1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-01-23 17:30:04 +08:00

Merge pull request #1437 from sei40kr/local-eslint

Add package.json as project rooter in javascript layer
This commit is contained in:
Seong Yong-ju 2018-02-23 15:58:40 +09:00 committed by GitHub
commit 391481365a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -33,27 +33,9 @@ function! SpaceVim#layers#lang#javascript#plugins() abort
endfunction
let s:auto_fix = 0
let s:use_local_eslint = 0
function! SpaceVim#layers#lang#javascript#set_variable(var) abort
let s:auto_fix = get(a:var, 'auto_fix', 0)
let s:use_local_eslint = get(a:var, 'use_local_eslint', 0)
endfunction
function! s:preferLocalEslint()
let dir = expand('%:p:h')
while finddir('node_modules' ,dir ) is ''
let next_dir = fnamemodify(dir, ':h')
if dir == next_dir
break
endif
let dir = next_dir
endwhile
let node_modules_path = dir . '/node_modules'
let eslint_bin = node_modules_path . '/.bin/eslint'
if (executable(eslint_bin))
let b:neomake_javascript_eslint_exe = eslint_bin
endif
endfunction
function! SpaceVim#layers#lang#javascript#config() abort
@ -62,6 +44,8 @@ function! SpaceVim#layers#lang#javascript#config() abort
let g:javascript_plugin_flow = 1
" }}}
call add(g:spacevim_project_rooter_patterns, 'package.json')
call SpaceVim#plugins#runner#reg_runner('javascript', 'node %s')
call SpaceVim#mapping#space#regesit_lang_mappings('javascript',
\ function('s:on_ft'))
@ -87,9 +71,6 @@ function! SpaceVim#layers#lang#javascript#config() abort
autocmd User NeomakeFinished checktime
autocmd FocusGained * checktime
endif
if s:use_local_eslint
autocmd BufNewFile,BufRead *.js call s:preferLocalEslint()
endif
augroup END
endfunction