From 3f444b9dc17f7cabb2b4f6420e70d3ec00f40f4e Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Mon, 12 Jun 2023 09:13:48 -0700
Subject: [PATCH] Fixes for nvim 0.6

---
 neovim/lua/plugins.lua             |  58 +++++++++-
 neovim/packer_snapshots/latest-0.6 | 176 +++++++++++++++++++++++++++++
 2 files changed, 231 insertions(+), 3 deletions(-)
 create mode 100644 neovim/packer_snapshots/latest-0.6

diff --git a/neovim/lua/plugins.lua b/neovim/lua/plugins.lua
index fa759bb..c04d2ed 100644
--- a/neovim/lua/plugins.lua
+++ b/neovim/lua/plugins.lua
@@ -27,6 +27,7 @@ packer.init({
         [">=0.9.0"] = "latest-0.9",
         [">=0.8.0"] = "latest-0.8",
         [">=0.7.0"] = "latest-0.7",
+        [">=0.6.0"] = "latest-0.6",
         [">=0.5.0"] = "latest",
     }),
     snapshot_path = packer_util.join_paths(vim.fn.stdpath("config"), "packer_snapshots"),
@@ -88,7 +89,13 @@ use({
         },
     },
     { "ViViDboarder/wombuddy.nvim", requires = "tjdevries/colorbuddy.vim" },
