From 92267a14ba4ef4f96ea5822366f5b24231b1d9d7 Mon Sep 17 00:00:00 2001 From: w0rp Date: Sat, 9 Sep 2023 23:13:44 +0100 Subject: [PATCH] Remove backwards compatibility with ancient setting names --- ale_linters/sh/shell.vim | 5 ----- autoload/ale/handlers/shellcheck.vim | 2 +- test/test_backwards_compatibility.vader | 19 ------------------- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 test/test_backwards_compatibility.vader diff --git a/ale_linters/sh/shell.vim b/ale_linters/sh/shell.vim index 73ab3608..0605c285 100644 --- a/ale_linters/sh/shell.vim +++ b/ale_linters/sh/shell.vim @@ -1,11 +1,6 @@ " Author: w0rp " Description: Lints shell files by invoking the shell with -n -" Backwards compatibility -if exists('g:ale_linters_sh_shell_default_shell') - let g:ale_sh_shell_default_shell = g:ale_linters_sh_shell_default_shell -endif - " This option can be changed to change the default shell when the shell " cannot be taken from the hashbang line. if !exists('g:ale_sh_shell_default_shell') diff --git a/autoload/ale/handlers/shellcheck.vim b/autoload/ale/handlers/shellcheck.vim index 17de2912..fd540e8e 100644 --- a/autoload/ale/handlers/shellcheck.vim +++ b/autoload/ale/handlers/shellcheck.vim @@ -102,7 +102,7 @@ function! ale#handlers#shellcheck#DefineLinter(filetype) abort " This global variable can be set with a string of comma-separated error " codes to exclude from shellcheck. For example: " let g:ale_sh_shellcheck_exclusions = 'SC2002,SC2004' - call ale#Set('sh_shellcheck_exclusions', get(g:, 'ale_linters_sh_shellcheck_exclusions', '')) + call ale#Set('sh_shellcheck_exclusions', '') call ale#Set('sh_shellcheck_executable', 'shellcheck') call ale#Set('sh_shellcheck_dialect', 'auto') call ale#Set('sh_shellcheck_options', '') diff --git a/test/test_backwards_compatibility.vader b/test/test_backwards_compatibility.vader deleted file mode 100644 index e4e3756f..00000000 --- a/test/test_backwards_compatibility.vader +++ /dev/null @@ -1,19 +0,0 @@ -" These tests, and the code that it covers, may be removed upon a major release. - -After: - unlet! g:ale_linters_sh_shellcheck_exclusions - unlet! g:ale_sh_shellcheck_exclusions - unlet! g:ale_linters_sh_shell_default_shell - unlet! g:ale_sh_shell_default_shell - -Execute(Old variable name for the 'shellcheck' linter should still work): - let g:ale_linters_sh_shellcheck_exclusions = 'SC1234' - runtime ale_linters/sh/shellcheck.vim - - AssertEqual 'SC1234', g:ale_sh_shellcheck_exclusions - -Execute (Old variable name for the 'shell' linter should still work): - let g:ale_linters_sh_shell_default_shell = 'woosh' - runtime ale_linters/sh/shell.vim - - AssertEqual 'woosh', g:ale_sh_shell_default_shell