To: vim_dev@googlegroups.com
Subject: Patch 8.2.2484
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2484
Problem:    Vim9: Cannot use a comment starting with #{ after an expression.
Solution:   Remove the check for "{" since #{ dictionaries are not supported.
Files:      src/ex_docmd.c, src/testdir/test_vim9_script.vim


*** ../vim-8.2.2483/src/ex_docmd.c	2021-02-06 12:58:13.623634848 +0100
--- src/ex_docmd.c	2021-02-07 16:38:18.967140335 +0100
***************
*** 5212,5219 ****
  	return TRUE;
  #ifdef FEAT_EVAL
      if (in_vim9script())
! 	return c == '#' && cmd[1] != '{'
! 				 && (cmd == cmd_start || VIM_ISWHITE(cmd[-1]));
  #endif
      return c == '"';
  }
--- 5212,5218 ----
  	return TRUE;
  #ifdef FEAT_EVAL
      if (in_vim9script())
! 	return c == '#' && (cmd == cmd_start || VIM_ISWHITE(cmd[-1]));
  #endif
      return c == '"';
  }
*** ../vim-8.2.2483/src/testdir/test_vim9_script.vim	2021-02-07 16:33:27.972066714 +0100
--- src/testdir/test_vim9_script.vim	2021-02-07 16:37:47.687239648 +0100
***************
*** 2205,2210 ****
--- 2205,2214 ----
      result ..= cnt .. '_'
    endwhile
    assert_equal('1_3_', result)
+ 
+   var s = ''
+   while s == 'x' #{comment
+   endwhile
  enddef
  
  def Test_while_loop_fails()
*** ../vim-8.2.2483/src/version.c	2021-02-07 16:33:27.972066714 +0100
--- src/version.c	2021-02-07 16:38:57.947016617 +0100
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2484,
  /**/

-- 
Computers are not intelligent.  They only think they are.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///