From 290001bacf8ed970304703f73ee11325ee54e6e3 Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Sun, 18 Aug 2024 22:26:28 -0400
Subject: [PATCH] Replace vim-matchup with MatchTagAlways until vim-matchup
 (hopefully) fixes some issues

---
 .gitmodules                            |  6 +++---
 readme.md                              |  2 +-
 vim/bundle/MatchTagAlways              |  1 +
 vim/bundle/vim-matchup                 |  1 -
 vim/config/plugins/MatchTagAlways.vim  | 11 +++++++++++
 vim/config/plugins/nvim-treesitter.lua |  5 -----
 vim/config/plugins/vim-matchup.vim     |  1 -
 7 files changed, 16 insertions(+), 11 deletions(-)
 create mode 160000 vim/bundle/MatchTagAlways
 delete mode 160000 vim/bundle/vim-matchup
 create mode 100644 vim/config/plugins/MatchTagAlways.vim
 delete mode 100644 vim/config/plugins/vim-matchup.vim

diff --git a/.gitmodules b/.gitmodules
index dbe48fa..266bd87 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -85,6 +85,6 @@
 [submodule "vim/bundle/smartyank.nvim"]
 	path = vim/bundle/smartyank.nvim
 	url = https://github.com/ibhagwan/smartyank.nvim
-[submodule "vim/bundle/vim-matchup"]
-	path = vim/bundle/vim-matchup
-	url = https://github.com/andymass/vim-matchup
+[submodule "vim/bundle/MatchTagAlways"]
+	path = vim/bundle/MatchTagAlways
+	url = https://github.com/Valloric/MatchTagAlways
diff --git a/readme.md b/readme.md
index 1700c00..ee209ce 100644
--- a/readme.md
+++ b/readme.md
@@ -117,6 +117,7 @@ For a complete list of mappings specific to **darkcloud-nvimconfig**, check the
   * [nvim-ts-context-commentstring](https://github.com/JoosepAlviste/nvim-ts-context-commentstring): A Neovim plugin for setting the commentstring option based on the cursor location in the file. The location is checked via treesitter queries
 * [lightline.vim](https://github.com/itchyny/lightline.vim): A light and configurable statusline/tabline plugin for Vim
   * [lightline-ale](https://github.com/maximbaz/lightline-ale): Provides ALE indicator for the lightline vim plugin
+* [MatchTagAlways](https://github.com/Valloric/MatchTagAlways): Always highlight enclosing tags
 * [nvim-cmp](https://github.com/hrsh7th/nvim-cmp): A completion engine plugin for neovim written in Lua
   * [cmp-async-path](https://codeberg.org/FelipeLema/cmp-async-path): Async file system path source for nvim-cmp
   * [cmp-buffer](https://github.com/hrsh7th/cmp-buffer): Buffer words source for nvim-cmp
@@ -135,7 +136,6 @@ For a complete list of mappings specific to **darkcloud-nvimconfig**, check the
 * [tabular](https://github.com/godlygeek/tabular): Vim script for text filtering and alignment
 * [vim-fugitive](https://github.com/tpope/vim-fugitive): A wrapper integrating git into vim in such a way as to provide features neither of them could offer on their own
 * [vim-gutentags](https://github.com/xolox/vim-easytags): A plugin that takes care of the much needed management of tags files in Vim
-* [vim-matchup](https://github.com/andymass/vim-matchup): A plugin that lets you highlight, navigate, and operate on sets of matching text
 * [vim-move](https://github.com/matze/vim-move): Provides a few convenient ways to move selected text
 * [vim-pathogen](https://github.com/tpope/vim-pathogen): A plugin to load other plugins while keeping them isolated in their own directory structure rather than all dumped together
 * [vim-polyglot-darkcloud](https://github.com/prurigro/vim-polyglot-darkcloud): The darkcloud-nvimconfig fork of a meta-package that attempts to provide the best syntax plugins for each file type
diff --git a/vim/bundle/MatchTagAlways b/vim/bundle/MatchTagAlways
new file mode 160000
index 0000000..352eb47
--- /dev/null
+++ b/vim/bundle/MatchTagAlways
@@ -0,0 +1 @@
+Subproject commit 352eb479a4ad1608e0880b79ab2357aac2cf4bed
diff --git a/vim/bundle/vim-matchup b/vim/bundle/vim-matchup
deleted file mode 160000
index 1535a76..0000000
--- a/vim/bundle/vim-matchup
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1535a769d5dca851fe7d41b0be95f7c7203a4bef
diff --git a/vim/config/plugins/MatchTagAlways.vim b/vim/config/plugins/MatchTagAlways.vim
new file mode 100644
index 0000000..4249728
--- /dev/null
+++ b/vim/config/plugins/MatchTagAlways.vim
@@ -0,0 +1,11 @@
+let g:mta_filetypes = {
+    \ 'aspnet':1,
+    \ 'blade':1,
+    \ 'html':1,
+    \ 'xhtml':1,
+    \ 'php':1,
+    \ 'xml':1,
+    \ 'jinja':1,
+    \ 'javascript':1,
+    \ 'vue':1
+\ }
diff --git a/vim/config/plugins/nvim-treesitter.lua b/vim/config/plugins/nvim-treesitter.lua
index 60fb802..fb5b1cd 100644
--- a/vim/config/plugins/nvim-treesitter.lua
+++ b/vim/config/plugins/nvim-treesitter.lua
@@ -21,11 +21,6 @@ if (vim.g.enabletreesitter == 1) then
             additional_vim_regex_highlighting = { "diff", "php", "scss" },
         },
 
-        -- vim-matchup
-        matchup = {
-            enable = true
-        },
-
         -- nvim-treesitter-textobjects
         textobjects = {
             select = {
diff --git a/vim/config/plugins/vim-matchup.vim b/vim/config/plugins/vim-matchup.vim
deleted file mode 100644
index 0f615a2..0000000
--- a/vim/config/plugins/vim-matchup.vim
+++ /dev/null
@@ -1 +0,0 @@
-let g:matchup_matchparen_offscreen = { 'method': '' }