@abaplint/core 2.81.4 → 2.82.3

package/build/src/abap/1_lexer/lexer.js

@@ -84,7 +84,10 @@ class Lexer {
             const col = this.stream.getCol();
             const row = this.stream.getRow();
             let whiteBefore = false;
-            const prev = this.stream.prevChar();
+            let prev = this.stream.prevChar();
+            if (s.length === 2) {
+                prev = this.stream.prevPrevChar().substr(0, 1);
+            }
             if (prev === " " || prev === "\n" || prev === "\t" || prev === ":") {
                 whiteBefore = true;
             }

package/build/src/abap/3_structures/structures/types.js

@@ -6,7 +6,7 @@ const _combi_1 = require("./_combi");
 const _statement_1 = require("../../2_statements/statements/_statement");
 class Types {
     getMatcher() {
-        return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.TypeBegin), (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.Type), (0, _combi_1.sub)(Types), (0, _combi_1.sta)(_statement_1.MacroCall), (0, _combi_1.sta)(Statements.IncludeType))), (0, _combi_1.sta)(Statements.TypeEnd));
+        return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.TypeBegin), (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.Type), (0, _combi_1.sub)(Types), (0, _combi_1.sta)(_statement_1.MacroCall), (0, _combi_1.sta)(Statements.Include), (0, _combi_1.sta)(Statements.IncludeType))), (0, _combi_1.sta)(Statements.TypeEnd));
     }
 }
 exports.Types = Types;

package/build/src/registry.js

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

package/build/src/rules/index.js

@@ -124,6 +124,7 @@ __exportStar(require("./space_before_colon"), exports);
 __exportStar(require("./space_before_dot"), exports);
 __exportStar(require("./sql_escape_host_variables"), exports);
 __exportStar(require("./start_at_tab"), exports);
+__exportStar(require("./static_call_via_instance"), exports);
 __exportStar(require("./superclass_final"), exports);
 __exportStar(require("./sy_modification"), exports);
 __exportStar(require("./tabl_enhancement_category"), exports);

package/build/src/rules/static_call_via_instance.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StaticCallViaInstance = exports.StaticCallViaInstanceConf = void 0;
+/* eslint-disable max-len */
+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 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 {
+}
+exports.StaticCallViaInstanceConf = StaticCallViaInstanceConf;
+class StaticCallViaInstance extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new StaticCallViaInstanceConf();
+    }
+    getMetadata() {
+        return {
+            key: "static_call_via_instance",
+            title: "Static call via instance variable",
+            shortDescription: `Static method call via instance variable`,
+            extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#dont-call-static-methods-through-instance-variables`,
+            tags: [_irule_1.RuleTag.Styleguide],
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file, obj) {
+        const issues = [];
+        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++) {
+            const token = tokens[i];
+            if (token.getStr() !== "->") {
+                continue;
+            }
+            const next = tokens[i + 1];
+            for (const s of staticMethodCalls) {
+                if (s.equals(next.getStart())) {
+                    const message = "Avoid calling static method via instance";
+                    issues.push(issue_1.Issue.atToken(file, token, message, this.getMetadata().key));
+                    break;
+                }
+            }
+        }
+        return issues;
+    }
+    listMethodCalls(filename, node) {
+        const ret = [];
+        for (const r of node.getData().references) {
+            if (r.referenceType !== _reference_1.ReferenceType.MethodReference || r.position.getFilename() !== filename) {
+                continue;
+            }
+            if (r.resolved instanceof types_1.MethodDefinition && r.resolved.isStatic() === true) {
+                ret.push(r.position.getStart());
+            }
+        }
+        for (const child of node.getChildren()) {
+            ret.push(...this.listMethodCalls(filename, child));
+        }
+        return ret;
+    }
+}
+exports.StaticCallViaInstance = StaticCallViaInstance;
+//# sourceMappingURL=static_call_via_instance.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.81.4",
+    "version": "2.82.3",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",