Skip to content

Commit 6cd3146

Browse files
dimonchik0036Space Team
authored andcommitted
[SLC] do not filter out private interface functions
This was accidentally added for regular functions in 8350f95, but its initial purpose is to filter out declarations with value classes ^KT-80690 Fixed
1 parent a7cd44c commit 6cd3146

File tree

5 files changed

+27
-3
lines changed

5 files changed

+27
-3
lines changed

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterface.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ internal open class SymbolLightClassForInterface : SymbolLightClassForInterfaceO
5858
}
5959
}
6060

61-
protected open fun acceptCallableSymbol(symbol: KaCallableSymbol): Boolean {
62-
return symbol !is KaNamedFunctionSymbol || symbol.visibility != KaSymbolVisibility.PRIVATE
63-
}
61+
protected open fun acceptCallableSymbol(symbol: KaCallableSymbol): Boolean = true
6462

6563
override fun copy(): SymbolLightClassForInterface =
6664
SymbolLightClassForInterface(classOrObjectDeclaration, classSymbolPointer, ktModule, manager)

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
public abstract interface PrivateInTrait /* PrivateInTrait*/ {
2+
private @org.jetbrains.annotations.Nullable() java.lang.String bar(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);// bar(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String)
3+
24
private abstract @org.jetbrains.annotations.NotNull() java.lang.String getNn();// getNn()
35

46
private abstract @org.jetbrains.annotations.Nullable() java.lang.String getN();// getN()
57

68
private abstract void setNn(@org.jetbrains.annotations.NotNull() java.lang.String);// setNn(@org.jetbrains.annotations.NotNull() java.lang.String)
79

810
public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ {
11+
private static @org.jetbrains.annotations.Nullable() java.lang.String bar(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() PrivateInTrait, @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);// bar(@org.jetbrains.annotations.NotNull() PrivateInTrait, @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String)
12+
913
private static final @org.jetbrains.annotations.NotNull() java.lang.String getNn(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() PrivateInTrait);// getNn(@org.jetbrains.annotations.NotNull() PrivateInTrait)
1014

1115
private static final @org.jetbrains.annotations.Nullable() java.lang.String getN(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() PrivateInTrait);// getN(@org.jetbrains.annotations.NotNull() PrivateInTrait)

compiler/testData/asJava/lightClasses/lightClassByFqName/privateInterfaceCallable.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ public abstract interface MyInterface /* MyInterface*/ {
22
@kotlin.jvm.JvmExposeBoxed()
33
private abstract @org.jetbrains.annotations.NotNull() java.lang.String getMangledVariable(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() StringWrapper);// getMangledVariable(@org.jetbrains.annotations.NotNull() StringWrapper)
44

5+
@kotlin.jvm.JvmExposeBoxed()
6+
private abstract void mangledMethod(@org.jetbrains.annotations.NotNull() StringWrapper);// mangledMethod(@org.jetbrains.annotations.NotNull() StringWrapper)
7+
58
@kotlin.jvm.JvmExposeBoxed()
69
private abstract void setMangledVariable(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() StringWrapper, @org.jetbrains.annotations.NotNull() java.lang.String);// setMangledVariable(@org.jetbrains.annotations.NotNull() StringWrapper, @org.jetbrains.annotations.NotNull() java.lang.String)
710

811
private abstract int getRegularVariable();// getRegularVariable()
912

13+
private abstract void regularMethod();// regularMethod()
14+
1015
private abstract void setRegularVariable(int);// setRegularVariable(int)
1116

1217
public abstract int getPublicRegularVariable();// getPublicRegularVariable()
@@ -22,10 +27,15 @@ public static final class DefaultImpls /* MyInterface.DefaultImpls*/ {
2227
@kotlin.jvm.JvmExposeBoxed()
2328
private static final void setMangledVariable(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() StringWrapper, @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() MyInterface, @org.jetbrains.annotations.NotNull() java.lang.String);// setMangledVariable(@org.jetbrains.annotations.NotNull() StringWrapper, @org.jetbrains.annotations.NotNull() MyInterface, @org.jetbrains.annotations.NotNull() java.lang.String)
2429

30+
@kotlin.jvm.JvmExposeBoxed()
31+
private static void mangledMethod(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() MyInterface, @org.jetbrains.annotations.NotNull() StringWrapper);// mangledMethod(@org.jetbrains.annotations.NotNull() MyInterface, @org.jetbrains.annotations.NotNull() StringWrapper)
32+
2533
private static final int getRegularVariable(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() MyInterface);// getRegularVariable(@org.jetbrains.annotations.NotNull() MyInterface)
2634

2735
private static final void setRegularVariable(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() MyInterface, int);// setRegularVariable(@org.jetbrains.annotations.NotNull() MyInterface, int)
2836

37+
private static void regularMethod(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() MyInterface);// regularMethod(@org.jetbrains.annotations.NotNull() MyInterface)
38+
2939
public static int getPublicRegularVariable(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() MyInterface);// getPublicRegularVariable(@org.jetbrains.annotations.NotNull() MyInterface)
3040

3141
public static void publicRegularMethod(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() MyInterface);// publicRegularMethod(@org.jetbrains.annotations.NotNull() MyInterface)

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmExposeBoxed/directive/defaultInInterface.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ public final class IC /* IC*/ {
1616
}
1717

1818
public abstract interface Test /* Test*/ {
19+
@kotlin.jvm.JvmExposeBoxed()
20+
private abstract @org.jetbrains.annotations.NotNull() IC foo(@org.jetbrains.annotations.NotNull() IC);// foo(@org.jetbrains.annotations.NotNull() IC)
21+
1922
@kotlin.jvm.JvmExposeBoxed()
2023
private abstract @org.jetbrains.annotations.Nullable() IC getBar();// getBar()
2124

2225
public static final class DefaultImpls /* Test.DefaultImpls*/ {
26+
@kotlin.jvm.JvmExposeBoxed()
27+
private static @org.jetbrains.annotations.NotNull() IC foo(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Test, @org.jetbrains.annotations.NotNull() IC);// foo(@org.jetbrains.annotations.NotNull() Test, @org.jetbrains.annotations.NotNull() IC)
28+
2329
@kotlin.jvm.JvmExposeBoxed()
2430
private static final @org.jetbrains.annotations.Nullable() IC getBar(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Test);// getBar(@org.jetbrains.annotations.NotNull() Test)
2531
}

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmExposeBoxed/directive/defaultInInterface.kmp.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ public final class IC /* IC*/ {
1616
}
1717

1818
public abstract interface Test /* Test*/ {
19+
@kotlin.jvm.JvmExposeBoxed()
20+
private abstract @org.jetbrains.annotations.NotNull() IC foo(@org.jetbrains.annotations.NotNull() IC);// foo(@org.jetbrains.annotations.NotNull() IC)
21+
1922
@kotlin.jvm.JvmExposeBoxed()
2023
private abstract @org.jetbrains.annotations.Nullable() IC getBar();// getBar()
2124

2225
public static final class DefaultImpls /* Test.DefaultImpls*/ {
26+
@kotlin.jvm.JvmExposeBoxed()
27+
private static @org.jetbrains.annotations.NotNull() IC foo(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Test, @org.jetbrains.annotations.NotNull() IC);// foo(@org.jetbrains.annotations.NotNull() Test, @org.jetbrains.annotations.NotNull() IC)
28+
2329
@kotlin.jvm.JvmExposeBoxed()
2430
private static final @org.jetbrains.annotations.Nullable() IC getBar(@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Test);// getBar(@org.jetbrains.annotations.NotNull() Test)
2531
}

0 commit comments

Comments
 (0)