vim/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use location of composer.json for PHP project path too (#2391)

Browse Source 
* move php-langserver "test for .git dir" test-project to its own directory
* search for composer.json file in php-langserver first then .git dir
* add test for php-langserver composer.json
This commit is contained in:
Shahin Sorkh 2019-03-26 01:59:34 +04:30 committed by w0rp
parent 80ef7ea2d0
commit ad998211f8
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ale_linters/php/langserver.vim
View File

@ -5,6 +5,12 @@ call ale#Set('php_langserver_executable', 'php-language-server.php')
call ale#Set('php_langserver_use_global', get(g:, 'ale_use_global_executables', 0)) call ale#Set('php_langserver_use_global', get(g:, 'ale_use_global_executables', 0))
function! ale_linters#php#langserver#GetProjectRoot(buffer) abort function! ale_linters#php#langserver#GetProjectRoot(buffer) abort
let l:composer_path = ale#path#FindNearestFile(a:buffer, 'composer.json')
if (!empty(l:composer_path))
return fnamemodify(l:composer_path, ':h')
endif
let l:git_path = ale#path#FindNearestDirectory(a:buffer, '.git') let l:git_path = ale#path#FindNearestDirectory(a:buffer, '.git')
return !empty(l:git_path) ? fnamemodify(l:git_path, ':h:h') : '' return !empty(l:git_path) ? fnamemodify(l:git_path, ':h:h') : ''

0
test/command_callback/php-langserver-project/with-composer/composer.json Normal file
View File

0
test/command_callback/php-langserver-project/with-composer/vendor/bin/php-language-server.php vendored Executable file
View File

0
test/command_callback/php-langserver-project/with-git/vendor/bin/php-language-server.php vendored Executable file
View File

15
test/command_callback/test_php_langserver_callbacks.vader
View File

@ -2,10 +2,6 @@ Before:
call ale#assert#SetUpLinterTest('php', 'langserver') call ale#assert#SetUpLinterTest('php', 'langserver')
After: After:
if isdirectory(g:dir . '/.git')
call delete(g:dir . '/.git', 'd')
endif
call ale#assert#TearDownLinterTest() call ale#assert#TearDownLinterTest()
Execute(The default executable path should be correct): Execute(The default executable path should be correct):
@ -23,7 +19,12 @@ Execute(Vendor executables should be detected):
\ )) \ ))
Execute(The project path should be correct for .git directories): Execute(The project path should be correct for .git directories):
call ale#test#SetFilename('php-langserver-project/test.php') call ale#test#SetFilename('php-langserver-project/with-git/test.php')
call mkdir(g:dir . '/.git') silent! call mkdir('php-langserver-project/with-git/.git')
AssertLSPProject g:dir AssertLSPProject ale#path#Simplify(g:dir . '/php-langserver-project/with-git')
Execute(The project path should be correct for composer.json file):
call ale#test#SetFilename('php-langserver-project/with-composer/test.php')
AssertLSPProject ale#path#Simplify(g:dir . '/php-langserver-project/with-composer')