Skip to content

Commit

Permalink
patch 9.0.1703: Vim9 Calling a method in an extended class fails
Browse files Browse the repository at this point in the history
Problem: Vim9 Calling a method in an extended class fails
Solution: use method index directly

closes: #12778

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
  • Loading branch information
yegappan authored and chrisbra committed Aug 13, 2023
1 parent 9ad1bf7 commit 74cc13c
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 0 deletions.
35 changes: 35 additions & 0 deletions src/testdir/test_vim9_class.vim
Original file line number Diff line number Diff line change
Expand Up @@ -1913,4 +1913,39 @@ def Test_extends_method_crashes_vim()
v9.CheckScriptSuccess(lines)
enddef

" Test for calling a method in a class that is extended
def Test_call_method_in_extended_class()
var lines =<< trim END
vim9script

var prop_init_called = false
var prop_register_called = false

class Property
def Init()
prop_init_called = true
enddef

def Register()
prop_register_called = true
enddef
endclass

class Bool extends Property
endclass

def Observe(obj: Property)
obj.Register()
enddef

var p = Property.new()
Observe(p)

p.Init()
assert_true(prop_init_called)
assert_true(prop_register_called)
END
v9.CheckScriptSuccess(lines)
enddef

" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1703,
/**/
1702,
/**/
Expand Down
7 changes: 7 additions & 0 deletions src/vim9class.c
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,13 @@ object_index_from_itf_index(class_T *itf, int is_method, int idx, class_T *cl)
siemsg("index %d out of range for interface %s", idx, itf->class_name);
return 0;
}

// If "cl" is the interface or the class that is extended, then the method
// index can be used directly and there is no need to search for the method
// index in one of the child classes.
if (cl == itf)
return idx;

itf2class_T *i2c;
for (i2c = itf->class_itf2class; i2c != NULL; i2c = i2c->i2c_next)
if (i2c->i2c_class == cl && i2c->i2c_is_method == is_method)
Expand Down

0 comments on commit 74cc13c

Please sign in to comment.