@abaplint/core 2.95.0 → 2.95.2

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;

package/build/src/abap/2_statements/expand_macros.js

@@ -90,7 +90,7 @@ class ExpandMacros {
             if (type instanceof _statement_1.Unknown || type instanceof _statement_1.MacroCall) {
                 const macroName = this.findName(statement.getTokens());
                 if (macroName && this.macros.isMacro(macroName)) {
-                    result.push(new statement_node_1.StatementNode(new _statement_1.MacroCall()).setChildren(this.tokensToNodes(statement.getTokens())));
+                    result.push(new statement_node_1.StatementNode(new _statement_1.MacroCall(), statement.getColon()).setChildren(this.tokensToNodes(statement.getTokens())));
                     const expanded = this.expandContents(macroName, statement);
                     const handled = this.handleMacros(expanded);
                     for (const e of handled.statements) {

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/registry.js

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

package/build/src/rules/expand_macros.js

@@ -52,14 +52,24 @@ _hello.`,
             for (let j = i + 1; j < statements.length; j++) {
                 const sub = statements[j];
                 if (sub.getFirstToken().getStart() instanceof position_1.VirtualPosition) {
-                    replace += sub.concatTokens();
+                    if (replace !== "") {
+                        replace += "\n";
+                    }
+                    replace += sub.concatTokensVirtual();
                 }
                 else {
                     break;
                 }
             }
-            const fix = edit_helper_1.EditHelper.replaceRange(file, statementNode.getStart(), statementNode.getEnd(), replace);
+            if (statementNode.getColon()) {
+                replace += "\n";
+            }
+            const fix1 = edit_helper_1.EditHelper.deleteStatement(file, statementNode);
+            const fix2 = edit_helper_1.EditHelper.insertAt(file, statementNode.getStart(), replace);
+            const fix = edit_helper_1.EditHelper.merge(fix1, fix2);
             issues.push(issue_1.Issue.atStatement(file, statementNode, message, this.getMetadata().key, this.conf.severity, fix));
+            // only one fix at a time per file
+            break;
         }
         return issues;
     }

package/package.json

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