@abaplint/cli 2.99.8 → 2.99.9

package/build/cli.js

@@ -30718,7 +30718,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Tables = void 0;
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
-const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const unknown_type_1 = __webpack_require__(/*! ../../types/basic/unknown_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/unknown_type.js");
 class Tables {
     runSyntax(node, scope, filename) {
         var _a, _b;
@@ -30730,13 +30730,15 @@ class Tables {
         if (name.startsWith("*")) {
             name = name.substr(1);
         }
+        // lookupTableOrView will also give Unknown and Void
         const found = (_b = scope.getDDIC()) === null || _b === void 0 ? void 0 : _b.lookupTableOrView(name);
         if (found) {
             scope.getDDICReferences().addUsing(scope.getParentObj(), { object: found.object, filename: filename, token: nameToken });
             scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, filename, found.type));
             return;
         }
-        scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, filename, new basic_1.UnknownType("Tables, fallback")));
+        // this should never happen,
+        scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, filename, new unknown_type_1.UnknownType("Tables, fallback")));
     }
 }
 exports.Tables = Tables;
@@ -39381,21 +39383,27 @@ class LSPLookup {
             const hover = "Method Definition \"" + method.getName() + "\"";
             return { hover, definition: found, definitionId: method, scope: bottomScope };
         }
+        let hoverValue = "";
+        const ddicRefs = reg.getDDICReferences().listByFilename(cursor.identifier.getFilename(), cursor.identifier.getStart().getRow());
+        for (const d of ddicRefs) {
+            if (d.object && d.token && d.token.getStart().equals(cursor.identifier.getStart())) {
+                hoverValue += `DDIC: ${d.object.getType()} ${d.object.getName()}`;
+            }
+        }
         const variable = bottomScope.findVariable(cursor.token.getStr());
         if (variable !== undefined && variable.getStart().equals(cursor.token.getStart())) {
             const hover = "Variable Definition\n\n" + this.dumpType(variable);
+            if (hoverValue !== "") {
+                hoverValue = hover + "\n_________________\n" + hoverValue;
+            }
+            else {
+                hoverValue = hover;
+            }
             let location = undefined;
             if (variable.getMeta().includes("built-in" /* IdentifierMeta.BuiltIn */) === false) {
                 location = _lsp_utils_1.LSPUtils.identiferToLocation(variable);
             }
-            return { hover, definition: location, implementation: location, definitionId: variable, scope: bottomScope };
-        }
-        let hoverValue = "";
-        const ddicRefs = reg.getDDICReferences().listByFilename(cursor.identifier.getFilename(), cursor.identifier.getStart().getRow());
-        for (const d of ddicRefs) {
-            if (d.object && d.token && d.token.getStart().equals(cursor.identifier.getStart())) {
-                hoverValue += `DDIC: ${d.object.getType()} ${d.object.getName()}`;
-            }
+            return { hover: hoverValue, definition: location, implementation: location, definitionId: variable, scope: bottomScope };
         }
         const refs = this.searchReferences(bottomScope, cursor.token);
         if (refs.length > 0) {
@@ -44983,10 +44991,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Program = void 0;
 const _abap_object_1 = __webpack_require__(/*! ./_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
 class Program extends _abap_object_1.ABAPObject {
-    constructor() {
-        super(...arguments);
-        this.isIncludeValue = undefined;
-    }
     getType() {
         return "PROG";
     }
@@ -45008,15 +45012,25 @@ class Program extends _abap_object_1.ABAPObject {
         };
     }
     setDirty() {
-        this.isIncludeValue = undefined;
+        this.parsedXML = undefined;
         super.setDirty();
     }
     isInclude() {
-        if (this.isIncludeValue === undefined) {
+        this.parseXML();
+        return this.parsedXML.isInclude;
+    }
+    isModulePool() {
+        this.parseXML();
+        return this.parsedXML.isModulePool;
+    }
+    parseXML() {
+        if (this.parsedXML === undefined) {
             const file = this.getXMLFile();
-            this.isIncludeValue = file ? file.getRaw().includes("<SUBC>I</SUBC>") : false;
+            this.parsedXML = {
+                isInclude: file ? file.getRaw().includes("<SUBC>I</SUBC>") : false,
+                isModulePool: file ? file.getRaw().includes("<SUBC>M</SUBC>") : false,
+            };
         }
-        return this.isIncludeValue;
     }
 }
 exports.Program = Program;
@@ -47591,7 +47605,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.99.8";
+        return "2.99.9";
     }
     getDDICReferences() {
         return this.references;
@@ -58904,7 +58918,9 @@ class MainFileContents {
         if (stru === undefined) {
             return [];
         }
-        if (obj instanceof Objects.Program && obj.isInclude() === false) {
+        if (obj instanceof Objects.Program
+            && obj.isInclude() === false
+            && obj.isModulePool() === false) {
             let count = 0;
             let first = main.getStatements()[count];
             while (first !== undefined && first.get() instanceof _statement_1.Comment) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.99.8",
+    "version": "2.99.9",
     "description": "abaplint - Command Line Interface",
     "bin": {
         "abaplint": "./abaplint"
@@ -37,12 +37,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.99.8",
+        "@abaplint/core": "^2.99.9",
         "@types/chai": "^4.3.5",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.1.0",
+        "@types/node": "^20.1.1",
         "@types/progress": "^2.0.5",
         "chai": "^4.3.7",
         "chalk": "^5.2.0",
@@ -55,7 +55,7 @@
         "progress": "^2.0.3",
         "typescript": "^5.0.4",
         "webpack": "^5.82.0",
-        "webpack-cli": "^5.1.0",
+        "webpack-cli": "^5.1.1",
         "xml-js": "^1.6.11"
     },
     "dependencies": {}