diff --git a/LICENSE.md b/LICENSE.md index e67bd8b..9bfab03 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT license -Copyright (c) 2019 Andy Massimino +Copyright (c) 2020 Andy Massimino Copyright (c) 2016 Karl Yngve Lervåg diff --git a/README.md b/README.md index b235ee7..05ffbb4 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,11 @@ # vim match-up -match-up is a drop-in replacement for the vim plugin [matchit.vim]. -match-up aims to enhance all of matchit's features, fix a number of its -deficiencies and bugs, and add a few totally new features. It also -replaces the standard plugin [matchparen], allowing all of matchit's words -to be highlighted along with the `matchpairs` (`(){}[]`). - -[matchit.vim]: http://ftp.vim.org/pub/vim/runtime/macros/matchit.txt -[matchparen]: http://ftp.vim.org/pub/vim/runtime/doc/pi_paren.txt +match-up is a plugin that lets you highlight, navigate, and operate on +sets of matching text. It extends vim's `%` key to language-specific +words instead of just single characters. and in this corner... -A major goal of this project is to keep a modern and modular code base. -Contributions are welcome! - ## Screenshot @@ -31,6 +23,15 @@ Contributions are welcome! ## Overview +match-up can be used as a drop-in replacement for the classic plugin [matchit.vim]. +match-up aims to enhance all of matchit's features, fix a number of its +deficiencies and bugs, and add a few totally new features. It also +replaces the standard plugin [matchparen], allowing all of matchit's words +to be highlighted along with the `matchpairs` (`(){}[]`). + +[matchit.vim]: http://ftp.vim.org/pub/vim/runtime/macros/matchit.txt +[matchparen]: http://ftp.vim.org/pub/vim/runtime/doc/pi_paren.txt + See [detailed feature documentation](#detailed-feature-documentation) for more information. This plugin: @@ -79,7 +80,7 @@ together with other plugins. | | feature | __match-up__ | matchit | matchparen | | ------- | -------------------------------- | -------------- | ------------- | ------------- | | ([a.1]) | jump between matching words | :thumbsup: | :thumbsup: | :x: | -| ([a.2]) | jump to open & close words | :thumbsup: | :question: | :x: | +| ([a.2]) | jump to open & close words | :thumbsup: | :thumbsup: | :x: | | ([a.3]) | jump inside | :thumbsup: | :x: | :x: | | ([b.1]) | full set of text objects | :thumbsup: | :question: | :x: | | ([c.1]) | highlight `()`, `[]`, & `{}` | :thumbsup: | :x: | :thumbsup: | @@ -774,3 +775,6 @@ Feature requests are also welcome. Please read the [contribution guidelines](CONTRIBUTING.md) before contributing. +A major goal of this project is to keep a modern and modular code base. +Contributions are welcome! + diff --git a/after/ftplugin/c_matchup.vim b/after/ftplugin/c_matchup.vim index 6a6f668..64fb6fe 100644 --- a/after/ftplugin/c_matchup.vim +++ b/after/ftplugin/c_matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - even better matching pairs +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/after/ftplugin/cpp_matchup.vim b/after/ftplugin/cpp_matchup.vim index c8575f8..4d4f2cf 100644 --- a/after/ftplugin/cpp_matchup.vim +++ b/after/ftplugin/cpp_matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - even better matching pairs +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/after/ftplugin/fortran_matchup.vim b/after/ftplugin/fortran_matchup.vim index 8e3b7d4..56b4129 100644 --- a/after/ftplugin/fortran_matchup.vim +++ b/after/ftplugin/fortran_matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - even better matching pairs +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/after/ftplugin/html_matchup.vim b/after/ftplugin/html_matchup.vim index 509737b..87e7651 100644 --- a/after/ftplugin/html_matchup.vim +++ b/after/ftplugin/html_matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - even better matching pairs +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/after/ftplugin/lua_matchup.vim b/after/ftplugin/lua_matchup.vim index bbc08f3..ad20a0a 100644 --- a/after/ftplugin/lua_matchup.vim +++ b/after/ftplugin/lua_matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - even better matching pairs +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/after/ftplugin/ocaml_matchup.vim b/after/ftplugin/ocaml_matchup.vim index 86f2732..5bd2d4f 100644 --- a/after/ftplugin/ocaml_matchup.vim +++ b/after/ftplugin/ocaml_matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - even better matching pairs +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/after/ftplugin/ruby_matchup.vim b/after/ftplugin/ruby_matchup.vim index 411d774..6aeab49 100644 --- a/after/ftplugin/ruby_matchup.vim +++ b/after/ftplugin/ruby_matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - even better matching pairs +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/after/ftplugin/tex_matchup.vim b/after/ftplugin/tex_matchup.vim index b748b7a..2f0c3d8 100644 --- a/after/ftplugin/tex_matchup.vim +++ b/after/ftplugin/tex_matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - even better matching pairs +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/after/ftplugin/vim_matchup.vim b/after/ftplugin/vim_matchup.vim index 9e6b9e7..8254d1a 100644 --- a/after/ftplugin/vim_matchup.vim +++ b/after/ftplugin/vim_matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - even better matching pairs +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/after/ftplugin/vue_matchup.vim b/after/ftplugin/vue_matchup.vim index 1be55b7..ca47401 100644 --- a/after/ftplugin/vue_matchup.vim +++ b/after/ftplugin/vue_matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - even better matching pairs +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/after/ftplugin/xml_matchup.vim b/after/ftplugin/xml_matchup.vim index aaef621..41b6d2b 100644 --- a/after/ftplugin/xml_matchup.vim +++ b/after/ftplugin/xml_matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - even better matching pairs +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup.vim b/autoload/matchup.vim index 88d866c..2ddadba 100644 --- a/autoload/matchup.vim +++ b/autoload/matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/custom.vim b/autoload/matchup/custom.vim index e51b130..7dda34f 100644 --- a/autoload/matchup/custom.vim +++ b/autoload/matchup/custom.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/delim.vim b/autoload/matchup/delim.vim index bd76685..942e5e7 100644 --- a/autoload/matchup/delim.vim +++ b/autoload/matchup/delim.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/loader.vim b/autoload/matchup/loader.vim index b88c5f5..2a63c2f 100644 --- a/autoload/matchup/loader.vim +++ b/autoload/matchup/loader.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/matchparen.vim b/autoload/matchup/matchparen.vim index 23ea663..a87e76b 100644 --- a/autoload/matchup/matchparen.vim +++ b/autoload/matchup/matchparen.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/misc.vim b/autoload/matchup/misc.vim index adaede0..b4194bc 100644 --- a/autoload/matchup/misc.vim +++ b/autoload/matchup/misc.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/motion.vim b/autoload/matchup/motion.vim index 5398b57..682e1e0 100644 --- a/autoload/matchup/motion.vim +++ b/autoload/matchup/motion.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/perf.vim b/autoload/matchup/perf.vim index 7f255f9..b9a736f 100644 --- a/autoload/matchup/perf.vim +++ b/autoload/matchup/perf.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/pos.vim b/autoload/matchup/pos.vim index 0d5f290..e26a38b 100644 --- a/autoload/matchup/pos.vim +++ b/autoload/matchup/pos.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/quirks.vim b/autoload/matchup/quirks.vim index 7d7eb16..f37e9f6 100644 --- a/autoload/matchup/quirks.vim +++ b/autoload/matchup/quirks.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/re.vim b/autoload/matchup/re.vim index a1d0885..cf3ec12 100644 --- a/autoload/matchup/re.vim +++ b/autoload/matchup/re.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/surround.vim b/autoload/matchup/surround.vim index e96bc04..8a5e8ce 100644 --- a/autoload/matchup/surround.vim +++ b/autoload/matchup/surround.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/text_obj.vim b/autoload/matchup/text_obj.vim index 0d2d7af..5e26640 100644 --- a/autoload/matchup/text_obj.vim +++ b/autoload/matchup/text_obj.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/transmute.vim b/autoload/matchup/transmute.vim index 77b195b..3f75ca1 100644 --- a/autoload/matchup/transmute.vim +++ b/autoload/matchup/transmute.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/unmatchit.vim b/autoload/matchup/unmatchit.vim index 94f6f20..15a1d12 100644 --- a/autoload/matchup/unmatchit.vim +++ b/autoload/matchup/unmatchit.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/util.vim b/autoload/matchup/util.vim index dc4ff07..4fa365d 100644 --- a/autoload/matchup/util.vim +++ b/autoload/matchup/util.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/autoload/matchup/where.vim b/autoload/matchup/where.vim index 24bdbca..463f2ba 100644 --- a/autoload/matchup/where.vim +++ b/autoload/matchup/where.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space diff --git a/doc/matchup.txt b/doc/matchup.txt index 682e1bb..09a8165 100644 --- a/doc/matchup.txt +++ b/doc/matchup.txt @@ -6,7 +6,7 @@ Web: https://github.com/andymass/vim-matchup Script ID: 5624 License: MIT license {{{ - Copyright (c) 2019 Andy Massimino + Copyright (c) 2020 Andy Massimino Copyright (c) 2016 Karl Yngve Lervåg diff --git a/plugin/matchup.vim b/plugin/matchup.vim index 97e2d02..009e38d 100644 --- a/plugin/matchup.vim +++ b/plugin/matchup.vim @@ -1,4 +1,4 @@ -" vim match-up - matchit replacement and more +" vim match-up - even better matching " " Maintainer: Andy Massimino " Email: a@normed.space