Merge branch 'master' into inconsistent-behavior-(missing-fields)

Author: NeOzay

changelog.md

@@ -14,7 +14,9 @@
 * `CHG` Change spacing of parameter inlay hints to match other LSPs, like `rust-analyzer`
 * `FIX` Inconsistent type narrow behavior of function call args [#2758](https://github.com/LuaLS/lua-language-server/issues/2758)
 * `FIX` Improve the `missing-fields` logic to be able to correctly handle classes defined several times [#22770](https://github.com/LuaLS/lua-language-server/pull/2770)
-* 
+* `FIX` Typos in annotation descriptions
+* `NEW` You can now click on "References" in CodeLen to display the reference list
+
 ## 3.9.3
 `2024-6-11`
 * `FIX` Sometimes providing incorrect autocompletion when chaining calls

locale/en-us/script.lua

@@ -1167,7 +1167,7 @@ Provide type declaration for [operator metamethods](http://lua-users.org/wiki/Me
 ### Vector Add Metamethod
 ```
 ---@class Vector
----@operation add(Vector):Vector
+---@operator add(Vector):Vector
 
 vA = Vector.new(1, 2, 3)
 vB = Vector.new(10, 20, 30)
@@ -1178,7 +1178,7 @@ vC = vA + vB
 ### Unary Minus
 ```
 ---@class Passcode
----@operation unm:integer
+---@operator unm:integer
 
 pA = Passcode.new(1234)
 pB = -pA

locale/pt-br/script.lua

@@ -1167,7 +1167,7 @@ Provide type declaration for [operator metamethods](http://lua-users.org/wiki/Me
 ### Vector Add Metamethod
 ```
 ---@class Vector
----@operation add(Vector):Vector
+---@operator add(Vector):Vector
 
 vA = Vector.new(1, 2, 3)
 vB = Vector.new(10, 20, 30)
@@ -1178,7 +1178,7 @@ vC = vA + vB
 ### Unary Minus
 ```
 ---@class Passcode
----@operation unm:integer
+---@operator unm:integer
 
 pA = Passcode.new(1234)
 pB = -pA
@@ -1216,7 +1216,7 @@ setColor(colors.green)
 LUADOC_DESC_SOURCE = -- TODO: need translate!
 [=[
 Provide a reference to some source code which lives in another file. When
-searching for the defintion of an item, its `@source` will be used.
+searching for the definition of an item, its `@source` will be used.
 
 ## Syntax
 `@source <path>`
@@ -1264,7 +1264,7 @@ end
 LUADOC_DESC_PRIVATE = -- TODO: need translate!
 [=[
 Mark a function as private to a @class. Private functions can be accessed only
-from within their class and are not accessable from child classes.
+from within their class and are not accessible from child classes.
 
 ## Syntax
 `@private`

locale/zh-cn/script.lua

@@ -1167,7 +1167,7 @@ Provide type declaration for [operator metamethods](http://lua-users.org/wiki/Me
 ### Vector Add Metamethod
 ```
 ---@class Vector
----@operation add(Vector):Vector
+---@operator add(Vector):Vector
 
 vA = Vector.new(1, 2, 3)
 vB = Vector.new(10, 20, 30)
@@ -1178,7 +1178,7 @@ vC = vA + vB
 ### Unary Minus
 ```
 ---@class Passcode
----@operation unm:integer
+---@operator unm:integer
 
 pA = Passcode.new(1234)
 pB = -pA
@@ -1216,7 +1216,7 @@ setColor(colors.green)
 LUADOC_DESC_SOURCE = -- TODO: need translate!
 [=[
 Provide a reference to some source code which lives in another file. When
-searching for the defintion of an item, its `@source` will be used.
+searching for the definition of an item, its `@source` will be used.
 
 ## Syntax
 `@source <path>`
@@ -1264,7 +1264,7 @@ end
 LUADOC_DESC_PRIVATE = -- TODO: need translate!
 [=[
 Mark a function as private to a @class. Private functions can be accessed only
-from within their class and are not accessable from child classes.
+from within their class and are not accessible from child classes.
 
 ## Syntax
 `@private`

locale/zh-tw/script.lua

@@ -1161,7 +1161,7 @@ Provide type declaration for [operator metamethods](http://lua-users.org/wiki/Me
 ### Vector Add Metamethod
 ```
 ---@class Vector
----@operation add(Vector):Vector
+---@operator add(Vector):Vector
 
 vA = Vector.new(1, 2, 3)
 vB = Vector.new(10, 20, 30)
@@ -1172,7 +1172,7 @@ vC = vA + vB
 ### Unary Minus
 ```
 ---@class Passcode
----@operation unm:integer
+---@operator unm:integer
 
 pA = Passcode.new(1234)
 pB = -pA
@@ -1210,7 +1210,7 @@ setColor(colors.green)
 LUADOC_DESC_SOURCE = -- TODO: need translate!
 [=[
 Provide a reference to some source code which lives in another file. When
-searching for the defintion of an item, its `@source` will be used.
+searching for the definition of an item, its `@source` will be used.
 
 ## Syntax
 `@source <path>`
@@ -1258,7 +1258,7 @@ end
 LUADOC_DESC_PRIVATE = -- TODO: need translate!
 [=[
 Mark a function as private to a @class. Private functions can be accessed only
-from within their class and are not accessable from child classes.
+from within their class and are not accessible from child classes.
 
 ## Syntax
 `@private`

script/core/code-lens.lua

@@ -4,6 +4,7 @@ local await  = require 'await'
 local conv   = require 'proto.converter'
 local getRef = require 'core.reference'
 local lang   = require 'language'
+local client = require 'client'
 
 ---@class parser.state
 ---@field package _codeLens? codeLens
@@ -88,12 +89,35 @@ end
 function mt:resolveReference(source)
     local refs = getRef(self.uri, source.finish, false)
     local count = refs and #refs or 0
-    local command = conv.command(
-        lang.script('COMMAND_REFERENCE_COUNT', count),
-        '',
-        {}
-    )
-    return command
+    if client.getOption('codeLensViewReferences') then
+        local locations = {}
+        for _, ref in ipairs(refs or {}) do
+            local state = files.getState(ref.uri)
+            if state then
+                locations[#locations+1] = conv.location(
+                    ref.uri,
+                    conv.packRange(state, ref.target.start, ref.target.finish)
+                )
+            end
+        end
+        local command = conv.command(
+            lang.script('COMMAND_REFERENCE_COUNT', count),
+            'lua.showReferences',
+            {
+                self.uri,
+                conv.packPosition(self.state, source.start),
+                locations,
+            }
+        )
+        return command
+    else
+        local command = conv.command(
+            lang.script('COMMAND_REFERENCE_COUNT', count),
+            '',
+            {}
+        )
+        return command
+    end
 end
 
 ---@async

script/core/diagnostics/unused-function.lua

@@ -5,6 +5,7 @@ local define  = require 'proto.define'
 local lang    = require 'language'
 local await   = require 'await'
 local client  = require 'client'
+local util    = require 'utility'
 
 local function isToBeClosed(source)
     if not source.attrs then
@@ -105,8 +106,11 @@ return function (uri, callback)
         turnBlack(source, black, white, links)
     end
 
+    local tagSupports = client.getAbility('textDocument.completion.completionItem.tagSupport.valueSet')
+    local supportUnnecessary = tagSupports and util.arrayHas(tagSupports, define.DiagnosticTag.Unnecessary)
+
     for source in pairs(white) do
-        if client.isVSCode() then
+        if supportUnnecessary then
             callback {
                 start   = source.start,
                 finish  = source.finish,

script/core/fix-indent.lua

@@ -0,0 +1,170 @@
+local files = require 'files'
+local guide = require 'parser.guide'
+local lookBackward = require 'core.look-backward'
+local proto = require 'proto.proto'
+
+---@param state parser.state
+local function insertIndentation(state, position, edits)
+    local text   = state.originText or state.lua
+    local lines  = state.originLines or state.lines
+    local row    = guide.rowColOf(position)
+    if not lines or not text then
+        return
+    end
+    local offset = lines[row]
+    local indent = text:match('^%s*', offset)
+    for _, edit in ipairs(edits) do
+        edit.text = edit.text:gsub('\n', '\n' .. indent)
+    end
+end
+
+---@param state parser.state
+local function findForward(state, position, ...)
+    local lines = state.originLines or state.lines
+    local offset      = guide.positionToOffsetByLines(lines, position)
+    local firstOffset = state.originText:match('^[ \t]*()', offset + 1)
+    if not firstOffset then
+        return nil
+    end
+    for _, symbol in ipairs { ... } do
+        if state.originText:sub(firstOffset, firstOffset + #symbol - 1) == symbol then
+            return guide.offsetToPositionByLines(lines, firstOffset - 1), symbol
+        end
+    end
+    return nil
+end
+
+---@param state parser.state
+local function findBackward(state, position, ...)
+    local text       = state.originText or state.lua
+    local lines      = state.originLines or state.lines
+    if not text or not lines then
+        return nil
+    end
+    local offset     = guide.positionToOffsetByLines(lines, position)
+    local lastOffset = lookBackward.findAnyOffset(text, offset)
+    if not lastOffset then
+        return nil
+    end
+    for _, symbol in ipairs { ... } do
+        if text:sub(lastOffset - #symbol + 1, lastOffset) == symbol then
+            return guide.offsetToPositionByLines(lines, lastOffset)
+        end
+    end
+    return nil
+end
+
+---@param state parser.state
+---@param change table
+---@param result any[]
+local function checkSplitOneLine(state, change, result)
+    if  change.text ~= '\r\n'
+    and change.text ~= '\n' then
+        return
+    end
+
+    local lines = state.originLines or state.lines
+    local position = lines[change.range.start.line + 1]
+
+    local fPosition, fSymbol = findForward(state, position, 'end', '}')
+    if not fPosition or not fSymbol then
+        return
+    end
+    local bPosition = findBackward(state, position, 'then', 'do', ')', '{')
+    if not bPosition then
+        return
+    end
+    local edits = {}
+    edits[#edits+1] = {
+        start  = bPosition,
+        finish = position,
+        text   = '\n\t',
+    }
+    edits[#edits+1] = {
+        start  = position,
+        finish = fPosition + 1,
+        text   = '',
+    }
+    edits[#edits+1] = {
+        start  = fPosition + 1,
+        finish = fPosition + 1,
+        text   = '\n' .. fSymbol:sub(1, 1)
+    }
+    insertIndentation(state, bPosition, edits)
+    for _, edit in ipairs(edits) do
+        result[#result+1] = edit
+    end
+end
+
+---@param state parser.state
+local function applyEdits(state, edits)
+    if #edits == 0 then
+        return
+    end
+
+    local lines = state.originLines or state.lines
+
+    local results = {}
+    for i, edit in ipairs(edits) do
+        local startPos = guide.offsetToPositionByLines(lines, edit.start)
+        local endPos = guide.offsetToPositionByLines(lines, edit.finish)
+        local startRow, startCol = guide.rowColOf(startPos)
+        local endRow, endCol = guide.rowColOf(endPos)
+        results[i] = {
+            range   = {
+                start = {
+                    line = startRow,
+                    character = startCol,
+                },
+                ['end'] = {
+                    line = endRow,
+                    character = endCol,
+                }
+            },
+            newText = edit.text,
+        }
+    end
+
+    proto.request('workspace/applyEdit', {
+        label = 'Fix Indent',
+        edit = {
+            changes = {
+                [state.uri] = {
+                    {
+                        range = {
+                            start = {
+                                line = 1,
+                                character = 0,
+                            },
+                            ['end'] = {
+                                line = 1,
+                                character = 0,
+                            }
+                        },
+                        newText = '\t',
+                    },
+                }
+            }
+        },
+    })
+    proto.notify('$/command', {
+        command = 'cursorMove',
+    })
+end
+
+return function (uri, changes)
+    do return end
+    local state = files.compileState(uri)
+    if not state then
+        return
+    end
+
+    local edits = {}
+    for _, change in ipairs(changes) do
+        if change.range then
+            checkSplitOneLine(state, change, edits)
+        end
+    end
+
+    applyEdits(state, edits)
+end