Skip to content

Commit 9a63d2d

Browse files
authored
Merge branch 'master' into master
2 parents d64c8b6 + 119355c commit 9a63d2d

File tree

17 files changed

+283
-30
lines changed

17 files changed

+283
-30
lines changed

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
## Unreleased
44
<!-- Add all new changes here. They will be moved under a version at release -->
55
* `FIX` cannot debug in Linux due to lua-debug expecting host process to have lua54 symbols available
6+
* `NEW` support custom addons path for enhanced editor flexibility
67
* `FIX` support hex color codes with `#` in `textDocument/documentColor`
8+
* `FIX` Prevent class methods from triggering missing-fields diagnostics
9+
* `ADD` missing locale
10+
* `FIX` updates the EmmyLuaCodeStyle submodule reference to a newer commit, ensuring compatibility with GCC 15
711
* `CHG` fulfill zh-tw translations
812

913
## 3.14.0

doc/en-us/config.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ boolean
1414
true
1515
```
1616

17+
# addonRepositoryPath
18+
19+
Specifies the addon repository path (not related to the addon manager).
20+
21+
## type
22+
23+
```ts
24+
string
25+
```
26+
1727
# codeLens.enable
1828

1929
Enable code lens.
@@ -2320,4 +2330,4 @@ Array<string>
23202330

23212331
```jsonc
23222332
[]
2323-
```
2333+
```

doc/pt-br/config.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ boolean
1414
true
1515
```
1616

17+
# addonRepositoryPath
18+
19+
Specifies the addon repository path (not related to the addon manager).
20+
21+
## type
22+
23+
```ts
24+
string
25+
```
26+
1727
# codeLens.enable
1828

1929
Enable code lens.
@@ -2320,4 +2330,4 @@ Array<string>
23202330

23212331
```jsonc
23222332
[]
2323-
```
2333+
```

doc/zh-cn/config.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ boolean
1414
true
1515
```
1616

17+
# addonRepositoryPath
18+
19+
指定插件仓库的路径(与 Addon Manager 无关)。
20+
21+
## type
22+
23+
```ts
24+
string
25+
```
26+
1727
# codeLens.enable
1828

1929
启用代码度量。
@@ -2318,4 +2328,4 @@ Array<string>
23182328

23192329
```jsonc
23202330
[]
2321-
```
2331+
```

doc/zh-tw/config.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ boolean
1414
true
1515
```
1616

17+
# addonRepositoryPath
18+
19+
Specifies the addon repository path (not related to the addon manager).
20+
21+
## type
22+
23+
```ts
24+
string
25+
```
26+
1727
# codeLens.enable
1828

1929
Enable code lens.
@@ -2318,4 +2328,4 @@ Array<string>
23182328

23192329
```jsonc
23202330
[]
2321-
```
2331+
```

