mirror of
				https://github.com/neovim/neovim.git
				synced 2025-11-04 09:44:31 +00:00 
			
		
		
		
	functionaltests: vim-patch:8.1.{550,551} fix
This commit is contained in:
		@@ -19,7 +19,10 @@ describe(':debug', function()
 | 
				
			|||||||
  it('scrolls messages correctly', function()
 | 
					  it('scrolls messages correctly', function()
 | 
				
			||||||
    feed(':echoerr bork<cr>')
 | 
					    feed(':echoerr bork<cr>')
 | 
				
			||||||
    screen:expect([[
 | 
					    screen:expect([[
 | 
				
			||||||
                                                        |
 | 
					      ^                                                  |
 | 
				
			||||||
 | 
					      {1:~                                                 }|
 | 
				
			||||||
 | 
					      {1:~                                                 }|
 | 
				
			||||||
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
@@ -29,10 +32,7 @@ describe(':debug', function()
 | 
				
			|||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {2:                                                  }|
 | 
					 | 
				
			||||||
      {3:E121: Undefined variable: bork}                    |
 | 
					      {3:E121: Undefined variable: bork}                    |
 | 
				
			||||||
      {3:E15: Invalid expression: bork}                     |
 | 
					 | 
				
			||||||
      {4:Press ENTER or type command to continue}^           |
 | 
					 | 
				
			||||||
    ]])
 | 
					    ]])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    feed(':debug echo "aa"| echo "bb"<cr>')
 | 
					    feed(':debug echo "aa"| echo "bb"<cr>')
 | 
				
			||||||
@@ -45,9 +45,9 @@ describe(':debug', function()
 | 
				
			|||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
 | 
					      {1:~                                                 }|
 | 
				
			||||||
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {2:                                                  }|
 | 
					      {2:                                                  }|
 | 
				
			||||||
      {3:E121: Undefined variable: bork}                    |
 | 
					 | 
				
			||||||
      {3:E15: Invalid expression: bork}                     |
 | 
					 | 
				
			||||||
      Entering Debug mode.  Type "cont" to continue.    |
 | 
					      Entering Debug mode.  Type "cont" to continue.    |
 | 
				
			||||||
      cmd: echo "aa"| echo "bb"                         |
 | 
					      cmd: echo "aa"| echo "bb"                         |
 | 
				
			||||||
      >^                                                 |
 | 
					      >^                                                 |
 | 
				
			||||||
@@ -60,9 +60,9 @@ describe(':debug', function()
 | 
				
			|||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
 | 
					      {1:~                                                 }|
 | 
				
			||||||
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {2:                                                  }|
 | 
					      {2:                                                  }|
 | 
				
			||||||
      {3:E121: Undefined variable: bork}                    |
 | 
					 | 
				
			||||||
      {3:E15: Invalid expression: bork}                     |
 | 
					 | 
				
			||||||
      Entering Debug mode.  Type "cont" to continue.    |
 | 
					      Entering Debug mode.  Type "cont" to continue.    |
 | 
				
			||||||
      cmd: echo "aa"| echo "bb"                         |
 | 
					      cmd: echo "aa"| echo "bb"                         |
 | 
				
			||||||
      >step                                             |
 | 
					      >step                                             |
 | 
				
			||||||
@@ -76,9 +76,9 @@ describe(':debug', function()
 | 
				
			|||||||
                                                        |
 | 
					                                                        |
 | 
				
			||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {1:~                                                 }|
 | 
					      {1:~                                                 }|
 | 
				
			||||||
 | 
					      {1:~                                                 }|
 | 
				
			||||||
 | 
					      {1:~                                                 }|
 | 
				
			||||||
      {2:                                                  }|
 | 
					      {2:                                                  }|
 | 
				
			||||||
      {3:E121: Undefined variable: bork}                    |
 | 
					 | 
				
			||||||
      {3:E15: Invalid expression: bork}                     |
 | 
					 | 
				
			||||||
      Entering Debug mode.  Type "cont" to continue.    |
 | 
					      Entering Debug mode.  Type "cont" to continue.    |
 | 
				
			||||||
      cmd: echo "aa"| echo "bb"                         |
 | 
					      cmd: echo "aa"| echo "bb"                         |
 | 
				
			||||||
      >step                                             |
 | 
					      >step                                             |
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -117,60 +117,60 @@ local function test_cmdline(linegrid)
 | 
				
			|||||||
    end)
 | 
					    end)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    it('but not with scrolled messages', function()
 | 
					    it('but not with scrolled messages', function()
 | 
				
			||||||
      screen:try_resize(50,10)
 | 
					      screen:try_resize(49,10)
 | 
				
			||||||
      feed(':echoerr doesnotexist<cr>')
 | 
					      feed(':echoerr doesnotexist<cr>')
 | 
				
			||||||
      screen:expect{grid=[[
 | 
					      screen:expect{grid=[[
 | 
				
			||||||
                                                          |
 | 
					        ^                                                 |
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {3:                                                  }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E121: Undefined variable: doesnotexist}            |
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E15: Invalid expression: doesnotexist}             |
 | 
					        {3:n                                                }|
 | 
				
			||||||
        {5:Press ENTER or type command to continue}^           |
 | 
					        {4:E121: Undefined variable: doesnotexist}           |
 | 
				
			||||||
      ]]}
 | 
					      ]]}
 | 
				
			||||||
      feed(':echoerr doesnotexist<cr>')
 | 
					      feed(':echoerr doesnotexist<cr>')
 | 
				
			||||||
      screen:expect{grid=[[
 | 
					      screen:expect{grid=[[
 | 
				
			||||||
                                                          |
 | 
					        ^                                                 |
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {3:                                                  }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E121: Undefined variable: doesnotexist}            |
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E15: Invalid expression: doesnotexist}             |
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E121: Undefined variable: doesnotexist}            |
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E15: Invalid expression: doesnotexist}             |
 | 
					        {3:n                                                }|
 | 
				
			||||||
        {5:Press ENTER or type command to continue}^           |
 | 
					        {4:E121: Undefined variable: doesnotexist}           |
 | 
				
			||||||
      ]]}
 | 
					      ]]}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      feed(':echoerr doesnotexist<cr>')
 | 
					      feed(':echoerr doesnotexist<cr>')
 | 
				
			||||||
      screen:expect{grid=[[
 | 
					      screen:expect{grid=[[
 | 
				
			||||||
                                                          |
 | 
					        ^                                                 |
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {3:                                                  }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E121: Undefined variable: doesnotexist}            |
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E15: Invalid expression: doesnotexist}             |
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E121: Undefined variable: doesnotexist}            |
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E15: Invalid expression: doesnotexist}             |
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E121: Undefined variable: doesnotexist}            |
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {4:E15: Invalid expression: doesnotexist}             |
 | 
					        {3:n                                                }|
 | 
				
			||||||
        {5:Press ENTER or type command to continue}^           |
 | 
					        {4:E121: Undefined variable: doesnotexist}           |
 | 
				
			||||||
      ]]}
 | 
					      ]]}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      feed('<cr>')
 | 
					      feed('<cr>')
 | 
				
			||||||
      screen:expect{grid=[[
 | 
					      screen:expect{grid=[[
 | 
				
			||||||
        ^                                                  |
 | 
					        ^                                                 |
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {1:~                                                 }|
 | 
					        {1:~                                                }|
 | 
				
			||||||
        {3:n                                                 }|
 | 
					        {3:n                                                }|
 | 
				
			||||||
                                                          |
 | 
					        {4:E121: Undefined variable: doesnotexist}           |
 | 
				
			||||||
      ]]}
 | 
					      ]]}
 | 
				
			||||||
    end)
 | 
					    end)
 | 
				
			||||||
  end)
 | 
					  end)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,9 +28,9 @@ local function test_embed(ext_linegrid)
 | 
				
			|||||||
                                                                  |
 | 
					                                                                  |
 | 
				
			||||||
                                                                  |
 | 
					                                                                  |
 | 
				
			||||||
                                                                  |
 | 
					                                                                  |
 | 
				
			||||||
 | 
					                                                                  |
 | 
				
			||||||
      Error detected while processing pre-vimrc command line:     |
 | 
					      Error detected while processing pre-vimrc command line:     |
 | 
				
			||||||
      E121: Undefined variable: invalid                           |
 | 
					      E121: Undefined variable: invalid                           |
 | 
				
			||||||
      E15: Invalid expression: invalid+                           |
 | 
					 | 
				
			||||||
      Press ENTER or type command to continue^                     |
 | 
					      Press ENTER or type command to continue^                     |
 | 
				
			||||||
    ]])
 | 
					    ]])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user