Skip to content

Commit c09845a

Browse files
committed
Merge branch 'master' into addon-manager
2 parents 285100c + 6f887be commit c09845a

20 files changed

+392
-1598
lines changed

.github/workflows/build.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,28 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- { os: ubuntu-20.04, target: linux, platform: linux-x64 }
25-
- { os: ubuntu-20.04, target: linux, platform: linux-arm64 }
24+
- { os: ubuntu-20.04, target: linux, platform: linux-x64, container: 'ubuntu:18.04' }
25+
- { os: ubuntu-20.04, target: linux, platform: linux-arm64, container: 'ubuntu:18.04' }
2626
- { os: macos-11, target: darwin, platform: darwin-x64 }
2727
- { os: macos-11, target: darwin, platform: darwin-arm64 }
2828
- { os: windows-latest, target: windows, platform: win32-ia32 }
2929
- { os: windows-latest, target: windows, platform: win32-x64 }
3030
runs-on: ${{ matrix.os }}
31+
container:
32+
image: ${{ matrix.container }}
3133
steps:
34+
- name: Prepare container
35+
if: ${{ matrix.target == 'linux' }}
36+
run: |
37+
apt-get update
38+
apt-get install -y software-properties-common curl sudo
39+
add-apt-repository -y ppa:ubuntu-toolchain-r/test # For gcc-9 and g++-9
40+
add-apt-repository -y ppa:git-core/ppa # For git>=2.18.
41+
curl -sL https://deb.nodesource.com/setup_14.x -o /tmp/nodesource_setup.sh # For nodejs
42+
sudo bash /tmp/nodesource_setup.sh
43+
apt-get update
44+
apt-get install -y git gcc-9 g++-9 nodejs
45+
3246
- name: Install aarch64-linux-gnu
3347
if: ${{ matrix.platform == 'linux-arm64' }}
3448
run: |

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ The Lua language server provides various language features for Lua to make devel
2626
- 💅 [Code formatting](https://github.com/sumneko/lua-language-server/wiki/Formatter)
2727
- 💬 [Spell checking](https://github.com/sumneko/lua-language-server/wiki/Formatter)
2828
- 🛠️ Custom [plugins](https://github.com/sumneko/lua-language-server/wiki/Plugins)
29+
- 📖 [Documentation Generation](https://github.com/sumneko/lua-language-server/wiki/Export-Documentation)
2930

3031
## Install
3132

build-settings.lua

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,14 @@ for dirPath in fs.pairs(fs.path 'server/locale') do
8484
description = 'Setting of sumneko.lua',
8585
type = 'object',
8686
properties = copyWithNLS(configuration, function (str)
87-
return str:gsub('^%%(.+)%%$', nls)
87+
return str:gsub('^%%(.+)%%$', function (key)
88+
if nls[key] then
89+
return nls[key]
90+
else
91+
nls[key] = ''
92+
return ''
93+
end
94+
end)
8895
end),
8996
}
9097

changelog.md

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

3+
## 3.6.7
4+
`2023-1-20`
5+
* `FIX` [#1810]
6+
* `FIX` [#1829]
7+
8+
[#1810]: https://github.com/sumneko/lua-language-server/issues/1810
9+
[#1829]: https://github.com/sumneko/lua-language-server/issues/1829
10+
11+
## 3.6.6
12+
`2023-1-17`
13+
* `FIX` [#1825]
14+
* `FIX` [#1826]
15+
16+
[#1825]: https://github.com/sumneko/lua-language-server/issues/1825
17+
[#1826]: https://github.com/sumneko/lua-language-server/issues/1826
18+
319
## 3.6.5
420
`2023-1-16`
521
* `NEW` support casting global variables

0 commit comments

Comments
 (0)