julia 1.5 compat (#32)

julia 1.5 compat, make the server multi-root, match vscode 1.0.5, add symbol server store path

Author: gdkrmr

.gitmodules

@@ -22,3 +22,9 @@
 [submodule "languageserver/SymbolServer"]
 	path = languageserver/SymbolServer
 	url = https://github.com/julia-vscode/SymbolServer.jl.git
+[submodule "languageserver/FilePathsBase"]
+	path = languageserver/FilePathsBase
+	url = https://github.com/rofinn/FilePathsBase.jl.git
+[submodule "languageserver/JSONRPC"]
+	path = languageserver/JSONRPC
+	url = https://github.com/julia-vscode/JSONRPC.jl.git

languageserver/CSTParser

@@ -7,6 +7,7 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 deps = ["Tokenize"]
 path = "CSTParser"
 uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f"
+version = "2.5.1-DEV"
 
 [[Dates]]
 deps = ["Printf"]
@@ -17,27 +18,45 @@ deps = ["Random", "Serialization", "Sockets"]
 uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 
 [[DocumentFormat]]
-deps = ["CSTParser", "Tokenize"]
+deps = ["CSTParser", "FilePathsBase", "Tokenize"]
 path = "DocumentFormat"
 uuid = "ffa9a821-9c82-50df-894e-fbcef3ed31cd"
+version = "3.2.1-DEV"
+
+[[FilePathsBase]]
+deps = ["Dates", "Printf", "Test", "UUIDs"]
+path = "FilePathsBase"
+uuid = "48062228-2e41-5def-b9a4-89aafe57970f"
+version = "0.9.3"
 
 [[InteractiveUtils]]
 deps = ["Markdown"]
 uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
 [[JSON]]
-deps = ["Dates", "Distributed", "Mmap", "Sockets", "Test", "Unicode"]
+deps = ["Dates", "Mmap", "Unicode"]
 path = "JSON"
 uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+version = "0.20.1"
+
+[[JSONRPC]]
+deps = ["JSON", "UUIDs"]
+path = "JSONRPC"
+uuid = "b9b8584e-8fd3-41f9-ad0c-7255d428e418"
+version = "1.2.1-DEV"
 
 [[LanguageServer]]
-deps = ["CSTParser", "DocumentFormat", "JSON", "REPL", "StaticLint", "SymbolServer", "Tokenize", "URIParser"]
+deps = ["CSTParser", "DocumentFormat", "JSON", "JSONRPC", "Markdown", "REPL", "StaticLint", "SymbolServer", "Tokenize", "URIParser", "UUIDs"]
 path = "LanguageServer"
 uuid = "2b0e0bc5-e4fd-59b4-8912-456d1b03d8d7"
+version = "3.2.1-DEV"
 
 [[LibGit2]]
 uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
 
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
 [[Logging]]
 uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
@@ -49,7 +68,7 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
 uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 
 [[Pkg]]
-deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
+deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"]
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[Printf]]
@@ -74,14 +93,16 @@ uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
 
 [[StaticLint]]
-deps = ["CSTParser", "SymbolServer", "Test"]
+deps = ["CSTParser", "Serialization", "SymbolServer"]
 path = "StaticLint"
 uuid = "b3cc710f-9c33-5bdb-a03d-a94903873e97"
+version = "4.5.1-DEV"
 
 [[SymbolServer]]
-deps = ["LibGit2", "Pkg", "SHA", "Serialization", "Test"]
+deps = ["InteractiveUtils", "LibGit2", "Markdown", "Pkg", "REPL", "SHA", "Serialization", "Sockets", "UUIDs"]
 path = "SymbolServer"
 uuid = "cf896787-08d5-524d-9de7-132aaa0cb996"
+version = "5.1.1-DEV"
 
 [[Test]]
 deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
@@ -90,11 +111,13 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 [[Tokenize]]
 path = "Tokenize"
 uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624"
+version = "0.5.8"
 
 [[URIParser]]
-deps = ["Test", "Unicode"]
+deps = ["Unicode"]
 path = "URIParser"
 uuid = "30578b45-9adc-5946-b283-645ec420af67"
+version = "0.4.1"
 
 [[UUIDs]]
 deps = ["Random", "SHA"]

