@abaplint/core 2.118.9 → 2.118.11

package/build/abaplint.d.ts

@@ -7226,8 +7226,10 @@ declare class TimeType extends AbstractType {
 export declare abstract class Token {
     private readonly start;
     private readonly str;
+    private readonly strUpper;
     constructor(start: Position, str: string);
     getStr(): string;
+    getUpperStr(): string;
     getRow(): number;
     getCol(): number;
     getStart(): Position;

package/build/src/abap/1_lexer/tokens/abstract_token.js

@@ -6,6 +6,7 @@ class AbstractToken {
     constructor(start, str) {
         this.start = start;
         this.str = str;
+        this.strUpper = str.toUpperCase();
     }
     // special function, for debugging purposes, see https://github.com/abaplint/abaplint/pull/3137
     [Symbol.for("debug.description")]() {
@@ -14,6 +15,9 @@ class AbstractToken {
     getStr() {
         return this.str;
     }
+    getUpperStr() {
+        return this.strUpper;
+    }
     getRow() {
         return this.start.getRow();
     }

package/build/src/abap/2_statements/combi.js

@@ -69,7 +69,7 @@ class Word {
         const result = [];
         for (const input of r) {
             if (input.remainingLength() !== 0
-                && input.peek().getStr().toUpperCase() === this.s) {
+                && input.peek().getUpperStr() === this.s) {
                 //        console.log("match, " + this.s + result.length);
                 result.push(input.shift(new nodes_1.TokenNode(input.peek())));
             }
@@ -88,7 +88,7 @@ class Word {
 }
 class Token {
     constructor(s) {
-        this.name = s.toUpperCase();
+        this.name = s;
     }
     listKeywords() {
         return [];
@@ -100,7 +100,7 @@ class Token {
         const result = [];
         for (const input of r) {
             if (input.remainingLength() !== 0
-                && input.peek().constructor.name.toUpperCase() === this.name) {
+                && input.peek().constructor.name === this.name) {
                 result.push(input.shift(new nodes_1.TokenNode(input.peek())));
             }
         }
@@ -838,7 +838,7 @@ function tok(t) {
 }
 const expressionSingletons = {};
 const stringSingletons = {};
-function map(s) {
+function mapInput(s) {
     const type = typeof s;
     if (type === "string") {
         if (stringSingletons[s] === undefined) {
@@ -860,48 +860,48 @@ function map(s) {
     }
 }
 function seq(first, second, ...rest) {
-    const list = [map(first), map(second)];
-    list.push(...rest.map(map));
+    const list = [mapInput(first), mapInput(second)];
+    list.push(...rest.map(mapInput));
     return new Sequence(list);
 }
 function alt(first, second, ...rest) {
-    const list = [map(first), map(second)];
-    list.push(...rest.map(map));
+    const list = [mapInput(first), mapInput(second)];
+    list.push(...rest.map(mapInput));
     return new Alternative(list);
 }
 function altPrio(first, second, ...rest) {
-    const list = [map(first), map(second)];
-    list.push(...rest.map(map));
+    const list = [mapInput(first), mapInput(second)];
+    list.push(...rest.map(mapInput));
     return new AlternativePriority(list);
 }
 function opt(first) {
-    return new Optional(map(first));
+    return new Optional(mapInput(first));
 }
 function optPrio(first) {
-    return new OptionalPriority(map(first));
+    return new OptionalPriority(mapInput(first));
 }
 function per(first, second, ...rest) {
-    const list = [map(first), map(second)];
-    list.push(...rest.map(map));
+    const list = [mapInput(first), mapInput(second)];
+    list.push(...rest.map(mapInput));
     return new Permutation(list);
 }
 function star(first) {
-    return new Star(map(first));
+    return new Star(mapInput(first));
 }
 function starPrio(first) {
-    return new StarPriority(map(first));
+    return new StarPriority(mapInput(first));
 }
 function plus(first) {
-    return new Plus(map(first));
+    return new Plus(mapInput(first));
 }
 function plusPrio(first) {
-    return new PlusPriority(map(first));
+    return new PlusPriority(mapInput(first));
 }
 function ver(version, first, or) {
-    return new Vers(version, map(first), or);
+    return new Vers(version, mapInput(first), or);
 }
 function verNot(version, first) {
-    return new VersNot(version, map(first));
+    return new VersNot(version, mapInput(first));
 }
 function failCombinator() {
     return new FailCombinator();

package/build/src/abap/5_syntax/structures/data.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Data = void 0;
 const data_1 = require("../statements/data");
 const nodes_1 = require("../../nodes");
+const identifier_1 = require("../../1_lexer/tokens/identifier");
 const type_1 = require("../statements/type");
 const _typed_identifier_1 = require("../../types/_typed_identifier");
 const types_1 = require("./types");
@@ -25,7 +26,11 @@ class Data {
             this.runCommonPartSyntax(node, input);
             return undefined;
         }
-        const name = node.findFirstExpression(Expressions.DefinitionName).getFirstToken();
+        const nameExpr = node.findFirstExpression(Expressions.DefinitionName);
+        let name = nameExpr.getFirstToken();
+        if (nameExpr.countTokens() > 1) { // workaround for names with dashes
+            name = new identifier_1.Identifier(name.getStart(), nameExpr.concatTokens());
+        }
         let table = false;
         const values = {};
         const components = [];

package/build/src/objects/rename/rename_program.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RenameProgram = void 0;
+const Statements = require("../../abap/2_statements/statements");
+const Expressions = require("../../abap/2_statements/expressions");
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const __1 = require("..");
+const renamer_helper_1 = require("./renamer_helper");
+const _lsp_utils_1 = require("../../lsp/_lsp_utils");
+const _abap_object_1 = require("../_abap_object");
+class RenameProgram {
+    constructor(reg) {
+        this.reg = reg;
+    }
+    buildEdits(obj, oldName, newName) {
+        if (!(obj instanceof __1.Program)) {
+            throw new Error("RenameProgram, not a program");
+        }
+        const main = obj.getMainABAPFile();
+        if (main === undefined) {
+            throw new Error(`Main file not found, ${obj.getType()} ${obj.getName()}`);
+        }
+        let changes = [];
+        const helper = new renamer_helper_1.RenamerHelper(this.reg);
+        changes = changes.concat(helper.buildXMLFileEdits(obj, "NAME", oldName, newName));
+        changes = changes.concat(helper.renameFiles(obj, oldName, newName));
+        const edits = [];
+        for (const s of main.getStatements()) {
+            if (s.get() instanceof Statements.Report || s.get() instanceof Statements.Program) {
+                const exp = s.findFirstExpression(Expressions.ReportName);
+                if (exp) {
+                    edits.push(vscode_languageserver_types_1.TextEdit.replace(_lsp_utils_1.LSPUtils.tokenToRange(exp.getFirstToken()), newName.toLowerCase()));
+                }
+            }
+        }
+        if (edits.length > 0) {
+            changes.push(vscode_languageserver_types_1.TextDocumentEdit.create({ uri: main.getFilename(), version: 1 }, edits));
+        }
+        // Rename INCLUDE statements in all ABAP objects
+        for (const o of this.reg.getObjects()) {
+            if (o instanceof _abap_object_1.ABAPObject && o !== obj) {
+                for (const file of o.getABAPFiles()) {
+                    const includeEdits = [];
+                    for (const s of file.getStatements()) {
+                        if (s.get() instanceof Statements.Include ||
+                            s.get() instanceof Statements.Submit ||
+                            s.get() instanceof Statements.Perform) {
+                            for (const exp of s.findAllExpressions(Expressions.IncludeName)) {
+                                if (exp && exp.getFirstToken().getStr().toUpperCase() === oldName.toUpperCase()) {
+                                    includeEdits.push(vscode_languageserver_types_1.TextEdit.replace(_lsp_utils_1.LSPUtils.tokenToRange(exp.getFirstToken()), newName.toLowerCase()));
+                                }
+                            }
+                        }
+                    }
+                    if (includeEdits.length > 0) {
+                        changes.push(vscode_languageserver_types_1.TextDocumentEdit.create({ uri: file.getFilename(), version: 1 }, includeEdits));
+                    }
+                }
+            }
+        }
+        return {
+            documentChanges: changes,
+        };
+    }
+}
+exports.RenameProgram = RenameProgram;
+//# sourceMappingURL=rename_program.js.map

package/build/src/objects/rename/renamer.js

@@ -7,6 +7,7 @@ const rename_data_element_1 = require("./rename_data_element");
 const rename_domain_1 = require("./rename_domain");
 const rename_global_class_1 = require("./rename_global_class");
 const rename_global_interface_1 = require("./rename_global_interface");
+const rename_program_1 = require("./rename_program");
 const rename_table_1 = require("./rename_table");
 const rename_table_type_1 = require("./rename_table_type");
 const rename_message_class_1 = require("./rename_message_class");
@@ -61,6 +62,8 @@ class Renamer {
                 return new rename_table_type_1.RenameTableType(this.reg);
             case "INTF":
                 return new rename_global_interface_1.RenameGlobalInterface(this.reg);
+            case "PROG":
+                return new rename_program_1.RenameProgram(this.reg);
             case "MSAG":
                 return new rename_message_class_1.RenameMessageClass(this.reg);
             case "SICF":

package/build/src/registry.js

@@ -74,7 +74,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.118.9";
+        return "2.118.11";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.118.9",
+    "version": "2.118.11",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",