From f3e7f044f6db5f1c887e5a594ddbdcdf440a50a7 Mon Sep 17 00:00:00 2001 From: BlahGeek Date: Sun, 4 Aug 2019 14:23:11 +0800 Subject: [PATCH 1/4] add g:ale_sign_highlight_linenr --- autoload/ale/sign.vim | 3 ++- doc/ale.txt | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/autoload/ale/sign.vim b/autoload/ale/sign.vim index eb0dd1cd75..7170e926df 100644 --- a/autoload/ale/sign.vim +++ b/autoload/ale/sign.vim @@ -20,6 +20,7 @@ let g:ale_sign_info = get(g:, 'ale_sign_info', g:ale_sign_warning) let g:ale_sign_offset = get(g:, 'ale_sign_offset', 1000000) " This flag can be set to 1 to keep sign gutter always open let g:ale_sign_column_always = get(g:, 'ale_sign_column_always', 0) +let g:ale_sign_highlight_linenr = get(g:, 'ale_sign_highlight_linenr', has('nvim-0.3.2')) if !hlexists('ALEErrorSign') highlight link ALEErrorSign error @@ -82,7 +83,7 @@ execute 'sign define ALEInfoSign text=' . s:EscapeSignText(g:ale_sign_info) \ . ' texthl=ALEInfoSign linehl=ALEInfoLine' sign define ALEDummySign -if has('nvim-0.3.2') +if g:ale_sign_highlight_linenr if !hlexists('ALEErrorSignLineNr') highlight link ALEErrorSignLineNr CursorLineNr endif diff --git a/doc/ale.txt b/doc/ale.txt index 5541236fed..2208a7bbc5 100644 --- a/doc/ale.txt +++ b/doc/ale.txt @@ -1427,7 +1427,8 @@ g:ale_set_signs *g:ale_set_signs* |ALEInfoLine| - All items with `'type': 'I'` With Neovim 0.3.2 or higher, ALE uses `numhl` option to highlight 'number' - column. It uses the following highlight groups. + column. It uses the following highlight groups. To disable this feature, + see |g:ale_sign_highlight_linenr|. |ALEErrorSignLineNr| - Items with `'type': 'E'` |ALEWarningSignLineNr| - Items with `'type': 'W'` @@ -1541,6 +1542,15 @@ g:ale_sign_warning *g:ale_sign_warning* The sign for warnings in the sign gutter. +g:ale_sign_highlight_linenr *g:ale_sign_highlight_linenr* + + Type: |Number| + Default: `has('nvim-0.3.2')` + + This option controls whether ALE should use `numhl` option to highlight 'number' + column. It's enabled by default in Neovim 0.3.2 or higher. + + g:ale_update_tagstack *g:ale_update_tagstack* *b:ale_update_tagstack* Type: |Number| From 81040c8ed5e2c97d45573a9ef5d684507211f121 Mon Sep 17 00:00:00 2001 From: BlahGeek Date: Sun, 4 Aug 2019 14:30:13 +0800 Subject: [PATCH 2/4] Fix tests. Change option default value --- autoload/ale/debugging.vim | 1 + autoload/ale/sign.vim | 4 ++-- doc/ale.txt | 4 ++-- test/test_ale_info.vader | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/autoload/ale/debugging.vim b/autoload/ale/debugging.vim index 7cdbabaa5e..0625161c60 100644 --- a/autoload/ale/debugging.vim +++ b/autoload/ale/debugging.vim @@ -50,6 +50,7 @@ let s:global_variable_list = [ \ 'ale_sign_style_error', \ 'ale_sign_style_warning', \ 'ale_sign_warning', +\ 'ale_sign_highlight_linenr', \ 'ale_statusline_format', \ 'ale_type_map', \ 'ale_use_global_executables', diff --git a/autoload/ale/sign.vim b/autoload/ale/sign.vim index 7170e926df..996817511f 100644 --- a/autoload/ale/sign.vim +++ b/autoload/ale/sign.vim @@ -20,7 +20,7 @@ let g:ale_sign_info = get(g:, 'ale_sign_info', g:ale_sign_warning) let g:ale_sign_offset = get(g:, 'ale_sign_offset', 1000000) " This flag can be set to 1 to keep sign gutter always open let g:ale_sign_column_always = get(g:, 'ale_sign_column_always', 0) -let g:ale_sign_highlight_linenr = get(g:, 'ale_sign_highlight_linenr', has('nvim-0.3.2')) +let g:ale_sign_highlight_linenr = get(g:, 'ale_sign_highlight_linenr', 1) if !hlexists('ALEErrorSign') highlight link ALEErrorSign error @@ -83,7 +83,7 @@ execute 'sign define ALEInfoSign text=' . s:EscapeSignText(g:ale_sign_info) \ . ' texthl=ALEInfoSign linehl=ALEInfoLine' sign define ALEDummySign -if g:ale_sign_highlight_linenr +if g:ale_sign_highlight_linenr && has('nvim-0.3.2') if !hlexists('ALEErrorSignLineNr') highlight link ALEErrorSignLineNr CursorLineNr endif diff --git a/doc/ale.txt b/doc/ale.txt index 2208a7bbc5..aef65bc4de 100644 --- a/doc/ale.txt +++ b/doc/ale.txt @@ -1545,10 +1545,10 @@ g:ale_sign_warning *g:ale_sign_warning* g:ale_sign_highlight_linenr *g:ale_sign_highlight_linenr* Type: |Number| - Default: `has('nvim-0.3.2')` + Default: `1` This option controls whether ALE should use `numhl` option to highlight 'number' - column. It's enabled by default in Neovim 0.3.2 or higher. + column in supported vim version. g:ale_update_tagstack *g:ale_update_tagstack* diff --git a/test/test_ale_info.vader b/test/test_ale_info.vader index decd49e94d..5f41e467ff 100644 --- a/test/test_ale_info.vader +++ b/test/test_ale_info.vader @@ -19,6 +19,7 @@ Before: Save g:ale_sign_style_error Save g:ale_sign_style_warning Save g:ale_sign_warning + Save g:ale_sign_highlight_linenr Save g:ale_statusline_format Save g:ale_type_map Save g:ale_warn_about_trailing_whitespace @@ -43,6 +44,7 @@ Before: let g:ale_sign_style_error = '>>' let g:ale_sign_style_warning = '--' let g:ale_sign_warning = '--' + let g:ale_sign_highlight_linenr = 0 let g:ale_statusline_format = ['%d error(s)', '%d warning(s)', 'OK'] let g:ale_type_map = {} let g:ale_warn_about_trailing_whitespace = 1 @@ -116,6 +118,7 @@ Before: \ 'let g:ale_sign_style_error = ''>>''', \ 'let g:ale_sign_style_warning = ''--''', \ 'let g:ale_sign_warning = ''--''', + \ 'let g:ale_sign_highlight_linenr = 0', \ 'let g:ale_statusline_format = [''%d error(s)'', ''%d warning(s)'', ''OK'']', \ 'let g:ale_type_map = {}', \ 'let g:ale_use_global_executables = v:null', From 25eb28b0b535138c2d6eb46f71f65aa711075af0 Mon Sep 17 00:00:00 2001 From: BlahGeek Date: Sun, 1 Sep 2019 20:40:21 +0800 Subject: [PATCH 3/4] Rename ale_sign_highlight_linenr to ale_sign_highlight_linenrs --- autoload/ale/debugging.vim | 2 +- autoload/ale/sign.vim | 4 ++-- doc/ale.txt | 4 ++-- test/test_ale_info.vader | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autoload/ale/debugging.vim b/autoload/ale/debugging.vim index 0625161c60..e54cae0dfe 100644 --- a/autoload/ale/debugging.vim +++ b/autoload/ale/debugging.vim @@ -50,7 +50,7 @@ let s:global_variable_list = [ \ 'ale_sign_style_error', \ 'ale_sign_style_warning', \ 'ale_sign_warning', -\ 'ale_sign_highlight_linenr', +\ 'ale_sign_highlight_linenrs', \ 'ale_statusline_format', \ 'ale_type_map', \ 'ale_use_global_executables', diff --git a/autoload/ale/sign.vim b/autoload/ale/sign.vim index 996817511f..8e04da1287 100644 --- a/autoload/ale/sign.vim +++ b/autoload/ale/sign.vim @@ -20,7 +20,7 @@ let g:ale_sign_info = get(g:, 'ale_sign_info', g:ale_sign_warning) let g:ale_sign_offset = get(g:, 'ale_sign_offset', 1000000) " This flag can be set to 1 to keep sign gutter always open let g:ale_sign_column_always = get(g:, 'ale_sign_column_always', 0) -let g:ale_sign_highlight_linenr = get(g:, 'ale_sign_highlight_linenr', 1) +let g:ale_sign_highlight_linenrs = get(g:, 'ale_sign_highlight_linenrs', 1) if !hlexists('ALEErrorSign') highlight link ALEErrorSign error @@ -83,7 +83,7 @@ execute 'sign define ALEInfoSign text=' . s:EscapeSignText(g:ale_sign_info) \ . ' texthl=ALEInfoSign linehl=ALEInfoLine' sign define ALEDummySign -if g:ale_sign_highlight_linenr && has('nvim-0.3.2') +if g:ale_sign_highlight_linenrs && has('nvim-0.3.2') if !hlexists('ALEErrorSignLineNr') highlight link ALEErrorSignLineNr CursorLineNr endif diff --git a/doc/ale.txt b/doc/ale.txt index aef65bc4de..2e4ba1e58a 100644 --- a/doc/ale.txt +++ b/doc/ale.txt @@ -1428,7 +1428,7 @@ g:ale_set_signs *g:ale_set_signs* With Neovim 0.3.2 or higher, ALE uses `numhl` option to highlight 'number' column. It uses the following highlight groups. To disable this feature, - see |g:ale_sign_highlight_linenr|. + see |g:ale_sign_highlight_linenrs|. |ALEErrorSignLineNr| - Items with `'type': 'E'` |ALEWarningSignLineNr| - Items with `'type': 'W'` @@ -1542,7 +1542,7 @@ g:ale_sign_warning *g:ale_sign_warning* The sign for warnings in the sign gutter. -g:ale_sign_highlight_linenr *g:ale_sign_highlight_linenr* +g:ale_sign_highlight_linenrs *g:ale_sign_highlight_linenrs* Type: |Number| Default: `1` diff --git a/test/test_ale_info.vader b/test/test_ale_info.vader index 5f41e467ff..f616c7bece 100644 --- a/test/test_ale_info.vader +++ b/test/test_ale_info.vader @@ -19,7 +19,7 @@ Before: Save g:ale_sign_style_error Save g:ale_sign_style_warning Save g:ale_sign_warning - Save g:ale_sign_highlight_linenr + Save g:ale_sign_highlight_linenrs Save g:ale_statusline_format Save g:ale_type_map Save g:ale_warn_about_trailing_whitespace @@ -44,7 +44,7 @@ Before: let g:ale_sign_style_error = '>>' let g:ale_sign_style_warning = '--' let g:ale_sign_warning = '--' - let g:ale_sign_highlight_linenr = 0 + let g:ale_sign_highlight_linenrs = 0 let g:ale_statusline_format = ['%d error(s)', '%d warning(s)', 'OK'] let g:ale_type_map = {} let g:ale_warn_about_trailing_whitespace = 1 @@ -118,7 +118,7 @@ Before: \ 'let g:ale_sign_style_error = ''>>''', \ 'let g:ale_sign_style_warning = ''--''', \ 'let g:ale_sign_warning = ''--''', - \ 'let g:ale_sign_highlight_linenr = 0', + \ 'let g:ale_sign_highlight_linenrs = 0', \ 'let g:ale_statusline_format = [''%d error(s)'', ''%d warning(s)'', ''OK'']', \ 'let g:ale_type_map = {}', \ 'let g:ale_use_global_executables = v:null', From 49bedecac435663564193889f80940412c5dbf3b Mon Sep 17 00:00:00 2001 From: BlahGeek Date: Sun, 1 Sep 2019 20:42:09 +0800 Subject: [PATCH 4/4] Default ale_sign_highlight_linenrs to 0 --- autoload/ale/sign.vim | 2 +- doc/ale.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autoload/ale/sign.vim b/autoload/ale/sign.vim index 8e04da1287..829de11846 100644 --- a/autoload/ale/sign.vim +++ b/autoload/ale/sign.vim @@ -20,7 +20,7 @@ let g:ale_sign_info = get(g:, 'ale_sign_info', g:ale_sign_warning) let g:ale_sign_offset = get(g:, 'ale_sign_offset', 1000000) " This flag can be set to 1 to keep sign gutter always open let g:ale_sign_column_always = get(g:, 'ale_sign_column_always', 0) -let g:ale_sign_highlight_linenrs = get(g:, 'ale_sign_highlight_linenrs', 1) +let g:ale_sign_highlight_linenrs = get(g:, 'ale_sign_highlight_linenrs', 0) if !hlexists('ALEErrorSign') highlight link ALEErrorSign error diff --git a/doc/ale.txt b/doc/ale.txt index 2e4ba1e58a..0df404c0e6 100644 --- a/doc/ale.txt +++ b/doc/ale.txt @@ -1426,8 +1426,8 @@ g:ale_set_signs *g:ale_set_signs* |ALEWarningLine| - All items with `'type': 'W'` |ALEInfoLine| - All items with `'type': 'I'` - With Neovim 0.3.2 or higher, ALE uses `numhl` option to highlight 'number' - column. It uses the following highlight groups. To disable this feature, + With Neovim 0.3.2 or higher, ALE can use `numhl` option to highlight 'number' + column. It uses the following highlight groups. To enable this feature, see |g:ale_sign_highlight_linenrs|. |ALEErrorSignLineNr| - Items with `'type': 'E'` @@ -1545,7 +1545,7 @@ g:ale_sign_warning *g:ale_sign_warning* g:ale_sign_highlight_linenrs *g:ale_sign_highlight_linenrs* Type: |Number| - Default: `1` + Default: `0` This option controls whether ALE should use `numhl` option to highlight 'number' column in supported vim version.