summaryrefslogtreecommitdiffstats
path: root/after/ftplugin/javascript.vim
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2020-09-10 12:18:29 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2020-09-10 12:18:29 +0200
commitbe092d6f430ca802d7200e68a5c987195bccd0e9 (patch)
treecb0c28919b29d1cc5bd8737da7cb402afe0392ab /after/ftplugin/javascript.vim
parentfb7cf8a9ab782d67db5aa71bffac67e63fcc0c4c (diff)
downloadvim-polyglot-4.9.8.tar.gz
vim-polyglot-4.9.8.zip
Fix jsx indentation, closes #543v4.9.8
Diffstat (limited to 'after/ftplugin/javascript.vim')
-rw-r--r--after/ftplugin/javascript.vim28
1 files changed, 3 insertions, 25 deletions
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