Merge pull request #45 from haya14busa/update-vimlparser

Update vimlparser

Author: haya14busa

.drone.sec

@@ -1 +1 @@
-eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.0oFEs0rWuFWbIrnL8syhyK3duLSLvDmGsv0xkiD9OAXbsjaZWKmRUgi4rKw_FObLwDkC1x5L5NB-ByiBbUwNhyosjlEVDp458xEXUCYlcwcnr1RbOG9W07EiQCTgl61Tvdq-dS759GuefpzWu3TzuQw-iTKNKbtHZrs1dlxl1sGl0FLM7oHEv4O8beAAjTH7ltC-KNmowFWWeqONb6A_dxonOSWiNZVGzHjqiVrzMc5uVEBeZYi9fLwrDUB2CIUkPhLZKFI3WKDxcDTWH3spi64zrvYo6Gdy9eCKHYJc-qciBeBCNtAoFRNdOWsa6ZnfmWa_RNwkvAlk8uTJn0IYbQ.dpPUBDj_1mWbEK8g.D2LXfkxlmCTVZIRTNVN7AX-sx0UwQ1BnF1MdRuCyZ1XnMAYdIz-hxjSH3zJop8pRN012hCt7xeBM63cyIM7JMleGxmRJYij7mkxgPQ6p_4ibHbymyoseHMue0Kxg0bAw32F_F6FiBVF_wMUxkz0Oj745CAZ7r_zc4Le8csvLZl7h08WDL03a7CCTL4xbgMUOM-ZA8d3N27A3Xpdzvy9k.FSpfgFLnLcL9tjjAuoM_Iw
+eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.fkWEl5SfcCEntdIFAB5yO4F91yx5a4jXdHvzgzY25HLo4dxGfCdFCrOGQKCNCulX4czQRaxXvESz-Dwki-lAh-TTeMuHSU0Xje7rPY4o0txxB1zrlKGrZ5-36izJB92doxOTNm-NWVxnsAlGzVECbgWMCDg154g-sypof8hCN7My6JXQ-Y815rGultkAID60rUgg4dsSMXiP5mWBqktUtKs-pwDwwWeRWpASdufTshkbwjxJzJsRpTFdJCRzgOpEeP7Z07IcFZE8vHb0tMWSLDJShOTtGjR3Dz881MrUbGoPvQv9Jg8DVNeKcQHSKKU7qa0e-zNGzBjULhd0mE4HZw.ygbdZZeyGiwm7LWt.NwFVXqKdHkl55Dn45TZgToblcbJWw6pACeAIetuSG4M-FY2ZSgpruEC-M9oktIqoRrhSShjyjLBmdrTaKUyj5k8WyF0xGR2T2rbZ9Mn9IFmNzzM0pNNfCvNAN5CpIUBNboX-L-_6DsAFAfekEkUBQYvArDhA8WE2pq7udUnr8u0n00MG1gcuT98mtSzovZCe1z57AdmItqazILYZuB-x.8IxWXoXOvzqtFh_fNn069A

.drone.yml

@@ -14,7 +14,7 @@ build:
     commands:
       - go get github.com/haya14busa/reviewdog/cmd/reviewdog
       - go get github.com/golang/lint/golint
-      - go get honnef.co/go/unused/cmd/unused
+      - go get honnef.co/go/tools/cmd/unused
       - |
         go tool vet -all -shadowstrict . 2>&1 | reviewdog -f=govet -ci=droneio
       - |

.travis.yml

@@ -6,9 +6,6 @@ go:
 
 install:
   - go get -d -v -t ./...
-  - go get github.com/mattn/goveralls
-  - go get github.com/golang/lint/golint
-  - go get honnef.co/go/unused/cmd/unused
   - go get github.com/haya14busa/goverage
   - go get github.com/haya14busa/gosum/cmd/gosumcheck
 
@@ -18,7 +15,7 @@ before_script:
 script:
   - go test -v -race ./...
   - goverage -coverprofile=coverage.txt ./...
-  - vim -u NONE -N --cmd "let &rtp .= ',' . getcwd()" -S go/generate.vim -c ":q"
+  - bash go/generate.sh
   - (! git diff | grep '^') # check diff
   - gosumcheck ./...
 

autoload/vimlparser.vim

@@ -941,7 +941,7 @@ function! s:VimLParser.find_command()
     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
@@ -958,7 +958,7 @@ function! s:VimLParser.find_command()
       endif
     endfor
   endif
