@abaplint/core 2.89.6 → 2.89.7

package/build/src/abap/2_statements/statements/message.js

@@ -12,7 +12,7 @@ class Message {
         const raising = (0, combi_1.seq)("RAISING", expressions_1.ExceptionName);
         const options = (0, combi_1.per)(like, into, raising);
         const type = (0, combi_1.seq)("TYPE", expressions_1.Source);
-        const sou = (0, combi_1.altPrio)(options, expressions_1.Source);
+        const sou = (0, combi_1.altPrio)(options, s);
         const sourc = (0, combi_1.alt)(sou, (0, combi_1.seq)(s, sou), (0, combi_1.seq)(s, s, sou), (0, combi_1.seq)(s, s, s, options));
         const mwith = (0, combi_1.seq)("WITH", s, (0, combi_1.opt)(sourc));
         const foo = (0, combi_1.seq)(expressions_1.MessageSource, (0, combi_1.opt)(options), (0, combi_1.opt)(mwith));

package/build/src/abap/5_syntax/expressions/component_compare_simple.js

@@ -2,15 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentCompareSimple = void 0;
 const Expressions = require("../../2_statements/expressions");
+const nodes_1 = require("../../nodes");
 const component_chain_1 = require("./component_chain");
 const source_1 = require("./source");
 class ComponentCompareSimple {
     runSyntax(node, scope, filename, rowType) {
-        for (const s of node.findDirectExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename);
-        }
-        for (const s of node.findDirectExpressions(Expressions.ComponentChainSimple)) {
-            new component_chain_1.ComponentChain().runSyntax(rowType, s);
+        let targetType = undefined;
+        for (const c of node.getChildren()) {
+            if (c instanceof nodes_1.ExpressionNode) {
+                if (c.get() instanceof Expressions.ComponentChainSimple) {
+                    targetType = new component_chain_1.ComponentChain().runSyntax(rowType, c);
+                }
+                else if (c.get() instanceof Expressions.Dynamic) {
+                    targetType = undefined;
+                }
+                else if (c.get() instanceof Expressions.Source) {
+                    new source_1.Source().runSyntax(c, scope, filename, targetType);
+                }
+                else {
+                    throw "ComponentCompareSimple, unexpected node";
+                }
+            }
         }
     }
 }

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -63,6 +63,7 @@ Current rules:
 * Moving with +=, -=, /=, *=, &&= is expanded
 * line_exists and line_index is downported to READ TABLE
 * ENUMs, but does not nessesarily give the correct type and value
+* MESSAGE with non simple source
 
 Only one transformation is applied to a statement at a time, so multiple steps might be required to do the full downport.`,
             tags: [_irule_1.RuleTag.Experimental, _irule_1.RuleTag.Downport, _irule_1.RuleTag.Quickfix],
@@ -285,6 +286,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.downportMessage(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         return undefined;
     }
     //////////////////////////////////////////
@@ -456,6 +461,30 @@ ${indentation}`);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, inlineData.getFirstToken(), "Outline SELECT @DATA", this.getMetadata().key, this.conf.severity, fix);
     }
+    downportMessage(high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.Message)) {
+            return undefined;
+        }
+        const foundWith = high.findExpressionAfterToken("WITH");
+        if (foundWith === undefined) {
+            return undefined;
+        }
+        const likeSource = high.findExpressionAfterToken("LIKE");
+        for (const s of high.findAllExpressions(Expressions.Source)) {
+            if (s === likeSource) {
+                continue;
+            }
+            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            const firstToken = high.getFirstToken();
+            const code = `DATA(${uniqueName}) = ${s.concatTokens()}.\n${indentation}`;
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), code);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, s.getFirstToken().getStart(), s.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Refactor MESSAGE WITH source", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
     replaceAppendExpression(high, lowFile, highSyntax) {
         if (!(high.get() instanceof Statements.Append)) {
             return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.89.6",
+    "version": "2.89.7",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -47,7 +47,7 @@
     "devDependencies": {
         "@microsoft/api-extractor": "^7.22.2",
         "@types/chai": "^4.3.1",
-        "@types/mocha": "^9.1.0",
+        "@types/mocha": "^9.1.1",
         "@types/node": "^17.0.25",
         "chai": "^4.3.6",
         "eslint": "^8.13.0",