diff --git a/changelog.md b/changelog.md index daefdb5ae..2c0261f72 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,7 @@ ## Unreleased +* `FIX` Auto-require now detects existing imports using `Lua.completion.requireFunction` (e.g. `import`) instead of `require`, so new imports use the preferred syntax and get inserted after existing ones ## 3.19.2 `2026-10-13` diff --git a/script/core/command/autoRequire.lua b/script/core/command/autoRequire.lua index afdfb238c..ff8edf0ec 100644 --- a/script/core/command/autoRequire.lua +++ b/script/core/command/autoRequire.lua @@ -24,6 +24,7 @@ local function findInsertRow(uri) if not state or not text then return end + local requireName = config.get(uri, "Lua.completion.requireFunction") local lines = state.lines local fmt = { pair = false, @@ -37,7 +38,7 @@ local function findInsertRow(uri) end local ln = lines[i] local lnText = text:match('[^\r\n]*', ln) - if not lnText:find('require', 1, true) then + if not lnText:find(requireName, 1, true) then if row then break end diff --git a/test/command/auto-require.lua b/test/command/auto-require.lua index f17968d80..5932a1455 100644 --- a/test/command/auto-require.lua +++ b/test/command/auto-require.lua @@ -2,6 +2,7 @@ local util = require 'utility' local files = require 'files' local autoRequire = require 'core.command.autoRequire' local client = require 'client' +local config = require 'config' local findInsertRow = util.getUpvalue(autoRequire, 'findInsertRow') local applyAutoRequire = util.getUpvalue(autoRequire, 'applyAutoRequire') @@ -92,4 +93,16 @@ end text = 'local test = require "test"\n' } +local originRequireFunction = config.get(nil, 'Lua.completion.requireFunction') +config.set(nil, 'Lua.completion.requireFunction', 'import') +TEST [[ +local modulea = import("modulea") +local moduleb = import("moduleb") +]] 'modulec' { + start = 20000, + finish = 20000, + text = 'local modulec = import("modulec")\n' +} +config.set(nil, 'Lua.completion.requireFunction', originRequireFunction) + client.editText = originEditText