Skip to content

Commit 455db2b

Browse files
authored
Merge branch 'master' into sp/format-in-equals
2 parents b2ad8b4 + f7083eb commit 455db2b

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/protocol/initialize.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ function InitializeParams(dict::Dict)
111111
InitializeParams(dict["processId"],
112112
haskey(dict, "clientInfo") ? InfoParams(dict["clientInfo"]) : missing,
113113
!haskey(dict, "rootPath") ? missing : dict["rootPath"] === nothing ? nothing : DocumentUri(dict["rootPath"]),
114-
dict["rootUri"] === nothing ? nothing : DocumentUri(dict["rootUri"]),
114+
# LS specification says this key should always exist, but neovim 0.5.1 doesn't seem to
115+
# send it (seems fixed in neovim 0.6). For now, just assume it might not exist here.
116+
(rootUri = get(dict, "rootUri", nothing); rootUri === nothing) ? nothing : DocumentUri(rootUri),
115117
get(dict, "initializationOptions", missing),
116118
ClientCapabilities(dict["capabilities"]),
117119
haskey(dict, "trace") ? String(dict["trace"]) : missing ,

src/requests/completions.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ const snippet_completions = Dict{String,String}(
136136
"elseif" => "elseif ",
137137
"end" => "end",
138138
"export" => "export ",
139+
"false" => "false",
139140
"finally" => "finally",
140141
"for" => "for \$1 in \$2\n\t\$0\nend",
141142
"function" => "function \$1(\$2)\n\t\$0\nend",
@@ -152,6 +153,7 @@ const snippet_completions = Dict{String,String}(
152153
"quote" => "quote\n\t\$0\nend",
153154
"return" => "return",
154155
"struct" => "struct \$0 end",
156+
"true" => "true",
155157
"try" => "try\n\t\$0\ncatch\nend",
156158
"using" => "using ",
157159
"while" => "while \$1\n\t\$0\nend"

0 commit comments

Comments
 (0)