locale/en-us/setting.lua

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ config.addonManager.repositoryBranch =
66
"Specifies the git branch used by the addon manager."
77
config.addonManager.repositoryPath =
88
"Specifies the git path used by the addon manager."
9+
config.addonRepositoryPath =
10+
"Specifies the addon repository path (not related to the addon manager)."
911
config.runtime.version =
1012
"Lua runtime version."
1113
config.runtime.path =
@@ -279,7 +281,10 @@ Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/doc
279281
config.spell.dict =
280282
'Custom words for spell checking.'
281283
config.nameStyle.config =
282-
'Set name style config'
284+
[[
285+
Set name style config.
286+
Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs) to learn usage.
287+
]]
283288
config.telemetry.enable =
284289
[[
285290
Enable telemetry to send your editor information and error logs over the network. Read our privacy policy [here](https://luals.github.io/privacy/#language-server).
@@ -289,7 +294,7 @@ config.misc.parameters =
289294
config.misc.executablePath =
290295
'Specify the executable path in VSCode.'
291296
config.language.fixIndent =
292-
'(VSCode only) Fix incorrect auto-indentation, such as incorrect indentation when line breaks occur within a string containing the word "function."'
297+
'(VSCode only) Fix incorrect auto-indentation, such as incorrect indentation when line breaks occur within a string containing the word "function".'
293298
config.language.completeAnnotation =
294299
'(VSCode only) Automatically insert "---@ " after a line break following a annotation.'
295300
config.type.castNumberToInteger =
@@ -316,12 +321,22 @@ config.type.checkTableShape =
316321
[[
317322
Strictly check the shape of the table.
318323
]]
324+
config.type.inferTableSize =
325+
'Maximum number of table fields analyzed during type inference.'
319326
config.doc.privateName =
320327
'Treat specific field names as private, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are private, witch can only be accessed in the class where the definition is located.'
321328
config.doc.protectedName =
322329
'Treat specific field names as protected, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are protected, witch can only be accessed in the class where the definition is located and its subclasses.'
323330
config.doc.packageName =
324331
'Treat specific field names as package, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are package, witch can only be accessed in the file where the definition is located.'
332+
config.doc.regengine =
333+
'The regular expression engine used for matching documentation scope names.'
334+
config.doc.regengine.glob =
335+
'The default lightweight pattern syntax.'
336+
config.doc.regengine.lua =
337+
'Full Lua-style regular expressions.'
338+
config.docScriptPath =
339+
'The regular expression engine used for matching documentation scope names.'
325340
config.diagnostics['unused-local'] =
326341
'Enable unused local variable diagnostics.'
327342
config.diagnostics['unused-function'] =
@@ -339,7 +354,7 @@ config.diagnostics['trailing-space'] =
339354
config.diagnostics['redefined-local'] =
340355
'Enable redefined local variable diagnostics.'
341356
config.diagnostics['newline-call'] =
342-
'Enable newline call diagnostics. Is\'s raised when a line starting with `(` is encountered, which is syntactically parsed as a function call on the previous line.'
357+
'Enable newline call diagnostics. It\'s raised when a line starting with `(` is encountered, which is syntactically parsed as a function call on the previous line.'
343358
config.diagnostics['newfield-call'] =
344359
'Enable newfield call diagnostics. It is raised when the parenthesis of a function call appear on the following line when defining a field in a table.'
345360
config.diagnostics['redundant-parameter'] =

locale/es-419/setting.lua

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ config.addonManager.repositoryBranch =
66
"Especifica la rama de git usada por el manejador de extensiones."
77
config.addonManager.repositoryPath =
88
"Especifica la ruta git usada por el manejador de extensiones."
9+
config.addonRepositoryPath = -- TODO: need translate!
10+
"Specifies the addon repository path (not related to the addon manager)."
911

1012
config.runtime.version =
1113
"Versión de Lua que se ejecuta."
@@ -280,7 +282,11 @@ para aprender más sobre su uso.
280282
config.spell.dict =
281283
'Palabras extra para el corrector ortográfico.'
282284
config.nameStyle.config =
283-
'Configuración de estilo para nombres.'
285+
[[
286+
Configuración de estilo para nombres.
287+
Revise [la documentación del formateador](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs)
288+
para aprender más sobre su uso.
289+
]]
284290
config.telemetry.enable =
285291
[[
286292
Habilita la telemetría para enviar información del editor y registros de errores por la red. Lea nuestra política de privacidad [aquí (en inglés)](https://luals.github.io/privacy#language-server).
@@ -317,12 +323,22 @@ config.type.checkTableShape =
317323
[[
318324
Chequea estrictamente la forma de la tabla.
319325
]]
326+
config.type.inferTableSize = -- TODO: need translate!
327+
'Maximum number of table fields analyzed during type inference.'
320328
config.doc.privateName =
321329
'Trata los nombres específicos de campo como privados. Por ejemplo `m_*` significa `XXX.m_id` y `XXX.m_tipo` son privados, por lo que solo pueden ser accedidos donde se define la clase.'
322330
config.doc.protectedName =
323331
'Trata los nombres específicos de campo como protegidos. Por ejemplo `m_*` significa `XXX.m_id` y `XXX.m_tipo` son privados, por lo que solo pueden ser accedidos donde se define la clase y sus subclases.'
324332
config.doc.packageName =
325333
'Trata los nombres específicos de campo como del paquete. Por ejemplo `m_*` significa `XXX.m_id` y `XXX.m_tipo` son de paquete, por lo que solo pueden ser accedidos en el archivo donde son definidos.'
334+
config.doc.regengine = -- TODO: need translate!
335+
'The regular expression engine used for matching documentation scope names.'
336+
config.doc.regengine.glob = -- TODO: need translate!
337+
'The default lightweight pattern syntax.'
338+
config.doc.regengine.lua = -- TODO: need translate!
339+
'Full Lua-style regular expressions.'
340+
config.docScriptPath = -- TODO: need translate!
341+
'The regular expression engine used for matching documentation scope names.'
326342
config.diagnostics['unused-local'] =
327343
'Habilita el diagnóstico de variables local sin uso.'
328344
config.diagnostics['unused-function'] =

locale/ja-jp/setting.lua

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ config.addonManager.repositoryBranch = -- TODO: need translate!
66
"Specifies the git branch used by the addon manager."
77
config.addonManager.repositoryPath = -- TODO: need translate!
88
"Specifies the git path used by the addon manager."
9+
config.addonRepositoryPath = -- TODO: need translate!
10+
"Specifies the addon repository path (not related to the addon manager)."
911
config.runtime.version = -- TODO: need translate!
1012
"Lua runtime version."
1113
config.runtime.path = -- TODO: need translate!
@@ -279,7 +281,10 @@ Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/doc
279281
config.spell.dict = -- TODO: need translate!
280282
'Custom words for spell checking.'
281283
config.nameStyle.config = -- TODO: need translate!
282-
'Set name style config'
284+
[[
285+
Set name style config.
286+
Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs) to learn usage.
287+
]]
283288
config.telemetry.enable = -- TODO: need translate!
284289
[[
285290
Enable telemetry to send your editor information and error logs over the network. Read our privacy policy [here](https://luals.github.io/privacy/#language-server).
@@ -316,12 +321,22 @@ config.type.checkTableShape = -- TODO: need translate!
316321
[[
317322
Strictly check the shape of the table.
318323
]]
324+
config.type.inferTableSize = -- TODO: need translate!
325+
'Maximum number of table fields analyzed during type inference.'
319326
config.doc.privateName = -- TODO: need translate!
320327
'Treat specific field names as private, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are private, witch can only be accessed in the class where the definition is located.'
321328
config.doc.protectedName = -- TODO: need translate!
322329
'Treat specific field names as protected, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are protected, witch can only be accessed in the class where the definition is located and its subclasses.'
323330
config.doc.packageName = -- TODO: need translate!
324331
'Treat specific field names as package, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are package, witch can only be accessed in the file where the definition is located.'
332+
config.doc.regengine = -- TODO: need translate!
333+
'The regular expression engine used for matching documentation scope names.'
334+
config.doc.regengine.glob = -- TODO: need translate!
335+
'The default lightweight pattern syntax.'
336+
config.doc.regengine.lua = -- TODO: need translate!
337+
'Full Lua-style regular expressions.'
338+
config.docScriptPath = -- TODO: need translate!
339+
'The regular expression engine used for matching documentation scope names.'
325340
config.diagnostics['unused-local'] = -- TODO: need translate!
326341
'Enable unused local variable diagnostics.'
327342
config.diagnostics['unused-function'] = -- TODO: need translate!

locale/pt-br/setting.lua

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ config.addonManager.repositoryBranch = -- TODO: need translate!
66
"Specifies the git branch used by the addon manager."
77
config.addonManager.repositoryPath = -- TODO: need translate!
88
"Specifies the git path used by the addon manager."
9+
config.addonRepositoryPath = -- TODO: need translate!
10+
"Specifies the addon repository path (not related to the addon manager)."
911
config.runtime.version = -- TODO: need translate!
1012
"Lua runtime version."
1113
config.runtime.path = -- TODO: need translate!
@@ -279,7 +281,10 @@ Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/doc
279281
config.spell.dict = -- TODO: need translate!
280282
'Custom words for spell checking.'
281283
config.nameStyle.config = -- TODO: need translate!
282-
'Set name style config'
284+
[[
285+
Set name style config.
286+
Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs) to learn usage.
287+
]]
283288
config.telemetry.enable = -- TODO: need translate!
284289
[[
285290
Enable telemetry to send your editor information and error logs over the network. Read our privacy policy [here](https://luals.github.io/privacy/#language-server).
@@ -316,12 +321,22 @@ config.type.checkTableShape = -- TODO: need translate!
316321
[[
317322
对表的形状进行严格检查。
318323
]]
324+
config.type.inferTableSize = -- TODO: need translate!
325+
'Maximum number of table fields analyzed during type inference.'
319326
config.doc.privateName = -- TODO: need translate!
320327
'Treat specific field names as private, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are private, witch can only be accessed in the class where the definition is located.'
321328
config.doc.protectedName = -- TODO: need translate!
322329
'Treat specific field names as protected, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are protected, witch can only be accessed in the class where the definition is located and its subclasses.'
323330
config.doc.packageName = -- TODO: need translate!
324331
'Treat specific field names as package, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are package, witch can only be accessed in the file where the definition is located.'
332+
config.doc.regengine = -- TODO: need translate!
333+
'The regular expression engine used for matching documentation scope names.'
334+
config.doc.regengine.glob = -- TODO: need translate!
335+
'The default lightweight pattern syntax.'
336+
config.doc.regengine.lua = -- TODO: need translate!
337+
'Full Lua-style regular expressions.'
338+
config.docScriptPath = -- TODO: need translate!
339+
'The regular expression engine used for matching documentation scope names.'
325340
config.diagnostics['unused-local'] = -- TODO: need translate!
326341
'未使用的局部变量'
327342
config.diagnostics['unused-function'] = -- TODO: need translate!

locale/zh-cn/setting.lua

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ config.addonManager.repositoryBranch =
66
"指定插件管理器(Addon Manager)使用的git仓库分支"
77
config.addonManager.repositoryPath =
88
"指定插件管理器(Addon Manager)使用的git仓库路径"
9+
config.addonRepositoryPath =
10+
"指定插件仓库的路径(与 Addon Manager 无关)"
911
config.runtime.version =
1012
"Lua运行版本。"
1113
config.runtime.path =
@@ -53,7 +55,7 @@ config.diagnostics.disable =
5355
config.diagnostics.globals =
5456
"已定义的全局变量。"
5557
config.diagnostics.globalsRegex =
56-
"启用诊断以检测尝试关闭非对象的变量"
58+
"已定义的全局变量符合的正则表达式"
5759
config.diagnostics.severity =
5860
[[
5961
修改诊断等级。
@@ -277,7 +279,10 @@ config.format.defaultConfig =
277279
config.spell.dict =
278280
'拼写检查的自定义单词。'
279281
config.nameStyle.config =
280-
'设定命名风格检查的配置'
282+
[[
283+
设定命名风格检查的配置。
284+
请查阅[格式化文档](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs)了解用法。
285+
]]
281286
config.telemetry.enable =
282287
[[
283288
启用遥测,通过网络发送你的编辑器信息与错误日志。在[此处](https://luals.github.io/privacy/#language-server)阅读我们的隐私声明。
@@ -314,12 +319,22 @@ config.type.checkTableShape =
314319
[[
315320
对表的形状进行严格检查。
316321
]]
322+
config.type.inferTableSize =
323+
'类型推断期间分析的表字段的最大数量。'
317324
config.doc.privateName =
318325
'将特定名称的字段视为私有,例如 `m_*` 意味着 `XXX.m_id` 与 `XXX.m_type` 是私有字段,只能在定义所在的类中访问。'
319326
config.doc.protectedName =
320327
'将特定名称的字段视为受保护,例如 `m_*` 意味着 `XXX.m_id` 与 `XXX.m_type` 是受保护的字段,只能在定义所在的类极其子类中访问。'
321328
config.doc.packageName =
322329
'将特定名称的字段视为package,例如 `m_*` 意味着 `XXX.m_id` 与 `XXX.m_type` 只能在定义所在的文件中访问。'
330+
config.doc.regengine =
331+
'用于匹配文档作用域名称的正则表达式引擎。'
332+
config.doc.regengine.glob =
333+
'默认轻量级模式语法。'
334+
config.doc.regengine.lua =
335+
'完整的 Lua 风格正则表达式。'
336+
config.docScriptPath =
337+
'自定义 Lua 脚本路径,覆盖默认文档生成行为。'
323338
config.diagnostics['unused-local'] =
324339
'未使用的局部变量'
325340
config.diagnostics['unused-function'] =

0 commit comments

Comments
 (0)