Merge pull request #145 from iamcco/patch-fix-read_nonwhite

fix(parse): fix read_nonwhite get dead loop

Author: tyru

autoload/vimlparser.vim

@@ -949,7 +949,7 @@ function! s:VimLParser.find_command() abort
     endif
   endfor
 
-  if self.neovim  
+  if self.neovim
     for x in self.neovim_additional_commands
       if stridx(x.name, name) ==# 0 && len(name) >= x.minlen
         unlet cmd
@@ -966,7 +966,7 @@ function! s:VimLParser.find_command() abort
       endif
     endfor
   endif
-  
+
   " FIXME: user defined command
   if (cmd is# s:NIL || cmd.name ==# 'Print') && name =~# '^[A-Z]'
     let name .= self.reader.read_alnum()
@@ -4681,8 +4681,10 @@ endfunction
 
 function! s:StringReader.read_nonwhite() abort
   let r = ''
-  while !s:iswhite(self.peekn(1))
+  let ch = self.peekn(1)
+  while !s:iswhite(ch) && ch !=# ''
     let r .= self.getn(1)
+    let ch = self.peekn(1)
   endwhile
   return r
 endfunction

js/vimlparser.js

@@ -4102,8 +4102,10 @@ StringReader.prototype.read_white = function() {
 
 StringReader.prototype.read_nonwhite = function() {
     var r = "";
-    while (!iswhite(this.peekn(1))) {
+    var ch = this.peekn(1);
+    while (!iswhite(ch) && ch != "") {
         r += this.getn(1);
+        var ch = this.peekn(1);
     }
     return r;
 }

py/vimlparser.py

@@ -3319,8 +3319,10 @@ def read_white(self):
 
     def read_nonwhite(self):
         r = ""
-        while not iswhite(self.peekn(1)):
+        ch = self.peekn(1)
+        while not iswhite(ch) and ch != "":
             r += self.getn(1)
+            ch = self.peekn(1)
         return r
 
     def read_name(self):

test/test_command.ok

@@ -3,3 +3,4 @@
 (excmd "normal gg")
 (excmd "Usercmd x, y z 123")
 (excmd "Usercmd! with bang")
+(excmd "write ++enc=utf-8")

test/test_command.vim

@@ -3,3 +3,4 @@ normal! gg
 normal gg
 Usercmd x, y z 123
 Usercmd! with bang
+write ++enc=utf-8