From fd74d8b2b170b540680a9bbf6c64990f8ebafd08 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 8 Oct 2018 19:00:59 +0200
Subject: Update

---
 after/ftplugin/jsx.vim       | 5 ++++-
 after/ftplugin/terraform.vim | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'after/ftplugin')

diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index a5682895..380d476b 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -11,8 +11,11 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
 " modified from html.vim
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
-  let b:match_words = '(:),\[:\],{:},<:>,' .
+  let s:jsx_match_words = '(:),\[:\],{:},<:>,' .
         \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(/\@<!>\|$\):<\@<=/\1>'
+  let b:match_words = exists('b:match_words')
+    \ ? b:match_words . ',' . s:jsx_match_words
+    \ : s:jsx_match_words
 endif
 
 setlocal suffixesadd+=.jsx
diff --git a/after/ftplugin/terraform.vim b/after/ftplugin/terraform.vim
index 1328931a..48ae0f20 100644
--- a/after/ftplugin/terraform.vim
+++ b/after/ftplugin/terraform.vim
@@ -75,4 +75,11 @@ if get(g:, "terraform_align", 1)
   setlocal shiftwidth=2
 endif
 
+" Set the commentstring
+if exists('g:terraform_commentstring')
+    let &l:commentstring=g:terraform_commentstring
+else
+    setlocal commentstring=#%s
+endif
+
 endif
-- 
cgit v1.2.3