@abaplint/cli 2.101.12 → 2.101.14

package/build/cli.js

@@ -25529,27 +25529,36 @@ class Source {
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
                         const bodyType = new reduce_body_1.ReduceBody().runSyntax(node.findDirectExpression(Expressions.ReduceBody), scope, filename, foundType);
-                        if (foundType === undefined || foundType.isGeneric() === true) {
+                        if (foundType === undefined || foundType.isGeneric()) {
                             this.addIfInferred(node, scope, filename, bodyType);
                         }
+                        else {
+                            this.addIfInferred(node, scope, filename, foundType);
+                        }
                         return foundType ? foundType : bodyType;
                     }
                 case "SWITCH":
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
                         const bodyType = new switch_body_1.SwitchBody().runSyntax(node.findDirectExpression(Expressions.SwitchBody), scope, filename);
-                        if (foundType === undefined || foundType.isGeneric() === true) {
+                        if (foundType === undefined || foundType.isGeneric()) {
                             this.addIfInferred(node, scope, filename, bodyType);
                         }
+                        else {
+                            this.addIfInferred(node, scope, filename, foundType);
+                        }
                         return foundType ? foundType : bodyType;
                     }
                 case "COND":
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
                         const bodyType = new cond_body_1.CondBody().runSyntax(node.findDirectExpression(Expressions.CondBody), scope, filename);
-                        if (foundType === undefined || foundType.isGeneric() === true) {
+                        if (foundType === undefined || foundType.isGeneric()) {
                             this.addIfInferred(node, scope, filename, bodyType);
                         }
+                        else {
+                            this.addIfInferred(node, scope, filename, foundType);
+                        }
                         return foundType ? foundType : bodyType;
                     }
                 case "CONV":
@@ -25590,7 +25599,9 @@ class Source {
                 case "CORRESPONDING":
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
-                        return new corresponding_body_1.CorrespondingBody().runSyntax(node.findDirectExpression(Expressions.CorrespondingBody), scope, filename, foundType);
+                        new corresponding_body_1.CorrespondingBody().runSyntax(node.findDirectExpression(Expressions.CorrespondingBody), scope, filename, foundType);
+                        this.addIfInferred(node, scope, filename, foundType);
+                        return foundType;
                     }
                 case "EXACT":
                     return this.determineType(node, scope, filename, targetType);
@@ -25686,10 +25697,12 @@ class Source {
             throw new Error("determineType, child TypeNameOrInfer not found");
         }
         else if (typeName === "#" && targetType) {
-            const found = basic.lookupQualifiedName(targetType.getQualifiedName());
+            // const found = basic.lookupQualifiedName(targetType.getQualifiedName());
+            /*
             if (found) {
-                scope.addReference(typeToken, found, _reference_1.ReferenceType.InferredType, filename);
+              scope.addReference(typeToken, found, ReferenceType.InferredType, filename);
             }
+            */
             return targetType;
         }
         if (typeName !== "#" && typeToken) {
@@ -26359,6 +26372,7 @@ class ValueBody {
             }
             for (const l of foo.findDirectExpressions(Expressions.ValueBodyLines)) {
                 for (const s of l.findDirectExpressions(Expressions.Source)) {
+                    // LINES OF ?? todo, pass type,
                     new source_1.Source().runSyntax(s, scope, filename);
                 }
             }
@@ -26366,7 +26380,7 @@ class ValueBody {
                 new field_assignment_1.FieldAssignment().runSyntax(s, scope, filename, rowType);
             }
             for (const s of foo.findDirectExpressions(Expressions.Source)) {
-                new source_1.Source().runSyntax(s, scope, filename);
+                new source_1.Source().runSyntax(s, scope, filename, rowType);
             }
         }
         if (letScoped === true) {
@@ -29110,9 +29124,9 @@ class InsertInternal {
             }
         }
         for (const s of node.findDirectExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename, targetType);
-        }
-        for (const s of node.findDirectExpressions(Expressions.SimpleSource4)) {
+            if (s === source) {
+                continue;
+            }
             new source_1.Source().runSyntax(s, scope, filename, targetType);
         }
     }
