diff --git a/package.json b/package.json index 3f61ad614a7c2011ef4a73288aa6c8ef40ee61f8..575d4b23fe79efa592b847a37e2d9db7cf91cad9 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "configuration": { "properties": { "Lua.awakened.cat": { - "default": false, + "default": true, "markdownDescription": "%config.awakened.cat%", "scope": "resource", "type": "boolean" @@ -137,9 +137,21 @@ "scope": "resource", "type": "string" }, - "duplicate-index": { + "circle-doc-class": { "default": "Warning", - "description": "%config.diagnostics.duplicate-index%", + "description": "%config.diagnostics.circle-doc-class%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "doc-field-no-class": { + "default": "Warning", + "description": "%config.diagnostics.doc-field-no-class%", "enum": [ "Error", "Warning", @@ -149,9 +161,9 @@ "scope": "resource", "type": "string" }, - "duplicate-method": { + "duplicate-doc-class": { "default": "Warning", - "description": "%config.diagnostics.duplicate-method%", + "description": "%config.diagnostics.duplicate-doc-class%", "enum": [ "Error", "Warning", @@ -161,9 +173,33 @@ "scope": "resource", "type": "string" }, - "emmy-lua": { + "duplicate-doc-field": { "default": "Warning", - "description": "%config.diagnostics.emmy-lua%", + "description": "%config.diagnostics.duplicate-doc-field%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "duplicate-doc-param": { + "default": "Warning", + "description": "%config.diagnostics.duplicate-doc-param%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "duplicate-index": { + "default": "Warning", + "description": "%config.diagnostics.duplicate-index%", "enum": [ "Error", "Warning", @@ -269,9 +305,9 @@ "scope": "resource", "type": "string" }, - "set-const": { - "default": "Error", - "description": "%config.diagnostics.set-const%", + "trailing-space": { + "default": "Hint", + "description": "%config.diagnostics.trailing-space%", "enum": [ "Error", "Warning", @@ -281,9 +317,9 @@ "scope": "resource", "type": "string" }, - "set-for-state": { + "undefined-doc-class": { "default": "Warning", - "description": "%config.diagnostics.set-for-state%", + "description": "%config.diagnostics.undefined-doc-class%", "enum": [ "Error", "Warning", @@ -293,9 +329,21 @@ "scope": "resource", "type": "string" }, - "trailing-space": { - "default": "Hint", - "description": "%config.diagnostics.trailing-space%", + "undefined-doc-name": { + "default": "Warning", + "description": "%config.diagnostics.undefined-doc-name%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "undefined-doc-param": { + "default": "Warning", + "description": "%config.diagnostics.undefined-doc-param%", "enum": [ "Error", "Warning", @@ -591,5 +639,5 @@ "type": "git", "url": "https://github.com/sumneko/lua-language-server" }, - "version": "0.21.12" + "version": "1.0.0" } diff --git a/package/build.lua b/package/build.lua index 495a7d104f9c19471bb354c20c6682bd69cfb206..0d869354b2c7b2b756de2248c70111e8c3f01046 100644 --- a/package/build.lua +++ b/package/build.lua @@ -1,8 +1,9 @@ local json = require 'json-beautify' -local VERSION = "0.21.12" +local VERSION = "1.0.0" local package = require 'package.package' +local fsu = require 'fs-utility' package.version = VERSION package.__metadata = { @@ -16,10 +17,10 @@ local encodeOption = { indent = ' ', } print('生成 package.json') -io.save(ROOT / 'package.json', json.beautify(package, encodeOption) .. '\r\n') +fsu.saveFile(ROOT / 'package.json', json.beautify(package, encodeOption) .. '\r\n') print('生成 package.nls.json') -io.save(ROOT / 'package.nls.json', json.beautify(require 'package.nls', encodeOption)) +fsu.saveFile(ROOT / 'package.nls.json', json.beautify(require 'package.nls', encodeOption)) print('生成 package.nls.zh-cn.json') -io.save(ROOT / 'package.nls.zh-cn.json', json.beautify(require 'package.nls-zh-cn', encodeOption)) +fsu.saveFile(ROOT / 'package.nls.zh-cn.json', json.beautify(require 'package.nls-zh-cn', encodeOption)) diff --git a/publish.lua b/publish.lua index 52f4855b8126abfaa742e8b90cc07d16687e99b4..5db3bbe0ff0f838f8940f9ac629a6dfe20203e07 100644 --- a/publish.lua +++ b/publish.lua @@ -5,12 +5,11 @@ if rootPath == '' then end loadfile(rootPath .. 'server/platform.lua')('script-beta') require 'bee' -local fs = require 'bee.filesystem' +local fs = require 'bee.filesystem' local subprocess = require 'bee.subprocess' -local platform = require 'bee.platform' -local thread = require 'bee.thread' - -require 'utility' +local platform = require 'bee.platform' +local thread = require 'bee.thread' +local fsu = require 'fs-utility' --dofile(rootPath .. 'server/test.lua') package.path = package.path @@ -21,7 +20,7 @@ dofile(rootPath .. 'setting/build.lua') local json = require 'json' local function loadPackage() - local buf = io.load(ROOT / 'package.json') + local buf = fsu.loadFile(ROOT / 'package.json') if not buf then error(ROOT:string()) end diff --git a/setting/build.lua b/setting/build.lua index 0525eea133604986e00f11941af1350fe72c5796..b6fea703ae5362c2022c2c23f1daaec34f7e4435 100644 --- a/setting/build.lua +++ b/setting/build.lua @@ -1,8 +1,8 @@ local fs = require 'bee.filesystem' -require 'utility' local json = require 'json-beautify' local configuration = require 'package.configuration' +local fsu = require 'fs-utility' local function copyWithNLS(t, callback) local nt = {} @@ -35,5 +35,5 @@ for _, lang in ipairs {'', '-zh-cn'} do end), } - io.save(fs.path'setting/schema'..lang..'.json', json.beautify(setting, encodeOption)) + fsu.saveFile(fs.path'setting/schema'..lang..'.json', json.beautify(setting, encodeOption)) end diff --git a/setting/schema-zh-cn.json b/setting/schema-zh-cn.json index fe2bba457b42afe33e8e111f0f4246feaa60f26f..1951b28ad2aea5c603dc5dd64e6bb66d040c3fcf 100644 --- a/setting/schema-zh-cn.json +++ b/setting/schema-zh-cn.json @@ -3,7 +3,7 @@ "description": "Setting of sumneko.lua", "properties": { "Lua.awakened.cat": { - "default": false, + "default": true, "markdownDescription": "PLAY WITH ME >_<\n\n(这会启用还处于开发中的beta版,欢迎测试反馈!改变此选项需要重载窗口!)", "scope": "resource", "type": "boolean" @@ -121,9 +121,21 @@ "scope": "resource", "type": "string" }, - "duplicate-index": { + "circle-doc-class": { "default": "Warning", - "description": "%config.diagnostics.duplicate-index%", + "description": "%config.diagnostics.circle-doc-class%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "doc-field-no-class": { + "default": "Warning", + "description": "%config.diagnostics.doc-field-no-class%", "enum": [ "Error", "Warning", @@ -133,9 +145,9 @@ "scope": "resource", "type": "string" }, - "duplicate-method": { + "duplicate-doc-class": { "default": "Warning", - "description": "%config.diagnostics.duplicate-method%", + "description": "%config.diagnostics.duplicate-doc-class%", "enum": [ "Error", "Warning", @@ -145,9 +157,33 @@ "scope": "resource", "type": "string" }, - "emmy-lua": { + "duplicate-doc-field": { "default": "Warning", - "description": "%config.diagnostics.emmy-lua%", + "description": "%config.diagnostics.duplicate-doc-field%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "duplicate-doc-param": { + "default": "Warning", + "description": "%config.diagnostics.duplicate-doc-param%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "duplicate-index": { + "default": "Warning", + "description": "%config.diagnostics.duplicate-index%", "enum": [ "Error", "Warning", @@ -253,9 +289,9 @@ "scope": "resource", "type": "string" }, - "set-const": { - "default": "Error", - "description": "%config.diagnostics.set-const%", + "trailing-space": { + "default": "Hint", + "description": "%config.diagnostics.trailing-space%", "enum": [ "Error", "Warning", @@ -265,9 +301,9 @@ "scope": "resource", "type": "string" }, - "set-for-state": { + "undefined-doc-class": { "default": "Warning", - "description": "%config.diagnostics.set-for-state%", + "description": "%config.diagnostics.undefined-doc-class%", "enum": [ "Error", "Warning", @@ -277,9 +313,21 @@ "scope": "resource", "type": "string" }, - "trailing-space": { - "default": "Hint", - "description": "%config.diagnostics.trailing-space%", + "undefined-doc-name": { + "default": "Warning", + "description": "%config.diagnostics.undefined-doc-name%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "undefined-doc-param": { + "default": "Warning", + "description": "%config.diagnostics.undefined-doc-param%", "enum": [ "Error", "Warning", diff --git a/setting/schema.json b/setting/schema.json index 4d88c3f040f39486fd6ff5436181b8ebfbfbf94a..b3ffc0644471c316f6b5d55f776b53a953460619 100644 --- a/setting/schema.json +++ b/setting/schema.json @@ -3,7 +3,7 @@ "description": "Setting of sumneko.lua", "properties": { "Lua.awakened.cat": { - "default": false, + "default": true, "markdownDescription": "PLAY WITH ME >_<\n\n(This will enable the beta version which is still in development. Feedback is welcome! Reload the window after changing this option!)", "scope": "resource", "type": "boolean" @@ -121,9 +121,21 @@ "scope": "resource", "type": "string" }, - "duplicate-index": { + "circle-doc-class": { "default": "Warning", - "description": "%config.diagnostics.duplicate-index%", + "description": "%config.diagnostics.circle-doc-class%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "doc-field-no-class": { + "default": "Warning", + "description": "%config.diagnostics.doc-field-no-class%", "enum": [ "Error", "Warning", @@ -133,9 +145,9 @@ "scope": "resource", "type": "string" }, - "duplicate-method": { + "duplicate-doc-class": { "default": "Warning", - "description": "%config.diagnostics.duplicate-method%", + "description": "%config.diagnostics.duplicate-doc-class%", "enum": [ "Error", "Warning", @@ -145,9 +157,33 @@ "scope": "resource", "type": "string" }, - "emmy-lua": { + "duplicate-doc-field": { "default": "Warning", - "description": "%config.diagnostics.emmy-lua%", + "description": "%config.diagnostics.duplicate-doc-field%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "duplicate-doc-param": { + "default": "Warning", + "description": "%config.diagnostics.duplicate-doc-param%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "duplicate-index": { + "default": "Warning", + "description": "%config.diagnostics.duplicate-index%", "enum": [ "Error", "Warning", @@ -253,9 +289,9 @@ "scope": "resource", "type": "string" }, - "set-const": { - "default": "Error", - "description": "%config.diagnostics.set-const%", + "trailing-space": { + "default": "Hint", + "description": "%config.diagnostics.trailing-space%", "enum": [ "Error", "Warning", @@ -265,9 +301,9 @@ "scope": "resource", "type": "string" }, - "set-for-state": { + "undefined-doc-class": { "default": "Warning", - "description": "%config.diagnostics.set-for-state%", + "description": "%config.diagnostics.undefined-doc-class%", "enum": [ "Error", "Warning", @@ -277,9 +313,21 @@ "scope": "resource", "type": "string" }, - "trailing-space": { - "default": "Hint", - "description": "%config.diagnostics.trailing-space%", + "undefined-doc-name": { + "default": "Warning", + "description": "%config.diagnostics.undefined-doc-name%", + "enum": [ + "Error", + "Warning", + "Information", + "Hint" + ], + "scope": "resource", + "type": "string" + }, + "undefined-doc-param": { + "default": "Warning", + "description": "%config.diagnostics.undefined-doc-param%", "enum": [ "Error", "Warning",