Skip to content

Commit e057c6c

Browse files
committed
Add go/gen_builtin_commands.vim
Also, run gofmt.
1 parent 8c1f247 commit e057c6c

File tree

5 files changed

+60
-31
lines changed

5 files changed

+60
-31
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ before_script:
1818
script:
1919
- go test -v -race ./...
2020
- goverage -coverprofile=coverage.txt ./...
21-
- vim -u NONE -N --cmd "let &rtp .= ',' . getcwd()" -S go/generate.vim -c ":q"
21+
- bash go/generate.sh
2222
- (! git diff | grep '^') # check diff
2323
- gosumcheck ./...
2424

go/builtin_commands.go

Lines changed: 15 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go/gen_builtin_commands.vim

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
" Generate go/builtin_commands.go
2+
3+
let s:lines = []
4+
5+
function! s:put(line) abort
6+
call add(s:lines, a:line)
7+
endfunction
8+
9+
call s:put('// Code generated by gen_builtin_commands.vim')
10+
call s:put('// source: autoload/vimlparser.vim')
11+
call s:put('// DO NOT EDIT!')
12+
call s:put('')
13+
call s:put('package vimlparser')
14+
call s:put('')
15+
16+
call s:put('var neovim_additional_commands = []*Cmd{')
17+
for s:cmd in vimlparser#import().VimLParser.neovim_additional_commands
18+
call s:put("\t" . printf('{flags: "%s", minlen: %s, name: "%s", parser: "%s" },',
19+
\ s:cmd.flags, s:cmd.minlen, s:cmd.name, s:cmd.parser))
20+
endfor
21+
call s:put('}')
22+
23+
call s:put('var neovim_removed_commands = []*Cmd{')
24+
for s:cmd in vimlparser#import().VimLParser.neovim_removed_commands
25+
call s:put("\t" . printf('{flags: "%s", minlen: %s, name: "%s", parser: "%s" },',
26+
\ s:cmd.flags, s:cmd.minlen, s:cmd.name, s:cmd.parser))
27+
endfor
28+
call s:put('}')
29+
30+
call s:put('var builtin_commands = []*Cmd{')
31+
for s:cmd in vimlparser#import().VimLParser.builtin_commands
32+
call s:put("\t" . printf('{flags: "%s", minlen: %s, name: "%s", parser: "%s" },',
33+
\ s:cmd.flags, s:cmd.minlen, s:cmd.name, s:cmd.parser))
34+
endfor
35+
call s:put('}')
36+
37+
call writefile(s:lines, expand('<sfile>:p:h') . '/builtin_commands.go')

go/generate.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
#!/bin/sh
2-
vim -u NONE -N --cmd "let &rtp .= ',' . getcwd()" -S go/generate.vim
1+
#!/bin/bash
2+
vim -u NONE -N --cmd "let &rtp .= ',' . getcwd()" -S go/generate.vim -c ":q"
3+
vim -u NONE -N --cmd "let &rtp .= ',' . getcwd()" -S go/gen_builtin_commands.vim -c ":q"
4+
gofmt -s -w go/*.go
35

go/vimlparser_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ func TestNewVimLParser(t *testing.T) {
5757
func TestVimLParser_parse_empty(t *testing.T) {
5858
defer recovert(t)
5959
ins := [][]string{
60-
[]string{},
61-
[]string{""},
62-
[]string{"", ""},
60+
{},
61+
{""},
62+
{"", ""},
6363
}
6464
for _, in := range ins {
6565
NewVimLParser(false).parse(NewStringReader(in))

0 commit comments

Comments
 (0)