1
0
forked from aniani/vim

patch 9.1.1012: Vim9: class interface inheritance not correctly working

Problem:  Vim9: class interface inheritance not correctly working
Solution: make the class inherit the interfaces of the super class

fixes: #16395
closes: #16412

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan
2025-01-13 07:30:11 +01:00
committed by Christian Brabandt
parent 3a0cc36c69
commit 8e92db4ea2
3 changed files with 283 additions and 45 deletions

View File

@@ -6096,44 +6096,151 @@ enddef
" Test for using an interface method using a child object when it is overridden
" by the child class.
" FIXME: This test fails.
" def Test_interface_overridden_method_from_child()
" var lines =<< trim END
" vim9script
"
" interface A
" def Foo(): string
" endinterface
"
" class B implements A
" def Foo(): string
" return 'b-foo'
" enddef
" endclass
"
" class C extends B
" def Bar(): string
" return 'bar'
" enddef
" def Foo(): string
" return 'c-foo'
" enddef
" endclass
"
" def T1(a: A)
" assert_equal('c-foo', a.Foo())
" enddef
"
" def T2(b: B)
" assert_equal('c-foo', b.Foo())
" enddef
"
" var c = C.new()
" T1(c)
" T2(c)
" END
" v9.CheckSourceSuccess(lines)
" enddef
def Test_interface_overridden_method_from_child()
var lines =<< trim END
vim9script
interface A
def Foo(): string
endinterface
class B implements A
def Foo(): string
return 'b-foo'
enddef
endclass
class C extends B
def Bar(): string
return 'bar'
enddef
def Foo(): string
return 'c-foo'
enddef
endclass
def T1(a: A)
assert_equal('c-foo', a.Foo())
enddef
def T2(b: B)
assert_equal('c-foo', b.Foo())
enddef
var c = C.new()
T1(c)
T2(c)
END
v9.CheckSourceSuccess(lines)
enddef
" Test for interface inheritance
def Test_interface_inheritance()
var lines =<< trim END
vim9script
interface A
def A_Fn(): string
endinterface
interface B
def B_Fn(): string
endinterface
interface C
def C_Fn(): string
endinterface
class C1 implements A
def A_Fn(): string
return 'c1-a'
enddef
endclass
class C2 extends C1 implements B
def B_Fn(): string
return 'c2-b'
enddef
def A_Fn(): string
return 'c2-a'
enddef
endclass
class C3 extends C2 implements C
def C_Fn(): string
return 'c3-c'
enddef
def A_Fn(): string
return 'c3-a'
enddef
def B_Fn(): string
return 'c3-b'
enddef
endclass
def T1(a: A, s: string)
assert_equal(s, a.A_Fn())
enddef
def T2(b: B, s: string)
assert_equal(s, b.B_Fn())
enddef
def T3(c: C, s: string)
assert_equal(s, c.C_Fn())
enddef
def T4(c1: C1)
T1(c1, 'c3-a')
enddef
def T5(c2: C2)
T1(c2, 'c3-a')
T2(c2, 'c3-b')
enddef
def T6(c3: C3)
T1(c3, 'c3-a')
T2(c3, 'c3-b')
T3(c3, 'c3-c')
enddef
var o3 = C3.new()
T4(o3)
T5(o3)
T6(o3)
END
v9.CheckSourceSuccess(lines)
# Both the parent and child classes implement the same interface
lines =<< trim END
vim9script
interface I
def Foo(): string
endinterface
class A implements I
def Foo(): string
return 'A-foo'
enddef
endclass
class B implements I
def Foo(): string
return 'B-foo'
enddef
endclass
def Bar(i1: I): string
return i1.Foo()
enddef
var b = B.new()
assert_equal('B-foo', Bar(b))
END
v9.CheckSourceSuccess(lines)
enddef
" Test for abstract methods
def Test_abstract_method()
@@ -7282,6 +7389,44 @@ def Test_implement_interface_with_different_variable_order()
v9.CheckSourceSuccess(lines)
enddef
" Test for inheriting interfaces from an imported super class
def Test_interface_inheritance_with_imported_super()
var lines =<< trim END
vim9script
export interface I
def F(): string
endinterface
export class A implements I
def F(): string
return 'A'
enddef
endclass
END
writefile(lines, 'Xinheritintfimportclass.vim', 'D')
lines =<< trim END
vim9script
import './Xinheritintfimportclass.vim' as i_imp
# class C extends i_imp.A
class C extends i_imp.A implements i_imp.I
def F(): string
return 'C'
enddef
endclass
def TestI(i: i_imp.I): string
return i.F()
enddef
assert_equal('C', TestI(C.new()))
END
v9.CheckSourceSuccess(lines)
enddef
" Test for using "any" type for a variable in a sub-class while it has a
" concrete type in the interface
def Test_implements_using_var_type_any()