From be092d6f430ca802d7200e68a5c987195bccd0e9 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 10 Sep 2020 12:18:29 +0200
Subject: Fix jsx indentation, closes #543

---
 after/ftplugin/javascript-1.vim | 16 ++++++++++++++++
 after/ftplugin/javascript-2.vim |  9 +++++++++
 after/ftplugin/javascript.vim   | 28 +++-------------------------
 3 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 after/ftplugin/javascript-1.vim
 create mode 100644 after/ftplugin/javascript-2.vim

(limited to 'after/ftplugin')

diff --git a/after/ftplugin/javascript-1.vim b/after/ftplugin/javascript-1.vim
new file mode 100644
index 00000000..9f6c9314
--- /dev/null
+++ b/after/ftplugin/javascript-1.vim
@@ -0,0 +1,16 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+
+" Vim filetype plugin file
+" Language:     JavaScript
+" Maintainer:   vim-javascript community
+" URL:          https://github.com/pangloss/vim-javascript
+
+setlocal iskeyword+=$ suffixesadd+=.js
+
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'
+else
+  let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
+endif
+
+endif
diff --git a/after/ftplugin/javascript-2.vim b/after/ftplugin/javascript-2.vim
new file mode 100644
index 00000000..2992e942
--- /dev/null
+++ b/after/ftplugin/javascript-2.vim
@@ -0,0 +1,9 @@
+if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+
+if get(g:, 'vim_jsx_pretty_disable_js', 0)
+  finish
+endif
+
+source <sfile>:h/jsx.vim
+
+endif
diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
index 8ff3938a..e3d355fc 100644
--- a/after/ftplugin/javascript.vim
+++ b/after/ftplugin/javascript.vim
@@ -1,25 +1,3 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
-
-if get(g:, 'vim_jsx_pretty_disable_js', 0)
-  finish
-endif
-
-source <sfile>:h/jsx.vim
-
-endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-
-" Vim filetype plugin file
-" Language:     JavaScript
-" Maintainer:   vim-javascript community
-" URL:          https://github.com/pangloss/vim-javascript
-
-setlocal iskeyword+=$ suffixesadd+=.js
-
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'
-else
-  let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
-endif
-
-endif
+" Polyglot metafile
+source <sfile>:h/javascript-1.vim
+source <sfile>:h/javascript-2.vim
-- 
cgit v1.2.3