Skip to content

Attempt at fixing issue #175 #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Attempt at fixing issue #175 #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/nimLsp.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import platform/[vscodeApi, languageClientApi]
import
platform/js/
[jsNodeFs, jsNodePath, jsNodeCp, jsNodeUtil, jsNodeOs, jsNodeNet, jsPromise]
import nimutils
import nimUtils
from tools/nimBinTools import getNimbleExecPath, getBinPath, execNimbleCmd
import spec

Expand Down Expand Up @@ -294,10 +294,10 @@ proc startSocket(
proc refreshNimbleTasks*() {.async.} =
ext.nimbleTasks = await fetchLsp[seq[NimbleTask]](ext, "extension/tasks")

proc provideInlayHints(self: JsObject, document: JsObject, viewPort: JsObject, token: JsObject, next: JsObject): Promise[seq[InlayHint]] {.importjs: "#(@)".}
proc next_provideInlayHints(self: JsObject, document: JsObject, viewPort: JsObject, token: JsObject): Promise[JsObject] {.importjs: "#(@)".}
proc provideInlayHints(document: JsObject, viewPort: JsObject, token: JsObject, next: JsObject): Promise[seq[InlayHint]] {.async.}=
var hintsToReturn = newSeq[InlayHint]()
let inlayHints = next.provideInlayHints(document, viewPort, token, next).await
let jsInlayHints = next_provideInlayHints(next, document, viewPort, token).await
let decorationType: VscodeTextEditorDecorationType = vscode.window.createTextEditorDecorationType(
VscodeDecorationRenderOptions(
textDecoration: "underline #0CAFFF"
Expand All @@ -309,6 +309,11 @@ proc provideInlayHints(document: JsObject, viewPort: JsObject, token: JsObject,
for decoration in ext.propagatedDecorations[uri]:
decoration.dispose()

if jsInlayHints.isNull or jsInlayHints.isUndefined:
return hintsToReturn

let inlayHints = jsInlayHints.to(seq[InlayHint])

var decorationRanges: seq[VscodeDecorationOptions] = @[]
let propagatedExceptionSymbol = vscode.workspace.getConfiguration("nim").getStr("inlayHints.exceptionHints.hintStringLeft")
for hint in inlayHints:
Expand Down