@abaplint/core 2.94.4 → 2.94.6

package/build/abaplint.d.ts

@@ -3502,6 +3502,7 @@ export declare interface ISpaghettiScopeNode {
     findScopeForVariable(name: string): IScopeIdentifier | undefined;
     findWriteReference(pos: Position): TypedIdentifier | undefined;
     findTableReference(pos: Position): string | undefined;
+    findTableVoidReference(pos: Position): boolean;
 }
 
 export declare class Issue {
@@ -5101,6 +5102,7 @@ export declare class SpaghettiScopeNode extends ScopeData implements ISpaghettiS
     findVariable(name: string): TypedIdentifier | undefined;
     findWriteReference(pos: Position): TypedIdentifier | undefined;
     findTableReference(pos: Position): string | undefined;
+    findTableVoidReference(pos: Position): boolean;
     findScopeForVariable(name: string): IScopeIdentifier | undefined;
 }
 

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BuiltIn = void 0;
+exports.BuiltIn = exports.BuiltInMethod = void 0;
 /* eslint-disable max-len */
 const _typed_identifier_1 = require("../types/_typed_identifier");
 const basic_1 = require("../types/basic");
@@ -84,6 +84,7 @@ class BuiltInMethod extends _identifier_1.Identifier {
         return undefined;
     }
 }
