@abaplint/core 2.115.23 → 2.115.25

package/build/src/cds/expressions/cds_annotation.js

@@ -7,7 +7,9 @@ const cds_annotation_array_1 = require("./cds_annotation_array");
 class CDSAnnotation extends combi_1.Expression {
     getRunnable() {
         const nameWithSlash = (0, combi_1.seq)((0, combi_1.regex)(/^\w+$/), (0, combi_1.star)((0, combi_1.seq)("/", (0, combi_1.regex)(/^\w+$/))));
-        return (0, combi_1.seq)((0, combi_1.regex)(/^@\w+$/), (0, combi_1.star)((0, combi_1.seq)(".", nameWithSlash)), (0, combi_1.opt)(":"), (0, combi_1.opt)((0, combi_1.alt)(cds_annotation_array_1.CDSAnnotationArray, _1.CDSAnnotationObject, _1.CDSAnnotationSimple)));
+        // Support both "@Name" (single token) and "@ Name" (two tokens with space)
+        const annotationStart = (0, combi_1.alt)((0, combi_1.regex)(/^@\w+$/), (0, combi_1.seq)("@", (0, combi_1.regex)(/^\w+$/)));
+        return (0, combi_1.seq)(annotationStart, (0, combi_1.star)((0, combi_1.seq)(".", nameWithSlash)), (0, combi_1.opt)((0, combi_1.seq)(":", (0, combi_1.alt)(cds_annotation_array_1.CDSAnnotationArray, _1.CDSAnnotationObject, _1.CDSAnnotationSimple))));
     }
 }
 exports.CDSAnnotation = CDSAnnotation;

package/build/src/cds/expressions/cds_arithmetics.js

@@ -9,11 +9,14 @@ class CDSArithmetics extends combi_1.Expression {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)));
         const val = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString, _1.CDSAggregate, name);
         const operator = (0, combi_1.altPrio)("+", "-", "*", "/");
+        // Support unary operators (e.g., "- field" in CASE expressions)
+        const unary = (0, combi_1.altPrio)("-", "+");
+        const unaryExpression = (0, combi_1.seq)(unary, val);
         const operatorValue = (0, combi_1.seq)(operator, val);
         const paren = (0, combi_1.seq)("(", val, (0, combi_1.plusPrio)(operatorValue), ")");
         const noParen = (0, combi_1.seq)(val, (0, combi_1.plusPrio)(operatorValue));
         // todo: this is pretty bad, it needs a rewrite
-        return (0, combi_1.altPrio)((0, combi_1.seq)(paren, (0, combi_1.starPrio)(operatorValue)), noParen);
+        return (0, combi_1.altPrio)(unaryExpression, (0, combi_1.seq)(paren, (0, combi_1.starPrio)(operatorValue)), noParen);
     }
 }
 exports.CDSArithmetics = CDSArithmetics;

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

@@ -25,7 +25,15 @@ class RenamerHelper {
             }
         }
         // start with the last reference in the file first, if there are multiple refs per line
-        return this.replaceRefs(refs, oldName, newName).reverse();
+        // sort refs by position descending (row desc, then col desc) so edits don't corrupt positions
+        refs.sort((a, b) => {
+            const rowDiff = b.getStart().getRow() - a.getStart().getRow();
+            if (rowDiff !== 0) {
+                return rowDiff;
+            }
+            return b.getStart().getCol() - a.getStart().getCol();
+        });
+        return this.replaceRefs(refs, oldName, newName);
     }
     renameDDICCodeReferences(obj, oldName, newName) {
         const changes = [];
@@ -165,8 +173,14 @@ class RenamerHelper {
     ////////////////////////
     replaceRefs(refs, oldName, newName) {
         const changes = [];
+        const seen = new Set();
         // "zif_abapgit_auth~is_allowed" is a single token so only replace the first part of a token
         for (const r of refs) {
+            const key = r.getFilename() + ":" + r.getStart().getRow() + ":" + r.getStart().getCol();
+            if (seen.has(key)) {
+                continue;
+            }
+            seen.add(key);
             const range = vscode_languageserver_types_1.Range.create(r.getStart().getRow() - 1, r.getStart().getCol() - 1, r.getStart().getRow() - 1, r.getStart().getCol() - 1 + oldName.length);
             changes.push(vscode_languageserver_types_1.TextDocumentEdit.create({ uri: r.getFilename(), version: 1 }, [vscode_languageserver_types_1.TextEdit.replace(range, newName.toLowerCase())]));
         }

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.115.23",
+    "version": "2.115.25",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -53,7 +53,7 @@
         "@microsoft/api-extractor": "^7.56.3",
         "@types/chai": "^4.3.20",
         "@types/mocha": "^10.0.10",
-        "@types/node": "^24.10.12",
+        "@types/node": "^24.10.13",
         "chai": "^4.5.0",
         "eslint": "^9.39.2",
         "mocha": "^11.7.5",
@@ -63,7 +63,7 @@
         "typescript": "^5.9.3"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.3.4",
+        "fast-xml-parser": "^5.3.5",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.5"
     }