Ar/typecheckfix

.vscode/launch.json

@@ -8,10 +8,11 @@
 			"request": "launch",
 			"stopOnEntry": false,
 			"program": "${workspaceRoot}/test.lua",
-			"cpath": "${workspaceFolder}/bin/Windows/?.dll",
+			"luaexe": "${workspaceFolder}/bin/Windows/lua-language-server.exe",
+			"cpath": null,
 			"arg": [
 			],
-			"luaVersion": "latest",
+			"luaVersion": "5.4",
 			"consoleCoding": "utf8",
 			"sourceCoding": "utf8",
 			"outputCapture": [

changelog.md

@@ -1,6 +1,14 @@
 # changelog
 
+## 2.4.1
+`2021-10-2`
+* `FIX` broken with single file
+* `FIX` [#698](https://github.com/sumneko/lua-language-server/issues/698)
+* `FIX` [#699](https://github.com/sumneko/lua-language-server/issues/699)
+
 ## 2.4.0
+`2021-10-1`
+* `NEW` loading settings from `.luarc.json`
 * `NEW` settings:
   + `Lua.diagnostics.libraryFiles`
   + `Lua.diagnostics.ignoredFiles`
@@ -33,6 +41,7 @@
     ---@module 'mylib'
     local lib -- the same as `local lib = require 'mylib'`
     ```
+* `NEW` add supports of `skynet`
 * `CHG` hover: improve showing multi defines
 * `CHG` hover: improve showing multi comments at enums
 * `CHG` hover: shows method

locale/en-us/script.lua

@@ -254,3 +254,14 @@ An error occurred in the plugin, please report it to the plugin author.
 Please check the details in the output or log.
 Plugin path: {}
 ]]
+PLUGIN_TRUST_LOAD                = [[
+The current settings try to load the plugin at this location:{}
+
+Note that malicious plugin may harm your computer
+]]
+PLUGIN_TRUST_YES                 = [[
+Trust and load this plugin
+]]
+PLUGIN_TRUST_NO                  = [[
+Don't load this plugin
+]]

locale/zh-cn/script.lua

@@ -253,3 +253,14 @@ PLUGIN_RUNTIME_ERROR             = [[
 请在输出或日志中查看详细信息。
 插件路径：{}
 ]]
+PLUGIN_TRUST_LOAD                = [[
+当前设置试图加载位于此位置的插件：{}
+
+注意，恶意的插件可能会危害您的电脑
+]]
+PLUGIN_TRUST_YES                 = [[
+信任并加载插件
+]]
+PLUGIN_TRUST_NO                  = [[
+不要加载此插件
+]]

make.lua

@@ -1,6 +1,12 @@
 local lm       = require 'luamake'
+local platform = require 'bee.platform'
+local fs       = require 'bee.filesystem'
+local exe      = platform.OS == 'Windows' and ".exe" or ""
 
-lm.EXE = "lua"
+lm.bindir = "bin/"..platform.OS
+
+lm.EXE_NAME = "lua-language-server"
+lm.EXE_DIR = lm.bindir
 lm.EXE_RESOURCE = "../../make/lua-language-server.rc"
 lm:import "3rd/bee.lua/make.lua"
 
@@ -14,23 +20,37 @@ lm:lua_dll 'lpeglabel' {
 }
 
 lm:build 'install' {
-    '$luamake', 'lua', 'make/install.lua', lm.builddir,
+    '$luamake', 'lua', 'make/install.lua',
+}
+
+lm:copy "copy_bootstrap" {
+    input = "make/bootstrap.lua",
+    output = lm.bindir.."/main.lua",
+}
+
+lm:build "bee-test" {
+    lm.bindir.."/"..lm.EXE_NAME..exe, "3rd/bee.lua/test/test.lua",
+    pool = "console",
     deps = {
-        'lua',
-        'lpeglabel',
-        'bee',
-    }
+        lm.EXE_NAME,
+        "copy_bootstrap"
+    },
 }
 
-local fs = require 'bee.filesystem'
-local pf = require 'bee.platform'
-local exe = pf.OS == 'Windows' and ".exe" or ""
-lm:build 'unittest' {
-    fs.path 'bin' / pf.OS / ('lua-language-server' .. exe), 'test.lua', '-E',
+lm:build 'unit-test' {
+    lm.bindir.."/"..lm.EXE_NAME..exe, 'test.lua',
     pool = "console",
     deps = {
-        'install',
+        "bee-test",
+        "lpeglabel",
+    },
+    windows = {
+        deps = "lua54"
     }
 }
 
-lm:default 'unittest'
+lm:default {
+    "bee-test",
+    "unit-test",
+    "install",
+}

make/bootstrap.lua

@@ -0,0 +1,38 @@
+local i = 1
+while true do
+    if arg[i] == '-E' then
+    elseif arg[i] == '-e' then
+        i = i + 1
+        local expr = assert(arg[i], "'-e' needs argument")
+        assert(load(expr, "=(command line)"))()
+    else
+        break
+    end
+    i = i + 1
+end
+
+if arg[i] == nil then
+    return
+end
+
+for j = -1, #arg do
+    arg[j - i] = arg[j]
+end
+for j = #arg - i + 1, #arg do
+    arg[j] = nil
+end
+
+local root; do
+    local sep = package.config:sub(1,1)
+    local pattern = "["..sep.."][^"..sep.."]+"
+    root = package.cpath:match("(.+)"..pattern..pattern..pattern.."$")
+end
+
+local fs = require "bee.filesystem"
+fs.current_path(fs.path(root))
+
+package.path = table.concat({
+    root .. "/script/?.lua",
+    root .. "/script/?/init.lua",
+}, ";")
+assert(loadfile(arg[0]))(table.unpack(arg))

make/install.lua

@@ -1,20 +1,8 @@
-local builddir = ...
 local fs = require 'bee.filesystem'
 local pf = require 'bee.platform'
-
 local CWD = fs.current_path()
 local output = CWD / 'bin' / pf.OS
-local bindir = CWD / builddir / 'bin'
-local exe = pf.OS == 'Windows' and ".exe" or ""
-local dll = pf.OS == 'Windows' and ".dll" or ".so"
-local OVERWRITE = fs.copy_options.overwrite_existing
-
-fs.create_directories(output)
-fs.copy_file(bindir / 'lpeglabel'..dll, output / 'lpeglabel'..dll, OVERWRITE)
-fs.copy_file(bindir / 'bee'..dll,       output / 'bee'..dll, OVERWRITE)
-fs.copy_file(bindir / 'lua'..exe,       output / 'lua-language-server'..exe, OVERWRITE)
 
 if pf.OS == 'Windows' then
-    fs.copy_file(bindir / 'lua54'..dll, output / 'lua54'..dll, OVERWRITE)
     require 'msvc'.copy_vcrt('x64', output)
 end

meta/3rd/skynet/config.lua

@@ -0,0 +1 @@
+words = { "skynet.start" }