From 46aa757c19bf2afb5e1102b34c758bff5434e0ee Mon Sep 17 00:00:00 2001
From: HsuehMin Chen <elsdrium@gmail.com>
Date: Tue, 11 May 2021 02:10:27 +0800
Subject: [PATCH 1/2] Add SystemVerilog keywords for matchit plugin

---
 runtime/ftplugin/systemverilog.vim | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/runtime/ftplugin/systemverilog.vim b/runtime/ftplugin/systemverilog.vim
index 4d0f565fccd89d..a2d65a7ed2e9e6 100644
--- a/runtime/ftplugin/systemverilog.vim
+++ b/runtime/ftplugin/systemverilog.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:    SystemVerilog
 " Maintainer:  kocha <kocha.lsifrontend@gmail.com>
-" Last Change: 12-Aug-2013. 
+" Last Change: 07-May-2021
 
 if exists("b:did_ftplugin")
   finish
@@ -9,3 +9,30 @@ endif
 
 " Behaves just like Verilog
 runtime! ftplugin/verilog.vim
+
+" Add SystemVerilog keywords for matchit plugin.
+if exists("loaded_matchit")
+  let b:match_words =
+    \ '\<begin\>:\<end\>,' .
+    \ '\<case\>\|\<casex\>\|\<casez\>:\<endcase\>,' .
+    \ '\<module\>:\<endmodule\>,' .
+    \ '\<if\>:`\@<!\<else\>,' .
+    \ '\<function\>:\<endfunction\>,' .
+    \ '`ifn\?def\>:`elsif\>:`else\>:`endif\>,' .
+    \ '\<task\>:\<endtask\>,' .
+    \ '\<specify\>:\<endspecify\>,' .
+    \ '\<config\>:\<endconfig\>,' .
+    \ '\<generate\>:\<endgenerate\>,' .
+    \ '\<fork\>:\<join\>,' .
+    \ '\<primitive\>:\<endprimitive\>,' .
+    \ '\<table\>:\<endtable\>,' .
+    \ '\<checker\>:\<endchecker\>,' .
+    \ '\<class\>:\<endclass\>,' .
+    \ '\<clocking\>:\<endclocking\>,' .
+    \ '\<gruop\>:\<endgruop\>,' .
+    \ '\<interface\>:\<endinterface\>,' .
+    \ '\<package\>:\<endpackage\>,' .
+    \ '\<program\>:\<endprogram\>,' .
+    \ '\<property\>:\<endproperty\>,' .
+    \ '\<sequence\>:\<endsequence\>'
+endif

From 46996003dceb982ba7968fb55905fd74119c01a8 Mon Sep 17 00:00:00 2001
From: HsuehMin Chen <elsdrium@gmail.com>
Date: Wed, 12 May 2021 00:43:39 +0800
Subject: [PATCH 2/2] Add SystemVerilog keywords, fork and
 join/join_any/join_none, for matchit plugin

---
 runtime/ftplugin/systemverilog.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/ftplugin/systemverilog.vim b/runtime/ftplugin/systemverilog.vim
index a2d65a7ed2e9e6..49764e9de0cb93 100644
--- a/runtime/ftplugin/systemverilog.vim
+++ b/runtime/ftplugin/systemverilog.vim
@@ -23,7 +23,7 @@ if exists("loaded_matchit")
     \ '\<specify\>:\<endspecify\>,' .
     \ '\<config\>:\<endconfig\>,' .
     \ '\<generate\>:\<endgenerate\>,' .
-    \ '\<fork\>:\<join\>,' .
+    \ '\<fork\>:\<join\>\|\<join_any\>\|\<join_none\>,' .
     \ '\<primitive\>:\<endprimitive\>,' .
     \ '\<table\>:\<endtable\>,' .
     \ '\<checker\>:\<endchecker\>,' .