@abaplint/core 2.85.43 → 2.85.46

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

@@ -7,6 +7,33 @@ class TypeUtils {
     constructor(scope) {
         this.scope = scope;
     }
+    isCharLikeStrict(type) {
+        if (type === undefined) {
+            return false;
+        }
+        else if (type instanceof basic_1.StructureType) {
+            for (const c of type.getComponents()) {
+                if (this.isCharLikeStrict(c.type) === false) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        else if (type instanceof basic_1.StringType
+            || type instanceof basic_1.AnyType
+            || type instanceof basic_1.CharacterType
+            || type instanceof basic_1.CLikeType
+            || type instanceof basic_1.DateType
+            || type instanceof basic_1.CSequenceType
+            || type instanceof basic_1.NumericGenericType
+            || type instanceof basic_1.NumericType
+            || type instanceof basic_1.TimeType
+            || type instanceof basic_1.UnknownType
+            || type instanceof basic_1.VoidType) {
+            return true;
+        }
+        return false;
+    }
     isCharLike(type) {
         if (type === undefined) {
             return false;

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

@@ -6,16 +6,31 @@ const basic_1 = require("../../types/basic");
 const inline_data_1 = require("../expressions/inline_data");
 const source_1 = require("../expressions/source");
 const target_1 = require("../expressions/target");
+const _type_utils_1 = require("../_type_utils");
 class Split {
     runSyntax(node, scope, filename) {
-        const type = node.findTokenSequencePosition("INTO", "TABLE") ? new basic_1.TableType(new basic_1.StringType(), { withHeader: false }) : new basic_1.StringType();
+        const intoTable = node.findTokenSequencePosition("INTO", "TABLE") !== undefined;
+        const type = intoTable ? new basic_1.TableType(new basic_1.StringType(), { withHeader: false }) : new basic_1.StringType();
         for (const target of node.findAllExpressions(Expressions.Target)) {
             const inline = target.findDirectExpression(Expressions.InlineData);
             if (inline) {
                 new inline_data_1.InlineData().runSyntax(inline, scope, filename, type);
             }
             else {
-                new target_1.Target().runSyntax(target, scope, filename);
+                let targetType = new target_1.Target().runSyntax(target, scope, filename);
+                if (intoTable) {
+                    if (!(targetType instanceof basic_1.TableType)
+                        && !(targetType instanceof basic_1.UnknownType)
+                        && !(targetType instanceof basic_1.VoidType)) {
+                        throw new Error("Into must be table typed");
+                    }
+                    if (targetType instanceof basic_1.TableType) {
+                        targetType = targetType.getRowType();
+                    }
+                }
+                if (new _type_utils_1.TypeUtils(scope).isCharLikeStrict(targetType) === false) {
+                    throw new Error("Incompatible, target not character like");
+                }
             }
         }
         for (const s of node.findDirectExpressions(Expressions.Source)) {

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -191,6 +191,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.moveWithTableTarget(low, high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.downportSelectInline(low, high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -259,6 +263,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.replaceContains(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.replaceTableExpression(high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -704,6 +712,37 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, Reduce statement", this.getMetadata().key, this.conf.severity, fix);
     }
+    moveWithTableTarget(node, high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.Move)) {
+            return undefined;
+        }
+        const target = high.findDirectExpression(Expressions.Target);
+        if (target === undefined) {
+            return undefined;
+        }
+        const tableExpression = target.findDirectExpression(Expressions.TableExpression);
+        if (tableExpression === undefined) {
+            return undefined;
+        }
+        const index = tableExpression.findDirectExpression(Expressions.Source);
+        if (index === undefined) {
+            return undefined;
+        }
+        let uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        uniqueName = `<${uniqueName}>`;
+        const tName = target.concatTokens().split("[")[0];
+        const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+        const code = `FIELD-SYMBOLS ${uniqueName} LIKE LINE OF ${tName}.
+${indentation}READ TABLE ${tName} INDEX ${index === null || index === void 0 ? void 0 : index.concatTokens()} ASSIGNING <temp1>.
+${indentation}IF sy-subrc <> 0.
+${indentation}  RAISE EXCEPTION TYPE cx_sy_itab_line_not_found.
+${indentation}ENDIF.
+    ${uniqueName}`;
+        const start = target.getFirstToken().getStart();
+        const end = target.getLastToken().getEnd();
+        const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, Reduce statement", this.getMetadata().key, this.conf.severity, fix);
+    }
     moveWithOperator(high, lowFile) {
         var _a, _b, _c;
         if (!(high.get() instanceof Statements.Move)) {
@@ -1034,6 +1073,7 @@ ${indentation}    output = ${topTarget}.`;
             let structureName = uniqueName;
             let added = false;
             let data = "";
+            let previous = undefined;
             for (const b of (valueBody === null || valueBody === void 0 ? void 0 : valueBody.getChildren()) || []) {
                 if (b.concatTokens() === "(" && added === false) {
                     structureName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
@@ -1053,8 +1093,13 @@ ${indentation}    output = ${topTarget}.`;
                     body += this.outlineLet(b, indentation, highSyntax, lowFile);
                 }
                 else if (b.concatTokens() === ")") {
+                    if (added === false && (previous === null || previous === void 0 ? void 0 : previous.concatTokens()) === "(") {
+                        body += data;
+                        added = true;
+                    }
                     body += indentation + `APPEND ${structureName} TO ${uniqueName}.\n`;
                 }
+                previous = b;
             }
             if (forLoop !== undefined) {
                 indentation = indentation.substring(2);
@@ -1332,6 +1377,43 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
+    replaceContains(node, lowFile, highSyntax) {
+        const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
+        // only downport if its an single method call condition
+        let found = false;
+        for (const c of node.findAllExpressionsRecursive(Expressions.Compare)) {
+            found = c.findDirectExpression(Expressions.MethodCallChain) !== undefined;
+            if (found === true) {
+                break;
+            }
+        }
+        if (found === false) {
+            return undefined;
+        }
+        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 (func === "CONTAINS") {
+                const token = r.position.getToken();
+                const expression = this.findMethodCallExpression(node, token);
+                if (expression === undefined) {
+                    continue;
+                }
+                const sList = expression.findAllExpressions(Expressions.Source).map(e => e.concatTokens());
+                if (sList.length !== 2) {
+                    continue;
+                }
+                const code = sList[0] + " CS " + sList[1];
+                const start = expression.getFirstToken().getStart();
+                const end = expression.getLastToken().getEnd();
+                const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
+                return issue_1.Issue.atToken(lowFile, token, "Downport contains()", this.getMetadata().key, this.conf.severity, fix);
+            }
+        }
+        return undefined;
+    }
     replaceLineFunctions(node, lowFile, highSyntax) {
         var _a, _b;
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());

package/build/src/rules/method_overwrites_builtin.js

@@ -19,8 +19,10 @@ class MethodOverwritesBuiltIn extends _abap_rule_1.ABAPRule {
             key: "method_overwrites_builtin",
             title: "Method name overwrites builtin function",
             shortDescription: `Checks Method names that overwrite builtin SAP functions`,
-            extendedInformation: `https://help.sap.com/doc/abapdocu_752_index_htm/7.52/en-us/abenbuilt_in_functions_overview.htm`,
-            tags: [_irule_1.RuleTag.Naming, _irule_1.RuleTag.SingleFile],
+            extendedInformation: `https://help.sap.com/doc/abapdocu_752_index_htm/7.52/en-us/abenbuilt_in_functions_overview.htm
+
+https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#avoid-obscuring-built-in-functions`,
+            tags: [_irule_1.RuleTag.Naming, _irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Styleguide],
         };
     }
     getConfig() {

package/build/src/rules/pragma_placement.js

@@ -19,6 +19,7 @@ class PragmaPlacement extends _abap_rule_1.ABAPRule {
             title: "Pragma Placement",
             shortDescription: `Place pragmas at end of statements`,
             tags: [_irule_1.RuleTag.SingleFile],
+            extendedInformation: `https://help.sap.com/doc/abapdocu_cp_index_htm/CLOUD/en-US/abenpragma.htm`,
             badExample: `DATA field ##NO_TEXT TYPE i.`,
             goodExample: `DATA field TYPE i ##NO_TEXT.`,
         };
@@ -42,7 +43,7 @@ class PragmaPlacement extends _abap_rule_1.ABAPRule {
                 }
                 if (children[children.length - 2].getLastToken().getStart().isAfter(p.getStart())) {
                     const message = "Place pragma at end of statement";
-                    const issue = issue_1.Issue.atStatement(file, s, message, this.getMetadata().key, this.conf.severity);
+                    const issue = issue_1.Issue.atToken(file, p, message, this.getMetadata().key, this.conf.severity);
                     issues.push(issue);
                     continue; // max one finding per statement
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.85.43",
+    "version": "2.85.46",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,21 +45,21 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.19.4",
+        "@microsoft/api-extractor": "^7.19.5",
         "@types/chai": "^4.3.0",
         "@types/mocha": "^9.1.0",
-        "@types/node": "^17.0.21",
+        "@types/node": "^17.0.22",
         "chai": "^4.3.6",
-        "eslint": "^8.10.0",
-        "mocha": "^9.2.1",
+        "eslint": "^8.11.0",
+        "mocha": "^9.2.2",
         "c8": "^7.11.0",
         "source-map-support": "^0.5.21",
-        "ts-json-schema-generator": "^0.98.0",
+        "ts-json-schema-generator": "^1.0.0",
         "typescript": "^4.6.2"
     },
     "dependencies": {
-        "fast-xml-parser": "^4.0.6",
-        "json5": "^2.2.0",
+        "fast-xml-parser": "^4.0.7",
+        "json5": "^2.2.1",
         "vscode-languageserver-protocol": "^3.16.0",
         "vscode-languageserver-types": "^3.16.0"
     }