Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Commit 4ded4f4

Browse files
lcd047lcd047
committed
Expand a few config parameters.
1 parent c8f562f commit 4ded4f4

7 files changed

Lines changed: 22 additions & 18 deletions

File tree

‎plugin/syntastic.vim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if has('reltime')
1818
let g:syntastic_start = reltime()
1919
endif
2020

21-
let g:syntastic_version = '3.4.0-4'
21+
let g:syntastic_version = '3.4.0-5'
2222

2323
" Sanity checks {{{1
2424

‎syntax_checkers/actionscript/mxmlc.vim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ endfunction
4747
function! SyntaxCheckers_actionscript_mxmlc_GetLocList() dict
4848
let makeprg = self.makeprgBuild({
4949
\ 'args_before': (g:syntastic_actionscript_mxmlc_conf != '' ?
50-
\ ' -load-config+=' . g:syntastic_actionscript_mxmlc_conf : ''),
50+
\ ' -load-config+=' . syntastic#util#shexpand(g:syntastic_actionscript_mxmlc_conf) : ''),
5151
\ 'args_after': '-output=' . syntastic#util#DevNull() })
5252

5353
let errorformat =

‎syntax_checkers/html/jshint.vim‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ endfunction
3434
function! SyntaxCheckers_html_jshint_GetLocList() dict
3535
let makeprg = self.makeprgBuild({
3636
\ 'exe': expand(g:syntastic_jshint_exec),
37-
\ 'args': (g:syntastic_html_jshint_conf != '' ? '--config ' . g:syntastic_html_jshint_conf : ''),
37+
\ 'args': (g:syntastic_html_jshint_conf != '' ?
38+
\ '--config ' . syntastic#util#shexpand(g:syntastic_html_jshint_conf) : ''),
3839
\ 'args_after': '--verbose --extract always' })
3940

4041
let errorformat = '%A%f: line %l\, col %v\, %m \(%t%*\d\)'

‎syntax_checkers/java/checkstyle.vim‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ function! SyntaxCheckers_java_checkstyle_GetLocList() dict
3737

3838
let makeprg = self.makeprgBuild({
3939
\ 'args_after': '-cp ' . g:syntastic_java_checkstyle_classpath .
40-
\ ' com.puppycrawl.tools.checkstyle.Main -c ' . g:syntastic_java_checkstyle_conf_file .
41-
\ ' -f xml',
40+
\ ' com.puppycrawl.tools.checkstyle.Main -c ' .
41+
\ syntastic#util#shexpand(g:syntastic_java_checkstyle_conf_file) .
42+
\ ' -f xml',
4243
\ 'fname': fname })
4344

4445
let errorformat = '%f:%t:%l:%c:%m'

‎syntax_checkers/java/javac.vim‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ let s:save_cpo = &cpo
4343
set cpo&vim
4444

4545
function! s:CygwinPath(path)
46-
return substitute(system("cygpath -m " . a:path), '\n', '', 'g')
46+
return substitute(system("cygpath -m " . syntastic#util#shescape(a:path)), '\n', '', 'g')
4747
endfunction
4848

4949
if !exists("g:syntastic_java_javac_temp_dir")
@@ -123,8 +123,8 @@ function! s:SplitClasspath(classpath)
123123
endfunction
124124

125125
function! s:LoadConfigFile()
126-
if filereadable(g:syntastic_java_javac_config_file)
127-
exe 'source '.g:syntastic_java_javac_config_file
126+
if filereadable(expand(g:syntastic_java_javac_config_file))
127+
exe 'source ' . fnameescape(expand(g:syntastic_java_javac_config_file))
128128
endif
129129
endfunction
130130

@@ -137,9 +137,9 @@ function! s:SaveClasspath()
137137
endfor
138138
" save classpath to config file
139139
if g:syntastic_java_javac_config_file_enabled
140-
if filereadable(g:syntastic_java_javac_config_file)
140+
if filereadable(expand(g:syntastic_java_javac_config_file))
141141
" load lines from config file
142-
let lines = readfile(g:syntastic_java_javac_config_file)
142+
let lines = readfile(expand(g:syntastic_java_javac_config_file))
143143
" strip g:syntastic_java_javac_classpath options from config file lines
144144
let i = 0
145145
while i < len(lines)
@@ -155,7 +155,7 @@ function! s:SaveClasspath()
155155
" add new g:syntastic_java_javac_classpath option to config
156156
call add(lines, 'let g:syntastic_java_javac_classpath = "'.path.'"')
157157
" save config file lines
158-
call writefile(lines, g:syntastic_java_javac_config_file)
158+
call writefile(lines, expand(g:syntastic_java_javac_config_file))
159159
endif
160160
" set new classpath
161161
let g:syntastic_java_javac_classpath = path
@@ -192,7 +192,7 @@ function! s:SaveConfig()
192192
let lines = getline(1, line('$'))
193193
if g:syntastic_java_javac_config_file_enabled
194194
" save config file lines
195-
call writefile(lines, g:syntastic_java_javac_config_file)
195+
call writefile(lines, expand(g:syntastic_java_javac_config_file))
196196
endif
197197
let &modified = 0
198198
endfunction
@@ -202,8 +202,8 @@ function! s:EditConfig()
202202
let winnr = bufwinnr('^' . command . '$')
203203
if winnr < 0
204204
let lines = []
205-
if filereadable(g:syntastic_java_javac_config_file)
206-
let lines = readfile(g:syntastic_java_javac_config_file)
205+
if filereadable(expand(g:syntastic_java_javac_config_file))
206+
let lines = readfile(expand(g:syntastic_java_javac_config_file))
207207
endif
208208
execute (len(lines) + 5) . 'sp ' . fnameescape(command)
209209

@@ -329,7 +329,7 @@ function! s:MavenOutputDirectory()
329329
endif
330330

331331
if has('win32unix')
332-
let output_dir=s:CygwinPath(output_dir)
332+
let output_dir = s:CygwinPath(output_dir)
333333
endif
334334
return output_dir
335335
endif
@@ -408,7 +408,7 @@ function! SyntaxCheckers_java_javac_GetLocList() dict
408408
let fname = fnameescape(expand ( '%:p:h' ) . sep . expand ( '%:t' ))
409409

410410
if has('win32unix')
411-
let fname = s:CygwinPath(fname)
411+
let fname = s:CygwinPath(fname)
412412
endif
413413

414414
let makeprg = self.makeprgBuild({

‎syntax_checkers/javascript/jshint.vim‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ function! SyntaxCheckers_javascript_jshint_GetLocList() dict
3737

3838
let makeprg = self.makeprgBuild({
3939
\ 'exe': exe,
40-
\ 'args': (g:syntastic_javascript_jshint_conf != '' ? '--config ' . g:syntastic_javascript_jshint_conf : ''),
40+
\ 'args': (g:syntastic_javascript_jshint_conf != '' ?
41+
\ '--config ' . syntastic#util#shexpand(g:syntastic_javascript_jshint_conf) : ''),
4142
\ 'args_after': (s:jshint_new ? '--verbose ' : '') })
4243

4344
let errorformat = s:jshint_new ?

‎syntax_checkers/javascript/jsl.vim‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ set cpo&vim
2323

2424
function! SyntaxCheckers_javascript_jsl_GetLocList() dict
2525
let makeprg = self.makeprgBuild({
26-
\ 'args': (g:syntastic_javascript_jsl_conf != '' ? '-conf ' . g:syntastic_javascript_jsl_conf : ''),
26+
\ 'args': (g:syntastic_javascript_jsl_conf != '' ?
27+
\ '-conf ' . syntastic#util#shexpand(g:syntastic_javascript_jsl_conf) : ''),
2728
\ 'args_after': '-nologo -nofilelisting -nosummary -nocontext -process' })
2829

2930
let errorformat =

0 commit comments

Comments
 (0)