@abaplint/cli 2.102.53 → 2.102.55

package/build/cli.js

@@ -1467,6 +1467,11 @@ class Lexer {
                 this.add();
                 this.m = this.ModeNormal;
             }
+            else if (this.m === this.ModeTemplate
+                && ahead === "}"
+                && current !== "\\") {
+                this.add();
+            }
             else if (this.m === this.ModeStr
                 && current === "'"
                 && buf.length > 1
@@ -23844,20 +23849,30 @@ const source_field_symbol_1 = __webpack_require__(/*! ./source_field_symbol */ "
 const source_field_1 = __webpack_require__(/*! ./source_field */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source_field.js");
 class FieldChain {
     runSyntax(node, scope, filename, refType) {
-        const concat = node.concatTokens();
-        if (concat.includes("-")) {
-            // workaround for names with dashes
-            const found = scope.findVariable(concat);
-            if (found) {
-                if (refType) {
-                    scope.addReference(node.getFirstToken(), found, refType, filename);
+        var _a, _b, _c, _d, _e;
+        const children = node.getChildren().slice();
+        let contextName = children[0].concatTokens();
+        let context = undefined;
+        try {
+            context = this.findTop(children.shift(), scope, filename, refType);
+        }
+        catch (error) {
+            const concat = node.concatTokens();
+            if (concat.includes("-") && ((_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.SourceField) {
+                // workaround for names with dashes, eg. "sy-repid"
+                const offset = ((_b = node.findDirectExpression(Expressions.FieldOffset)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
+                const length = ((_c = node.findDirectExpression(Expressions.FieldLength)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "";
+                const found = scope.findVariable(concat.replace(offset, "").replace(length, ""));
+                if (found) {
+                    if (refType) {
+                        scope.addReference(node.getFirstToken(), found, refType, filename);
+                    }
+                    // this is not completely correct, but will work, dashes in names is a mess anyhow
+                    return found.getType();
                 }
-                return found.getType();
             }
+            throw error;
         }
-        const children = node.getChildren().slice();
-        let contextName = children[0].concatTokens();
-        let context = this.findTop(children.shift(), scope, filename, refType);
         while (children.length > 0) {
             contextName += children[0].concatTokens();
             const current = children.shift();
@@ -23905,7 +23920,30 @@ class FieldChain {
                 if (context instanceof basic_1.TableType && context.isWithHeader()) {
                     context = context.getRowType();
                 }
-                context = new component_name_1.ComponentName().runSyntax(context, current);
+                try {
+                    context = new component_name_1.ComponentName().runSyntax(context, current);
+                }
+                catch (error) {
+                    const concat = node.concatTokens();
+                    if (concat.includes("-")) {
+                        // workaround for names with dashes, eg. "sy-repid"
+                        const offset = ((_d = node.findDirectExpression(Expressions.FieldOffset)) === null || _d === void 0 ? void 0 : _d.concatTokens()) || "";
+                        const length = ((_e = node.findDirectExpression(Expressions.FieldLength)) === null || _e === void 0 ? void 0 : _e.concatTokens()) || "";
+                        const found = scope.findVariable(concat.replace(offset, "").replace(length, ""));
+                        if (found) {
+                            if (refType) {
+                                scope.addReference(node.getFirstToken(), found, refType, filename);
+                            }
+                            context = found.getType();
+                        }
+                        else {
+                            throw error;
+                        }
+                    }
+                    else {
+                        throw error;
+                    }
+                }
             }
             else if (current instanceof nodes_1.ExpressionNode
                 && current.get() instanceof Expressions.TableExpression) {
@@ -49149,7 +49187,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.53";
+        return "2.102.55";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -68552,6 +68590,7 @@ class UnreachableCode extends _abap_rule_1.ABAPRule {
             || s instanceof Statements.EndMethod
             || s instanceof Statements.EndModule
             || s instanceof Statements.EndForm
+            || s instanceof Statements.EndTestSeam
             || s instanceof Statements.EndAt
             || s instanceof Statements.EndSelect
             || s instanceof Statements.AtSelectionScreen
@@ -71780,7 +71819,7 @@ Builder.prototype.j2x = function(jObj, level) {
   let attrStr = '';
   let val = '';
   for (let key in jObj) {
-    if(!jObj.hasOwnProperty(key)) continue;
+    if(!Object.prototype.hasOwnProperty.call(jObj, key)) continue;
     if (typeof jObj[key] === 'undefined') {
       // supress undefined node only if it is not an attribute
       if (this.isAttribute(key)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.102.53",
+    "version": "2.102.55",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,12 +38,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.102.53",
+        "@abaplint/core": "^2.102.55",
         "@types/chai": "^4.3.6",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.3",
         "@types/mocha": "^10.0.2",
-        "@types/node": "^20.8.0",
+        "@types/node": "^20.8.2",
         "@types/progress": "^2.0.5",
         "chai": "^4.3.10",
         "chalk": "^5.3.0",