@abaplint/cli 2.105.16 → 2.105.18

package/build/cli.js

@@ -7196,7 +7196,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class RaiseWith extends combi_1.Expression {
     getRunnable() {
-        const wit = (0, combi_1.seq)("WITH", _1.Source, (0, combi_1.opt)(_1.Source), (0, combi_1.opt)(_1.Source), (0, combi_1.opt)(_1.Source));
+        const wit = (0, combi_1.seq)("WITH", _1.SimpleSource3, (0, combi_1.opt)(_1.SimpleSource3), (0, combi_1.opt)(_1.SimpleSource3), (0, combi_1.opt)(_1.SimpleSource3));
         return wit;
     }
 }
@@ -21373,11 +21373,11 @@ class CurrentScope {
         }
         this.addNamedIdentifier(identifier.getName(), identifier);
     }
-    addDeferred(token) {
+    addDeferred(token, type) {
         if (token === undefined) {
             return;
         }
-        this.current.getData().deferred[token.getStr().toUpperCase()] = token;
+        this.current.getData().deferred[token.getStr().toUpperCase()] = { token, ooType: type };
     }
     addListPrefix(identifiers, prefix) {
         for (const id of identifiers) {
@@ -21482,7 +21482,16 @@ class CurrentScope {
         }
         const def = (_c = this.current) === null || _c === void 0 ? void 0 : _c.findDeferred(name);
         if (def !== undefined) {
-            return { id: def };
+            let rttiName = prefixRTTI;
+            switch (def.ooType) {
+                case "INTF":
+                    rttiName = rttiName + "\\INTERFACE=" + name;
+                    break;
+                default:
+                    rttiName = rttiName + "\\CLASS=" + name;
+                    break;
+            }
+            return { id: def.id, ooType: def.ooType, RTTIName: rttiName };
         }
         return undefined;
     }
@@ -21512,6 +21521,11 @@ class CurrentScope {
         if (typePoolName.length <= 1 || typePoolName.length > 5) {
             return undefined;
         }
+        if (this.parentObj.getType() === "TYPE"
+            && this.parentObj.getName().toUpperCase() === typePoolName.toUpperCase()) {
+            // dont recurse into itself
+            return undefined;
+        }
         const typePool = this.reg.getObject("TYPE", typePoolName);
         if (typePool === undefined) {
             return undefined;
@@ -21529,6 +21543,11 @@ class CurrentScope {
         if (typePoolName.length <= 2 || typePoolName.length > 5) {
             return undefined;
         }
+        if (this.parentObj.getType() === "TYPE"
+            && this.parentObj.getName().toUpperCase() === typePoolName.toUpperCase()) {
+            // dont recurse into itself
+            return undefined;
+        }
         if (new ddic_1.DDIC(this.reg).lookupNoVoid(name) !== undefined) {
             // this is tricky, it should not do recursion when parsing the type pool itself,
             // think about DTEL ABAP_ENCOD vs TYPE ABAP
@@ -26283,7 +26302,7 @@ const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ ".
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 class RaiseWith {
     runSyntax(node, scope, filename) {
-        for (const f of node.findDirectExpressions(Expressions.Source)) {
+        for (const f of node.findDirectExpressions(Expressions.SimpleSource3)) {
             new source_1.Source().runSyntax(f, scope, filename);
         }
     }
@@ -26743,6 +26762,11 @@ class Source {
                         else {
                             this.addIfInferred(node, scope, filename, foundType);
                         }
+                        children.shift();
+                        children.shift();
+                        children.shift();
+                        children.shift();
+                        this.traverseRemainingChildren(children, scope, filename);
                         return foundType ? foundType : bodyType;
                     }
                 case "CONV":
@@ -26859,6 +26883,12 @@ class Source {
         return context;
     }
     ////////////////////////////////
+    traverseRemainingChildren(children, scope, filename) {
+        const last = children[children.length - 1];
+        if (last && last.get() instanceof Expressions.Source) {
+            new Source().runSyntax(last, scope, filename);
+        }
+    }
     infer(context, found) {
         if (context instanceof basic_1.FloatType && found instanceof basic_1.IntegerType) {
             return context;
@@ -27880,7 +27910,10 @@ class SpaghettiScopeNode extends ScopeData {
         while (search !== undefined) {
             const found = search.getData().deferred[name.toUpperCase()];
             if (found) {
-                return new _identifier_1.Identifier(found, search.identifier.filename);
+                return {
+                    id: new _identifier_1.Identifier(found.token, search.identifier.filename),
+                    ooType: found.ooType,
+                };
             }
             search = search.getParent();
         }
@@ -28781,7 +28814,7 @@ class ClassDeferred {
     runSyntax(node, scope, _filename) {
         var _a;
         const name = (_a = node.findFirstExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
-        scope.addDeferred(name);
+        scope.addDeferred(name, "CLAS");
     }
 }
 exports.ClassDeferred = ClassDeferred;
@@ -30591,7 +30624,7 @@ class InterfaceDeferred {
     runSyntax(node, scope, _filename) {
         var _a;
         const name = (_a = node.findFirstExpression(Expressions.InterfaceName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
-        scope.addDeferred(name);
+        scope.addDeferred(name, "INTF");
     }
 }
 exports.InterfaceDeferred = InterfaceDeferred;
@@ -30959,13 +30992,33 @@ const source_1 = __webpack_require__(/*! ../expressions/source */ "./node_module
 const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/target.js");
 const fstarget_1 = __webpack_require__(/*! ../expressions/fstarget */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/fstarget.js");
 const component_cond_1 = __webpack_require__(/*! ../expressions/component_cond */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_cond.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 class ModifyInternal {
     runSyntax(node, scope, filename) {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
-        for (const t of node.findDirectExpressions(Expressions.Target)) {
-            new target_1.Target().runSyntax(t, scope, filename);
+        // there is only one
+        const targetExpression = node.findFirstExpression(Expressions.Target);
+        if (targetExpression) {
+            // it might be a dynamic target
+            const targetType = new target_1.Target().runSyntax(targetExpression, scope, filename);
+            if (targetType instanceof basic_1.VoidType
+                || targetType instanceof basic_1.AnyType
+                || targetType instanceof basic_1.UnknownType) {
+                // ok
+            }
+            else if (targetType instanceof basic_1.TableType) {
+                if (node.findDirectTokenByText("TABLE")
+                    && node.findDirectTokenByText("INDEX")
+                    && targetType.isWithHeader() === false) {
+                    // MODIFY TABLE INDEX
+                    throw new Error("Table does not have header line");
+                }
+            }
+            else {
+                throw new Error("Not an internal table");
+            }
         }
         const target = node.findDirectExpression(Expressions.FSTarget);
         if (target) {
@@ -31203,6 +31256,9 @@ class Parameter {
         if (nameToken && nameToken.getStr().length > 8) {
             throw new Error("Parameter name too long, " + nameToken.getStr());
         }
+        if (node.findDirectTokenByText("RADIOBUTTON") && node.findDirectTokenByText("LENGTH")) {
+            throw new Error("RADIOBUTTON and LENGTH not possible together");
+        }
         const bfound = new basic_types_1.BasicTypes(filename, scope).parseType(node);
         if (nameToken && bfound) {
             scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, filename, bfound));
@@ -34519,6 +34575,32 @@ class ExpressionNode extends _abstract_node_1.AbstractNode {
         }
         throw new Error("ExpressionNode, getFirstToken, no children");
     }
+    concatTokensWithLinebreaks() {
+        let str = "";
+        let prev;
+        for (const token of this.getTokens()) {
+            if (token instanceof tokens_1.Pragma) {
+                continue;
+            }
+            if (str === "") {
+                str = token.getStr();
+            }
+            else if (prev && prev.getStr().length + prev.getCol() === token.getCol()
+                && prev.getRow() === token.getRow()) {
+                str = str + token.getStr();
+            }
+            else {
+                if (prev && prev.getRow() !== token.getRow()) {
+                    str = str + "\n" + token.getStr();
+                }
+                else {
+                    str = str + " " + token.getStr();
+                }
+            }
+            prev = token;
+        }
+        return str;
+    }
     concatTokens() {
         let str = "";
         let prev;
@@ -51167,7 +51249,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.105.16";
+        return "2.105.18";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -52427,6 +52509,7 @@ const expressions_1 = __webpack_require__(/*! ../abap/2_statements/expressions *
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 const version_1 = __webpack_require__(/*! ../version */ "./node_modules/@abaplint/core/build/src/version.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 class AvoidUseConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -52436,11 +52519,11 @@ class AvoidUseConf extends _basic_rule_config_1.BasicRuleConfig {
         this.define = true;
         /** Detects statics */
         this.statics = true;
-        /** Detects DEFAULT KEY definitions, from version v740sp02 and up */
+        /** Detects DEFAULT KEY definitions, from version v740sp02 and up. Use pseudo comment DEFAULT_KEY to ignore */
         this.defaultKey = true;
         /** Detects BREAK and BREAK-POINTS */
         this.break = true;
-        /** Detects TEST SEAMS */
+        /** Detects TEST SEAMS. Use pseudo comment TEST_SEAM_USAGE to ignore */
         this.testSeams = true;
         /** Detects DESCRIBE TABLE LINES, use lines() instead */
         this.describeLines = true;
@@ -52488,7 +52571,9 @@ BREAK points`,
         var _a;
         const issues = [];
         let isStaticsBlock = false;
-        for (const statementNode of file.getStatements()) {
+        const statements = file.getStatements();
+        for (let i = 0; i < statements.length; i++) {
+            const statementNode = statements[i];
             const statement = statementNode.get();
             let message = undefined;
             let fix = undefined;
@@ -52516,6 +52601,10 @@ BREAK points`,
                 message = "EXPORT TO DATABASE";
             }
             else if (this.conf.testSeams && statement instanceof Statements.TestSeam) {
+                const next = statements[i + 1];
+                if ((next === null || next === void 0 ? void 0 : next.get()) instanceof _statement_1.Comment && next.concatTokens().includes("EC TEST_SEAM_USAGE")) {
+                    continue;
+                }
                 message = "TEST-SEAM";
             }
             else if (this.conf.statics && statement instanceof Statements.Static && isStaticsBlock === false) {
@@ -52535,6 +52624,10 @@ BREAK points`,
                 const tt = (_a = statementNode.findFirstExpression(expressions_1.TypeTable)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.TypeTableKey);
                 const token = tt === null || tt === void 0 ? void 0 : tt.findDirectTokenByText("DEFAULT");
                 if (tt && token) {
+                    const next = statements[i + 1];
+                    if ((next === null || next === void 0 ? void 0 : next.get()) instanceof _statement_1.Comment && next.concatTokens().includes("EC DEFAULT_KEY")) {
+                        continue;
+                    }
                     message = "DEFAULT KEY";
                     issues.push(issue_1.Issue.atToken(file, token, this.getDescription(message), this.getMetadata().key, this.conf.severity));
                 }
@@ -56966,7 +57059,7 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
             }
             startToken = node.getFirstToken();
         }
-        const withs = ((_f = node.findDirectExpression(Expressions.RaiseWith)) === null || _f === void 0 ? void 0 : _f.findDirectExpressions(Expressions.Source)) || [];
+        const withs = ((_f = node.findDirectExpression(Expressions.RaiseWith)) === null || _f === void 0 ? void 0 : _f.findDirectExpressions(Expressions.SimpleSource3)) || [];
         const className = ((_g = node.findDirectExpression(Expressions.ClassName)) === null || _g === void 0 ? void 0 : _g.concatTokens()) || "ERROR";
         const uniqueName1 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         const uniqueName2 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
@@ -57354,7 +57447,7 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
         const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
         let code = `CLEAR ${target.concatTokens()}.\n`;
         for (const fieldAssignment of fieldAssignments) {
-            code += indentation + target.concatTokens() + "-" + fieldAssignment.concatTokens() + `.\n`;
+            code += indentation + target.concatTokens() + "-" + fieldAssignment.concatTokensWithLinebreaks() + `.\n`;
         }
         code = code.trimEnd();
         const start = high.getFirstToken().getStart();
@@ -58024,7 +58117,7 @@ ${indentation}    output = ${uniqueName}.\n`;
                                 body += data;
                                 added = true;
                             }
-                            body += indentation + structureName + "-" + b.concatTokens() + ".\n";
+                            body += indentation + structureName + "-" + b.concatTokensWithLinebreaks() + ".\n";
                         }
                         else if (b.get() instanceof Expressions.Source) {
                             // note: it wont work with APPEND for Hashed/Sorted Tables, so use INSERT,
@@ -63586,6 +63679,7 @@ exports.MethodImplementedTwice = MethodImplementedTwice;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MethodLength = exports.MethodLengthConf = void 0;
 const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+const Objects = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
 const method_length_stats_1 = __webpack_require__(/*! ../utils/method_length_stats */ "./node_modules/@abaplint/core/build/src/utils/method_length_stats.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
@@ -63647,6 +63741,12 @@ Abstract methods without statements are considered okay.`,
         return this;
     }
     run(obj) {
+        var _a;
+        if (this.conf.ignoreTestClasses === true
+            && obj instanceof Objects.Class
+            && ((_a = obj.getClassDefinition()) === null || _a === void 0 ? void 0 : _a.isForTesting) === true) {
+            return [];
+        }
         const methodStats = method_length_stats_1.MethodLengthStats.run(obj);
         const methodIssues = this.check(methodStats, "METHOD");
         let formIssues = [];
@@ -70618,7 +70718,7 @@ class UnnecessaryChaining extends _abap_rule_1.ABAPRule {
             j = 1;
             let prevStatement = statements[i - j];
             while ((prevStatement === null || prevStatement === void 0 ? void 0 : prevStatement.get()) instanceof _statement_1.Comment) {
-                j--;
+                j++;
                 prevStatement = statements[i - j];
             }
             const next = nextStatement === null || nextStatement === void 0 ? void 0 : nextStatement.getColon();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.105.16",
+    "version": "2.105.18",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,24 +38,24 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.105.16",
+        "@abaplint/core": "^2.105.18",
         "@types/chai": "^4.3.11",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.11.16",
+        "@types/node": "^20.11.19",
         "@types/progress": "^2.0.7",
         "chai": "^4.4.1",
         "chalk": "^5.3.0",
         "eslint": "^8.56.0",
         "glob": "^7.2.3",
         "json5": "^2.2.3",
-        "memfs": "^4.6.0",
+        "memfs": "^4.7.6",
         "minimist": "^1.2.8",
-        "mocha": "^10.2.0",
+        "mocha": "^10.3.0",
         "progress": "^2.0.3",
         "typescript": "^5.3.3",
-        "webpack": "^5.90.1",
+        "webpack": "^5.90.2",
         "webpack-cli": "^5.1.4",
         "xml-js": "^1.6.11"
     },