@abaplint/core 2.80.4 → 2.80.8

package/build/src/abap/5_syntax/statements/delete_report.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeleteReport = void 0;
+const Expressions = require("../../2_statements/expressions");
+const source_1 = require("../expressions/source");
+class DeleteReport {
+    runSyntax(node, scope, filename) {
+        for (const s of node.findDirectExpressions(Expressions.Source)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
+    }
+}
+exports.DeleteReport = DeleteReport;
+//# sourceMappingURL=delete_report.js.map

package/build/src/abap/5_syntax/statements/get_cursor.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetCursor = void 0;
+const Expressions = require("../../2_statements/expressions");
+const target_1 = require("../expressions/target");
+class GetCursor {
+    runSyntax(node, scope, filename) {
+        for (const t of node.findAllExpressions(Expressions.Target)) {
+            new target_1.Target().runSyntax(t, scope, filename);
+        }
+    }
+}
+exports.GetCursor = GetCursor;
+//# sourceMappingURL=get_cursor.js.map

package/build/src/abap/5_syntax/statements/insert_textpool.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InsertTextpool = void 0;
+const Expressions = require("../../2_statements/expressions");
+const source_1 = require("../expressions/source");
+class InsertTextpool {
+    runSyntax(node, scope, filename) {
+        for (const s of node.findDirectExpressions(Expressions.Source)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
+    }
+}
+exports.InsertTextpool = InsertTextpool;
+//# sourceMappingURL=insert_textpool.js.map

package/build/src/abap/5_syntax/syntax.js

@@ -122,11 +122,14 @@ const set_titlebar_1 = require("./statements/set_titlebar");
 const call_transaction_1 = require("./statements/call_transaction");
 const set_handler_1 = require("./statements/set_handler");
 const wait_1 = require("./statements/wait");
+const delete_report_1 = require("./statements/delete_report");
 const shift_1 = require("./statements/shift");
 const set_bit_1 = require("./statements/set_bit");
 const modify_screen_1 = require("./statements/modify_screen");
 const delete_cluster_1 = require("./statements/delete_cluster");
 const unassign_1 = require("./statements/unassign");
+const insert_textpool_1 = require("./statements/insert_textpool");
+const get_cursor_1 = require("./statements/get_cursor");
 // -----------------------------------
 const map = {};
 function addToMap(handler) {
@@ -146,6 +149,7 @@ if (Object.keys(map).length === 0) {
     addToMap(new move_1.Move());
     addToMap(new get_badi_1.GetBadi());
     addToMap(new call_badi_1.CallBadi());
+    addToMap(new get_cursor_1.GetCursor());
     addToMap(new replace_1.Replace());
     addToMap(new truncate_dataset_1.TruncateDataset());
     addToMap(new assert_1.Assert());
@@ -154,8 +158,10 @@ if (Object.keys(map).length === 0) {
     addToMap(new set_pf_status_1.SetPFStatus());
     addToMap(new set_titlebar_1.SetTitlebar());
     addToMap(new submit_1.Submit());
+    addToMap(new insert_textpool_1.InsertTextpool());
     addToMap(new read_table_1.ReadTable());
     addToMap(new syntax_check_1.SyntaxCheck());
+    addToMap(new delete_report_1.DeleteReport());
     addToMap(new import_1.Import());
     addToMap(new collect_1.Collect());
     addToMap(new export_1.Export());

package/build/src/abap/flow/flow_graph.js

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FlowGraph = void 0;
+class FlowGraph {
+    constructor(counter) {
+        this.label = "undefined";
+        this.edges = {};
+        this.start = "start#" + counter;
+        this.end = "end#" + counter;
+    }
+    getStart() {
+        return this.start;
+    }
+    getEnd() {
+        return this.end;
+    }
+    addEdge(from, to) {
+        if (this.edges[from] === undefined) {
+            this.edges[from] = {};
+        }
+        this.edges[from][to] = true;
+    }
+    removeEdge(from, to) {
+        if (this.edges[from] === undefined) {
+            return;
+        }
+        delete this.edges[from][to];
+        if (Object.keys(this.edges[from]).length === 0) {
+            delete this.edges[from];
+        }
+    }
+    listEdges() {
+        const list = [];
+        for (const from of Object.keys(this.edges)) {
+            for (const to of Object.keys(this.edges[from])) {
+                list.push({ from, to });
+            }
+        }
+        return list;
+    }
+    listNodes() {
+        const set = new Set();
+        for (const l of this.listEdges()) {
+            set.add(l.from);
+            set.add(l.to);
+        }
+        return Array.from(set.values());
+    }
+    hasEdges() {
+        return Object.keys(this.edges).length > 0;
+    }
+    /** return value: end node of to graph */
+    addGraph(from, to) {
+        if (to.hasEdges() === false) {
+            return from;
+        }
+        this.addEdge(from, to.getStart());
+        to.listEdges().forEach(e => this.addEdge(e.from, e.to));
+        return to.getEnd();
+    }
+    toJSON() {
+        return JSON.stringify(this.edges);
+    }
+    toTextEdges() {
+        let graph = "";
+        for (const l of this.listEdges()) {
+            graph += `"${l.from}" -> "${l.to}";\n`;
+        }
+        return graph.trim();
+    }
+    setLabel(label) {
+        this.label = label;
+    }
+    toDigraph() {
+        return `digraph G {
+labelloc="t";
+label="${this.label}";
+graph [fontname = "helvetica"];
+node [fontname = "helvetica", shape="box"];
+edge [fontname = "helvetica"];
+${this.toTextEdges()}
+}`;
+    }
+    listSources(node) {
+        const set = new Set();
+        for (const l of this.listEdges()) {
+            if (node === l.to) {
+                set.add(l.from);
+            }
+        }
+        return Array.from(set.values());
+    }
+    listTargets(node) {
+        const set = new Set();
+        for (const l of this.listEdges()) {
+            if (node === l.from) {
+                set.add(l.to);
+            }
+        }
+        return Array.from(set.values());
+    }
+    /** removes all nodes containing "#" that have one ingoing and one outgoing edge */
+    reduce() {
+        for (const node of this.listNodes()) {
+            if (node.includes("#") === false) {
+                continue;
+            }
+            const sources = this.listSources(node);
+            const targets = this.listTargets(node);
+            if (sources.length > 0 && targets.length > 0) {
+                // hash node in the middle of the graph
+                for (const s of sources) {
+                    this.removeEdge(s, node);
+                }
+                for (const t of targets) {
+                    this.removeEdge(node, t);
+                }
+                for (const s of sources) {
+                    for (const t of targets) {
+                        this.addEdge(s, t);
+                    }
+                }
+            }
+            if (node.startsWith("end#") && sources.length === 0) {
+                for (const t of targets) {
+                    this.removeEdge(node, t);
+                }
+            }
+        }
+        return this;
+    }
+}
+exports.FlowGraph = FlowGraph;
+//# sourceMappingURL=flow_graph.js.map

package/build/src/abap/flow/statement_flow.js

@@ -1,211 +1,184 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatementFlow = exports.dumpFlows = exports.dumpFlowsWithDescription = void 0;
+exports.StatementFlow = void 0;
 const nodes_1 = require("../nodes");
 const Structures = require("../3_structures/structures");
 const Statements = require("../2_statements/statements");
 const Expressions = require("../2_statements/expressions");
-function dumpFlowsWithDescription(flows) {
-    let ret = "";
-    for (const f of flows) {
-        ret += f.description + ": [" + f.statements.map(b => b === null || b === void 0 ? void 0 : b.get().constructor.name).join(",") + "]\n";
-    }
-    return ret.trim();
-}
-exports.dumpFlowsWithDescription = dumpFlowsWithDescription;
-function dumpFlows(flows) {
-    const ret = "[" + flows.map(f => "[" + f.statements.map(b => b === null || b === void 0 ? void 0 : b.get().constructor.name).join(",") + "]").join(",");
-    return ret + "]";
-}
-exports.dumpFlows = dumpFlows;
-function findBody(f) {
-    var _a;
-    return ((_a = f.findDirectStructure(Structures.Body)) === null || _a === void 0 ? void 0 : _a.getChildren()) || [];
-}
-function removeDuplicates(flows) {
-    const result = [];
-    for (const f of flows) {
-        let duplicate = false;
-        for (const r of result) {
-            if (f.statements.length !== r.statements.length) {
-                continue;
-            }
-            duplicate = true;
-            for (let index = 0; index < f.statements.length; index++) {
-                if (f.statements[index] !== r.statements[index]) {
-                    duplicate = false;
-                    break;
-                }
-            }
-        }
-        if (duplicate === false) {
-            result.push(f);
-        }
-    }
-    return result;
-}
-function pruneByStatement(flows, type) {
-    const result = [];
-    for (const f of flows) {
-        const nodes = [];
-        for (const n of f.statements) {
-            nodes.push(n);
-            if (n.get() instanceof type) {
-                break;
-            }
-        }
-        result.push({ statements: nodes });
-    }
-    return removeDuplicates(result);
-}
-////////////////////////////////////////////////////////////////
+const flow_graph_1 = require("./flow_graph");
 class StatementFlow {
+    constructor() {
+        this.counter = 0;
+    }
     build(stru) {
         var _a, _b;
         const ret = [];
         const forms = stru.findAllStructures(Structures.Form);
         for (const f of forms) {
-            let body = this.traverseBody(findBody(f));
-            const formName = (_a = f.findFirstExpression(Expressions.FormName)) === null || _a === void 0 ? void 0 : _a.concatTokens();
-            body = body.map((b) => { return { description: "FORM " + formName, statements: b.statements }; });
-            ret.push(...body);
+            const formName = "FORM " + ((_a = f.findFirstExpression(Expressions.FormName)) === null || _a === void 0 ? void 0 : _a.concatTokens());
+            this.counter = 1;
+            const graph = this.traverseBody(this.findBody(f), { procedureEnd: "end#1" });
+            graph.setLabel(formName);
+            ret.push(graph);
         }
         const methods = stru.findAllStructures(Structures.Method);
         for (const f of methods) {
-            let body = this.traverseBody(findBody(f));
-            const methodName = (_b = f.findFirstExpression(Expressions.MethodName)) === null || _b === void 0 ? void 0 : _b.concatTokens();
-            body = body.map((b) => { return { description: "METHOD " + methodName, statements: b.statements }; });
-            ret.push(...body);
+            const methodName = "METHOD " + ((_b = f.findFirstExpression(Expressions.MethodName)) === null || _b === void 0 ? void 0 : _b.concatTokens());
+            this.counter = 1;
+            const graph = this.traverseBody(this.findBody(f), { procedureEnd: "end#1" });
+            graph.setLabel(methodName);
+            ret.push(graph);
         }
-        return ret;
+        return ret.map(f => f.reduce());
+    }
+    findBody(f) {
+        var _a;
+        return ((_a = f.findDirectStructure(Structures.Body)) === null || _a === void 0 ? void 0 : _a.getChildren()) || [];
     }
-    traverseBody(children) {
-        let flows = [{ statements: [] }];
+    buildName(statement) {
+        let token = undefined;
+        const colon = statement.getColon();
+        if (colon === undefined) {
+            token = statement.getFirstToken();
+        }
+        else {
+            for (const t of statement.getTokens()) {
+                if (t.getStart().isAfter(colon.getEnd())) {
+                    token = t;
+                    break;
+                }
+            }
+        }
+        if (token === undefined) {
+            return "tokenError";
+        }
+        return statement.get().constructor.name +
+            ":" + token.getRow() +
+            "," + token.getCol();
+    }
+    traverseBody(children, context) {
+        const graph = new flow_graph_1.FlowGraph(this.counter++);
         if (children.length === 0) {
-            return [];
+            graph.addEdge(graph.getStart(), graph.getEnd());
+            return graph;
         }
-        for (let i = 0; i < children.length; i++) {
-            const c = children[i];
-            //      console.dir(c);
+        let current = graph.getStart();
+        for (const c of children) {
             if (c.get() instanceof Structures.Normal) {
                 const firstChild = c.getFirstChild(); // "Normal" only has one child
                 if (firstChild instanceof nodes_1.StatementNode) {
-                    flows.forEach(f => f.statements.push(firstChild));
-                    //          current.push(firstChild);
-                    //          console.dir("push: " + firstChild.constructor.name);
-                    if (firstChild.get() instanceof Statements.Check
-                        || firstChild.get() instanceof Statements.Assert) {
-                        const after = children.slice(i + 1, children.length);
-                        for (const b of this.traverseBody(after)) {
-                            for (const f of [...flows]) {
-                                flows.push({ statements: [...f.statements, ...b.statements] });
-                            }
+                    const name = this.buildName(firstChild);
+                    graph.addEdge(current, name);
+                    current = name;
+                    if (firstChild.get() instanceof Statements.Check) {
+                        if (context.loopStart) {
+                            graph.addEdge(name, context.loopStart);
+                        }
+                        else {
+                            graph.addEdge(name, context.procedureEnd);
                         }
-                        break;
+                    }
+                    else if (firstChild.get() instanceof Statements.Assert) {
+                        graph.addEdge(name, context.procedureEnd);
+                    }
+                    else if (firstChild.get() instanceof Statements.Continue && context.loopStart) {
+                        graph.addEdge(name, context.loopStart);
+                        return graph;
                     }
                     else if (firstChild.get() instanceof Statements.Exit) {
-                        break;
+                        if (context.loopEnd) {
+                            graph.addEdge(name, context.loopEnd);
+                        }
+                        else {
+                            graph.addEdge(name, context.procedureEnd);
+                        }
+                        return graph;
                     }
                     else if (firstChild.get() instanceof Statements.Return) {
-                        break;
+                        graph.addEdge(name, context.procedureEnd);
+                        return graph;
                     }
                 }
                 else if (firstChild instanceof nodes_1.StructureNode) {
-                    //          console.dir("firstch: " + firstChild.get().constructor.name);
-                    const found = this.traverseStructure(firstChild);
-                    //          console.dir("found: " + dump(found));
-                    const n = [];
-                    for (const existing of flows) {
-                        for (const fo of found) {
-                            const add = { statements: [...existing.statements, ...fo.statements] };
-                            n.push(add);
-                        }
-                    }
-                    //          console.dir(dump(n));
-                    flows = n;
+                    const sub = this.traverseStructure(firstChild, context);
+                    current = graph.addGraph(current, sub);
                 }
             }
         }
-        return flows;
+        graph.addEdge(current, graph.getEnd());
+        return graph;
     }
-    traverseStructure(n) {
-        let flows = [];
+    traverseStructure(n, context) {
+        const graph = new flow_graph_1.FlowGraph(this.counter++);
         if (n === undefined) {
-            return flows;
+            return graph;
         }
+        let current = graph.getStart();
         const type = n.get();
-        if (type instanceof Structures.Form) {
-            const formst = n.findDirectStatement(Statements.Form);
-            let bodyFlows = this.traverseBody(findBody(n));
-            //      console.dir(bodyFlows);
-            bodyFlows = bodyFlows.map(a => { return { statements: [formst, ...a.statements] }; });
-            flows.push(...bodyFlows);
-        }
-        else if (type instanceof Structures.Any) {
-            for (const c of n.getChildren()) {
-                //        console.dir("yep");
-                if (c instanceof nodes_1.StructureNode && c.get() instanceof Structures.Form) {
-                    flows.push(...this.traverseStructure(c));
-                }
-                else if (c instanceof nodes_1.StructureNode && c.get() instanceof Structures.If) {
-                    flows.push(...this.traverseStructure(c));
-                }
-                else {
-                    console.dir("any, todo, " + c.constructor.name + ", " + c.get().constructor.name);
-                }
-            }
-        }
-        else if (type instanceof Structures.Try) {
-            // TODO: this does not take exceptions into account
-            const firstTry = n.getFirstStatement();
-            let allPossibleBody = this.traverseBody(findBody(n));
-            allPossibleBody = allPossibleBody.map(b => { return { statements: [firstTry, ...b.statements] }; });
-            if (allPossibleBody.length === 0) {
-                allPossibleBody.push({ statements: [firstTry] });
-            }
-            flows.push(...allPossibleBody);
-            for (const c of n.findDirectStructures(Structures.Catch)) {
-                const firstCatch = c.getFirstStatement();
-                const catchBodies = this.traverseBody(findBody(c));
-                for (const bodyFlow of allPossibleBody) {
-                    for (const catchFlow of catchBodies) {
-                        flows.push({ statements: [...bodyFlow.statements, firstCatch, ...catchFlow.statements] });
-                    }
-                    if (catchBodies.length === 0) {
-                        flows.push({ statements: [...bodyFlow.statements, firstCatch] });
-                    }
-                }
-            }
-            // TODO, handle CLEANUP
-        }
-        else if (type instanceof Structures.If) {
-            const collect = [n.findDirectStatement(Statements.If)];
-            let bodyFlows = this.traverseBody(findBody(n));
-            bodyFlows = bodyFlows.map(b => { return { statements: [...collect, ...b.statements] }; });
-            flows.push(...bodyFlows);
+        if (type instanceof Structures.If) {
+            const ifName = this.buildName(n.findDirectStatement(Statements.If));
+            const sub = this.traverseBody(this.findBody(n), context);
+            graph.addEdge(current, ifName);
+            graph.addGraph(ifName, sub);
+            graph.addEdge(sub.getEnd(), graph.getEnd());
+            current = ifName;
             for (const e of n.findDirectStructures(Structures.ElseIf)) {
                 const elseifst = e.findDirectStatement(Statements.ElseIf);
                 if (elseifst === undefined) {
                     continue;
                 }
-                collect.push(elseifst);
-                let bodyFlows = this.traverseBody(findBody(e));
-                bodyFlows = bodyFlows.map(b => { return { statements: [...collect, ...b.statements] }; });
-                flows.push(...bodyFlows);
+                const elseIfName = this.buildName(elseifst);
+                const sub = this.traverseBody(this.findBody(e), context);
+                graph.addEdge(current, elseIfName);
+                graph.addGraph(elseIfName, sub);
+                graph.addEdge(sub.getEnd(), graph.getEnd());
+                current = elseIfName;
             }
             const els = n.findDirectStructure(Structures.Else);
             const elsest = els === null || els === void 0 ? void 0 : els.findDirectStatement(Statements.Else);
             if (els && elsest) {
-                let bodyFlows = this.traverseBody(findBody(els));
-                bodyFlows = bodyFlows.map(b => { return { statements: [...collect, elsest, ...b.statements] }; });
-                flows.push(...bodyFlows);
+                const elseName = this.buildName(elsest);
+                const sub = this.traverseBody(this.findBody(els), context);
+                graph.addEdge(current, elseName);
+                graph.addGraph(elseName, sub);
+                graph.addEdge(sub.getEnd(), graph.getEnd());
             }
             else {
-                flows.push({ statements: [...collect] });
+                graph.addEdge(ifName, graph.getEnd());
             }
         }
+        else if (type instanceof Structures.Loop
+            || type instanceof Structures.While
+            || type instanceof Structures.With
+            || type instanceof Structures.Provide
+            || type instanceof Structures.Select
+            || type instanceof Structures.Do) {
+            const loopName = this.buildName(n.getFirstStatement());
+            const sub = this.traverseBody(this.findBody(n), Object.assign(Object.assign({}, context), { loopStart: loopName, loopEnd: graph.getEnd() }));
+            graph.addEdge(current, loopName);
+            graph.addGraph(loopName, sub);
+            graph.addEdge(sub.getEnd(), loopName);
+            graph.addEdge(loopName, graph.getEnd());
+        }
+        else if (type instanceof Structures.Try) {
+            const tryName = this.buildName(n.getFirstStatement());
+            const body = this.traverseBody(this.findBody(n), context);
+            graph.addEdge(current, tryName);
+            graph.addGraph(tryName, body);
+            graph.addEdge(body.getEnd(), graph.getEnd());
+            for (const c of n.findDirectStructures(Structures.Catch)) {
+                const catchName = this.buildName(c.getFirstStatement());
+                const catchBody = this.traverseBody(this.findBody(c), context);
+                // TODO: this does not take exceptions into account
+                graph.addEdge(body.getEnd(), catchName);
+                graph.addGraph(catchName, catchBody);
+                graph.addEdge(catchBody.getEnd(), graph.getEnd());
+            }
+            // TODO, handle CLEANUP
+        }
         else if (type instanceof Structures.Case) {
-            const cas = n.getFirstStatement();
+            const caseName = this.buildName(n.getFirstStatement());
+            graph.addEdge(current, caseName);
             let othersFound = false;
             for (const w of n.findDirectStructures(Structures.When)) {
                 const first = w.getFirstStatement();
@@ -215,16 +188,19 @@ class StatementFlow {
                 if (first.get() instanceof Statements.WhenOthers) {
                     othersFound = true;
                 }
-                let bodyFlows = this.traverseBody(findBody(w));
-                bodyFlows = bodyFlows.map(b => { return { statements: [cas, first, ...b.statements] }; });
-                flows.push(...bodyFlows);
+                const firstName = this.buildName(first);
+                const sub = this.traverseBody(this.findBody(w), context);
+                graph.addEdge(caseName, firstName);
+                graph.addGraph(firstName, sub);
+                graph.addEdge(sub.getEnd(), graph.getEnd());
             }
             if (othersFound === false) {
-                flows.push({ statements: [cas] });
+                graph.addEdge(caseName, graph.getEnd());
             }
         }
         else if (type instanceof Structures.CaseType) {
-            const cas = n.getFirstStatement();
+            const caseName = this.buildName(n.getFirstStatement());
+            graph.addEdge(current, caseName);
             let othersFound = false;
             for (const w of n.findDirectStructures(Structures.WhenType)) {
                 const first = w.getFirstStatement();
@@ -234,40 +210,20 @@ class StatementFlow {
                 if (first.get() instanceof Statements.WhenOthers) {
                     othersFound = true;
                 }
-                let bodyFlows = this.traverseBody(findBody(w));
-                bodyFlows = bodyFlows.map(b => { return { statements: [cas, first, ...b.statements] }; });
-                flows.push(...bodyFlows);
+                const firstName = this.buildName(first);
+                const sub = this.traverseBody(this.findBody(w), context);
+                graph.addEdge(caseName, firstName);
+                graph.addGraph(firstName, sub);
+                graph.addEdge(sub.getEnd(), graph.getEnd());
             }
             if (othersFound === false) {
-                flows.push({ statements: [cas] });
-            }
-        }
-        else if (type instanceof Structures.Loop
-            || type instanceof Structures.While
-            || type instanceof Structures.With
-            || type instanceof Structures.Provide
-            || type instanceof Structures.Select
-            || type instanceof Structures.Do) {
-            const loop = n.getFirstStatement();
-            const bodyFlows = this.traverseBody(findBody(n));
-            for (const b of bodyFlows) {
-                flows.push({ statements: [loop, ...b.statements] });
-            }
-            for (const b1 of bodyFlows) {
-                for (const b2 of bodyFlows) {
-                    const add = [loop, ...b1.statements, ...b2.statements];
-                    flows.push({ statements: add });
-                }
+                graph.addEdge(caseName, graph.getEnd());
             }
-            flows.push({ statements: [loop] });
-            flows = pruneByStatement(flows, Statements.Exit);
-            flows = pruneByStatement(flows, Statements.Continue);
-            flows = pruneByStatement(flows, Statements.Return);
         }
         else {
-            console.dir("todo, " + n.get().constructor.name);
+            console.dir("StatementFlow,todo, " + n.get().constructor.name);
         }
-        return flows;
+        return graph;
     }
 }
 exports.StatementFlow = StatementFlow;

package/build/src/lsp/language_server.js

@@ -121,7 +121,9 @@ class LanguageServer {
         if (stru === undefined) {
             return "empty structure";
         }
-        return (0, statement_flow_1.dumpFlowsWithDescription)(new statement_flow_1.StatementFlow().build(stru)).replace(/\],\[/, "],\n[");
+        const graphs = new statement_flow_1.StatementFlow().build(stru);
+        const wiz = graphs.map(g => g.toDigraph());
+        return JSON.stringify(wiz);
     }
 }
 exports.LanguageServer = LanguageServer;

package/build/src/lsp/references.js

@@ -30,12 +30,12 @@ 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 = [];
         // todo, this first assumes that the identifier is a variable?
-        if (node.getIdentifier().stype === _scope_type_1.ScopeType.Method
-            || node.getIdentifier().stype === _scope_type_1.ScopeType.FunctionModule
-            || node.getIdentifier().stype === _scope_type_1.ScopeType.Form) {
+        const stype = node.getIdentifier().stype;
+        if (stype === _scope_type_1.ScopeType.Method || stype === _scope_type_1.ScopeType.FunctionModule || stype === _scope_type_1.ScopeType.Form) {
             ret = this.findReferences(node, identifier);
         }
         if (ret.length > 1 && exitAfterFound === true) {
@@ -71,15 +71,16 @@ class References {
         var _a;
         const ret = [];
         if (node.getIdentifier().stype !== _scope_type_1.ScopeType.BuiltIn) {
+            const upper = identifier.getName().toUpperCase();
             // this is for finding the definitions
             const vars = node.getData().vars;
-            const vid = vars[identifier.getName().toUpperCase()];
+            const vid = vars[upper];
             if (vid === null || vid === void 0 ? void 0 : vid.equals(identifier)) {
                 ret.push(vid);
             }
             // this is for finding the definitions
             const types = node.getData().types;
-            const tid = types[identifier.getName().toUpperCase()];
+            const tid = types[upper];
             if (tid === null || tid === void 0 ? void 0 : tid.equals(identifier)) {
                 ret.push(tid);
             }

package/build/src/registry.js

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

package/build/src/rules/unused_types.js

@@ -36,23 +36,25 @@ class WorkArea {
         return this.workarea.length;
     }
 }
-function removeDuplicates(list) {
-    const deduplicated = [];
-    for (const result of list) {
-        let cont = false;
-        for (const d of deduplicated) {
-            if (result.getStart().equals(d.getStart())) {
-                cont = true;
-                break;
-            }
-        }
-        if (cont === true) {
-            continue;
-        }
-        deduplicated.push(result);
-    }
-    return deduplicated;
+/*
+function removeDuplicates(list: readonly TypedIdentifier[]): readonly TypedIdentifier[] {
+  const deduplicated: TypedIdentifier[] = [];
+  for (const result of list) {
+    let cont = false;
+    for (const d of deduplicated) {
+      if (result.getStart().equals(d.getStart())) {
+        cont = true;
+        break;
+      }
+    }
+    if (cont === true) {
+      continue;
+    }
+    deduplicated.push(result);
+  }
+  return deduplicated;
 }
+*/
 class UnusedTypesConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -103,7 +105,10 @@ class UnusedTypes {
             return []; // exit early if all types are used in the current object
         }
         for (const o of this.reg.getObjects()) {
-            if (o instanceof _abap_object_1.ABAPObject) {
+            if (o === obj) {
+                continue;
+            }
+            else if (o instanceof _abap_object_1.ABAPObject) {
                 if (this.reg.isDependency(o)) {
                     continue; // do not search in dependencies
                 }
@@ -116,7 +121,7 @@ class UnusedTypes {
         }
         // what is left is unused
         const ret = [];
-        for (const t of removeDuplicates(this.workarea.get())) {
+        for (const t of this.workarea.get()) {
             const message = "Type \"" + t.getName() + "\" not used";
             const file = obj.getABAPFileByName(t.getFilename());
             if (file === undefined) {

package/build/src/rules/unused_variables.js

@@ -8,10 +8,10 @@ const syntax_1 = require("../abap/5_syntax/syntax");
 const _abap_object_1 = require("../objects/_abap_object");
 const _scope_type_1 = require("../abap/5_syntax/_scope_type");
 const objects_1 = require("../objects");
-const references_1 = require("../lsp/references");
 const edit_helper_1 = require("../edit_helper");
 const Statements = require("../abap/2_statements/statements");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
+const _reference_1 = require("../abap/5_syntax/_reference");
 class UnusedVariablesConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -22,6 +22,39 @@ class UnusedVariablesConf extends _basic_rule_config_1.BasicRuleConfig {
     }
 }
 exports.UnusedVariablesConf = UnusedVariablesConf;
+class WorkArea {
+    constructor() {
+        this.workarea = [];
+    }
+    push(id, count = 1) {
+        for (const w of this.workarea) {
+            if (id.equals(w.id)) {
+                return;
+            }
+        }
+        this.workarea.push({ id, count });
+    }
+    removeIfExists(id) {
+        if (id === undefined) {
+            return;
+        }
+        for (let i = 0; i < this.workarea.length; i++) {
+            if (id.equals(this.workarea[i].id)) {
+                this.workarea[i].count--;
+                if (this.workarea[i].count === 0) {
+                    this.workarea.splice(i, 1);
+                }
+                return;
+            }
+        }
+    }
+    get() {
+        return this.workarea;
+    }
+    count() {
+        return this.workarea.length;
+    }
+}
 class UnusedVariables {
     constructor() {
         this.conf = new UnusedVariablesConf();
@@ -33,11 +66,11 @@ class UnusedVariables {
             shortDescription: `Checks for unused variables and constants`,
             extendedInformation: `WARNING: slow
 
-      Experimental, might give false positives. Skips event parameters.
+Experimental, might give false positives. Skips event parameters.
 
-      Note that this currently does not work if the source code uses macros.
+Note that this currently does not work if the source code uses macros.
 
-      Unused variables are not reported if the object contains syntax errors.`,
+Unused variables are not reported if the object contains syntax errors. Errors found in INCLUDES are reported for the main program.`,
             tags: [_irule_1.RuleTag.Quickfix],
             pragma: "##NEEDED",
             pseudoComment: "EC NEEDED",
@@ -68,67 +101,91 @@ class UnusedVariables {
         if (syntax.issues.length > 0) {
             return [];
         }
-        const results = this.traverse(syntax.spaghetti.getTop(), obj);
-        // remove duplicates, quick and dirty
-        const deduplicated = [];
-        for (const result of results) {
-            let cont = false;
-            for (const d of deduplicated) {
-                if (result.getStart().equals(d.getStart())) {
-                    cont = true;
-                    break;
-                }
-            }
-            if (cont === true) {
+        this.workarea = new WorkArea();
+        const top = syntax.spaghetti.getTop();
+        this.buildWorkarea(top, obj);
+        if (this.workarea.count() === 0) {
+            return this.buildIssues(obj); // exit early if all types are used
+        }
+        this.findUses(top, obj);
+        for (const o of this.reg.getObjects()) {
+            if (o === obj) {
                 continue;
             }
-            deduplicated.push(result);
+            else if (o instanceof _abap_object_1.ABAPObject) {
+                if (this.reg.isDependency(o)) {
+                    continue; // do not search in dependencies
+                }
+                const syntax = new syntax_1.SyntaxLogic(this.reg, o).run();
+                this.findUses(syntax.spaghetti.getTop(), o);
+                if (this.workarea.count() === 0) {
+                    return this.buildIssues(obj); // exit early if all types are used
+                }
+            }
         }
-        return deduplicated;
+        return this.buildIssues(obj);
     }
-    traverse(node, obj) {
-        const ret = [];
-        if (node.getIdentifier().stype === _scope_type_1.ScopeType.OpenSQL) {
-            return [];
-        }
-        if (node.getIdentifier().stype !== _scope_type_1.ScopeType.BuiltIn) {
-            ret.push(...this.checkNode(node, obj));
+    findUses(node, obj) {
+        for (const r of node.getData().references) {
+            if (r.referenceType === _reference_1.ReferenceType.DataReadReference
+                || r.referenceType === _reference_1.ReferenceType.DataWriteReference
+                || r.referenceType === _reference_1.ReferenceType.TypeReference) {
+                this.workarea.removeIfExists(r.resolved);
+            }
         }
         for (const c of node.getChildren()) {
-            ret.push(...this.traverse(c, obj));
+            this.findUses(c, obj);
         }
-        return ret;
     }
-    checkNode(node, obj) {
+    buildWorkarea(node, obj) {
         var _a;
+        const stype = node.getIdentifier().stype;
+        if (stype === _scope_type_1.ScopeType.OpenSQL) {
+            return;
+        }
+        for (const c of node.getChildren()) {
+            this.buildWorkarea(c, obj);
+        }
+        if (stype !== _scope_type_1.ScopeType.BuiltIn) {
+            const vars = node.getData().vars;
+            for (const name in vars) {
+                const meta = vars[name].getMeta();
+                if (((_a = this.conf.skipNames) === null || _a === void 0 ? void 0 : _a.length) > 0
+                    && this.conf.skipNames.some((a) => a.toUpperCase() === name)) {
+                    continue;
+                }
+                else if (name === "ME"
+                    || name === "SUPER"
+                    || meta.includes("event_parameter" /* EventParameter */)) {
+                    // todo, workaround for "me" and "super", these should somehow be typed to built-in
+                    continue;
+                }
+                const isInline = meta.includes("inline" /* InlineDefinition */);
+                this.workarea.push(vars[name], isInline ? 2 : 1);
+            }
+        }
+    }
+    buildIssues(obj) {
         const ret = [];
-        const vars = node.getData().vars;
-        for (const name in vars) {
-            if (((_a = this.conf.skipNames) === null || _a === void 0 ? void 0 : _a.length) > 0
-                && this.conf.skipNames.some((a) => a.toUpperCase() === name)) {
+        for (const w of this.workarea.get()) {
+            const filename = w.id.getFilename();
+            if (this.reg.isFileDependency(filename) === true) {
                 continue;
             }
-            if (name === "ME"
-                || name === "SUPER"
-                || vars[name].getMeta().includes("event_parameter" /* EventParameter */)) {
-                // todo, workaround for "me" and "super", these should somehow be typed to built-in
+            else if (obj instanceof objects_1.Program === false && obj.containsFile(filename) === false) {
                 continue;
             }
-            else if ((obj.containsFile(vars[name].getFilename())
-                || node.getIdentifier().stype === _scope_type_1.ScopeType.Program
-                || node.getIdentifier().stype === _scope_type_1.ScopeType.Form)
-                && this.isUsed(vars[name], node) === false) {
-                const message = "Variable \"" + name.toLowerCase() + "\" not used";
-                const statement = this.findStatement(vars[name]);
-                if (statement === null || statement === void 0 ? void 0 : statement.getPragmas().map(t => t.getStr()).includes(this.getMetadata().pragma + "")) {
-                    continue;
-                }
-                else if (this.suppressedbyPseudo(statement, vars[name], obj)) {
-                    continue;
-                }
-                const fix = this.buildFix(vars[name], obj);
-                ret.push(issue_1.Issue.atIdentifier(vars[name], message, this.getMetadata().key, this.conf.severity, fix));
+            const statement = this.findStatement(w.id);
+            if (statement === null || statement === void 0 ? void 0 : statement.getPragmas().map(t => t.getStr()).includes(this.getMetadata().pragma + "")) {
+                continue;
             }
+            else if (this.suppressedbyPseudo(statement, w.id, obj)) {
+                continue;
+            }
+            const name = w.id.getName();
+            const message = "Variable \"" + name.toLowerCase() + "\" not used";
+            const fix = this.buildFix(w.id, obj);
+            ret.push(issue_1.Issue.atIdentifier(w.id, message, this.getMetadata().key, this.conf.severity, fix));
         }
         return ret;
     }
@@ -151,16 +208,6 @@ class UnusedVariables {
         }
         return false;
     }
-    isUsed(id, node) {
-        const isInline = id.getMeta().includes("inline" /* InlineDefinition */);
-        const found = new references_1.References(this.reg).search(id, node, true, isInline === false);
-        if (isInline === true) {
-            return found.length > 2; // inline definitions are always written to
-        }
-        else {
-            return found.length > 1;
-        }
-    }
     findStatement(v) {
         const file = this.reg.getFileByName(v.getFilename());
         if (file === undefined) {

package/package.json

@@ -1,29 +1,19 @@
 {
     "name": "@abaplint/core",
-    "version": "2.80.4",
+    "version": "2.80.8",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
     "scripts": {
-        "madge.orphans": "madge --extensions ts --ts-config tsconfig.json --orphans src/",
-        "madge.svg": "madge --extensions ts --ts-config tsconfig.json  --image graph.svg src/",
-        "madge.circular": "madge --extensions ts --ts-config tsconfig.json --circular src/",
         "lint": "eslint src/**/*.ts test/**/*.ts --format unix",
         "lint:fix": "eslint src/**/*.ts test/**/*.ts --format unix --fix",
-        "compile": "tsc",
-        "postcompile": "sh scripts/version.sh",
-        "pretest": "npm run compile",
-        "test": "mocha --timeout 1000",
+        "compile": "tsc && sh scripts/version.sh",
+        "test": "npm run compile && mocha --timeout 1000 && npm run lint && npm run schema && api-extractor run",
         "test:only": "npm run compile && mocha",
         "test:parallel": "npm run compile && mocha --timeout 1000 --parallel --reporter dot",
-        "posttest": "npm run lint && npm run schema && api-extractor run",
-        "prepublishOnly": "rm -rf build && npm run test",
-        "precoverage": "npm run compile",
-        "coverage": "c8 mocha",
-        "postcoverage": "c8 report --reporter=html",
-        "preschema": "node scripts/schema.js > scripts/schema.ts",
-        "schema": "ts-json-schema-generator --tsconfig tsconfig_schema.json --jsDoc extended --path scripts/schema.ts > scripts/schema.json",
-        "postschema": "node scripts/schema_post.js"
+        "coverage": "npm run compile && c8 mocha && c8 report --reporter=html",
+        "schema": "node scripts/schema.js > scripts/schema.ts && ts-json-schema-generator --tsconfig tsconfig_schema.json --jsDoc extended --path scripts/schema.ts > scripts/schema.json && node scripts/schema_post.js",
+        "publish:patch": "npm --no-git-tag-version version patch && rm -rf build && npm install && npm run test && npm publish --access public"
     },
     "mocha": {
         "recursive": true,
@@ -54,17 +44,16 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.18.17",
+        "@microsoft/api-extractor": "^7.18.19",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.6",
         "chai": "^4.3.4",
-        "eslint": "^8.1.0",
-        "madge": "^5.0.1",
+        "eslint": "^8.2.0",
         "mocha": "^9.1.3",
         "c8": "^7.10.0",
         "source-map-support": "^0.5.20",
-        "ts-json-schema-generator": "^0.96.0",
+        "ts-json-schema-generator": "^0.97.0",
         "typescript": "^4.4.4"
     },
     "dependencies": {