@abaplint/core 2.113.137 → 2.113.139

package/build/src/objects/function_group.js

@@ -80,12 +80,14 @@ class FunctionGroup extends _abap_object_1.ABAPObject {
                 }
                 if ((i.startsWith("L") || namespaced) && f.getFilename().includes(search.toLowerCase() + ".")) {
                     ret.push({ file: f, name: i });
+                    break;
                 }
                 // fix for URL encoded? Uris
                 if (namespaced) {
                     search = i.replace(/\//g, "%23");
                     if (f.getFilename().includes(search.toLowerCase() + ".")) {
                         ret.push({ file: f, name: i });
+                        break;
                     }
                 }
             }

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.137";
+        return "2.113.139";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/utils/include_graph.js

@@ -11,6 +11,7 @@ const _abap_object_1 = require("../objects/_abap_object");
 const severity_1 = require("../severity");
 // todo, check for cycles/circular dependencies, method findTop
 // todo, add configurable error for multiple use includes
+const FMXXINCLUDE = /^(\/\w+\/)?L.+XX$/;
 function getABAPObjects(reg) {
     const ret = [];
     for (const o of reg.getObjects()) {
@@ -22,40 +23,35 @@ function getABAPObjects(reg) {
 }
 class Graph {
     constructor() {
-        this.vertices = [];
-        this.edges = [];
+        this.verticesIncludenameIndex = {};
+        this.verticesFilenameIndex = {};
+        this.edges = {};
     }
     addVertex(vertex) {
-        this.vertices.push(vertex);
-    }
-    findInclude(includeName) {
-        for (const v of this.vertices) {
-            if (v.includeName.toUpperCase() === includeName.toUpperCase()) {
-                return v;
-            }
+        if (vertex.includeName !== undefined) {
+            this.verticesIncludenameIndex[vertex.includeName.toUpperCase()] = vertex;
         }
-        return undefined;
+        this.verticesFilenameIndex[vertex.filename.toUpperCase()] = vertex;
     }
-    findVertex(filename) {
-        for (const v of this.vertices) {
-            if (v.filename.toUpperCase() === filename.toUpperCase()) {
-                return v;
-            }
-        }
-        return undefined;
+    findVertexViaIncludename(includeName) {
+        return this.verticesIncludenameIndex[includeName.toUpperCase()];
+    }
+    findVertexByFilename(filename) {
+        return this.verticesFilenameIndex[filename.toUpperCase()];
     }
     addEdge(from, toFilename) {
-        this.edges.push({ from: from.filename, to: toFilename });
+        if (this.edges[from.filename] === undefined) {
+            this.edges[from.filename] = [];
+        }
+        this.edges[from.filename].push(toFilename);
     }
     findTop(filename) {
         const ret = [];
-        for (const e of this.edges) {
-            if (e.from === filename) {
-                ret.push(...this.findTop(e.to));
-            }
+        for (const to of this.edges[filename] || []) {
+            ret.push(...this.findTop(to));
         }
         if (ret.length === 0) {
-            const found = this.findVertex(filename);
+            const found = this.findVertexByFilename(filename);
             if (found !== undefined) {
                 ret.push(found);
             }
@@ -99,19 +95,23 @@ class IncludeGraph {
         this.addVertices();
         for (const o of getABAPObjects(this.reg)) {
             for (const f of o.getABAPFiles()) {
+                if (f.getFilename().includes(".prog.screen_") || f.getFilename().includes(".fugr.screen_")) {
+                    // skip dynpro files
+                    continue;
+                }
                 for (const s of f.getStatements()) {
                     if (s.get() instanceof statements_1.Include) {
-                        const ifFound = s.concatTokens().toUpperCase().includes("IF FOUND");
                         const iexp = s.findFirstExpression(expressions_1.IncludeName);
                         if (iexp === undefined) {
                             throw new Error("unexpected Include node");
                         }
                         const name = iexp.getFirstToken().getStr().toUpperCase();
-                        if (name.match(/^(\/\w+\/)?L.+XX$/)) { // function module XX includes, possibily namespaced
+                        if (name.match(FMXXINCLUDE)) { // function module XX includes, possibily namespaced
                             continue;
                         }
-                        const found = this.graph.findInclude(name);
+                        const found = this.graph.findVertexViaIncludename(name);
                         if (found === undefined) {
+                            const ifFound = s.concatTokens().toUpperCase().includes("IF FOUND");
                             if (ifFound === false) {
                                 const issue = issue_1.Issue.atStatement(f, s, "Include " + name + " not found", new check_include_1.CheckInclude().getMetadata().key, severity_1.Severity.Error);
                                 this.issues.push(issue);
@@ -131,7 +131,7 @@ class IncludeGraph {
         this.findUnusedIncludes();
     }
     findUnusedIncludes() {
-        for (const v of this.graph.vertices) {
+        for (const v of Object.values(this.graph.verticesFilenameIndex)) {
             if (v.include === true) {
                 if (this.listMainForInclude(v.filename).length === 0) {
                     const f = this.reg.getFileByName(v.filename);
@@ -161,7 +161,7 @@ class IncludeGraph {
                 if (file) {
                     this.graph.addVertex({
                         filename: file.getFilename(),
-                        includeName: o.getName(),
+                        includeName: undefined,
                         include: false
                     });
                 }
@@ -170,7 +170,7 @@ class IncludeGraph {
                 for (const f of o.getSequencedFiles()) {
                     this.graph.addVertex({
                         filename: f.getFilename(),
-                        includeName: o.getName(),
+                        includeName: undefined,
                         include: false
                     });
                 }
@@ -187,7 +187,7 @@ class IncludeGraph {
                 if (file) {
                     this.graph.addVertex({
                         filename: file.getFilename(),
-                        includeName: o.getName(),
+                        includeName: undefined, // this is the SAPL program
                         include: false
                     });
                 }

package/package.json

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