Skip to content

Commit e954648

Browse files
sumnekosumneko
committed
rename global, fix assigning to for variables 
1 parent 9202def commit e954648

37 files changed

+456
-175
lines changed

‎.luarc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"unusedLocalExclude": [ "_*" ]
2525
},
2626
"runtime": {
27-
"version": "Lua 5.4",
27+
"version": "Lua 5.5",
2828
"path": [
2929
"script/?.lua",
3030
"script/?/init.lua",

‎errors.json‎

Lines changed: 265 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,265 @@
1+
[{
2+
"resource": "/d:/github/vscode-lua/server/script/core/workspace-symbol.lua",
3+
"owner": "_generated_diagnostic_collection_name_#0",
4+
"code": "keyword",
5+
"severity": 8,
6+
"message": "关键字无法作为名称。",
7+
"source": "Lua 语法检查",
8+
"startLineNumber": 61,
9+
"startColumn": 12,
10+
"endLineNumber": 61,
11+
"endColumn": 18,
12+
"origin": "extHost1"
13+
},{
14+
"resource": "/d:/github/vscode-lua/server/script/core/workspace-symbol.lua",
15+
"owner": "_generated_diagnostic_collection_name_#0",
16+
"code": "undefined-global",
17+
"severity": 4,
18+
"message": "未定义的全局变量 `global`。",
19+
"source": "Lua 诊断",
20+
"startLineNumber": 115,
21+
"startColumn": 29,
22+
"endLineNumber": 115,
23+
"endColumn": 35,
24+
"origin": "extHost1"
25+
},{
26+
"resource": "/d:/github/vscode-lua/server/script/vm/global.lua",
27+
"owner": "_generated_diagnostic_collection_name_#0",
28+
"code": "keyword",
29+
"severity": 8,
30+
"message": "关键字无法作为名称。",
31+
"source": "Lua 语法检查",
32+
"startLineNumber": 549,
33+
"startColumn": 12,
34+
"endLineNumber": 549,
35+
"endColumn": 18,
36+
"origin": "extHost1"
37+
},{
38+
"resource": "/d:/github/vscode-lua/server/script/vm/global.lua",
39+
"owner": "_generated_diagnostic_collection_name_#0",
40+
"code": "keyword",
41+
"severity": 8,
42+
"message": "关键字无法作为名称。",
43+
"source": "Lua 语法检查",
44+
"startLineNumber": 653,
45+
"startColumn": 12,
46+
"endLineNumber": 653,
47+
"endColumn": 18,
48+
"origin": "extHost1"
49+
},{
50+
"resource": "/d:/github/vscode-lua/server/script/vm/global.lua",
51+
"owner": "_generated_diagnostic_collection_name_#0",
52+
"code": "keyword",
53+
"severity": 8,
54+
"message": "关键字无法作为名称。",
55+
"source": "Lua 语法检查",
56+
"startLineNumber": 693,
57+
"startColumn": 12,
58+
"endLineNumber": 693,
59+
"endColumn": 18,
60+
"origin": "extHost1"
61+
},{
62+
"resource": "/d:/github/vscode-lua/server/script/vm/global.lua",
63+
"owner": "_generated_diagnostic_collection_name_#0",
64+
"code": "keyword",
65+
"severity": 8,
66+
"message": "关键字无法作为名称。",
67+
"source": "Lua 语法检查",
68+
"startLineNumber": 746,
69+
"startColumn": 12,
70+
"endLineNumber": 746,
71+
"endColumn": 18,
72+
"origin": "extHost1"
73+
},{
74+
"resource": "/d:/github/vscode-lua/server/script/vm/operator.lua",
75+
"owner": "_generated_diagnostic_collection_name_#0",
76+
"code": "set-const",
77+
"severity": 8,
78+
"message": "不能对常量赋值。",
79+
"source": "Lua 语法检查",
80+
"startLineNumber": 108,
81+
"startColumn": 13,
82+
"endLineNumber": 108,
83+
"endColumn": 14,
84+
"origin": "extHost1"
85+
},{
86+
"resource": "/d:/github/vscode-lua/server/script/vm/ref.lua",
87+
"owner": "_generated_diagnostic_collection_name_#0",
88+
"code": "keyword",
89+
"severity": 8,
90+
"message": "关键字无法作为名称。",
91+
"source": "Lua 语法检查",
92+
"startLineNumber": 100,
93+
"startColumn": 12,
94+
"endLineNumber": 100,
95+
"endColumn": 18,
96+
"origin": "extHost1"
97+
},{
98+
"resource": "/d:/github/vscode-lua/server/script/vm/type.lua",
99+
"owner": "_generated_diagnostic_collection_name_#0",
100+
"code": "keyword",
101+
"severity": 8,
102+
"message": "关键字无法作为名称。",
103+
"source": "Lua 语法检查",
104+
"startLineNumber": 281,
105+
"startColumn": 12,
106+
"endLineNumber": 281,
107+
"endColumn": 18,
108+
"origin": "extHost1"
109+
},{
110+
"resource": "/d:/github/vscode-lua/server/script/vm/type.lua",
111+
"owner": "_generated_diagnostic_collection_name_#0",
112+
"code": "keyword",
113+
"severity": 8,
114+
"message": "关键字无法作为名称。",
115+
"source": "Lua 语法检查",
116+
"startLineNumber": 370,
117+
"startColumn": 16,
118+
"endLineNumber": 370,
119+
"endColumn": 22,
120+
"origin": "extHost1"
121+
},{
122+
"resource": "/d:/github/vscode-lua/server/script/vm/type.lua",
123+
"owner": "_generated_diagnostic_collection_name_#0",
124+
"code": "keyword",
125+
"severity": 8,
126+
"message": "关键字无法作为名称。",
127+
"source": "Lua 语法检查",
128+
"startLineNumber": 472,
129+
"startColumn": 16,
130+
"endLineNumber": 472,
131+
"endColumn": 22,
132+
"origin": "extHost1"
133+
},{
134+
"resource": "/d:/github/vscode-lua/server/script/vm/type.lua",
135+
"owner": "_generated_diagnostic_collection_name_#0",
136+
"code": "keyword",
137+
"severity": 8,
138+
"message": "关键字无法作为名称。",
139+
"source": "Lua 语法检查",
140+
"startLineNumber": 903,
141+
"startColumn": 12,
142+
"endLineNumber": 903,
143+
"endColumn": 18,
144+
"origin": "extHost1"
145+
},{
146+
"resource": "/d:/github/vscode-lua/server/script/vm/visible.lua",
147+
"owner": "_generated_diagnostic_collection_name_#0",
148+
"code": "keyword",
149+
"severity": 8,
150+
"message": "关键字无法作为名称。",
151+
"source": "Lua 语法检查",
152+
"startLineNumber": 142,
153+
"startColumn": 8,
154+
"endLineNumber": 142,
155+
"endColumn": 14,
156+
"origin": "extHost1"
157+
},{
158+
"resource": "/d:/github/vscode-lua/server/script/workspace/require-path.lua",
159+
"owner": "_generated_diagnostic_collection_name_#0",
160+
"code": "set-const",
161+
"severity": 8,
162+
"message": "不能对常量赋值。",
163+
"source": "Lua 语法检查",
164+
"startLineNumber": 85,
165+
"startColumn": 9,
166+
"endLineNumber": 85,
167+
"endColumn": 17,
168+
"origin": "extHost1"
169+
},{
170+
"resource": "/d:/github/vscode-lua/server/script/workspace/require-path.lua",
171+
"owner": "_generated_diagnostic_collection_name_#0",
172+
"code": "set-const",
173+
"severity": 8,
174+
"message": "不能对常量赋值。",
175+
"source": "Lua 语法检查",
176+
"startLineNumber": 106,
177+
"startColumn": 17,
178+
"endLineNumber": 106,
179+
"endColumn": 25,
180+
"origin": "extHost1"
181+
},{
182+
"resource": "/d:/github/vscode-lua/server/script/workspace/require-path.lua",
183+
"owner": "_generated_diagnostic_collection_name_#0",
184+
"code": "set-const",
185+
"severity": 8,
186+
"message": "不能对常量赋值。",
187+
"source": "Lua 语法检查",
188+
"startLineNumber": 108,
189+
"startColumn": 17,
190+
"endLineNumber": 108,
191+
"endColumn": 25,
192+
"origin": "extHost1"
193+
},{
194+
"resource": "/d:/github/vscode-lua/server/script/workspace/workspace.lua",
195+
"owner": "_generated_diagnostic_collection_name_#0",
196+
"code": "set-const",
197+
"severity": 8,
198+
"message": "不能对常量赋值。",
199+
"source": "Lua 语法检查",
200+
"startLineNumber": 184,
201+
"startColumn": 9,
202+
"endLineNumber": 184,
203+
"endColumn": 13,
204+
"origin": "extHost1"
205+
},{
206+
"resource": "/d:/github/vscode-lua/server/script/workspace/workspace.lua",
207+
"owner": "_generated_diagnostic_collection_name_#0",
208+
"code": "set-const",
209+
"severity": 8,
210+
"message": "不能对常量赋值。",
211+
"source": "Lua 语法检查",
212+
"startLineNumber": 226,
213+
"startColumn": 9,
214+
"endLineNumber": 226,
215+
"endColumn": 13,
216+
"origin": "extHost1"
217+
},{
218+
"resource": "/d:/github/vscode-lua/server/tools/locale.lua",
219+
"owner": "_generated_diagnostic_collection_name_#0",
220+
"code": "set-const",
221+
"severity": 8,
222+
"message": "不能对常量赋值。",
223+
"source": "Lua 语法检查",
224+
"startLineNumber": 36,
225+
"startColumn": 13,
226+
"endLineNumber": 36,
227+
"endColumn": 17,
228+
"origin": "extHost1"
229+
},{
230+
"resource": "/d:/github/vscode-lua/server/tools/love-api.lua",
231+
"owner": "_generated_diagnostic_collection_name_#0",
232+
"code": "set-const",
233+
"severity": 8,
234+
"message": "不能对常量赋值。",
235+
"source": "Lua 语法检查",
236+
"startLineNumber": 40,
237+
"startColumn": 9,
238+
"endLineNumber": 40,
239+
"endColumn": 13,
240+
"origin": "extHost1"
241+
},{
242+
"resource": "/d:/github/vscode-lua/server/tools/lovr-api.lua",
243+
"owner": "_generated_diagnostic_collection_name_#0",
244+
"code": "set-const",
245+
"severity": 8,
246+
"message": "不能对常量赋值。",
247+
"source": "Lua 语法检查",
248+
"startLineNumber": 41,
249+
"startColumn": 9,
250+
"endLineNumber": 41,
251+
"endColumn": 13,
252+
"origin": "extHost1"
253+
},{
254+
"resource": "/d:/github/vscode-lua/server/tools/lua51.lua",
255+
"owner": "_generated_diagnostic_collection_name_#0",
256+
"code": "set-const",
257+
"severity": 8,
258+
"message": "不能对常量赋值。",
259+
"source": "Lua 语法检查",
260+
"startLineNumber": 67,
261+
"startColumn": 9,
262+
"endLineNumber": 67,
263+
"endColumn": 11,
264+
"origin": "extHost1"
265+
}]

‎script/cli/check_worker.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ end
148148
local function apply_check_level(uri, checkLevel)
149149
local config_disables = util.arrayToHash(config.get(uri, 'Lua.diagnostics.disable'))
150150
local config_severities = config.get(uri, 'Lua.diagnostics.severity')
151-
for name, serverity in pairs(define.DiagnosticDefaultSeverity) do
152-
serverity = config_severities[name] or serverity
153-
if serverity:sub(-1) == '!' then
154-
serverity = serverity:sub(1, -2)
151+
for name, defaultSeverity in pairs(define.DiagnosticDefaultSeverity) do
152+
local severity = config_severities[name] or defaultSeverity
153+
if severity:sub(-1) == '!' then
154+
severity = severity:sub(1, -2)
155155
end
156-
if define.DiagnosticSeverity[serverity] > checkLevel then
156+
if define.DiagnosticSeverity[severity] > checkLevel then
157157
config_disables[name] = true
158158
end
159159
end

‎script/cli/doc/export.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ end
283283
---@param callback fun(i, max)
284284
function export.makeDocs(globals, callback)
285285
local docs = {}
286-
for i, global in ipairs(globals) do
287-
table.insert(docs, export.documentObject(global))
286+
for i, globalVar in ipairs(globals) do
287+
table.insert(docs, export.documentObject(globalVar))
288288
callback(i, #globals)
289289
end
290290
docs[#docs+1] = export.getLualsConfig()

‎script/client.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ local function tryModifyClientGlobal(finalChanges)
485485
end
486486
local changes = {}
487487
for _, change in ipairs(finalChanges) do
488-
if change.global then
488+
if change['global'] then
489489
changes[#changes+1] = change
490490
end
491491
end

‎script/config/config.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ function m.update(scp, ...)
205205
scp:set('config.raw', {})
206206

207207
local function expand(t, left)
208-
for key, value in pairs(t) do
208+
for key, val in pairs(t) do
209+
local value = val
209210
local fullKey = key
210211
if left then
211212
fullKey = left .. '.' .. key

‎script/core/code-action.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -694,17 +694,17 @@ local function checkMissingRequire(results, uri, start, finish)
694694
return
695695
end
696696

697-
local function addRequires(global, endpos)
698-
if not global then
697+
local function addRequires(globalVar, endpos)
698+
if not globalVar then
699699
return
700700
end
701-
autoreq.check(state, global, endpos, function (moduleFile, _stemname, _targetSource, fullKeyPath)
701+
autoreq.check(state, globalVar, endpos, function (moduleFile, _stemname, _targetSource, fullKeyPath)
702702
local visiblePaths = rpath.getVisiblePath(uri, furi.decode(moduleFile))
703703
if not visiblePaths or #visiblePaths == 0 then return end
704704

705705
for _, target in ipairs(findRequireTargets(visiblePaths)) do
706706
results[#results+1] = {
707-
title = lang.script('ACTION_AUTOREQUIRE', target .. (fullKeyPath or ''), global),
707+
title = lang.script('ACTION_AUTOREQUIRE', target .. (fullKeyPath or ''), globalVar),
708708
kind = 'refactor.rewrite',
709709
command = {
710710
title = 'autoRequire',
@@ -713,7 +713,7 @@ local function checkMissingRequire(results, uri, start, finish)
713713
{
714714
uri = guide.getUri(state.ast),
715715
target = moduleFile,
716-
name = global,
716+
name = globalVar,
717717
requireName = target,
718718
fullKeyPath = fullKeyPath,
719719
},

‎script/core/definition.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ return function (uri, offset)
158158

159159
local defs = vm.getDefs(source)
160160

161-
for _, src in ipairs(defs) do
161+
for _, def in ipairs(defs) do
162+
local src = def
162163
if src.type == 'global' then
163164
goto CONTINUE
164165
end

‎script/core/diagnostics/global-element.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ return function (uri, callback)
5757
end
5858
if definedGlobal[name] == nil then
5959
definedGlobal[name] = false
60-
local global = vm.getGlobal('variable', name)
61-
if global then
62-
for _, set in ipairs(global:getSets(uri)) do
60+
local globalVar = vm.getGlobal('variable', name)
61+
if globalVar then
62+
for _, set in ipairs(globalVar:getSets(uri)) do
6363
if vm.isMetaFile(guide.getUri(set)) then
6464
definedGlobal[name] = true
6565
return

‎script/core/diagnostics/lowercase-global.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ return function (uri, callback)
6666
end
6767
if definedGlobal[name] == nil then
6868
definedGlobal[name] = false
69-
local global = vm.getGlobal('variable', name)
70-
if global then
71-
for _, set in ipairs(global:getSets(uri)) do
69+
local globalVar = vm.getGlobal('variable', name)
70+
if globalVar then
71+
for _, set in ipairs(globalVar:getSets(uri)) do
7272
if vm.isMetaFile(guide.getUri(set)) then
7373
definedGlobal[name] = true
7474
return

0 commit comments

Comments
 (0)