Skip to content

Commit 440da47

Browse files
committed
Merge branch 'master' of github.com:CppCXY/lua-language-server
2 parents c1542d0 + b4ef18b commit 440da47

File tree

5 files changed

+17
-18
lines changed

5 files changed

+17
-18
lines changed

README.md

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

3-
![build](https://github.com/LuaLS/lua-language-server/workflows/build/badge.svg)
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)
44
[![version](https://vsmarketplacebadges.dev/version-short/sumneko.lua.svg)](https://marketplace.visualstudio.com/items?itemName=sumneko.lua)
55
![installs](https://vsmarketplacebadges.dev/installs-short/sumneko.lua.svg)
66
![downloads](https://vsmarketplacebadges.dev/downloads-short/sumneko.lua.svg)
7-
[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/LuaLS/lua-language-server.svg)](https://github.com/LuaLS/lua-language-server/issues "Average time to resolve an issue")
87

98

109
***Lua development just got a whole lot better*** 🧠
@@ -33,25 +32,25 @@ The Lua language server provides various language features for Lua to make devel
3332
The language server can easily be installed for use in VS Code, but it can also be used by other clients using the command line.
3433

3534
### Visual Studio Code
36-
[![Install in VS Code](https://img.shields.io/badge/Install%20For-VS%20Code-blue?style=for-the-badge&logo=visualstudiocode "Install in VS Code")](https://marketplace.visualstudio.com/items?itemName=sumneko.lua)
35+
[![Install in VS Code](https://img.shields.io/badge/VS%20Code-Install-blue?style=for-the-badge&logo=visualstudiocode "Install in VS Code")](https://marketplace.visualstudio.com/items?itemName=sumneko.lua)
3736

3837
The language server and Visual Studio Code client can be installed from [the VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=sumneko.lua).
3938

4039
![](https://github.com/LuaLS/vscode-lua/raw/master/images//Install%20In%20VSCode.gif)
4140

4241
### Command Line
43-
[![Install for command line](https://img.shields.io/badge/Install%20For-Command%20Line-blue?style=for-the-badge&logo=windowsterminal "Install for command line")](https://github.com/LuaLS/lua-language-server/wiki/Getting-Started#command-line)
42+
[![Install for command line](https://img.shields.io/badge/Command%20Line-Install-blue?style=for-the-badge&logo=windowsterminal "Install for command line")](https://github.com/LuaLS/lua-language-server/wiki/Getting-Started#command-line)
4443

45-
Check the [wiki for a guide](https://github.com/LuaLS/lua-language-server/wiki/Getting-Started#command-line) to install the language server for use on the command line. This allows the language server to be used for NeoVim and other clients that follow the language server protocol.
44+
Check the [wiki for a guide](https://github.com/LuaLS/lua-language-server/wiki/Getting-Started#command-line) to install the language server for use on the command line. This allows the language server to be used with NeoVim and [other clients](https://microsoft.github.io/language-server-protocol/implementors/tools/) that follow the [language server protocol](https://microsoft.github.io/language-server-protocol/overviews/lsp/overview/).
4645

4746
## Supported Lua Versions
48-
| Version | Supported |
47+
| Version | Supported |
4948
| :-----: | :------------: |
50-
| Lua 5.1 | ![][checkmark] |
51-
| Lua 5.2 | ![][checkmark] |
52-
| Lua 5.3 | ![][checkmark] |
53-
| Lua 5.4 | ![][checkmark] |
54-
| LuaJIT | ![][checkmark] |
49+
| Lua 5.1 | ![][checkmark] |
50+
| Lua 5.2 | ![][checkmark] |
51+
| Lua 5.3 | ![][checkmark] |
52+
| Lua 5.4 | ![][checkmark] |
53+
| LuaJIT | ![][checkmark] |
5554

5655
## Links
5756
- [Changelog](https://github.com/LuaLS/lua-language-server/blob/master/changelog.md)
@@ -76,14 +75,13 @@ Check the [wiki for a guide](https://github.com/LuaLS/lua-language-server/wiki/G
7675
- `pt-br` 🇧🇷
7776

7877

79-
> ℹ Note: All translations are provided and collaborated on by the community. If you find an inappropriate or harmful translation, [please report it immediately](https://github.com/LuaLS/lua-language-server/issues).
78+
> **Note**
79+
> All translations are provided and collaborated on by the community. If you find an inappropriate or harmful translation, [please report it immediately](https://github.com/LuaLS/lua-language-server/issues).
8080
8181
Are you able to [provide a translation](https://github.com/LuaLS/lua-language-server/wiki/Translations)? It would be greatly appreciated!
8282

8383
Thank you to [all contributors of translations](https://github.com/LuaLS/lua-language-server/commits/master/locale)!
8484

85-
[en-US]: https://github.com/LuaLS/lua-language-server/tree/master/locale/en-us
86-
8785
## Configuration
8886
Configuration of the server can be done in a number of ways, which are explained more in-depth in the [wiki](https://github.com/LuaLS/lua-language-server/wiki/Configuration-File).
8987

@@ -95,7 +93,7 @@ See the [configuration file wiki page](https://github.com/LuaLS/lua-language-ser
9593

9694

9795
## Privacy
98-
This language server has **opt-in** telemetry that collects usage data and sends it to the development team to help improve the extension. Read our [privacy policy](https://github.com/LuaLS/lua-language-server/wiki/Home#privacy) to learn more.
96+
The language server had **opt-in** telemetry that collected usage data and sent it to the development team to help improve the extension. Read our [privacy policy](https://github.com/LuaLS/lua-language-server/wiki/Home#privacy) to learn more. Telemetry was removed in `v3.6.5` and is no longer part of the language server.
9997

10098

10199
## Contributors

make/modules.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <bee/lua/binding.h>
1+
#include <binding/binding.h>
22

33
extern "C" int luaopen_lpeglabel (lua_State *L);
44
static ::bee::lua::callfunc _init(::bee::lua::register_module, "lpeglabel", luaopen_lpeglabel);

script/config/template.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ local template = {
395395
['Lua.doc.packageName'] = Type.Array(Type.String),
396396

397397
-- VSCode
398+
["Lua.addonManager.enable"] = Type.Boolean >> false,
398399
['files.associations'] = Type.Hash(Type.String, Type.String),
399400
-- copy from VSCode default
400401
['files.exclude'] = Type.Hash(Type.String, Type.Boolean) >> {

0 commit comments

Comments
 (0)