rebase and retry

.github/workflows/ci.yml

@@ -38,28 +38,23 @@ jobs:
  steps:
  - uses: actions/checkout@v4
 
- - run: date +%F > todays-date
-
  - uses: rhysd/action-setup-vim@v1
  with:
  neovim: true
  version: ${{ matrix.rev }}
 
- - name: Restore from todays cache
- uses: actions/cache@v4
- with:
- path: deps
- key: ${{ runner.os }}-deps-${{ matrix.version }}-${{ hashFiles('todays-date') }}
- restore-keys: |
- ${{ runner.os }}-deps-${{ matrix.version }}-
-
-
- - name: Install ripgrep
+ - name: Prepare
  run: |
  ${{ matrix.manager }} update
+ ${{ matrix.manager }} upgrade
  ${{ matrix.manager }} install ${{ matrix.packages }}
  rg --version
 
+ mkdir -p ~/.local/share/nvim/site/pack/vendor/start
+ git clone --depth 1 https://github.com/nvim-lua/plenary.nvim ~/.local/share/nvim/site/pack/vendor/start/plenary.nvim
+ git clone --depth 1 https://github.com/nvim-tree/nvim-web-devicons ~/.local/share/nvim/site/pack/vendor/start/nvim-web-devicons
+ ln -s $(pwd) ~/.local/share/nvim/site/pack/vendor/start
+
  - name: Run tests
  run: |
  nvim --version

.github/workflows/lint.yml

@@ -23,7 +23,7 @@ jobs:
  runs-on: ubuntu-22.04
  steps:
  - uses: actions/checkout@v4
- - uses: JohnnyMorganz/stylua-action@v3
+ - uses: JohnnyMorganz/stylua-action@v4
  with:
  token: ${{ secrets.GITHUB_TOKEN }}
  version: latest

.gitignore

@@ -1,5 +1,4 @@
 build/
 doc/tags
-deps/
 
 .luacheckcache

Makefile

@@ -1,37 +1,10 @@
-.PHONY: test lint docgen clean
+.PHONY: test lint docgen
 
-DEPS_DIR := deps
-PLENARY_DIR := $(DEPS_DIR)/plenary.nvim
-DEVICONS_DIR := $(DEPS_DIR)/nvim-web-devicions
-
-define git_clone_or_pull
-@mkdir -p $(dir $1)
-@if [ ! -d "$1" ]; then \
- git clone --depth 1 $2 $1; \
-else \
- git -C "$1" pull; \
-fi
-endef
-
-$(DEPS_DIR):
- @mkdir -p $@
-
-plenary: | $(DEPS_DIR)
- $(call git_clone_or_pull,$(PLENARY_DIR),https://github.com/nvim-lua/plenary.nvim)
-
-test-deps: plenary | $(DEPS_DIR)
- $(call git_clone_or_pull,$(DEVICONS_DIR),https://github.com/nvim-tree/nvim-web-devicons)
-
-test: plenary
+test:
  nvim --headless --noplugin -u scripts/minimal_init.vim -c "PlenaryBustedDirectory lua/tests/automated/ { minimal_init = './scripts/minimal_init.vim' }"
 
 lint:
  luacheck lua/telescope
 
-# pinned tree-sitter-lua commit no longer works on nightly (0.10)
 docgen:
  nvim --headless --noplugin -u scripts/minimal_init.vim -c "luafile ./scripts/gendocs.lua" -c 'qa'
-
-clean:
- @rm -rf $(DEPS_DIR)
-

lua/telescope/utils.lua

@@ -265,7 +265,7 @@ end
 --- this function outside of telescope might yield to undefined behavior and will
 --- not be addressed by us
 ---@param opts table: The opts the users passed into the picker. Might contains a path_display key
----@param path string?: The path that should be formatted
+---@param path string|nil: The path that should be formatted
 ---@return string: The transformed path ready to be displayed
 utils.transform_path = function(opts, path)
  if path == nil then

scripts/minimal_init.vim

@@ -1,10 +1,8 @@
 set rtp+=.
-set rtp+=deps/plenary.nvim/
-set rtp+=deps/tree-sitter-lua/
-set rtp+=deps/nvim-web-devicons/
+set rtp+=../plenary.nvim/
+set rtp+=../tree-sitter-lua/
 
 runtime! plugin/plenary.vim
 runtime! plugin/telescope.lua
-" runtime! plugin/ts_lua.vim
 
 let g:telescope_test_delay = 100