@abaplint/core 2.85.33 → 2.85.36

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -214,6 +214,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.outlineCatchSimple(high, lowFile);
+        if (found) {
+            return found;
+        }
         found = this.outlineDataSimple(high, lowFile);
         if (found) {
             return found;
@@ -238,7 +242,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;
@@ -254,8 +257,8 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
-        // todo: select loop
         if (!(high.get() instanceof Statements.Select)
+            && !(high.get() instanceof Statements.SelectLoop)
             && !(high.get() instanceof Statements.UpdateDatabase)
             && !(high.get() instanceof Statements.ModifyDatabase)
             && !(high.get() instanceof Statements.DeleteDatabase)
@@ -280,7 +283,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
                 addFix(c.getFirstToken());
             }
         }
-        for (const fieldList of high.findAllExpressionsRecursive(Expressions.SQLFieldList)) {
+        for (const fieldList of high.findAllExpressionsMulti([Expressions.SQLFieldList, Expressions.SQLFieldListLoop], true)) {
             for (const token of fieldList.getDirectTokens()) {
                 if (token.getStr() === ",") {
                     addFix(token);
@@ -446,6 +449,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()) {
@@ -488,6 +496,28 @@ ${indentation}`);
         }
         return undefined;
     }
+    outlineCatchSimple(node, lowFile) {
+        // outlines "CATCH cx_bcs INTO DATA(lx_bcs_excep).", note that this does not need to look at types
+        var _a, _b;
+        if (!(node.get() instanceof Statements.Catch)) {
+            return undefined;
+        }
+        const target = node.findFirstExpression(Expressions.Target);
+        if (!(((_a = target === null || target === void 0 ? void 0 : target.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.InlineData)) {
+            return undefined;
+        }
+        const classNames = node.findDirectExpressions(Expressions.ClassName);
+        if (classNames.length !== 1) {
+            return undefined;
+        }
+        const className = classNames[0].concatTokens();
+        const targetName = (_b = target.findFirstExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+        const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+        const code = `  DATA ${targetName} TYPE REF TO ${className}.
+${indentation}CATCH ${className} INTO ${targetName}.`;
+        const fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getStart(), node.getEnd(), code);
+        return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline DATA", this.getMetadata().key, this.conf.severity, fix);
+    }
     outlineDataSimple(node, lowFile) {
         // outlines "DATA(ls_msg) = temp1.", note that this does not need to look at types
         var _a, _b, _c;
@@ -945,17 +975,26 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     outlineValue(node, lowFile, highSyntax) {
+        var _a;
         const allSources = node.findAllExpressionsRecursive(Expressions.Source);
-        for (const i of allSources) {
-            const firstToken = i.getFirstToken();
+        for (const s of allSources) {
+            const firstToken = s.getFirstToken();
             if (firstToken.getStr().toUpperCase() !== "VALUE") {
                 continue;
             }
-            const type = this.findType(i, lowFile, highSyntax);
+            let type = this.findType(s, lowFile, highSyntax);
             if (type === undefined) {
-                continue;
+                if (node.get() instanceof Statements.Move && node.findDirectExpression(Expressions.Source) === s) {
+                    type = "LIKE " + ((_a = node.findDirectExpression(Expressions.Target)) === null || _a === void 0 ? void 0 : _a.concatTokens());
+                }
+                if (type === undefined) {
+                    continue;
+                }
             }
-            const valueBody = i.findDirectExpression(Expressions.ValueBody);
+            else {
+                type = "TYPE " + type;
+            }
+            const valueBody = s.findDirectExpression(Expressions.ValueBody);
             const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
             let indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
             let body = "";
@@ -995,11 +1034,11 @@ ${indentation}    output = ${topTarget}.`;
                 indentation = indentation.substring(2);
                 body += indentation + outlineFor.end + `.\n`;
             }
-            const abap = `DATA ${uniqueName} TYPE ${type}.\n` +
+            const abap = `DATA ${uniqueName} ${type}.\n` +
                 body +
                 indentation;
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
-            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, firstToken.getStart(), i.getLastToken().getEnd(), uniqueName);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, firstToken.getStart(), s.getLastToken().getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, firstToken, "Downport VALUE", this.getMetadata().key, this.conf.severity, fix);
         }
@@ -1271,9 +1310,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.85.33",
+    "version": "2.85.36",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",