@abaplint/core 2.85.35 → 2.85.38

package/build/src/abap/2_statements/statement_parser.js

@@ -107,6 +107,9 @@ class StatementParser {
             if (statement.get() instanceof _statement_1.Unknown
                 && statement.concatTokens().toUpperCase().startsWith("CALL METHOD ") === false) {
                 for (const { first, second } of this.buildSplits(statement.getTokens())) {
+                    if (second.length === 1) {
+                        continue; // probably punctuation
+                    }
                     const s = this.categorizeStatement(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(second)));
                     if (!(s.get() instanceof _statement_1.Unknown)) {
                         result.push(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(first)));

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -19,6 +19,8 @@ const _typed_identifier_1 = require("../abap/types/_typed_identifier");
 const basic_1 = require("../abap/types/basic");
 const config_1 = require("../config");
 const tokens_1 = require("../abap/1_lexer/tokens");
+const include_graph_1 = require("../utils/include_graph");
+const objects_1 = require("../objects");
 // todo: refactor each sub-rule to new classes?
 // todo: add configuration
 class DownportConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -75,10 +77,12 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         const version = this.lowReg.getConfig().getVersion();
         if (version === version_1.Version.v702 || version === version_1.Version.OpenABAP) {
             this.initHighReg();
+            this.graph = new include_graph_1.IncludeGraph(reg);
         }
         return this;
     }
     run(lowObj) {
+        var _a;
         const ret = [];
         this.counter = 1;
         const version = this.lowReg.getConfig().getVersion();
@@ -92,7 +96,20 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (highObj === undefined || !(highObj instanceof _abap_object_1.ABAPObject)) {
             return ret;
         }
-        const highSyntax = new syntax_1.SyntaxLogic(this.highReg, highObj).run();
+        let highSyntaxObj = highObj;
+        // for includes do the syntax check via a main program
+        if (lowObj instanceof objects_1.Program && lowObj.isInclude()) {
+            const mains = this.graph.listMainForInclude((_a = lowObj.getMainABAPFile()) === null || _a === void 0 ? void 0 : _a.getFilename());
+            if (mains.length <= 0) {
+                return [];
+            }
+            const f = this.highReg.getFileByName(mains[0]);
+            if (f === undefined) {
+                return [];
+            }
+            highSyntaxObj = this.highReg.findObjectForFile(f);
+        }
+        const highSyntax = new syntax_1.SyntaxLogic(this.highReg, highSyntaxObj).run();
         for (const lowFile of lowObj.getABAPFiles()) {
             const highFile = highObj.getABAPFileByName(lowFile.getFilename());
             if (highFile === undefined) {
@@ -242,7 +259,6 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        // note: line_exists() must be replaced before this call
         found = this.replaceTableExpression(high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -450,6 +466,11 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
             if (tableExpression === undefined) {
                 continue;
             }
+            const concat = node.concatTokens().toUpperCase();
+            if (concat.includes(" LINE_EXISTS( ") || concat.includes(" LINE_INDEX( ")) {
+                // note: line_exists() must be replaced before handling table expressions
+                continue;
+            }
             let pre = "";
             let startToken = undefined;
             for (const child of fieldChain.getChildren()) {
@@ -1148,8 +1169,8 @@ ${indentation}    output = ${topTarget}.`;
             if (found === undefined) {
                 continue;
             }
-            else if (found.getType() instanceof basic_1.VoidType) {
-                return issue_1.Issue.atToken(lowFile, i.getFirstToken(), "Error outlining voided type", this.getMetadata().key, this.conf.severity);
+            else if (found.getType() instanceof basic_1.VoidType && found.getType().getQualifiedName() === undefined) {
+                continue;
             }
             const type = found.getType().getQualifiedName() ? (_b = found.getType().getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toLowerCase() : found.getType().toABAP();
             const code = `DATA ${name} TYPE ${type}.\n` +
@@ -1306,9 +1327,11 @@ ${indentation}    output = ${topTarget}.`;
         var _a, _b;
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
         for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
+            if (r.referenceType !== _reference_1.ReferenceType.BuiltinMethodReference) {
+                continue;
+            }
             const func = r.position.getName().toUpperCase();
-            if (r.referenceType === _reference_1.ReferenceType.BuiltinMethodReference
-                && (func === "LINE_EXISTS" || func === "LINE_INDEX")) {
+            if (func === "LINE_EXISTS" || func === "LINE_INDEX") {
                 const token = r.position.getToken();
                 const expression = this.findMethodCallExpression(node, token);
                 if (expression === undefined) {
@@ -1327,7 +1350,7 @@ ${indentation}    output = ${topTarget}.`;
                     }
                     condition += c.concatTokens() + " ";
                 }
-                const tableName = (_b = expression === null || expression === void 0 ? void 0 : expression.findFirstExpression(Expressions.SourceField)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+                const tableName = (_b = expression.findFirstExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.concatTokens().split("[")[0];
                 const uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
                 const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
                 const sy = func === "LINE_EXISTS" ? "sy-subrc" : "sy-tabix";

package/build/src/utils/include_graph.js

@@ -75,6 +75,9 @@ class IncludeGraph {
     }
     listMainForInclude(filename) {
         const ret = [];
+        if (filename === undefined) {
+            return [];
+        }
         for (const f of this.graph.findTop(filename)) {
             if (f.include === false) {
                 ret.push(f.filename);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.85.35",
+    "version": "2.85.38",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -58,7 +58,7 @@
         "typescript": "^4.6.2"
     },
     "dependencies": {
-        "fast-xml-parser": "^4.0.3",
+        "fast-xml-parser": "^4.0.4",
         "json5": "^2.2.0",
         "vscode-languageserver-protocol": "^3.16.0",
         "vscode-languageserver-types": "^3.16.0"