fix

fox0430 · Oct 20, 2024 · fad6052 · fad6052
1 parent 59c6838
commit fad6052
Show file tree

Hide file tree

Showing 11 changed files with 253 additions and 215 deletions.
diff --git a/src/moepkg/callhierarchyviewer.nim b/src/moepkg/callhierarchyviewer.nim
@@ -89,7 +89,7 @@ proc incomingCalls(status: var EditorStatus) =
   let infoIndex =
     currentMainWindowNode.currentLine - CallHierarchyViewHeaderLength
 
-  let r = status.lspClients[langId.get].textDocumentIncomingCalls(
+  let r = waitFor status.lspClients[langId.get].textDocumentIncomingCalls(
     currentBufStatus.id,
     currentBufStatus.callHierarchyInfo.items[infoIndex])
   if r.isErr:
@@ -109,7 +109,7 @@ proc outgoingCalls(status: var EditorStatus) =
   let infoIndex =
     currentMainWindowNode.currentLine - CallHierarchyViewHeaderLength
 
-  let r = status.lspClients[langId.get].textDocumentOutgoingCalls(
+  let r = waitFor status.lspClients[langId.get].textDocumentOutgoingCalls(
     currentBufStatus.id,
     currentBufStatus.callHierarchyInfo.items[infoIndex])
   if r.isErr:

diff --git a/src/moepkg/editorstatus.nim b/src/moepkg/editorstatus.nim
@@ -306,7 +306,7 @@ proc cancelLspForegroundRequest*(
     if c.isInitialized:
       let fgRes = c.getForegroundWaitingResponse(bufferId)
       if fgRes.isSome:
-        let err = c.cancelForegroundRequest(bufferId)
+        let err = waitFor c.cancelForegroundRequest(bufferId)
         if err.isOk:
           return Result[LspMethod, string].ok fgRes.get.lspMethod
         else:
@@ -342,15 +342,15 @@ proc lspInitialize*(
 
     if not status.lspClients.contains(langId):
       # Init a LSP client and start a LSP server.
-      var c = initLspClient(
+      var c = waitFor initLspClient(
         $status.settings.lsp.languages[langId].command)
       if c.isErr:
         return Result[(), string].err c.error
 
       status.lspClients[langId] = c.get
 
     # Initialize request
-    let err = status.lspClients[langId].initialize(
+    let err = waitFor status.lspClients[langId].initialize(
       status.bufStatus[^1].id,
       initInitializeParams(
         status.lspClients[langId].serverName,
@@ -446,7 +446,7 @@ proc addNewBuffer*(
                status.settings.lsp.languages.contains(newBufStatus.langId):
                  if status.lspClients.contains(newBufStatus.langId):
                    # textDocument/didOpen notification
-                   let err = lspClient.textDocumentDidOpen(
+                   let err = waitFor lspClient.textDocumentDidOpen(
                      $newBufStatus.path.absolutePath,
                      newBufStatus.langId,
                      newBufStatus.buffer.toString)
@@ -689,15 +689,15 @@ proc sendLspSemanticTokenRequest*(c: var LspClient, b: BufferStatus) =
 
   block:
     # Cancel before completion request.
-    let err = c.cancelRequest(
+    let err = waitFor c.cancelRequest(
       b.id,
       LspMethod.textDocumentSemanticTokensFull)
     if err.isErr:
       error fmt"lsp: {err.error}"
 
   block:
     # Send a textDocument/semanticTokens request to the LSP server.
-    let err = c.textDocumentSemanticTokens(b.id, $b.absolutePath)
+    let err = waitFor c.textDocumentSemanticTokens(b.id, $b.absolutePath)
     if err.isErr:
       error fmt"lsp: {err.error}"
 
@@ -710,7 +710,7 @@ proc sendLspInlayHintRequest*(
 
     block:
       # Cancel before inlayHint request.
-      let err = c.cancelRequest(b.id, LspMethod.textDocumentInlayHint)
+      let err = waitFor c.cancelRequest(b.id, LspMethod.textDocumentInlayHint)
       if err.isErr: error fmt"lsp: {err.error}"
 
     # Calc range from all views.
@@ -731,7 +731,7 @@ proc sendLspInlayHintRequest*(
           if b.buffer[last].high >= 0: b.buffer[last].high
           else: 0
 
-    let err = c.textDocumentInlayHint(b.id, $b.absolutePath, hintRange)
+    let err = waitFor c.textDocumentInlayHint(b.id, $b.absolutePath, hintRange)
     if err.isErr: error fmt"lsp: {err.error}"
 
     b.inlayHints.range = Range(
@@ -747,7 +747,7 @@ proc sendLspInlineValueRequest*(
 
     block:
       # Cancel before inlineValue request.
-      let err = c.cancelRequest(b.id, LspMethod.textDocumentInlineValue)
+      let err = waitFor c.cancelRequest(b.id, LspMethod.textDocumentInlineValue)
       if err.isErr: error fmt"lsp: {err.error}"
 
     # Calc range from all views.
@@ -768,7 +768,7 @@ proc sendLspInlineValueRequest*(
           if b.buffer[last].high >= 0: b.buffer[last].high
           else: 0
 
-    let err = c.textDocumentInlineValue(b.id, $b.absolutePath, valueRange)
+    let err = waitFor c.textDocumentInlineValue(b.id, $b.absolutePath, valueRange)
     if err.isErr: error fmt"lsp: {err.error}"
 
     b.inlineValues.range = Range(
@@ -778,7 +778,7 @@ proc sendLspInlineValueRequest*(
 proc sendLspCodeLens*(c: var LspClient, b: BufferStatus) =
   ## Send textDocument/codeLens requests to the LSP server.
 
-  let err = c.textDocumentCodeLens(b.id, $b.absolutePath)
+  let err = waitFor c.textDocumentCodeLens(b.id, $b.absolutePath)
   if err.isErr:
     error fmt"lsp: {err.error}"
 
@@ -832,7 +832,7 @@ proc updateSyntaxHighlightings(status: EditorStatus) =
 
         if isSendDidChange():
           # Send a textDocument/didChange notification to the LSP server.
-          let err = client.textDocumentDidChange(
+          let err = waitFor client.textDocumentDidChange(
             b.version,
             absPath,
             b.buffer.toString)
@@ -1527,7 +1527,7 @@ proc autoSave(status: var EditorStatus) =
 
       if bufStatus.isEditMode and status.lspClients.contains(bufStatus.langId):
         # Send textDocument/didSave notify to the LSP server.
-        let err = status.lspClients[bufStatus.langId].textDocumentDidSave(
+        let err = waitFor status.lspClients[bufStatus.langId].textDocumentDidSave(
           bufStatus.version,
           $bufStatus.path.absolutePath,
           $bufStatus.buffer)

diff --git a/src/moepkg/exmode.nim b/src/moepkg/exmode.nim
@@ -774,7 +774,7 @@ proc writeCommand(status: var EditorStatus, path: Runes) =
 
     if status.lspClients.contains(currentBufStatus.langId):
       # Send textDocument/didSave notify to the LSP server.
-      let err = lspClient.textDocumentDidSave(
+      let err = waitFor lspClient.textDocumentDidSave(
         currentBufStatus.version,
         $currentBufStatus.path.absolutePath,
         $currentBufStatus.buffer)
@@ -874,7 +874,7 @@ proc writeAndQuitCommand(status: var EditorStatus) =
 
   if status.lspClients.contains(currentBufStatus.langId):
     # Send textDocument/didSave notify to the LSP server.
-    let err = lspClient.textDocumentDidSave(
+    let err = waitFor lspClient.textDocumentDidSave(
       currentBufStatus.version,
       $currentBufStatus.path.absolutePath,
       $currentBufStatus.buffer)
@@ -1133,7 +1133,7 @@ proc lspExecuteCommand(status: var EditorStatus, command: seq[Runes]) =
     status.commandLine.writeLspExecuteCommandError("unknow command")
     return
 
-  let r = lspClient.workspaceExecuteCommand(
+  let r = waitFor lspClient.workspaceExecuteCommand(
     currentBufStatus.id,
     lspCommand,
     %*command[1 .. ^1].mapIt($it))
@@ -1154,7 +1154,7 @@ proc lspFoldingRange(status: var EditorStatus) =
       "folding range is unavailable")
     return
 
-  let r = lspClient.textDocumentFoldingRange(
+  let r = waitFor lspClient.textDocumentFoldingRange(
     currentBufStatus.id,
     $currentBufStatus.absolutePath)
   if r.isErr:
@@ -1167,7 +1167,7 @@ proc lspRestartClient(status: var EditorStatus) =
     status.commandLine.writeLspError("Client not found")
     return
 
-  let r = lspClient.restart
+  let r = waitFor lspClient.restart
   if r.isOk:
     status.commandLine.writeStandard(fmt"lsp: restarted client: {lspClient.serverName}")
   else:
@@ -1176,7 +1176,7 @@ proc lspRestartClient(status: var EditorStatus) =
   let langId = currentBufStatus.langId
   for b in status.bufStatus:
     if b.langId == langId:
-      let r = lspClient.initialize(
+      let r = waitFor lspClient.initialize(
         status.bufStatus[^1].id,
         initInitializeParams(
           lspClient.serverName,
@@ -1200,7 +1200,7 @@ proc lspDocumentFormatting(status: var EditorStatus) =
     insertSpaces: true,
     insertFinalNewline: some(true))
 
-  let r = lspClient.textDocumentFormatting(
+  let r = waitFor lspClient.textDocumentFormatting(
     currentBufStatus.id,
     $currentBufStatus.absolutePath,
     options)

diff --git a/src/moepkg/insertmode.nim b/src/moepkg/insertmode.nim
@@ -88,7 +88,7 @@ proc sendDidChangeNotify(status: var EditorStatus): Result[(), string] =
     first: currentMainWindowNode.bufferPosition,
     last: currentMainWindowNode.bufferPosition)
 
-  let err = lspClient.textDocumentDidChange(
+  let err = waitFor lspClient.textDocumentDidChange(
     currentBufStatus.version,
     $currentBufStatus.path.absolutePath,
     currentBufStatus.buffer.toString,
@@ -111,7 +111,7 @@ proc sendCompletionRequest(
     block:
       let isIncompleteTrigger = status.completionWindow.isSome
 
-      let err = lspClient.textDocumentCompletion(
+      let err = waitFor lspClient.textDocumentCompletion(
         currentBufStatus.id,
         $currentBufStatus.path.absolutePath,
         currentMainWindowNode.bufferPosition,
@@ -141,7 +141,7 @@ proc sendSignatureHelpRequest(
           if r.isSome: SignatureHelpTriggerKind.TriggerCharacter
           else: SignatureHelpTriggerKind.Invoked
 
-      let err = lspClient.textDocumentSignatureHelp(
+      let err = waitFor lspClient.textDocumentSignatureHelp(
         currentBufStatus.id,
         $currentBufStatus.path.absolutePath,
         currentMainWindowNode.bufferPosition,