@abaplint/transpiler-cli 2.8.25 → 2.8.27

package/build/bundle.js

@@ -1921,7 +1921,7 @@ class Star {
         return this.sta.getUsing();
     }
     run(r) {
-        const result = r;
+        let result = r;
         try {
             let res = r;
             let input = [];
@@ -1931,7 +1931,13 @@ class Star {
                 if (res.length === 0) {
                     break;
                 }
-                result.push(...res);
+                if (res.length > 1000) {
+                    // avoid stack overflow
+                    result = result.concat(res);
+                }
+                else {
+                    result.push(...res);
+                }
             }
         }
         catch (err) {
@@ -2064,7 +2070,7 @@ class Sequence {
         return this.list.reduce((a, c) => { return a.concat(c.getUsing()); }, []);
     }
     run(r) {
-        const result = [];
+        let result = [];
         for (const input of r) {
             let temp = [input];
             let match = true;
@@ -2076,7 +2082,13 @@ class Sequence {
                 }
             }
             if (match === true) {
-                result.push(...temp);
+                if (temp.length > 1000) {
+                    // avoid stack overflow
+                    result = result.concat(temp);
+                }
+                else {
+                    result.push(...temp);
+                }
             }
         }
         return result;
@@ -2577,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);
@@ -2598,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
@@ -2607,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()));
@@ -2644,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);
                     }
@@ -3548,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;
@@ -8510,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);
@@ -16900,7 +16937,7 @@ class Sequence {
     }
     run(statements, parent) {
         let inn = statements;
-        const out = [];
+        let out = [];
         for (const i of this.list) {
             const match = i.run(inn, parent);
             if (match.error) {
@@ -16912,7 +16949,14 @@ class Sequence {
                     errorMatched: out.length,
                 };
             }
-            out.push(...match.matched);
+            if (match.matched.length < 100) {
+                out.push(...match.matched);
+            }
+            else {
+                // avoid using the spread operator, it might trigger "Maximum call stack size exceeded"
+                // when the number of matched elements is very large
+                out = out.concat(match.matched);
+            }
             inn = match.unmatched;
         }
         return {
@@ -17044,7 +17088,7 @@ class Star {
     }
     run(statements, parent) {
         let inn = statements;
-        const out = [];
+        let out = [];
         while (true) {
             if (inn.length === 0) {
                 return {
@@ -17076,7 +17120,14 @@ class Star {
                     };
                 }
             }
-            out.push(...match.matched);
+            if (match.matched.length < 100) {
+                out.push(...match.matched);
+            }
+            else {
+                // avoid using the spread operator, it might trigger "Maximum call stack size exceeded"
+                // when the number of matched elements is very large
+                out = out.concat(match.matched);
+            }
             inn = match.unmatched;
         }
     }
@@ -40566,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;
@@ -40682,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 };
         }
@@ -41058,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;
@@ -41746,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;
@@ -41774,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(`"!`)) {
@@ -42142,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 = [];
@@ -42169,7 +42245,6 @@ class References {
             return ret;
         }
     }