languageserver/DocumentFormat

@@ -1,7 +1,9 @@
 [deps]
 CSTParser = "00ebfdb7-1f24-5e51-bd34-a7502290713f"
 DocumentFormat = "ffa9a821-9c82-50df-894e-fbcef3ed31cd"
+FilePathsBase = "48062228-2e41-5def-b9a4-89aafe57970f"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+JSONRPC = "b9b8584e-8fd3-41f9-ad0c-7255d428e418"
 LanguageServer = "2b0e0bc5-e4fd-59b4-8912-456d1b03d8d7"
 StaticLint = "b3cc710f-9c33-5bdb-a03d-a94903873e97"
 SymbolServer = "cf896787-08d5-524d-9de7-132aaa0cb996"

languageserver/FilePathsBase

@@ -9,7 +9,7 @@
 ;;             Guido Kraemer <[email protected]>
 ;; Keywords: languages, tools
 ;; Version: 0.2.0
-;; Package-Requires: ((emacs "25.1") (lsp-mode "6.0") (julia-mode "0.3"))
+;; Package-Requires: ((emacs "25.1") (lsp-mode "6.3") (julia-mode "0.3"))
 ;; Keywords: languages, tools
 ;; URL: https://github.com/non-Jedi/lsp-julia
 
@@ -83,6 +83,15 @@ Set to nil if you want to use the globally installed versions."
   :type '(repeat (string :tag "argument"))
   :group 'lsp-julia)
 
