diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-08-21 20:50:35 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-08-21 20:50:35 +0200 |
commit | bf5f2878333da934a8bdc560bf0bcf9a88ff86a1 (patch) | |
tree | 2e41e267215698d5131d9f9ab8aecf4ed13637e6 | |
parent | bebf06954e1c801870b57e06ab03151c2654d079 (diff) | |
download | vim-git-bf5f2878333da934a8bdc560bf0bcf9a88ff86a1.tar.gz |
patch 8.2.3365: Vim9: cannot use option for all operationsv8.2.3365
Problem: Vim9: cannot use option for all operations.
Solution: Recognize more operations. (closes #8779)
-rw-r--r-- | src/ex_docmd.c | 22 | ||||
-rw-r--r-- | src/proto/vim9compile.pro | 1 | ||||
-rw-r--r-- | src/testdir/test_vim9_cmd.vim | 16 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9compile.c | 2 |
5 files changed, 40 insertions, 3 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index d29a93265..4eee8fe9c 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3425,12 +3425,26 @@ find_ex_command( { char_u *pskip = skip_option_env_lead(eap->cmd); - if (vim_strchr((char_u *)"{('[\"@", *p) != NULL + if (vim_strchr((char_u *)"{('[\"@&", *p) != NULL || ((p = to_name_const_end(pskip)) > eap->cmd && *p != NUL)) { int oplen; int heredoc; - char_u *swp = skipwhite(p); + char_u *swp; + + if (*eap->cmd == '&') + { + p = to_name_end(eap->cmd + 1, FALSE); + if (ends_excmd(*skipwhite(p))) + { + // "&option <NL>" is the start of an expression. + eap->cmdidx = CMD_eval; + return eap->cmd; + } + // "&option" can be followed by "->" or "=", check below + } + + swp = skipwhite(p); if ( // "(..." is an expression. @@ -3530,10 +3544,14 @@ find_ex_command( // Recognize an assignment if we recognize the variable name: // "g:var = expr" + // "@r = expr" + // "&opt = expr" // "var = expr" where "var" is a variable name or we are skipping // (variable declaration might have been skipped). if (*eap->cmd == '@') p = eap->cmd + 2; + else if (*eap->cmd == '&') + p = skiptowhite_esc(eap->cmd + 1); oplen = assignment_len(skipwhite(p), &heredoc); if (oplen > 0) { diff --git a/src/proto/vim9compile.pro b/src/proto/vim9compile.pro index 81da2a5df..2b62b6c88 100644 --- a/src/proto/vim9compile.pro +++ b/src/proto/vim9compile.pro @@ -8,6 +8,7 @@ imported_T *find_imported(char_u *name, size_t len, cctx_T *cctx); imported_T *find_imported_in_script(char_u *name, size_t len, int sid); char_u *peek_next_line_from_context(cctx_T *cctx); char_u *next_line_from_context(cctx_T *cctx, int skip_comment); +char_u *to_name_end(char_u *arg, int use_namespace); char_u *to_name_const_end(char_u *arg); int get_lambda_tv_and_compile(char_u **arg, typval_T *rettv, int types_optional, evalarg_T *evalarg); exprtype_T get_compare_type(char_u *p, int *len, int *type_is); diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index a9e95ff59..4b3cbc678 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -521,6 +521,22 @@ def Test_method_and_user_command() CheckScriptSuccess(lines) enddef +def Test_option_use_linebreak() + var lines =<< trim END + new + &matchpairs = '(:)' + &matchpairs->setline(1) + &matchpairs = '[:]' + &matchpairs ->setline(2) + &matchpairs = '{:}' + &matchpairs + ->setline(3) + assert_equal(['(:)', '[:]', '{:}'], getline(1, '$')) + bwipe! + END + CheckDefAndScriptSuccess(lines) +enddef + def Test_skipped_expr_linebreak() if 0 var x = [] diff --git a/src/version.c b/src/version.c index 146eb8a30..1130e6f7e 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3365, +/**/ 3364, /**/ 3363, diff --git a/src/vim9compile.c b/src/vim9compile.c index ee63b32f1..17aba4a69 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -3579,7 +3579,7 @@ theend: * Return a pointer to just after the name. Equal to "arg" if there is no * valid name. */ - static char_u * + char_u * to_name_end(char_u *arg, int use_namespace) { char_u *p; |