Update tests

.github/workflows/tests.yaml

@@ -17,15 +17,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Python 3.x
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.x"
+        python-version: "3.10"
 
     - name: Setup Vim
-      uses: rhysd/action-setup-vim@v1.2.8
+      uses: rhysd/action-setup-vim@v1
       with:
         neovim: true
         version: ${{ matrix.nvim_version }}

test/case/basic.vader

@@ -8,23 +8,23 @@ Execute (Check fibonacci sequence.):
     AssertEqual [1, 2, 3, 5, 8, 13, 21], line_number_interval#fibonacci()
 
 Execute (Check highlight with default color.):
-    AssertEqual "\nLineNr         xxx ctermfg=11 guifg=Yellow", execute('highlight LineNr')
+    AssertEqual "\nLineNr         xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "")
 
     LineNumberIntervalEnable
 
     AssertEqual "\nLineNr         xxx ctermfg=0 guifg=Black", execute('highlight LineNr')
     AssertEqual "\nDimLineNr      xxx cleared", execute('highlight DimLineNr')
-    AssertEqual "\nHighlightedLineNr xxx ctermfg=11 guifg=Yellow", execute('highlight HighlightedLineNr')
+    AssertEqual "\nHighlightedLineNr xxx guifg=NvimDarkGrey4", substitute(execute('highlight HighlightedLineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "")
 
     LineNumberIntervalDisable
 
-    AssertEqual "\nLineNr         xxx ctermfg=11 guifg=Yellow", execute('highlight LineNr')
+    AssertEqual "\nLineNr         xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "")
 
 Execute (Check highlight with configured color.):
     highlight HighlightedLineNr guifg=White ctermfg=7
     highlight DimLineNr guifg=Magenta ctermfg=5
 
-    AssertEqual "\nLineNr         xxx ctermfg=11 guifg=Yellow", execute('highlight LineNr')
+    AssertEqual "\nLineNr         xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "")
 
     LineNumberIntervalEnable
 
@@ -34,7 +34,7 @@ Execute (Check highlight with configured color.):
 
     LineNumberIntervalDisable
 
-    AssertEqual "\nLineNr         xxx ctermfg=11 guifg=Yellow", execute('highlight LineNr')
+    AssertEqual "\nLineNr         xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "")
 
 Execute (Check autocmd.):
     AssertThrows autocmd LineNumberInterval
@@ -65,12 +65,12 @@ Execute (Check sign group.):
     AssertEqual "\n--- Signs ---\n", execute('sign place group=LineNumberGroup')
 
 Execute (Check toggle.):
-    AssertEqual "\nLineNr         xxx ctermfg=11 guifg=Yellow", execute('highlight LineNr')
+    AssertEqual "\nLineNr         xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "")
 
     LineNumberIntervalToggle
 
     AssertEqual "\nLineNr         xxx ctermfg=0 guifg=Black", execute('highlight LineNr')
 
     LineNumberIntervalToggle
 
-    AssertEqual "\nLineNr         xxx ctermfg=11 guifg=Yellow", execute('highlight LineNr')
+    AssertEqual "\nLineNr         xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "")

test/case/custom_interval.vader

@@ -26,12 +26,12 @@ Execute (Check use_custom with default interval.):
 
     AssertEqual [1, 2, 3, 5, 8, 13, 21], g:line_number_interval#custom_interval
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=2  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=3  id=2  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=4  id=3  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=6  id=4  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=9  id=5  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=14  id=6  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=2    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=3    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=4    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=6    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=9    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=14    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
     14
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=1  id=6  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=6  id=5  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=9  id=4  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=11  id=3  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=12  id=2  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=13  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=15  id=7  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=1    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=6    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=9    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=11    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=12    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=13    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=15    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
 Execute (Check use_custom with custom interval.):
     let g:line_number_interval#use_custom = 1
@@ -44,9 +44,9 @@ Execute (Check use_custom with custom interval.):
     2
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=5  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=11  id=2  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=5    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=11    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
     11
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=2  id=2  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=8  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=14  id=3  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=2    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=8    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=14    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")

test/case/multiple-colors.vader

@@ -30,12 +30,12 @@ Execute (Check multiple colors with relative number.):
     2
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=5  id=1  group=LineNumberGroup  name=LineNumberInterval1  priority=10\n    line=11  id=2  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=5    group=LineNumberGroup  name=LineNumberInterval1  priority=10\n    line=11    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
     11
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=2  id=2  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=8  id=1  group=LineNumberGroup  name=LineNumberInterval1  priority=10\n    line=14  id=3  group=LineNumberGroup  name=LineNumberInterval1  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=2    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=8    group=LineNumberGroup  name=LineNumberInterval1  priority=10\n    line=14    group=LineNumberGroup  name=LineNumberInterval1  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
 Execute (Check multiple colors with set number.):
     let g:line_number_interval#use_custom = 1
@@ -50,9 +50,9 @@ Execute (Check multiple colors with set number.):
     2
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=5  id=2  group=LineNumberGroup  name=LineNumberInterval1  priority=10\n    line=10  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=5    group=LineNumberGroup  name=LineNumberInterval1  priority=10\n    line=10    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
     11
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=8  id=2  group=LineNumberGroup  name=LineNumberInterval1  priority=10\n    line=10  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=14  id=3  group=LineNumberGroup  name=LineNumberInterval1  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=8    group=LineNumberGroup  name=LineNumberInterval1  priority=10\n    line=10    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=14    group=LineNumberGroup  name=LineNumberInterval1  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")

test/case/number.vader

@@ -25,16 +25,16 @@ Execute (Check set number.):
     2
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=10  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=10    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
     13
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=10  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=10    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
     LineNumberIntervalDisable
 
-    AssertEqual "\n--- Signs ---\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "")
 
 Execute (Check set number with fold.):
     set number
@@ -46,7 +46,7 @@ Execute (Check set number with fold.):
     4
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=10  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=10    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
 Execute (Check set number on fold.):
     set number
@@ -58,7 +58,7 @@ Execute (Check set number on fold.):
     4
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=10  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=10    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
 Execute (Check set number with configured interval.):
     let g:line_number_interval = 7
@@ -70,4 +70,4 @@ Execute (Check set number with configured interval.):
     3
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=7  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=14  id=2  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=7    group=LineNumberGroup  name=LineNumberInterval  priority=10\n    line=14    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")

test/case/relative_number.vader

@@ -22,12 +22,12 @@ Execute (Check set relativenumber.):
 
     LineNumberIntervalEnable
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=11  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=11    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
     13
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=3  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=3    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
 Execute (Check set relativenumber with fold.):
     set relativenumber
@@ -39,12 +39,12 @@ Execute (Check set relativenumber with fold.):
     1
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=14  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=14    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
     15
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=2  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=2    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
 Execute (Check set relativenumber on fold (forward).):
     set relativenumber
@@ -58,12 +58,12 @@ Execute (Check set relativenumber on fold (forward).):
     2
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=14  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=14    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
     14
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
 Execute (Check set relativenumber on fold (backward).):
     set relativenumber
@@ -77,12 +77,12 @@ Execute (Check set relativenumber on fold (backward).):
     12
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=2  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=2    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
     2
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
 Execute (Check set relativenumber with configured interval.):
     let g:line_number_interval = 7
@@ -94,9 +94,9 @@ Execute (Check set relativenumber with configured interval.):
     3
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=10  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=10    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")
 
     13
     doautocmd CursorMoved
 
-    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=6  id=1  group=LineNumberGroup  name=LineNumberInterval  priority=10\n", execute('sign place group=LineNumberGroup')
+    AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n    line=6    group=LineNumberGroup  name=LineNumberInterval  priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")