-    "ishan9299/nvim-solarized-lua",
+    {
+        "ishan9299/nvim-solarized-lua",
+        commit = utils.map_version_rule({
+            [">=0.7.0"] = utils.nil_val,
+            ["<0.7.0"] = "faba49b",
+        }),
+    },
     {
         "folke/tokyonight.nvim",
         run = 'fish -c \'echo "set --path --prepend fish_themes_path "(pwd)"/extras" > ~/.config/fish/conf.d/tokyonight.fish\' || true', -- luacheck: no max line length
@@ -122,9 +129,16 @@ use("ludovicchabant/vim-gutentags")
 -- Make it easier to discover some of my keymaps
 use({
     "folke/which-key.nvim",
+    -- TODO: Pin < 0.7 version
     config = function()
         require("plugins.whichkey").configure()
     end,
+    --[[
+    commit = utils.map_version_rule({
+            [">=0.7.0"]= utils.,
+            ["<0.7.0"]= "bd4411a",
+        }),
+    --]]
 })
 
 -- Better commenting
@@ -256,7 +270,14 @@ use({
 })
 
 -- Better display of lsp diagnostics
-use("folke/trouble.nvim")
+-- TODO: Pin < 0.7 version
+use({
+    "folke/trouble.nvim",
+    tag = utils.map_version_rule({
+        [">=0.7.2"] = "stable",
+        ["<0.7.2"] = "v1.0.2",
+    }),
+})
 
 -- Incremental lsp rename view
 use({
@@ -310,22 +331,38 @@ use({
     commit = utils.map_version_rule({
         [">=0.8.0"] = utils.nil_val,
         [">=0.7.0"] = "4cccb6f494eb255b32a290d37c35ca12584c74d0",
+        [">=0.6.0"] = "bc25a6a5",
         [">=0.5.0"] = "a189323454d1215c682c7ad7db3e6739d26339c4",
     }),
     config = function()
         require("utils").require_with_local("plugins.treesitter").setup()
     end,
 })
+--[[ TODO: Enable this as an alterantive or fallback for LSPs
 use({
     "nvim-treesitter/nvim-treesitter-refactor",
     requires = "nvim-treesitter/nvim-treesitter",
+    commit = utils.map_version_rule({
+        [">=0.7.0"] = utils.nil_val,
+        ["<0.7.0"] = "75f5895",
+    }),
 })
+--]]
 use({
     "nvim-treesitter/nvim-treesitter-textobjects",
     requires = "nvim-treesitter/nvim-treesitter",
+    commit = utils.map_version_rule({
+        [">=0.7.0"] = utils.nil_val,
+        ["<0.7.0"] = "eca3bf30334f85259d41dc060d50994f8f91ef7d",
+    }),
 })
 
 -- Completion
+use({
+    "L3MON4D3/LuaSnip",
+    tag = "v1.*",
+})
+
 use({
     "hrsh7th/nvim-cmp",
     config = function()
@@ -336,7 +373,14 @@ use({
         [">=0.5.0"] = "bba6fb67fdafc0af7c5454058dfbabc2182741f4",
     }),
     requires = {
-        { "hrsh7th/cmp-nvim-lsp", after = "nvim-cmp" },
+        {
+            "hrsh7th/cmp-nvim-lsp",
+            after = "nvim-cmp",
+            commit = utils.map_version_rule({
+                [">=0.7.0"] = utils.nil_val,
+                ["<0.7.0"] = "3cf38d9c957e95c397b66f91967758b31be4abe6",
+            }),
+        },
         { "hrsh7th/cmp-buffer", after = "nvim-cmp" },
         { "f3fora/cmp-spell", after = "nvim-cmp" },
         {
@@ -427,6 +471,14 @@ use({
     config = function()
         require("plugins.todo")
     end,
+    tag = utils.map_version_rule({
+        [">=0.8.0"] = "stable",
+        ["<0.8.0"] = utils.nil_val,
+    }),
+    branch = utils.map_version_rule({
+        [">=0.8.0"] = utils.nil_val,
+        ["<0.8.0"] = "neovim-pre-0.8.0",
+    }),
 })
 
 -- Fancy notifications
diff --git a/neovim/packer_snapshots/latest-0.6 b/neovim/packer_snapshots/latest-0.6
new file mode 100644
index 0000000..3bc7ae5
--- /dev/null
+++ b/neovim/packer_snapshots/latest-0.6
@@ -0,0 +1,176 @@
+{
+  "LuaSnip": {
+    "commit": "500981f"
+  },
+  "cmp-buffer": {
+    "commit": "3022dbc"
+  },
+  "cmp-nvim-lsp": {
+    "commit": "3cf38d9"
+  },
+  "cmp-spell": {
+    "commit": "60584cb"
+  },
+  "cmp_luasnip": {
+    "commit": "b108297"
+  },
+  "colorbuddy.vim": {
+    "commit": "cdb5b06"
+  },
+  "dark-notify": {
+    "commit": "891adc0"
+  },
+  "file-line": {
+    "commit": "67c3590"
+  },
+  "friendly-snippets": {
+    "commit": "49ca2a0"
+  },
+  "goyo.vim": {
+    "commit": "fa0263d"
+  },
+  "impatient.nvim": {
+    "commit": "969f2c5"
+  },
+  "limelight.vim": {
+    "commit": "86aaec1"
+  },
+  "lsp_signature.nvim": {
+    "commit": "17ff7a4"
+  },
+  "lualine.nvim": {
+    "commit": "05d78e9"
+  },
+  "lush.nvim": {
+    "commit": "87e9039"
+  },
+  "neodev.nvim": {
+    "commit": "c120c96"
+  },
+  "null-ls.nvim": {
+    "commit": "4b403d2"
+  },
+  "nvim-cmp": {
+    "commit": "bba6fb6"
+  },
+  "nvim-colorizer.lua": {
+    "commit": "36c610a"
+  },
+  "nvim-gps": {
+    "commit": "f4734df"
+  },
+  "nvim-lspconfig": {
+    "commit": "ea29110"
+  },
+  "nvim-notify": {
+    "commit": "ea9c8ce"
+  },
+  "nvim-solarized-lua": {
+    "commit": "faba49b"
+  },
+  "nvim-treesitter": {
+    "commit": "bc25a6a5"
+  },
+  "nvim-treesitter-textobjects": {
+    "commit": "eca3bf3"
+  },
+  "packer.nvim": {
+    "commit": "1d0cf98"
+  },
+  "plenary.nvim": {
+    "commit": "36aaceb"
+  },
+  "popup.nvim": {
+    "commit": "b7404d3"
+  },
+  "rust.vim": {
+    "commit": "889b9a7"
+  },
+  "startuptime.vim": {
+    "commit": "dfa57f5"
+  },
+  "tcomment_vim": {
+    "commit": "b4930f9"
+  },
+  "telescope-file-browser.nvim": {
+    "commit": "87dfaa9"
+  },
+  "telescope.nvim": {
+    "commit": "d88094f"
+  },
+  "todo-comments.nvim": {
+    "commit": "7b8f174"
+  },
+  "tokyonight.nvim": {
+    "commit": "161114b"
+  },
+  "trouble.nvim": {
+    "commit": "556ef30"
+  },
+  "vim-android": {
+    "commit": "8911f86"
+  },
+  "vim-argwrap": {
+    "commit": "feaba6b"
+  },
+  "vim-endwise": {
+    "commit": "e714ac3"
+  },
+  "vim-eunuch": {
+    "commit": "291ef1f"
+  },
+  "vim-forcedotcom": {
+    "commit": "a30ba7e"
+  },
+  "vim-fugitive": {
+    "commit": "5a24c25"
+  },
+  "vim-grepper": {
+    "commit": "2b93535"
+  },
+  "vim-gutentags": {
+    "commit": "1337b18"
+  },
+  "vim-pencil": {
+    "commit": "6d70438"
+  },
+  "vim-polyglot": {
+    "commit": "bc8a81d3"
+  },
+  "vim-repeat": {
+    "commit": "24afe92"
+  },
+  "vim-rsi": {
+    "commit": "4554063"
+  },
+  "vim-startify": {
+    "commit": "81e36c3"
+  },
+  "vim-surround": {
+    "commit": "3d188ed"
+  },
+  "vim-textobj-sentence": {
+    "commit": "c5dd562"
+  },
+  "vim-textobj-user": {
+    "commit": "41a675d"
+  },
+  "vim-togglelist": {
+    "commit": "48f0d30"
+  },
+  "vim-vinegar": {
+    "commit": "bb1bcdd"
+  },
+  "which-key.nvim": {
+    "commit": "e271c28"
+  },
+  "wombat.nvim": {
+    "commit": "96989b1"
+  },
+  "wombat256.vim": {
+    "commit": "8734ba4"
+  },
+  "wombuddy.nvim": {
+    "commit": "29deb8f"
+  }
+}