mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-08-26 00:11:26 +07:00
resolve conflict on type param rename (IDEA-57326)
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
abstract class A{
|
||||
class T{}
|
||||
abstract T foo();
|
||||
}
|
||||
class B<<caret>S> extends A{
|
||||
void foo(T x){}
|
||||
|
||||
@Override
|
||||
T foo() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
abstract class A{
|
||||
class T{}
|
||||
abstract T foo();
|
||||
}
|
||||
class B<T> extends A{
|
||||
void foo(A.T x){}
|
||||
|
||||
@Override
|
||||
A.T foo() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user