Skip to content

Commit 7fc0bde

Browse files
committed
diagnostic check file as folder before as library
1 parent 48f5977 commit 7fc0bde

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

script/core/rename.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ function m.rename(uri, pos, newname)
354354
return
355355
end
356356
mark[uid] = true
357-
if files.isLibrary(turi) then
357+
if files.isLibrary(turi, true) then
358358
return
359359
end
360360
results[#results+1] = {

script/files.lua

+8-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,14 @@ function m.setLibraryUri(scp, uri, libraryUri)
108108
end
109109

110110
--- 是否是库文件
111-
function m.isLibrary(uri)
111+
function m.isLibrary(uri, excludeFolder)
112+
if excludeFolder then
113+
for _, scp in ipairs(scope.folders) do
114+
if scp:isChildUri(uri) then
115+
return false
116+
end
117+
end
118+
end
112119
for _, scp in ipairs(scope.folders) do
113120
local map = scp:get 'libraryMap'
114121
if map and map[uri] ~= nil then

script/provider/diagnostic.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ function m.doDiagnostic(uri, isScopeDiag)
187187
if not config.get(uri, 'Lua.diagnostics.enable') then
188188
return
189189
end
190-
if files.isLibrary(uri) then
190+
if files.isLibrary(uri, true) then
191191
local status = config.get(uri, 'Lua.diagnostics.libraryFiles')
192192
if status == 'Disable' then
193193
return
@@ -411,7 +411,7 @@ files.watch(function (ev, uri) ---@async
411411
xpcall(m.doDiagnostic, log.error, uri)
412412
end
413413
elseif ev == 'close' then
414-
if files.isLibrary(uri)
414+
if files.isLibrary(uri, true)
415415
or ws.isIgnored(uri) then
416416
m.clear(uri)
417417
end

0 commit comments

Comments
 (0)