@abaplint/core 2.90.1 → 2.90.4

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

@@ -6,7 +6,7 @@ const version_1 = require("../../../version");
 const expressions_1 = require("../expressions");
 class InsertInternal {
     getMatcher() {
-        const target = (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic);
+        const target = (0, combi_1.altPrio)(expressions_1.Source, expressions_1.Dynamic);
         const assigning = (0, combi_1.seq)("ASSIGNING", expressions_1.FSTarget);
         const ref = (0, combi_1.seq)("REFERENCE INTO", expressions_1.Target);
         const index = (0, combi_1.seq)("INDEX", expressions_1.Source);
@@ -14,10 +14,10 @@ class InsertInternal {
         const into = (0, combi_1.seq)("INTO", (0, combi_1.opt)("TABLE"), expressions_1.Target);
         const to = (0, combi_1.seq)("TO", expressions_1.Source);
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
-        const fromTo = (0, combi_1.seq)((0, combi_1.opt)(from), (0, combi_1.opt)(to));
+        const fromTo = (0, combi_1.seq)((0, combi_1.optPrio)(from), (0, combi_1.optPrio)(to));
         const foo = (0, combi_1.per)(into, ref, index, assigning);
         const lines = (0, combi_1.seq)("LINES OF", target, (0, combi_1.opt)(fromTo));
-        const src = (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source), expressions_1.SimpleSource4);
+        const src = (0, combi_1.alt)(expressions_1.SimpleSource4, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source));
         const tab = (0, combi_1.seq)("TABLE", expressions_1.Source);
         const ret = (0, combi_1.seq)("INSERT", (0, combi_1.altPrio)(tab, (0, combi_1.seq)((0, combi_1.altPrio)(initial, lines, src), foo)));
         return ret;

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

@@ -18,7 +18,7 @@ class InsertInternal {
         }
         const afterAssigning = node.findExpressionAfterToken("ASSIGNING");
         if ((afterAssigning === null || afterAssigning === void 0 ? void 0 : afterAssigning.get()) instanceof Expressions.FSTarget) {
-            let source = node.findDirectExpression(Expressions.SimpleSource2);
+            let source = node.findDirectExpression(Expressions.SimpleSource4);
             if (source === undefined) {
                 source = node.findDirectExpression(Expressions.Source);
             }
@@ -34,7 +34,7 @@ class InsertInternal {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename, targetType);
         }
-        for (const s of node.findDirectExpressions(Expressions.SimpleSource1)) {
+        for (const s of node.findDirectExpressions(Expressions.SimpleSource4)) {
             new source_1.Source().runSyntax(s, scope, filename, targetType);
         }
     }

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -49,6 +49,7 @@ Current rules:
 * REDUCE is outlined
 * SWITCH is outlined
 * APPEND expression is outlined
+* INSERT expression is outlined
 * EMPTY KEY is changed to DEFAULT KEY, opposite of DEFAULT KEY in https://rules.abaplint.org/avoid_use/
 * CAST changed to ?=
 * LOOP AT method_call( ) is outlined
@@ -286,6 +287,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.replaceInsertExpression(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.downportMessage(high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -507,6 +512,28 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
         }
         return undefined;
     }
+    replaceInsertExpression(high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.InsertInternal)) {
+            return undefined;
+        }
+        const children = high.getChildren();
+        if (children[1].get() instanceof Expressions.Source) {
+            const source = children[1];
+            const target = high.findDirectExpression(Expressions.Target);
+            if (target === undefined) {
+                return undefined;
+            }
+            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            const firstToken = high.getFirstToken();
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${uniqueName} LIKE LINE OF ${target === null || target === void 0 ? void 0 : target.concatTokens()}.
+${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, source.getFirstToken().getStart(), source.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Outline INSERT source expression", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
     replaceTableExpression(node, lowFile, highSyntax) {
         for (const fieldChain of node.findAllExpressionsRecursive(Expressions.FieldChain)) {
             const tableExpression = fieldChain.findDirectExpression(Expressions.TableExpression);
@@ -1224,12 +1251,14 @@ ${indentation}    output = ${topTarget}.`;
                 body += indentation + uniqueName + " = " + base.concatTokens() + ".\n";
             }
             let end = "";
-            for (const forLoop of (valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectExpressions(Expressions.For)) || []) {
-                const outlineFor = this.outlineFor(forLoop, indentation, lowFile, highSyntax);
-                body += outlineFor.body;
-                end = outlineFor.end + `.\n` + end;
-                indentation += "  ";
-            }
+            /*
+                  for (const forLoop of valueBody?.findDirectExpressions(Expressions.For) || []) {
+                    const outlineFor = this.outlineFor(forLoop, indentation, lowFile, highSyntax);
+                    body += outlineFor.body;
+                    end = outlineFor.end + `.\n` + end;
+                    indentation += "  ";
+                  }
+            */
             let structureName = uniqueName;
             let added = false;
             let skip = false;
@@ -1247,6 +1276,12 @@ ${indentation}    output = ${topTarget}.`;
                     }
                     body += indentation + structureName + "-" + b.concatTokens() + ".\n";
                 }
+                else if (b instanceof nodes_1.ExpressionNode && b.get() instanceof Expressions.For) {
+                    const outlineFor = this.outlineFor(b, indentation, lowFile, highSyntax);
+                    body += outlineFor.body;
+                    end = outlineFor.end + `.\n` + end;
+                    indentation += "  ";
+                }
                 else if (b.get() instanceof Expressions.Source) {
                     structureName = b.concatTokens();
                     if (base && (valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectTokenByText("(")) === undefined) {
@@ -1302,6 +1337,10 @@ ${indentation}    output = ${topTarget}.`;
             }
             const found = spag.findVariable(name);
             if (found === undefined) {
+                const source = f.findFirstExpression(Expressions.Source);
+                if (source) {
+                    ret += indentation + "DATA(" + name + `) = ${source.concatTokens()}.\n`;
+                }
                 continue;
             }
             const type = found.getType().getQualifiedName() ? (_a = found.getType().getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toLowerCase() : found.getType().toABAP();

package/build/src/rules/function_module_recommendations.js

@@ -12,28 +12,29 @@ class FunctionModuleRecommendationsConf extends _basic_rule_config_1.BasicRuleCo
         /** Tuple of Function Module Name to be replaced, the recommended alternative and
          * the version from which the recommendation is valid.*/
         this.recommendations = [
-            { name: "SUBST_GET_FILE_LIST", replace: "see note 1686357" },
-            { name: "ROUND", replace: "use built in function: round()" },
-            { name: "SO_NEW_DOCUMENT_ATT_SEND_API1", replace: "use CL_BCS" },
+            { name: "CALCULATE_HASH_FOR_RAW", replace: "use CL_ABAP_HMAC" },
             { name: "ECATT_CONV_XSTRING_TO_STRING", replace: "use CL_BINARY_CONVERT" },
-            { name: "SCMS_STRING_TO_XSTRING", replace: "use CL_BINARY_CONVERT" },
-            { name: "JOB_CREATE", replace: "use CL_BP_ABAP_JOB" },
-            { name: "JOB_SUBMIT", replace: "use CL_BP_ABAP_JOB" },
+            { name: "F4_FILENAME", replace: "use CL_GUI_FRONTEND_SERVICES" },
+            { name: "FUNCTION_EXISTS", replace: "surround with try-catch CX_SY_DYN_CALL_ILLEGAL_METHOD instead" },
             { name: "GUI_DOWNLOAD", replace: "use CL_GUI_FRONTEND_SERVICES" },
             { name: "GUI_UPLOAD", replace: "use CL_GUI_FRONTEND_SERVICES" },
-            { name: "WS_FILENAME_GET", replace: "use CL_GUI_FRONTEND_SERVICES" },
-            { name: "F4_FILENAME", replace: "use CL_GUI_FRONTEND_SERVICES" },
-            { name: "SAPGUI_PROGRESS_INDICATOR", replace: "use CL_PROGRESS_INDICATOR" },
             { name: "GUID_CREATE", replace: "use CL_SYSTEM_UUID" },
-            { name: "SSFC_BASE64_DECODE", replace: "use class CL_HTTP_UTILITY methods" },
-            { name: "SSFC_BASE64_ENCODE", replace: "use class CL_HTTP_UTILITY methods" },
-            { name: "SCMS_BASE64_DECODE_STR", replace: "use class CL_HTTP_UTILITY methods" },
-            { name: "POPUP_TO_DECIDE", replace: "use POPUP_TO_CONFIRM" },
-            { name: "REUSE_ALV_GRID_DISPLAY", replace: "use CL_SALV_TABLE=>FACTORY or CL_GUI_ALV_GRID" },
-            { name: "CALCULATE_HASH_FOR_RAW", replace: "use CL_ABAP_HMAC" },
-            { name: "FUNCTION_EXISTS", replace: "surround with try-catch CX_SY_DYN_CALL_ILLEGAL_METHOD instead" },
             { name: "IGN_TIMESTAMP_DIFFERENCE", replace: "use CL_ABAP_TSTMP" },
             { name: "IGN_TIMESTAMP_PLUSMINUS", replace: "use CL_ABAP_TSTMP" },
+            { name: "JOB_CREATE", replace: "use CL_BP_ABAP_JOB" },
+            { name: "JOB_SUBMIT", replace: "use CL_BP_ABAP_JOB" },
+            { name: "POPUP_TO_DECIDE", replace: "use POPUP_TO_CONFIRM" },
+            { name: "POPUP_TO_GET_VALUE", replace: "use POPUP_GET_VALUES" },
+            { name: "REUSE_ALV_GRID_DISPLAY", replace: "use CL_SALV_TABLE=>FACTORY or CL_GUI_ALV_GRID" },
+            { name: "ROUND", replace: "use built in function: round()" },
+            { name: "SAPGUI_PROGRESS_INDICATOR", replace: "use CL_PROGRESS_INDICATOR" },
+            { name: "SCMS_BASE64_DECODE_STR", replace: "use class CL_HTTP_UTILITY methods" },
+            { name: "SCMS_STRING_TO_XSTRING", replace: "use CL_BINARY_CONVERT" },
+            { name: "SO_NEW_DOCUMENT_ATT_SEND_API1", replace: "use CL_BCS" },
+            { name: "SSFC_BASE64_DECODE", replace: "use class CL_HTTP_UTILITY methods" },
+            { name: "SSFC_BASE64_ENCODE", replace: "use class CL_HTTP_UTILITY methods" },
+            { name: "SUBST_GET_FILE_LIST", replace: "see note 1686357" },
+            { name: "WS_FILENAME_GET", replace: "use CL_GUI_FRONTEND_SERVICES" },
         ];
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.90.1",
+    "version": "2.90.4",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,10 +45,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.23.1",
+        "@microsoft/api-extractor": "^7.23.2",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^17.0.31",
+        "@types/node": "^17.0.32",
         "chai": "^4.3.6",
         "eslint": "^8.15.0",
         "mocha": "^10.0.0",
@@ -60,7 +60,7 @@
     "dependencies": {
         "fast-xml-parser": "^4.0.7",
         "json5": "^2.2.1",
-        "vscode-languageserver-protocol": "^3.16.0",
-        "vscode-languageserver-types": "^3.16.0"
+        "vscode-languageserver-protocol": "=3.16.0",
+        "vscode-languageserver-types": "=3.16.0"
     }
 }