got lsp connection running in browser

config.nims

@@ -3,7 +3,7 @@ switch("path", "scripting")
 switch("path", "src")
 
 switch("d", "mingw")
-switch("mm", "refc")
+switch("mm", "orc")
 switch("tlsEmulation", "off")
 switch("d", "enableGui=true")
 switch("d", "enableTerminal=true")

src/misc/custom_logger.nim

@@ -25,9 +25,9 @@ proc newCustomLogger*(levelThreshold = logging.lvlAll, fmtStr = logging.defaultF
   result.levelThreshold = levelThreshold
   logging.addHandler(result)
 
-proc enableFileLogger*(self: CustomLogger) =
+proc enableFileLogger*(self: CustomLogger, filename = "messages.log") =
   when not defined(js):
-    var file = open("messages.log", fmWrite)
+    var file = open(filename, fmWrite)
     self.fileLogger = logging.newFileLogger(file, self.levelThreshold, self.fmtStr, flushThreshold=logging.lvlAll).some
 
 proc enableConsoleLogger*(self: CustomLogger) =

src/misc/util.nim

@@ -179,4 +179,19 @@ type CatchableAssertion* = object of CatchableError
 template softAssert*(condition: bool, message: string): untyped =
   if not condition:
     echo message
-    raise newException(CatchableAssertion, message)
+    raise newException(CatchableAssertion, message)
+
+when defined(js):
+  # on js the normal string.add function can cause stack overflows when the
+  # argument is too long, because it uses x.apply(push, y)
+  template append*(x: var string, y: string): untyped =
+    ## Concatenates `x` and `y` in place.
+    ##
+    ## See also `system.add`.
+    x = x & y
+else:
+  template append*(x: var string, y: string) =
+    ## Concatenates `x` and `y` in place.
+    ##
+    ## See also `system.add`.
+    x.add(y)

src/servers/languages_server.nim

@@ -1,4 +1,4 @@
-import std/[os, osproc, asynchttpserver, strutils, strformat, uri, asyncfile, json]
+import std/[os, osproc, asynchttpserver, strutils, strformat, uri, asyncfile, json, sequtils]
 import misc/[custom_async, util, myjsonutils]
 import router, server_utils
 
@@ -9,6 +9,10 @@ proc callback(req: Request): Future[void] {.async.} =
 
   let headers = newHttpHeaders([("Access-Control-Allow-Origin", "*")])
 
+  let (workspaceName, hostedFolders) = block:
+    {.gcsafe.}:
+      (workspaceName, hostedFolders)
+
   withRequest req:
     options "/":
       let headers = newHttpHeaders([
@@ -26,14 +30,17 @@ proc callback(req: Request): Future[void] {.async.} =
         let executablePath = reqBody["path"].str
         let additionalArgs = reqBody["args"].jsonTo seq[string]
         let proxyPath = getCurrentDir() / "tools/lsp-ws.exe"
-        let args = @[fmt"--port:{port}", fmt"--exe:{executablePath}", "--"] & additionalArgs
+
+        let directories = hostedFolders.mapIt(fmt"{it.path}").join(";")
+        let args = @[fmt"--port:{port}", fmt"--exe:{executablePath}", fmt"--log:lsp-ws-{port}.log", fmt"--workspace:{workspaceName}", fmt"--directories:{directories}", "--"] & additionalArgs
         let process = startProcess(proxyPath, args=args, options={poUsePath, poDaemon})
 
         {.gcsafe.}:
           processes.add process
 
         let response = %*{
-          "port": port.int
+          "port": port.int,
+          "processId": os.getCurrentProcessId()
         }
 
         await req.respond(Http200, response.pretty, headers)

src/servers/server_utils.nim

@@ -4,6 +4,7 @@ import misc/[custom_async]
 proc `$`*(p: Port): string {.borrow.}
 
 var hostedFolders*: seq[tuple[path: string, name: Option[string]]]
+var workspaceName*: string
 
 proc getFreePort*(): Port =
   var server = newAsyncHttpServer()

src/servers/workspace_server.nim

@@ -7,7 +7,6 @@ type DirInfo = object
   files: seq[string]
   folders: seq[string]
 
-var workspaceName: string
 var ignoredPatterns: seq[Glob]
 
 proc shouldIgnore(path: string): bool =
@@ -49,7 +48,15 @@ proc callback(req: Request): Future[void] {.async.} =
     get "/info/name":
       await req.respond(Http200, workspaceName, headers)
 
+    get "/info/workspace-folders":
+      let message = %hostedFolders.mapIt(%*{
+        "path": it.path,
+        "name": it.name,
+      })
+      await req.respond(Http200, $message, headers)
+
     get "/relative-path/":
+      ##
       var relativePath = ""
 
       let (name, actualPath) = path.splitWorkspacePath
@@ -83,7 +90,9 @@ proc callback(req: Request): Future[void] {.async.} =
       else:
         var folders: seq[string]
         for i, f in hostedFolders:
-          folders.add "@" & f.name.get($i)
+          # todo
+          # folders.add "@" & f.name.get($i)
+          folders.add f.path
         DirInfo(folders: folders)
 
       let response = result.toJson

src/text/language/language_server.nim

@@ -1,13 +1,14 @@
 import std/[options]
 import misc/[custom_async, util]
 import language_server_base
+import workspaces/workspace
 
 import language_server_lsp
 
 {.used.}
 
-proc getOrCreateLanguageServerImpl*(languageId: string, filename: string, workspaces: seq[string], languagesServer: Option[(string, int)] = (string, int).none): Future[Option[LanguageServer]] {.async.} =
-  let lsp = await getOrCreateLanguageServerLSP(languageId, workspaces, languagesServer)
+proc getOrCreateLanguageServerImpl*(languageId: string, filename: string, workspaces: seq[string], languagesServer: Option[(string, int)] = (string, int).none, workspace = WorkspaceFolder.none): Future[Option[LanguageServer]] {.async.} =
+  let lsp = await getOrCreateLanguageServerLSP(languageId, workspaces, languagesServer, workspace)
   if lsp.getSome(server):
     return server.LanguageServer.some
 

src/text/language/language_server_base.nim

@@ -1,6 +1,7 @@
 import std/[options, tables]
 import misc/[custom_async, custom_logger]
 import scripting_api except DocumentEditor, TextDocumentEditor, AstDocumentEditor
+import workspaces/workspace
 
 type OnRequestSaveHandle* = distinct int
 
@@ -31,7 +32,7 @@ type TextCompletion* = object
   typ*: string
   doc*: string
 
-var getOrCreateLanguageServer*: proc(languageId: string, filename: string, workspaces: seq[string], languagesServer: Option[(string, int)] = (string, int).none): Future[Option[LanguageServer]] = nil
+var getOrCreateLanguageServer*: proc(languageId: string, filename: string, workspaces: seq[string], languagesServer: Option[(string, int)] = (string, int).none, workspace = WorkspaceFolder.none): Future[Option[LanguageServer]] = nil
 
 method start*(self: LanguageServer): Future[void] {.base.} = discard
 method stop*(self: LanguageServer) {.base.} = discard

src/text/language/language_server_lsp.nim

@@ -3,6 +3,7 @@ import scripting_api except DocumentEditor, TextDocumentEditor, AstDocumentEdito
 import misc/[event, util, custom_logger, custom_async, myjsonutils]
 import text/text_editor
 import language_server_base, app, app_interface, config_provider, lsp_client
+import workspaces/workspace as ws
 
 logCategory "lsp"
 
@@ -32,7 +33,7 @@ method disconnect*(self: LanguageServerLSP) =
     self.stop()
     # todo: remove from languageServers
 
-proc getOrCreateLanguageServerLSP*(languageId: string, workspaces: seq[string], languagesServer: Option[(string, int)] = (string, int).none): Future[Option[LanguageServerLSP]] {.async.} =
+proc getOrCreateLanguageServerLSP*(languageId: string, workspaces: seq[string], languagesServer: Option[(string, int)] = (string, int).none, workspace = ws.WorkspaceFolder.none): Future[Option[LanguageServerLSP]] {.async.} =
   if languageServers.contains(languageId):
     return languageServers[languageId].some
 
@@ -52,8 +53,7 @@ proc getOrCreateLanguageServerLSP*(languageId: string, workspaces: seq[string],
   else:
     @[]
 
-
-  var client = LSPClient()
+  var client = LSPClient(workspace: workspace)
   languageServers[languageId] = LanguageServerLSP(client: client)
   await client.connect(exePath, workspaces, args, languagesServer)
   client.run()
@@ -68,16 +68,28 @@ proc getOrCreateLanguageServerLSP*(languageId: string, workspaces: seq[string],
     if textDocumentEditor.document.languageId != languageId:
       return
 
-    asyncCheck client.notifyOpenedTextDocument(languageId, textDocumentEditor.document.fullPath, textDocumentEditor.document.contentString)
+    if textDocumentEditor.document.isLoadingAsync:
+      discard textDocumentEditor.document.onLoaded.subscribe proc(document: TextDocument) =
+        asyncCheck client.notifyOpenedTextDocument(languageId, document.fullPath, document.contentString)
+    else:
+      asyncCheck client.notifyOpenedTextDocument(languageId, textDocumentEditor.document.fullPath, textDocumentEditor.document.contentString)
+
     discard textDocumentEditor.document.textInserted.subscribe proc(args: auto) =
       # debugf"TEXT INSERTED {args.document.fullPath}:{args.location}: {args.text}"
-      let changes = @[TextDocumentContentChangeEvent(`range`: args.location.toSelection.toRange, text: args.text)]
-      asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, changes)
+
+      if client.fullDocumentSync:
+        asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, args.document.contentString)
+      else:
+        let changes = @[TextDocumentContentChangeEvent(`range`: args.location.toSelection.toRange, text: args.text)]
+        asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, changes)
 
     discard textDocumentEditor.document.textDeleted.subscribe proc(args: auto) =
       # debugf"TEXT DELETED {args.document.fullPath}: {args.selection}"
-      let changes = @[TextDocumentContentChangeEvent(`range`: args.selection.toRange)]
-      asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, changes)
+      if client.fullDocumentSync:
+        asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, args.document.contentString)
+      else:
+        let changes = @[TextDocumentContentChangeEvent(`range`: args.selection.toRange)]
+        asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, changes)
 
   discard gEditor.onEditorDeregistered.subscribe proc(editor: auto) =
     if not (editor of TextDocumentEditor):
