Merge branch 'master' into elixir

This commit is contained in:
Chiel ten Brinke 2018-01-15 14:25:04 +01:00 committed by GitHub
commit e5048ad12a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions

View File

@ -231,6 +231,11 @@ Here is a list of formatprograms that are supported by default, and thus will be
* `mix format` for __Elixir__. * `mix format` for __Elixir__.
`mix format` is included with Elixir 1.6+. `mix format` is included with Elixir 1.6+.
* `fixjson` for JSON.
It is a JSON file fixer/formatter for humans using (relaxed) JSON5. It fixes various failures while humans writing JSON and formats JSON codes.
It can be installed with `npm install -g fixjson`. More info is available at https://github.com/rhysd/fixjson.
## Help, the formatter doesn't work as expected! ## Help, the formatter doesn't work as expected!
If you're struggling with getting a formatter to work, it may help to set vim-autoformat in If you're struggling with getting a formatter to work, it may help to set vim-autoformat in

View File

@ -264,10 +264,15 @@ if !exists('g:formatdef_jsbeautify_json')
endif endif
endif endif
if !exists('g:formatdef_fixjson')
let g:formatdef_fixjson = '"fixjson"'
endif
if !exists('g:formatters_json') if !exists('g:formatters_json')
let g:formatters_json = [ let g:formatters_json = [
\ 'jsbeautify_json', \ 'jsbeautify_json',
\ 'fixjson',
\ ] \ ]
endif endif