find reference respect includeDeclaration

Author: sumneko

changelog.md

@@ -93,6 +93,7 @@ server will generate `doc.json` and `doc.md` in `LOGPATH`.
       end
   end
   ```
+* `CHG` find reference: respect `includeDeclaration` (although I don't know how to turn off this option in VSCode)
 * `FIX` [#1567]
 * `FIX` [#1593]
 * `FIX` [#1595]

script/core/reference.lua

@@ -55,7 +55,10 @@ local accept = {
 }
 
 ---@async
-return function (uri, position)
+---@param uri uri
+---@param position integer
+---@param includeDeclaration boolean
+return function (uri, position, includeDeclaration)
     local ast = files.getState(uri)
     if not ast then
         return nil
@@ -82,6 +85,9 @@ return function (uri, position)
         if src.type == 'self' then
             goto CONTINUE
         end
+        if not includeDeclaration and guide.isSet(src) then
+            goto CONTINUE
+        end
         src = src.field or src.method or src
         if src.type == 'getindex'
         or src.type == 'setindex'

script/provider/provider.lua

@@ -484,7 +484,7 @@ m.register 'textDocument/references' {
         end
         local core   = require 'core.reference'
         local pos    = converter.unpackPosition(state, params.position)
-        local result = core(uri, pos)
+        local result = core(uri, pos, params.context.includeDeclaration)
         if not result then
             return nil
         end

script/vm/operator.lua

@@ -273,7 +273,7 @@ vm.binarySwitch = util.switch()
                         or op == '//' and a // b
                         or op == '^'  and a ^  b
             vm.setNode(source, {
-                type   = math.type(result) == 'integer' and 'integer' or 'number',
+                type   = (op == '//' or math.type(result) == 'integer') and 'integer' or 'number',
                 start  = source.start,
                 finish = source.finish,
                 parent = source,
@@ -288,7 +288,6 @@ vm.binarySwitch = util.switch()
             if op == '+'
             or op == '-'
             or op == '*'
-            or op == '//'
             or op == '%' then
                 local uri = guide.getUri(source)
                 local infer1 = vm.getInfer(source[1])
@@ -302,6 +301,10 @@ vm.binarySwitch = util.switch()
                     end
                 end
             end
+            if op == '//' then
+                vm.setNode(source, node or vm.declareGlobal('type', 'integer'))
+                return
+            end
             vm.setNode(source, node or vm.declareGlobal('type', 'number'))
         end
     end)

test/crossfile/references.lua

@@ -83,7 +83,7 @@ function TEST(datas)
     end
 
     local sourcePos = (sourceList[1][1] + sourceList[1][2]) // 2
-    local positions = core(sourceUri, sourcePos)
+    local positions = core(sourceUri, sourcePos, true)
     if positions then
         local result = {}
         for i, position in ipairs(positions) do

test/references/init.lua

@@ -25,7 +25,7 @@ function TEST(script)
 
     local input  = catched['?'] + catched['~']
     local expect = catched['!'] + catched['~']
-    local results = core(TESTURI, input[1][1])
+    local results = core(TESTURI, input[1][1], true)
     if results then
         local positions = {}
         for i, result in ipairs(results) do