-
+  
   " FIXME: user defined command
   if (cmd is s:NIL || cmd.name ==# 'Print') && name =~# '^[A-Z]'
     let name .= self.reader.read_alnum()
@@ -1959,7 +1959,6 @@ function! s:VimLParser.parse_cmd_syntax()
 endfunction
 
 let s:VimLParser.neovim_additional_commands = [
-      \ {'name': 'tnoremap', 'minlen': 8, 'flags': 'EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN', 'parser': 'parse_cmd_common'},
       \ {'name': 'rshada', 'minlen': 3, 'flags': 'BANG|FILE1|TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'},
       \ {'name': 'wshada', 'minlen': 3, 'flags': 'BANG|FILE1|TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'}]
 
@@ -2517,6 +2516,11 @@ let s:VimLParser.builtin_commands = [
       \ {'flags': 'RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN', 'minlen': 4, 'name': 'pyxdo', 'parser': 'parse_cmd_common'},
       \ {'flags': 'RANGE|EXTRA|NEEDARG|CMDWIN', 'minlen': 7, 'name': 'pythonx', 'parser': 'parse_cmd_common'},
       \ {'flags': 'RANGE|FILE1|NEEDARG|CMDWIN', 'minlen': 4, 'name': 'pyxfile', 'parser': 'parse_cmd_common'},
+      \ {'flags': 'RANGE|BANG|FILES|CMDWIN', 'minlen': 3, 'name': 'terminal', 'parser': 'parse_cmd_common'},
+      \ {'flags': 'EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN', 'minlen': 3, 'name': 'tmap', 'parser': 'parse_cmd_common'},
+      \ {'flags': 'EXTRA|TRLBAR|CMDWIN', 'minlen': 5, 'name': 'tmapclear', 'parser': 'parse_cmd_common'},
+      \ {'flags': 'EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN', 'minlen': 3, 'name': 'tnoremap', 'parser': 'parse_cmd_common'},
+      \ {'flags': 'EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN', 'minlen': 5, 'name': 'tunmap', 'parser': 'parse_cmd_common'},
       \]
 
 let s:ExprTokenizer = {}

go/builtin_commands.go

@@ -0,0 +1,37 @@
+" Generate go/builtin_commands.go
+
+let s:lines = []
+
+function! s:put(line) abort
+  call add(s:lines, a:line)
+endfunction
+
+call s:put('// Code generated by gen_builtin_commands.vim')
+call s:put('// source: autoload/vimlparser.vim')
+call s:put('// DO NOT EDIT!')
+call s:put('')
+call s:put('package vimlparser')
+call s:put('')
+
+call s:put('var neovim_additional_commands = []*Cmd{')
+for s:cmd in vimlparser#import().VimLParser.neovim_additional_commands
+  call s:put("\t" . printf('{flags: "%s", minlen: %s, name: "%s", parser: "%s" },',
+  \ s:cmd.flags, s:cmd.minlen, s:cmd.name, s:cmd.parser))
+endfor
+call s:put('}')
+
+call s:put('var neovim_removed_commands = []*Cmd{')
+for s:cmd in vimlparser#import().VimLParser.neovim_removed_commands
+  call s:put("\t" . printf('{flags: "%s", minlen: %s, name: "%s", parser: "%s" },',
+  \ s:cmd.flags, s:cmd.minlen, s:cmd.name, s:cmd.parser))
+endfor
+call s:put('}')
+
+call s:put('var builtin_commands = []*Cmd{')
+for s:cmd in vimlparser#import().VimLParser.builtin_commands
+  call s:put("\t" . printf('{flags: "%s", minlen: %s, name: "%s", parser: "%s" },',
+  \ s:cmd.flags, s:cmd.minlen, s:cmd.name, s:cmd.parser))
+endfor
+call s:put('}')
+
+call writefile(s:lines, expand('<sfile>:p:h') . '/builtin_commands.go')

go/gen_builtin_commands.vim

@@ -1,3 +1,5 @@
-#!/bin/sh
-vim -u NONE -N --cmd "let &rtp .= ',' . getcwd()" -S go/generate.vim
+#!/bin/bash
+vim -u NONE -N --cmd "let &rtp .= ',' . getcwd()" -S go/generate.vim -c ":q"
+vim -u NONE -N --cmd "let &rtp .= ',' . getcwd()" -S go/gen_builtin_commands.vim -c ":q"
+gofmt -s -w go/*.go
 

go/generate.sh

@@ -57,9 +57,9 @@ func TestNewVimLParser(t *testing.T) {
 func TestVimLParser_parse_empty(t *testing.T) {
 	defer recovert(t)
 	ins := [][]string{
-		[]string{},
-		[]string{""},
-		[]string{"", ""},
+		{},
+		{""},
+		{"", ""},
 	}
 	for _, in := range ins {
 		NewVimLParser(false).parse(NewStringReader(in))