@abaplint/core 2.105.16 → 2.105.18

package/build/abaplint.d.ts

@@ -1378,7 +1378,7 @@ export declare class CurrentScope {
     addInterfaceDefinition(i: IInterfaceDefinition): void;
     addNamedIdentifier(name: string, identifier: TypedIdentifier): void;
     addIdentifier(identifier: TypedIdentifier | undefined): void;
-    addDeferred(token: Token | undefined): void;
+    addDeferred(token: Token | undefined, type: "CLAS" | "INTF"): void;
     addListPrefix(identifiers: readonly TypedIdentifier[], prefix: string): void;
     addList(identifiers: readonly TypedIdentifier[]): void;
     addReference(usage: Token | undefined, referencing: Identifier | undefined, type: ReferenceType | ReferenceType[] | undefined, filename: string, extra?: IReferenceExtras): void;
@@ -1631,6 +1631,11 @@ declare class Default extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare type DeferredInformation = {
+    token: Token;
+    ooType: "CLAS" | "INTF";
+};
+
 declare class Define implements IStructure {
     getMatcher(): IStructureRunnable;
 }
@@ -2055,6 +2060,7 @@ declare class ExpressionNode extends AbstractNode<ExpressionNode | TokenNode> {
     get(): IStatementRunnable;
     countTokens(): number;
     getFirstToken(): Token;
+    concatTokensWithLinebreaks(): string;
     concatTokens(): string;
     concatTokensWithoutStringsAndComments(): string;
     getTokens(): readonly Token[];
@@ -3704,7 +3710,7 @@ declare interface IScopeData {
         [name: string]: TypedIdentifier;
     };
     deferred: {
-        [name: string]: Token;
+        [name: string]: DeferredInformation;
     };
     cdefs: {
         [name: string]: IClassDefinition;
@@ -5701,7 +5707,10 @@ export declare class SpaghettiScopeNode extends ScopeData implements ISpaghettiS
         end: Position;
     };
     setEnd(end: Position): void;
-    findDeferred(name: string): Identifier | undefined;
+    findDeferred(name: string): {
+        id: Identifier | undefined;
+        ooType: "CLAS" | "INTF";
+    } | undefined;
     findClassDefinition(name: string): IClassDefinition | undefined;
     listClassDefinitions(): IClassDefinition[];
     listInterfaceDefinitions(): IInterfaceDefinition[];

package/build/src/abap/2_statements/expressions/raise_with.js

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 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;
     }
 }

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

@@ -126,11 +126,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) {
@@ -235,7 +235,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;
     }
@@ -265,6 +274,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;
@@ -282,6 +296,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

package/build/src/abap/5_syntax/expressions/raise_with.js

@@ -5,7 +5,7 @@ const Expressions = require("../../2_statements/expressions");
 const source_1 = require("./source");
 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);
         }
     }

package/build/src/abap/5_syntax/expressions/source.js

@@ -97,6 +97,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":
@@ -213,6 +218,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;

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

@@ -61,7 +61,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();
         }

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

@@ -6,7 +6,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;

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

@@ -6,7 +6,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;

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

@@ -6,13 +6,33 @@ const source_1 = require("../expressions/source");
 const target_1 = require("../expressions/target");
 const fstarget_1 = require("../expressions/fstarget");
 const component_cond_1 = require("../expressions/component_cond");
+const basic_1 = require("../../types/basic");
 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) {

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

@@ -12,6 +12,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));

package/build/src/abap/nodes/expression_node.js

@@ -25,6 +25,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;

package/build/src/registry.js

@@ -65,7 +65,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.105.16";
+        return "2.105.18";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/avoid_use.js

@@ -9,6 +9,7 @@ const expressions_1 = require("../abap/2_statements/expressions");
 const _irule_1 = require("./_irule");
 const version_1 = require("../version");
 const edit_helper_1 = require("../edit_helper");
+const _statement_1 = require("../abap/2_statements/statements/_statement");
 class AvoidUseConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -18,11 +19,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;
@@ -70,7 +71,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;
@@ -98,6 +101,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) {
@@ -117,6 +124,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));
                 }

package/build/src/rules/downport.js

@@ -1152,7 +1152,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);
@@ -1540,7 +1540,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();
@@ -2210,7 +2210,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,

package/build/src/rules/method_length.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MethodLength = exports.MethodLengthConf = void 0;
 const issue_1 = require("../issue");
+const Objects = require("../objects");
 const method_length_stats_1 = require("../utils/method_length_stats");
 const _irule_1 = require("./_irule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
@@ -63,6 +64,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 = [];

package/build/src/rules/unnecessary_chaining.js

@@ -49,7 +49,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/core",
-    "version": "2.105.16",
+    "version": "2.105.18",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,13 +50,13 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.39.4",
+        "@microsoft/api-extractor": "^7.40.2",
         "@types/chai": "^4.3.11",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.11.16",
+        "@types/node": "^20.11.19",
         "chai": "^4.4.1",
         "eslint": "^8.56.0",
-        "mocha": "^10.2.0",
+        "mocha": "^10.3.0",
         "c8": "^9.1.0",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^1.5.0",