Merge branch 'master' into feat/addons

Author: sumneko

3rd/EmmyLuaCodeStyle

@@ -4,6 +4,9 @@
 <!-- Add all new changes here. They will be moved under a version at release -->
 * `FIX` cannot debug in Linux due to lua-debug expecting host process to have lua54 symbols available
 * `NEW` support custom addons path for enhanced editor flexibility
+* `FIX` support hex color codes with `#` in `textDocument/documentColor`
+* `ADD` missing locale
+* `FIX` updates the EmmyLuaCodeStyle submodule reference to a newer commit, ensuring compatibility with GCC 15
 
 ## 3.14.0
 `2025-4-7`

changelog.md

@@ -281,7 +281,10 @@ Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/doc
 config.spell.dict                        =
 'Custom words for spell checking.'
 config.nameStyle.config                  =
-'Set name style config'
+[[
+Set name style config.
+Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs) to learn usage.
+]]
 config.telemetry.enable                  =
 [[
 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).
@@ -291,7 +294,7 @@ config.misc.parameters                   =
 config.misc.executablePath               =
 'Specify the executable path in VSCode.'
 config.language.fixIndent                =
-'(VSCode only) Fix incorrect auto-indentation, such as incorrect indentation when line breaks occur within a string containing the word "function."'
+'(VSCode only) Fix incorrect auto-indentation, such as incorrect indentation when line breaks occur within a string containing the word "function".'
 config.language.completeAnnotation       =
 '(VSCode only) Automatically insert "---@ " after a line break following a annotation.'
 config.type.castNumberToInteger          =
@@ -318,12 +321,22 @@ config.type.checkTableShape              =
 [[
 Strictly check the shape of the table.
 ]]
+config.type.inferTableSize               =
+'Maximum number of table fields analyzed during type inference.'
 config.doc.privateName                   =
 '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.'
 config.doc.protectedName                 =
 '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.'
 config.doc.packageName                   =
 '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.'
+config.doc.regengine                     =
+'The regular expression engine used for matching documentation scope names.'
+config.doc.regengine.glob                =
+'The default lightweight pattern syntax.'
+config.doc.regengine.lua                 =
+'Full Lua-style regular expressions.'
+config.docScriptPath                     =
+'The regular expression engine used for matching documentation scope names.'
 config.diagnostics['unused-local']          =
 'Enable unused local variable diagnostics.'
 config.diagnostics['unused-function']       =
@@ -341,7 +354,7 @@ config.diagnostics['trailing-space']        =
 config.diagnostics['redefined-local']       =
 'Enable redefined local variable diagnostics.'
 config.diagnostics['newline-call']          =
-'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.'
+'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.'
 config.diagnostics['newfield-call']         =
 '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.'
 config.diagnostics['redundant-parameter']   =

locale/en-us/setting.lua

@@ -282,7 +282,11 @@ para aprender más sobre su uso.
 config.spell.dict                        =
 'Palabras extra para el corrector ortográfico.'
 config.nameStyle.config                  =
-'Configuración de estilo para nombres.'
+[[
+Configuración de estilo para nombres.
+Revise [la documentación del formateador](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs)
+para aprender más sobre su uso.
+]]
 config.telemetry.enable                  =
 [[
 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).
@@ -319,12 +323,22 @@ config.type.checkTableShape              =
 [[
 Chequea estrictamente la forma de la tabla.
 ]]
+config.type.inferTableSize               = -- TODO: need translate!
+'Maximum number of table fields analyzed during type inference.'
 config.doc.privateName                   =
 '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.'
 config.doc.protectedName                 =
 '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.'
 config.doc.packageName                   =
 '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.'
+config.doc.regengine                     = -- TODO: need translate!
+'The regular expression engine used for matching documentation scope names.'
+config.doc.regengine.glob                = -- TODO: need translate!
+'The default lightweight pattern syntax.'
+config.doc.regengine.lua                 = -- TODO: need translate!
+'Full Lua-style regular expressions.'
+config.docScriptPath                     = -- TODO: need translate!
+'The regular expression engine used for matching documentation scope names.'
 config.diagnostics['unused-local']          =
 'Habilita el diagnóstico de variables local sin uso.'
 config.diagnostics['unused-function']       =

locale/es-419/setting.lua

@@ -281,7 +281,10 @@ Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/doc
 config.spell.dict                        = -- TODO: need translate!
 'Custom words for spell checking.'
 config.nameStyle.config                  = -- TODO: need translate!
-'Set name style config'
+[[
+Set name style config.
+Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs) to learn usage.
+]]
 config.telemetry.enable                  = -- TODO: need translate!
 [[
 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).
@@ -318,12 +321,22 @@ config.type.checkTableShape              = -- TODO: need translate!
 [[
 Strictly check the shape of the table.
 ]]
+config.type.inferTableSize               = -- TODO: need translate!
+'Maximum number of table fields analyzed during type inference.'
 config.doc.privateName                   = -- TODO: need translate!
 '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.'
 config.doc.protectedName                 = -- TODO: need translate!
 '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.'
 config.doc.packageName                   = -- TODO: need translate!
 '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.'
+config.doc.regengine                     = -- TODO: need translate!
+'The regular expression engine used for matching documentation scope names.'
+config.doc.regengine.glob                = -- TODO: need translate!
+'The default lightweight pattern syntax.'
+config.doc.regengine.lua                 = -- TODO: need translate!
+'Full Lua-style regular expressions.'
+config.docScriptPath                     = -- TODO: need translate!
+'The regular expression engine used for matching documentation scope names.'
 config.diagnostics['unused-local']          = -- TODO: need translate!
 'Enable unused local variable diagnostics.'
 config.diagnostics['unused-function']       = -- TODO: need translate!

locale/ja-jp/setting.lua

@@ -281,7 +281,10 @@ Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/doc
 config.spell.dict                        = -- TODO: need translate!
 'Custom words for spell checking.'
 config.nameStyle.config                  = -- TODO: need translate!
-'Set name style config'
+[[
+Set name style config.
+Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs) to learn usage.
+]]
 config.telemetry.enable                  = -- TODO: need translate!
 [[
 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).
@@ -318,12 +321,22 @@ config.type.checkTableShape              = -- TODO: need translate!
 [[
 对表的形状进行严格检查。
 ]]
+config.type.inferTableSize               = -- TODO: need translate!
+'Maximum number of table fields analyzed during type inference.'
 config.doc.privateName                   = -- TODO: need translate!
 '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.'
 config.doc.protectedName                 = -- TODO: need translate!
 '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.'
 config.doc.packageName                   = -- TODO: need translate!
 '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.'
+config.doc.regengine                     = -- TODO: need translate!
+'The regular expression engine used for matching documentation scope names.'
+config.doc.regengine.glob                = -- TODO: need translate!
+'The default lightweight pattern syntax.'
+config.doc.regengine.lua                 = -- TODO: need translate!
+'Full Lua-style regular expressions.'
+config.docScriptPath                     = -- TODO: need translate!
+'The regular expression engine used for matching documentation scope names.'
 config.diagnostics['unused-local']          = -- TODO: need translate!
 '未使用的局部变量'
 config.diagnostics['unused-function']       = -- TODO: need translate!

locale/pt-br/setting.lua

@@ -55,7 +55,7 @@ config.diagnostics.disable        =
 config.diagnostics.globals        =
 "已定义的全局变量。"
 config.diagnostics.globalsRegex   =
-"启用诊断以检测尝试关闭非对象的变量。"
+"已定义的全局变量符合的正则表达式。"
 config.diagnostics.severity       =
 [[
 修改诊断等级。
@@ -279,7 +279,10 @@ config.format.defaultConfig              =
 config.spell.dict                        =
 '拼写检查的自定义单词。'
 config.nameStyle.config                  =
-'设定命名风格检查的配置'
+[[
+设定命名风格检查的配置。
+请查阅[格式化文档](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs)了解用法。
+]]
 config.telemetry.enable                  =
 [[
 启用遥测，通过网络发送你的编辑器信息与错误日志。在[此处](https://luals.github.io/privacy/#language-server)阅读我们的隐私声明。
@@ -316,12 +319,22 @@ config.type.checkTableShape              =
 [[
 对表的形状进行严格检查。
 ]]
+config.type.inferTableSize               =
+'类型推断期间分析的表字段的最大数量。'
 config.doc.privateName                   =
 '将特定名称的字段视为私有，例如 `m_*` 意味着 `XXX.m_id` 与 `XXX.m_type` 是私有字段，只能在定义所在的类中访问。'
 config.doc.protectedName                 =
 '将特定名称的字段视为受保护，例如 `m_*` 意味着 `XXX.m_id` 与 `XXX.m_type` 是受保护的字段，只能在定义所在的类极其子类中访问。'
 config.doc.packageName                   =
 '将特定名称的字段视为package，例如 `m_*` 意味着 `XXX.m_id` 与 `XXX.m_type` 只能在定义所在的文件中访问。'
+config.doc.regengine                     =
+'用于匹配文档作用域名称的正则表达式引擎。'
+config.doc.regengine.glob                =
+'默认轻量级模式语法。'
+config.doc.regengine.lua                 =
+'完整的 Lua 风格正则表达式。'
+config.docScriptPath                     =
+'自定义 Lua 脚本路径，覆盖默认文档生成行为。'
 config.diagnostics['unused-local']          =
 '未使用的局部变量'
 config.diagnostics['unused-function']       =

locale/zh-cn/setting.lua

@@ -279,7 +279,10 @@ config.format.defaultConfig              =
 config.spell.dict                        =
 '拼寫檢查的自訂單詞。'
 config.nameStyle.config                  = -- TODO: need translate!
-'Set name style config'
+[[
+Set name style config.
+Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs) to learn usage.
+]]
 config.telemetry.enable                  =
 [[
 啟用遙測，透過網路發送你的編輯器資訊與錯誤日誌。在[此處](https://luals.github.io/privacy/#language-server)閱讀我們的隱私聲明。
@@ -316,12 +319,22 @@ config.type.checkTableShape              = -- TODO: need translate!
 [[
 对表的形状进行严格检查。
 ]]
+config.type.inferTableSize               = -- TODO: need translate!
+'Maximum number of table fields analyzed during type inference.'
 config.doc.privateName                   = -- TODO: need translate!
 '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.'
 config.doc.protectedName                 = -- TODO: need translate!
 '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.'
 config.doc.packageName                   = -- TODO: need translate!
 '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.'
+config.doc.regengine                     = -- TODO: need translate!
+'The regular expression engine used for matching documentation scope names.'
+config.doc.regengine.glob                = -- TODO: need translate!
+'The default lightweight pattern syntax.'
+config.doc.regengine.lua                 = -- TODO: need translate!
+'Full Lua-style regular expressions.'
+config.docScriptPath                     = -- TODO: need translate!
+'The regular expression engine used for matching documentation scope names.'
 config.diagnostics['unused-local']          =
 '未使用的區域變數'
 config.diagnostics['unused-function']       =

locale/zh-tw/setting.lua

@@ -2,15 +2,21 @@ local files = require "files"
 local guide = require "parser.guide"
 
 local colorPattern = string.rep('%x', 8)
+local hex6Pattern = string.format("^#%s", string.rep('%x', 6))
 ---@param source parser.object
 ---@return boolean
 local function isColor(source)
     ---@type string
     local text = source[1]
-    if text:len() ~= 8 then
-        return false
+    if text:len() == 8 then
+        return text:match(colorPattern)
     end
-    return text:match(colorPattern)
+
+    if text:len() == 7 then
+        return text:match(hex6Pattern)
+    end
+
+    return false
 end
 
 
@@ -25,6 +31,16 @@ local function textToColor(colorText)
     }
 end
 
+---@param colorText string
+---@return Color
+local function hexTextToColor(colorText)
+    return {
+        alpha = 255,
+        red   = tonumber(colorText:sub(2, 3), 16) / 255,
+        green = tonumber(colorText:sub(4, 5), 16) / 255,
+        blue  = tonumber(colorText:sub(6, 7), 16) / 255,
+    }
+end
 
 ---@param color Color
 ---@return string
@@ -63,10 +79,12 @@ local function colors(uri)
             ---@type string
             local colorText = source[1]
 
+            local color = colorText:match(colorPattern) and textToColor(colorText) or hexTextToColor(colorText)
+
             colorValues[#colorValues+1] = {
                 start  = source.start + 1,
                 finish = source.finish - 1,
-                color  = textToColor(colorText)
+                color  = color
             }
         end
     end)