From f0d0be3fc5b250017f1de946d85a396a948bb08c Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Mon, 23 Sep 2024 16:01:45 +0100 Subject: [PATCH] lint: cleanup unused code and redefined locals --- .luarc.json | 3 +- script/core/code-action.lua | 10 ++-- script/core/command/autoRequire.lua | 1 - script/core/command/exportDocument.lua | 1 - script/core/command/reloadFFIMeta.lua | 2 +- script/core/completion/completion.lua | 20 ++++--- script/core/completion/keyword.lua | 1 - script/core/definition.lua | 8 +-- .../core/diagnostics/cast-type-mismatch.lua | 1 - .../core/diagnostics/different-requires.lua | 1 - .../core/diagnostics/duplicate-set-field.lua | 2 - script/core/diagnostics/missing-fields.lua | 6 +-- .../diagnostics/missing-local-export-doc.lua | 2 +- .../core/diagnostics/param-type-mismatch.lua | 5 +- .../diagnostics/unbalanced-assignments.lua | 3 +- script/core/diagnostics/undefined-global.lua | 3 -- .../diagnostics/unknown-cast-variable.lua | 1 - script/core/diagnostics/unknown-operator.lua | 3 -- script/core/folding.lua | 28 +++++----- script/core/highlight.lua | 4 +- script/core/hint.lua | 2 +- script/core/hover/description.lua | 14 ++--- script/core/hover/table.lua | 1 - script/core/implementation.lua | 2 - script/core/look-backward.lua | 2 - script/core/rename.lua | 4 +- script/core/semantic-tokens.lua | 21 ++++---- script/core/type-definition.lua | 8 +-- script/core/type-formatting.lua | 7 +-- script/core/workspace-symbol.lua | 5 +- script/doctor.lua | 52 +++++++++---------- script/file-uri.lua | 2 +- script/files.lua | 2 - script/fs-utility.lua | 14 +++-- script/gc.lua | 2 +- script/glob/gitignore.lua | 18 +++---- script/lazytable.lua | 2 - script/lclient.lua | 1 - script/library.lua | 4 +- script/parser/compile.lua | 5 +- script/parser/guide.lua | 6 +-- script/parser/luadoc.lua | 6 +-- script/parser/relabel.lua | 1 - script/plugin.lua | 4 +- script/plugins/astHelper.lua | 1 - script/plugins/ffi/c-parser/ctypes.lua | 8 +-- script/plugins/ffi/c-parser/util.lua | 2 +- script/plugins/ffi/cdefRerence.lua | 2 +- script/plugins/ffi/init.lua | 9 ++-- script/plugins/ffi/searchCode.lua | 10 ++-- script/plugins/nodeHelper.lua | 5 +- script/provider/build-meta.lua | 2 - script/provider/capability.lua | 2 - script/provider/code-lens.lua | 2 +- script/provider/completion.lua | 4 +- script/provider/diagnostic.lua | 2 +- script/provider/formatting.lua | 5 +- script/provider/inlay-hint.lua | 2 +- script/provider/name-style.lua | 2 +- script/provider/provider.lua | 13 +++-- script/provider/semantic-tokens.lua | 2 +- script/provider/spell.lua | 2 - script/pub/report.lua | 1 - script/service/service.lua | 1 - script/text-merger.lua | 1 - script/tracy.lua | 4 +- script/utility.lua | 1 - script/vm/compiler.lua | 11 ++-- script/vm/doc.lua | 7 ++- script/vm/field.lua | 2 +- script/vm/infer.lua | 18 +++---- script/vm/node.lua | 2 +- script/vm/visible.lua | 4 +- script/workspace/loading.lua | 1 - script/workspace/require-path.lua | 4 +- 75 files changed, 181 insertions(+), 241 deletions(-) diff --git a/.luarc.json b/.luarc.json index 7e366901d..b56692448 100644 --- a/.luarc.json +++ b/.luarc.json @@ -20,7 +20,8 @@ "unused": "Any" }, "ignoredFiles": "Opened", - "libraryFiles": "Opened" + "libraryFiles": "Opened", + "unusedLocalExclude": [ "_*" ] }, "runtime": { "version": "Lua 5.4", diff --git a/script/core/code-action.lua b/script/core/code-action.lua index 720cd4c49..3031971ff 100644 --- a/script/core/code-action.lua +++ b/script/core/code-action.lua @@ -1,13 +1,11 @@ local files = require 'files' local lang = require 'language' local util = require 'utility' -local sp = require 'bee.subprocess' local guide = require "parser.guide" local converter = require 'proto.converter' local autoreq = require 'core.completion.auto-require' local rpath = require 'workspace.require-path' local furi = require 'file-uri' -local undefined = require 'core.diagnostics.undefined-global' local vm = require 'vm' ---@param uri uri @@ -51,7 +49,7 @@ local function checkDisableByLuaDocExits(uri, row, mode, code) return nil end -local function checkDisableByLuaDocInsert(uri, row, mode, code) +local function checkDisableByLuaDocInsert(_uri, row, mode, code) return { start = guide.positionOf(row, 0), finish = guide.positionOf(row, 0), @@ -242,7 +240,7 @@ local function solveSyntaxByFix(uri, err, results) } end -local function solveSyntaxUnicodeName(uri, err, results) +local function solveSyntaxUnicodeName(uri, _err, results) results[#results+1] = { title = lang.script('ACTION_RUNTIME_UNICODE_NAME'), kind = 'quickfix', @@ -321,7 +319,7 @@ local function solveAmbiguity1(uri, diag, results) } end -local function solveTrailingSpace(uri, diag, results) +local function solveTrailingSpace(uri, _diag, results) results[#results+1] = { title = lang.script.ACTION_REMOVE_SPACE, kind = 'quickfix', @@ -697,7 +695,7 @@ local function checkMissingRequire(results, uri, start, finish) end local function addRequires(global, endpos) - autoreq.check(state, global, endpos, function(moduleFile, stemname, targetSource) + autoreq.check(state, global, endpos, function(moduleFile, _stemname, _targetSource) local visiblePaths = rpath.getVisiblePath(uri, furi.decode(moduleFile)) if not visiblePaths or #visiblePaths == 0 then return end diff --git a/script/core/command/autoRequire.lua b/script/core/command/autoRequire.lua index 9f3ff9297..edf769c50 100644 --- a/script/core/command/autoRequire.lua +++ b/script/core/command/autoRequire.lua @@ -1,6 +1,5 @@ local files = require 'files' local furi = require 'file-uri' -local config = require 'config' local rpath = require 'workspace.require-path' local client = require 'client' local lang = require 'language' diff --git a/script/core/command/exportDocument.lua b/script/core/command/exportDocument.lua index 39832856b..e145e6222 100644 --- a/script/core/command/exportDocument.lua +++ b/script/core/command/exportDocument.lua @@ -2,7 +2,6 @@ local doc = require 'cli.doc' local client = require 'client' local furi = require 'file-uri' local lang = require 'language' -local ws = require 'workspace' local files = require 'files' ---@async diff --git a/script/core/command/reloadFFIMeta.lua b/script/core/command/reloadFFIMeta.lua index d00929adb..afb56eac9 100644 --- a/script/core/command/reloadFFIMeta.lua +++ b/script/core/command/reloadFFIMeta.lua @@ -32,7 +32,7 @@ return function (uri) return end - for i, v in ipairs(refs) do + for _, v in ipairs(refs) do local target_uri = v.uri local codes = searchCode(refs, target_uri) if not codes then diff --git a/script/core/completion/completion.lua b/script/core/completion/completion.lua index 10d26a416..e46c03c4e 100644 --- a/script/core/completion/completion.lua +++ b/script/core/completion/completion.lua @@ -448,7 +448,7 @@ local function checkModule(state, word, position, results) end) end -local function checkFieldFromFieldToIndex(state, name, src, parent, word, startPos, position) +local function checkFieldFromFieldToIndex(state, name, parent, word, position) if name:match(guide.namePatternFull) then if not name:match '[\x80-\xff]' or config.get(state.uri, 'Lua.runtime.unicodeName') then @@ -499,7 +499,7 @@ local function checkFieldFromFieldToIndex(state, name, src, parent, word, startP return textEdit, additionalTextEdits end -local function checkFieldThen(state, name, src, word, startPos, position, parent, oop, results) +local function checkFieldThen(state, name, src, word, position, parent, oop, results) local value = vm.getObjectFunctionValue(src) or src local kind = define.CompletionItemKind.Field if (value.type == 'function' and not vm.isVarargFunctionWithOverloads(value)) @@ -542,7 +542,7 @@ local function checkFieldThen(state, name, src, word, startPos, position, parent newText = name:sub(#str[2] + 1, - #str[2] - 1), } else - textEdit, additionalTextEdits = checkFieldFromFieldToIndex(state, name, src, parent, word, startPos, position) + textEdit, additionalTextEdits = checkFieldFromFieldToIndex(state, name, parent, word, position) end results[#results+1] = { label = name, @@ -632,7 +632,7 @@ local function checkFieldOfRefs(refs, state, word, startPos, position, parent, o local fieldResults = {} for name, src in util.sortPairs(fields) do if src then - checkFieldThen(state, name, src, word, startPos, position, parent, oop, fieldResults) + checkFieldThen(state, name, src, word, position, parent, oop, fieldResults) await.delay() end end @@ -1256,12 +1256,10 @@ local function insertDocEnum(state, pos, doc, enums) return enums end ----@param state parser.state ----@param pos integer ---@param doc vm.node.object ---@param enums table[] ---@return table[]? -local function insertDocEnumKey(state, pos, doc, enums) +local function insertDocEnumKey(doc, enums) local tbl = doc.bindSource if not tbl then return nil @@ -1357,12 +1355,12 @@ local function insertEnum(state, pos, src, enums, isInArray, mark) elseif src.type == 'doc.enum' then ---@cast src parser.object if vm.docHasAttr(src, 'key') then - insertDocEnumKey(state, pos, src, enums) + insertDocEnumKey(src, enums) else insertDocEnum(state, pos, src, enums) end elseif isInArray and src.type == 'doc.type.array' then - for i, d in ipairs(vm.getDefs(src.node)) do + for _, d in ipairs(vm.getDefs(src.node)) do insertEnum(state, pos, d, enums, isInArray, mark) end elseif src.type == 'global' and src.cate == 'type' then @@ -2082,7 +2080,7 @@ local function tryluaDocByErr(state, position, err, docState, results) end local label = {} local insertText = {} - for i, arg in ipairs(func.args) do + for _, arg in ipairs(func.args) do if arg[1] and arg.type ~= 'self' then label[#label+1] = arg[1] if #label == 1 then @@ -2098,7 +2096,7 @@ local function tryluaDocByErr(state, position, err, docState, results) insertTextFormat = 2, insertText = table.concat(insertText, '\n'), } - for i, arg in ipairs(func.args) do + for _, arg in ipairs(func.args) do if arg[1] then results[#results+1] = { label = arg[1], diff --git a/script/core/completion/keyword.lua b/script/core/completion/keyword.lua index aa0e21487..1c0199a47 100644 --- a/script/core/completion/keyword.lua +++ b/script/core/completion/keyword.lua @@ -1,5 +1,4 @@ local define = require 'proto.define' -local files = require 'files' local guide = require 'parser.guide' local config = require 'config' local util = require 'utility' diff --git a/script/core/definition.lua b/script/core/definition.lua index 3619916e6..75a1433f5 100644 --- a/script/core/definition.lua +++ b/script/core/definition.lua @@ -59,7 +59,7 @@ local accept = { ['doc.field.name'] = true, } -local function checkRequire(source, offset) +local function checkRequire(source) if source.type ~= 'string' then return nil end @@ -141,14 +141,14 @@ return function (uri, offset) local results = {} local uris = checkRequire(source) if uris then - for i, uri in ipairs(uris) do + for _, uri0 in ipairs(uris) do results[#results+1] = { - uri = uri, + uri = uri0, source = source, target = { start = 0, finish = 0, - uri = uri, + uri = uri0, } } end diff --git a/script/core/diagnostics/cast-type-mismatch.lua b/script/core/diagnostics/cast-type-mismatch.lua index d86443c57..c91b1efd1 100644 --- a/script/core/diagnostics/cast-type-mismatch.lua +++ b/script/core/diagnostics/cast-type-mismatch.lua @@ -1,5 +1,4 @@ local files = require 'files' -local guide = require 'parser.guide' local lang = require 'language' local vm = require 'vm' local await = require 'await' diff --git a/script/core/diagnostics/different-requires.lua b/script/core/diagnostics/different-requires.lua index 22e3e6810..6e86e0038 100644 --- a/script/core/diagnostics/different-requires.lua +++ b/script/core/diagnostics/different-requires.lua @@ -1,7 +1,6 @@ local files = require 'files' local guide = require 'parser.guide' local lang = require 'language' -local config = require 'config' local vm = require 'vm' local rpath = require 'workspace.require-path' diff --git a/script/core/diagnostics/duplicate-set-field.lua b/script/core/diagnostics/duplicate-set-field.lua index 2705c2d4b..97d50f1da 100644 --- a/script/core/diagnostics/duplicate-set-field.lua +++ b/script/core/diagnostics/duplicate-set-field.lua @@ -1,6 +1,5 @@ local files = require 'files' local lang = require 'language' -local define = require 'proto.define' local guide = require 'parser.guide' local vm = require 'vm' local await = require 'await' @@ -24,7 +23,6 @@ local function getTopFunctionOfIf(source) end source = source.parent end - return nil end ---@async diff --git a/script/core/diagnostics/missing-fields.lua b/script/core/diagnostics/missing-fields.lua index 5ce650ec6..089d14d43 100644 --- a/script/core/diagnostics/missing-fields.lua +++ b/script/core/diagnostics/missing-fields.lua @@ -35,7 +35,7 @@ return function (uri, callback) return end end - + local myKeys local warnings = {} for className, samedefs in pairs(sortedDefs) do @@ -44,7 +44,7 @@ return function (uri, callback) if not def.fields or #def.fields == 0 then goto continue end - + if not myKeys then myKeys = {} for _, field in ipairs(src) do @@ -82,7 +82,7 @@ return function (uri, callback) if #missedKeys == 0 then return end - + warnings[#warnings+1] = lang.script('DIAG_MISSING_FIELDS', className, table.concat(missedKeys, ', ')) end diff --git a/script/core/diagnostics/missing-local-export-doc.lua b/script/core/diagnostics/missing-local-export-doc.lua index da413961e..b1a9e217c 100644 --- a/script/core/diagnostics/missing-local-export-doc.lua +++ b/script/core/diagnostics/missing-local-export-doc.lua @@ -41,7 +41,7 @@ return function (uri, callback) await.delay() --table - for i, ret in ipairs(source) do + for _, ret in ipairs(source) do if ret.type == 'getlocal' then if ret.node.value and ret.node.value.type == 'table' then findSetField(state.ast, ret[1], callback) diff --git a/script/core/diagnostics/param-type-mismatch.lua b/script/core/diagnostics/param-type-mismatch.lua index acbf9c8c2..d97bb76d1 100644 --- a/script/core/diagnostics/param-type-mismatch.lua +++ b/script/core/diagnostics/param-type-mismatch.lua @@ -32,9 +32,8 @@ end ---@param funcNode vm.node ---@param i integer ----@param uri uri ---@return vm.node? -local function getDefNode(funcNode, i, uri) +local function getDefNode(funcNode, i) local defNode = vm.createNode() for src in funcNode:eachObject() do if src.type == 'function' @@ -93,7 +92,7 @@ return function (uri, callback) if not refNode then goto CONTINUE end - local defNode = getDefNode(funcNode, i, uri) + local defNode = getDefNode(funcNode, i) if not defNode then goto CONTINUE end diff --git a/script/core/diagnostics/unbalanced-assignments.lua b/script/core/diagnostics/unbalanced-assignments.lua index f72e1fd50..a2fdf42c0 100644 --- a/script/core/diagnostics/unbalanced-assignments.lua +++ b/script/core/diagnostics/unbalanced-assignments.lua @@ -1,5 +1,4 @@ local files = require 'files' -local define = require 'proto.define' local lang = require 'language' local guide = require 'parser.guide' local await = require 'await' @@ -13,7 +12,7 @@ local types = { } ---@async -return function (uri, callback, code) +return function (uri, callback) local ast = files.getState(uri) if not ast then return diff --git a/script/core/diagnostics/undefined-global.lua b/script/core/diagnostics/undefined-global.lua index d9d949598..ae50c717e 100644 --- a/script/core/diagnostics/undefined-global.lua +++ b/script/core/diagnostics/undefined-global.lua @@ -1,10 +1,7 @@ local files = require 'files' local vm = require 'vm' local lang = require 'language' -local config = require 'config' local guide = require 'parser.guide' -local await = require 'await' -local util = require 'utility' local requireLike = { ['include'] = true, diff --git a/script/core/diagnostics/unknown-cast-variable.lua b/script/core/diagnostics/unknown-cast-variable.lua index 7c12e4d30..67fea5fca 100644 --- a/script/core/diagnostics/unknown-cast-variable.lua +++ b/script/core/diagnostics/unknown-cast-variable.lua @@ -1,5 +1,4 @@ local files = require 'files' -local guide = require 'parser.guide' local lang = require 'language' local vm = require 'vm' local await = require 'await' diff --git a/script/core/diagnostics/unknown-operator.lua b/script/core/diagnostics/unknown-operator.lua index 7404b5ef7..703995fe8 100644 --- a/script/core/diagnostics/unknown-operator.lua +++ b/script/core/diagnostics/unknown-operator.lua @@ -1,9 +1,6 @@ local files = require 'files' -local guide = require 'parser.guide' local lang = require 'language' local vm = require 'vm' -local await = require 'await' -local util = require 'utility' ---@async return function (uri, callback) diff --git a/script/core/folding.lua b/script/core/folding.lua index 7f59636ed..9f1fbd272 100644 --- a/script/core/folding.lua +++ b/script/core/folding.lua @@ -4,7 +4,7 @@ local util = require 'utility' local await = require 'await' local care = { - ['function'] = function (source, text, results) + ['function'] = function (source, _text, results) local folding = { start = source.start, finish = source.finish, @@ -20,7 +20,7 @@ local care = { } end end, - ['do'] = function (source, text, results) + ['do'] = function (source, _text, results) local folding = { start = source.start, finish = source.finish, @@ -28,7 +28,7 @@ local care = { } results[#results+1] = folding end, - ['if'] = function (source, text, results) + ['if'] = function (source, _text, results) for i = 1, #source do local block = source[i] local nblock = source[i + 1] @@ -39,7 +39,7 @@ local care = { } end end, - ['loop'] = function (source, text, results) + ['loop'] = function (source, _text, results) local folding = { start = source.start, finish = source.finish, @@ -47,7 +47,7 @@ local care = { } results[#results+1] = folding end, - ['in'] = function (source, text, results) + ['in'] = function (source, _text, results) local folding = { start = source.start, finish = source.finish, @@ -55,7 +55,7 @@ local care = { } results[#results+1] = folding end, - ['while'] = function (source, text, results) + ['while'] = function (source, _text, results) local folding = { start = source.start, finish = source.finish, @@ -63,7 +63,7 @@ local care = { } results[#results+1] = folding end, - ['repeat'] = function (source, text, results) + ['repeat'] = function (source, _text, results) local start = source.start local finish = source.keyword[#source.keyword] -- must end with 'until' @@ -77,7 +77,7 @@ local care = { } results[#results+1] = folding end, - ['table'] = function (source, text, results) + ['table'] = function (source, _text, results) local folding = { start = source.start, finish = source.finish, @@ -85,7 +85,7 @@ local care = { } results[#results+1] = folding end, - ['string'] = function (source, text, results) + ['string'] = function (source, _text, results) local folding = { start = source.start, finish = source.finish, @@ -93,7 +93,7 @@ local care = { } results[#results+1] = folding end, - ['comment.short'] = function (source, text, results, status) + ['comment.short'] = function (source, _text, results, status) local ltext = source.text:lower() ltext = util.trim(ltext, 'left') if ltext:sub(1, #'region') == 'region' @@ -119,7 +119,7 @@ local care = { } end end, - ['comment.long'] = function (source, text, results) + ['comment.long'] = function (source, _text, results) local folding = { start = source.start, finish = source.finish, @@ -127,7 +127,7 @@ local care = { } results[#results+1] = folding end, - ['comment.clong'] = function (source, text, results) + ['comment.clong'] = function (source, _text, results) local folding = { start = source.start, finish = source.finish, @@ -135,7 +135,7 @@ local care = { } results[#results+1] = folding end, - ['doc.class'] = function (source, text, results) + ['doc.class'] = function (source, _text, results) local folding = { start = source.start, finish = source.bindGroup[#source.bindGroup].finish, @@ -144,7 +144,7 @@ local care = { } results[#results+1] = folding end, - ['doc.alias'] = function (source, text, results) + ['doc.alias'] = function (source, _text, results) local folding = { start = source.start, finish = source.bindGroup[#source.bindGroup].finish, diff --git a/script/core/highlight.lua b/script/core/highlight.lua index 722146724..6eab0a0dc 100644 --- a/script/core/highlight.lua +++ b/script/core/highlight.lua @@ -25,7 +25,7 @@ local function eachLocal(source, callback) end ---@async -local function find(source, uri, callback) +local function find(source, callback) if source.type == 'local' then eachLocal(source, callback) elseif source.type == 'getlocal' @@ -254,7 +254,7 @@ return function (uri, offset) if source then local isGlobal = guide.isGlobal(source) local isLiteral = isLiteralValue(source) - find(source, uri, function (target) + find(source, function (target) if not target then return end diff --git a/script/core/hint.lua b/script/core/hint.lua index b0ff5aa75..8ce73e56d 100644 --- a/script/core/hint.lua +++ b/script/core/hint.lua @@ -274,7 +274,7 @@ local blockTypes = { } ---@async -local function semicolonHint(uri, results, start, finish) +local function semicolonHint(uri, results, _start, _finish) local state = files.getState(uri) if not state then return diff --git a/script/core/hover/description.lua b/script/core/hover/description.lua index 0cbcc835c..9fcc88aa4 100644 --- a/script/core/hover/description.lua +++ b/script/core/hover/description.lua @@ -19,16 +19,16 @@ local function collectRequire(mode, literal, uri) end if result and #result > 0 then local shows = {} - for i, uri in ipairs(result) do - local searcher = searchers and searchers[uri] - local path = ws.getRelativePath(uri) - if vm.isMetaFile(uri) then - shows[i] = ('* [[meta]](%s)'):format(uri) + for i, uri0 in ipairs(result) do + local searcher = searchers and searchers[uri0] + local path = ws.getRelativePath(uri0) + if vm.isMetaFile(uri0) then + shows[i] = ('* [[meta]](%s)'):format(uri0) elseif searcher then searcher = searcher:gsub('^[/\\]+', '') - shows[i] = ('* [%s](%s) %s'):format(path, uri, lang.script('HOVER_USE_LUA_PATH', searcher)) + shows[i] = ('* [%s](%s) %s'):format(path, uri0, lang.script('HOVER_USE_LUA_PATH', searcher)) else - shows[i] = ('* [%s](%s)'):format(path, uri) + shows[i] = ('* [%s](%s)'):format(path, uri0) end end table.sort(shows) diff --git a/script/core/hover/table.lua b/script/core/hover/table.lua index e59a26d05..7ab0ad348 100644 --- a/script/core/hover/table.lua +++ b/script/core/hover/table.lua @@ -1,5 +1,4 @@ local vm = require 'vm' -local util = require 'utility' local config = require 'config' local await = require 'await' local guide = require 'parser.guide' diff --git a/script/core/implementation.lua b/script/core/implementation.lua index e48e2f736..51538ee2e 100644 --- a/script/core/implementation.lua +++ b/script/core/implementation.lua @@ -1,9 +1,7 @@ -local workspace = require 'workspace' local files = require 'files' local vm = require 'vm' local findSource = require 'core.find-source' local guide = require 'parser.guide' -local rpath = require 'workspace.require-path' local jumpSource = require 'core.jump-source' local function sortResults(results) diff --git a/script/core/look-backward.lua b/script/core/look-backward.lua index 508b57eb0..611fd8ff3 100644 --- a/script/core/look-backward.lua +++ b/script/core/look-backward.lua @@ -66,7 +66,6 @@ function m.findSymbol(text, offset) end ::CONTINUE:: end - return nil end function m.findTargetSymbol(text, offset, symbol) @@ -79,7 +78,6 @@ function m.findTargetSymbol(text, offset, symbol) return nil end end - return nil end ---@param text string diff --git a/script/core/rename.lua b/script/core/rename.lua index 534a972a8..afff8a4a7 100644 --- a/script/core/rename.lua +++ b/script/core/rename.lua @@ -110,8 +110,8 @@ local function renameField(source, newname, callback) , util.viewString(newname) ) callback(source, func.start, parent.finish, newstr) - local finishOffset = guide.positionToOffset(state, parent.finish) - local pl = text:find('(', finishOffset, true) + local finishOffset0 = guide.positionToOffset(state, parent.finish) + local pl = text:find('(', finishOffset0, true) if pl then local insertPos = guide.offsetToPosition(state, pl) if text:find('^%s*%)', pl + 1) then diff --git a/script/core/semantic-tokens.lua b/script/core/semantic-tokens.lua index a3344f6b6..25df6b3c1 100644 --- a/script/core/semantic-tokens.lua +++ b/script/core/semantic-tokens.lua @@ -655,7 +655,7 @@ local Care = util.switch() } end) : case 'nonstandardSymbol.comment' - : call(function (source, options, results) + : call(function (source, _options, results) results[#results+1] = { start = source.start, finish = source.finish, @@ -663,7 +663,7 @@ local Care = util.switch() } end) : case 'nonstandardSymbol.continue' - : call(function (source, options, results) + : call(function (source, _options, results) results[#results+1] = { start = source.start, finish = source.finish, @@ -671,7 +671,7 @@ local Care = util.switch() } end) : case 'doc.cast.block' - : call(function (source, options, results) + : call(function (source, _options, results) results[#results+1] = { start = source.start, finish = source.finish, @@ -679,7 +679,7 @@ local Care = util.switch() } end) : case 'doc.cast.name' - : call(function (source, options, results) + : call(function (source, _options, results) results[#results+1] = { start = source.start, finish = source.finish, @@ -687,7 +687,7 @@ local Care = util.switch() } end) : case 'doc.type.code' - : call(function (source, options, results) + : call(function (source, _options, results) results[#results+1] = { start = source.start, finish = source.finish, @@ -696,7 +696,7 @@ local Care = util.switch() } end) : case 'doc.operator.name' - : call(function (source, options, results) + : call(function (source, _options, results) results[#results+1] = { start = source.start, finish = source.finish, @@ -704,7 +704,7 @@ local Care = util.switch() } end) : case 'doc.meta.name' - : call(function (source, options, results) + : call(function (source, _options, results) results[#results+1] = { start = source.start, finish = source.finish, @@ -712,7 +712,7 @@ local Care = util.switch() } end) : case 'doc.attr' - : call(function (source, options, results) + : call(function (source, _options, results) results[#results+1] = { start = source.start, finish = source.finish, @@ -720,9 +720,8 @@ local Care = util.switch() } end) ----@param state table ---@param results table -local function buildTokens(state, results) +local function buildTokens(results) local tokens = {} local lastLine = 0 local lastStartChar = 0 @@ -939,7 +938,7 @@ return function (uri, start, finish) results = solveMultilineAndOverlapping(state, results) - local tokens = buildTokens(state, results) + local tokens = buildTokens(results) return tokens end diff --git a/script/core/type-definition.lua b/script/core/type-definition.lua index d9939eb0e..ccdb2f96f 100644 --- a/script/core/type-definition.lua +++ b/script/core/type-definition.lua @@ -57,7 +57,7 @@ local accept = { ['doc.field.name'] = true, } -local function checkRequire(source, offset) +local function checkRequire(source) if source.type ~= 'string' then return nil end @@ -119,14 +119,14 @@ return function (uri, offset) local results = {} local uris = checkRequire(source) if uris then - for i, uri in ipairs(uris) do + for _, uri0 in ipairs(uris) do results[#results+1] = { - uri = uri, + uri = uri0, source = source, target = { start = 0, finish = 0, - uri = uri, + uri = uri0, } } end diff --git a/script/core/type-formatting.lua b/script/core/type-formatting.lua index f60806505..a333ab44d 100644 --- a/script/core/type-formatting.lua +++ b/script/core/type-formatting.lua @@ -1,8 +1,5 @@ -local files = require 'files' -local lookBackward = require 'core.look-backward' -local guide = require 'parser.guide' -local config = require 'config' -local util = require 'utility' +local files = require 'files' +local config = require 'config' local function typeFormat(results, uri, position, ch, options) if ch ~= '\n' then diff --git a/script/core/workspace-symbol.lua b/script/core/workspace-symbol.lua index f831aa034..d197889a1 100644 --- a/script/core/workspace-symbol.lua +++ b/script/core/workspace-symbol.lua @@ -2,10 +2,9 @@ local files = require 'files' local guide = require 'parser.guide' local matchKey = require 'core.matchkey' local define = require 'proto.define' -local await = require 'await' local vm = require 'vm' -local function buildSource(uri, source, key, results) +local function buildSource(source, key, results) if source.type == 'local' or source.type == 'setlocal' or source.type == 'setglobal' then @@ -51,7 +50,7 @@ local function searchFile(uri, key, results) end guide.eachSource(ast.ast, function (source) - buildSource(uri, source, key, results) + buildSource(source, key, results) end) end diff --git a/script/doctor.lua b/script/doctor.lua index 478831c36..a7fd240bb 100644 --- a/script/doctor.lua +++ b/script/doctor.lua @@ -182,7 +182,7 @@ m.snapshot = private(function () ---@generic T ---@param o T ---@return T - local function private(o) + local function private0(o) if not o then return nil end @@ -190,10 +190,10 @@ m.snapshot = private(function () return o end - private(exclude) + private0(exclude) local find - local mark = private {} + local mark = private0 {} local function findTable(t, result) result = result or {} @@ -218,14 +218,14 @@ m.snapshot = private(function () find(v) local valueResults = mark[v] if valueResults then - valueResults[#valueResults+1] = private { + valueResults[#valueResults+1] = private0 { type = 'weakvalue-key', name = formatName(t) .. '|' .. formatName(v), info = keyInfo, } end else - result[#result+1] = private { + result[#result+1] = private0 { type = 'key', name = formatName(k), info = keyInfo, @@ -240,14 +240,14 @@ m.snapshot = private(function () find(k) local keyResults = mark[k] if keyResults then - keyResults[#keyResults+1] = private { + keyResults[#keyResults+1] = private0 { type = 'weakkey-field', name = formatName(t) .. '|' .. formatName(k), info = valueInfo, } end else - result[#result+1] = private { + result[#result+1] = private0 { type = 'field', name = formatName(k) .. '|' .. formatName(v), info = valueInfo, @@ -258,7 +258,7 @@ m.snapshot = private(function () end local MTInfo = find(getmetatable(t)) if MTInfo then - result[#result+1] = private { + result[#result+1] = private0 { type = 'metatable', name = '', info = MTInfo, @@ -276,7 +276,7 @@ m.snapshot = private(function () end local valueInfo = find(v) if valueInfo then - result[#result+1] = private { + result[#result+1] = private0 { type = 'upvalue', name = n, info = valueInfo, @@ -296,7 +296,7 @@ m.snapshot = private(function () end local valueInfo = find(v) if valueInfo then - result[#result+1] = private { + result[#result+1] = private0 { type = 'uservalue', name = formatName(i), info = valueInfo, @@ -305,7 +305,7 @@ m.snapshot = private(function () end local MTInfo = find(getmetatable(u)) if MTInfo then - result[#result+1] = private { + result[#result+1] = private0 { type = 'metatable', name = '', info = MTInfo, @@ -322,7 +322,7 @@ m.snapshot = private(function () if m._ignoreMainThread and trd == registry[1] then return nil end - result = result or private {} + result = result or private0 {} for i = 1, maxinterger do local info = getinfo(trd, i, 'Sf') @@ -338,14 +338,14 @@ m.snapshot = private(function () end local valueInfo = find(l) if valueInfo then - funcInfo[#funcInfo+1] = private { + funcInfo[#funcInfo+1] = private0 { type = 'local', name = n, info = valueInfo, } end end - result[#result+1] = private { + result[#result+1] = private0 { type = 'stack', name = i .. '@' .. formatName(info.func), info = funcInfo, @@ -364,7 +364,7 @@ m.snapshot = private(function () if m._ignoreMainThread then return nil end - local result = private {} + local result = private0 {} for i = 1, maxinterger do local info = getinfo(i, 'Sf') @@ -380,14 +380,14 @@ m.snapshot = private(function () end local valueInfo = find(l) if valueInfo then - funcInfo[#funcInfo+1] = private { + funcInfo[#funcInfo+1] = private0 { type = 'local', name = n, info = valueInfo, } end end - result[#result+1] = private { + result[#result+1] = private0 { type = 'stack', name = i .. '@' .. formatName(info.func), info = funcInfo, @@ -410,16 +410,16 @@ m.snapshot = private(function () end local tp = type(obj) if tp == 'table' then - mark[obj] = private {} + mark[obj] = private0 {} mark[obj] = findTable(obj, mark[obj]) elseif tp == 'function' then - mark[obj] = private {} + mark[obj] = private0 {} mark[obj] = findFunction(obj, mark[obj]) elseif tp == 'userdata' then - mark[obj] = private {} + mark[obj] = private0 {} mark[obj] = findUserData(obj, mark[obj]) elseif tp == 'thread' then - mark[obj] = private {} + mark[obj] = private0 {} mark[obj] = findThread(obj, mark[obj]) else return nil @@ -431,26 +431,26 @@ m.snapshot = private(function () end -- TODO: Lua 5.1中,主线程与_G都不在注册表里 - local result = private { + local result = private0 { name = formatName(registry), type = 'root', info = find(registry), } if not registry[1] then - result.info[#result.info+1] = private { + result.info[#result.info+1] = private0 { type = 'thread', name = 'main', info = findMainThread(), } end if not registry[2] then - result.info[#result.info+1] = private { + result.info[#result.info+1] = private0 { type = '_G', name = '_G', info = find(_G), } end - for name, mt in next, private { + for name, mt in next, private0 { ['nil'] = getmetatable(nil), ['boolean'] = getmetatable(true), ['number'] = getmetatable(0), @@ -458,7 +458,7 @@ m.snapshot = private(function () ['function'] = getmetatable(function () end), ['thread'] = getmetatable(ccreate(function () end)), } do - result.info[#result.info+1] = private { + result.info[#result.info+1] = private0 { type = 'metatable', name = name, info = find(mt), diff --git a/script/file-uri.lua b/script/file-uri.lua index 192f3ab5a..4c5649046 100644 --- a/script/file-uri.lua +++ b/script/file-uri.lua @@ -95,7 +95,7 @@ end ---@param uri string ---@return boolean function m.isValid(uri) - local scheme, authority, path = m.split(uri) + local scheme, _authority, path = m.split(uri) if not scheme or scheme == '' then return false end diff --git a/script/files.lua b/script/files.lua index b9df56957..401e81dad 100644 --- a/script/files.lua +++ b/script/files.lua @@ -6,9 +6,7 @@ local furi = require 'file-uri' local parser = require 'parser' local lang = require 'language' local await = require 'await' -local timer = require 'timer' local util = require 'utility' -local guide = require 'parser.guide' local smerger = require 'string-merger' local progress = require "progress" local encoder = require 'encoder' diff --git a/script/fs-utility.lua b/script/fs-utility.lua index 35b336fe6..c226c7616 100644 --- a/script/fs-utility.lua +++ b/script/fs-utility.lua @@ -1,5 +1,4 @@ local fs = require 'bee.filesystem' -local platform = require 'bee.platform' local type = type local ioOpen = io.open @@ -7,7 +6,6 @@ local pcall = pcall local pairs = pairs local setmetatable = setmetatable local next = next -local ipairs = ipairs local tostring = tostring local tableSort = table.sort @@ -286,7 +284,7 @@ local function fsAbsolute(path, option) return res end -local function fsIsDirectory(path, option) +local function fsIsDirectory(path) if not path then return false end @@ -455,7 +453,7 @@ local function fileRemove(path, option) if option.onRemove and option.onRemove(path) == false then return end - if fsIsDirectory(path, option) then + if fsIsDirectory(path) then for child in fsPairs(path, option) do fileRemove(child, option) end @@ -472,8 +470,8 @@ local function fileCopy(source, target, option) if not source or not target then return end - local isDir1 = fsIsDirectory(source, option) - local isDir2 = fsIsDirectory(target, option) + local isDir1 = fsIsDirectory(source) + local isDir2 = fsIsDirectory(target) local isExists = fsExists(target, option) if isDir1 then if isDir2 or fsCreateDirectories(target, option) then @@ -508,8 +506,8 @@ local function fileSync(source, target, option) if not source or not target then return end - local isDir1 = fsIsDirectory(source, option) - local isDir2 = fsIsDirectory(target, option) + local isDir1 = fsIsDirectory(source) + local isDir2 = fsIsDirectory(target) local isExists = fsExists(target, option) if isDir1 then if isDir2 then diff --git a/script/gc.lua b/script/gc.lua index 927395851..e733f22e5 100644 --- a/script/gc.lua +++ b/script/gc.lua @@ -51,7 +51,7 @@ end local function zip(self) local list = self._list local index = 1 - for i = 1, #list do + for _ = 1, #list do local obj = list[index] if not obj then break diff --git a/script/glob/gitignore.lua b/script/glob/gitignore.lua index fef0a0d74..d7615ccbc 100644 --- a/script/glob/gitignore.lua +++ b/script/glob/gitignore.lua @@ -100,11 +100,11 @@ function mt:hasInterface(name) return self.interface[name] ~= nil end -function mt:checkDirectory(catch, path, matcher) +function mt:checkDirectory(catch, path, matcher0) if not self:hasInterface 'type' then return true end - if not matcher:isNeedDirectory() then + if not matcher0:isNeedDirectory() then return true end if #catch < #path then @@ -119,10 +119,10 @@ end function mt:simpleMatch(path) path = self:getRelativePath(path) for i = #self.matcher, 1, -1 do - local matcher = self.matcher[i] - local catch = matcher(path) - if catch and self:checkDirectory(catch, path, matcher) then - if matcher:isNegative() then + local matcher0 = self.matcher[i] + local catch = matcher0(path) + if catch and self:checkDirectory(catch, path, matcher0) then + if matcher0:isNegative() then return false else return true @@ -182,12 +182,12 @@ function mt:scan(path, callback, hook) elseif fileType == 'directory' then local result = self:callInterface('list', current) if type(result) == 'table' then - for _, path in ipairs(result) do - local filename = path:match '([^/\\]+)[/\\]*$' + for _, path0 in ipairs(result) do + local filename = path0:match '([^/\\]+)[/\\]*$' if filename and filename ~= '.' and filename ~= '..' then - list[#list+1] = path + list[#list+1] = path0 end end end diff --git a/script/lazytable.lua b/script/lazytable.lua index f964f236c..6d1f2611d 100644 --- a/script/lazytable.lua +++ b/script/lazytable.lua @@ -5,8 +5,6 @@ local next = next local load = load local setmt = setmetatable local rawset = rawset -local sdump = string.dump -local sbyte = string.byte local smatch = string.match local sformat = string.format local tconcat = table.concat diff --git a/script/lclient.lua b/script/lclient.lua index 3bcde50ae..0909e9321 100644 --- a/script/lclient.lua +++ b/script/lclient.lua @@ -5,7 +5,6 @@ local await = require 'await' local timer = require 'timer' local pub = require 'pub' local json = require 'json' -local client = require 'client' local define = require 'proto.define' require 'provider' diff --git a/script/library.lua b/script/library.lua index 49e39470b..620520dbc 100644 --- a/script/library.lua +++ b/script/library.lua @@ -343,7 +343,7 @@ local function loadSingle3rdConfig(libraryDir) local jsonbuf = jsonb.beautify(cfg) client.requestMessage('Info', lang.script.WINDOW_CONFIG_LUA_DEPRECATED, { lang.script.WINDOW_CONVERT_CONFIG_LUA, - }, function (action, index) + }, function (_action, index) if index == 1 and jsonbuf then fsu.saveFile(libraryDir / 'config.json', jsonbuf) fsu.fileRemove(libraryDir / 'config.lua') @@ -638,7 +638,7 @@ local function check3rdOfWorkspace(suri) end, id) end -config.watch(function (uri, key, value, oldValue) +config.watch(function (uri, key, _value, _oldValue) if key:find '^Lua.runtime' then initBuiltIn(uri) end diff --git a/script/parser/compile.lua b/script/parser/compile.lua index 597c0e5bc..c007ed512 100644 --- a/script/parser/compile.lua +++ b/script/parser/compile.lua @@ -370,7 +370,7 @@ local function unknownSymbol(start, finish, word) return true end -local function skipUnknownSymbol(stopSymbol) +local function skipUnknownSymbol() if unknownSymbol() then Index = Index + 2 return true @@ -1123,7 +1123,6 @@ local function parseShortString() stringPool[stringIndex] = '\n' currentOffset = Tokens[Index] + #nextToken skipNL() - local right = getPosition(currentOffset + 1, 'right') escs[#escs+1] = escLeft escs[#escs+1] = escLeft + 1 escs[#escs+1] = 'normal' @@ -2274,7 +2273,7 @@ local function parseParams(params, isLambda) Index = Index + 2 goto CONTINUE end - skipUnknownSymbol ('%,%' .. endToken .. '%.') + skipUnknownSymbol() ::CONTINUE:: end return params diff --git a/script/parser/guide.lua b/script/parser/guide.lua index aeb229658..429785125 100644 --- a/script/parser/guide.lua +++ b/script/parser/guide.lua @@ -750,12 +750,12 @@ end --- 遍历所有指定类型的source ---@param ast parser.object ----@param type string +---@param ty string ---@param callback fun(src: parser.object): any ---@return any -function m.eachSourceType(ast, type, callback) +function m.eachSourceType(ast, ty, callback) local cache = getSourceTypeCache(ast) - local myCache = cache[type] + local myCache = cache[ty] if not myCache then return end diff --git a/script/parser/luadoc.lua b/script/parser/luadoc.lua index 2ae24ccac..c95f8f3b2 100644 --- a/script/parser/luadoc.lua +++ b/script/parser/luadoc.lua @@ -739,7 +739,7 @@ local function parseCodePattern(parent) end end local start = getStart() - for i = 2 , finishOffset do + for _ = 2, finishOffset do nextToken() end local code = { @@ -2088,7 +2088,7 @@ local function bindDocWithSources(sources, binded) bindGeneric(binded) bindCommentsAndFields(binded) bindReturnIndex(binded) - + -- doc is special node if lastDoc.special then if bindDoc(lastDoc.special, binded) then @@ -2235,7 +2235,7 @@ local function luadoc(state) end if ast.state.pluginDocs then - for i, doc in ipairs(ast.state.pluginDocs) do + for _, doc in ipairs(ast.state.pluginDocs) do insertDoc(doc, doc.originalComment) end ---@param a unknown diff --git a/script/parser/relabel.lua b/script/parser/relabel.lua index ac9024034..323e01a15 100644 --- a/script/parser/relabel.lua +++ b/script/parser/relabel.lua @@ -23,7 +23,6 @@ _ENV = nil local any = m.P(1) -local dummy = mm.P(false) local errinfo = { diff --git a/script/plugin.lua b/script/plugin.lua index f2a108fa9..3dc77b22e 100644 --- a/script/plugin.lua +++ b/script/plugin.lua @@ -29,7 +29,7 @@ function m.dispatch(event, uri, ...) end local failed = 0 local res1, res2 - for i, interface in ipairs(interfaces) do + for _, interface in ipairs(interfaces) do local method = interface[event] if type(method) ~= 'function' then return false @@ -110,7 +110,7 @@ local function initPlugin(uri) if type(pluginConfigPaths) == 'string' then pluginConfigPaths = { pluginConfigPaths } end - for i, pluginConfigPath in ipairs(pluginConfigPaths) do + for _, pluginConfigPath in ipairs(pluginConfigPaths) do local myArgs = args if args and not args[1] then for k, v in pairs(args) do diff --git a/script/plugins/astHelper.lua b/script/plugins/astHelper.lua index bfe2dd27b..c4df175dd 100644 --- a/script/plugins/astHelper.lua +++ b/script/plugins/astHelper.lua @@ -1,5 +1,4 @@ local luadoc = require 'parser.luadoc' -local ssub = require 'core.substring' local guide = require 'parser.guide' local _M = {} diff --git a/script/plugins/ffi/c-parser/ctypes.lua b/script/plugins/ffi/c-parser/ctypes.lua index 115f78ab0..2f43d8aa6 100644 --- a/script/plugins/ffi/c-parser/ctypes.lua +++ b/script/plugins/ffi/c-parser/ctypes.lua @@ -126,12 +126,12 @@ local convert_value = typed("TypeList, table -> CType?, string?", function (lst, }), nil end) -local function convert_fields(lst, field_src, fields) +local function convert_fields(field_src, fields) if field_src.ids then - for i, id in ipairs(field_src.ids) do + for _, id in ipairs(field_src.ids) do id.type = utility.deepCopy(field_src.type) if id.type and id[1] then - for i, v in ipairs(id[1]) do + for _, v in ipairs(id[1]) do table.insert(id.type, v) end if id[1].idx then @@ -159,7 +159,7 @@ local function add_to_fields(lst, field_src, fields) return true end - if convert_fields(lst, field_src, fields) then + if convert_fields(field_src, fields) then return true end local field, err = convert_value(lst, field_src) diff --git a/script/plugins/ffi/c-parser/util.lua b/script/plugins/ffi/c-parser/util.lua index cb493efaf..8e043786f 100644 --- a/script/plugins/ffi/c-parser/util.lua +++ b/script/plugins/ffi/c-parser/util.lua @@ -1,7 +1,7 @@ local m = {} local function tableLenEqual(t, len) - for key, value in pairs(t) do + for _key, _value in pairs(t) do len = len - 1 if len < 0 then return false diff --git a/script/plugins/ffi/cdefRerence.lua b/script/plugins/ffi/cdefRerence.lua index 54a8c2a79..654d77436 100644 --- a/script/plugins/ffi/cdefRerence.lua +++ b/script/plugins/ffi/cdefRerence.lua @@ -8,7 +8,7 @@ local remove = table.remove local function getCdefSourcePosition(ffi_state) local cdef_position = ffi_state.ast.returns[1][1] local source = vm.getFields(cdef_position) - for index, value in ipairs(source) do + for _, value in ipairs(source) do local name = guide.getKeyName(value) if name == 'cdef' then return value.field.start diff --git a/script/plugins/ffi/init.lua b/script/plugins/ffi/init.lua index 17159ff2e..05c2b5844 100644 --- a/script/plugins/ffi/init.lua +++ b/script/plugins/ffi/init.lua @@ -1,11 +1,8 @@ local cdriver = require 'plugins.ffi.c-parser.cdriver' local util = require 'plugins.ffi.c-parser.util' local utility = require 'utility' -local SDBMHash = require 'SDBMHash' -local config = require 'config' local fs = require 'bee.filesystem' local ws = require 'workspace' -local furi = require 'file-uri' local namespace = 'ffi.namespace*.' @@ -88,7 +85,7 @@ local constName = 'm' local builder = { switch_ast = utility.switch() } function builder:getTypeAst(name) - for i, asts in ipairs(self.globalAsts) do + for _, asts in ipairs(self.globalAsts) do if asts[name] then return asts[name] end @@ -166,7 +163,7 @@ local function getArrayType(arr) return arr and '[]' or '' end local res = '' - for i, v in ipairs(arr) do + for _ in ipairs(arr) do res = res .. '[]' end return res @@ -188,7 +185,7 @@ end function builder:buildFunction(lines, tt, name) local param_names = {} - for i, param in ipairs(tt.params or {}) do + for _, param in ipairs(tt.params or {}) do local param_name = getValidName(param.name) lines[#lines+1] = ('---@param %s %s%s'):format(param_name, self:getType(param.type), getArrayType(param.idxs)) param_names[#param_names+1] = param_name diff --git a/script/plugins/ffi/searchCode.lua b/script/plugins/ffi/searchCode.lua index 86dbc6803..46d2e7af0 100644 --- a/script/plugins/ffi/searchCode.lua +++ b/script/plugins/ffi/searchCode.lua @@ -6,7 +6,7 @@ local function getLiterals(arg) if not literals then return res end - for k, v in pairs(literals) do + for k in pairs(literals) do if type(k) == 'string' then res[#res+1] = k end @@ -34,7 +34,7 @@ local function getCode(CdefReference) if not literals then goto CONTINUE end - for k, v in pairs(literals) do + for k in pairs(literals) do if type(k) == 'string' then res[#res+1] = k end @@ -51,7 +51,7 @@ return function (CdefReference, target_uri) return nil end local codeResults - for i, v in ipairs(CdefReference) do + for _, v in ipairs(CdefReference) do if v.uri ~= target_uri then goto continue end @@ -59,9 +59,9 @@ return function (CdefReference, target_uri) if not codes then goto continue end - for i, v in ipairs(codes) do + for _, v0 in ipairs(codes) do codeResults = codeResults or {} - codeResults[#codeResults+1] = v + codeResults[#codeResults+1] = v0 end ::continue:: end diff --git a/script/plugins/nodeHelper.lua b/script/plugins/nodeHelper.lua index 3f90b1521..d8ecd9825 100644 --- a/script/plugins/nodeHelper.lua +++ b/script/plugins/nodeHelper.lua @@ -1,6 +1,3 @@ -local vm = require 'vm' -local guide = require 'parser.guide' - local _M = {} ---@class node.match.pattern @@ -32,7 +29,7 @@ end function _M.matchPattern(source, pattern) if source.type == 'local' then if source.parent.type == 'funcargs' and source.parent.parent.type == 'function' then - for i, ref in ipairs(source.ref) do + for _, ref in ipairs(source.ref) do if deepCompare(ref, pattern) then return true end diff --git a/script/provider/build-meta.lua b/script/provider/build-meta.lua index baabe39c0..9fcd00957 100644 --- a/script/provider/build-meta.lua +++ b/script/provider/build-meta.lua @@ -1,5 +1,3 @@ -local fs = require 'bee.filesystem' -local config = require 'config' local util = require 'utility' local await = require 'await' local progress = require 'progress' diff --git a/script/provider/capability.lua b/script/provider/capability.lua index 4f7ec3885..b33f17fa6 100644 --- a/script/provider/capability.lua +++ b/script/provider/capability.lua @@ -1,8 +1,6 @@ local nonil = require 'without-check-nil' local client = require 'client' -local platform = require 'bee.platform' local completion = require 'provider.completion' -local define = require 'proto.define' require 'provider.semantic-tokens' require 'provider.formatting' diff --git a/script/provider/code-lens.lua b/script/provider/code-lens.lua index 5802b17eb..6d33e6152 100644 --- a/script/provider/code-lens.lua +++ b/script/provider/code-lens.lua @@ -14,7 +14,7 @@ local function refresh() proto.request('workspace/codeLens/refresh', json.null) end -config.watch(function (uri, key, value, oldValue) +config.watch(function (_uri, key, _value, _oldValue) if key == '' then refresh() end diff --git a/script/provider/completion.lua b/script/provider/completion.lua index 46960709a..373443fed 100644 --- a/script/provider/completion.lua +++ b/script/provider/completion.lua @@ -29,7 +29,7 @@ local function allWords() return list end -local function enable(uri) +local function enable(_uri) if isEnable then return end @@ -55,7 +55,7 @@ local function enable(uri) }) end -local function disable(uri) +local function disable(_uri) if not isEnable then return end diff --git a/script/provider/diagnostic.lua b/script/provider/diagnostic.lua index c52c7e895..c36ed8c2c 100644 --- a/script/provider/diagnostic.lua +++ b/script/provider/diagnostic.lua @@ -715,7 +715,7 @@ config.watch(function (uri, key, value, oldValue) end end) -fw.event(function (ev, path) +fw.event(function (_ev, path) if util.stringEndWith(path, '.editorconfig') then for _, scp in ipairs(ws.folders) do m.diagnosticsScope(scp.uri) diff --git a/script/provider/formatting.lua b/script/provider/formatting.lua index ea94db08c..f8b4ef21c 100644 --- a/script/provider/formatting.lua +++ b/script/provider/formatting.lua @@ -8,7 +8,6 @@ local furi = require 'file-uri' local fs = require 'bee.filesystem' local fw = require 'filewatch' local util = require 'utility' -local diagnostics = require 'provider.diagnostic' local config = require 'config' local loadedUris = {} @@ -19,7 +18,7 @@ local updateType = { Deleted = 3, } -fw.event(function(ev, path) +fw.event(function(_ev, path) if util.stringEndWith(path, '.editorconfig') then for uri, fsPath in pairs(loadedUris) do loadedUris[uri] = nil @@ -91,7 +90,7 @@ function m.updateNonStandardSymbols(symbols) codeFormat.set_nonstandard_symbol() end -config.watch(function(uri, key, value) +config.watch(function(_uri, key, value) if key == "Lua.format.defaultConfig" then codeFormat.set_default_config(value) elseif key == "Lua.runtime.nonstandardSymbol" then diff --git a/script/provider/inlay-hint.lua b/script/provider/inlay-hint.lua index 12b43330e..d970de5ab 100644 --- a/script/provider/inlay-hint.lua +++ b/script/provider/inlay-hint.lua @@ -14,7 +14,7 @@ local function refresh() proto.request('workspace/inlayHint/refresh', json.null) end -config.watch(function (uri, key, value, oldValue) +config.watch(function (_uri, key, _value, _oldValue) if key == '' then refresh() end diff --git a/script/provider/name-style.lua b/script/provider/name-style.lua index bdb20d80d..e95925ef0 100644 --- a/script/provider/name-style.lua +++ b/script/provider/name-style.lua @@ -19,7 +19,7 @@ function m.nameStyleCheck(uri, text) return codeFormat.name_style_analysis(uri, text) end -config.watch(function (uri, key, value) +config.watch(function (_uri, key, value) if key == "Lua.nameStyle.config" then codeFormat.update_name_style_config(value) end diff --git a/script/provider/provider.lua b/script/provider/provider.lua index f9f509951..bc4554465 100644 --- a/script/provider/provider.lua +++ b/script/provider/provider.lua @@ -7,7 +7,6 @@ local define = require 'proto.define' local workspace = require 'workspace' local config = require 'config' local client = require 'client' -local pub = require 'pub' local lang = require 'language' local progress = require 'progress' local tm = require 'text-merger' @@ -81,7 +80,7 @@ function m.register(method) end end -filewatch.event(function (ev, path) ---@async +filewatch.event(function (_ev, path) ---@async if (CONFIGPATH and util.stringEndWith(path, CONFIGPATH)) then for _, scp in ipairs(workspace.folders) do local configPath = workspace.getAbsolutePath(scp.uri, CONFIGPATH) @@ -138,7 +137,7 @@ m.register 'initialize' { m.register 'initialized'{ ---@async - function (params) + function (_params) local _ = progress.create(workspace.getFirstScope().uri, lang.script.WINDOW_INITIALIZING, 0.5) m.updateConfig() local registrations = {} @@ -506,7 +505,7 @@ m.register 'textDocument/references' { return nil end local response = {} - for i, info in ipairs(result) do + for _, info in ipairs(result) do ---@type uri local targetUri = info.uri local targetState = files.getState(targetUri) @@ -1416,7 +1415,7 @@ m.register 'textDocument/inlayHint' { local results = core(uri, start, finish) local hintResults = {} for i, res in ipairs(results) do - local luri = res.source and guide.getUri(res.source) + local luri = res.source and guide.getUri(res.source) local lstate = files.getState(luri) hintResults[i] = { label = { @@ -1609,7 +1608,7 @@ local function refreshLanguageConfiguration() proto.notify('$/languageConfiguration', require 'provider.language-configuration') end -config.watch(function (uri, key, value) +config.watch(function (_uri, key, _value) if key == '' then refreshLanguageConfiguration() end @@ -1633,7 +1632,7 @@ local function refreshStatusBar() end end -config.watch(function (uri, key, value) +config.watch(function (_uri, key, _value) if key == 'Lua.window.statusBar' or key == '' then refreshStatusBar() diff --git a/script/provider/semantic-tokens.lua b/script/provider/semantic-tokens.lua index 0218db2a8..cfe967f66 100644 --- a/script/provider/semantic-tokens.lua +++ b/script/provider/semantic-tokens.lua @@ -14,7 +14,7 @@ local function refresh() proto.request('workspace/semanticTokens/refresh', json.null) end -config.watch(function (uri, key, value, oldValue) +config.watch(function (_uri, key, _value, _oldValue) if key == '' then refresh() end diff --git a/script/provider/spell.lua b/script/provider/spell.lua index 6647bbad4..b29295d4c 100644 --- a/script/provider/spell.lua +++ b/script/provider/spell.lua @@ -5,9 +5,7 @@ end local fs = require 'bee.filesystem' local config = require 'config' -local diagnostics = require 'provider.diagnostic' local pformatting = require 'provider.formatting' -local util = require 'utility' local m = {} diff --git a/script/pub/report.lua b/script/pub/report.lua index 5169023c7..28340245c 100644 --- a/script/pub/report.lua +++ b/script/pub/report.lua @@ -1,6 +1,5 @@ local pub = require 'pub.pub' local await = require 'await' -local util = require 'utility' pub.on('log', function (params, brave) log.raw(brave.id, params.level, params.msg, params.src, params.line, params.clock) diff --git a/script/service/service.lua b/script/service/service.lua index c7675f1b6..13cc560e0 100644 --- a/script/service/service.lua +++ b/script/service/service.lua @@ -1,6 +1,5 @@ ---@diagnostic disable: deprecated local pub = require 'pub' -local thread = require 'bee.thread' local await = require 'await' local timer = require 'timer' local proto = require 'proto' diff --git a/script/text-merger.lua b/script/text-merger.lua index c3b144c38..9386a6b22 100644 --- a/script/text-merger.lua +++ b/script/text-merger.lua @@ -1,4 +1,3 @@ -local files = require 'files' local util = require 'utility' local encoder = require 'encoder' local client = require 'client' diff --git a/script/tracy.lua b/script/tracy.lua index 6a8ab4804..9c096e21c 100644 --- a/script/tracy.lua +++ b/script/tracy.lua @@ -7,7 +7,7 @@ local function enable() originTracy = tracy else originTracy = { - ZoneBeginN = function (info) end, + ZoneBeginN = function (_info) end, ZoneEnd = function () end, } end @@ -19,7 +19,7 @@ end local function disable() ---@diagnostic disable-next-line: lowercase-global tracy = { - ZoneBeginN = function (info) end, + ZoneBeginN = function (_info) end, ZoneEnd = function () end, } end diff --git a/script/utility.lua b/script/utility.lua index 861c66ace..117122fc6 100644 --- a/script/utility.lua +++ b/script/utility.lua @@ -23,7 +23,6 @@ local mathHuge = math.huge local inf = 1 / 0 local nan = 0 / 0 local error = error -local assert = assert _ENV = nil diff --git a/script/vm/compiler.lua b/script/vm/compiler.lua index 8d6b2db76..ba164c838 100644 --- a/script/vm/compiler.lua +++ b/script/vm/compiler.lua @@ -119,7 +119,6 @@ local function searchFieldByLocalID(source, key, pushResult) end end end - local hasMarkDoc = {} for _, src in ipairs(fields) do @@ -177,7 +176,7 @@ end local searchFieldSwitch = util.switch() : case 'table' - : call(function (suri, source, key, pushResult) + : call(function (_suri, source, key, pushResult) local hasFiled = false for _, field in ipairs(source) do if field.type == 'tablefield' @@ -247,7 +246,7 @@ local searchFieldSwitch = util.switch() end) : case 'string' : case 'doc.type.string' - : call(function (suri, source, key, pushResult) + : call(function (suri, _source, key, pushResult) -- change to `string: stringlib` ? local stringlib = vm.getGlobal('type', 'stringlib') if stringlib then @@ -270,7 +269,7 @@ local searchFieldSwitch = util.switch() end end) : case 'doc.type.table' - : call(function (suri, source, key, pushResult) + : call(function (_suri, source, key, pushResult) if type(key) == 'string' and key:find(vm.ID_SPLITE) then return end @@ -1208,7 +1207,7 @@ local function compileFunctionParam(func, source) if not extClass then goto continue end - vm.getClassFields(suri, extClass, key, function (field, isMark) + vm.getClassFields(suri, extClass, key, function (field, _isMark) for n in vm.compileNode(field):eachObject() do if n.type == 'function' and n.args[aindex] then local argNode = vm.compileNode(n.args[aindex]) @@ -1672,7 +1671,7 @@ local compilerSwitch = util.switch() end local hasGeneric if sign then - guide.eachSourceType(rtn, 'doc.generic.name', function (src) + guide.eachSourceType(rtn, 'doc.generic.name', function (_src) hasGeneric = true end) end diff --git a/script/vm/doc.lua b/script/vm/doc.lua index 6ac39910a..c936d2f3f 100644 --- a/script/vm/doc.lua +++ b/script/vm/doc.lua @@ -342,14 +342,13 @@ function vm.isAsyncCall(call) return false end ----@param uri uri ---@param doc parser.object ---@param results table[] -local function makeDiagRange(uri, doc, results) +local function makeDiagRange(doc, results) local names if doc.names then names = {} - for i, nameUnit in ipairs(doc.names) do + for _, nameUnit in ipairs(doc.names) do local name = nameUnit[1] names[name] = true end @@ -419,7 +418,7 @@ function vm.isDiagDisabledAt(uri, position, name, err) cache.diagnosticRanges = {} for _, doc in ipairs(status.ast.docs) do if doc.type == 'doc.diagnostic' then - makeDiagRange(uri, doc, cache.diagnosticRanges) + makeDiagRange(doc, cache.diagnosticRanges) end end table.sort(cache.diagnosticRanges, function (a, b) diff --git a/script/vm/field.lua b/script/vm/field.lua index d41e886a5..806986b1b 100644 --- a/script/vm/field.lua +++ b/script/vm/field.lua @@ -11,7 +11,7 @@ local searchByNodeSwitch = util.switch() pushResult(set) end end) - : default(function (suri, source, pushResult) + : default(function (_suri, source, pushResult) pushResult(source) end) diff --git a/script/vm/infer.lua b/script/vm/infer.lua index 35e17e5c3..099b894b4 100644 --- a/script/vm/infer.lua +++ b/script/vm/infer.lua @@ -42,11 +42,11 @@ local viewNodeSwitch;viewNodeSwitch = util.switch() : case 'boolean' : case 'string' : case 'integer' - : call(function (source, infer) + : call(function (source, _infer) return source.type end) : case 'number' - : call(function (source, infer) + : call(function (source, _infer) return source.type end) : case 'table' @@ -101,7 +101,7 @@ local viewNodeSwitch;viewNodeSwitch = util.switch() return table.concat(buf, '|') end) : case 'doc.type.name' - : call(function (source, infer, uri) + : call(function (source, _infer, uri) if source.signs then local buf = {} for i, sign in ipairs(source.signs) do @@ -113,11 +113,11 @@ local viewNodeSwitch;viewNodeSwitch = util.switch() end end) : case 'generic' - : call(function (source, infer, uri) + : call(function (source, _infer, uri) return vm.getInfer(source.proto):view(uri) end) : case 'doc.generic.name' - : call(function (source, infer, uri) + : call(function (source, _infer, uri) local resolved = vm.getGenericResolved(source) if resolved then return vm.getInfer(resolved):view(uri) @@ -185,16 +185,16 @@ local viewNodeSwitch;viewNodeSwitch = util.switch() return table.concat(buf) end) : case 'doc.type.string' - : call(function (source, infer) + : call(function (source, _infer) return util.viewString(source[1], source[2]) end) : case 'doc.type.integer' : case 'doc.type.boolean' - : call(function (source, infer) + : call(function (source, _infer) return ('%q'):format(source[1]) end) : case 'doc.type.code' - : call(function (source, infer) + : call(function (source, _infer) return ('`%s`'):format(source[1]) end) : case 'doc.type.function' @@ -245,7 +245,7 @@ local viewNodeSwitch;viewNodeSwitch = util.switch() return ('fun(%s)%s'):format(argView, regView) end) : case 'doc.field.name' - : call(function (source, infer, uri) + : call(function (source, _infer, uri) return vm.viewKey(source, uri) end) diff --git a/script/vm/node.lua b/script/vm/node.lua index fae79cbc2..f1b77513b 100644 --- a/script/vm/node.lua +++ b/script/vm/node.lua @@ -504,7 +504,7 @@ files.watch(function (ev, uri) end end) -ws.watch(function (ev, uri) +ws.watch(function (ev, _uri) if ev == 'reload' then vm.clearNodeCache() end diff --git a/script/vm/visible.lua b/script/vm/visible.lua index 518307a0b..6d78596b6 100644 --- a/script/vm/visible.lua +++ b/script/vm/visible.lua @@ -62,13 +62,13 @@ local function getVisibleType(source) source._visibleType = 'private' return 'private' end - + local protectedNames = config.get(uri, 'Lua.doc.protectedName') if #protectedNames > 0 and match(protectedNames, fieldName) then source._visibleType = 'protected' return 'protected' end - + local packageNames = config.get(uri, 'Lua.doc.packageName') if #packageNames > 0 and match(packageNames, fieldName) then source._visibleType = 'package' diff --git a/script/workspace/loading.lua b/script/workspace/loading.lua index 5ddc4bdab..670d70f0c 100644 --- a/script/workspace/loading.lua +++ b/script/workspace/loading.lua @@ -4,7 +4,6 @@ local await = require 'await' local files = require 'files' local config = require 'config.config' local client = require 'client' -local util = require 'utility' local furi = require 'file-uri' local pub = require 'pub' diff --git a/script/workspace/require-path.lua b/script/workspace/require-path.lua index 6553212d5..c2274e52c 100644 --- a/script/workspace/require-path.lua +++ b/script/workspace/require-path.lua @@ -318,14 +318,14 @@ function m.isMatchedUri(suri, uri, name) return false end -files.watch(function (ev, uri) +files.watch(function (_ev, _uri) for _, scp in ipairs(workspace.folders) do scp:set('requireManager', nil) end scope.fallback:set('requireManager', nil) end) -config.watch(function (uri, key, value, oldValue) +config.watch(function (uri, key, _value, _oldValue) if key == 'Lua.completion.requireSeparator' or key == 'Lua.runtime.path' or key == 'Lua.runtime.pathStrict' then