-    ////////////////////////////////////////////
     removeDuplicates(arr) {
         const values = {};
         return arr.filter(item => {
@@ -42595,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 ***!
@@ -49707,6 +49863,10 @@ const Types = __webpack_require__(/*! ../abap/types/basic */ "./node_modules/@ab
 const _abstract_object_1 = __webpack_require__(/*! ./_abstract_object */ "./node_modules/@abaplint/core/build/src/objects/_abstract_object.js");
 const xml_utils_1 = __webpack_require__(/*! ../xml_utils */ "./node_modules/@abaplint/core/build/src/xml_utils.js");
 const ddic_1 = __webpack_require__(/*! ../ddic */ "./node_modules/@abaplint/core/build/src/ddic.js");
+var ViewClass;
+(function (ViewClass) {
+    ViewClass["ExternalView"] = "X";
+})(ViewClass || (ViewClass = {}));
 class View extends _abstract_object_1.AbstractObject {
     getType() {
         return "VIEW";
@@ -49750,6 +49910,16 @@ class View extends _abstract_object_1.AbstractObject {
                 // ignore, this is a special case of old style .INCLUDE
                 continue;
             }
+            else if (this.parsedData.header.VIEWCLASS === ViewClass.ExternalView) {
+                components.push({
+                    name: field.VIEWFIELD,
+                    type: new Types.VoidType("ExternalView")
+                });
+                continue;
+            }
+            else if (field.TABNAME === this.getName()) {
+                throw new Error("Unexpected self reference in view " + this.getName() + ", " + field.FIELDNAME + " " + field.FIELDNAME);
+            }
             const lookup = ddic.lookupTableOrView(field.TABNAME);
             let found = lookup.type;
             if (lookup.object) {
@@ -49785,13 +49955,23 @@ class View extends _abstract_object_1.AbstractObject {
     }
     ///////////////
     parseXML() {
-        var _a, _b;
-        this.parsedData = { fields: [], join: [] };
+        var _a, _b, _c;
+        this.parsedData = {
+            header: {
+                VIEWCLASS: "",
+            },
+            fields: [],
+            join: [],
+        };
         const parsed = super.parseRaw2();
         if (parsed === undefined || parsed.abapGit === undefined) {
             return;
         }
-        const fields = (_a = parsed.abapGit["asx:abap"]["asx:values"]) === null || _a === void 0 ? void 0 : _a.DD27P_TABLE;
+        const header = (_a = parsed.abapGit["asx:abap"]["asx:values"]) === null || _a === void 0 ? void 0 : _a.DD25V;
+        this.parsedData.header = {
+            VIEWCLASS: (header === null || header === void 0 ? void 0 : header.VIEWCLASS) || "",
+        };
+        const fields = (_b = parsed.abapGit["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.DD27P_TABLE;
         for (const field of (0, xml_utils_1.xmlToArray)(fields === null || fields === void 0 ? void 0 : fields.DD27P)) {
             this.parsedData.fields.push({
                 VIEWFIELD: field.VIEWFIELD,
@@ -49799,7 +49979,7 @@ class View extends _abstract_object_1.AbstractObject {
                 FIELDNAME: field.FIELDNAME,
             });
         }
-        const join = (_b = parsed.abapGit["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.DD28J_TABLE;
+        const join = (_c = parsed.abapGit["asx:abap"]["asx:values"]) === null || _c === void 0 ? void 0 : _c.DD28J_TABLE;
         for (const j of (0, xml_utils_1.xmlToArray)(join === null || join === void 0 ? void 0 : join.DD28J)) {
             this.parsedData.join.push({
                 LTAB: j.LTAB,
@@ -50476,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() {
@@ -50530,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.8";
+        return "2.109.3";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -50541,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]) {
@@ -53398,7 +53583,7 @@ If sy-dbcnt is checked after database statements, it is considered okay.
 If IS ASSIGNED is checked after assigning, it is considered okay.
 
 FIND statement with MATCH COUNT is considered okay if subrc is not checked`,
-            tags: [_irule_1.RuleTag.SingleFile],
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Quickfix],
             pseudoComment: "EC CI_SUBRC",
             pragma: "##SUBRC_OK",
         };
@@ -61272,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);
@@ -68225,7 +68411,9 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SelectSingleFullKey = exports.SelectSingleFullKeyConf = 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 __1 = __webpack_require__(/*! .. */ "./node_modules/@abaplint/core/build/src/index.js");
+const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 class SelectSingleFullKeyConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -68246,7 +68434,7 @@ class SelectSingleFullKey {
 
 If the statement contains a JOIN it is not checked`,
             pseudoComment: "EC CI_NOORDER",
-            tags: [],
+            tags: [_irule_1.RuleTag.Quickfix],
         };
     }
     initialize(reg) {
@@ -68267,6 +68455,12 @@ If the statement contains a JOIN it is not checked`,
     setConfig(conf) {
         this.conf = conf;
     }
+    buildFix(file, statement) {
+        return {
+            description: `Add "#EC CI_NOORDER`,
+            edit: edit_helper_1.EditHelper.insertAt(file, statement.getLastToken().getStart(), ` "#EC CI_NOORDER`),
+        };
+    }
     run(obj) {
         var _a, _b;
         if (!(obj instanceof __1.ABAPObject)) {
@@ -68328,7 +68522,8 @@ If the statement contains a JOIN it is not checked`,
                     }
                 }
                 if (set.size > 0) {
-                    issues.push(issue_1.Issue.atStatement(file, s, message, this.getMetadata().key, this.getConfig().severity));
+                    const fix = this.buildFix(file, s);
+                    issues.push(issue_1.Issue.atStatement(file, s, message, this.getMetadata().key, this.getConfig().severity, undefined, [fix]));
                 }
             }
         }
@@ -70793,7 +70988,13 @@ const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 class UnnecessaryReturnConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        /** Allow empty METHODs + FORMs + FUNCTION-MODULEs */
+        this.allowEmpty = false;
+    }
 }
 exports.UnnecessaryReturnConf = UnnecessaryReturnConf;
 class UnnecessaryReturn extends _abap_rule_1.ABAPRule {
@@ -70837,15 +71038,29 @@ ENDFORM.`,
         }
         const message = "Unnecessary RETURN";
         const statements = file.getStatements();
+        let statementCounter = 0;
         for (let i = 0; i < statements.length; i++) {
             const node = statements[i];
-            if (!(node.get() instanceof Statements.EndMethod
-                || node.get() instanceof Statements.EndForm
-                || node.get() instanceof Statements.EndFunction)) {
+            const nodeType = node.get();
+            if ((nodeType instanceof Statements.MethodImplementation
+                || nodeType instanceof Statements.Form
+                || nodeType instanceof Statements.FunctionModule)) {
+                statementCounter = 0;
+                continue;
+            }
+            if (!(nodeType instanceof _statement_1.Comment)) {
+                statementCounter++;
+            }
+            if (!(nodeType instanceof Statements.EndMethod
+                || nodeType instanceof Statements.EndForm
+                || nodeType instanceof Statements.EndFunction)) {
                 continue;
             }
             const prev = statements[i - 1];
             if (prev && prev.get() instanceof Statements.Return) {
+                if (this.conf.allowEmpty === true && statementCounter === 2) {
+                    continue;
+                }
                 const fix = edit_helper_1.EditHelper.deleteStatement(file, prev);
                 issues.push(issue_1.Issue.atStatement(file, prev, message, this.getMetadata().key, this.getConfig().severity, fix));
             }
@@ -71121,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 ***!
@@ -77551,12 +77850,12 @@ class Transpiler {
         progress?.set(reg.getObjectCount(false), "Building");
         for (const obj of reg.getObjects()) {
             await progress?.tick("Building, " + obj.getName());
-            if (obj instanceof abaplint.ABAPObject && !(obj instanceof abaplint.Objects.TypePool)) {
-                output.objects.push(...new handle_abap_1.HandleABAP(this.options).runObject(obj, reg));
-            }
-            else if (obj instanceof abaplint.Objects.TypePool) {
+            if (obj instanceof abaplint.Objects.TypePool) {
                 output.objects.push(...new handle_type_pool_1.HandleTypePool().runObject(obj, reg));
             }
+            else if (obj instanceof abaplint.ABAPObject) {
+                output.objects.push(...new handle_abap_1.HandleABAP(this.options).runObject(obj, reg));
+            }
             else if (obj instanceof abaplint.Objects.Oauth2Profile) {
                 output.objects.push(...new handle_oa2p_1.HandleOA2P().runObject(obj, reg));
             }
@@ -85833,28 +86132,29 @@ async function run() {
         for (const st of this.getSortedTests(reg)) {
             ret += `// --------------------------------------------\n`;
             ret += `    clas = unit.addObject("${st.obj.getName()}");\n`;
+            const lc = st.localClass.toLowerCase();
             ret += `    {
-        const {${st.localClass}} = await import("./${this.escapeNamespace(st.obj.getName().toLowerCase())}.${st.obj.getType().toLowerCase()}.testclasses.mjs");
-        locl = clas.addTestClass("${st.localClass}");
-        if (${st.localClass}.class_setup) await ${st.localClass}.class_setup();\n`;
+        const {${lc}} = await import("./${this.escapeNamespace(st.obj.getName().toLowerCase())}.${st.obj.getType().toLowerCase()}.testclasses.mjs");
+        locl = clas.addTestClass("${lc}");
+        if (${lc}.class_setup) await ${lc}.class_setup();\n`;
             for (const m of st.methods) {
-                const skipThis = (skip || []).some(a => a.object === st.obj.getName() && a.class === st.localClass && a.method === m);
+                const skipThis = (skip || []).some(a => a.object === st.obj.getName() && a.class === lc && a.method === m);
                 if (skipThis) {
-                    ret += `  console.log('${st.obj.getName()}: running ${st.localClass}->${m}, skipped');\n`;
+                    ret += `  console.log('${st.obj.getName()}: running ${lc}->${m}, skipped');\n`;
                     ret += `  meth = locl.addMethod("${m}");\n`;
                     ret += `  meth.skip();\n`;
                     continue;
                 }
-                ret += `      {\n        const test = await (new ${st.localClass}()).constructor_();\n`;
+                ret += `      {\n        const test = await (new ${lc}()).constructor_();\n`;
                 ret += `        if (test.setup) await test.setup();\n`;
-                ret += `        console.log("${st.obj.getName()}: running ${st.localClass}->${m}");\n`;
+                ret += `        console.log("${st.obj.getName()}: running ${lc}->${m}");\n`;
                 ret += `        meth = locl.addMethod("${m}");\n`;
                 ret += `        await test.${m}();\n`;
                 ret += `        meth.pass();\n`;
                 ret += `        if (test.teardown) await test.teardown();\n`;
                 ret += `      }\n`;
             }
-            ret += `      if (${st.localClass}.class_teardown) await ${st.localClass}.class_teardown();\n`;
+            ret += `      if (${lc}.class_teardown) await ${lc}.class_teardown();\n`;
             ret += `    }\n`;
         }
         /*
@@ -86676,6 +86976,8 @@ exports.validate = function (xmlData, options) {
             return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' doesn't have proper closing.", getLineNumberForPosition(xmlData, i));
           } else if (attrStr.trim().length > 0) {
             return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' can't have attributes or invalid starting.", getLineNumberForPosition(xmlData, tagStartPos));
+          } else if (tags.length === 0) {
+            return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' has not been opened.", getLineNumberForPosition(xmlData, tagStartPos));
           } else {
             const otg = tags.pop();
             if (tagName !== otg.tagName) {
@@ -87963,10 +88265,18 @@ const parseXml = function(xmlData) {
           let tagContent = "";
           //self-closing tag
           if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
+            if(tagName[tagName.length - 1] === "/"){ //remove trailing '/'
+              tagName = tagName.substr(0, tagName.length - 1);
+              jPath = jPath.substr(0, jPath.length - 1);
+              tagExp = tagName;
+            }else{
+              tagExp = tagExp.substr(0, tagExp.length - 1);
+            }
             i = result.closeIndex;
           }
           //unpaired tag
           else if(this.options.unpairedTags.indexOf(tagName) !== -1){
+            
             i = result.closeIndex;
           }
           //normal tag

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.8.25",
+  "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.25",
+    "@abaplint/transpiler": "^2.8.27",
     "@types/glob": "^8.1.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.7",
-    "@types/node": "^20.12.12",
-    "@abaplint/core": "^2.108.8",
+    "@types/node": "^20.14.2",
+    "@abaplint/core": "^2.109.3",
     "progress": "^2.0.3",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4",