@abaplint/core 2.93.31 → 2.93.33

package/build/src/abap/5_syntax/statements/get_reference.js

@@ -4,13 +4,19 @@ exports.GetReference = void 0;
 const Expressions = require("../../2_statements/expressions");
 const source_1 = require("../expressions/source");
 const target_1 = require("../expressions/target");
+const inline_data_1 = require("../expressions/inline_data");
+const basic_1 = require("../../types/basic");
 class GetReference {
     runSyntax(node, scope, filename) {
-        for (const s of node.findDirectExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename);
+        const s = node.findDirectExpression(Expressions.Source);
+        const type = new source_1.Source().runSyntax(s, scope, filename);
+        const target = node.findDirectExpression(Expressions.Target);
+        const inline = target === null || target === void 0 ? void 0 : target.findDirectExpression(Expressions.InlineData);
+        if (inline) {
+            new inline_data_1.InlineData().runSyntax(inline, scope, filename, type ? new basic_1.DataReference(type) : undefined);
         }
-        for (const t of node.findDirectExpressions(Expressions.Target)) {
-            new target_1.Target().runSyntax(t, scope, filename);
+        else if (target) {
+            new target_1.Target().runSyntax(target, scope, filename);
         }
     }
 }

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.93.31";
+        return "2.93.33";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -1106,11 +1106,9 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
             return undefined;
         }
         const fieldChain = (_b = (_a = high.findDirectExpression(Expressions.AssignSource)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(Expressions.FieldChain);
-        if ((fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getChildren().length) !== 2) {
-            return undefined;
-        }
-        const tableExpression = fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getChildren()[1];
-        if (!(tableExpression.get() instanceof Expressions.TableExpression)
+        const tableExpression = fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getLastChild();
+        if (tableExpression === undefined
+            || !(tableExpression.get() instanceof Expressions.TableExpression)
             || !(tableExpression instanceof nodes_1.ExpressionNode)) {
             return undefined;
         }
@@ -1128,8 +1126,15 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
             concat = concat.substring(0, concat.length - 2);
             condition = `WITH KEY ${concat}`;
         }
+        let pre = "";
+        for (const c of fieldChain.getChildren()) {
+            if (c === tableExpression) {
+                break;
+            }
+            pre += c.concatTokens();
+        }
         const fsTarget = high.findDirectExpression(Expressions.FSTarget);
-        const code = `READ TABLE ${fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getChildren()[0].concatTokens()} ${condition} ASSIGNING ${fsTarget === null || fsTarget === void 0 ? void 0 : fsTarget.concatTokens()}.`;
+        const code = `READ TABLE ${pre} ${condition} ASSIGNING ${fsTarget === null || fsTarget === void 0 ? void 0 : fsTarget.concatTokens()}.`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, high.getFirstToken().getStart(), high.getLastToken().getEnd(), code);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, ASSIGN table expr", this.getMetadata().key, this.conf.severity, fix);
     }
@@ -1228,11 +1233,11 @@ CONSTANTS: BEGIN OF ${structureName},\n`;
         if (index === undefined) {
             return undefined;
         }
-        let uniqueName = this.uniqueName(low.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        let uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         uniqueName = `<${uniqueName}>`;
         const tName = target.concatTokens().split("[")[0];
         const condition = this.tableCondition(tableExpression);
-        const tabixBackup = this.uniqueName(low.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const tabixBackup = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
         // restore tabix before exeption
         const code = `FIELD-SYMBOLS ${uniqueName} LIKE LINE OF ${tName}.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.31",
+    "version": "2.93.33",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,7 +48,7 @@
     "devDependencies": {
         "@microsoft/api-extractor": "^7.31.2",
         "@types/chai": "^4.3.3",
-        "@types/mocha": "^9.1.1",
+        "@types/mocha": "^10.0.0",
         "@types/node": "^18.7.23",
         "chai": "^4.3.6",
         "eslint": "^8.24.0",