@abaplint/core 2.93.14 → 2.93.16

package/build/src/abap/2_statements/statement_parser.js

@@ -104,18 +104,21 @@ class StatementParser {
         const result = [];
         for (let statement of wa.statements) {
             // dont use CALL METHOD, when executing lazy, it easily gives a Move for the last statment if lazy logic is evaluated
-            if (statement.get() instanceof _statement_1.Unknown
-                && statement.concatTokens().toUpperCase().startsWith("CALL METHOD ") === false
-                && statement.concatTokens().toUpperCase().startsWith("CALL FUNCTION ") === false) {
-                for (const { first, second } of this.buildSplits(statement.getTokens())) {
-                    if (second.length === 1) {
-                        continue; // probably punctuation
-                    }
-                    const s = this.categorizeStatement(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(second)));
-                    if (!(s.get() instanceof _statement_1.Unknown)) {
-                        result.push(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(first)));
-                        statement = s;
-                        break;
+            if (statement.get() instanceof _statement_1.Unknown) {
+                const concat = statement.concatTokens().toUpperCase();
+                if (concat.startsWith("CALL METHOD ") === false
+                    && concat.startsWith("RAISE EXCEPTION TYPE ") === false
+                    && concat.startsWith("CALL FUNCTION ") === false) {
+                    for (const { first, second } of this.buildSplits(statement.getTokens())) {
+                        if (second.length === 1) {
+                            continue; // probably punctuation
+                        }
+                        const s = this.categorizeStatement(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(second)));
+                        if (!(s.get() instanceof _statement_1.Unknown)) {
+                            result.push(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(first)));
+                            statement = s;
+                            break;
+                        }
                     }
                 }
             }

package/build/src/registry.js

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

package/build/src/rules/change_if_to_case.js

@@ -9,6 +9,13 @@ const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
 class ChangeIfToCaseConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        /** skip specific names, case insensitive regular expression
+         * @uniqueItems true
+         */
+        this.skipNames = [];
+    }
 }
 exports.ChangeIfToCaseConf = ChangeIfToCaseConf;
 class ChangeIfToCase extends _abap_rule_1.ABAPRule {
@@ -113,6 +120,12 @@ ENDCASE.`,
         else {
             return false;
         }
+        for (const skip of this.getConfig().skipNames || []) {
+            const reg = new RegExp(skip, "i");
+            if (chain.match(reg)) {
+                return false;
+            }
+        }
         for (const t of tuples) {
             if (t.left !== chain && t.right !== chain) {
                 return false;

package/build/src/rules/downport.js

@@ -139,6 +139,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
                 const message = "Internal Error: Statement lengths does not match";
                 ret.push(Issue.atStatement(lowFile, lowStatements[0], message, this.getMetadata().key));
                 */
+                // hmm, add some way to disable lazyUnknown() in statement_parser.ts
                 continue;
             }
             for (let i = 0; i < lowStatements.length; i++) {
@@ -1317,7 +1318,7 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     outlineFor(forLoop, indentation, lowFile, highSyntax) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let body = "";
         let end = "";
         const loopSource = (_a = forLoop.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
@@ -1357,8 +1358,12 @@ ${indentation}    output = ${topTarget}.`;
             end += indentation + "ENDWHILE";
         }
         else if (loopTargetField !== undefined) {
+            let from = (_h = forLoop.findExpressionAfterToken("FROM")) === null || _h === void 0 ? void 0 : _h.concatTokens();
+            from = from ? " FROM " + from : "";
+            let to = (_j = forLoop.findExpressionAfterToken("TO")) === null || _j === void 0 ? void 0 : _j.concatTokens();
+            to = to ? " TO " + to : "";
             // todo, also backup sy-index / sy-tabix here?
-            body += indentation + `LOOP AT ${loopSource} INTO DATA(${loopTargetField})${cond}.\n`;
+            body += indentation + `LOOP AT ${loopSource} INTO DATA(${loopTargetField})${from}${to}${cond}.\n`;
             if (indexInto) {
                 body += indentation + "  DATA(" + indexInto + ") = sy-tabix.\n";
             }
@@ -1366,7 +1371,7 @@ ${indentation}    output = ${topTarget}.`;
         }
         else if (loopTargetField === undefined) {
             // todo, also backup sy-index / sy-tabix here?
-            const loopTargetFieldSymbol = (_h = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _h === void 0 ? void 0 : _h.concatTokens();
+            const loopTargetFieldSymbol = (_k = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _k === void 0 ? void 0 : _k.concatTokens();
             body += indentation + `LOOP AT ${loopSource} ASSIGNING FIELD-SYMBOL(${loopTargetFieldSymbol})${cond}.\n`;
             if (indexInto) {
                 body += indentation + "  DATA(" + indexInto + ") = sy-tabix.\n";

package/build/src/rules/line_length.js

@@ -38,20 +38,18 @@ https://docs.abapopenchecks.org/checks/04/`,
         const issues = [];
         // maximum line length in abap files
         const maxLineLength = 255;
-        file.getRawRows().forEach((row, rowIndex) => {
-            row = row.replace("\r", "");
-            let message = "";
+        const array = file.getRawRows();
+        for (let rowIndex = 0; rowIndex < array.length; rowIndex++) {
+            const row = array[rowIndex].replace("\r", "");
             if (row.length > maxLineLength) {
-                message = `Maximum allowed line length of ${maxLineLength} exceeded, currently  ${row.length}`;
+                const message = `Maximum allowed line length of ${maxLineLength} exceeded, currently  ${row.length}`;
+                issues.push(issue_1.Issue.atRow(file, rowIndex + 1, message, this.getMetadata().key, this.conf.severity));
             }
             else if (row.length > this.conf.length) {
-                message = `Reduce line length to max ${this.conf.length}, currently ${row.length}`;
+                const message = `Reduce line length to max ${this.conf.length}, currently ${row.length}`;
+                issues.push(issue_1.Issue.atRow(file, rowIndex + 1, message, this.getMetadata().key, this.conf.severity));
             }
-            else {
-                return;
-            }
-            issues.push(issue_1.Issue.atRow(file, rowIndex + 1, message, this.getMetadata().key, this.conf.severity));
-        });
+        }
         return issues;
     }
 }

