Skip to content

Commit ff6b661

Browse files
CppCXYCppCXY
committed
Merge branch 'master' of github.com:CppCXY/lua-language-server into HEAD
2 parents 065cc4e + a2bb5a3 commit ff6b661

35 files changed

+639
-96
lines changed

‎.vscode/launch.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99
"stopOnEntry": false,
1010
"program": "${workspaceRoot}/test.lua",
1111
"luaexe": "${workspaceFolder}/bin/lua-language-server",
12-
"cpath": null,
13-
"arg": [
14-
],
1512
"luaVersion": "5.4",
1613
"sourceCoding": "utf8",
17-
"console": "internalConsole",
14+
"console": "integratedTerminal",
15+
"internalConsoleOptions": "openOnSessionStart",
1816
"outputCapture": [
1917
"print",
2018
"stderr",

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# lua-language-server
22

3-
[![build](https://github.com/LuaLS/lua-language-server/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/LuaLS/lua-language-server/actions/workflows/build.yml)
4-
[![version](https://vsmarketplacebadges.dev/version-short/sumneko.lua.svg)](https://marketplace.visualstudio.com/items?itemName=sumneko.lua)
5-
![installs](https://vsmarketplacebadges.dev/installs-short/sumneko.lua.svg)
6-
![downloads](https://vsmarketplacebadges.dev/downloads-short/sumneko.lua.svg)
3+
![build](https://img.shields.io/github/actions/workflow/status/LuaLS/lua-language-server/.github%2Fworkflows%2Fbuild.yml)
4+
![Version (including pre-releases)](https://img.shields.io/visual-studio-marketplace/v/sumneko.lua)
5+
![Installs](https://img.shields.io/visual-studio-marketplace/i/sumneko.lua)
6+
![Downloads](https://img.shields.io/visual-studio-marketplace/d/sumneko.lua)
77

88

99
***Lua development just got a whole lot better*** 🧠

‎changelog.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# changelog
22

3+
## 3.6.23
4+
`2023-7-7`
5+
* `CHG` signature: narrow by inputed literal
6+
7+
## 3.6.22
8+
`2023-6-14`
9+
* `FIX` [#2038]
10+
* `FIX` [#2042]
11+
* `FIX` [#2062]
12+
* `FIX` [#2083]
13+
* `FIX` [#2088]
14+
* `FIX` [#2110]
15+
* `FIX` [#2129]
16+
17+
[#2038]: https://github.com/LuaLS/lua-language-server/issues/2038
18+
[#2042]: https://github.com/LuaLS/lua-language-server/issues/2042
19+
[#2062]: https://github.com/LuaLS/lua-language-server/issues/2062
20+
[#2083]: https://github.com/LuaLS/lua-language-server/issues/2083
21+
[#2088]: https://github.com/LuaLS/lua-language-server/issues/2088
22+
[#2110]: https://github.com/LuaLS/lua-language-server/issues/2110
23+
[#2129]: https://github.com/LuaLS/lua-language-server/issues/2129
24+
325
## 3.6.21
426
`2023-5-24`
527
* `FIX` disable ffi plugin

‎locale/en-us/script.lua‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,6 +1199,33 @@ local function setColor(color) end
11991199
setColor(colors.green)
12001200
```
12011201
]=]
1202+
LUADOC_DESC_SOURCE =
1203+
[=[
1204+
Provide a reference to some source code which lives in another file. When
1205+
searching for the defintion of an item, its `@source` will be used.
1206+
1207+
## Syntax
1208+
`@source <path>`
1209+
1210+
## Usage
1211+
```
1212+
---You can use absolute paths
1213+
---@source C:/Users/me/Documents/program/myFile.c
1214+
local a
1215+
1216+
---Or URIs
1217+
---@source file:///C:/Users/me/Documents/program/myFile.c:10
1218+
local b
1219+
1220+
---Or relative paths
1221+
---@source local/file.c
1222+
local c
1223+
1224+
---You can also include line and char numbers
1225+
---@source local/file.c:10:8
1226+
local d
1227+
```
1228+
]=]
12021229
LUADOC_DESC_PACKAGE =
12031230
[=[
12041231
Mark a function as private to the file it is defined in. A packaged function

‎locale/pt-br/script.lua‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,6 +1199,33 @@ local function setColor(color) end
11991199
setColor(colors.green)
12001200
```
12011201
]=]
1202+
LUADOC_DESC_SOURCE = -- TODO: need translate!
1203+
[=[
1204+
Provide a reference to some source code which lives in another file. When
1205+
searching for the defintion of an item, its `@source` will be used.
1206+
1207+
## Syntax
1208+
`@source <path>`
1209+
1210+
## Usage
1211+
```
1212+
---You can use absolute paths
1213+
---@source C:/Users/me/Documents/program/myFile.c
1214+
local a
1215+
1216+
---Or URIs
1217+
---@source file:///C:/Users/me/Documents/program/myFile.c:10
1218+
local b
1219+
1220+
---Or relative paths
1221+
---@source local/file.c
1222+
local c
1223+
1224+
---You can also include line and char numbers
1225+
---@source local/file.c:10:8
1226+
local d
1227+
```
1228+
]=]
12021229
LUADOC_DESC_PACKAGE = -- TODO: need translate!
12031230
[=[
12041231
Mark a function as private to the file it is defined in. A packaged function

‎locale/zh-cn/script.lua‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,6 +1199,33 @@ local function setColor(color) end
11991199
setColor(colors.green)
12001200
```
12011201
]=]
1202+
LUADOC_DESC_SOURCE = -- TODO: need translate!
1203+
[=[
1204+
Provide a reference to some source code which lives in another file. When
1205+
searching for the defintion of an item, its `@source` will be used.
1206+
1207+
## Syntax
1208+
`@source <path>`
1209+
1210+
## Usage
1211+
```
1212+
---You can use absolute paths
1213+
---@source C:/Users/me/Documents/program/myFile.c
1214+
local a
1215+
1216+
---Or URIs
1217+
---@source file:///C:/Users/me/Documents/program/myFile.c:10
1218+
local b
1219+
1220+
---Or relative paths
1221+
---@source local/file.c
1222+
local c
1223+
1224+
---You can also include line and char numbers
1225+
---@source local/file.c:10:8
1226+
local d
1227+
```
1228+
]=]
12021229
LUADOC_DESC_PACKAGE = -- TODO: need translate!
12031230
[=[
12041231
Mark a function as private to the file it is defined in. A packaged function

‎locale/zh-tw/script.lua‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,6 +1193,33 @@ local function setColor(color) end
11931193
setColor(colors.green)
11941194
```
11951195
]=]
1196+
LUADOC_DESC_SOURCE = -- TODO: need translate!
1197+
[=[
1198+
Provide a reference to some source code which lives in another file. When
1199+
searching for the defintion of an item, its `@source` will be used.
1200+
1201+
## Syntax
1202+
`@source <path>`
1203+
1204+
## Usage
1205+
```
1206+
---You can use absolute paths
1207+
---@source C:/Users/me/Documents/program/myFile.c
1208+
local a
1209+
1210+
---Or URIs
1211+
---@source file:///C:/Users/me/Documents/program/myFile.c:10
1212+
local b
1213+
1214+
---Or relative paths
1215+
---@source local/file.c
1216+
local c
1217+
1218+
---You can also include line and char numbers
1219+
---@source local/file.c:10:8
1220+
local d
1221+
```
1222+
]=]
11961223
LUADOC_DESC_PACKAGE = -- TODO: need translate!
11971224
[=[
11981225
Mark a function as private to the file it is defined in. A packaged function

‎make.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
git submodule update --init --recursive
44
pushd 3rd/luamake
5-
./compile/install.sh
5+
./compile/build.sh
66
popd
77
./3rd/luamake/luamake rebuild

‎meta/template/basic.lua‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -213,37 +213,37 @@ function setfenv(f, table) end
213213
---@class metatable
214214
---@field __mode 'v'|'k'|'kv'|nil
215215
---@field __metatable any|nil
216-
---@field __tostring fun(t):string|nil
216+
---@field __tostring (fun(t):string)|nil
217217
---@field __gc fun(t)|nil
218-
---@field __add fun(t1,t2):any|nil
219-
---@field __sub fun(t1,t2):any|nil
220-
---@field __mul fun(t1,t2):any|nil
221-
---@field __div fun(t1,t2):any|nil
222-
---@field __mod fun(t1,t2):any|nil
223-
---@field __pow fun(t1,t2):any|nil
224-
---@field __unm fun(t):any|nil
218+
---@field __add (fun(t1,t2):any)|nil
219+
---@field __sub (fun(t1,t2):any)|nil
220+
---@field __mul (fun(t1,t2):any)|nil
221+
---@field __div (fun(t1,t2):any)|nil
222+
---@field __mod (fun(t1,t2):any)|nil
223+
---@field __pow (fun(t1,t2):any)|nil
224+
---@field __unm (fun(t):any)|nil
225225
---#if VERSION >= 5.3 then
226-
---@field __idiv fun(t1,t2):any|nil
227-
---@field __band fun(t1,t2):any|nil
228-
---@field __bor fun(t1,t2):any|nil
229-
---@field __bxor fun(t1,t2):any|nil
230-
---@field __bnot fun(t):any|nil
231-
---@field __shl fun(t1,t2):any|nil
232-
---@field __shr fun(t1,t2):any|nil
226+
---@field __idiv (fun(t1,t2):any)|nil
227+
---@field __band (fun(t1,t2):any)|nil
228+
---@field __bor (fun(t1,t2):any)|nil
229+
---@field __bxor (fun(t1,t2):any)|nil
230+
---@field __bnot (fun(t):any)|nil
231+
---@field __shl (fun(t1,t2):any)|nil
232+
---@field __shr (fun(t1,t2):any)|nil
233233
---#end
234-
---@field __concat fun(t1,t2):any|nil
235-
---@field __len fun(t):integer|nil
236-
---@field __eq fun(t1,t2):boolean|nil
237-
---@field __lt fun(t1,t2):boolean|nil
238-
---@field __le fun(t1,t2):boolean|nil
239-
---@field __index table|fun(t,k)|nil
234+
---@field __concat (fun(t1,t2):any)|nil
235+
---@field __len (fun(t):integer)|nil
236+
---@field __eq (fun(t1,t2):boolean)|nil
237+
---@field __lt (fun(t1,t2):boolean)|nil
238+
---@field __le (fun(t1,t2):boolean)|nil
239+
---@field __index table|(fun(t,k):any)|nil
240240
---@field __newindex table|fun(t,k,v)|nil
241-
---@field __call fun(t,...)|nil
241+
---@field __call (fun(t,...):...)|nil
242242
---#if VERSION > 5.1 or VERSION == JIT then
243-
---@field __pairs fun(t):fun(t,k,v)|nil
243+
---@field __pairs (fun(t):(fun(t,k,v):any,any))|nil
244244
---#end
245245
---#if VERSION == JIT or VERSION == 5.2 then
246-
---@field __ipairs fun(t):fun(t,k,v)|nil
246+
---@field __ipairs (fun(t):(fun(t,k,v):(integer|nil),any))|nil
247247
---#end
248248

249249
---#DES 'setmetatable'

‎meta/template/string.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ function string.dump(f, strip) end
3131
---@param pattern string|number
3232
---@param init? integer
3333
---@param plain? boolean
34-
---@return integer start
35-
---@return integer end
36-
---@return any ... captured
34+
---@return integer|nil start
35+
---@return integer|nil end
36+
---@return any|nil ... captured
3737
---@nodiscard
3838
function string.find(s, pattern, init, plain) end
3939

0 commit comments

Comments
 (0)