@@ -40007,6 +40021,9 @@ class LSPUtils {
     static tokenToRange(token) {
         return LServer.Range.create(token.getStart().getRow() - 1, token.getStart().getCol() - 1, token.getEnd().getRow() - 1, token.getEnd().getCol() - 1);
     }
+    static positionToLS(pos) {
+        return LServer.Position.create(pos.getRow() - 1, pos.getCol() - 1);
+    }
     static identiferToLocation(identifier) {
         return {
             uri: identifier.getFilename(),
@@ -40166,7 +40183,7 @@ class CodeLens {
     constructor(reg) {
         this.reg = reg;
     }
-    list(textDocument) {
+    list(textDocument, settings = { messageText: true }) {
         var _a;
         const file = _lsp_utils_1.LSPUtils.getABAPFile(this.reg, textDocument.uri);
         if (file === undefined) {
@@ -40178,14 +40195,22 @@ class CodeLens {
         }
         new syntax_1.SyntaxLogic(this.reg, obj).run();
         const ret = [];
-        const list = this.reg.getMSAGReferences().listByFilename(file.getFilename());
-        for (const l of list) {
-            const msag = this.reg.getObject("MSAG", l.messageClass);
-            if (msag === undefined) {
-                continue;
+        if (settings.messageText === true) {
+            const list = this.reg.getMSAGReferences().listByFilename(file.getFilename());
+            for (const l of list) {
+                const msag = this.reg.getObject("MSAG", l.messageClass);
+                if (msag === undefined) {
+                    continue;
+                }
+                const text = (_a = msag.getByNumber(l.number)) === null || _a === void 0 ? void 0 : _a.getMessage();
+                if (text === undefined) {
+                    continue;
+                }
+                ret.push({
+                    range: _lsp_utils_1.LSPUtils.tokenToRange(l.token),
+                    command: LServer.Command.create(text, ""),
+                });
             }
-            const text = (_a = msag.getByNumber(l.number)) === null || _a === void 0 ? void 0 : _a.getMessage();
-            ret.push(LServer.CodeLens.create(_lsp_utils_1.LSPUtils.tokenToRange(l.token), text));
         }
         return ret;
     }
@@ -40867,6 +40892,81 @@ exports.Implementation = Implementation;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/lsp/inlay_hints.js":
+/*!******************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/lsp/inlay_hints.js ***!
+  \******************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.InlayHints = void 0;
+const LServer = __webpack_require__(/*! vscode-languageserver-types */ "./node_modules/vscode-languageserver-types/lib/esm/main.js");
+const _lsp_utils_1 = __webpack_require__(/*! ./_lsp_utils */ "./node_modules/@abaplint/core/build/src/lsp/_lsp_utils.js");
+const syntax_1 = __webpack_require__(/*! ../abap/5_syntax/syntax */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/syntax.js");
+const _abap_object_1 = __webpack_require__(/*! ../objects/_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
+const _reference_1 = __webpack_require__(/*! ../abap/5_syntax/_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
+const _typed_identifier_1 = __webpack_require__(/*! ../abap/types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
+const types_1 = __webpack_require__(/*! ../abap/types */ "./node_modules/@abaplint/core/build/src/abap/types/index.js");
+class InlayHints {
+    constructor(reg) {
+        this.reg = reg;
+    }
+    list(textDocument, settings = { inferredTypes: true }) {
+        const file = _lsp_utils_1.LSPUtils.getABAPFile(this.reg, textDocument.uri);
+        if (file === undefined) {
+            return [];
+        }
+        const obj = this.reg.findObjectForFile(file);
+        if (obj === undefined || !(obj instanceof _abap_object_1.ABAPObject)) {
+            return [];
+        }
+        const top = new syntax_1.SyntaxLogic(this.reg, obj).run().spaghetti.getTop();
+        const ret = [];
+        if (settings.inferredTypes === true) {
+            const implicit = this.findImplicitReferences(top);
+            for (const i of implicit) {
+                let label = undefined;
+                if (i.resolved instanceof _typed_identifier_1.TypedIdentifier) {
+                    label = "TYPE " + i.resolved.getType().toABAP();
+                }
+                else if (i.resolved instanceof types_1.ClassDefinition) {
+                    label = "TYPE REF TO " + i.resolved.getName();
+                }
+                if (label === undefined) {
+                    continue;
+                }
+                ret.push({
+                    label: label,
+                    tooltip: "Inferred type",
+                    kind: LServer.InlayHintKind.Type,
+                    paddingLeft: true,
+                    paddingRight: true,
+                    position: _lsp_utils_1.LSPUtils.positionToLS(i.position.getEnd()),
+                });
+            }
+        }
+        return ret;
+    }
+    findImplicitReferences(node) {
+        const ret = [];
+        for (const r of node.getData().references) {
+            if (r.referenceType === _reference_1.ReferenceType.InferredType) {
+                ret.push(r);
+            }
+        }
+        for (const c of node.getChildren()) {
+            ret.push(...this.findImplicitReferences(c));
+        }
+        return ret;
+    }
+}
+exports.InlayHints = InlayHints;
+//# sourceMappingURL=inlay_hints.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/lsp/language_server.js":
 /*!**********************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/lsp/language_server.js ***!
@@ -40893,6 +40993,7 @@ const implementation_1 = __webpack_require__(/*! ./implementation */ "./node_mod
 const semantic_1 = __webpack_require__(/*! ./semantic */ "./node_modules/@abaplint/core/build/src/lsp/semantic.js");
 const statement_flow_1 = __webpack_require__(/*! ../abap/flow/statement_flow */ "./node_modules/@abaplint/core/build/src/abap/flow/statement_flow.js");
 const code_lens_1 = __webpack_require__(/*! ./code_lens */ "./node_modules/@abaplint/core/build/src/lsp/code_lens.js");
+const inlay_hints_1 = __webpack_require__(/*! ./inlay_hints */ "./node_modules/@abaplint/core/build/src/lsp/inlay_hints.js");
 // note Ranges are zero based in LSP,
 // https://github.com/microsoft/language-server-protocol/blob/main/versions/protocol-2-x.md#range
 // but 1 based in abaplint
@@ -40974,8 +41075,12 @@ class LanguageServer {
         return new semantic_1.SemanticHighlighting(this.reg).semanticTokensRange(range);
     }
     // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_codeLens
-    codeLens(textDocument) {
-        return new code_lens_1.CodeLens(this.reg).list(textDocument);
+    codeLens(textDocument, settings) {
+        return new code_lens_1.CodeLens(this.reg).list(textDocument, settings);
+    }
+    // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
+    inlayHints(textDocument, settings) {
+        return new inlay_hints_1.InlayHints(this.reg).list(textDocument, settings);
     }
     ////////////////////////////////////////
     //  ______      _
@@ -48184,7 +48289,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.101.12";
+        return "2.101.14";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -70813,7 +70918,7 @@ function isNotation(xmlData, i){
 
 //an entity name should not contains special characters that may be used in regex
 //Eg !?\\\/[]$%{}^&*()<>
-const specialChar = "!?\\\/[]$%{}^&*()<>";
+const specialChar = "!?\\\/[]$%{}^&*()<>|+";
 
 function validateEntityName(name){
     for (let i = 0; i < specialChar.length; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.101.12",
+    "version": "2.101.14",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.101.12",
+        "@abaplint/core": "^2.101.14",
         "@types/chai": "^4.3.5",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",
@@ -55,7 +55,7 @@
         "mocha": "^10.2.0",
         "progress": "^2.0.3",
         "typescript": "^5.1.3",
-        "webpack": "^5.85.0",
+        "webpack": "^5.85.1",
         "webpack-cli": "^5.1.3",
         "xml-js": "^1.6.11"
     },