@abaplint/core 2.94.25 → 2.95.1

package/build/abaplint.d.ts

@@ -5308,6 +5308,7 @@ declare class StatementNode extends AbstractNode<ExpressionNode | TokenNode> {
     includesToken(search: Token): boolean;
     getTokenNodes(): readonly TokenNode[];
     concatTokens(): string;
+    concatTokensVirtual(): string;
     concatTokensWithoutStringsAndComments(): string;
     getTerminator(): string;
     getFirstToken(): Token;
@@ -6398,7 +6399,6 @@ declare class VirtualEndPoint extends AbstractObject {
 
 /** used for macro calls */
 export declare class VirtualPosition extends Position {
-    private readonly virtual;
     readonly vrow: number;
     readonly vcol: number;
     constructor(virtual: Position, row: number, col: number);

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

@@ -9,10 +9,10 @@ class MethodSource extends combi_1.Expression {
         // note: AttributeName can be both an attribute and a method name, the syntax check will tell
         // note: its allowed to end with MethodCall, however if this is done it will give a syntax error via syntax check
         const afterArrow = (0, combi_1.alt)(_1.AttributeName, _1.MethodCall, _1.Dynamic);
-        const arrow = (0, combi_1.alt)((0, combi_1.tok)(tokens_1.InstanceArrow), (0, combi_1.tok)(tokens_1.StaticArrow));
+        const arrow = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.InstanceArrow), (0, combi_1.tok)(tokens_1.StaticArrow));
         const attr = (0, combi_1.seq)(arrow, afterArrow);
         const comp = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), _1.ComponentName);
-        const attrOrComp = (0, combi_1.alt)(attr, comp);
+        const attrOrComp = (0, combi_1.altPrio)(attr, comp);
         const staticClass = (0, combi_1.seq)(_1.ClassName, (0, combi_1.tok)(tokens_1.StaticArrow));
         const clas = (0, combi_1.seq)(staticClass, afterArrow);
         const start = (0, combi_1.seq)((0, combi_1.altPrio)(clas, _1.SourceField, _1.SourceFieldSymbol, _1.Dynamic), (0, combi_1.star)(attrOrComp));

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

@@ -85,6 +85,30 @@ class StatementNode extends _abstract_node_1.AbstractNode {
         }
         return str;
     }
+    concatTokensVirtual() {
+        let str = "";
+        let prev;
+        for (const token of this.getTokens()) {
+            if (token instanceof pragma_1.Pragma) {
+                continue;
+            }
+            const vprev = prev === null || prev === void 0 ? void 0 : prev.getStart();
+            const vtoke = token === null || token === void 0 ? void 0 : token.getStart();
+            if (str === "") {
+                str = token.getStr();
+            }
+            else if (prev && vprev && vtoke
+                && prev.getStr().length + vprev.vcol === vtoke.vcol
+                && vprev.vrow === vtoke.vrow) {
+                str = str + token.getStr();
+            }
+            else {
+                str = str + " " + token.getStr();
+            }
+            prev = token;
+        }
+        return str;
+    }
     concatTokensWithoutStringsAndComments() {
         let str = "";
         let prev;

package/build/src/position.js

@@ -31,7 +31,7 @@ exports.Position = Position;
 class VirtualPosition extends Position {
     constructor(virtual, row, col) {
         super(virtual.getRow(), virtual.getCol());
-        this.virtual = virtual;
+        //    this.virtual = virtual;
         this.vrow = row;
         this.vcol = col;
     }
@@ -39,8 +39,7 @@ class VirtualPosition extends Position {
         if (!(p instanceof VirtualPosition)) {
             return false;
         }
-        const bar = p; // widening cast for ABAP translation
-        return super.equals(this.virtual) && this.vrow === bar.vrow && this.vcol === bar.vcol;
+        return super.equals(this) && this.vrow === p.vrow && this.vcol === p.vcol;
     }
 }
 exports.VirtualPosition = VirtualPosition;

package/build/src/registry.js

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

package/build/src/rules/expand_macros.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExpandMacros = exports.ExpandMacrosConf = void 0;
+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 edit_helper_1 = require("../edit_helper");
+const _statement_1 = require("../abap/2_statements/statements/_statement");
+const position_1 = require("../position");
+class ExpandMacrosConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.ExpandMacrosConf = ExpandMacrosConf;
+class ExpandMacros extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new ExpandMacrosConf();
+    }
+    getMetadata() {
+        return {
+            key: "expand_macros",
+            title: "Expand Macros",
+            shortDescription: `Allows expanding macro calls with quick fixes`,
+            extendedInformation: `Macros: https://help.sap.com/doc/abapdocu_752_index_htm/7.52/en-US/abenmacros_guidl.htm
+
+Note that macros/DEFINE cannot be used in the ABAP Cloud programming model`,
+            badExample: `DEFINE _hello.
+  WRITE 'hello'.
+END-OF-DEFINITION.
+_hello.`,
+            goodExample: `WRITE 'hello'.`,
+            tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.Quickfix, _irule_1.RuleTag.Upport],
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file) {
+        const issues = [];
+        const message = "Expand macro call";
+        const statements = file.getStatements();
+        for (let i = 0; i < statements.length; i++) {
+            const statementNode = statements[i];
+            const statement = statementNode.get();
+            if (!(statement instanceof _statement_1.MacroCall)) {
+                continue;
+            }
+            let replace = "";
+            for (let j = i + 1; j < statements.length; j++) {
+                const sub = statements[j];
+                if (sub.getFirstToken().getStart() instanceof position_1.VirtualPosition) {
+                    if (replace !== "") {
+                        replace += "\n";
+                    }
+                    replace += sub.concatTokensVirtual();
+                }
+                else {
+                    break;
+                }
+            }
+            const fix = edit_helper_1.EditHelper.replaceRange(file, statementNode.getStart(), statementNode.getEnd(), replace);
+            issues.push(issue_1.Issue.atStatement(file, statementNode, message, this.getMetadata().key, this.conf.severity, fix));
+        }
+        return issues;
+    }
+}
+exports.ExpandMacros = ExpandMacros;
+//# sourceMappingURL=expand_macros.js.map

package/build/src/rules/index.js

@@ -57,6 +57,7 @@ __exportStar(require("./empty_line_in_statement"), exports);
 __exportStar(require("./empty_statement"), exports);
 __exportStar(require("./empty_structure"), exports);
 __exportStar(require("./exit_or_check"), exports);
+__exportStar(require("./expand_macros"), exports);
 __exportStar(require("./exporting"), exports);
 __exportStar(require("./forbidden_identifier"), exports);
 __exportStar(require("./forbidden_pseudo_and_pragma"), exports);

package/package.json

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