@abaplint/core 2.101.12 → 2.101.13

package/build/abaplint.d.ts

@@ -1063,6 +1063,10 @@ declare class CloseDataset implements IStatement {
     getMatcher(): IStatementRunnable;
 }
 
+declare type CodeLensSettings = {
+    messageText: boolean;
+};
+
 declare class Collect implements IStatement {
     getMatcher(): IStatementRunnable;
 }
@@ -3272,6 +3276,10 @@ declare class Initialization implements IStatement {
     getMatcher(): IStatementRunnable;
 }
 
+declare type InlayHintsSettings = {
+    inferredTypes: boolean;
+};
+
 declare class InlineData extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -3787,7 +3795,8 @@ export declare class LanguageServer {
     references(params: ITextDocumentPositionParams): LServer.Location[];
     static semanticTokensLegend(): LServer.SemanticTokensLegend;
     semanticTokensRange(range: ITextDocumentRange): LServer.SemanticTokens;
-    codeLens(textDocument: LServer.TextDocumentIdentifier): LServer.CodeLens[];
+    codeLens(textDocument: LServer.TextDocumentIdentifier, settings?: CodeLensSettings): LServer.CodeLens[];
+    inlayHints(textDocument: LServer.TextDocumentIdentifier, settings?: InlayHintsSettings): LServer.InlayHint[];
     help(textDocument: LServer.TextDocumentIdentifier, position: LServer.Position): string;
     listDefinitionPositions(textDocument: LServer.TextDocumentIdentifier): LServer.Range[];
     listReadPositions(textDocument: LServer.TextDocumentIdentifier): LServer.Range[];

package/build/src/abap/5_syntax/expressions/source.js

@@ -65,27 +65,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":
@@ -222,10 +231,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) {

package/build/src/lsp/_lsp_utils.js

@@ -26,6 +26,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(),

package/build/src/lsp/code_lens.js

@@ -9,7 +9,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) {
@@ -21,14 +21,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;
     }

package/build/src/lsp/inlay_hints.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InlayHints = void 0;
+const LServer = require("vscode-languageserver-types");
+const _lsp_utils_1 = require("./_lsp_utils");
+const syntax_1 = require("../abap/5_syntax/syntax");
+const _abap_object_1 = require("../objects/_abap_object");
+const _reference_1 = require("../abap/5_syntax/_reference");
+const _typed_identifier_1 = require("../abap/types/_typed_identifier");
+const types_1 = require("../abap/types");
+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

package/build/src/lsp/language_server.js

@@ -17,6 +17,7 @@ const implementation_1 = require("./implementation");
 const semantic_1 = require("./semantic");
 const statement_flow_1 = require("../abap/flow/statement_flow");
 const code_lens_1 = require("./code_lens");
+const inlay_hints_1 = require("./inlay_hints");
 // 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
@@ -98,8 +99,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);
     }
     ////////////////////////////////////////
     //  ______      _

package/build/src/registry.js

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

package/package.json

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