+exports.BuiltInMethod = BuiltInMethod;
 class BuiltIn {
     constructor() {
         this.row = 1;

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

@@ -675,6 +675,7 @@ class BasicTypes {
     }
     resolveConstantValue(expr) {
         var _a, _b;
+        // todo: rewrite this method
         if (!(expr.get() instanceof Expressions.SimpleFieldChain)) {
             throw new Error("resolveConstantValue");
         }
@@ -688,6 +689,9 @@ class BasicTypes {
                 this.scope.addReference(firstToken, found, _reference_1.ReferenceType.DataReadReference, this.filename);
                 return val;
             }
+            else if ((found === null || found === void 0 ? void 0 : found.getType()) instanceof basic_1.StructureType) {
+                this.scope.addReference(firstToken, found, _reference_1.ReferenceType.DataReadReference, this.filename);
+            }
             return undefined;
         }
         else if (firstNode.get() instanceof Expressions.ClassName

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

@@ -4,12 +4,17 @@ exports.MethodCallBody = void 0;
 const Expressions = require("../../2_statements/expressions");
 const method_parameters_1 = require("./method_parameters");
 const source_1 = require("./source");
+const method_call_param_1 = require("./method_call_param");
 class MethodCallBody {
     runSyntax(node, scope, filename, method) {
         const parameters = node.findDirectExpression(Expressions.MethodParameters);
         if (parameters) {
             new method_parameters_1.MethodParameters().runSyntax(parameters, scope, method, filename);
         }
+        const param = node.findDirectExpression(Expressions.MethodCallParam);
+        if (param) {
+            new method_call_param_1.MethodCallParam().runSyntax(param, scope, method, filename);
+        }
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }

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

@@ -171,6 +171,15 @@ class SpaghettiScopeNode extends ScopeData {
         }
         return undefined;
     }
+    findTableVoidReference(pos) {
+        for (const r of this.getData().references) {
+            if (r.referenceType === _reference_1.ReferenceType.TableVoidReference
+                && r.position.getStart().equals(pos)) {
+                return true;
+            }
+        }
+        return false;
+    }
     // TODO, this method can be deleted? its only used in tests?
     findScopeForVariable(name) {
         let search = this;

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

@@ -5,6 +5,7 @@ const Expressions = require("../../2_statements/expressions");
 const dynamic_1 = require("../expressions/dynamic");
 const database_table_1 = require("../expressions/database_table");
 const source_1 = require("../expressions/source");
+const _reference_1 = require("../_reference");
 class ModifyDatabase {
     runSyntax(node, scope, filename) {
         for (const d of node.findAllExpressions(Expressions.Dynamic)) {
@@ -12,14 +13,18 @@ class ModifyDatabase {
         }
         const dbtab = node.findFirstExpression(Expressions.DatabaseTable);
         if (dbtab !== undefined) {
-            try {
-                new database_table_1.DatabaseTable().runSyntax(dbtab, scope, filename);
-            }
-            catch (e) {
-                if (scope.findVariable(dbtab.concatTokens()) === undefined) {
-                    throw e;
+            if (node.getChildren().length === 5) {
+                const found = scope.findVariable(dbtab.concatTokens());
+                if (found) {
+                    scope.addReference(dbtab.getFirstToken(), found, _reference_1.ReferenceType.DataWriteReference, filename);
+                }
+                else {
+                    new database_table_1.DatabaseTable().runSyntax(dbtab, scope, filename);
                 }
             }
+            else {
+                new database_table_1.DatabaseTable().runSyntax(dbtab, scope, filename);
+            }
         }
         for (const s of node.findAllExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);

package/build/src/registry.js

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

package/build/src/rules/change_if_to_case.js

@@ -29,7 +29,9 @@ class ChangeIfToCase extends _abap_rule_1.ABAPRule {
             title: "Change IF to CASE",
             shortDescription: `Finds IF constructs that can be changed to CASE`,
             // eslint-disable-next-line max-len
-            extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#prefer-case-to-else-if-for-multiple-alternative-conditions`,
+            extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#prefer-case-to-else-if-for-multiple-alternative-conditions
+
+If the first comparison is a boolean compare, no issue is reported.`,
             tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Styleguide],
             badExample: `IF l_fcat-fieldname EQ 'FOO'.
 ELSEIF l_fcat-fieldname = 'BAR'
@@ -60,6 +62,9 @@ ENDCASE.`,
             if (ifStatement === undefined) {
                 continue;
             }
+            if (ifStatement.concatTokens().match(/ (abap_true|abap_false)\s*\./i)) {
+                continue;
+            }
             conds.push(ifStatement === null || ifStatement === void 0 ? void 0 : ifStatement.findDirectExpression(Expressions.Cond));
             for (const ei of i.findDirectStructures(Structures.ElseIf)) {
                 conds.push((_a = ei.findDirectStatement(Statements.ElseIf)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Cond));

package/build/src/rules/modify_only_own_db_tables.js

@@ -4,9 +4,10 @@ exports.ModifyOnlyOwnDBTables = exports.ModifyOnlyOwnDBTablesConf = void 0;
 const Statements = require("../abap/2_statements/statements");
 const Expressions = require("../abap/2_statements/expressions");
 const issue_1 = require("../issue");
-const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
+const _abap_object_1 = require("../objects/_abap_object");
+const syntax_1 = require("../abap/5_syntax/syntax");
 class ModifyOnlyOwnDBTablesConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -16,9 +17,8 @@ class ModifyOnlyOwnDBTablesConf extends _basic_rule_config_1.BasicRuleConfig {
     }
 }
 exports.ModifyOnlyOwnDBTablesConf = ModifyOnlyOwnDBTablesConf;
-class ModifyOnlyOwnDBTables extends _abap_rule_1.ABAPRule {
+class ModifyOnlyOwnDBTables {
     constructor() {
-        super(...arguments);
         this.conf = new ModifyOnlyOwnDBTablesConf();
     }
     getMetadata() {
@@ -26,8 +26,8 @@ class ModifyOnlyOwnDBTables extends _abap_rule_1.ABAPRule {
             key: "modify_only_own_db_tables",
             title: "Modify only own DB tables",
             shortDescription: `Modify only own DB tables`,
-            extendedInformation: "https://docs.abapopenchecks.org/checks/26/",
-            tags: [_irule_1.RuleTag.Security, _irule_1.RuleTag.SingleFile],
+            extendedInformation: `https://docs.abapopenchecks.org/checks/26/`,
+            tags: [_irule_1.RuleTag.Security],
         };
     }
     getConfig() {
@@ -36,33 +36,52 @@ class ModifyOnlyOwnDBTables extends _abap_rule_1.ABAPRule {
     setConfig(conf) {
         this.conf = conf;
     }
-    runParsed(file) {
+    initialize(reg) {
+        this.reg = reg;
+        return this;
+    }
+    run(obj) {
         var _a;
-        const output = [];
-        const struc = file.getStructure();
-        if (struc === undefined) {
+        if (!(obj instanceof _abap_object_1.ABAPObject)) {
             return [];
         }
-        const regExp = new RegExp(this.getConfig().ownTables, "i");
-        for (const s of file.getStatements()) {
-            const g = s.get();
-            if (g instanceof Statements.DeleteDatabase
-                || g instanceof Statements.UpdateDatabase
-                || g instanceof Statements.InsertDatabase
-                || g instanceof Statements.ModifyDatabase) {
-                const databaseTable = s.findFirstExpression(Expressions.DatabaseTable);
-                if (databaseTable === undefined) {
-                    continue;
-                }
-                if (((_a = databaseTable.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.Dynamic) {
-                    if (this.getConfig().reportDynamic === true) {
-                        output.push(issue_1.Issue.atStatement(file, s, this.getMetadata().title, this.getMetadata().key, this.getConfig().severity));
+        let spaghetti = undefined;
+        const output = [];
+        for (const file of obj.getABAPFiles()) {
+            const struc = file.getStructure();
+            if (struc === undefined) {
+                return [];
+            }
+            const regExp = new RegExp(this.getConfig().ownTables, "i");
+            for (const s of file.getStatements()) {
+                const g = s.get();
+                if (g instanceof Statements.DeleteDatabase
+                    || g instanceof Statements.UpdateDatabase
+                    || g instanceof Statements.InsertDatabase
+                    || g instanceof Statements.ModifyDatabase) {
+                    const databaseTable = s.findFirstExpression(Expressions.DatabaseTable);
+                    if (databaseTable === undefined) {
+                        continue;
+                    }
+                    if (((_a = databaseTable.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.Dynamic) {
+                        if (this.getConfig().reportDynamic === true) {
+                            output.push(issue_1.Issue.atStatement(file, s, this.getMetadata().title, this.getMetadata().key, this.getConfig().severity));
+                        }
+                        continue;
+                    }
+                    const concat = databaseTable.concatTokens().toUpperCase();
+                    if (regExp.test(concat) === false) {
+                        // must contain a ReferenceType.TableVoidReference
+                        if (spaghetti === undefined) {
+                            spaghetti = new syntax_1.SyntaxLogic(this.reg, obj).run().spaghetti;
+                        }
+                        const start = databaseTable.getFirstToken().getStart();
+                        const scope = spaghetti.lookupPosition(start, file.getFilename());
+                        const found = scope === null || scope === void 0 ? void 0 : scope.findTableVoidReference(start);
+                        if (found) {
+                            output.push(issue_1.Issue.atStatement(file, s, this.getMetadata().title, this.getMetadata().key, this.getConfig().severity));
+                        }
                     }
-                    continue;
-                }
-                const concat = databaseTable.concatTokens().toUpperCase();
-                if (regExp.test(concat) === false && concat !== "SCREEN") {
-                    output.push(issue_1.Issue.atStatement(file, s, this.getMetadata().title, this.getMetadata().key, this.getConfig().severity));
                 }
             }
         }

package/build/src/rules/omit_parameter_name.js

@@ -10,6 +10,7 @@ const syntax_1 = require("../abap/5_syntax/syntax");
 const _reference_1 = require("../abap/5_syntax/_reference");
 const method_definition_1 = require("../abap/types/method_definition");
 const edit_helper_1 = require("../edit_helper");
+const _builtin_1 = require("../abap/5_syntax/_builtin");
 class OmitParameterNameConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.OmitParameterNameConf = OmitParameterNameConf;
@@ -74,7 +75,7 @@ EXPORTING must already be omitted for this rule to take effect, https://rules.ab
                 if (ref === undefined) {
                     continue;
                 }
-                const i = ref.getParameters().getDefaultImporting();
+                const i = ref.getDefaultImporting();
                 if (i === undefined) {
                     continue;
                 }
@@ -101,12 +102,17 @@ EXPORTING must already be omitted for this rule to take effect, https://rules.ab
             return undefined;
         }
         for (const r of scope.getData().references) {
-            if (r.referenceType !== _reference_1.ReferenceType.MethodReference) {
+            if (r.referenceType !== _reference_1.ReferenceType.MethodReference
+                && r.referenceType !== _reference_1.ReferenceType.BuiltinMethodReference) {
                 continue;
             }
-            else if (r.position.getStart().equals(token.getStart())
-                && r.resolved instanceof method_definition_1.MethodDefinition) {
-                return r.resolved;
+            else if (r.position.getStart().equals(token.getStart())) {
+                if (r.resolved instanceof _builtin_1.BuiltInMethod) {
+                    return r.resolved;
+                }
+                else if (r.resolved instanceof method_definition_1.MethodDefinition) {
+                    return r.resolved.getParameters();
+                }
             }
         }
         return undefined;

package/build/src/rules/static_call_via_instance.js

@@ -10,6 +10,11 @@ const syntax_1 = require("../abap/5_syntax/syntax");
 const _reference_1 = require("../abap/5_syntax/_reference");
 const types_1 = require("../abap/types");
 class StaticCallViaInstanceConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        /** Allow in test class includes */
+        this.allowInTestclassIncludes = false;
+    }
 }
 exports.StaticCallViaInstanceConf = StaticCallViaInstanceConf;
 class StaticCallViaInstance extends _abap_rule_1.ABAPRule {
@@ -34,6 +39,9 @@ class StaticCallViaInstance extends _abap_rule_1.ABAPRule {
     }
     runParsed(file, obj) {
         const issues = [];
+        if (this.getConfig().allowInTestclassIncludes === true && file.getFilename().includes(".testclasses.")) {
+            return [];
+        }
         const staticMethodCalls = this.listMethodCalls(file.getFilename(), new syntax_1.SyntaxLogic(this.reg, obj).run().spaghetti.getTop());
         const tokens = file.getTokens();
         for (let i = 0; i < tokens.length - 1; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.94.4",
+    "version": "2.94.6",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -49,7 +49,7 @@
         "@microsoft/api-extractor": "^7.33.7",
         "@types/chai": "^4.3.4",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.11.14",
+        "@types/node": "^18.11.15",
         "chai": "^4.3.7",
         "eslint": "^8.29.0",
         "mocha": "^10.2.0",
@@ -60,7 +60,7 @@
     },
     "dependencies": {
         "fast-xml-parser": "^4.0.12",
-        "json5": "^2.2.1",
+        "json5": "^2.2.2",
         "vscode-languageserver-types": "^3.17.2"
     }
 }