Merge branch 'master' into sp/format-in-equals

julia-vscode · Dec 3, 2021 · 455db2b · 455db2b
2 parents b2ad8b4 + f7083eb
commit 455db2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/protocol/initialize.jl b/src/protocol/initialize.jl
@@ -111,7 +111,9 @@ function InitializeParams(dict::Dict)
     InitializeParams(dict["processId"],
     haskey(dict, "clientInfo") ? InfoParams(dict["clientInfo"]) : missing,
     !haskey(dict, "rootPath") ? missing : dict["rootPath"] === nothing ? nothing : DocumentUri(dict["rootPath"]),
-    dict["rootUri"] === nothing ? nothing : DocumentUri(dict["rootUri"]),
+    # LS specification says this key should always exist, but neovim 0.5.1 doesn't seem to
+    # send it (seems fixed in neovim 0.6). For now, just assume it might not exist here.
+    (rootUri = get(dict, "rootUri", nothing); rootUri === nothing) ? nothing : DocumentUri(rootUri),
     get(dict, "initializationOptions", missing),
     ClientCapabilities(dict["capabilities"]),
     haskey(dict, "trace") ? String(dict["trace"]) : missing ,

diff --git a/src/requests/completions.jl b/src/requests/completions.jl
@@ -136,6 +136,7 @@ const snippet_completions = Dict{String,String}(
     "elseif" => "elseif ",
     "end" => "end",
     "export" => "export ",
+    "false" => "false",
     "finally" => "finally",
     "for" => "for \$1 in \$2\n\t\$0\nend",
     "function" => "function \$1(\$2)\n\t\$0\nend",
@@ -152,6 +153,7 @@ const snippet_completions = Dict{String,String}(
     "quote" => "quote\n\t\$0\nend",
     "return" => "return",
     "struct" => "struct \$0 end",
+    "true" => "true",
     "try" => "try\n\t\$0\ncatch\nend",
     "using" => "using ",
     "while" => "while \$1\n\t\$0\nend"