Merge pull request uniconproject#444 from Jafaral/win-ulsp

ulsp: fix socket option on Windows and handle a few exceptions

Author: Jafaral

uni/ulsp/Makefile

@@ -15,7 +15,7 @@ export IPATH=$(UNI)/unidoc
 all: $(prog)
 
 $(prog): $(OBJ)
-	$(UC) $(DASHG) -o $(prog) $(OBJ)
+	$(UC) -o $(prog) $(OBJ)
 	$(CP) $(prog)$(EXE) ../../bin
 
 launch-lsp.u:launch-lsp.icn workspace.u database.u server.u completion.u signature.u hover.u definition.u

uni/ulsp/hover.icn

@@ -54,6 +54,7 @@ class HoverHandler(
       num_params, param, num_attributes, _attribute, line, character
 
       line := context.line
+      \line | fail
       character := context.charNum
 
       # Begin initial string scanning

uni/ulsp/launch-lsp.icn

@@ -40,11 +40,13 @@ procedure main(args)
    #write("args: ", ximage(args))
    port := validate_args(args) | stop("Error: invalid args/port number.")
 
-   if &features == "MacOS" then
-      #port := "localhost:" || port
-      port := "127.0.0.1:" || port
-   else
-      port := ":" || port
+   # Allow passing full host:port as an arg
+   if integer(port) then {
+      if &features == ("MacOS" | "MS Windows NT") then
+         port := "127.0.0.1:" || port
+      else
+         port := ":" || port
+   }
 
    Server(port).run()
 end

uni/ulsp/server.icn

@@ -278,11 +278,11 @@ class Server(
 
    initially
 
-      every 1 to 5 do {
-         if sock := open(port, "n") then
+      every 1 to 10 do {
+         if sock := open(port, "n", 1000) then
             break
          else {
-            write("open(",port,") ERROR: ", &errortext)
+            write("open(",port,") ERROR: ", \&errortext | "Unknown")
             delay(1000)
          }
       }

uni/ulsp/workspace.icn

@@ -81,7 +81,8 @@ class Workspace(
    end
 
    method getFile()
-      return m_uni_file
+      if \m_uni_file then
+         return m_uni_file
    end
 
    method updateUniDoc(uri, contents)
@@ -104,7 +105,8 @@ class Workspace(
    method setLinks()
       local links_w_ext, link_w_ext, temp, _link, pack
       links := []
-      links_w_ext := getFile().getLinkNames()
+      getFile() | fail
+      links_w_ext := getFile().getLinkNames() | fail
       every link_w_ext := !links_w_ext do {
          temp := reverse(link_w_ext)
          temp ? {
@@ -130,6 +132,7 @@ class Workspace(
    method setImports()
       local _import
       imports := []
+      getFile() | fail
       every _import := !getFile().getImportNames() do {
          if member(lsp_database.package_db, _import) then
             put(imports, _import)
@@ -146,6 +149,7 @@ class Workspace(
 
    method setPackage()
       local file_loc
+      getFile() | fail
       if \getFile().getPackageName() then {
          _package := getFile().getPackageName()
          if not member(lsp_database.package_db, _package) then {
@@ -170,6 +174,7 @@ class Workspace(
    method setInternalProcedures()
       local _procedure, _param, paramName, paramType, paramDef
       internal_procedures := table()
+      getFile() | fail
       every _procedure := getFile().getProcedures().get() do {
          _procedure.setSrcFile(uri)
          internal_procedures[_procedure.getName()] := table()
@@ -268,6 +273,7 @@ class Workspace(
    method setInternalClasses()
       local _class, _method, _param, paramName, paramType, paramDef, constructor_param
       internal_classes := table()
+      getFile() | fail
       every _class := getFile().getClasses().get() do {
          _class.setSrcFile(uri)
          internal_classes[_class.getName()] := table()