Merge commit '9ee501a1def04d23a7dd021af1a45f0e6aeb064c' into main

main
Buddy Sandidge 9 years ago
commit a061b7865d

@ -16,12 +16,16 @@ Usage
By default, JSX syntax highlighting and indenting will be enabled only for
files with the `.jsx` extension. If you would like JSX in `.js` files, add
let g:jsx_ext_required = 0
```viml
let g:jsx_ext_required = 0
```
to your .vimrc or somewhere in your include path. If you wish to restrict JSX
to files with the pre-v0.12 `@jsx React.DOM` pragma, add
let g:jsx_pragma_required = 1
```viml
let g:jsx_pragma_required = 1
```
to your .vimrc or somewhere in your include path.

@ -41,3 +41,7 @@ syn region xmlString contained start=+{+ end=++ contains=jsBlock,javascriptBlock
" Add jsxRegion to the lowest-level JS syntax cluster.
syn cluster jsExpression add=jsxRegion
" Allow jsxRegion to contain reserved words.
" See: https://github.com/othree/yajs.vim
syn cluster javascriptNoReserved add=jsxRegion

Loading…
Cancel
Save