@abaplint/cli 2.115.2 → 2.115.3

package/build/cli.js

@@ -32881,13 +32881,18 @@ class InsertInternal {
             }
         }
         if (node.findDirectTokenByText("INITIAL") === undefined) {
-            if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(sourceType, targetType) === false) {
-                const message = "Types not compatible";
-                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-                return;
+            let error = false;
+            if (sourceType instanceof basic_1.IntegerType && targetType instanceof basic_1.Integer8Type) {
+                error = true;
+            }
+            else if (new _type_utils_1.TypeUtils(input.scope).isAssignable(sourceType, targetType) === false) {
+                error = true;
             }
             else if (sourceType instanceof basic_1.CharacterType && targetType instanceof basic_1.StringType) {
                 // yea, well, INSERT doesnt convert the values automatically, like everything else?
+                error = true;
+            }
+            if (error === true) {
                 const message = "Types not compatible";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
@@ -52499,15 +52504,39 @@ class RenameICFService {
         this.reg = reg;
     }
     buildEdits(obj, oldName, newName) {
+        var _a, _b, _c, _d;
         if (!(obj instanceof __1.ICFService)) {
             throw new Error("RenameICFService, not a ICF Service");
         }
+        // Preserve GUID suffix from the stored object/file name for the filename rename
+        // SICF files follow pattern: servicename.sicf or servicename {GUID}.sicf
+        const fileNewName = (() => {
+            // Look for pattern: space + GUID (32 hex chars in braces) + optional extension
+            const guidPattern = / \{[0-9A-Fa-f]{16,32}\}/;
+            const match = oldName.match(guidPattern);
+            if (match) {
+                // Extract everything from the GUID onwards (includes .sicf extension if present)
+                const guidIndex = match.index;
+                const suffix = oldName.substring(guidIndex);
+                // Only append suffix if newName doesn't already contain it
+                return newName.includes(suffix) ? newName : newName + suffix;
+            }
+            // Fallback: preserve any suffix after first space (legacy behavior)
+            const space = oldName.indexOf(" ");
+            if (space > -1) {
+                const suffix = oldName.substring(space);
+                return newName.includes(suffix) ? newName : newName + suffix;
+            }
+            return newName;
+        })();
+        const cleanOldName = (_b = (_a = oldName.match(/^[^ ]+/)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : oldName;
+        const cleanNewName = (_d = (_c = newName.match(/^[^ ]+/)) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : newName;
         let changes = [];
         const helper = new renamer_helper_1.RenamerHelper(this.reg);
-        changes = changes.concat(helper.buildXMLFileEdits(obj, "URL", oldName, newName, true));
-        changes = changes.concat(helper.buildXMLFileEdits(obj, "ICF_NAME", oldName, newName));
-        changes = changes.concat(helper.buildXMLFileEdits(obj, "ORIG_NAME", oldName, newName, true));
-        changes = changes.concat(helper.renameFiles(obj, oldName, newName));
+        changes = changes.concat(helper.buildURLFileEdits(obj, cleanOldName, cleanNewName));
+        changes = changes.concat(helper.buildXMLFileEdits(obj, "ICF_NAME", cleanOldName, cleanNewName));
+        changes = changes.concat(helper.buildXMLFileEdits(obj, "ORIG_NAME", cleanOldName, cleanNewName, true));
+        changes = changes.concat(helper.renameFiles(obj, oldName, fileNewName));
         return {
             documentChanges: changes,
         };
@@ -52684,7 +52713,10 @@ class Renamer {
     /** Builds edits, but does not apply to registry, used by LSP */
     buildEdits(type, oldName, newName) {
         this.reg.parse(); // the registry must be parsed to dermine references
-        const obj = this.reg.getObject(type, oldName);
+        let obj = this.reg.getObject(type, oldName);
+        if (obj === undefined && type === "SICF") {
+            obj = Array.from(this.reg.getObjects()).find(o => o.getType() === "SICF" && o.getName().toUpperCase().startsWith(oldName.toUpperCase() + " "));
+        }
         if (obj === undefined) {
             throw new Error("rename, object not found");
         }
@@ -52913,6 +52945,34 @@ class RenamerHelper {
         }
         return changes;
     }
+    buildURLFileEdits(object, oldName, newName) {
+        const changes = [];
+        const xml = object.getXMLFile();
+        if (xml === undefined) {
+            return [];
+        }
+        const oldNameLower = oldName.toLowerCase();
+        const newNameLower = newName.toLowerCase();
+        const rows = xml.getRawRows();
+        for (let i = 0; i < rows.length; i++) {
+            const row = rows[i];
+            const urlTagStart = row.indexOf("<URL>");
+            if (urlTagStart === -1) {
+                continue;
+            }
+            const urlTagEnd = row.indexOf("</URL>");
+            if (urlTagEnd === -1) {
+                continue;
+            }
+            const urlContent = row.substring(urlTagStart + 5, urlTagEnd);
+            const updatedUrl = urlContent.replace(oldNameLower, newNameLower);
+            if (updatedUrl !== urlContent) {
+                const range = vscode_languageserver_types_1.Range.create(i, urlTagStart + 5, i, urlTagEnd);
+                changes.push(vscode_languageserver_types_1.TextDocumentEdit.create({ uri: xml.getFilename(), version: 1 }, [vscode_languageserver_types_1.TextEdit.replace(range, updatedUrl)]));
+            }
+        }
+        return changes;
+    }
     renameFiles(obj, oldName, name) {
         const list = [];
         const newName = name.toLowerCase().replace(/\//g, "#");
@@ -55155,7 +55215,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.115.2";
+        return "2.115.3";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.115.2",
+    "version": "2.115.3",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.115.2",
+        "@abaplint/core": "^2.115.3",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",