mirror of
				https://github.com/neovim/neovim.git
				synced 2025-11-03 17:24:29 +00:00 
			
		
		
		
	test: fix screen assertions
This commit is contained in:
		@@ -734,11 +734,11 @@ describe(":substitute, inccommand=split", function()
 | 
			
		||||
    feed_command("set nomodified")
 | 
			
		||||
    feed(":%s/tw")
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      {12:tw}o lines                     |
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      {12:tw}o lines                     |
 | 
			
		||||
                                    |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {11:[No Name]                     }|
 | 
			
		||||
      |2| {12:tw}o lines                 |
 | 
			
		||||
      |4| {12:tw}o lines                 |
 | 
			
		||||
@@ -791,11 +791,11 @@ describe(":substitute, inccommand=split", function()
 | 
			
		||||
  it('shows split window when typing the pattern', function()
 | 
			
		||||
    feed(":%s/tw")
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      {12:tw}o lines                     |
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      {12:tw}o lines                     |
 | 
			
		||||
                                    |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {11:[No Name] [+]                 }|
 | 
			
		||||
      |2| {12:tw}o lines                 |
 | 
			
		||||
      |4| {12:tw}o lines                 |
 | 
			
		||||
@@ -812,11 +812,11 @@ describe(":substitute, inccommand=split", function()
 | 
			
		||||
  it('shows preview with empty replacement', function()
 | 
			
		||||
    feed(":%s/tw/")
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      o lines                       |
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      o lines                       |
 | 
			
		||||
                                    |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {11:[No Name] [+]                 }|
 | 
			
		||||
      |2| o lines                   |
 | 
			
		||||
      |4| o lines                   |
 | 
			
		||||
@@ -831,11 +831,11 @@ describe(":substitute, inccommand=split", function()
 | 
			
		||||
 | 
			
		||||
    feed("x")
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      {12:x}o lines                      |
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      {12:x}o lines                      |
 | 
			
		||||
                                    |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {11:[No Name] [+]                 }|
 | 
			
		||||
      |2| {12:x}o lines                  |
 | 
			
		||||
      |4| {12:x}o lines                  |
 | 
			
		||||
@@ -850,11 +850,11 @@ describe(":substitute, inccommand=split", function()
 | 
			
		||||
 | 
			
		||||
    feed("<bs>")
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      o lines                       |
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      o lines                       |
 | 
			
		||||
                                    |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {11:[No Name] [+]                 }|
 | 
			
		||||
      |2| o lines                   |
 | 
			
		||||
      |4| o lines                   |
 | 
			
		||||
@@ -872,11 +872,11 @@ describe(":substitute, inccommand=split", function()
 | 
			
		||||
  it('shows split window when typing replacement', function()
 | 
			
		||||
    feed(":%s/tw/XX")
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      {12:XX}o lines                     |
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      {12:XX}o lines                     |
 | 
			
		||||
                                    |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {11:[No Name] [+]                 }|
 | 
			
		||||
      |2| {12:XX}o lines                 |
 | 
			
		||||
      |4| {12:XX}o lines                 |
 | 
			
		||||
@@ -938,11 +938,11 @@ describe(":substitute, inccommand=split", function()
 | 
			
		||||
    feed(":%s/tw")
 | 
			
		||||
    -- 'cursorline' is NOT active during preview.
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      {12:tw}o lines                     |
 | 
			
		||||
      Inc substitution on           |
 | 
			
		||||
      {12:tw}o lines                     |
 | 
			
		||||
                                    |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {11:[No Name] [+]                 }|
 | 
			
		||||
      |2| {12:tw}o lines                 |
 | 
			
		||||
      |4| {12:tw}o lines                 |
 | 
			
		||||
@@ -2205,11 +2205,11 @@ describe(":substitute", function()
 | 
			
		||||
 | 
			
		||||
    feed("/KKK")
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      T T123 T T123 T2T TT T23423424|
 | 
			
		||||
      x                             |
 | 
			
		||||
      afa {12:KKK}adf la;lkd {12:KKK}alx      |
 | 
			
		||||
                                    |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {11:[No Name] [+]                 }|
 | 
			
		||||
      |3| afa {12:KKK}adf la;lkd {12:KKK}alx  |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
@@ -2485,11 +2485,11 @@ describe(":substitute", function()
 | 
			
		||||
    wait()
 | 
			
		||||
    feed([[:%s/\(some\)\@<lt>!thing/one/]])
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      something                     |
 | 
			
		||||
      every{12:one}                      |
 | 
			
		||||
      someone                       |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {11:[No Name] [+]                 }|
 | 
			
		||||
      |2| every{12:one}                  |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
@@ -2527,11 +2527,11 @@ describe(":substitute", function()
 | 
			
		||||
    wait()
 | 
			
		||||
    feed([[:%s/some\(thing\)\@!/every/]])
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      something                     |
 | 
			
		||||
      everything                    |
 | 
			
		||||
      {12:every}one                      |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
      {11:[No Name] [+]                 }|
 | 
			
		||||
      |3| {12:every}one                  |
 | 
			
		||||
      {15:~                             }|
 | 
			
		||||
 
 | 
			
		||||
@@ -419,9 +419,9 @@ describe('ui/mouse/input', function()
 | 
			
		||||
        meths.set_option('showtabline', 2)
 | 
			
		||||
        screen:expect([[
 | 
			
		||||
          {fill:test-test2               }|
 | 
			
		||||
          testing                  |
 | 
			
		||||
          mouse                    |
 | 
			
		||||
          support and selectio^n    |
 | 
			
		||||
          {0:~                        }|
 | 
			
		||||
                                   |
 | 
			
		||||
        ]])
 | 
			
		||||
        meths.set_var('reply', {})
 | 
			
		||||
@@ -539,9 +539,9 @@ describe('ui/mouse/input', function()
 | 
			
		||||
    feed_command('tabprevious')  -- go to first tab
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      {sel: + foo }{tab: + bar }{fill:          }{tab:X}|
 | 
			
		||||
      testing                  |
 | 
			
		||||
      mouse                    |
 | 
			
		||||
      support and selectio^n    |
 | 
			
		||||
      {0:~                        }|
 | 
			
		||||
      :tabprevious             |
 | 
			
		||||
    ]])
 | 
			
		||||
    feed('<LeftMouse><10,0><LeftRelease>')  -- go to second tab
 | 
			
		||||
 
 | 
			
		||||
@@ -1491,20 +1491,20 @@ describe('builtin popupmenu', function()
 | 
			
		||||
 | 
			
		||||
    command("split")
 | 
			
		||||
    screen:expect([[
 | 
			
		||||
      xx                                      |
 | 
			
		||||
      choice^                                  |
 | 
			
		||||
      {1:~                                       }|
 | 
			
		||||
      {n:word           }{1:                         }|
 | 
			
		||||
      {s:choice         }{4:                         }|
 | 
			
		||||
      {n:text           }                         |
 | 
			
		||||
      {n:thing          }{1:                         }|
 | 
			
		||||
      {n:thing          }                         |
 | 
			
		||||
      {3:[No Name] [+]                           }|
 | 
			
		||||
      {2:-- INSERT --}                            |
 | 
			
		||||
    ]])
 | 
			
		||||
 | 
			
		||||
    meths.input_mouse('wheel', 'down', '', 0, 6, 15)
 | 
			
		||||
    screen:expect{grid=[[
 | 
			
		||||
      xx                                      |
 | 
			
		||||
      choice^                                  |
 | 
			
		||||
      {1:~                                       }|
 | 
			
		||||
      {n:word           }{1:                         }|
 | 
			
		||||
      {s:choice         }{4:                         }|
 | 
			
		||||
      {n:text           }                         |
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user