From 6735dbe56aac5c8fb5ea768c1fb33a1a1cb74f9a Mon Sep 17 00:00:00 2001 From: Stephan Badragan Date: Sun, 29 Sep 2024 13:35:00 -0700 Subject: [PATCH] converting / to . in requires for easy auto-import --- lua/grug-far.lua | 24 +++++------ lua/grug-far/actions/abort.lua | 2 +- lua/grug-far/actions/gotoLocation.lua | 4 +- lua/grug-far/actions/help.lua | 4 +- lua/grug-far/actions/historyAdd.lua | 2 +- lua/grug-far/actions/historyOpen.lua | 14 +++---- lua/grug-far/actions/openLocation.lua | 4 +- lua/grug-far/actions/previewLocation.lua | 2 +- lua/grug-far/actions/qflist.lua | 2 +- lua/grug-far/actions/replace.lua | 6 +-- lua/grug-far/actions/search.lua | 6 +-- lua/grug-far/actions/swapEngine.lua | 4 +- .../actions/swapReplacementInterpreter.lua | 4 +- lua/grug-far/actions/sync.lua | 4 +- lua/grug-far/actions/syncLine.lua | 2 +- lua/grug-far/actions/syncLocations.lua | 4 +- lua/grug-far/actions/toggleShowCommand.lua | 2 +- lua/grug-far/engine.lua | 4 +- lua/grug-far/engine/astgrep.lua | 4 +- .../astgrep/blacklistedReplaceFlags.lua | 2 +- lua/grug-far/engine/astgrep/getArgs.lua | 2 +- lua/grug-far/engine/astgrep/parseResults.lua | 4 +- lua/grug-far/engine/astgrep/replace.lua | 18 ++++----- lua/grug-far/engine/astgrep/search.lua | 20 +++++----- lua/grug-far/engine/fetchCommandOutput.lua | 2 +- lua/grug-far/engine/ripgrep.lua | 6 +-- lua/grug-far/engine/ripgrep/colors.lua | 2 +- .../engine/ripgrep/fetchFilesWithMatches.lua | 6 +-- .../engine/ripgrep/fetchFilteredFilesList.lua | 4 +- .../ripgrep/fetchReplacedFileContent.lua | 6 +-- lua/grug-far/engine/ripgrep/getArgs.lua | 4 +- lua/grug-far/engine/ripgrep/parseResults.lua | 4 +- lua/grug-far/engine/ripgrep/replace.lua | 6 +-- .../engine/ripgrep/replaceInMatchedFiles.lua | 12 +++--- lua/grug-far/engine/ripgrep/search.lua | 14 +++---- lua/grug-far/engine/ripgrep/sync.lua | 6 +-- lua/grug-far/engine/syncChangedFiles.lua | 2 +- lua/grug-far/farBuffer.lua | 40 +++++++++---------- lua/grug-far/fold.lua | 2 +- lua/grug-far/history.lua | 2 +- lua/grug-far/render.lua | 10 ++--- lua/grug-far/render/help.lua | 4 +- lua/grug-far/render/input.lua | 4 +- lua/grug-far/render/results.lua | 2 +- lua/grug-far/render/resultsHeader.lua | 2 +- lua/grug-far/render/resultsList.lua | 8 ++-- lua/grug-far/replacementInterpreter.lua | 8 ++-- lua/grug-far/test/helpers.lua | 6 +-- scripts/test_plugin_config.lua | 2 +- tests/astgrep/test_goto.lua | 2 +- tests/astgrep/test_history.lua | 4 +- tests/astgrep/test_lua_interpreter.lua | 2 +- tests/astgrep/test_open.lua | 2 +- tests/astgrep/test_parseResults.lua | 2 +- tests/astgrep/test_replace.lua | 2 +- tests/astgrep/test_search.lua | 2 +- tests/astgrep/test_sync.lua | 2 +- tests/astgrep/test_ui.lua | 2 +- tests/astgrep/test_vimscript_interpreter.lua | 2 +- tests/base/test_close.lua | 2 +- tests/base/test_goto.lua | 2 +- tests/base/test_history.lua | 4 +- tests/base/test_instance_api.lua | 2 +- tests/base/test_lua_interpreter.lua | 2 +- tests/base/test_open.lua | 2 +- tests/base/test_opts.lua | 2 +- tests/base/test_preview.lua | 2 +- tests/base/test_quickfix.lua | 2 +- tests/base/test_replace.lua | 2 +- tests/base/test_search.lua | 2 +- tests/base/test_sync.lua | 2 +- tests/base/test_toggle_flags.lua | 2 +- tests/base/test_toggle_instance.lua | 2 +- tests/base/test_ui.lua | 2 +- tests/base/test_utils.lua | 2 +- tests/base/test_vimscript_interpreter.lua | 2 +- 76 files changed, 183 insertions(+), 183 deletions(-) diff --git a/lua/grug-far.lua b/lua/grug-far.lua index be70d36f..cbeff8eb 100644 --- a/lua/grug-far.lua +++ b/lua/grug-far.lua @@ -1,14 +1,14 @@ -local opts = require('grug-far/opts') -local highlights = require('grug-far/highlights') -local farBuffer = require('grug-far/farBuffer') -local history = require('grug-far/history') -local utils = require('grug-far/utils') -local close = require('grug-far/actions/close') -local engine = require('grug-far/engine') -local replacementInterpreter = require('grug-far/replacementInterpreter') -local fold = require('grug-far/fold') -local inputs = require('grug-far/inputs') -local fileIconsProvider = require('grug-far/fileIconsProvider') +local opts = require('grug-far.opts') +local highlights = require('grug-far.highlights') +local farBuffer = require('grug-far.farBuffer') +local history = require('grug-far.history') +local utils = require('grug-far.utils') +local close = require('grug-far.actions.close') +local engine = require('grug-far.engine') +local replacementInterpreter = require('grug-far.replacementInterpreter') +local fold = require('grug-far.fold') +local inputs = require('grug-far.inputs') +local fileIconsProvider = require('grug-far.fileIconsProvider') local M = {} @@ -232,7 +232,7 @@ local function setupCleanup(buf, context) vim.api.nvim_buf_clear_namespace(buf, context.historyHlNamespace, 0, -1) vim.api.nvim_buf_clear_namespace(buf, context.helpHlNamespace, 0, -1) vim.api.nvim_del_augroup_by_id(context.augroup) - require('grug-far/render/treesitter').clear(buf) + require('grug-far.render.treesitter').clear(buf) fold.cleanup(context) end diff --git a/lua/grug-far/actions/abort.lua b/lua/grug-far/actions/abort.lua index 2a7b7fe5..08713b03 100644 --- a/lua/grug-far/actions/abort.lua +++ b/lua/grug-far/actions/abort.lua @@ -1,4 +1,4 @@ -local utils = require('grug-far/utils') +local utils = require('grug-far.utils') --- aborts all currently running tasks ---@param params { buf: integer, context: GrugFarContext } diff --git a/lua/grug-far/actions/gotoLocation.lua b/lua/grug-far/actions/gotoLocation.lua index 0f0c6ca5..cb5a87ed 100644 --- a/lua/grug-far/actions/gotoLocation.lua +++ b/lua/grug-far/actions/gotoLocation.lua @@ -1,5 +1,5 @@ -local resultsList = require('grug-far/render/resultsList') -local utils = require('grug-far/utils') +local resultsList = require('grug-far.render.resultsList') +local utils = require('grug-far.utils') --- gets result location that we should open and row in buffer where it is referenced ---@param buf integer diff --git a/lua/grug-far/actions/help.lua b/lua/grug-far/actions/help.lua index 9376a8f3..31e5a440 100644 --- a/lua/grug-far/actions/help.lua +++ b/lua/grug-far/actions/help.lua @@ -1,5 +1,5 @@ -local utils = require('grug-far/utils') -local opts = require('grug-far/opts') +local utils = require('grug-far.utils') +local opts = require('grug-far.opts') ---@alias HlText string[] diff --git a/lua/grug-far/actions/historyAdd.lua b/lua/grug-far/actions/historyAdd.lua index 75ac6ff8..f6e5729b 100644 --- a/lua/grug-far/actions/historyAdd.lua +++ b/lua/grug-far/actions/historyAdd.lua @@ -1,4 +1,4 @@ -local history = require('grug-far/history') +local history = require('grug-far.history') --- adds current UI values as history entry ---@param params { context: GrugFarContext } diff --git a/lua/grug-far/actions/historyOpen.lua b/lua/grug-far/actions/historyOpen.lua index e531fd43..6efee640 100644 --- a/lua/grug-far/actions/historyOpen.lua +++ b/lua/grug-far/actions/historyOpen.lua @@ -1,10 +1,10 @@ -local renderHelp = require('grug-far/render/help') -local history = require('grug-far/history') -local utils = require('grug-far/utils') -local opts = require('grug-far/opts') -local engine = require('grug-far/engine') -local replacementInterpreter = require('grug-far/replacementInterpreter') -local inputs = require('grug-far/inputs') +local renderHelp = require('grug-far.render.help') +local history = require('grug-far.history') +local utils = require('grug-far.utils') +local opts = require('grug-far.opts') +local engine = require('grug-far.engine') +local replacementInterpreter = require('grug-far.replacementInterpreter') +local inputs = require('grug-far.inputs') --- gets history entry at given 0-based buffer row ---@param historyBuf integer diff --git a/lua/grug-far/actions/openLocation.lua b/lua/grug-far/actions/openLocation.lua index 55623cbf..191b895d 100644 --- a/lua/grug-far/actions/openLocation.lua +++ b/lua/grug-far/actions/openLocation.lua @@ -1,5 +1,5 @@ -local resultsList = require('grug-far/render/resultsList') -local utils = require('grug-far/utils') +local resultsList = require('grug-far.render.resultsList') +local utils = require('grug-far.utils') --- gets result location that we should open and row in buffer where it is referenced ---@param buf integer diff --git a/lua/grug-far/actions/previewLocation.lua b/lua/grug-far/actions/previewLocation.lua index 5b4a7fb2..75c8324a 100644 --- a/lua/grug-far/actions/previewLocation.lua +++ b/lua/grug-far/actions/previewLocation.lua @@ -1,4 +1,4 @@ -local resultsList = require('grug-far/render/resultsList') +local resultsList = require('grug-far.render.resultsList') local function previewLocation(params) local buf = params.buf diff --git a/lua/grug-far/actions/qflist.lua b/lua/grug-far/actions/qflist.lua index af4a3971..2dc12c40 100644 --- a/lua/grug-far/actions/qflist.lua +++ b/lua/grug-far/actions/qflist.lua @@ -1,4 +1,4 @@ -local utils = require('grug-far/utils') +local utils = require('grug-far.utils') --- opens quickfix list ---@param context GrugFarContext diff --git a/lua/grug-far/actions/replace.lua b/lua/grug-far/actions/replace.lua index e49d39c1..94e48df5 100644 --- a/lua/grug-far/actions/replace.lua +++ b/lua/grug-far/actions/replace.lua @@ -1,6 +1,6 @@ -local renderResultsHeader = require('grug-far/render/resultsHeader') -local resultsList = require('grug-far/render/resultsList') -local history = require('grug-far/history') +local renderResultsHeader = require('grug-far.render.resultsHeader') +local resultsList = require('grug-far.render.resultsList') +local history = require('grug-far.history') local uv = vim.uv --- gets action message to display diff --git a/lua/grug-far/actions/search.lua b/lua/grug-far/actions/search.lua index f47cb34c..a8194d35 100644 --- a/lua/grug-far/actions/search.lua +++ b/lua/grug-far/actions/search.lua @@ -1,6 +1,6 @@ -local renderResultsHeader = require('grug-far/render/resultsHeader') -local resultsList = require('grug-far/render/resultsList') -local fold = require('grug-far/fold') +local renderResultsHeader = require('grug-far.render.resultsHeader') +local resultsList = require('grug-far.render.resultsList') +local fold = require('grug-far.fold') --- performs search ---@param params { buf: integer, context: GrugFarContext } diff --git a/lua/grug-far/actions/swapEngine.lua b/lua/grug-far/actions/swapEngine.lua index 65bc3b7d..c0b1c555 100644 --- a/lua/grug-far/actions/swapEngine.lua +++ b/lua/grug-far/actions/swapEngine.lua @@ -1,5 +1,5 @@ -local search = require('grug-far/actions/search') -local engine = require('grug-far/engine') +local search = require('grug-far.actions.search') +local engine = require('grug-far.engine') --- swaps engine with the next one ---@param params { buf: integer, context: GrugFarContext } diff --git a/lua/grug-far/actions/swapReplacementInterpreter.lua b/lua/grug-far/actions/swapReplacementInterpreter.lua index 6cc56cc2..ce4b6488 100644 --- a/lua/grug-far/actions/swapReplacementInterpreter.lua +++ b/lua/grug-far/actions/swapReplacementInterpreter.lua @@ -1,5 +1,5 @@ -local search = require('grug-far/actions/search') -local replacementInterpreter = require('grug-far/replacementInterpreter') +local search = require('grug-far.actions.search') +local replacementInterpreter = require('grug-far.replacementInterpreter') --- swaps replacement interpreter with the next one ---@param params { buf: integer, context: GrugFarContext } diff --git a/lua/grug-far/actions/sync.lua b/lua/grug-far/actions/sync.lua index 9e238bfc..be45ad76 100644 --- a/lua/grug-far/actions/sync.lua +++ b/lua/grug-far/actions/sync.lua @@ -1,5 +1,5 @@ -local renderResultsHeader = require('grug-far/render/resultsHeader') -local resultsList = require('grug-far/render/resultsList') +local renderResultsHeader = require('grug-far.render.resultsHeader') +local resultsList = require('grug-far.render.resultsList') local uv = vim.uv --- gets action message to display diff --git a/lua/grug-far/actions/syncLine.lua b/lua/grug-far/actions/syncLine.lua index 7d50e030..54d11785 100644 --- a/lua/grug-far/actions/syncLine.lua +++ b/lua/grug-far/actions/syncLine.lua @@ -1,4 +1,4 @@ -local sync = require('grug-far/actions/sync') +local sync = require('grug-far.actions.sync') --- syncs current result line with original file location ---@param params { buf: integer, context: GrugFarContext } diff --git a/lua/grug-far/actions/syncLocations.lua b/lua/grug-far/actions/syncLocations.lua index 8a03d198..da2b6440 100644 --- a/lua/grug-far/actions/syncLocations.lua +++ b/lua/grug-far/actions/syncLocations.lua @@ -1,5 +1,5 @@ -local sync = require('grug-far/actions/sync') -local history = require('grug-far/history') +local sync = require('grug-far.actions.sync') +local history = require('grug-far.history') --- syncs all result lines with original file locations ---@param params { buf: integer, context: GrugFarContext } diff --git a/lua/grug-far/actions/toggleShowCommand.lua b/lua/grug-far/actions/toggleShowCommand.lua index c8cd3e0a..b3df1a3f 100644 --- a/lua/grug-far/actions/toggleShowCommand.lua +++ b/lua/grug-far/actions/toggleShowCommand.lua @@ -1,4 +1,4 @@ -local search = require('grug-far/actions/search') +local search = require('grug-far.actions.search') --- toggles displaying search command ---@param params { buf: integer, context: GrugFarContext } diff --git a/lua/grug-far/engine.lua b/lua/grug-far/engine.lua index c2ebfe9e..3d1a7ba8 100644 --- a/lua/grug-far/engine.lua +++ b/lua/grug-far/engine.lua @@ -80,9 +80,9 @@ M.DiffSeparatorChars = ' ' ---@return GrugFarEngine function M.getEngine(type) if type == 'astgrep' then - return require('grug-far/engine/astgrep') + return require('grug-far.engine.astgrep') else - return require('grug-far/engine/ripgrep') + return require('grug-far.engine.ripgrep') end end diff --git a/lua/grug-far/engine/astgrep.lua b/lua/grug-far/engine/astgrep.lua index 9e209f0c..33e37459 100644 --- a/lua/grug-far/engine/astgrep.lua +++ b/lua/grug-far/engine/astgrep.lua @@ -1,5 +1,5 @@ -local search = require('grug-far/engine/astgrep/search') -local replace = require('grug-far/engine/astgrep/replace') +local search = require('grug-far.engine.astgrep.search') +local replace = require('grug-far.engine.astgrep.replace') ---@type GrugFarEngine local AstgrepEngine = { diff --git a/lua/grug-far/engine/astgrep/blacklistedReplaceFlags.lua b/lua/grug-far/engine/astgrep/blacklistedReplaceFlags.lua index c2d4f945..cefd0b2a 100644 --- a/lua/grug-far/engine/astgrep/blacklistedReplaceFlags.lua +++ b/lua/grug-far/engine/astgrep/blacklistedReplaceFlags.lua @@ -1,4 +1,4 @@ -local blacklistedSearchFlags = require('grug-far/engine/astgrep/blacklistedSearchFlags') +local blacklistedSearchFlags = require('grug-far.engine.astgrep.blacklistedSearchFlags') -- those are flags that would result in undesirable situations when replacing -- (in addition to the blacklisted search flags) diff --git a/lua/grug-far/engine/astgrep/getArgs.lua b/lua/grug-far/engine/astgrep/getArgs.lua index ede10f82..ed78964e 100644 --- a/lua/grug-far/engine/astgrep/getArgs.lua +++ b/lua/grug-far/engine/astgrep/getArgs.lua @@ -1,4 +1,4 @@ -local utils = require('grug-far/utils') +local utils = require('grug-far.utils') local rewriteFlags = { '--rewrite', diff --git a/lua/grug-far/engine/astgrep/parseResults.lua b/lua/grug-far/engine/astgrep/parseResults.lua index d4a94b0d..9f5b8c06 100644 --- a/lua/grug-far/engine/astgrep/parseResults.lua +++ b/lua/grug-far/engine/astgrep/parseResults.lua @@ -1,5 +1,5 @@ -local utils = require('grug-far/utils') -local engine = require('grug-far/engine') +local utils = require('grug-far.utils') +local engine = require('grug-far.engine') local ResultHighlightType = engine.ResultHighlightType local M = {} diff --git a/lua/grug-far/engine/astgrep/replace.lua b/lua/grug-far/engine/astgrep/replace.lua index 60fa109d..7beb9183 100644 --- a/lua/grug-far/engine/astgrep/replace.lua +++ b/lua/grug-far/engine/astgrep/replace.lua @@ -1,12 +1,12 @@ -local fetchCommandOutput = require('grug-far/engine/fetchCommandOutput') -local utils = require('grug-far/utils') -local getArgs = require('grug-far/engine/astgrep/getArgs') -local blacklistedReplaceFlags = require('grug-far/engine/astgrep/blacklistedReplaceFlags') -local fetchFilteredFilesList = require('grug-far/engine/ripgrep/fetchFilteredFilesList') -local runWithChunkedFiles = require('grug-far/engine/runWithChunkedFiles') -local argUtils = require('grug-far/engine/astgrep/argUtils') -local parseResults = require('grug-far/engine/astgrep/parseResults') -local ProcessingQueue = require('grug-far/engine/ProcessingQueue') +local fetchCommandOutput = require('grug-far.engine.fetchCommandOutput') +local utils = require('grug-far.utils') +local getArgs = require('grug-far.engine.astgrep.getArgs') +local blacklistedReplaceFlags = require('grug-far.engine.astgrep.blacklistedReplaceFlags') +local fetchFilteredFilesList = require('grug-far.engine.ripgrep.fetchFilteredFilesList') +local runWithChunkedFiles = require('grug-far.engine.runWithChunkedFiles') +local argUtils = require('grug-far.engine.astgrep.argUtils') +local parseResults = require('grug-far.engine.astgrep.parseResults') +local ProcessingQueue = require('grug-far.engine.ProcessingQueue') local M = {} diff --git a/lua/grug-far/engine/astgrep/search.lua b/lua/grug-far/engine/astgrep/search.lua index 76364013..7c3bceb0 100644 --- a/lua/grug-far/engine/astgrep/search.lua +++ b/lua/grug-far/engine/astgrep/search.lua @@ -1,13 +1,13 @@ -local fetchCommandOutput = require('grug-far/engine/fetchCommandOutput') -local getArgs = require('grug-far/engine/astgrep/getArgs') -local parseResults = require('grug-far/engine/astgrep/parseResults') -local utils = require('grug-far/utils') -local blacklistedSearchFlags = require('grug-far/engine/astgrep/blacklistedSearchFlags') -local getAstgrepVersion = require('grug-far/engine/astgrep/getAstgrepVersion') -local fetchFilteredFilesList = require('grug-far/engine/ripgrep/fetchFilteredFilesList') -local runWithChunkedFiles = require('grug-far/engine/runWithChunkedFiles') -local getRgVersion = require('grug-far/engine/ripgrep/getRgVersion') -local argUtils = require('grug-far/engine/astgrep/argUtils') +local fetchCommandOutput = require('grug-far.engine.fetchCommandOutput') +local getArgs = require('grug-far.engine.astgrep.getArgs') +local parseResults = require('grug-far.engine.astgrep.parseResults') +local utils = require('grug-far.utils') +local blacklistedSearchFlags = require('grug-far.engine.astgrep.blacklistedSearchFlags') +local getAstgrepVersion = require('grug-far.engine.astgrep.getAstgrepVersion') +local fetchFilteredFilesList = require('grug-far.engine.ripgrep.fetchFilteredFilesList') +local runWithChunkedFiles = require('grug-far.engine.runWithChunkedFiles') +local getRgVersion = require('grug-far.engine.ripgrep.getRgVersion') +local argUtils = require('grug-far.engine.astgrep.argUtils') local M = {} diff --git a/lua/grug-far/engine/fetchCommandOutput.lua b/lua/grug-far/engine/fetchCommandOutput.lua index 3796d37d..6f15c9d7 100644 --- a/lua/grug-far/engine/fetchCommandOutput.lua +++ b/lua/grug-far/engine/fetchCommandOutput.lua @@ -1,4 +1,4 @@ -local utils = require('grug-far/utils') +local utils = require('grug-far.utils') local uv = vim.uv ---@class FetchCommandOutputParams diff --git a/lua/grug-far/engine/ripgrep.lua b/lua/grug-far/engine/ripgrep.lua index 0503a8ac..382926a4 100644 --- a/lua/grug-far/engine/ripgrep.lua +++ b/lua/grug-far/engine/ripgrep.lua @@ -1,6 +1,6 @@ -local search = require('grug-far/engine/ripgrep/search') -local replace = require('grug-far/engine/ripgrep/replace') -local sync = require('grug-far/engine/ripgrep/sync') +local search = require('grug-far.engine.ripgrep.search') +local replace = require('grug-far.engine.ripgrep.replace') +local sync = require('grug-far.engine.ripgrep.sync') ---@type GrugFarEngine local RipgrepEngine = { diff --git a/lua/grug-far/engine/ripgrep/colors.lua b/lua/grug-far/engine/ripgrep/colors.lua index 8cc666d7..49f1f71e 100644 --- a/lua/grug-far/engine/ripgrep/colors.lua +++ b/lua/grug-far/engine/ripgrep/colors.lua @@ -1,4 +1,4 @@ -local ResultHighlightType = require('grug-far/engine').ResultHighlightType +local ResultHighlightType = require('grug-far.engine').ResultHighlightType local M = {} M.ansi_color_ending = '' diff --git a/lua/grug-far/engine/ripgrep/fetchFilesWithMatches.lua b/lua/grug-far/engine/ripgrep/fetchFilesWithMatches.lua index 29ac3898..5d2f6c15 100644 --- a/lua/grug-far/engine/ripgrep/fetchFilesWithMatches.lua +++ b/lua/grug-far/engine/ripgrep/fetchFilesWithMatches.lua @@ -1,6 +1,6 @@ -local getArgs = require('grug-far/engine/ripgrep/getArgs') -local blacklistedReplaceFlags = require('grug-far/engine/ripgrep/blacklistedReplaceFlags') -local fetchCommandOutput = require('grug-far/engine/fetchCommandOutput') +local getArgs = require('grug-far.engine.ripgrep.getArgs') +local blacklistedReplaceFlags = require('grug-far.engine.ripgrep.blacklistedReplaceFlags') +local fetchCommandOutput = require('grug-far.engine.fetchCommandOutput') ---@class FetchWithMatchesParams ---@field inputs GrugFarInputs diff --git a/lua/grug-far/engine/ripgrep/fetchFilteredFilesList.lua b/lua/grug-far/engine/ripgrep/fetchFilteredFilesList.lua index 91ad7b38..91161019 100644 --- a/lua/grug-far/engine/ripgrep/fetchFilteredFilesList.lua +++ b/lua/grug-far/engine/ripgrep/fetchFilteredFilesList.lua @@ -1,5 +1,5 @@ -local getArgs = require('grug-far/engine/ripgrep/getArgs') -local fetchCommandOutput = require('grug-far/engine/fetchCommandOutput') +local getArgs = require('grug-far.engine.ripgrep.getArgs') +local fetchCommandOutput = require('grug-far.engine.fetchCommandOutput') ---@class FetchFilteredFilesListParams ---@field inputs GrugFarInputs diff --git a/lua/grug-far/engine/ripgrep/fetchReplacedFileContent.lua b/lua/grug-far/engine/ripgrep/fetchReplacedFileContent.lua index b88d040e..d4a47f11 100644 --- a/lua/grug-far/engine/ripgrep/fetchReplacedFileContent.lua +++ b/lua/grug-far/engine/ripgrep/fetchReplacedFileContent.lua @@ -1,6 +1,6 @@ -local getArgs = require('grug-far/engine/ripgrep/getArgs') -local utils = require('grug-far/utils') -local blacklistedReplaceFlags = require('grug-far/engine/ripgrep/blacklistedReplaceFlags') +local getArgs = require('grug-far.engine.ripgrep.getArgs') +local utils = require('grug-far.utils') +local blacklistedReplaceFlags = require('grug-far.engine.ripgrep.blacklistedReplaceFlags') local uv = vim.uv ---@class FetchReplacedFileContentParams diff --git a/lua/grug-far/engine/ripgrep/getArgs.lua b/lua/grug-far/engine/ripgrep/getArgs.lua index b6906428..251039c3 100644 --- a/lua/grug-far/engine/ripgrep/getArgs.lua +++ b/lua/grug-far/engine/ripgrep/getArgs.lua @@ -1,5 +1,5 @@ -local utils = require('grug-far/utils') -local getRgVersion = require('grug-far/engine/ripgrep/getRgVersion') +local utils = require('grug-far.utils') +local getRgVersion = require('grug-far.engine.ripgrep.getRgVersion') --- get args for ripgrep or nil if params invalid / insufficient ---@param inputs GrugFarInputs diff --git a/lua/grug-far/engine/ripgrep/parseResults.lua b/lua/grug-far/engine/ripgrep/parseResults.lua index 7da65305..18892f04 100644 --- a/lua/grug-far/engine/ripgrep/parseResults.lua +++ b/lua/grug-far/engine/ripgrep/parseResults.lua @@ -1,5 +1,5 @@ -local utils = require('grug-far/utils') -local engine = require('grug-far/engine') +local utils = require('grug-far.utils') +local engine = require('grug-far.engine') local ResultHighlightType = engine.ResultHighlightType local M = {} diff --git a/lua/grug-far/engine/ripgrep/replace.lua b/lua/grug-far/engine/ripgrep/replace.lua index d1c87356..d6316b36 100644 --- a/lua/grug-far/engine/ripgrep/replace.lua +++ b/lua/grug-far/engine/ripgrep/replace.lua @@ -1,6 +1,6 @@ -local fetchFilesWithMatches = require('grug-far/engine/ripgrep/fetchFilesWithMatches') -local replaceInMatchedFiles = require('grug-far/engine/ripgrep/replaceInMatchedFiles') -local getArgs = require('grug-far/engine/ripgrep/getArgs') +local fetchFilesWithMatches = require('grug-far.engine.ripgrep.fetchFilesWithMatches') +local replaceInMatchedFiles = require('grug-far.engine.ripgrep.replaceInMatchedFiles') +local getArgs = require('grug-far.engine.ripgrep.getArgs') local M = {} diff --git a/lua/grug-far/engine/ripgrep/replaceInMatchedFiles.lua b/lua/grug-far/engine/ripgrep/replaceInMatchedFiles.lua index b31a54d3..0096ac8f 100644 --- a/lua/grug-far/engine/ripgrep/replaceInMatchedFiles.lua +++ b/lua/grug-far/engine/ripgrep/replaceInMatchedFiles.lua @@ -1,9 +1,9 @@ -local fetchReplacedFileContent = require('grug-far/engine/ripgrep/fetchReplacedFileContent') -local utils = require('grug-far/utils') -local fetchCommandOutput = require('grug-far/engine/fetchCommandOutput') -local argUtils = require('grug-far/engine/ripgrep/argUtils') -local getArgs = require('grug-far/engine/ripgrep/getArgs') -local parseResults = require('grug-far/engine/ripgrep/parseResults') +local fetchReplacedFileContent = require('grug-far.engine.ripgrep.fetchReplacedFileContent') +local utils = require('grug-far.utils') +local fetchCommandOutput = require('grug-far.engine.fetchCommandOutput') +local argUtils = require('grug-far.engine.ripgrep.argUtils') +local getArgs = require('grug-far.engine.ripgrep.getArgs') +local parseResults = require('grug-far.engine.ripgrep.parseResults') ---@class replaceInFileParams ---@field inputs GrugFarInputs diff --git a/lua/grug-far/engine/ripgrep/search.lua b/lua/grug-far/engine/ripgrep/search.lua index f63298e9..7fed87fc 100644 --- a/lua/grug-far/engine/ripgrep/search.lua +++ b/lua/grug-far/engine/ripgrep/search.lua @@ -1,10 +1,10 @@ -local fetchCommandOutput = require('grug-far/engine/fetchCommandOutput') -local utils = require('grug-far/utils') -local ProcessingQueue = require('grug-far/engine/ProcessingQueue') -local getRgVersion = require('grug-far/engine/ripgrep/getRgVersion') -local parseResults = require('grug-far/engine/ripgrep/parseResults') -local getArgs = require('grug-far/engine/ripgrep/getArgs') -local argUtils = require('grug-far/engine/ripgrep/argUtils') +local fetchCommandOutput = require('grug-far.engine.fetchCommandOutput') +local utils = require('grug-far.utils') +local ProcessingQueue = require('grug-far.engine.ProcessingQueue') +local getRgVersion = require('grug-far.engine.ripgrep.getRgVersion') +local parseResults = require('grug-far.engine.ripgrep.parseResults') +local getArgs = require('grug-far.engine.ripgrep.getArgs') +local argUtils = require('grug-far.engine.ripgrep.argUtils') local uv = vim.uv local M = {} diff --git a/lua/grug-far/engine/ripgrep/sync.lua b/lua/grug-far/engine/ripgrep/sync.lua index 1f465c9d..104d4300 100644 --- a/lua/grug-far/engine/ripgrep/sync.lua +++ b/lua/grug-far/engine/ripgrep/sync.lua @@ -1,6 +1,6 @@ -local syncChangedFiles = require('grug-far/engine/syncChangedFiles') -local getArgs = require('grug-far/engine/ripgrep/getArgs') -local utils = require('grug-far/utils') +local syncChangedFiles = require('grug-far.engine.syncChangedFiles') +local getArgs = require('grug-far.engine.ripgrep.getArgs') +local utils = require('grug-far.utils') local M = {} diff --git a/lua/grug-far/engine/syncChangedFiles.lua b/lua/grug-far/engine/syncChangedFiles.lua index 26dccb48..442ef048 100644 --- a/lua/grug-far/engine/syncChangedFiles.lua +++ b/lua/grug-far/engine/syncChangedFiles.lua @@ -1,4 +1,4 @@ -local utils = require('grug-far/utils') +local utils = require('grug-far.utils') --- performs sync for given changed file ---@param params { changedFile: ChangedFile, on_done: fun(errorMessage: string?) } diff --git a/lua/grug-far/farBuffer.lua b/lua/grug-far/farBuffer.lua index f33a0ae3..fb7603ee 100644 --- a/lua/grug-far/farBuffer.lua +++ b/lua/grug-far/farBuffer.lua @@ -1,23 +1,23 @@ -local render = require('grug-far/render') -local search = require('grug-far/actions/search') -local replace = require('grug-far/actions/replace') -local qflist = require('grug-far/actions/qflist') -local gotoLocation = require('grug-far/actions/gotoLocation') -local openLocation = require('grug-far/actions/openLocation') -local syncLocations = require('grug-far/actions/syncLocations') -local syncLine = require('grug-far/actions/syncLine') -local close = require('grug-far/actions/close') -local help = require('grug-far/actions/help') -local abort = require('grug-far/actions/abort') -local historyOpen = require('grug-far/actions/historyOpen') -local historyAdd = require('grug-far/actions/historyAdd') -local toggleShowCommand = require('grug-far/actions/toggleShowCommand') -local swapEngine = require('grug-far/actions/swapEngine') -local previewLocation = require('grug-far/actions/previewLocation') -local swapReplacementInterpreter = require('grug-far/actions/swapReplacementInterpreter') -local utils = require('grug-far/utils') -local resultsList = require('grug-far/render/resultsList') -local inputs = require('grug-far/inputs') +local render = require('grug-far.render') +local search = require('grug-far.actions.search') +local replace = require('grug-far.actions.replace') +local qflist = require('grug-far.actions.qflist') +local gotoLocation = require('grug-far.actions.gotoLocation') +local openLocation = require('grug-far.actions.openLocation') +local syncLocations = require('grug-far.actions.syncLocations') +local syncLine = require('grug-far.actions.syncLine') +local close = require('grug-far.actions.close') +local help = require('grug-far.actions.help') +local abort = require('grug-far.actions.abort') +local historyOpen = require('grug-far.actions.historyOpen') +local historyAdd = require('grug-far.actions.historyAdd') +local toggleShowCommand = require('grug-far.actions.toggleShowCommand') +local swapEngine = require('grug-far.actions.swapEngine') +local previewLocation = require('grug-far.actions.previewLocation') +local swapReplacementInterpreter = require('grug-far.actions.swapReplacementInterpreter') +local utils = require('grug-far.utils') +local resultsList = require('grug-far.render.resultsList') +local inputs = require('grug-far.inputs') local M = {} diff --git a/lua/grug-far/fold.lua b/lua/grug-far/fold.lua index d7341fee..ab66b0df 100644 --- a/lua/grug-far/fold.lua +++ b/lua/grug-far/fold.lua @@ -1,4 +1,4 @@ -local engine = require('grug-far/engine') +local engine = require('grug-far.engine') local M = {} ---@param line string diff --git a/lua/grug-far/history.lua b/lua/grug-far/history.lua index 0a8557d6..286b2c15 100644 --- a/lua/grug-far/history.lua +++ b/lua/grug-far/history.lua @@ -1,4 +1,4 @@ -local utils = require('grug-far/utils') +local utils = require('grug-far.utils') local M = {} local continuation_prefix = '| ' diff --git a/lua/grug-far/render.lua b/lua/grug-far/render.lua index 8ecbf00c..1c8a1562 100644 --- a/lua/grug-far/render.lua +++ b/lua/grug-far/render.lua @@ -1,8 +1,8 @@ -local renderHelp = require('grug-far/render/help') -local renderInput = require('grug-far/render/input') -local renderResults = require('grug-far/render/results') -local utils = require('grug-far/utils') -local inputs = require('grug-far/inputs') +local renderHelp = require('grug-far.render.help') +local renderInput = require('grug-far.render.input') +local renderResults = require('grug-far.render.results') +local utils = require('grug-far.utils') +local inputs = require('grug-far.inputs') local InputNames = inputs.InputNames local TOP_EMPTY_LINES = 2 diff --git a/lua/grug-far/render/help.lua b/lua/grug-far/render/help.lua index 202a1805..4f5e3d4c 100644 --- a/lua/grug-far/render/help.lua +++ b/lua/grug-far/render/help.lua @@ -1,5 +1,5 @@ -local opts = require('grug-far/opts') -local utils = require('grug-far/utils') +local opts = require('grug-far.opts') +local utils = require('grug-far.utils') ---@alias VirtText string[] diff --git a/lua/grug-far/render/input.lua b/lua/grug-far/render/input.lua index ebb46363..d7202a41 100644 --- a/lua/grug-far/render/input.lua +++ b/lua/grug-far/render/input.lua @@ -1,5 +1,5 @@ -local opts = require('grug-far/opts') -local treesitter = require('grug-far/render/treesitter') +local opts = require('grug-far.opts') +local treesitter = require('grug-far.render.treesitter') ---@class InputRenderParams ---@field buf integer diff --git a/lua/grug-far/render/results.lua b/lua/grug-far/render/results.lua index 0285ce21..8111b758 100644 --- a/lua/grug-far/render/results.lua +++ b/lua/grug-far/render/results.lua @@ -1,4 +1,4 @@ -local renderResultsHeader = require('grug-far/render/resultsHeader') +local renderResultsHeader = require('grug-far.render.resultsHeader') --- ensure a minimum line number so that we don't overlap inputs ---@param buf integer diff --git a/lua/grug-far/render/resultsHeader.lua b/lua/grug-far/render/resultsHeader.lua index c8973f0e..5653b18b 100644 --- a/lua/grug-far/render/resultsHeader.lua +++ b/lua/grug-far/render/resultsHeader.lua @@ -1,4 +1,4 @@ -local opts = require('grug-far/opts') +local opts = require('grug-far.opts') --- gets status text ---@param context GrugFarContext diff --git a/lua/grug-far/render/resultsList.lua b/lua/grug-far/render/resultsList.lua index 30373f56..3cb2e99b 100644 --- a/lua/grug-far/render/resultsList.lua +++ b/lua/grug-far/render/resultsList.lua @@ -1,7 +1,7 @@ -local opts = require('grug-far/opts') -local utils = require('grug-far/utils') -local treesitter = require('grug-far/render/treesitter') -local ResultHighlightType = require('grug-far/engine').ResultHighlightType +local opts = require('grug-far.opts') +local utils = require('grug-far.utils') +local treesitter = require('grug-far.render.treesitter') +local ResultHighlightType = require('grug-far.engine').ResultHighlightType local M = {} diff --git a/lua/grug-far/replacementInterpreter.lua b/lua/grug-far/replacementInterpreter.lua index 7918d639..5b9396b2 100644 --- a/lua/grug-far/replacementInterpreter.lua +++ b/lua/grug-far/replacementInterpreter.lua @@ -1,5 +1,5 @@ -local treesitter = require('grug-far/render/treesitter') -local resultsList = require('grug-far/render/resultsList') +local treesitter = require('grug-far.render.treesitter') +local resultsList = require('grug-far.render.resultsList') local M = {} ---@class GrugFarReplacementInterpreter @@ -12,9 +12,9 @@ local M = {} ---@return GrugFarReplacementInterpreter? function M.getReplacementInterpreter(type) if type == 'lua' then - return require('grug-far/replacementInterpreter/luascript') + return require('grug-far.replacementInterpreter.luascript') elseif type == 'vimscript' then - return require('grug-far/replacementInterpreter/vimscript') + return require('grug-far.replacementInterpreter.vimscript') end return nil diff --git a/lua/grug-far/test/helpers.lua b/lua/grug-far/test/helpers.lua index 4cf52db9..7176de65 100644 --- a/lua/grug-far/test/helpers.lua +++ b/lua/grug-far/test/helpers.lua @@ -1,7 +1,7 @@ local MiniTest = require('mini.test') local expect = MiniTest.expect -local screenshot = require('grug-far/test/screenshot') -local opts = require('grug-far/opts') +local screenshot = require('grug-far.test.screenshot') +local opts = require('grug-far.opts') local M = {} @@ -164,7 +164,7 @@ function M.initChildNeovim(child) [[ GrugFar = require('grug-far') GrugFar.setup(...) - Helpers = require('grug-far/test/helpers') + Helpers = require('grug-far.test.helpers') vim.cmd('set showtabline=0') ]], { diff --git a/scripts/test_plugin_config.lua b/scripts/test_plugin_config.lua index 766c25ea..59b0e465 100644 --- a/scripts/test_plugin_config.lua +++ b/scripts/test_plugin_config.lua @@ -1,6 +1,6 @@ vim.cmd([[let &rtp.=','.getcwd()]]) vim.cmd('set rtp+=deps/mini.nvim') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local grugFar = require('grug-far') grugFar.setup(helpers.getSetupOptions()) diff --git a/tests/astgrep/test_goto.lua b/tests/astgrep/test_goto.lua index 743b438b..c23abc13 100644 --- a/tests/astgrep/test_goto.lua +++ b/tests/astgrep/test_goto.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/astgrep/test_history.lua b/tests/astgrep/test_history.lua index 9a6777dc..6d5e27a3 100644 --- a/tests/astgrep/test_history.lua +++ b/tests/astgrep/test_history.lua @@ -1,7 +1,7 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() -local opts = require('grug-far/opts') +local opts = require('grug-far.opts') ---@type NeovimChild local child = MiniTest.new_child_neovim() diff --git a/tests/astgrep/test_lua_interpreter.lua b/tests/astgrep/test_lua_interpreter.lua index 7e9f8471..99f3dda9 100644 --- a/tests/astgrep/test_lua_interpreter.lua +++ b/tests/astgrep/test_lua_interpreter.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/astgrep/test_open.lua b/tests/astgrep/test_open.lua index e2e59ce0..7c27c870 100644 --- a/tests/astgrep/test_open.lua +++ b/tests/astgrep/test_open.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/astgrep/test_parseResults.lua b/tests/astgrep/test_parseResults.lua index 28e93255..2988b9fd 100644 --- a/tests/astgrep/test_parseResults.lua +++ b/tests/astgrep/test_parseResults.lua @@ -1,4 +1,4 @@ -local parseResults = require('grug-far/engine/astgrep/parseResults') +local parseResults = require('grug-far.engine.astgrep.parseResults') local MiniTest = require('mini.test') local expect = MiniTest.expect diff --git a/tests/astgrep/test_replace.lua b/tests/astgrep/test_replace.lua index 7fbeaf2a..7dbf0895 100644 --- a/tests/astgrep/test_replace.lua +++ b/tests/astgrep/test_replace.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/astgrep/test_search.lua b/tests/astgrep/test_search.lua index b7f176a4..0a965c25 100644 --- a/tests/astgrep/test_search.lua +++ b/tests/astgrep/test_search.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') ---@type NeovimChild local child = MiniTest.new_child_neovim() diff --git a/tests/astgrep/test_sync.lua b/tests/astgrep/test_sync.lua index 9153b4fd..169d9d6b 100644 --- a/tests/astgrep/test_sync.lua +++ b/tests/astgrep/test_sync.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/astgrep/test_ui.lua b/tests/astgrep/test_ui.lua index ef45512d..23ceea9f 100644 --- a/tests/astgrep/test_ui.lua +++ b/tests/astgrep/test_ui.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') ---@type NeovimChild local child = MiniTest.new_child_neovim() diff --git a/tests/astgrep/test_vimscript_interpreter.lua b/tests/astgrep/test_vimscript_interpreter.lua index 1e176315..b6a94e7c 100644 --- a/tests/astgrep/test_vimscript_interpreter.lua +++ b/tests/astgrep/test_vimscript_interpreter.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/base/test_close.lua b/tests/base/test_close.lua index fe13714c..de2d9a6f 100644 --- a/tests/base/test_close.lua +++ b/tests/base/test_close.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/base/test_goto.lua b/tests/base/test_goto.lua index 9d406ce4..d5225b35 100644 --- a/tests/base/test_goto.lua +++ b/tests/base/test_goto.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/base/test_history.lua b/tests/base/test_history.lua index 92a697ea..5a0dcccd 100644 --- a/tests/base/test_history.lua +++ b/tests/base/test_history.lua @@ -1,6 +1,6 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') -local opts = require('grug-far/opts') +local helpers = require('grug-far.test.helpers') +local opts = require('grug-far.opts') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/base/test_instance_api.lua b/tests/base/test_instance_api.lua index 3ac998db..2367f157 100644 --- a/tests/base/test_instance_api.lua +++ b/tests/base/test_instance_api.lua @@ -1,6 +1,6 @@ local MiniTest = require('mini.test') local expect = MiniTest.expect -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') ---@type NeovimChild local child = MiniTest.new_child_neovim() diff --git a/tests/base/test_lua_interpreter.lua b/tests/base/test_lua_interpreter.lua index a901d931..4e85ca8c 100644 --- a/tests/base/test_lua_interpreter.lua +++ b/tests/base/test_lua_interpreter.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/base/test_open.lua b/tests/base/test_open.lua index 3a7236ff..4fe8ac88 100644 --- a/tests/base/test_open.lua +++ b/tests/base/test_open.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/base/test_opts.lua b/tests/base/test_opts.lua index 93027d74..b504c102 100644 --- a/tests/base/test_opts.lua +++ b/tests/base/test_opts.lua @@ -1,4 +1,4 @@ -local opts = require('grug-far/opts') +local opts = require('grug-far.opts') local MiniTest = require('mini.test') local expect = MiniTest.expect diff --git a/tests/base/test_preview.lua b/tests/base/test_preview.lua index dbc250aa..d88908b9 100644 --- a/tests/base/test_preview.lua +++ b/tests/base/test_preview.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/base/test_quickfix.lua b/tests/base/test_quickfix.lua index 6317a830..28683f11 100644 --- a/tests/base/test_quickfix.lua +++ b/tests/base/test_quickfix.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/base/test_replace.lua b/tests/base/test_replace.lua index 0807cce5..5138872e 100644 --- a/tests/base/test_replace.lua +++ b/tests/base/test_replace.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/base/test_search.lua b/tests/base/test_search.lua index 6aa02f35..d2b8a86c 100644 --- a/tests/base/test_search.lua +++ b/tests/base/test_search.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') ---@type NeovimChild local child = MiniTest.new_child_neovim() diff --git a/tests/base/test_sync.lua b/tests/base/test_sync.lua index 942f8196..a529ae06 100644 --- a/tests/base/test_sync.lua +++ b/tests/base/test_sync.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild diff --git a/tests/base/test_toggle_flags.lua b/tests/base/test_toggle_flags.lua index f10765dc..5ea85d6e 100644 --- a/tests/base/test_toggle_flags.lua +++ b/tests/base/test_toggle_flags.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') ---@type NeovimChild local child = MiniTest.new_child_neovim() diff --git a/tests/base/test_toggle_instance.lua b/tests/base/test_toggle_instance.lua index e6897416..98f01938 100644 --- a/tests/base/test_toggle_instance.lua +++ b/tests/base/test_toggle_instance.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') ---@type NeovimChild local child = MiniTest.new_child_neovim() diff --git a/tests/base/test_ui.lua b/tests/base/test_ui.lua index 1e202f99..e7e54925 100644 --- a/tests/base/test_ui.lua +++ b/tests/base/test_ui.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') ---@type NeovimChild local child = MiniTest.new_child_neovim() diff --git a/tests/base/test_utils.lua b/tests/base/test_utils.lua index 2492fa7b..25691a83 100644 --- a/tests/base/test_utils.lua +++ b/tests/base/test_utils.lua @@ -1,4 +1,4 @@ -local utils = require('grug-far/utils') +local utils = require('grug-far.utils') local MiniTest = require('mini.test') local expect = MiniTest.expect diff --git a/tests/base/test_vimscript_interpreter.lua b/tests/base/test_vimscript_interpreter.lua index b20fac46..c63a1037 100644 --- a/tests/base/test_vimscript_interpreter.lua +++ b/tests/base/test_vimscript_interpreter.lua @@ -1,5 +1,5 @@ local MiniTest = require('mini.test') -local helpers = require('grug-far/test/helpers') +local helpers = require('grug-far.test.helpers') local keymaps = helpers.getKeymaps() ---@type NeovimChild