Skip to content

Commit 9b6df71

Browse files
CppCXYCppCXY
committed
Merge branch 'master' of github.com:CppCXY/lua-language-server
2 parents 483fe24 + 3e6fd3c commit 9b6df71

File tree

890 files changed

+13554
-93956
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

890 files changed

+13554
-93956
lines changed

‎.editorconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ continuation_indent = 4
1818
# this option decides when to chopdown the code
1919
max_line_length = 120
2020

21-
# optional crlf/lf/cr/auto, if it is 'auto', in windows it is crlf other platforms are lf
22-
# in neovim the value 'auto' is not a valid option, please use 'unset'
23-
end_of_line = auto
24-
2521
#optional keep/never/always/smart
2622
trailing_table_separator = keep
2723

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ body:
8888
label: Log File
8989
description: >
9090
Please provide your log file. Refer to the wiki to find your log file:
91-
https://github.com/LuaLS/lua-language-server/wiki/FAQ#where-can-i-find-the-log-file
91+
https://luals.github.io/wiki/faq#where-can-i-find-the-log-file
9292
- type: markdown
9393
attributes:
9494
value: |

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
if: ${{ matrix.target == 'linux' && matrix.libc == 'musl' }}
6161
run: |
6262
apk update
63-
apk add git ninja bash build-base nodejs
63+
apk add git ninja bash build-base nodejs linux-headers
6464
6565
- uses: actions/checkout@v3
6666
with:

