Merge branch 'LuaLS:master' into master

Author: CppCXY

3rd/bee.lua

@@ -1,9 +1,16 @@
 # changelog
 
 ## 3.6.11
+* `CHG` completion: don't show loading process
 * `FIX` [#1886]
+* `FIX` [#1887]
+* `FIX` [#1889]
+* `FIX` [#1895]
 
 [#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
 
 ## 3.6.10
 `2023-2-7`

changelog.md

@@ -376,24 +376,30 @@ local function tryModifySpecifiedConfig(uri, finalChanges)
     if #finalChanges == 0 then
         return false
     end
+    log.info('tryModifySpecifiedConfig', uri, inspect(finalChanges))
     local workspace = require 'workspace'
     local scp = scope.getScope(uri)
     if scp:get('lastLocalType') ~= 'json' then
+        log.info('lastLocalType ~= json')
         return false
     end
     local validChanges = getValidChanges(uri, finalChanges)
     if #validChanges == 0 then
+        log.info('No valid changes')
         return false
     end
     local path = workspace.getAbsolutePath(uri, CONFIGPATH)
     if not path then
+        log.info('Can not get absolute path')
         return false
     end
     local newJson = editConfigJson(uri, path, validChanges)
     if not newJson then
+        log.info('Can not edit config json')
         return false
     end
     util.saveFile(path, newJson)
+    log.info('Apply changes to config file', inspect(validChanges))
     removeAppliedChanges(finalChanges, validChanges)
     return true
 end
@@ -402,31 +408,38 @@ local function tryModifyRC(uri, finalChanges, create)
     if #finalChanges == 0 then
         return false
     end
+    log.info('tryModifyRC', uri, inspect(finalChanges))
     local workspace = require 'workspace'
     local path = workspace.getAbsolutePath(uri, '.luarc.jsonc')
     if not path then
+        log.info('Can not get absolute path of .luarc.jsonc')
         return false
     end
     path = fs.exists(fs.path(path)) and path or workspace.getAbsolutePath(uri, '.luarc.json')
     if not path then
+        log.info('Can not get absolute path of .luarc.json')
         return false
     end
     local buf = util.loadFile(path)
     if not buf and not create then
+        log.info('Can not load .luarc.json and not create')
         return false
     end
     local validChanges = getValidChanges(uri, finalChanges)
     if #validChanges == 0 then
+        log.info('No valid changes')
         return false
     end
     if not buf then
         util.saveFile(path, '')
     end
     local newJson = editConfigJson(uri, path, validChanges)
     if not newJson then
+        log.info('Can not edit config json')
         return false
     end
     util.saveFile(path, newJson)
+    log.info('Apply changes to .luarc.json', inspect(validChanges))
     removeAppliedChanges(finalChanges, validChanges)
     return true
 end
@@ -435,6 +448,7 @@ local function tryModifyClient(uri, finalChanges)
     if #finalChanges == 0 then
         return false
     end
+    log.info('tryModifyClient', uri, inspect(finalChanges))
     if not m.getOption 'changeConfiguration' then
         return false
     end
@@ -447,12 +461,14 @@ local function tryModifyClient(uri, finalChanges)
         end
     end
     if #scpChanges == 0 then
+        log.info('No changes in client scope')
         return false
     end
     proto.notify('$/command', {
         command   = 'lua.config',
         data      = scpChanges,
     })
+    log.info('Apply client changes', uri, inspect(scpChanges))
     removeAppliedChanges(finalChanges, scpChanges)
     return true
 end
@@ -462,7 +478,9 @@ local function tryModifyClientGlobal(finalChanges)
     if #finalChanges == 0 then
         return
     end
+    log.info('tryModifyClientGlobal', inspect(finalChanges))
     if not m.getOption 'changeConfiguration' then
+        log.info('Client dose not support modifying config')
         return
     end
     local changes = {}
@@ -471,10 +489,15 @@ local function tryModifyClientGlobal(finalChanges)
             changes[#changes+1] = change
         end
     end
+    if #changes == 0 then
+        log.info('No global changes')
+        return
+    end
     proto.notify('$/command', {
         command   = 'lua.config',
         data      = changes,
     })
+    log.info('Apply client global changes', inspect(changes))
     removeAppliedChanges(finalChanges, changes)
 end
 
@@ -522,6 +545,7 @@ function m.setConfig(changes, onlyMemory)
     if #finalChanges == 0 then
         return
     end
+    log.info('Modify config', inspect(finalChanges))
     xpcall(function ()
         local ws = require 'workspace'
         tryModifyClientGlobal(finalChanges)
@@ -541,6 +565,7 @@ function m.setConfig(changes, onlyMemory)
             end
             if #finalChanges > 0 then
                 m.showMessage('Warning', lang.script('CONFIG_MODIFY_FAIL', buildMaunuallyMessage(finalChanges)))
+                log.warn('Config modify fail', inspect(finalChanges))
             end
         end
     end, log.error)

script/client.lua

@@ -210,6 +210,7 @@ local template = {
                                                     'assert',
                                                     'error',
                                                     'type',
+                                                    'os.exit',
                                                 }
                                             ),
     ['Lua.runtime.meta']                    = Type.String >> '${version} ${language} ${encoding}',

script/config/template.lua

@@ -7,7 +7,7 @@ local await  = require 'await'
 ---@param block parser.object
 ---@return boolean
 local function hasReturn(block)
-    if block.hasReturn or block.hasError then
+    if block.hasReturn or block.hasExit then
         return true
     end
     if block.type == 'if' then

script/core/diagnostics/missing-return.lua

@@ -23,7 +23,7 @@ end
 ---@param block parser.object
 ---@return boolean
 local function hasReturn(block)
-    if block.hasReturn or block.hasError then
+    if block.hasReturn or block.hasExit then
         return true
     end
     if block.type == 'if' then

script/core/diagnostics/unreachable-code.lua

@@ -118,6 +118,7 @@ local Specials = {
     ['assert']       = true,
     ['error']        = true,
     ['type']         = true,
+    ['os.exit']      = true,
 }
 
 local UnarySymbol = {
@@ -1379,12 +1380,24 @@ local function parseNumber()
     return result
 end
 
-local function isKeyWord(word)
+local function isKeyWord(word, nextToken)
     if KeyWord[word] then
         return true
     end
     if word == 'goto' then
-        return State.version ~= 'Lua 5.1'
+        if State.version == 'Lua 5.1' then
+            return false
+        end
+        if State.version == 'LuaJIT' then
+            if not nextToken then
+                return false
+            end
+            if CharMapWord[ssub(nextToken, 1, 1)] then
+                return true
+            end
+            return false
+        end
+        return true
     end
     return false
 end
@@ -1410,7 +1423,7 @@ local function parseName(asAction)
             finish = finishPos,
         }
     end
-    if isKeyWord(word) then
+    if isKeyWord(word, Tokens[Index + 1]) then
         pushError {
             type   = 'KEYWORD',
             start  = startPos,
@@ -1491,7 +1504,7 @@ local function parseExpList(mini)
                     break
                 end
                 local nextToken = peekWord()
-                if  isKeyWord(nextToken)
+                if  isKeyWord(nextToken, Tokens[Index + 2])
                 and nextToken ~= 'function'
                 and nextToken ~= 'true'
                 and nextToken ~= 'false'
@@ -2223,7 +2236,7 @@ local function parseParams(params)
                     finish = getPosition(Tokens[Index] + #token - 1, 'right'),
                 }
             end
-            if isKeyWord(token) then
+            if isKeyWord(token, Tokens[Index + 3]) then
                 pushError {
                     type   = 'KEYWORD',
                     start  = getPosition(Tokens[Index], 'left'),
@@ -2887,14 +2900,15 @@ local function compileExpAsAction(exp)
     end
 
     if exp.type == 'call' then
-        if exp.node.special == 'error' then
+        if exp.node.special == 'error'
+        or exp.node.special == 'os.exit' then
             for i = #Chunk, 1, -1 do
                 local block = Chunk[i]
                 if block.type == 'ifblock'
                 or block.type == 'elseifblock'
                 or block.type == 'elseblock'
                 or block.type == 'function' then
-                    block.hasError = true
+                    block.hasExit = true
                     break
                 end
             end
@@ -3785,7 +3799,7 @@ function parseAction()
         return parseRepeat()
     end
 
-    if token == 'goto' and isKeyWord 'goto' then
+    if token == 'goto' and isKeyWord('goto', Tokens[Index + 3]) then
         return parseGoTo()
     end
 

script/parser/compile.lua

@@ -72,7 +72,7 @@ local type         = type
 ---@field hasGoTo?              true
 ---@field hasReturn?            true
 ---@field hasBreak?             true
----@field hasError?             true
+---@field hasExit?              true
 ---@field [integer]             parser.object|any
 ---@field package _root          parser.object
 

script/parser/guide.lua

@@ -597,19 +597,7 @@ m.register 'textDocument/completion' {
     function (params)
         local uri  = files.getRealUri(params.textDocument.uri)
         if not workspace.isReady(uri) then
-            local count, max = workspace.getLoadingProcess(uri)
-            return {
-                {
-                    label = lang.script('HOVER_WS_LOADING', count, max),
-                    textEdit    = {
-                        range   = {
-                            start   = params.position,
-                            ['end'] = params.position,
-                        },
-                        newText = '',
-                    },
-                }
-            }
+            return nil
         end
         local _ <close> = progress.create(uri, lang.script.WINDOW_PROCESSING_COMPLETION, 0.5)
         --log.info(util.dump(params))

script/provider/provider.lua

@@ -282,6 +282,10 @@ local lookIntoChild = util.switch()
     ---@param topNode  vm.node
     ---@param outNode? vm.node
     : call(function (tracer, action, topNode, outNode)
+        if action.type == 'loop' then
+            tracer:lookIntoChild(action.init, topNode)
+            tracer:lookIntoChild(action.max, topNode)
+        end
         if action[1] then
             tracer:lookIntoBlock(action, action.bstart, topNode:copy())
             local lastAssign = tracer:getLastAssign(action.start, action.finish)
@@ -369,7 +373,7 @@ local lookIntoChild = util.switch()
                 local neverReturn = subBlock.hasReturn
                                 or  subBlock.hasGoTo
                                 or  subBlock.hasBreak
-                                or  subBlock.hasError
+                                or  subBlock.hasExit
                 if neverReturn then
                     mergedNode = true
                 else

script/vm/tracer.lua

@@ -2620,6 +2620,17 @@ end
 print(<?n?>)
 ]]
 
+TEST 'integer' [[
+---@type integer?
+local n
+
+if not n then
+    os.exit()
+end
+
+print(<?n?>)
+]]
+
 TEST 'table' [[
 ---@type table?
 local n
@@ -4208,3 +4219,17 @@ end
 function Y()
 end
 ]]
+
+TEST 'A_Class' [[
+---@class A_Class
+local A = { x = 5 }
+
+function A:func()
+    for i = 1, <?self?>.x do
+        print(i)
+    end
+
+    self.y = 3
+    self.y = self.y + 3
+end
+]]