package/build/src/rules/prefer_inline.js

@@ -29,7 +29,7 @@ Activates if language version is v740sp02 or above.
 
 Variables must be local(METHOD or FORM).
 
-No generic or void typed variables.
+No generic or void typed variables. No syntax errors.
 
 First position used must be a full/pure write.
 
@@ -65,7 +65,11 @@ DATA(percentage) = CONV decfloat34( comment_number / abs_statement_number ) * 10
         else if (!(obj instanceof _abap_object_1.ABAPObject)) {
             return [];
         }
-        const scopes = this.findScopeCandidates(new syntax_1.SyntaxLogic(this.reg, obj).run().spaghetti.getTop());
+        const run = new syntax_1.SyntaxLogic(this.reg, obj).run();
+        if (run.issues.length > 0) {
+            return [];
+        }
+        const scopes = this.findScopeCandidates(run.spaghetti.getTop());
         const ret = [];
         for (const s of scopes) {
             ret.push(...this.analyzeScope(s, obj));

package/build/src/rules/prefix_is_current_class.js

@@ -30,7 +30,7 @@ class PrefixIsCurrentClass extends _abap_rule_1.ABAPRule {
             title: "Prefix is current class",
             shortDescription: `Reports errors if the current class or interface references itself with "current_class=>"`,
             // eslint-disable-next-line max-len
-            extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#omit-the-self-reference-me-when-calling-an-instance-method`,
+            extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#omit-the-self-reference-me-when-calling-an-instance-attribute-or-method`,
             tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.Quickfix, _irule_1.RuleTag.SingleFile],
         };
     }

package/build/src/rules/sicf_consistency.js

@@ -8,7 +8,9 @@ const position_1 = require("../position");
 class SICFConsistencyConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
-        /** skip specific names, case insensitive */
+        /** skip specific names, case insensitive
+         * @uniqueItems true
+         */
         this.skipNames = [];
     }
 }

package/build/src/rules/unused_types.js

@@ -39,7 +39,9 @@ class WorkArea {
 class UnusedTypesConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
-        /** skip specific names, case insensitive */
+        /** skip specific names, case insensitive
+         * @uniqueItems true
+         */
         this.skipNames = [];
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.14",
+    "version": "2.93.16",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -46,10 +46,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.31.0",
+        "@microsoft/api-extractor": "^7.31.1",
         "@types/chai": "^4.3.3",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^18.7.17",
+        "@types/node": "^18.7.18",
         "chai": "^4.3.6",
         "eslint": "^8.23.1",
         "mocha": "^10.0.0",
@@ -59,7 +59,7 @@
         "typescript": "^4.8.3"
     },
     "dependencies": {
-        "fast-xml-parser": "^4.0.9",
+        "fast-xml-parser": "^4.0.10",
         "json5": "^2.2.1",
         "vscode-languageserver-types": "^3.17.2"
     }