‎.github/workflows/test.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: test
2+
on: [ push, pull_request ]
3+
jobs:
4+
test:
5+
strategy:
6+
fail-fast: false
7+
matrix:
8+
include:
9+
- { os: ubuntu-20.04, platform: linux-x64 }
10+
- { os: macos-latest, platform: darwin-x64 }
11+
- { os: windows-latest, platform: win32-x64 }
12+
runs-on: ${{ matrix.os }}
13+
steps:
14+
- uses: actions/checkout@v4
15+
with:
16+
submodules: recursive
17+
- uses: actboy168/setup-luamake@master
18+
- run: luamake -platform ${{ matrix.platform }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
/meta/*
55
!/meta/template
66
!/meta/3rd
7+
!/meta/whimsical
78
/bin*

‎.gitmodules‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,45 @@
1919
[submodule "3rd/json.lua"]
2020
path = 3rd/json.lua
2121
url = https://github.com/actboy168/json.lua
22+
[submodule "meta/3rd/OpenResty"]
23+
path = meta/3rd/OpenResty
24+
url = https://github.com/LuaCATS/openresty.git
25+
[submodule "meta/3rd/bee"]
26+
path = meta/3rd/bee
27+
url = https://github.com/LuaCATS/bee.git
28+
[submodule "meta/3rd/busted"]
29+
path = meta/3rd/busted
30+
url = https://github.com/LuaCATS/busted.git
31+
[submodule "meta/3rd/Cocos4.0"]
32+
path = meta/3rd/Cocos4.0
33+
url = https://github.com/LuaCATS/cocos4.0.git
34+
[submodule "meta/3rd/Defold"]
35+
path = meta/3rd/Defold
36+
url = https://github.com/LuaCATS/defold.git
37+
[submodule "meta/3rd/Jass"]
38+
path = meta/3rd/Jass
39+
url = https://github.com/LuaCATS/jass.git
40+
[submodule "meta/3rd/lfs"]
41+
path = meta/3rd/lfs
42+
url = https://github.com/LuaCATS/luafilesystem.git
43+
[submodule "meta/3rd/love2d"]
44+
path = meta/3rd/love2d
45+
url = https://github.com/LuaCATS/love2d.git
46+
[submodule "meta/3rd/lovr"]
47+
path = meta/3rd/lovr
48+
url = https://github.com/LuaCATS/lovr.git
49+
[submodule "meta/3rd/luaecs"]
50+
path = meta/3rd/luaecs
51+
url = https://github.com/LuaCATS/luaecs.git
52+
[submodule "meta/3rd/luassert"]
53+
path = meta/3rd/luassert
54+
url = https://github.com/LuaCATS/luassert.git
55+
[submodule "meta/3rd/skynet"]
56+
path = meta/3rd/skynet
57+
url = https://github.com/LuaCATS/skynet.git
58+
[submodule "meta/3rd/ffi-reflect"]
59+
path = meta/3rd/ffi-reflect
60+
url = https://github.com/LuaCATS/ffi-reflect.git
61+
[submodule "meta/3rd/luv"]
62+
path = meta/3rd/luv
63+
url = https://github.com/LuaCATS/luv.git

‎.luarc.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"disable": [
44
"close-non-object",
55
"incomplete-signature-doc",
6-
"missing-global-doc"
6+
"missing-global-doc",
7+
"missing-local-export-doc"
78
],
89
"groupFileStatus": {
910
"ambiguity": "Any",

‎.vscode/launch.json‎

Lines changed: 14 additions & 13 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-
],
15-
"luaVersion": "5.4",
12+
"luaVersion": "lua54",
1613
"sourceCoding": "utf8",
17-
"console": "internalConsole",
14+
"console": "integratedTerminal",
15+
"internalConsoleOptions": "openOnSessionStart",
1816
"outputCapture": [
1917
"print",
2018
"stderr",
@@ -36,9 +34,6 @@
3634
]
3735
],
3836
"windows": {
39-
"name": "🍄attach",
40-
"type": "lua",
41-
"request": "attach",
4237
"sourceMaps": [
4338
[
4439
"script\\*",
@@ -55,9 +50,11 @@
5550
"luaexe": "${workspaceFolder}/bin/lua-language-server",
5651
"program": "${workspaceRoot}/tools/build-3rd-meta.lua",
5752
"cpath": "${workspaceFolder}/bin/?.dll;${workspaceFolder}/bin/?.so",
53+
"console": "integratedTerminal",
54+
"internalConsoleOptions": "openOnSessionStart",
5855
"arg": [
5956
],
60-
"luaVersion": "latest",
57+
"luaVersion": "lua-latest",
6158
"sourceCoding": "utf8",
6259
"outputCapture": [
6360
"print",
@@ -72,9 +69,11 @@
7269
"luaexe": "${workspaceFolder}/bin/lua-language-server",
7370
"program": "${workspaceRoot}/tools/locale.lua",
7471
"cpath": "${workspaceFolder}/bin/?.dll;${workspaceFolder}/bin/?.so",
72+
"console": "integratedTerminal",
73+
"internalConsoleOptions": "openOnSessionStart",
7574
"arg": [
7675
],
77-
"luaVersion": "latest",
76+
"luaVersion": "lua-latest",
7877
"sourceCoding": "utf8",
7978
"outputCapture": [
8079
"print",
@@ -89,9 +88,11 @@
8988
"luaexe": "${workspaceFolder}/bin/lua-language-server",
9089
"program": "${workspaceRoot}/tools/build-doc.lua",
9190
"cpath": "${workspaceFolder}/bin/?.dll;${workspaceFolder}/bin/?.so",
91+
"console": "integratedTerminal",
92+
"internalConsoleOptions": "openOnSessionStart",
9293
"arg": [
9394
],
94-
"luaVersion": "latest",
95+
"luaVersion": "lua-latest",
9596
"sourceCoding": "utf8",
9697
"outputCapture": [
9798
"print",
@@ -110,7 +111,7 @@
110111
"--check",
111112
"${workspaceRoot}",
112113
],
113-
"luaVersion": "5.4",
114+
"luaVersion": "lua-latest",
114115
"sourceCoding": "utf8",
115116
"outputCapture": [
116117
"print",
@@ -129,7 +130,7 @@
129130
"--doc",
130131
"${workspaceRoot}",
131132
],
132-
"luaVersion": "5.4",
133+
"luaVersion": "lua-latest",
133134
"sourceCoding": "utf8",
134135
"outputCapture": [
135136
"print",

‎3rd/bee.lua‎

Submodule bee.lua updated 153 files

‎3rd/json.lua‎

0 commit comments

Comments
 (0)