From a49f664aea742bafae43af50eac568143870a663 Mon Sep 17 00:00:00 2001 From: cyy Date: Wed, 7 Oct 2020 14:04:43 +0700 Subject: [PATCH] chang fishindent to fish_indent --- autoload/ale/fixers/fish_indent.vim | 8 ++++---- doc/ale-fish.txt | 10 +++++----- doc/ale.txt | 2 +- test/fixers/test_fish_indent_fixer_callback.vader | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/autoload/ale/fixers/fish_indent.vim b/autoload/ale/fixers/fish_indent.vim index 98572e47..ebf17c5a 100644 --- a/autoload/ale/fixers/fish_indent.vim +++ b/autoload/ale/fixers/fish_indent.vim @@ -1,12 +1,12 @@ " Author: Chen YuanYuan " Description: Integration of fish_indent with ALE. -call ale#Set('fish_fishindent_executable', 'fish_indent') -call ale#Set('fish_fishindent_options', '') +call ale#Set('fish_fish_indent_executable', 'fish_indent') +call ale#Set('fish_fish_indent_options', '') function! ale#fixers#fish_indent#Fix(buffer) abort - let l:executable = ale#Var(a:buffer, 'fish_fishindent_executable') - let l:options = ale#Var(a:buffer, 'fish_fishindent_options') + let l:executable = ale#Var(a:buffer, 'fish_fish_indent_executable') + let l:options = ale#Var(a:buffer, 'fish_fish_indent_options') let l:filename = ale#Escape(bufname(a:buffer)) return { diff --git a/doc/ale-fish.txt b/doc/ale-fish.txt index 3b9ab44c..7dbbc10c 100644 --- a/doc/ale-fish.txt +++ b/doc/ale-fish.txt @@ -11,17 +11,17 @@ If ALE is not showing any errors but your file does not run as expected, run `fish -n ` from the command line. =============================================================================== -fish_indent *ale-fish-fishindent* +fish_indent *ale-fish-fish_indent* -g:ale_fish_fishindent_executable *g:ale_fish_fishindent_executable* - *b:ale_fish_fishindent_executable* +g:ale_fish_fish_indent_executable *g:ale_fish_fish_indent_executable* + *b:ale_fish_fish_indent_executable* Type: |String| Default: `'fish_indent'` This variable can be changed to use a different executable for fish_indent. -g:ale_fish_fishindent_options *g:ale_fish_fishindent_options* - *b:ale_fish_fishindent_options* +g:ale_fish_fish_indent_options *g:ale_fish_fish_indent_options* + *b:ale_fish_fish_indent_options* Type: |String| Default: `''` diff --git a/doc/ale.txt b/doc/ale.txt index 22402afb..e7f69011 100644 --- a/doc/ale.txt +++ b/doc/ale.txt @@ -2594,7 +2594,7 @@ documented in additional help files. eruby...................................|ale-eruby-options| ruumba................................|ale-eruby-ruumba| fish....................................|ale-fish-options| - fish_indent...........................|ale-fish-fishindent| + fish_indent...........................|ale-fish-fish_indent| fortran.................................|ale-fortran-options| gcc...................................|ale-fortran-gcc| language_server.......................|ale-fortran-language-server| diff --git a/test/fixers/test_fish_indent_fixer_callback.vader b/test/fixers/test_fish_indent_fixer_callback.vader index c83300e1..beb0b42e 100644 --- a/test/fixers/test_fish_indent_fixer_callback.vader +++ b/test/fixers/test_fish_indent_fixer_callback.vader @@ -1,10 +1,10 @@ Before: - Save g:ale_fish_fishindent_executable - Save g:ale_fish_fishindent_options + Save g:ale_fish_fish_indent_executable + Save g:ale_fish_fish_indent_options " Use an invalid global executable, so we don't match it. - let g:ale_fish_fishindent_executable = 'xxxinvalid' - let g:ale_fish_fishindent_options = '' + let g:ale_fish_fish_indent_executable = 'xxxinvalid' + let g:ale_fish_fish_indent_options = '' call ale#test#SetDirectory('/testplugin/test/fixers') @@ -26,7 +26,7 @@ Execute(The fish_indent callback should return the correct default values): \ ale#fixers#fish_indent#Fix(bufnr('')) Execute(The fish_indent callback should include custom fish_indent options): - let g:ale_fish_fishindent_options = "-d" + let g:ale_fish_fish_indent_options = "-d" call ale#test#SetFilename('../fish_files/testfile.fish') AssertEqual