fix #923

Author: sumneko

changelog.md

@@ -2,6 +2,7 @@
 
 ## 2.6.3
 * `FIX` new files are not loaded correctly
+* `FIX` [#923](https://github.com/sumneko/lua-language-server/issues/923)
 * `FIX` [#926](https://github.com/sumneko/lua-language-server/issues/926)
 
 ## 2.6.2

script/core/searcher.lua

@@ -219,13 +219,13 @@ local function pushResult(status, mode, source, force)
         end
     end
 
-    local parent = source.parent
-    if parent.type == 'return' then
-        if source ~= status.source then
-            results[#results+1] = source
-            return true
-        end
-    end
+    --local parent = source.parent
+    --if parent.type == 'return' then
+    --    if source ~= status.source then
+    --        results[#results+1] = source
+    --        return true
+    --    end
+    --end
 
     return false
 end

test/crossfile/definition.lua

@@ -149,7 +149,7 @@ config.set(nil, 'Lua.runtime.pathStrict', false)
 TEST {
     {
         path = 'a.lua',
-        content = 'local <!t!> = 1; return <!t!>',
+        content = 'local <!t!> = 1; return t',
     },
     {
         path = 'b.lua',
@@ -160,7 +160,7 @@ TEST {
 TEST {
     {
         path = 'a.lua',
-        content = 'local <!t!> = 1; return <!t!>',
+        content = 'local <!t!> = 1; return t',
     },
     {
         path = 'b.lua',
@@ -188,7 +188,7 @@ local <~t~>
 TEST {
     {
         path = 'a.lua',
-        content = 'local <!t!> = 1; return <!t!>',
+        content = 'local <!t!> = 1; return t',
     },
     {
         path = 'b.lua',
@@ -254,7 +254,7 @@ TEST {
     {
         path = 'a.lua',
         content = [[
-            return <!a():b():c()!>
+            return a():b():c()
         ]],
     },
     {
@@ -397,7 +397,7 @@ TEST {
         content = [[
             local function <!f!>()
             end
-            return <!f!>
+            return f
         ]]
     },
     {

test/definition/bug.lua

@@ -178,42 +178,42 @@ local A, B
 
 function A:get1()
     local <!a!> = B:get()
-    return <!a!>
+    return a
 end
 
 function A:get2()
     local <!a!> = B:get()
-    return <!a!>
+    return a
 end
 
 function A:get3()
     local <!a!> = B:get()
-    return <!a!>
+    return a
 end
 
 function A:get4()
     local <!a!> = B:get()
-    return <!a!>
+    return a
 end
 
 function A:get5()
     local <!a!> = B:get()
-    return <!a!>
+    return a
 end
 
 function A:get6()
     local <!a!> = B:get()
-    return <!a!>
+    return a
 end
 
 function A:get7()
     local <!a!> = B:get()
-    return <!a!>
+    return a
 end
 
 function A:get8()
     local <!a!> = B:get()
-    return <!a!>
+    return a
 end
 
 function B:get()
@@ -226,7 +226,7 @@ function B:get()
     <!b!> = A:get6()
     <!b!> = A:get7()
     <!b!> = A:get8()
-    return <!b!>
+    return b
 end
 
 local <!b!> = B:get()

test/definition/call.lua

@@ -1,7 +1,7 @@
 TEST [[
 function f()
     local <!x!>
-    return <!x!>
+    return x
 end
 local <!y!> = f()
 print(<?y?>)