@abaplint/cli 2.115.2 → 2.115.4

package/build/cli.js

@@ -11974,7 +11974,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class DataBegin {
     getMatcher() {
-        const occurs = (0, combi_1.seq)("OCCURS", expressions_1.Integer);
+        const occurs = (0, combi_1.seq)("OCCURS", (0, combi_1.altPrio)(expressions_1.Integer, expressions_1.FieldChain));
         const common = (0, combi_1.seq)("COMMON PART", (0, combi_1.optPrio)(expressions_1.DefinitionName));
         const structure = (0, combi_1.seq)("BEGIN OF", (0, combi_1.altPrio)(common, (0, combi_1.seq)(expressions_1.DefinitionName, (0, combi_1.optPrio)("READ-ONLY"), (0, combi_1.optPrio)(occurs))));
         return (0, combi_1.seq)("DATA", structure);
@@ -18678,7 +18678,8 @@ class Write {
         const as = (0, combi_1.seq)("AS", (0, combi_1.altPrio)("LINE", "ICON", "CHECKBOX", "SYMBOL"));
         const to = (0, combi_1.seq)("TO", expressions_1.Target);
         const options = (0, combi_1.per)(mask, to, (0, combi_1.seq)("EXPONENT", expressions_1.Source), "NO-GROUPING", "NO-ZERO", "CENTERED", (0, combi_1.seq)("INPUT", (0, combi_1.opt)(onOff)), "NO-GAP", "LEFT-JUSTIFIED", as, (0, combi_1.seq)("FRAMES", onOff), (0, combi_1.seq)("HOTSPOT", (0, combi_1.opt)(onOff)), "RIGHT-JUSTIFIED", (0, combi_1.seq)("TIME ZONE", expressions_1.Source), (0, combi_1.seq)("UNDER", expressions_1.Source), (0, combi_1.seq)("STYLE", expressions_1.Source), (0, combi_1.seq)("ROUND", expressions_1.Source), (0, combi_1.seq)("QUICKINFO", expressions_1.Source), "ENVIRONMENT TIME FORMAT", dateFormat, (0, combi_1.seq)("UNIT", expressions_1.Source), (0, combi_1.seq)("INTENSIFIED", (0, combi_1.opt)(onOff)), (0, combi_1.seq)("INDEX", expressions_1.Source), (0, combi_1.seq)("DECIMALS", expressions_1.Source), (0, combi_1.seq)("INVERSE", (0, combi_1.opt)(onOff)), expressions_1.Color, (0, combi_1.seq)("CURRENCY", expressions_1.Source), "RESET", "NO-SIGN");
-        const ret = (0, combi_1.seq)("WRITE", (0, combi_1.alt)("AT /", (0, combi_1.seq)((0, combi_1.opt)(expressions_1.WriteOffsetLength), (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic, "/"), (0, combi_1.opt)(options))));
+        // Need to refactor all this sometime,
+        const ret = (0, combi_1.seq)("WRITE", (0, combi_1.alt)((0, combi_1.seq)("AT /", (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)("NO-GAP")), (0, combi_1.seq)((0, combi_1.opt)(expressions_1.WriteOffsetLength), (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic, "/"), (0, combi_1.opt)(options))));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -32881,13 +32882,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;
@@ -42628,8 +42634,22 @@ class DDIC {
             case "XSTRING":
                 return Types.XStringType.get({ qualifiedName: qualifiedName || name });
             case "D":
+                /*
+                if (length && length > 0) {
+                  throw new Error("Length for type D not possible");
+                } else if (decimals && decimals > 0) {
+                  throw new Error("Decimals for type D not possible");
+                }
+                */
                 return new Types.DateType({ qualifiedName: qualifiedName || name });
             case "T":
+                /*
+                if (length && length > 0) {
+                  throw new Error("Length for type T not possible");
+                } else if (decimals && decimals > 0) {
+                  throw new Error("Decimals for type T not possible");
+                }
+                */
                 return new Types.TimeType({ qualifiedName: qualifiedName || name });
             case "XSEQUENCE":
                 return new Types.XSequenceType({ qualifiedName: qualifiedName });
@@ -42662,6 +42682,13 @@ class DDIC {
             case "INT8": // todo, take version into account
                 return new Types.Integer8Type({ qualifiedName: qualifiedName || name });
             case "F":
+                /*
+                if (length && length > 0) {
+                  throw new Error("Length for type F not possible");
+                } else if (decimals && decimals > 0) {
+                  throw new Error("Decimals for type F not possible");
+                }
+                */
                 return new Types.FloatType({ qualifiedName: qualifiedName || name });
             case "P":
                 if (length && decimals) {
@@ -52499,15 +52526,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 +52735,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 +52967,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 +55237,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.115.2";
+        return "2.115.4";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -68388,7 +68470,7 @@ ENDIF.
             return [];
         }
         for (const cond of structure.findAllExpressionsMulti([Expressions.Cond, Expressions.ComponentCond])) {
-            issues.push(...this.analyze(file, cond));
+            issues.push(...this.analyzeCondition(file, cond));
         }
         for (const sub of structure.findAllExpressionsMulti([Expressions.CondSub, Expressions.ComponentCondSub])) {
             let cond = [];
@@ -68442,18 +68524,20 @@ ENDIF.
     }
     analyzeMove(file, m) {
         const issues = [];
-        const children = m.getChildren();
-        const last = children[children.length - 2];
-        const lastChildren = last.getChildren();
-        if (lastChildren.length === 3
-            && lastChildren[0].getFirstToken().getStr() === "("
-            && lastChildren[2].getFirstToken().getStr() === ")") {
-            const issue = issue_1.Issue.atToken(file, last.getFirstToken(), "Too many parentheses", this.getMetadata().key, this.conf.severity);
-            issues.push(issue);
+        for (const source of m.findAllExpressionsRecursive(Expressions.Source)) {
+            const lastChildren = source.getChildren();
+            if (lastChildren.length === 3
+                && lastChildren[0].getFirstToken().getStr() === "("
+                && lastChildren[1].getChildren().length === 1
+                && lastChildren[1].getFirstToken().getStr().startsWith("-") === false
+                && lastChildren[2].getFirstToken().getStr() === ")") {
+                const issue = issue_1.Issue.atToken(file, lastChildren[0].getFirstToken(), "Too many parentheses", this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+            }
         }
         return issues;
     }
-    analyze(file, cond) {
+    analyzeCondition(file, cond) {
         var _a, _b;
         const issues = [];
         let comparator = "";
@@ -70910,6 +70994,8 @@ class ObsoleteStatementConf extends _basic_rule_config_1.BasicRuleConfig {
         this.fieldGroups = true;
         /** Check for REPLACE INTO */
         this.replaceInto = true;
+        this.loopExtract = true;
+        this.sortExtract = true;
     }
 }
 exports.ObsoleteStatementConf = ObsoleteStatementConf;
@@ -71163,6 +71249,14 @@ ENDIF.`,
                     issues.push(issue);
                 }
             }
+            if (this.conf.loopExtract && sta instanceof Statements.LoopExtract) {
+                const issue = issue_1.Issue.atStatement(file, staNode, "LOOP extract", this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+            }
+            if (this.conf.sortExtract && sta instanceof Statements.SortDataset && staNode.getChildren().length === 2) {
+                const issue = issue_1.Issue.atStatement(file, staNode, "SORT extract", this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+            }
             if (configVersion >= version_1.Version.v754 && this.conf.clientSpecified
                 && (sta instanceof Statements.Select
                     || sta instanceof Statements.SelectLoop

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.115.2",
+    "version": "2.115.4",
     "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.4",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",