@abaplint/cli 2.115.1 → 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;
@@ -52125,7 +52130,10 @@ exports.Program = Program;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ProxyObject = void 0;
+const xml_utils_1 = __webpack_require__(/*! ../xml_utils */ "./node_modules/@abaplint/core/build/src/xml_utils.js");
 const _abstract_object_1 = __webpack_require__(/*! ./_abstract_object */ "./node_modules/@abaplint/core/build/src/objects/_abstract_object.js");
+const interface_1 = __webpack_require__(/*! ./interface */ "./node_modules/@abaplint/core/build/src/objects/interface.js");
+const memory_file_1 = __webpack_require__(/*! ../files/memory_file */ "./node_modules/@abaplint/core/build/src/files/memory_file.js");
 class ProxyObject extends _abstract_object_1.AbstractObject {
     getType() {
         return "SPRX";
@@ -52137,8 +52145,83 @@ class ProxyObject extends _abstract_object_1.AbstractObject {
         };
     }
     getDescription() {
-        // todo
-        return undefined;
+        var _a;
+        this.parse();
+        const intfItem = (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.proxyData.find(i => i.R3_TYPE === "INTF");
+        return intfItem === null || intfItem === void 0 ? void 0 : intfItem.R3_TEXT;
+    }
+    setDirty() {
+        this.parsedXML = undefined;
+        super.setDirty();
+    }
+    parse(_version, _globalMacros, reg) {
+        if (this.parsedXML) {
+            return { updated: false, runtime: 0 };
+        }
+        const start = Date.now();
+        this.parsedXML = this.parseXML();
+        const end = Date.now();
+        const objects = this.generateABAPObjects();
+        for (const obj of objects) {
+            reg === null || reg === void 0 ? void 0 : reg.addDependencies(obj.getFiles());
+        }
+        return { updated: true, runtime: end - start };
+    }
+    parseXML() {
+        var _a, _b;
+        const result = { proxyData: [] };
+        const parsed = super.parseRaw2();
+        if (parsed === undefined
+            || parsed.abapGit === undefined
+            || ((_a = parsed.abapGit["asx:abap"]) === null || _a === void 0 ? void 0 : _a["asx:values"]) === undefined) {
+            return result;
+        }
+        const values = parsed.abapGit["asx:abap"]["asx:values"];
+        result.proxyData = (0, xml_utils_1.xmlToArray)((_b = values.PROXY_DATA) === null || _b === void 0 ? void 0 : _b.item);
+        return result;
+    }
+    generateABAPObjects() {
+        var _a, _b, _c;
+        this.parse();
+        const result = [];
+        if (!this.parsedXML) {
+            return result;
+        }
+        // Find interface definition
+        const intfItem = this.parsedXML.proxyData.find(i => i.R3_TYPE === "INTF");
+        if (!intfItem || !intfItem.R3_NAME) {
+            return result;
+        }
+        const intfName = intfItem.R3_NAME.toLowerCase();
+        // Find methods
+        const methods = this.parsedXML.proxyData.filter(i => i.R3_TYPE === "METH");
+        // Build interface code
+        let code = `INTERFACE ${intfName} PUBLIC.\n`;
+        for (const method of methods) {
+            const methodName = (_a = method.R3_NAME) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+            if (!methodName) {
+                continue;
+            }
+            // Find parameters for this method
+            const params = this.parsedXML.proxyData.filter(i => i.R3_TYPE === "PAIM" && i.OBJ_NAME1 === method.OBJ_NAME1);
+            code += `  METHODS ${methodName}\n`;
+            if (params.length > 0) {
+                code += `    IMPORTING\n`;
+                for (let i = 0; i < params.length; i++) {
+                    const param = params[i];
+                    const paramName = (_b = param.OBJ_NAME2) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+                    const paramType = (_c = param.OBJ_NAME_R) === null || _c === void 0 ? void 0 : _c.toLowerCase();
+                    const isLast = i === params.length - 1;
+                    code += `      ${paramName} TYPE ${paramType}${isLast ? "." : ""}\n`;
+                }
+            }
+        }
+        code += `ENDINTERFACE.`;
+        // Create the interface object
+        const intf = new interface_1.Interface(intfName.toUpperCase());
+        intf.addFile(new memory_file_1.MemoryFile(`${intfName}.intf.abap`, code));
+        result.push(intf);
+        return result;
     }
 }
 exports.ProxyObject = ProxyObject;
@@ -52421,14 +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, "ICF_NAME", oldName, newName));
-        changes = changes.concat(helper.buildXMLFileEdits(obj, "ORIG_NAME", oldName, newName));
-        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,
         };
@@ -52605,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");
         }
@@ -52813,21 +52924,51 @@ class RenamerHelper {
         }
         return changes;
     }
-    buildXMLFileEdits(object, xmlTag, oldName, newName) {
+    buildXMLFileEdits(object, xmlTag, oldName, newName, useLowerCase = false) {
         const changes = [];
         const xml = object.getXMLFile();
         if (xml === undefined) {
             return [];
         }
+        const originalValue = useLowerCase ? oldName.toLowerCase() : oldName.toUpperCase();
+        const replacementValue = useLowerCase ? newName.toLowerCase() : newName.toUpperCase();
         const tag = xmlTag.toUpperCase();
-        const search = "<" + tag + ">" + oldName.toUpperCase() + "</" + tag + ">";
+        const search = "<" + tag + ">" + originalValue + "</" + tag + ">";
         const length = tag.length + 2;
         const rows = xml.getRawRows();
         for (let i = 0; i < rows.length; i++) {
             const index = rows[i].indexOf(search);
             if (index >= 0) {
-                const range = vscode_languageserver_types_1.Range.create(i, index + length, i, index + oldName.length + length);
-                changes.push(vscode_languageserver_types_1.TextDocumentEdit.create({ uri: xml.getFilename(), version: 1 }, [vscode_languageserver_types_1.TextEdit.replace(range, newName.toUpperCase())]));
+                const range = vscode_languageserver_types_1.Range.create(i, index + length, i, index + originalValue.length + length);
+                changes.push(vscode_languageserver_types_1.TextDocumentEdit.create({ uri: xml.getFilename(), version: 1 }, [vscode_languageserver_types_1.TextEdit.replace(range, replacementValue)]));
+            }
+        }
+        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;
@@ -55074,7 +55215,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.115.1";
+        return "2.115.3";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -65569,7 +65710,8 @@ lv_value = 5.`,
                 const source = (_a = statement.findDirectExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
                 const target = (_b = statement.findDirectExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.concatTokens().toUpperCase();
                 if (source === target && source !== undefined) {
-                    issues.push(issue_1.Issue.atStatement(file, statement, "Comment between methods in global class implementation", this.getMetadata().key, this.conf.severity));
+                    const message = `Identical MOVE from "${source}" to "${target}"`;
+                    issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.conf.severity));
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.115.1",
+    "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.1",
+        "@abaplint/core": "^2.115.3",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",
@@ -47,7 +47,7 @@
         "chai": "^4.5.0",
         "p-limit": "^3.1.0",
         "chalk": "^5.6.2",
-        "eslint": "^9.39.1",
+        "eslint": "^9.39.2",
         "glob": "^11.0.3",
         "json5": "^2.2.3",
         "memfs": "^4.51.1",