refactor: cleanup

## Description

Don't count `ft=jj` buffers towards those that need persisting

## Related Issue(s)

https://github.com/LazyVim/LazyVim/discussions/5545

.editorconfig

@@ -0,0 +1,7 @@
+root = true
+
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+charset = utf-8

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,7 +6,10 @@ body:
   - type: markdown
     attributes:
       value: |
-        **Before** reporting an issue, make sure to read the [documentation](https://github.com/folke/persistence.nvim) and search [existing issues](https://github.com/folke/persistence.nvim/issues). Usage questions such as ***"How do I...?"*** belong in [Discussions](https://github.com/folke/persistence.nvim/discussions) and will be closed.
+        **Before** reporting an issue, make sure to read the [documentation](https://github.com/folke/persistence.nvim)
+        and search [existing issues](https://github.com/folke/persistence.nvim/issues).
+
+        Usage questions such as ***"How do I...?"*** belong in [Discussions](https://github.com/folke/persistence.nvim/discussions) and will be closed.
   - type: checkboxes
     attributes:
       label: Did you check docs and existing issues?
@@ -14,6 +17,8 @@ body:
       options:
         - label: I have read all the persistence.nvim docs
           required: true
+        - label: I have updated the plugin to the latest version before submitting this issue
+          required: true
         - label: I have searched the existing issues of persistence.nvim
           required: true
         - label: I have searched the existing issues of plugins related to this issue
@@ -57,33 +62,15 @@ body:
       label: Repro
       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
+        vim.env.LAZY_STDPATH = ".repro"
-        local root = vim.fn.fnamemodify("./.repro", ":p")
+        load(vim.fn.system("curl -s https://raw.githubusercontent.com/folke/lazy.nvim/main/bootstrap.lua"))()
 
-        -- set stdpaths to use .repro
+        require("lazy.minit").repro({
-        for _, name in ipairs({ "config", "data", "state", "cache" }) do
+          spec = {
-          vim.env[("XDG_%s_HOME"):format(name:upper())] = root .. "/" .. name
+            { "folke/persistence.nvim", opts = {} },
-        end
+            -- add any other plugins here
-
+          },
-        -- 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",
-          { "folke/persistence.nvim", opts = {} },
-          -- add any other plugins here
-        }
-        require("lazy").setup(plugins, {
-          root = root .. "/plugins",
         })
-
+      render: lua
-        vim.cmd.colorscheme("tokyonight")
-        -- add anything else here
-      render: Lua
     validations:
       required: false

.github/workflows/ci.yml

@@ -12,4 +12,3 @@ jobs:
     with:
       plugin: persistence.nvim
       repo: folke/persistence.nvim
-      tests: false

.github/workflows/stale.yml

@@ -5,6 +5,7 @@ on:
     - cron: "30 1 * * *"
 
 jobs:
-  ci:
+  stale:
+    if: contains(fromJSON('["folke", "LazyVim"]'), github.repository_owner)
     uses: folke/github/.github/workflows/stale.yml@main
     secrets: inherit

.github/workflows/update.yml

@@ -7,6 +7,7 @@ on:
     - cron: "0 * * * *"
 
 jobs:
-  ci:
+  update:
+    if: contains(fromJSON('["folke", "LazyVim"]'), github.repository_owner)
     uses: folke/github/.github/workflows/update.yml@main
     secrets: inherit

.gitignore

@@ -1,8 +1,9 @@
 *.log
-.repro
+/.repro
-.tests
+/.tests
-build
+/build
-debug
+/debug
-doc/tags
+/doc/tags
 foo.*
+node_modules
 tt.*

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [3.1.0](https://github.com/folke/persistence.nvim/compare/v3.0.1...v3.1.0) (2024-07-07)
+
+
+### Features
+
+* **load:** fallback to regular session when branch session does not exist (yet) ([a93748a](https://github.com/folke/persistence.nvim/commit/a93748acdb2e7bc4389b3738b4c787b764c3b2a6))
+
+## [3.0.1](https://github.com/folke/persistence.nvim/compare/v3.0.0...v3.0.1) (2024-07-07)
+
+
+### Bug Fixes
+
+* branch detection. Closes [#62](https://github.com/folke/persistence.nvim/issues/62) ([a1d37fa](https://github.com/folke/persistence.nvim/commit/a1d37fa32ef9431f6a57c217ba5c456d20834679))
+* **branch:** escape branch name. Fixes [#65](https://github.com/folke/persistence.nvim/issues/65) ([1565ca0](https://github.com/folke/persistence.nvim/commit/1565ca0af2d93ee94335c2950d92bc133c90aa82))
+* windows ([2d83b1a](https://github.com/folke/persistence.nvim/commit/2d83b1a5c3fe5b2251866f5263fb9607db8d64c0))
+
 ## [3.0.0](https://github.com/folke/persistence.nvim/compare/v2.0.0...v3.0.0) (2024-07-06)
 
 

doc/persistence.nvim.txt

@@ -1,4 +1,4 @@
-*persistence.nvim.txt*           For Neovim          Last change: 2024 July 06
+*persistence.nvim.txt*         For Neovim        Last change: 2025 February 25
 
 ==============================================================================
 Table of Contents                         *persistence.nvim-table-of-contents*

lua/persistence/init.lua

@@ -3,17 +3,18 @@ local Config = require("persistence.config")
 local uv = vim.uv or vim.loop
 
 local M = {}
----@type string?
+M._active = false
-M._current = nil
 
 local e = vim.fn.fnameescape
 
-function M.current()
+---@param opts? {branch?: boolean}
-  local name = vim.fn.getcwd():gsub("[\\/:]", "%%")
+function M.current(opts)
-  if Config.options.branch then
+  opts = opts or {}
+  local name = vim.fn.getcwd():gsub("[\\/:]+", "%%")
+  if Config.options.branch and opts.branch ~= false then
     local branch = M.branch()
     if branch and branch ~= "main" and branch ~= "master" then
-      name = name .. "-" .. branch
+      name = name .. "%%" .. branch:gsub("[\\/:]+", "%%")
     end
   end
   return Config.options.dir .. name .. ".vim"
@@ -32,11 +33,11 @@ end
 
 -- Check if a session is active
 function M.active()
-  return M._current ~= nil
+  return M._active
 end
 
 function M.start()
-  M._current = M.current()
+  M._active = true
   vim.api.nvim_create_autocmd("VimLeavePre", {
     group = vim.api.nvim_create_augroup("persistence", { clear = true }),
     callback = function()
@@ -44,7 +45,7 @@ function M.start()
 
       if Config.options.need > 0 then
         local bufs = vim.tbl_filter(function(b)
-          if vim.bo[b].buftype ~= "" or vim.bo[b].filetype == "gitcommit" or vim.bo[b].filetype == "gitrebase" then
+          if vim.bo[b].buftype ~= "" or vim.tbl_contains({ "gitcommit", "gitrebase", "jj" }, vim.bo[b].filetype) then
             return false
           end
           return vim.api.nvim_buf_get_name(b) ~= ""
@@ -61,25 +62,31 @@ function M.start()
 end
 
 function M.stop()
-  M._current = nil
+  M._active = false
   pcall(vim.api.nvim_del_augroup_by_name, "persistence")
 end
 
 function M.save()
-  vim.cmd("mks! " .. e(M._current or M.current()))
+  vim.cmd("mks! " .. e(M.current()))
 end
 
----@param opts? { last?: boolean, file?: string }
+---@param opts? { last?: boolean }
 function M.load(opts)
   opts = opts or {}
-  local file = opts.file or opts.last and M.last() or M.current()
+  ---@type string
+  local file
+  if opts.last then
+    file = M.last()
+  else
+    file = M.current()
+    if vim.fn.filereadable(file) == 0 then
+      file = M.current({ branch = false })
+    end
+  end
   if file and vim.fn.filereadable(file) ~= 0 then
     M.fire("LoadPre")
     vim.cmd("silent! source " .. e(file))
     M.fire("LoadPost")
-    if M._current then
-      M.start()
-    end
   end
 end
 
@@ -97,12 +104,21 @@ function M.last()
 end
 
 function M.select()
-  ---@type { session: string, dir: string }[]
+  ---@type { session: string, dir: string, branch?: string }[]
   local items = {}
+  local have = {} ---@type table<string, boolean>
   for _, session in ipairs(M.list()) do
     if uv.fs_stat(session) then
-      local dir = session:sub(#Config.options.dir + 1, -5):gsub("%%", "/")
+      local file = session:sub(#Config.options.dir + 1, -5)
-      items[#items + 1] = { session = session, dir = dir }
+      local dir, branch = unpack(vim.split(file, "%%", { plain = true }))
+      dir = dir:gsub("%%", "/")
+      if jit.os:find("Windows") then
+        dir = dir:gsub("^(%w)/", "%1:/")
+      end
+      if not have[dir] then
+        have[dir] = true
+        items[#items + 1] = { session = session, dir = dir, branch = branch }
+      end
     end
   end
   vim.ui.select(items, {
@@ -112,7 +128,8 @@ function M.select()
     end,
   }, function(item)
     if item then
-      M.load({ file = item.session })
+      vim.fn.chdir(item.dir)
+      M.load()
     end
   end)
 end
@@ -120,7 +137,10 @@ end
 --- get current branch name
 ---@return string?
 function M.branch()
-  return vim.fn.systemlist("git branch --show-current")[1]
+  if uv.fs_stat(".git") then
+    local ret = vim.fn.systemlist("git branch --show-current")[1]
+    return vim.v.shell_error == 0 and ret or nil
+  end
 end
 
 return M