Skip to content

Commit 0127578

Browse files
authored
Merge branch 'LuaLS:master' into addon-manager
2 parents ff01e62 + 9297d5f commit 0127578

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,7 +2244,7 @@
22442244
},
22452245
"Lua.format.defaultConfig": {
22462246
"additionalProperties": false,
2247-
"default": [],
2247+
"default": {},
22482248
"markdownDescription": "%config.format.defaultConfig%",
22492249
"patternProperties": {
22502250
".*": {
@@ -2669,7 +2669,7 @@
26692669
},
26702670
"Lua.runtime.special": {
26712671
"additionalProperties": false,
2672-
"default": [],
2672+
"default": {},
26732673
"markdownDescription": "%config.runtime.special%",
26742674
"patternProperties": {
26752675
".*": {

setting/schema-pt-br.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2318,7 +2318,7 @@
23182318
},
23192319
"format.defaultConfig": {
23202320
"additionalProperties": false,
2321-
"default": [],
2321+
"default": {},
23222322
"markdownDescription": "The default format configuration. Has a lower priority than `.editorconfig` file in the workspace.\nRead [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs) to learn usage.\n",
23232323
"patternProperties": {
23242324
".*": {
@@ -2840,7 +2840,7 @@
28402840
},
28412841
"runtime.special": {
28422842
"additionalProperties": false,
2843-
"default": [],
2843+
"default": {},
28442844
"markdownDescription": "The custom global variables are regarded as some special built-in variables, and the language server will provide special support\nThe following example shows that 'include' is treated as' require '.\n```json\n\"Lua.runtime.special\" : {\n \"include\" : \"require\"\n}\n```\n",
28452845
"patternProperties": {
28462846
".*": {

setting/schema-zh-cn.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2318,7 +2318,7 @@
23182318
},
23192319
"format.defaultConfig": {
23202320
"additionalProperties": false,
2321-
"default": [],
2321+
"default": {},
23222322
"markdownDescription": "默认的格式化配置,优先级低于工作区内的 `.editorconfig` 文件。\n请查阅[格式化文档](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs)了解用法。\n",
23232323
"patternProperties": {
23242324
".*": {
@@ -2840,7 +2840,7 @@
28402840
},
28412841
"runtime.special": {
28422842
"additionalProperties": false,
2843-
"default": [],
2843+
"default": {},
28442844
"markdownDescription": "将自定义全局变量视为一些特殊的内置变量,语言服务将提供特殊的支持。\n下面这个例子表示将 `include` 视为 `require` 。\n```json\n\"Lua.runtime.special\" : {\n \"include\" : \"require\"\n}\n```\n",
28452845
"patternProperties": {
28462846
".*": {

setting/schema-zh-tw.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2318,7 +2318,7 @@
23182318
},
23192319
"format.defaultConfig": {
23202320
"additionalProperties": false,
2321-
"default": [],
2321+
"default": {},
23222322
"markdownDescription": "預設的格式化組態,優先順序低於工作區內的 `.editorconfig` 檔案。\n請查閱[格式化文件](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs)了解用法。\n",
23232323
"patternProperties": {
23242324
".*": {
@@ -2840,7 +2840,7 @@
28402840
},
28412841
"runtime.special": {
28422842
"additionalProperties": false,
2843-
"default": [],
2843+
"default": {},
28442844
"markdownDescription": "將自訂全域變數視為一些特殊的內建變數,語言伺服將提供特殊的支援。\n下面這個例子表示將 `include` 視為 `require` 。\n```json\n\"Lua.runtime.special\" : {\n \"include\" : \"require\"\n}\n```\n",
28452845
"patternProperties": {
28462846
".*": {

setting/schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2318,7 +2318,7 @@
23182318
},
23192319
"format.defaultConfig": {
23202320
"additionalProperties": false,
2321-
"default": [],
2321+
"default": {},
23222322
"markdownDescription": "The default format configuration. Has a lower priority than `.editorconfig` file in the workspace.\nRead [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs) to learn usage.\n",
23232323
"patternProperties": {
23242324
".*": {
@@ -2840,7 +2840,7 @@
28402840
},
28412841
"runtime.special": {
28422842
"additionalProperties": false,
2843-
"default": [],
2843+
"default": {},
28442844
"markdownDescription": "The custom global variables are regarded as some special built-in variables, and the language server will provide special support\nThe following example shows that 'include' is treated as' require '.\n```json\n\"Lua.runtime.special\" : {\n \"include\" : \"require\"\n}\n```\n",
28452845
"patternProperties": {
28462846
".*": {

0 commit comments

Comments
 (0)