fix(scratchPad): option defined in wrong order (#333)

## 📃 Summary the default scratchPad options should override the neovim ones to make the buffers usable
shortcuts · Mar 27, 2024 · 0e27d1f · 0e27d1f
1 parent da79b97
commit 0e27d1f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/lua/no-neck-pain/wins.lua b/lua/no-neck-pain/wins.lua
@@ -71,33 +71,30 @@ function W.initScratchPad(side, id, cleanup)
         return W.initSideOptions(side, id)
     end
 
-    local bufID = vim.api.nvim_win_get_buf(id)
-
-    A.setBufferOption(bufID, "bufhidden", "")
-    A.setBufferOption(bufID, "buftype", "")
-    A.setBufferOption(bufID, "buflisted", false)
-    A.setBufferOption(bufID, "autoread", true)
-    A.setWindowOption(id, "conceallevel", 2)
-
     D.log(
         string.format("W.initScratchPad:%s", side),
         "enabled with location %s",
         _G.NoNeckPain.config.buffers[side].scratchPad.pathToFile
     )
 
+    W.initSideOptions(side, id)
+
     vim.cmd(string.format("edit %s", _G.NoNeckPain.config.buffers[side].scratchPad.pathToFile))
 
-    W.initSideOptions(side, id)
+    A.setBufferOption(0, "bufhidden", "")
+    A.setBufferOption(0, "buftype", "")
+    A.setBufferOption(0, "buflisted", false)
+    A.setBufferOption(0, "autoread", true)
+    A.setWindowOption(id, "conceallevel", 2)
 
     -- users might want to use a filetype that isn't supported by neovim, we should let them
     -- if they've defined it on the configuration side.
-    if vim.api.nvim_buf_get_option(bufID, "filetype") == "" then
+    if vim.api.nvim_buf_get_option(0, "filetype") == "" then
         local filetype = _G.NoNeckPain.config.buffers[side].bo.filetype
-        if filetype == "" or "no-neck-pain" then
+        if filetype == "" or filetype == "no-neck-pain" then
             filetype = "norg"
         end
-
-        A.setBufferOption(bufID, "filetype", "norg")
+        A.setBufferOption(0, "filetype", filetype)
     end
 
     vim.o.autowriteall = true
@@ -148,8 +145,8 @@ function W.createSideBuffers(skipIntegrations)
                 S.setSideID(S, id, side)
 
                 if _G.NoNeckPain.config.buffers[side].scratchPad.enabled then
-                    W.initScratchPad(side, id)
                     S.setScratchPad(S, true)
+                    W.initScratchPad(side, id)
                 else
                     W.initSideOptions(side, id)
                 end

diff --git a/tests/test_scratchpad.lua b/tests/test_scratchpad.lua
@@ -246,11 +246,16 @@ T["scratchPad"]["forwards the given filetype to the scratchPad"] = function()
 
     Helpers.expect.equality(Helpers.winsInTab(child), { 1001, 1000, 1002 })
 
+    Helpers.expect.config(child, "buffers.left.bo.filetype", "custom")
+    Helpers.expect.config(child, "buffers.right.bo.filetype", "custom")
+
     child.fn.win_gotoid(1001)
     Helpers.expect.equality(child.lua_get("vim.api.nvim_buf_get_option(0, 'filetype')"), "custom")
+    Helpers.expect.equality(child.lua_get("vim.api.nvim_buf_get_option(0, 'buftype')"), "")
 
     child.fn.win_gotoid(1002)
     Helpers.expect.equality(child.lua_get("vim.api.nvim_buf_get_option(0, 'filetype')"), "custom")
+    Helpers.expect.equality(child.lua_get("vim.api.nvim_buf_get_option(0, 'buftype')"), "")
 end
 
 T["scratchPad"]["toggling the scratchPad sets the buffer/window options"] = function()