Skip to content

Commit 17d35b8

Browse files
CopilotCppCXY
Copilot
and
CppCXY
committed
Add Lua 5.5 support to lua-language-server
Co-authored-by: CppCXY <[email protected]>
1 parent 2ea6169 commit 17d35b8

File tree

7 files changed

+26
-16
lines changed

7 files changed

+26
-16
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The Lua language server provides various language features for Lua to make devel
1414

1515
## Features
1616

17-
- ⚙️ Supports `Lua 5.4`, `Lua 5.3`, `Lua 5.2`, `Lua 5.1`, and `LuaJIT`
17+
- ⚙️ Supports `Lua 5.5`, `Lua 5.4`, `Lua 5.3`, `Lua 5.2`, `Lua 5.1`, and `LuaJIT`
1818
- 📄 Over 20 supported [annotations](https://luals.github.io/wiki/annotations/) for documenting your code
1919
- ↪ Go to definition
2020
- 🦺 Dynamic [type checking](https://luals.github.io/wiki/type-checking/)

‎meta/template/basic.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,8 @@ _VERSION = "Lua 5.2"
302302
_VERSION = "Lua 5.3"
303303
---#elseif VERSION == 5.4 then
304304
_VERSION = "Lua 5.4"
305+
---#elseif VERSION == 5.5 then
306+
_VERSION = "Lua 5.5"
305307
---#end
306308

307309
---@version >5.4

‎script/config/template.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ local template = {
189189
'Lua 5.2',
190190
'Lua 5.3',
191191
'Lua 5.4',
192+
'Lua 5.5',
192193
'LuaJIT',
193194
},
194195
['Lua.runtime.path'] = Type.Array(Type.String) >> {

‎script/library.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ local function getDocFormater(uri)
3131
return 'HOVER_NATIVE_DOCUMENT_LUA53'
3232
elseif version == 'Lua 5.4' then
3333
return 'HOVER_NATIVE_DOCUMENT_LUA54'
34+
elseif version == 'Lua 5.5' then
35+
return 'HOVER_NATIVE_DOCUMENT_LUA54' -- Use 5.4 docs for 5.5 until 5.5 specific docs are available
3436
elseif version == 'LuaJIT' then
3537
return 'HOVER_NATIVE_DOCUMENT_LUAJIT'
3638
end
@@ -43,6 +45,8 @@ local function getDocFormater(uri)
4345
return 'HOVER_DOCUMENT_LUA53'
4446
elseif version == 'Lua 5.4' then
4547
return 'HOVER_DOCUMENT_LUA54'
48+
elseif version == 'Lua 5.5' then
49+
return 'HOVER_DOCUMENT_LUA54' -- Use 5.4 docs for 5.5 until 5.5 specific docs are available
4650
elseif version == 'LuaJIT' then
4751
return 'HOVER_DOCUMENT_LUAJIT'
4852
end

‎script/parser/compile.lua

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -706,12 +706,12 @@ local function parseLocalAttrs()
706706
else
707707
missSymbol '>'
708708
end
709-
if State.version ~= 'Lua 5.4' then
709+
if State.version ~= 'Lua 5.4' and State.version ~= 'Lua 5.5' then
710710
pushError {
711711
type = 'UNSUPPORT_SYMBOL',
712712
start = attr.start,
713713
finish = attr.finish,
714-
version = 'Lua 5.4',
714+
version = {'Lua 5.4', 'Lua 5.5'},
715715
info = {
716716
version = State.version
717717
}
@@ -906,13 +906,14 @@ local function parseStringUnicode()
906906
end
907907
if State.version ~= 'Lua 5.3'
908908
and State.version ~= 'Lua 5.4'
909+
and State.version ~= 'Lua 5.5'
909910
and State.version ~= 'LuaJIT'
910911
then
911912
pushError {
912913
type = 'ERR_ESC',
913914
start = leftPos - 2,
914915
finish = rightPos,
915-
version = {'Lua 5.3', 'Lua 5.4', 'LuaJIT'},
916+
version = {'Lua 5.3', 'Lua 5.4', 'Lua 5.5', 'LuaJIT'},
916917
info = {
917918
version = State.version,
918919
}
@@ -932,7 +933,7 @@ local function parseStringUnicode()
932933
end
933934
return nil, offset
934935
end
935-
if State.version == 'Lua 5.4' then
936+
if State.version == 'Lua 5.4' or State.version == 'Lua 5.5' then
936937
if byte < 0 or byte > 0x7FFFFFFF then
937938
pushError {
938939
type = 'UTF8_MAX',
@@ -951,7 +952,7 @@ local function parseStringUnicode()
951952
type = 'UTF8_MAX',
952953
start = leftPos,
953954
finish = rightPos,
954-
version = byte <= 0x7FFFFFFF and 'Lua 5.4' or nil,
955+
version = (byte <= 0x7FFFFFFF and {'Lua 5.4', 'Lua 5.5'}) or nil,
955956
info = {
956957
min = '000000',
957958
max = '10FFFF',
@@ -1095,7 +1096,7 @@ local function parseShortString()
10951096
type = 'ERR_ESC',
10961097
start = left,
10971098
finish = left + 4,
1098-
version = {'Lua 5.2', 'Lua 5.3', 'Lua 5.4', 'LuaJIT'},
1099+
version = {'Lua 5.2', 'Lua 5.3', 'Lua 5.4', 'Lua 5.5', 'LuaJIT'},
10991100
info = {
11001101
version = State.version,
11011102
}
@@ -1274,7 +1275,7 @@ local function parseNumber2(start)
12741275
finish = getPosition(offset - 1, 'right'),
12751276
version = 'LuaJIT',
12761277
info = {
1277-
version = 'Lua 5.4',
1278+
version = {'Lua 5.4', 'Lua 5.5'},
12781279
}
12791280
}
12801281
end
@@ -2673,10 +2674,11 @@ local function parseBinaryOP(asAction, level)
26732674
or token == '<<'
26742675
or token == '>>' then
26752676
if State.version ~= 'Lua 5.3'
2676-
and State.version ~= 'Lua 5.4' then
2677+
and State.version ~= 'Lua 5.4'
2678+
and State.version ~= 'Lua 5.5' then
26772679
pushError {
26782680
type = 'UNSUPPORT_SYMBOL',
2679-
version = {'Lua 5.3', 'Lua 5.4'},
2681+
version = {'Lua 5.3', 'Lua 5.4', 'Lua 5.5'},
26802682
start = op.start,
26812683
finish = op.finish,
26822684
info = {
@@ -3229,7 +3231,7 @@ local function parseLabel()
32293231
local name = label[1]
32303232
local olabel = guide.getLabel(block, name)
32313233
if olabel then
3232-
if State.version == 'Lua 5.4'
3234+
if (State.version == 'Lua 5.4' or State.version == 'Lua 5.5')
32333235
or block == guide.getBlock(olabel) then
32343236
pushError {
32353237
type = 'REDEFINED_LABEL',
@@ -3252,7 +3254,7 @@ local function parseLabel()
32523254
type = 'UNSUPPORT_SYMBOL',
32533255
start = left,
32543256
finish = lastRightPosition(),
3255-
version = {'Lua 5.2', 'Lua 5.3', 'Lua 5.4', 'LuaJIT'},
3257+
version = {'Lua 5.2', 'Lua 5.3', 'Lua 5.4', 'Lua 5.5', 'LuaJIT'},
32563258
info = {
32573259
version = State.version,
32583260
}
@@ -3634,7 +3636,7 @@ local function parseFor()
36343636
missExp()
36353637
end
36363638

3637-
if State.version == 'Lua 5.4' then
3639+
if State.version == 'Lua 5.4' or State.version == 'Lua 5.5' then
36383640
forStateVars = 4
36393641
else
36403642
forStateVars = 3

‎script/vm/compiler.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1898,7 +1898,8 @@ local compilerSwitch = util.switch()
18981898
local uri = guide.getUri(source)
18991899
local version = config.get(uri, 'Lua.runtime.version')
19001900
if version == 'Lua 5.3'
1901-
or version == 'Lua 5.4' then
1901+
or version == 'Lua 5.4'
1902+
or version == 'Lua 5.5' then
19021903
vm.setNode(source, vm.declareGlobal('type', 'unknown'))
19031904
else
19041905
vm.setNode(source, vm.declareGlobal('type', 'nil'))

‎script/vm/operator.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,14 +362,14 @@ vm.binarySwitch = util.switch()
362362
local uri = guide.getUri(source)
363363
local version = config.get(uri, 'Lua.runtime.version')
364364
if math.tointeger(a) and math.type(a) == 'float' then
365-
if version == 'Lua 5.3' or version == 'Lua 5.4' then
365+
if version == 'Lua 5.3' or version == 'Lua 5.4' or version == 'Lua 5.5' then
366366
a = ('%.1f'):format(a)
367367
else
368368
a = ('%.0f'):format(a)
369369
end
370370
end
371371
if math.tointeger(b) and math.type(b) == 'float' then
372-
if version == 'Lua 5.3' or version == 'Lua 5.4' then
372+
if version == 'Lua 5.3' or version == 'Lua 5.4' or version == 'Lua 5.5' then
373373
b = ('%.1f'):format(b)
374374
else
375375
b = ('%.0f'):format(b)

0 commit comments

Comments
 (0)