Merge branch 'LuaLS:master' into addon-manager

Author: carsakiller

changelog.md

@@ -1,5 +1,20 @@
 # changelog
 
+## 3.6.11
+`2023-2-13`
+* `CHG` completion: don't show loading process
+* `FIX` [#1886]
+* `FIX` [#1887]
+* `FIX` [#1889]
+* `FIX` [#1895]
+* `FIX` [#1902]
+
+[#1886]: https://github.com/LuaLS/lua-language-server/issues/1886
+[#1887]: https://github.com/LuaLS/lua-language-server/issues/1887
+[#1889]: https://github.com/LuaLS/lua-language-server/issues/1889
+[#1895]: https://github.com/LuaLS/lua-language-server/issues/1895
+[#1902]: https://github.com/LuaLS/lua-language-server/issues/1902
+
 ## 3.6.10
 `2023-2-7`
 * `FIX` [#1869]

client/3rd/vscode-lua-doc

@@ -2686,7 +2686,8 @@
 								"xpcall",
 								"assert",
 								"error",
-								"type"
+								"type",
+								"os.exit"
 							],
 							"type": "string"
 						}
@@ -3058,5 +3059,5 @@
 	"sponsor": {
 		"url": "https://github.com/LuaLS/lua-language-server/issues/484"
 	},
-	"version": "3.6.10"
+	"version": "3.6.11"
 }

package.json

@@ -1,6 +1,6 @@
 local json = require 'json-beautify'
 
-local VERSION = "3.6.10"
+local VERSION = "3.6.11"
 
 local package = require 'package.package'
 local fsu     = require 'fs-utility'

package/build.lua

@@ -2857,7 +2857,8 @@
                         "xpcall",
                         "assert",
                         "error",
-                        "type"
+                        "type",
+                        "os.exit"
                     ],
                     "type": "string"
                 }

server

@@ -2857,7 +2857,8 @@
                         "xpcall",
                         "assert",
                         "error",
-                        "type"
+                        "type",
+                        "os.exit"
                     ],
                     "type": "string"
                 }

setting/schema-pt-br.json

@@ -2857,7 +2857,8 @@
                         "xpcall",
                         "assert",
                         "error",
-                        "type"
+                        "type",
+                        "os.exit"
                     ],
                     "type": "string"
                 }

setting/schema-zh-cn.json

@@ -2857,7 +2857,8 @@
                         "xpcall",
                         "assert",
                         "error",
-                        "type"
+                        "type",
+                        "os.exit"
                     ],
                     "type": "string"
                 }