resolve #691

Author: sumneko

changelog.md

@@ -1,5 +1,8 @@
 # changelog
 
+## 2.5.0
+* `NEW` setting `Lua.runtime.pathStrict`
+
 ## 2.4.7
 `2021-10-27`
 * `FIX` [#762](https://github.com/sumneko/lua-language-server/issues/762)

script/config/config.lua

@@ -151,6 +151,7 @@ local Template = {
  "?.lua",
  "?/init.lua",
  },
+ ['Lua.runtime.pathStrict'] = Type.Boolean >> false,
  ['Lua.runtime.special'] = Type.Hash(Type.String, Type.String),
  ['Lua.runtime.meta'] = Type.String >> '${version} ${language} ${encoding}',
  ['Lua.runtime.unicodeName'] = Type.Boolean,

script/core/command/autoRequire.lua

@@ -135,7 +135,7 @@ return function (data)
  end
 
  local path = furi.decode(target)
- local visiblePaths = rpath.getVisiblePath(path, config.get 'Lua.runtime.path')
+ local visiblePaths = rpath.getVisiblePath(path)
  if not visiblePaths or #visiblePaths == 0 then
  return
  end

script/core/completion.lua

@@ -885,7 +885,7 @@ local function collectRequireNames(mode, myUri, literal, source, smark, position
  goto CONTINUE
  end
  local path = workspace.getRelativePath(uri)
- local infos = rpath.getVisiblePath(path, config.get 'Lua.runtime.path')
+ local infos = rpath.getVisiblePath(path)
  for _, info in ipairs(infos) do
  if matchKey(literal, info.expect) then
  if not collect[info.expect] then

script/workspace/require-path.lua

@@ -27,7 +27,9 @@ local function getOnePath(path, searcher)
  return nil
 end
 
-function m.getVisiblePath(path, searchers, strict)
+function m.getVisiblePath(path)
+ local searchers = config.get 'Lua.runtime.path'
+ local strict = config.get 'Lua.runtime.pathStrict'
  path = path:gsub('^[/\\]+', '')
  local uri = furi.encode(path)
  local libraryPath = files.getLibraryPath(uri)
@@ -91,7 +93,9 @@ files.watch(function (ev)
 end)
 
 config.watch(function (key, value, oldValue)
- if key == 'Lua.completion.requireSeparator' then
+ if key == 'Lua.completion.requireSeparator'
+ or key == 'Lua.runtime.path'
+ or key == 'Lua.runtime.pathStrict' then
  m.flush()
  end
 end)

script/workspace/workspace.lua

@@ -391,17 +391,22 @@ function m.findUrisByFilePath(path)
  return resultCache[path].results, resultCache[path].posts
  end
  tracy.ZoneBeginN('findUrisByFilePath #1')
+ local strict = config.get 'Lua.runtime.pathStrict'
  local results = {}
  local posts = {}
  for uri in files.eachFile() do
  if not uri:find(lpath, 1, true) then
  goto CONTINUE
  end
+ local relat = m.getRelativePath(uri)
  local pathLen = #path
- local curPath = furi.decode(uri)
+ local curPath = relat
  local curLen = #curPath
  local seg = curPath:sub(curLen - pathLen, curLen - pathLen)
  if seg == '/' or seg == '\\' or seg == '' then
+ if strict and seg ~= '' then
+ goto CONTINUE
+ end
  local see = curPath:sub(curLen - pathLen + 1, curLen)
  if see == path then
  results[#results+1] = uri

test/crossfile/completion.lua

@@ -87,7 +87,7 @@ function TEST(data)
  local pos
  for _, info in ipairs(data) do
  local uri = furi.encode(info.path)
- local script = info.content
+ local script = info.content or ''
  if info.main then
  local newScript, catched = catch(script, '?')
  pos = catched['?'][1][1]
@@ -565,8 +565,114 @@ TEST {
  ]],
  main = true,
  },
+ completion = nil,
 }
 
+TEST {
+ { path = 'f/a.lua' },
+ { path = 'f/b.lua' },
+ {
+ path = 'c.lua',
+ content = [[
+ require '<??>'
+ ]],
+ main = true,
+ },
+ completion = {
+ {
+ label = 'a',
+ kind = CompletionItemKind.Reference,
+ textEdit = EXISTS,
+ },
+ {
+ label = 'b',
+ kind = CompletionItemKind.Reference,
+ textEdit = EXISTS,
+ },
+ {
+ label = 'f.a',
+ kind = CompletionItemKind.Reference,
+ textEdit = EXISTS,
+ },
+ {
+ label = 'f.b',
+ kind = CompletionItemKind.Reference,
+ textEdit = EXISTS,
+ },
+ }
+}
+
+TEST {
+ { path = 'f/a.lua' },
+ { path = 'f/b.lua' },
+ {
+ path = 'c.lua',
+ content = [[
+ require 'a<??>'
+ ]],
+ main = true,
+ },
+ completion = {
+ {
+ label = 'a',
+ kind = CompletionItemKind.Reference,
+ textEdit = EXISTS,
+ },
+ {
+ label = 'f.a',
+ kind = CompletionItemKind.Reference,
+ textEdit = EXISTS,
+ },
+ }
+}
+
+config.set('Lua.runtime.pathStrict', true)
+
+TEST {
+ { path = 'f/a.lua' },
+ { path = 'f/b.lua' },
+ {
+ path = 'c.lua',
+ content = [[
+ require '<??>'
+ ]],
+ main = true,
+ },
+ completion = {
+ {
+ label = 'f.a',
+ kind = CompletionItemKind.Reference,
+ textEdit = EXISTS,
+ },
+ {
+ label = 'f.b',
+ kind = CompletionItemKind.Reference,
+ textEdit = EXISTS,
+ },
+ }
+}
+
+TEST {
+ { path = 'f/a.lua' },
+ { path = 'f/b.lua' },
+ {
+ path = 'c.lua',
+ content = [[
+ require 'a<??>'
+ ]],
+ main = true,
+ },
+ completion = {
+ {
+ label = 'f.a',
+ kind = CompletionItemKind.Reference,
+ textEdit = EXISTS,
+ },
+ }
+}
+
+config.set('Lua.runtime.pathStrict', false)
+
 TEST {
  {
  path = 'xxx.lua',

test/crossfile/definition.lua

@@ -117,6 +117,31 @@ TEST {
  },
 }
 
+config.set('Lua.runtime.pathStrict', true)
+TEST {
+ {
+ path = 'aaa/bbb.lua',
+ content = '',
+ },
+ {
+ path = 'b.lua',
+ content = 'require "<?bbb?>"',
+ },
+}
+
+TEST {
+ {
+ path = 'aaa/bbb.lua',
+ content = '<!!>',
+ },
+ {
+ path = 'b.lua',
+ content = 'require "<?aaa.bbb?>"',
+ },
+}
+
+config.set('Lua.runtime.pathStrict', false)
+
 TEST {
  {
  path = 'a.lua',