@@ -99,17 +111,27 @@ proc getOrCreateLanguageServerLSP*(languageId: string, workspaces: seq[string],
       continue
 
     # debugf"Register events for {textDocumentEditor.document.fullPath}"
-    asyncCheck client.notifyOpenedTextDocument(languageId, textDocumentEditor.document.fullPath, textDocumentEditor.document.contentString)
+    if textDocumentEditor.document.isLoadingAsync:
+      discard textDocumentEditor.document.onLoaded.subscribe proc(document: TextDocument) =
+        asyncCheck client.notifyOpenedTextDocument(languageId, document.fullPath, document.contentString)
+    else:
+      asyncCheck client.notifyOpenedTextDocument(languageId, textDocumentEditor.document.fullPath, textDocumentEditor.document.contentString)
 
     discard textDocumentEditor.document.textInserted.subscribe proc(args: auto) =
       # debugf"TEXT INSERTED {args.document.fullPath}:{args.location}: {args.text}"
-      let changes = @[TextDocumentContentChangeEvent(`range`: args.location.toSelection.toRange, text: args.text)]
-      asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, changes)
+      if client.fullDocumentSync:
+        asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, args.document.contentString)
+      else:
+        let changes = @[TextDocumentContentChangeEvent(`range`: args.location.toSelection.toRange, text: args.text)]
+        asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, changes)
 
     discard textDocumentEditor.document.textDeleted.subscribe proc(args: auto) =
       # debugf"TEXT DELETED {args.document.fullPath}: {args.selection}"
