summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author最萌小汐 <sumneko@hotmail.com>2021-07-15 20:59:40 +0800
committer最萌小汐 <sumneko@hotmail.com>2021-07-15 20:59:40 +0800
commit48cd25965a936f24d1466e720db125e9d2a177e5 (patch)
tree0de4632015ee87a276fc1b9f843209e3eba7d4a6
parentbfb7d2eb7b846888d34a24810eaf6943d618b233 (diff)
downloadlua-language-server-48cd25965a936f24d1466e720db125e9d2a177e5.zip
fix #601
-rw-r--r--.vscode/launch.json2
-rw-r--r--changelog.md1
-rw-r--r--script/client.lua1
-rw-r--r--script/provider/diagnostic.lua2
-rw-r--r--script/provider/semantic-tokens.lua2
-rw-r--r--script/service/telemetry.lua4
-rw-r--r--script/workspace/workspace.lua1
7 files changed, 6 insertions, 7 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json
index c2dd4704..802eba16 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -24,7 +24,7 @@
"type": "lua",
"request": "attach",
"stopOnEntry": true,
- "address": "127.0.0.1:11413",
+ "address": "127.0.0.1:11427",
"outputCapture": [
],
"sourceMaps": [
diff --git a/changelog.md b/changelog.md
index 0e4c8559..99232ab4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -28,6 +28,7 @@
* `FIX` [#596](https://github.com/sumneko/lua-language-server/issues/596)
* `FIX` [#597](https://github.com/sumneko/lua-language-server/issues/597)
* `FIX` [#598](https://github.com/sumneko/lua-language-server/issues/598)
+* `FIX` [#601](https://github.com/sumneko/lua-language-server/issues/601)
## 2.2.3
`2021-7-9`
diff --git a/script/client.lua b/script/client.lua
index 64a5cbef..0778c08d 100644
--- a/script/client.lua
+++ b/script/client.lua
@@ -120,6 +120,7 @@ function m.setConfig(changes, onlyMemory)
finalChanges[#finalChanges+1] = change
end
end
+ change.uri = m.info.rootUri
end
if onlyMemory then
return
diff --git a/script/provider/diagnostic.lua b/script/provider/diagnostic.lua
index 5d3b00ea..5e8926a8 100644
--- a/script/provider/diagnostic.lua
+++ b/script/provider/diagnostic.lua
@@ -286,7 +286,6 @@ local function askForDisable()
key = 'Lua.diagnostics.workspaceDelay',
action = 'set',
value = delay * 1000,
- uri = ws.uri,
}
}
elseif item.title == lang.script.WINDOW_DISABLE_DIAGNOSTIC then
@@ -295,7 +294,6 @@ local function askForDisable()
key = 'Lua.diagnostics.workspaceDelay',
action = 'set',
value = -1,
- uri = ws.uri,
}
}
end
diff --git a/script/provider/semantic-tokens.lua b/script/provider/semantic-tokens.lua
index 567f80e2..4f2d8177 100644
--- a/script/provider/semantic-tokens.lua
+++ b/script/provider/semantic-tokens.lua
@@ -69,7 +69,7 @@ local function enable()
key = 'editor.semanticHighlighting.enabled',
action = 'set',
value = true,
- isGlobal = true,
+ global = true,
}
}
end
diff --git a/script/service/telemetry.lua b/script/service/telemetry.lua
index 978adee4..1ab3fdbe 100644
--- a/script/service/telemetry.lua
+++ b/script/service/telemetry.lua
@@ -135,7 +135,7 @@ function m.updateConfig()
key = 'Lua.telemetry.enable',
action = 'set',
value = true,
- isGlobal = true,
+ global = true,
}
}
elseif item.title == disableTitle then
@@ -144,7 +144,7 @@ function m.updateConfig()
key = 'Lua.telemetry.enable',
action = 'set',
value = false,
- isGlobal = true,
+ global = true,
}
}
end
diff --git a/script/workspace/workspace.lua b/script/workspace/workspace.lua
index 0f7d8103..b98face5 100644
--- a/script/workspace/workspace.lua
+++ b/script/workspace/workspace.lua
@@ -212,7 +212,6 @@ local function loadFileFactory(root, progressData, isLibrary)
action = 'set',
value = config.get 'Lua.workspace.maxPreload'
+ math.max(1000, config.get 'Lua.workspace.maxPreload'),
- uri = m.uri,
}
}
end