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

Merge pull request #3430 from mbrunnen/mbn/fix-macros-include-c-flag

Browse source 
Add -imacros to C flags
This commit is contained in:
Horacio Sanson 2021-01-20 20:42:18 +09:00 committed by GitHub
commit 8de0e7b9ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autoload/ale/c.vim
View file

@ -152,6 +152,7 @@ function! ale#c#ParseCFlags(path_prefix, should_quote, raw_arguments) abort
\ || stridx(l:option, '-idirafter') == 0 \ || stridx(l:option, '-idirafter') == 0
\ || stridx(l:option, '-iframework') == 0 \ || stridx(l:option, '-iframework') == 0
\ || stridx(l:option, '-include') == 0 \ || stridx(l:option, '-include') == 0
\ || stridx(l:option, '-imacros') == 0
if stridx(l:option, '-I') == 0 && l:option isnot# '-I' if stridx(l:option, '-I') == 0 && l:option isnot# '-I'
let l:arg = join(split(l:option, '\zs')[2:], '') let l:arg = join(split(l:option, '\zs')[2:], '')
let l:option = '-I' let l:option = '-I'

6
test/test_c_flag_parsing.vader
View file

@ -482,6 +482,7 @@ Execute(We should include several important flags):
\ . ' -idirafter ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/incafter')) \ . ' -idirafter ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/incafter'))
\ . ' -iframework ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incframework')) \ . ' -iframework ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incframework'))
\ . ' -include ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/foo bar')) \ . ' -include ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/foo bar'))
\ . ' -imacros ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incmacros'))
\ . ' -Dmacro="value"' \ . ' -Dmacro="value"'
\ . ' -DGoal=9' \ . ' -DGoal=9'
\ . ' -D macro2' \ . ' -D macro2'
@ -511,6 +512,8 @@ Execute(We should include several important flags):
\ 'incframework', \ 'incframework',
\ '-include', \ '-include',
\ '''foo bar''', \ '''foo bar''',
\ '-imacros',
\ 'incmacros',
\ '-Dmacro="value"', \ '-Dmacro="value"',
\ '-DGoal=9', \ '-DGoal=9',
\ '-D', \ '-D',
@ -559,6 +562,7 @@ Execute(We should quote the flags we need to quote):
\ . ' -idirafter ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/incafter')) \ . ' -idirafter ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/incafter'))
\ . ' -iframework ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incframework')) \ . ' -iframework ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incframework'))
\ . ' -include ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/foo bar')) \ . ' -include ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/foo bar'))
\ . ' -imacros ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incmacros'))
\ . ' ' . ale#Escape('-Dmacro="value"') \ . ' ' . ale#Escape('-Dmacro="value"')
\ . ' -DGoal=9' \ . ' -DGoal=9'
\ . ' -D macro2' \ . ' -D macro2'
@ -591,6 +595,8 @@ Execute(We should quote the flags we need to quote):
\ 'incframework', \ 'incframework',
\ '-include', \ '-include',
\ '''foo bar''', \ '''foo bar''',
\ '-imacros',
\ 'incmacros',
\ '-Dmacro="value"', \ '-Dmacro="value"',
\ '-DGoal=9', \ '-DGoal=9',
\ '-D', \ '-D',