@abaplint/transpiler-cli 2.8.26 → 2.8.27

package/build/bundle.js

@@ -2589,17 +2589,23 @@ class Macros {
     constructor(globalMacros) {
         this.macros = {};
         for (const m of globalMacros) {
-            this.macros[m.toUpperCase()] = [];
+            this.macros[m.toUpperCase()] = {
+                statements: [],
+                filename: undefined,
+            };
         }
     }
-    addMacro(name, contents) {
+    addMacro(name, contents, filename) {
         if (this.isMacro(name)) {
             return;
         }
-        this.macros[name.toUpperCase()] = contents;
+        this.macros[name.toUpperCase()] = {
+            statements: contents,
+            filename: filename,
+        };
     }
     getContents(name) {
-        return this.macros[name.toUpperCase()];
+        return this.macros[name.toUpperCase()].statements;
     }
     listMacroNames() {
         return Object.keys(this.macros);
@@ -2610,6 +2616,9 @@ class Macros {
         }
         return false;
     }
+    getMacroFilename(name) {
+        return this.macros[name.toUpperCase()].filename;
+    }
 }
 class ExpandMacros {
     // "reg" must be supplied if there are cross object macros via INCLUDE
@@ -2619,35 +2628,42 @@ class ExpandMacros {
         this.globalMacros = globalMacros;
         this.reg = reg;
     }
-    find(statements) {
-        var _a, _b;
-        let name = undefined;
+    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();
+        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?
-                name = statement.getTokens()[1].getStr();
+                nameToken = statement.getTokens()[1];
+                start = statement.getFirstToken().getStart();
                 contents = [];
             }
             else if (type instanceof Statements.Include) {
-                const includeName = (_a = statement.findDirectExpression(Expressions.IncludeName)) === null || _a === void 0 ? void 0 : _a.concatTokens();
+                const includeName = (_b = statement.findDirectExpression(Expressions.IncludeName)) === null || _b === void 0 ? void 0 : _b.concatTokens();
                 // todo, this does not take function module includes into account
-                const prog = (_b = this.reg) === null || _b === void 0 ? void 0 : _b.getObject("PROG", includeName);
+                const prog = (_c = this.reg) === null || _c === void 0 ? void 0 : _c.getObject("PROG", includeName);
                 if (prog) {
                     prog.parse(this.version, this.globalMacros, this.reg);
-                    const main = prog.getMainABAPFile();
-                    if (main) {
+                    const includeMainFile = prog.getMainABAPFile();
+                    if (includeMainFile) {
                         // slow, this copies everything,
-                        this.find([...main.getStatements()]);
+                        this.find([...includeMainFile.getStatements()], includeMainFile, false);
                     }
                 }
             }
-            else if (name) {
+            else if (nameToken) {
                 if (type instanceof Statements.EndOfDefinition) {
-                    this.macros.addMacro(name, contents);
-                    name = undefined;
+                    this.macros.addMacro(nameToken.getStr(), contents, file.getFilename());
+                    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)) {
                     statements[i] = new statement_node_1.StatementNode(new _statement_1.MacroContent()).setChildren(this.tokensToNodes(statement.getTokens()));
@@ -2656,17 +2672,26 @@ class ExpandMacros {
             }
         }
     }
-    handleMacros(statements) {
+    handleMacros(statements, file) {
+        var _a;
         const result = [];
         let containsUnknown = false;
+        const macroReferences = (_a = this.reg) === null || _a === void 0 ? void 0 : _a.getMacroReferences();
         for (const statement of statements) {
             const type = statement.get();
             if (type instanceof _statement_1.Unknown || type instanceof _statement_1.MacroCall) {
                 const macroName = this.findName(statement.getTokens());
                 if (macroName && this.macros.isMacro(macroName)) {
+                    const filename = this.macros.getMacroFilename(macroName);
+                    if (filename) {
+                        macroReferences === null || macroReferences === void 0 ? void 0 : macroReferences.addReference({
+                            filename: filename,
+                            token: statement.getFirstToken(),
+                        });
+                    }
                     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);
+                    const handled = this.handleMacros(expanded, file);
                     for (const e of handled.statements) {
                         result.push(e);
                     }
@@ -3560,9 +3585,9 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class CondBody extends combi_1.Expression {
     getRunnable() {
-        const when = (0, combi_1.seq)("WHEN", (0, combi_1.alt)(_1.Cond, _1.Source), "THEN", (0, combi_1.alt)(_1.Source, _1.Throw));
-        const elsee = (0, combi_1.seq)("ELSE", (0, combi_1.alt)(_1.Source, _1.Throw));
-        return (0, combi_1.seq)((0, combi_1.opt)(_1.Let), (0, combi_1.plus)(when), (0, combi_1.opt)(elsee));
+        const when = (0, combi_1.seq)("WHEN", (0, combi_1.altPrio)(_1.Cond, _1.Source), "THEN", (0, combi_1.altPrio)(_1.Throw, _1.Source));
+        const elsee = (0, combi_1.seq)("ELSE", (0, combi_1.altPrio)(_1.Throw, _1.Source));
+        return (0, combi_1.seq)((0, combi_1.optPrio)(_1.Let), (0, combi_1.plusPrio)(when), (0, combi_1.optPrio)(elsee));
     }
 }
 exports.CondBody = CondBody;
@@ -8522,10 +8547,10 @@ class StatementParser {
         for (const w of wa) {
             this.process(w);
             this.categorize(w);
-            macros.find(w.statements);
+            macros.find(w.statements, w.file);
         }
         for (const w of wa) {
-            const res = macros.handleMacros(w.statements);
+            const res = macros.handleMacros(w.statements, w.file);
             w.statements = res.statements;
             if (res.containsUnknown === true) {
                 this.lazyUnknown(w);
@@ -40592,6 +40617,7 @@ const _reference_1 = __webpack_require__(/*! ../abap/5_syntax/_reference */ "./n
 const _builtin_1 = __webpack_require__(/*! ../abap/5_syntax/_builtin */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_builtin.js");
 const _scope_type_1 = __webpack_require__(/*! ../abap/5_syntax/_scope_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_scope_type.js");
 const types_1 = __webpack_require__(/*! ../abap/types */ "./node_modules/@abaplint/core/build/src/abap/types/index.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 class LSPLookup {
     static lookup(cursor, reg, obj) {
         var _a, _b;
@@ -40708,6 +40734,18 @@ class LSPLookup {
                 scope: bottomScope,
             };
         }
+        if (cursor.snode.get() instanceof _statement_1.MacroCall) {
+            const macroDefinition = reg.getMacroReferences().findDefinitionByUsage(cursor.identifier.getFilename(), cursor.snode.getFirstToken());
+            if (macroDefinition) {
+                return {
+                    hover: "Macro Call",
+                    definition: {
+                        uri: macroDefinition === null || macroDefinition === void 0 ? void 0 : macroDefinition.filename,
+                        range: _lsp_utils_1.LSPUtils.tokenToRange(macroDefinition.token),
+                    },
+                };
+            }
+        }
         if (hoverValue !== "") {
             return { hover: hoverValue, scope: bottomScope };
         }
@@ -41084,6 +41122,9 @@ class CodeActions {
         const diagnostics = [];
         const fixes = [];
         for (const i of issues) {
+            if (i.getKey() !== key) {
+                continue;
+            }
             const fix = i.getDefaultFix();
             if (fix === undefined) {
                 continue;
@@ -41772,11 +41813,13 @@ exports.Highlight = Highlight;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Hover = void 0;
+const Tokens = __webpack_require__(/*! ../abap/1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
+const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 const LServer = __webpack_require__(/*! vscode-languageserver-types */ "./node_modules/vscode-languageserver-types/lib/umd/main.js");
 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 Tokens = __webpack_require__(/*! ../abap/1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.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;
@@ -41800,6 +41843,12 @@ 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" };
+        }
         else if (found.token instanceof Tokens.Comment) {
             let type = "Comment";
             if (found.token.getStr().startsWith(`"!`)) {
@@ -42168,6 +42217,7 @@ class References {
         const locs = this.search(lookup.definitionId, lookup.scope);
         return locs.map(_lsp_utils_1.LSPUtils.identiferToLocation);
     }
+    ////////////////////////////////////////////
     // todo, cleanup this mehtod, some of the method parameters are not used anymore?
     search(identifier, node, exitAfterFound = false, removeDuplicates = true) {
         let ret = [];
@@ -42195,7 +42245,6 @@ class References {
             return ret;
         }
     }
-    ////////////////////////////////////////////
     removeDuplicates(arr) {
         const values = {};
         return arr.filter(item => {
@@ -42621,6 +42670,87 @@ exports.Symbols = Symbols;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/macro_references.js":
+/*!*******************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/macro_references.js ***!
+  \*******************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.MacroReferences = void 0;
+class MacroReferences {
+    constructor() {
+        this.definitions = {};
+        this.references = {};
+    }
+    addDefinition(ref, start, end) {
+        if (this.definitions[ref.filename] === undefined) {
+            this.definitions[ref.filename] = [];
+        }
+        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 });
+    }
+    getDefinitionRange(filename, token) {
+        for (const d of this.definitions[filename] || []) {
+            if (d.token.getStart().equals(token.getStart())) {
+                return { start: d.start, end: d.end };
+            }
+        }
+        return undefined;
+    }
+    addReference(ref) {
+        if (this.references[ref.filename] === undefined) {
+            this.references[ref.filename] = [];
+        }
+        this.references[ref.filename].push(ref);
+    }
+    listDefinitionsByFile(filename) {
+        const ret = [];
+        for (const d of this.definitions[filename] || []) {
+            ret.push(d.token);
+        }
+        return ret;
+    }
+    listUsagesbyMacro(filename, token) {
+        const ret = [];
+        const tokenStr = token.getStr().toUpperCase();
+        for (const ref of this.references[filename] || []) {
+            if (ref.token.getStr().toUpperCase() === tokenStr) {
+                ret.push(ref);
+            }
+        }
+        return ret;
+    }
+    clear(filename) {
+        delete this.definitions[filename];
+        delete this.references[filename];
+    }
+    findDefinitionByUsage(filename, token) {
+        const tokenStr = token.getStr().toUpperCase();
+        for (const ref of this.references[filename] || []) {
+            if (ref.token.getStart().equals(token.getStart())) {
+                for (const d of this.definitions[ref.filename] || []) {
+                    if (d.token.getStr().toUpperCase() === tokenStr) {
+                        return {
+                            filename: ref.filename,
+                            token: d.token,
+                        };
+                    }
+                }
+            }
+        }
+        return undefined;
+    }
+}
+exports.MacroReferences = MacroReferences;
+//# sourceMappingURL=macro_references.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/msag_references.js":
 /*!******************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/msag_references.js ***!
@@ -50526,6 +50656,7 @@ const excludeHelper_1 = __webpack_require__(/*! ./utils/excludeHelper */ "./node
 const ddic_references_1 = __webpack_require__(/*! ./ddic_references */ "./node_modules/@abaplint/core/build/src/ddic_references.js");
 const rules_runner_1 = __webpack_require__(/*! ./rules_runner */ "./node_modules/@abaplint/core/build/src/rules_runner.js");
 const msag_references_1 = __webpack_require__(/*! ./msag_references */ "./node_modules/@abaplint/core/build/src/msag_references.js");
+const macro_references_1 = __webpack_require__(/*! ./macro_references */ "./node_modules/@abaplint/core/build/src/macro_references.js");
 // todo, this should really be an instance in case there are multiple Registry'ies
 class ParsingPerformance {
     static clear() {
@@ -50580,10 +50711,11 @@ class Registry {
         this.conf = conf ? conf : config_1.Config.getDefault();
         this.ddicReferences = new ddic_references_1.DDICReferences();
         this.msagReferences = new msag_references_1.MSAGReferences();
+        this.macroReferences = new macro_references_1.MacroReferences();
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.108.12";
+        return "2.109.3";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -50591,6 +50723,9 @@ class Registry {
     getMSAGReferences() {
         return this.msagReferences;
     }
+    getMacroReferences() {
+        return this.macroReferences;
+    }
     *getObjects() {
         for (const name in this.objects) {
             for (const type in this.objects[name]) {
@@ -61322,6 +61457,7 @@ __exportStar(__webpack_require__(/*! ./cds_legacy_view */ "./node_modules/@abapl
 __exportStar(__webpack_require__(/*! ./cds_parser_error */ "./node_modules/@abaplint/core/build/src/rules/cds_parser_error.js"), exports);
 __exportStar(__webpack_require__(/*! ./chain_mainly_declarations */ "./node_modules/@abaplint/core/build/src/rules/chain_mainly_declarations.js"), exports);
 __exportStar(__webpack_require__(/*! ./change_if_to_case */ "./node_modules/@abaplint/core/build/src/rules/change_if_to_case.js"), exports);
+__exportStar(__webpack_require__(/*! ./unused_macros */ "./node_modules/@abaplint/core/build/src/rules/unused_macros.js"), exports);
 __exportStar(__webpack_require__(/*! ./check_abstract */ "./node_modules/@abaplint/core/build/src/rules/check_abstract.js"), exports);
 __exportStar(__webpack_require__(/*! ./check_comments */ "./node_modules/@abaplint/core/build/src/rules/check_comments.js"), exports);
 __exportStar(__webpack_require__(/*! ./check_ddic */ "./node_modules/@abaplint/core/build/src/rules/check_ddic.js"), exports);
@@ -71200,6 +71336,90 @@ exports.UnusedDDIC = UnusedDDIC;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/rules/unused_macros.js":
+/*!**********************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/rules/unused_macros.js ***!
+  \**********************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.UnusedMacros = exports.UnusedMacrosConf = void 0;
+const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+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);
+        /** skip specific names, case insensitive
+         * @uniqueItems true
+         */
+        this.skipNames = [];
+    }
+}
+exports.UnusedMacrosConf = UnusedMacrosConf;
+class UnusedMacros {
+    constructor() {
+        this.conf = new UnusedMacrosConf();
+    }
+    getMetadata() {
+        return {
+            key: "unused_macros",
+            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() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+        if (this.conf.skipNames === undefined) {
+            this.conf.skipNames = [];
+        }
+    }
+    initialize(reg) {
+        this.reg = reg;
+        return this;
+    }
+    run(obj) {
+        var _a;
+        const result = [];
+        if (!(obj instanceof _abap_object_1.ABAPObject)) {
+            return [];
+        }
+        const references = this.reg.getMacroReferences();
+        for (const file of obj.getABAPFiles()) {
+            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.getDefinitionRange(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));
+                }
+            }
+        }
+        return result;
+    }
+}
+exports.UnusedMacros = UnusedMacros;
+//# sourceMappingURL=unused_macros.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/rules/unused_methods.js":
 /*!***********************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/rules/unused_methods.js ***!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.8.26",
+  "version": "2.8.27",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -26,12 +26,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.8.26",
+    "@abaplint/transpiler": "^2.8.27",
     "@types/glob": "^8.1.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.7",
-    "@types/node": "^20.14.0",
-    "@abaplint/core": "^2.108.12",
+    "@types/node": "^20.14.2",
+    "@abaplint/core": "^2.109.3",
     "progress": "^2.0.3",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4",