@abaplint/core 2.79.21 → 2.79.22

package/build/src/abap/5_syntax/basic_types.js

@@ -14,6 +14,8 @@ const basic_1 = require("../types/basic");
 const field_chain_1 = require("./expressions/field_chain");
 const types_1 = require("../types");
 const expressions_1 = require("../2_statements/expressions");
+const _builtin_1 = require("./_builtin");
+const position_1 = require("../../position");
 class BasicTypes {
     constructor(filename, scope) {
         this.filename = filename;
@@ -45,6 +47,10 @@ class BasicTypes {
         if (id && (lookup === null || lookup === void 0 ? void 0 : lookup.type)) {
             return new _typed_identifier_1.TypedIdentifier(id.getToken(), id.getFilename(), lookup.type);
         }
+        const builtin = this.scope.getDDIC().lookupBuiltinType(name);
+        if (builtin) {
+            return new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(new position_1.Position(1, 1), name), _builtin_1.BuiltIn.filename, builtin);
+        }
         return undefined;
     }
     resolveLikeName(node, headerLogic = true) {

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -5,6 +5,7 @@ const _basic_rule_config_1 = require("./_basic_rule_config");
 const issue_1 = require("../issue");
 const _irule_1 = require("./_irule");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
+const nodes_1 = require("../abap/nodes");
 const Statements = require("../abap/2_statements/statements");
 const Expressions = require("../abap/2_statements/expressions");
 const edit_helper_1 = require("../edit_helper");
@@ -39,6 +40,7 @@ Current rules:
 * DATA() definitions are outlined, opposite of https://rules.abaplint.org/prefer_inline/
 * FIELD-SYMBOL() definitions are outlined
 * CONV is outlined
+* COND 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
@@ -175,6 +177,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.outlineCond(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.outlineDataSimple(high, lowFile);
         if (found) {
             return found;
@@ -424,7 +430,7 @@ ${indentation}`);
             }
             i = key;
             const concat = i.concatTokens();
-            if (concat.includes("WITH EMPTY KEY") === false) {
+            if (concat.toUpperCase().includes("WITH EMPTY KEY") === false) {
                 continue;
             }
             const token = i.findDirectTokenByText("EMPTY");
@@ -669,6 +675,59 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
+    outlineCond(node, lowFile, highSyntax) {
+        for (const i of node.findAllExpressionsRecursive(Expressions.Source)) {
+            if (i.getFirstToken().getStr().toUpperCase() !== "COND") {
+                continue;
+            }
+            const body = i.findDirectExpression(Expressions.CondBody);
+            if (body === undefined) {
+                continue;
+            }
+            const uniqueName = this.uniqueName(i.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            const type = this.findType(i, lowFile, highSyntax);
+            const indent = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+            const bodyCode = this.buildCondBody(body, uniqueName, indent);
+            const abap = `DATA ${uniqueName} TYPE ${type}.\n` + bodyCode;
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), i.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, i.getFirstToken(), "Downport COND", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
+    buildCondBody(body, uniqueName, indent) {
+        let code = indent;
+        for (const c of body.getChildren()) {
+            if (c instanceof nodes_1.TokenNode) {
+                switch (c.getFirstToken().getStr().toUpperCase()) {
+                    case "WHEN":
+                        code += "IF ";
+                        break;
+                    case "THEN":
+                        code += ".\n";
+                        break;
+                    case "ELSE":
+                        code += indent + "ELSE.\n";
+                        break;
+                    default:
+                        throw "buildCondBody, unexpected token";
+                }
+            }
+            else if (c.get() instanceof Expressions.Cond) {
+                code += c.concatTokens();
+            }
+            else if (c.get() instanceof Expressions.Source) {
+                code += indent + "  " + uniqueName + " = " + c.concatTokens() + ".\n";
+            }
+            else {
+                throw "buildCondBody, unexpected expression";
+            }
+        }
+        code += indent + "ENDIF.\n";
+        code += indent;
+        return code;
+    }
     outlineConv(node, lowFile, highSyntax) {
         var _a;
         for (const i of node.findAllExpressionsRecursive(Expressions.Source)) {
@@ -681,10 +740,10 @@ ${indentation}    output = ${topTarget}.`;
             }
             const uniqueName = this.uniqueName(i.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const type = this.findType(i, lowFile, highSyntax);
+            const indent = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
             const abap = `DATA ${uniqueName} TYPE ${type}.\n` +
-                " ".repeat(node.getFirstToken().getStart().getCol() - 1) +
-                `${uniqueName} = ${body}.\n` +
-                " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+                indent + `${uniqueName} = ${body}.\n` +
+                indent;
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), i.getLastToken().getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);

package/package.json

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