Add improved JavaScript highlighting

mephraim · Feb 10, 2017 · 26642b9 · 26642b9
1 parent 3e66705
commit 26642b9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -78,10 +78,6 @@
 	path = bundle/vimroom
 	url = https://github.com/mikewest/vimroom.git
   ignore = dirty
-[submodule "bundle/vim-javascript-syntax"]
-	path = bundle/vim-javascript-syntax
-	url = https://github.com/jelera/vim-javascript-syntax.git
-  ignore = dirty
 [submodule "bundle/YankRing"]
 	path = bundle/YankRing
 	url = https://github.com/vim-scripts/YankRing.vim.git
@@ -102,3 +98,9 @@
 	path = bundle/vim-cucumber
 	url = https://github.com/tpope/vim-cucumber
   ignore = dirty
+[submodule "bundle/vim-javascript"]
+	path = bundle/vim-javascript
+	url = https://github.com/pangloss/vim-javascript.git
+[submodule "bundle/vim-jsx"]
+	path = bundle/vim-jsx
+	url = https://github.com/mxw/vim-jsx.git
diff --git a/.vimrc b/.vimrc
@@ -596,5 +596,8 @@ set nocompatible
   let g:vimroom_sidebar_height = 0
   let g:vimroom_width = 80
 
+  let g:jsx_ext_required = 0
+  au BufNewFile,BufRead *.js6 set filetype=javascript
+
 " End plugin configuration
 " }}}1
diff --git a/bundle/vim-javascript b/bundle/vim-javascript
diff --git a/bundle/vim-javascript-syntax b/bundle/vim-javascript-syntax
diff --git a/bundle/vim-jsx b/bundle/vim-jsx