Merge branch 'main' into indent-level

Author: and-rs

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        **Before** reporting an issue, make sure to read [`:h neo-tree.txt`](https://github.com/nvim-neo-tree/neo-tree.nvim/blob/v2.x/doc/neo-tree.txt) and search [existing issues](https://github.com/nvim-neo-tree/neo-tree.nvim/issues). Usage questions such as ***"How do I...?"*** belong in [Discussions](https://github.com/nvim-neo-tree/neo-tree.nvim/discussions) and will be closed.
+        **Before** reporting an issue, make sure to read [`:h neo-tree.txt`](https://github.com/nvim-neo-tree/neo-tree.nvim/blob/v3.x/doc/neo-tree.txt) and search [existing issues](https://github.com/nvim-neo-tree/neo-tree.nvim/issues). Usage questions such as ***"How do I...?"*** belong in [Discussions](https://github.com/nvim-neo-tree/neo-tree.nvim/discussions) and will be closed.
   - type: checkboxes
     attributes:
       label: Did you check docs and existing issues?
@@ -21,7 +21,7 @@ body:
   - type: input
     attributes:
       label: "Neovim Version (nvim -v)"
-      placeholder: "0.8.0 commit db1b0ee3b30f"
+      placeholder: "NVIM v0.10.3"
     validations:
       required: true
   - type: input
@@ -63,47 +63,30 @@ body:
       label: Your Configuration
       description: Minimal `init.lua` to reproduce this issue. Save as `repro.lua` and run with `nvim -u repro.lua`
       value: |
-        -- DO NOT change the paths and don't remove the colorscheme
-        local root = vim.fn.fnamemodify("./.repro", ":p")
+        -- template from https://lazy.folke.io/developers#reprolua, feel free to replace if you have your own minimal init.lua
+        vim.env.LAZY_STDPATH = ".repro"
+        load(vim.fn.system("curl -s https://raw.githubusercontent.com/folke/lazy.nvim/main/bootstrap.lua"))()
 
-        -- set stdpaths to use .repro
-        for _, name in ipairs({ "config", "data", "state", "cache" }) do
-          vim.env[("XDG_%s_HOME"):format(name:upper())] = root .. "/" .. name
-        end
-
-        -- bootstrap lazy
-        local lazypath = root .. "/plugins/lazy.nvim"
-        if not vim.loop.fs_stat(lazypath) then
-          vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", lazypath, })
-        end
-        vim.opt.runtimepath:prepend(lazypath)
-
-        -- install plugins
-        local plugins = {
-          "folke/tokyonight.nvim",
-          -- add any other plugins here
-        }
-
-        local neotree_config = {
-          "nvim-neo-tree/neo-tree.nvim",
-          dependencies = { "MunifTanjim/nui.nvim", "nvim-tree/nvim-web-devicons", "nvim-lua/plenary.nvim" },
-          cmd = { "Neotree" },
-          keys = {
-            { "<Leader>e", "<Cmd>Neotree<CR>" }, -- change or remove this line if relevant.
+        require("lazy.minit").repro({
+          spec = {
+            {
+              "nvim-neo-tree/neo-tree.nvim",
+              branch = "v3.x", -- or "main"
+              dependencies = {
+                "nvim-lua/plenary.nvim",
+                "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+                "MunifTanjim/nui.nvim",
+                -- { "3rd/image.nvim", opts = {} }, -- Optional image support
+              },
+              opts = {
+                -- fill any relevant options here
+              },
+            }
           },
-          opts = {
-            -- Your config here
-            -- ...
-          },
-        }
-
-        table.insert(plugins, neotree_config)
-        require("lazy").setup(plugins, {
-          root = root .. "/plugins",
         })
-
-        vim.cmd.colorscheme("tokyonight")
-        -- add anything else here
+        vim.g.mapleader = " "
+        vim.keymap.set("n", "<leader>e", "<Cmd>Neotree<CR>")
+        -- do anything else you need to do to reproduce the issue
       render: Lua
     validations:
       required: true

.github/workflows/ci.yml

@@ -12,33 +12,42 @@ jobs:
   stylua-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Check formatting
-        uses: JohnnyMorganz/stylua-action@v2
+        uses: JohnnyMorganz/stylua-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          version: v0.16.0
-          args: --color always --check -g '!**/defaults.lua' lua/
+          version: latest
+          args: --color always --check lua/
 
   plenary-tests:
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            rev: nightly/nvim-linux-x86_64.tar.gz
+          - os: ubuntu-22.04
+            rev: v0.8.3/nvim-linux64.tar.gz
+          - os: ubuntu-22.04
+            rev: v0.9.5/nvim-linux64.tar.gz
+          - os: ubuntu-22.04
+            rev: v0.10.4/nvim-linux-x86_64.tar.gz
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: date +%F > todays-date
       - name: Restore cache for today's nightly.
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: build
-          key: ${{ runner.os }}-appimage-${{ hashFiles('todays-date') }}
-
+          key: ${{ runner.os }}-${{ matrix.rev }}-${{ hashFiles('todays-date') }}
       - name: Prepare
         run: |
           test -d build || {
             mkdir -p build
-            wget https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage
-            chmod +x nvim.appimage
-            mv nvim.appimage ./build/nvim
+            curl -sL "https://github.com/neovim/neovim/releases/download/${{ matrix.rev }}" | tar xzf - --strip-components=1 -C "${PWD}/build"
           }
 
       # - name: Get Luver Cache Key
@@ -66,7 +75,7 @@ jobs:
 
       - name: Run tests
         run: |
-          export PATH="${PWD}/build/:${PATH}"
+          export PATH="${PWD}/build/bin:${PATH}"
           ./scripts/test.sh
 
       # - name: Upload coverage to Codecov

.github/workflows/protect_release_branches.yml

@@ -21,7 +21,7 @@ jobs:
         run: |
           target=${{ github.base_ref }}
           echo "Target is: $target"
-          if [[ $target  == "v2.x" ]]; then
+          if [[ $target != "main" ]]; then
             echo "PRs must target main"
             exit 1
           else

.stylua.toml

@@ -3,3 +3,4 @@ line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 2
 quote_style = "AutoPreferDouble"
+syntax = "LuaJIT"