From bddbb7095d2d4977dcf3259489a188eba9e2d321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=80=E8=90=8C=E5=B0=8F=E6=B1=90?= Date: Mon, 27 Sep 2021 15:43:18 +0800 Subject: `$/cancelRequest` returns code `RequestCancelled` --- script/provider/provider.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'script/provider/provider.lua') diff --git a/script/provider/provider.lua b/script/provider/provider.lua index 070652ef..ff9296d6 100644 --- a/script/provider/provider.lua +++ b/script/provider/provider.lua @@ -684,7 +684,6 @@ proto.on('textDocument/semanticTokens/full', function (params) local uri = params.textDocument.uri await.close('textDocument/semanticTokens/full') await.setID('textDocument/semanticTokens/full') - await.setID('update:' .. uri) workspace.awaitReady() local _ = progress.create(lang.script.WINDOW_PROCESSING_SEMANTIC_FULL, 0.5) local core = require 'core.semantic-tokens' @@ -702,7 +701,6 @@ proto.on('textDocument/semanticTokens/range', function (params) local uri = params.textDocument.uri await.close('textDocument/semanticTokens/range') await.setID('textDocument/semanticTokens/range') - await.setID('update:' .. uri) workspace.awaitReady() local _ = progress.create(lang.script.WINDOW_PROCESSING_SEMANTIC_RANGE, 0.5) local core = require 'core.semantic-tokens' @@ -806,7 +804,7 @@ proto.on('textDocument/onTypeFormatting', function (params) end) proto.on('$/cancelRequest', function (params) - await.close('proto:' .. params.id) + proto.close(params.id, define.ErrorCodes.RequestCancelled) end) proto.on('$/requestHint', function (params) -- cgit debian/1.2.3+git2.25.1-1-2-gaceb0 From 8dda772869b35778be3178c7e12d3a268e8d08af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=80=E8=90=8C=E5=B0=8F=E6=B1=90?= Date: Mon, 27 Sep 2021 15:45:21 +0800 Subject: no need to check for duplicate requests --- script/provider/provider.lua | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'script/provider/provider.lua') diff --git a/script/provider/provider.lua b/script/provider/provider.lua index ff9296d6..668e4eb2 100644 --- a/script/provider/provider.lua +++ b/script/provider/provider.lua @@ -168,9 +168,6 @@ end) proto.on('textDocument/hover', function (params) local doc = params.textDocument local uri = doc.uri - await.close 'hover' - await.setID 'hover' - await.setID('update:' .. uri) if not workspace.isReady() then local count, max = workspace.getLoadProcess() return { @@ -359,9 +356,6 @@ end) proto.on('textDocument/completion', function (params) local uri = params.textDocument.uri - await.close 'completion' - await.setID 'completion' - await.setID('update:' .. uri) if not workspace.isReady() then local count, max = workspace.getLoadProcess() return { @@ -479,9 +473,6 @@ proto.on('completionItem/resolve', function (item) end local id = item.data.id local uri = item.data.uri - await.close 'completion.resolve' - await.setID 'completion.resolve' - await.setID('update:' .. uri) --await.setPriority(1000) local resolved = core.resolve(id) if not resolved then @@ -519,9 +510,6 @@ proto.on('textDocument/signatureHelp', function (params) if not files.exists(uri) then return nil end - await.close('signatureHelp') - await.setID('signatureHelp') - await.setID('update:' .. uri) local pos = converter.unpackPosition(uri, params.position) local core = require 'core.signature' local results = core(uri, pos) @@ -651,10 +639,6 @@ proto.on('workspace/symbol', function (params) local _ = progress.create(lang.script.WINDOW_PROCESSING_WS_SYMBOL, 0.5) local core = require 'core.workspace-symbol' - await.close('workspace/symbol') - await.setID('workspace/symbol') - await.setID('files.version') - local symbols = core(params.query) if not symbols or #symbols == 0 then return nil @@ -682,8 +666,6 @@ end) proto.on('textDocument/semanticTokens/full', function (params) local uri = params.textDocument.uri - await.close('textDocument/semanticTokens/full') - await.setID('textDocument/semanticTokens/full') workspace.awaitReady() local _ = progress.create(lang.script.WINDOW_PROCESSING_SEMANTIC_FULL, 0.5) local core = require 'core.semantic-tokens' @@ -699,8 +681,6 @@ end) proto.on('textDocument/semanticTokens/range', function (params) local uri = params.textDocument.uri - await.close('textDocument/semanticTokens/range') - await.setID('textDocument/semanticTokens/range') workspace.awaitReady() local _ = progress.create(lang.script.WINDOW_PROCESSING_SEMANTIC_RANGE, 0.5) local core = require 'core.semantic-tokens' @@ -725,9 +705,6 @@ proto.on('textDocument/foldingRange', function (params) if not files.exists(uri) then return nil end - await.close('textDocument/foldingRange') - await.setID('textDocument/foldingRange') - await.setID('update:' .. uri) local regions = core(uri) if not regions then return nil @@ -830,13 +807,9 @@ end) -- Hint do local function updateHint(uri) - local awaitID = 'hint:' .. uri - await.close(awaitID) if not config.get 'Lua.hint.enable' then return end - await.setID(awaitID) - await.setID('update:' .. uri) workspace.awaitReady() local visibles = files.getVisibles(uri) if not visibles then -- cgit debian/1.2.3+git2.25.1-1-2-gaceb0 From 2f4f3e185b82ac16364e3a6150b8e1a7c5b1cdf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=80=E8=90=8C=E5=B0=8F=E6=B1=90?= Date: Mon, 27 Sep 2021 15:54:37 +0800 Subject: some fix --- script/provider/provider.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'script/provider/provider.lua') diff --git a/script/provider/provider.lua b/script/provider/provider.lua index 668e4eb2..3f64494d 100644 --- a/script/provider/provider.lua +++ b/script/provider/provider.lua @@ -673,7 +673,7 @@ proto.on('textDocument/semanticTokens/full', function (params) if not text then return nil end - local results = core(uri, 0, #text) + local results = core(uri, 0, math.huge) return { data = results } @@ -689,7 +689,7 @@ proto.on('textDocument/semanticTokens/range', function (params) if cache and not cache['firstSemantic'] then cache['firstSemantic'] = true start = 0 - finish = #files.getText(uri) + finish = math.huge else start, finish = converter.unpackRange(uri, params.range) end -- cgit debian/1.2.3+git2.25.1-1-2-gaceb0