-      let changes = @[TextDocumentContentChangeEvent(`range`: args.selection.toRange)]
-      asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, changes)
+      if client.fullDocumentSync:
+        asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, args.document.contentString)
+      else:
+        let changes = @[TextDocumentContentChangeEvent(`range`: args.selection.toRange)]
+        asyncCheck client.notifyTextDocumentChanged(args.document.fullPath, args.document.version, changes)
 
   log lvlInfo, fmt"Started language server for {languageId}"
   return languageServers[languageId].some
@@ -131,16 +153,16 @@ method getDefinition*(self: LanguageServerLSP, filename: string, location: Curso
   let parsedResponse = response.result
 
   if parsedResponse.asLocation().getSome(location):
-    return Definition(filename: location.uri.parseUri.path.myNormalizedPath, location: (line: location.`range`.start.line, column: location.`range`.start.character)).some
+    return Definition(filename: location.uri.decodeUrl.parseUri.path.myNormalizedPath, location: (line: location.`range`.start.line, column: location.`range`.start.character)).some
 
   if parsedResponse.asLocationSeq().getSome(locations) and locations.len > 0:
     let location = locations[0]
-    return Definition(filename: location.uri.parseUri.path.myNormalizedPath, location: (line: location.`range`.start.line, column: location.`range`.start.character)).some
+    return Definition(filename: location.uri.decodeUrl.parseUri.path.myNormalizedPath, location: (line: location.`range`.start.line, column: location.`range`.start.character)).some
 
   if parsedResponse.asLocationLinkSeq().getSome(locations) and locations.len > 0:
     let location = locations[0]
     return Definition(
-      filename: location.targetUri.parseUri.path.myNormalizedPath,
+      filename: location.targetUri.decodeUrl.parseUri.path.myNormalizedPath,
       location: (line: location.targetSelectionRange.start.line, column: location.targetSelectionRange.start.character)).some
 
   log(lvlError, "No definition found")
@@ -195,7 +217,7 @@ method getSymbols*(self: LanguageServerLSP, filename: string): Future[seq[Symbol
         location: (line: r.location.range.start.line, column: r.location.range.start.character),
         name: r.name,
         symbolType: symbolKind,
-        filename: r.location.uri.parseUri.path.myNormalizedPath,
+        filename: r.location.uri.decodeUrl.parseUri.path.myNormalizedPath,
       )
 
   return completions
@@ -206,7 +228,7 @@ method getCompletions*(self: LanguageServerLSP, languageId: string, filename: st
 
   let response = await self.client.getCompletions(filename, location.line, location.column)
   if response.isError:
-    log(lvlError, fmt"Error: {response.error}")
+    log(lvlError, &"Error: {response.error.code}\n{response.error.message}")
     return completionsResult
 
   let completions = response.result