Merge pull request #22 from haya14busa/fix-parse-cmd

Fix parse syntax cmd
vim-jp · Sep 28, 2016 · 47c0128 · 47c0128
2 parents 0e91d5a + 8ce0f6c
commit 47c0128
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/autoload/vimlparser.vim b/autoload/vimlparser.vim
@@ -1939,7 +1939,21 @@ endfunction
 
 " FIXME: validate argument
 function! s:VimLParser.parse_cmd_syntax()
-  let end = self.separate_nextcmd()
+  let end = self.reader.getpos()
+  while s:TRUE
+    let end = self.reader.getpos()
+    let c = self.reader.peek()
+    if c == "/" || c == "'" || c == "\""
+      call self.reader.getn(1)
+      call self.parse_pattern(c)
+    elseif c == "="
+      call self.reader.getn(1)
+      call self.parse_pattern(" ")
+    elseif self.ends_excmds(c)
+      break
+    endif
+    call self.reader.getn(1)
+  endwhile
   let node = s:Node(s:NODE_EXCMD)
   let node.pos = self.ea.cmdpos
   let node.ea = self.ea

diff --git a/go/vimlparser.go b/go/vimlparser.go
diff --git a/test/test_syncmd.ok b/test/test_syncmd.ok
@@ -3,3 +3,6 @@
 (excmd "syntax")
 (excmd "syntax enable")
 (excmd "syntax list GroupName")
+(excmd "syn match pythonError \"[&|]\\{2,}\" display")
+(excmd "syntax match qfFileName /^\\zs\\S[^|]\\+\\/\\ze[^|\\/]\\+\\/[^|\\/]\\+|/ conceal cchar=+")
+(excmd "syntax region jsString start=+\"+ skip=+\\\\\\(\"\\|$\\)+ end=+\"\\|$+ contains=jsSpecial,@Spell extend")
diff --git a/test/test_syncmd.vim b/test/test_syncmd.vim
@@ -2,3 +2,6 @@ if 1 | syntax on | endif
 syntax
 syntax enable
 syntax list GroupName
+syn match pythonError "[&|]\{2,}" display
+syntax match qfFileName /^\zs\S[^|]\+\/\ze[^|\/]\+\/[^|\/]\+|/ conceal cchar=+
+syntax region jsString start=+"+ skip=+\\\("\|$\)+ end=+"\|$+ contains=jsSpecial,@Spell extend