marc/ale
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3575 from hugomg/gnumakefile

Browse source 
Have c_parse_makefile look for GNUmakefile as well
This commit is contained in:
Horacio Sanson 2021-02-06 21:31:16 +09:00 committed by GitHub
commit b88d3c4e4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
autoload/ale/c.vim
View file

@ -506,6 +506,10 @@ function! ale#c#GetMakeCommand(buffer) abort
if s:CanParseMakefile(a:buffer) if s:CanParseMakefile(a:buffer)
let l:path = ale#path#FindNearestFile(a:buffer, 'Makefile') let l:path = ale#path#FindNearestFile(a:buffer, 'Makefile')
if empty(l:path)
let l:path = ale#path#FindNearestFile(a:buffer, 'GNUmakefile')
endif
if !empty(l:path) if !empty(l:path)
let l:always_make = ale#Var(a:buffer, 'c_always_make') let l:always_make = ale#Var(a:buffer, 'c_always_make')

8
test/test_c_flag_parsing.vader
View file

@ -38,6 +38,14 @@ Execute(The make command should be correct):
\ . 'make -n', \ . 'make -n',
\ ale#c#GetMakeCommand(bufnr('')) \ ale#c#GetMakeCommand(bufnr(''))
Execute(Should recognize GNUmakefile as a makefile):
call ale#test#SetFilename('test_c_projects/gnumakefile_project/file.c')
AssertEqual
\ ale#path#CdString(ale#path#Simplify(g:dir. '/test_c_projects/gnumakefile_project'))
\ . 'make -n --always-make',
\ ale#c#GetMakeCommand(bufnr(''))
Execute(The CFlags parser should be able to parse include directives): Execute(The CFlags parser should be able to parse include directives):
call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c') call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c')

0
test/test_c_projects/gnumakefile_project/GNUmakefile Normal file
View file

0
test/test_c_projects/gnumakefile_project/file.c Normal file
View file