+(defcustom lsp-julia-symbol-server-store-path "~/.julia/symbolstorev2-lsp-julia"
+  "The cache directory for `SymbolServer.jl'."
+  :type 'directory
+  ;; :initialize (lambda (sym expr)
+  ;;               (print expr)
+  ;;               (when expr (make-directory expr t) expr))
+  :group 'lsp-julia)
+
+
 (defcustom lsp-julia-timeout 30
   "Time before symbol `lsp-mode' should assume julia just ain't gonna start."
   :type 'number
@@ -93,27 +102,184 @@ Set to nil if you want to use the globally installed versions."
   :type 'string
   :group 'lsp-julia)
 
+;;; Workspace options
+(defcustom lsp-julia-format-indent 4
+  "Indent size for formatting."
+  :type 'integer
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-format-indents t
+  "Format file indents."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-format-ops t
+  "Format whitespace around operators."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-format-tuples t
+  "Format tuples."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-format-curly t
+  "Format braces."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-format-calls t
+  "Format function calls."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-format-iterops t
+  "Format loop iterators."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-format-comments t
+  "Format comments."
+  :type 'boolean
+  :group 'lsp-julia)
+(defcustom lsp-julia-format-docs t
+  "Format inline documentation."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-format-kw t
+  "Remove spaces around = in function keywords."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-run t
+  "Run the linter on active files."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-missingrefs "all"
+  "Highlight unknown symbols. The `symbols` option will not mark
+unknown fields."
+  :type 'string
+  :options '("none" "symbols" "all")
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-call t
+  "This compares call signatures against all known methods for
+the called function. Calls with too many or too few arguments, or
+unknown keyword parameters are highlighted."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-iter t
+  "Check iterator syntax of loops. Will identify, for example,
+attempts to iterate over single values."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-constif t
+  "Check for constant conditionals in if statements that result
+in branches never being reached.."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-lazy t
+  "Check for deterministic lazy boolean operators."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-datadecl t
+  "Check variables used in type declarations are datatypes."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-typeparam t
+  "Check parameters declared in `where` statements or datatype
+declarations are used."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-modname t
+  "Check submodule names do not shadow their parent's name."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-pirates t
+  "Check for type piracy - the overloading of external functions
+with methods specified for external datatypes. 'External' here
+refers to imported code."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-useoffuncargs t
+  "Check that all declared arguments are used within the function
+body."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(defcustom lsp-julia-lint-nothingcomp t
+  "Check for use of `==` rather than `===` when comparing against
+`nothing`."
+  :type 'boolean
+  :group 'lsp-julia)
+
+(lsp-register-custom-settings
+ '(("julia.format.indent"      lsp-julia-format-indent)
+   ("julia.format.indents"     lsp-julia-format-indents     t)
+   ("julia.format.ops"         lsp-julia-format-ops         t)
+   ("julia.format.tuples"      lsp-julia-format-tuples      t)
+   ("julia.format.curly"       lsp-julia-format-curly       t)
+   ("julia.format.calls"       lsp-julia-format-calls       t)
+   ("julia.format.iterOps"     lsp-julia-format-iterops     t)
+   ("julia.format.comments"    lsp-julia-format-comments    t)
+   ("julia.format.docs"        lsp-julia-format-docs        t)
+   ("julia.format.kw"          lsp-julia-format-kw          t)
+   ("julia.lint.run"           lsp-julia-lint-run           t)
+   ("julia.lint.missingrefs"   lsp-julia-lint-missingrefs)
+   ("julia.lint.call"          lsp-julia-lint-call          t)
+   ("julia.lint.iter"          lsp-julia-lint-iter          t)
+   ("julia.lint.constif"       lsp-julia-lint-constif       t)
+   ("julia.lint.lazyif"        lsp-julia-lint-lazy          t)
+   ("julia.lint.datadecl"      lsp-julia-lint-datadecl      t)
+   ("julia.lint.typeparam"     lsp-julia-lint-typeparam     t)
+   ("julia.lint.modname"       lsp-julia-lint-modname       t)
+   ("julia.lint.pirates"       lsp-julia-lint-pirates       t)
+   ("julia.lint.useoffuncargs" lsp-julia-lint-useoffuncargs t)
+   ("julia.lint.nothingcomp"   lsp-julia-lint-nothingcomp   t)))
+
+;;; lsp-julia related functions setup
 (defun lsp-julia--get-root ()
   "Get the (Julia) project root directory of the current file."
-  (let ((dir (locate-dominating-file default-directory "Project.toml")))
-    (if dir (expand-file-name dir)
-      (expand-file-name lsp-julia-default-environment))))
+  (let* ((dir (locate-dominating-file default-directory "Project.toml"))
+         (dir2 (if dir dir lsp-julia-default-environment)))
+    (concat "\"" (expand-file-name dir2) "\"")))
 
 (defun lsp-julia--get-depot-path ()
   "Get the (Julia) depot path."
-  (let ((dp (getenv "JULIA_DEPOT_PATH")))
-    (if dp dp lsp-julia-default-depot)))
+  (let* ((dp (getenv "JULIA_DEPOT_PATH"))
+         (dp2 (if dp dp lsp-julia-default-depot)))
+    (concat "\"" dp2 "\"")))
+
+(defun lsp-julia--symbol-server-store-path-to-jl ()
+  "Convert the variable `lsp-julia-symbol-server-store-path' to a
+  string or \"nothing\" if `nil'"
+  (if lsp-julia-symbol-server-store-path
+      (let ((sssp (expand-file-name lsp-julia-symbol-server-store-path)))
+        (make-directory sssp t)
+        (concat "\"" sssp "\""))
+    "nothing"))
 
 (defun lsp-julia--rls-command ()
   "The command to lauch the Julia Language Server."
   `(,lsp-julia-command
     ,@lsp-julia-flags
-    ,(concat "-e using LanguageServer, Sockets, SymbolServer;"
+    ,(concat "-e using InteractiveUtils, Sockets, SymbolServer, LanguageServer;"
              " server = LanguageServer.LanguageServerInstance("
-             " stdin, stdout, false,"
-             " \"" (lsp-julia--get-root) "\","
-             " \"" (lsp-julia--get-depot-path) "\");"
-             " server.runlinter = true;"
+             " stdin, stdout,"
+             (lsp-julia--get-root) ","
+             (lsp-julia--get-depot-path) ","
+             " nothing, "
+             (lsp-julia--symbol-server-store-path-to-jl) ");"
              " run(server);")))
 
 (defconst lsp-julia--handlers
@@ -125,7 +291,8 @@ Set to nil if you want to use the globally installed versions."
 (lsp-register-client
  (make-lsp-client :new-connection (lsp-stdio-connection 'lsp-julia--rls-command)
                   :major-modes '(julia-mode ess-julia-mode)
-                  :server-id 'julia-ls))
+                  :server-id 'julia-ls
+                  :multi-root t))
 
 (provide 'lsp-julia)
 ;;; lsp-julia.el ends here