@abaplint/cli 2.109.0 → 2.109.1

package/build/cli.js

@@ -3687,18 +3687,22 @@ class ExpandMacros {
         this.globalMacros = globalMacros;
         this.reg = reg;
     }
-    find(statements, file) {
+    find(statements, file, clear = true) {
         var _a, _b, _c;
         let nameToken = undefined;
+        let start = undefined;
         let contents = [];
         const macroReferences = (_a = this.reg) === null || _a === void 0 ? void 0 : _a.getMacroReferences();
-        macroReferences === null || macroReferences === void 0 ? void 0 : macroReferences.clear(file.getFilename());
+        if (clear) {
+            macroReferences === null || macroReferences === void 0 ? void 0 : macroReferences.clear(file.getFilename());
+        }
         for (let i = 0; i < statements.length; i++) {
             const statement = statements[i];
             const type = statement.get();
             if (type instanceof Statements.Define) {
                 // todo, will this break if first token is a pragma?
                 nameToken = statement.getTokens()[1];
+                start = statement.getFirstToken().getStart();
                 contents = [];
             }
             else if (type instanceof Statements.Include) {
@@ -3710,14 +3714,14 @@ class ExpandMacros {
                     const includeMainFile = prog.getMainABAPFile();
                     if (includeMainFile) {
                         // slow, this copies everything,
-                        this.find([...includeMainFile.getStatements()], includeMainFile);
+                        this.find([...includeMainFile.getStatements()], includeMainFile, false);
                     }
                 }
             }
             else if (nameToken) {
                 if (type instanceof Statements.EndOfDefinition) {
                     this.macros.addMacro(nameToken.getStr(), contents, file.getFilename());
-                    macroReferences === null || macroReferences === void 0 ? void 0 : macroReferences.addDefinition({ filename: file.getFilename(), token: nameToken });
+                    macroReferences === null || macroReferences === void 0 ? void 0 : macroReferences.addDefinition({ filename: file.getFilename(), token: nameToken }, start, statement.getLastToken().getEnd());
                     nameToken = undefined;
                 }
                 else if (!(type instanceof _statement_1.Comment)) {
@@ -42861,6 +42865,7 @@ const LServer = __webpack_require__(/*! vscode-languageserver-types */ "./node_m
 const _abap_object_1 = __webpack_require__(/*! ../objects/_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
 const _lsp_utils_1 = __webpack_require__(/*! ./_lsp_utils */ "./node_modules/@abaplint/core/build/src/lsp/_lsp_utils.js");
 const _lookup_1 = __webpack_require__(/*! ./_lookup */ "./node_modules/@abaplint/core/build/src/lsp/_lookup.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 class Hover {
     constructor(reg) {
         this.reg = reg;
@@ -42884,6 +42889,9 @@ class Hover {
             || found.token instanceof Tokens.StringTemplateMiddle) {
             return { kind: LServer.MarkupKind.Markdown, value: "String Template" };
         }
+        else if (found.snode.get() instanceof _statement_1.MacroCall) {
+            return { kind: LServer.MarkupKind.Markdown, value: "Macro Call" };
+        }
         else if (found.snode.get() instanceof Statements.Define && found.stack.length === 2) {
             return { kind: LServer.MarkupKind.Markdown, value: "Macro Name" };
         }
@@ -43723,11 +43731,22 @@ class MacroReferences {
         this.definitions = {};
         this.references = {};
     }
-    addDefinition(ref) {
+    addDefinition(ref, start, end) {
         if (this.definitions[ref.filename] === undefined) {
             this.definitions[ref.filename] = [];
         }
-        this.definitions[ref.filename].push(ref);
+        else if (this.definitions[ref.filename].find((d) => d.token.getStart().equals(ref.token.getStart()))) {
+            return;
+        }
+        this.definitions[ref.filename].push({ token: ref.token, start, end });
+    }
+    getDefinitionPosition(filename, token) {
+        for (const d of this.definitions[filename] || []) {
+            if (d.token.getStart().equals(token.getStart())) {
+                return { start: d.token.getStart(), end: d.token.getEnd() };
+            }
+        }
+        return undefined;
     }
     addReference(ref) {
         if (this.references[ref.filename] === undefined) {
@@ -43736,7 +43755,11 @@ class MacroReferences {
         this.references[ref.filename].push(ref);
     }
     listDefinitionsByFile(filename) {
-        return this.definitions[filename] || [];
+        const ret = [];
+        for (const d of this.definitions[filename] || []) {
+            ret.push(d.token);
+        }
+        return ret;
     }
     listUsagesbyMacro(filename, token) {
         const ret = [];
@@ -51722,7 +51745,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.109.0";
+        return "2.109.1";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -72357,6 +72380,7 @@ const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/co
 const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 const _abap_object_1 = __webpack_require__(/*! ../objects/_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
+const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 class UnusedMacrosConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -72377,6 +72401,14 @@ class UnusedMacros {
             title: "Unused macros",
             shortDescription: `Checks for unused macro definitions definitions`,
             tags: [_irule_1.RuleTag.Quickfix],
+            badExample: `DEFINE foobar1.
+  WRITE 'hello'.
+END-OF-DEFINITION.`,
+            goodExample: `DEFINE foobar2.
+  WRITE 'hello'.
+END-OF-DEFINITION.
+
+foobar2.`,
         };
     }
     getConfig() {
@@ -72400,11 +72432,13 @@ class UnusedMacros {
         }
         const references = this.reg.getMacroReferences();
         for (const file of obj.getABAPFiles()) {
-            for (const macro of references.listDefinitionsByFile(file.getFilename())) {
-                const usages = references.listUsagesbyMacro(file.getFilename(), macro.token);
-                if (usages.length === 0 && ((_a = this.conf.skipNames) === null || _a === void 0 ? void 0 : _a.includes(macro.token.getStr().toUpperCase())) === false) {
-                    const message = "Unused macro definition: " + macro.token.getStr();
-                    result.push(issue_1.Issue.atToken(file, macro.token, message, this.getMetadata().key, this.conf.severity));
+            for (const macroToken of references.listDefinitionsByFile(file.getFilename())) {
+                const usages = references.listUsagesbyMacro(file.getFilename(), macroToken);
+                if (usages.length === 0 && ((_a = this.conf.skipNames) === null || _a === void 0 ? void 0 : _a.includes(macroToken.getStr().toUpperCase())) === false) {
+                    const message = "Unused macro definition: " + macroToken.getStr();
+                    const pos = references.getDefinitionPosition(file.getFilename(), macroToken);
+                    const fix = edit_helper_1.EditHelper.deleteRange(file, pos.start, pos.end);
+                    result.push(issue_1.Issue.atToken(file, macroToken, message, this.getMetadata().key, this.conf.severity, fix));
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.109.0",
+    "version": "2.109.1",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.109.0",
+        "@abaplint/core": "^2.109.1",
         "@types/chai": "^4.3.16",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",