patch 9.0.1889: Vim9 static tests fail

Problem:  Vim9 static tests fail
Solution: Fix tests, make CI happy ;)

closes: #13064

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>

diff --git a/src/testdir/test_vim9_disassemble.vim b/src/testdir/test_vim9_disassemble.vim
index c918bf6b1269e614c89b6346cddee6cb7ccab5b4..540fd55fadf7001e9dfda0c776d0f73386014ed2 100644 (file)
--- a/src/testdir/test_vim9_disassemble.vim
+++ b/src/testdir/test_vim9_disassemble.vim
@@ -3067,17 +3067,13 @@ def Test_disassemble_interface_static_member()
 
     def F1(i: I)
       var x: number
-      x = i.s_var
       x = i.o_var
-      x = i.s_var2
       x = i.o_var2
     enddef
 
     def F2(o: C)
       var x: number
-      x = o.s_var
       x = o.o_var
-      x = o.s_var2
       x = o.o_var2
     enddef
 
@@ -3087,43 +3083,27 @@ def Test_disassemble_interface_static_member()
   v9.CheckScriptSuccess(lines)
   assert_match('<SNR>\d*_F1\_s*' ..
     'var x: number\_s*' ..
-    'x = i.s_var\_s*' ..
+    'x = i.o_var\_s*' ..
     '0 LOAD arg\[-1\]\_s*' ..
-    '1 ITF_MEMBER 0 on I \[STATIC\]\_s*' ..
+    '1 ITF_MEMBER 0 on I\_s*' ..
     '2 STORE $0\_s*' ..
-    'x = i.o_var\_s*' ..
+    'x = i.o_var2\_s*' ..
     '3 LOAD arg\[-1\]\_s*' ..
-    '4 ITF_MEMBER 0 on I\_s*' ..
+    '4 ITF_MEMBER 1 on I\_s*' ..
     '5 STORE $0\_s*' ..
-    'x = i.s_var2\_s*' ..
-    '6 LOAD arg\[-1\]\_s*' ..
-    '7 ITF_MEMBER 1 on I \[STATIC\]\_s*' ..
-    '8 STORE $0\_s*' ..
-    'x = i.o_var2\_s*' ..
-    '9 LOAD arg\[-1\]\_s*' ..
-    '10 ITF_MEMBER 1 on I\_s*' ..
-    '11 STORE $0\_s*' ..
-    '12 RETURN void\_s*',
+    '6 RETURN void\_s*',
     g:instr1)
   assert_match('<SNR>\d*_F2\_s*' ..
     'var x: number\_s*' ..
-    'x = o.s_var\_s*' ..
+    'x = o.o_var\_s*' ..
     '0 LOAD arg\[-1\]\_s*' ..
-    '1 OBJ_MEMBER 0 \[STATIC\]\_s*' ..
+    '1 OBJ_MEMBER 0\_s*' ..
     '2 STORE $0\_s*' ..
-    'x = o.o_var\_s*' ..
+    'x = o.o_var2\_s*' ..
     '3 LOAD arg\[-1\]\_s*' ..
-    '4 OBJ_MEMBER 0\_s*' ..
+    '4 OBJ_MEMBER 1\_s*' ..
     '5 STORE $0\_s*' ..
-    'x = o.s_var2\_s*' ..
-    '6 LOAD arg\[-1\]\_s*' ..
-    '7 OBJ_MEMBER 1 \[STATIC\]\_s*' ..
-    ' 8 STORE $0\_s*' ..
-    'x = o.o_var2\_s*' ..
-    '9 LOAD arg\[-1\]\_s*' ..
-    '10 OBJ_MEMBER 1\_s*' ..
-    '11 STORE $0\_s*' ..
-    '12 RETURN void',
+    '6 RETURN void',
     g:instr2)
 
   unlet g:instr1

diff --git a/src/version.c b/src/version.c
index d3be87cb02a3661c1a60f023cdadc8256004da92..11bf957d57354c041afc25c5480517f956661f43 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1889,
 /**/
     1888,
 /**/