Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support :echowindow #199

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support :echowindow #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion autoload/vimlparser.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ let s:NODE_EVAL = 95
let s:NODE_HEREDOC = 96
let s:NODE_METHOD = 97
let s:NODE_ECHOCONSOLE = 98
let s:NODE_ECHOWINDOW = 99

let s:TOKEN_EOF = 1
let s:TOKEN_EOL = 2
Expand Down Expand Up @@ -836,6 +837,8 @@ function! s:VimLParser._parse_command(parser) abort
call self.parse_cmd_echo()
elseif a:parser ==# 'parse_cmd_echoconsole'
call self.parse_cmd_echoconsole()
elseif a:parser ==# 'parse_cmd_echowindow'
call self.parse_cmd_echowindow()
elseif a:parser ==# 'parse_cmd_echoerr'
call self.parse_cmd_echoerr()
elseif a:parser ==# 'parse_cmd_echohl'
Expand Down Expand Up @@ -1976,6 +1979,14 @@ function! s:VimLParser.parse_cmd_echoconsole() abort
call self.add_node(node)
endfunction

function! s:VimLParser.parse_cmd_echowindow() abort
let node = s:Node(s:NODE_ECHOWINDOW)
let node.pos = self.ea.cmdpos
let node.ea = self.ea
let node.list = self.parse_exprlist()
call self.add_node(node)
endfunction

function! s:VimLParser.parse_cmd_execute() abort
let node = s:Node(s:NODE_EXECUTE)
let node.pos = self.ea.cmdpos
Expand Down Expand Up @@ -2345,7 +2356,7 @@ let s:VimLParser.builtin_commands = [
\ {'name': 'echohl', 'minlen': 5, 'flags': 'EXTRA|TRLBAR|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echohl'},
\ {'name': 'echomsg', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echomsg'},
\ {'name': 'echoconsole', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echoconsole'},
\ {'name': 'echowindow', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
\ {'name': 'echowindow', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echowindow'},
\ {'name': 'echon', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echon'},
\ {'name': 'else', 'minlen': 2, 'flags': 'TRLBAR|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_else'},
\ {'name': 'elseif', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_elseif'},
Expand Down Expand Up @@ -5070,6 +5081,9 @@ function! s:Compiler.compile(node) abort
elseif a:node.type ==# s:NODE_ECHOCONSOLE
call self.compile_echoconsole(a:node)
return s:NIL
elseif a:node.type ==# s:NODE_ECHOWINDOW
call self.compile_echowindow(a:node)
return s:NIL
elseif a:node.type ==# s:NODE_EXECUTE
call self.compile_execute(a:node)
return s:NIL
Expand Down Expand Up @@ -5439,6 +5453,11 @@ function! s:Compiler.compile_echoconsole(node) abort
call self.out('(echoconsole %s)', join(list, ' '))
endfunction

function! s:Compiler.compile_echowindow(node) abort
let list = map(a:node.list, 'self.compile(v:val)')
call self.out('(echowindow %s)', join(list, ' '))
endfunction

function! s:Compiler.compile_execute(node) abort
let list = map(a:node.list, 'self.compile(v:val)')
call self.out('(execute %s)', join(list, ' '))
Expand Down
23 changes: 22 additions & 1 deletion js/vimlparser.js
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 18 additions & 1 deletion py/vimlparser.py
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions test/test1.ok
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
(echomsg "echomsg")
(echoerr "echoerr")
(echoconsole "echoconsole")
(echowindow "echowindow")
(execute "normal ihello")
(echo (list) (list 1 2 3) (list 1 2 3))
(echo (dict) (dict ("x" "y")) (dict ("x" "y") ("z" "w")))
Expand Down
1 change: 1 addition & 0 deletions test/test1.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ echon "echon"
echomsg "echomsg"
echoerr "echoerr"
echoconsole "echoconsole"
echowindow "echowindow"
execute "normal ihello"
echo [] [1,2,3] [1,2,3,]
echo {} {"x":"y"} {"x":"y","z":"w",}
Expand Down