azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AA] Cover both static and inner classes in Java member scope tests

Browse Source 
^KT-61900
This commit is contained in:
Marco Pennekamp
2023-09-22 16:50:58 +02:00
committed by Space Team
parent ab717c25d7
commit dab06c0942
15 changed files with 211 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.kt
Vendored
+4
View File
@@ -14,6 +14,8 @@ public interface SuperInterface {
public abstract class SuperClass implements SuperInterface {
public static class NestedSuperClass { }
public class InnerSuperClass { }
@Override
public int getActualRandomNumber() {
return getRandomNumber();
@@ -30,6 +32,8 @@ public abstract class SuperClass implements SuperInterface {
public class JavaClass extends SuperClass {
public static class NestedClass { }
public class InnerClass { }
public static int foo = 1;
public static String bar() {
analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.pretty.txt
Vendored
+2
View File
@@ -4,6 +4,8 @@ open fun hello()
open var foo: kotlin.Int
open inner class InnerClass
open class NestedClass
constructor()
analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.txt
Vendored
+29
View File
@@ -86,6 +86,35 @@ KtJavaFieldSymbol:
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: JavaClass.InnerClass
classKind: CLASS
companionObject: null
contextReceivers: []
isActual: false
isData: false
isExpect: false
isExternal: false
isFun: false
isInline: false
isInner: true
modality: OPEN
name: InnerClass
origin: JAVA
superTypes: [
KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Any
]
symbolKind: CLASS_MEMBER
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
deprecationStatus: null
KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: JavaClass.NestedClass
analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.kt
Vendored
+4
View File
@@ -14,6 +14,8 @@ public interface SuperInterface {
public abstract class SuperClass implements SuperInterface {
public static class NestedSuperClass { }
public class InnerSuperClass { }
@Override
public int getActualRandomNumber() {
return getRandomNumber();
@@ -30,6 +32,8 @@ public abstract class SuperClass implements SuperInterface {
public class JavaClass extends SuperClass {
public static class NestedClass { }
public class InnerClass { }
public static int foo = 1;
public static String bar() {
analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.pretty.txt
Vendored
+2
View File
@@ -1,3 +1,5 @@
open fun hello()
open inner class InnerClass
constructor()
analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.txt
Vendored
+29
View File
@@ -34,6 +34,35 @@ KtFunctionSymbol:
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: JavaClass.InnerClass
classKind: CLASS
companionObject: null
contextReceivers: []
isActual: false
isData: false
isExpect: false
isExternal: false
isFun: false
isInline: false
isInner: true
modality: OPEN
name: InnerClass
origin: JAVA
superTypes: [
KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Any
]
symbolKind: CLASS_MEMBER
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
deprecationStatus: null
KtConstructorSymbol:
annotationsList: []
callableIdIfNonLocal: null
analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.kt
Vendored
+4
View File
@@ -14,6 +14,8 @@ public interface SuperInterface {
public abstract class SuperClass implements SuperInterface {
public static class NestedSuperClass { }
public class InnerSuperClass { }
@Override
public int getActualRandomNumber() {
return getRandomNumber();
@@ -30,6 +32,8 @@ public abstract class SuperClass implements SuperInterface {
public class JavaClass extends SuperClass {
public static class NestedClass { }
public class InnerClass { }
public static int foo = 1;
public static String bar() {
analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.pretty.txt
Vendored
+4
View File
@@ -11,6 +11,10 @@ open fun toString(): kotlin.String
open class NestedClass
open inner class InnerClass
open class NestedSuperClass
open inner class InnerSuperClass
constructor()
analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.txt
Vendored
+58
View File
@@ -233,6 +233,35 @@ KtNamedClassOrObjectSymbol:
annotationApplicableTargets: null
deprecationStatus: null
KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: JavaClass.InnerClass
classKind: CLASS
companionObject: null
contextReceivers: []
isActual: false
isData: false
isExpect: false
isExternal: false
isFun: false
isInline: false
isInner: true
modality: OPEN
name: InnerClass
origin: JAVA
superTypes: [
KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Any
]
symbolKind: CLASS_MEMBER
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
deprecationStatus: null
KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: SuperClass.NestedSuperClass
@@ -262,6 +291,35 @@ KtNamedClassOrObjectSymbol:
annotationApplicableTargets: null
deprecationStatus: null
KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: SuperClass.InnerSuperClass
classKind: CLASS
companionObject: null
contextReceivers: []
isActual: false
isData: false
isExpect: false
isExternal: false
isFun: false
isInline: false
isInner: true
modality: OPEN
name: InnerSuperClass
origin: JAVA
superTypes: [
KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Any
]
symbolKind: CLASS_MEMBER
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
deprecationStatus: null
KtConstructorSymbol:
annotationsList: []
callableIdIfNonLocal: null
analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.kt
Vendored
+4
View File
@@ -14,6 +14,8 @@ public interface SuperInterface {
public abstract class SuperClass implements SuperInterface {
public static class NestedSuperClass { }
public class InnerSuperClass { }
@Override
public int getActualRandomNumber() {
return getRandomNumber();
@@ -30,6 +32,8 @@ public abstract class SuperClass implements SuperInterface {
public class JavaClass extends SuperClass {
public static class NestedClass { }
public class InnerClass { }
public static int foo = 1;
public static String bar() {
analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.pretty.txt
Vendored
+2
View File
@@ -2,4 +2,6 @@ open fun bar(): kotlin.String!
open var foo: kotlin.Int
open inner class InnerClass
open class NestedClass
analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.txt
Vendored
+29
View File
@@ -50,6 +50,35 @@ KtJavaFieldSymbol:
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: JavaClass.InnerClass
classKind: CLASS
companionObject: null
contextReceivers: []
isActual: false
isData: false
isExpect: false
isExternal: false
isFun: false
isInline: false
isInner: true
modality: OPEN
name: InnerClass
origin: JAVA
superTypes: [
KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Any
]
symbolKind: CLASS_MEMBER
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
deprecationStatus: null
KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: JavaClass.NestedClass
analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.kt
Vendored
+6 -4
View File
@@ -16,8 +16,9 @@ public interface SuperInterface {
public abstract class SuperClass implements SuperInterface {
// NestedSuperClass will not be included in JavaClass's static member scope, because Kotlin does not propagate static nested classes
// defined in super-classes to sub-classes, unlike Java. So `JavaClass.SuperClass` is valid in Java, but an error in Kotlin.
class NestedSuperClass {
}
public static class NestedSuperClass { }
public class InnerSuperClass { }
@Override
public int getActualRandomNumber() {
@@ -35,8 +36,9 @@ public abstract class SuperClass implements SuperInterface {
// FILE: JavaClass.java
public class JavaClass extends SuperClass {
class NestedClass {
}
public static class NestedClass { }
public class InnerClass { }
public static int foo = 1;
analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.pretty.txt
Vendored
+3 -1
View File
@@ -6,4 +6,6 @@ open fun superBar(): kotlin.String!
open var foo: kotlin.Int
open inner class NestedClass
open inner class InnerClass
open class NestedClass
analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.txt
Vendored
+31 -2
View File
@@ -104,7 +104,7 @@ KtJavaFieldSymbol:
KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: JavaClass.NestedClass
classIdIfNonLocal: JavaClass.InnerClass
classKind: CLASS
companionObject: null
contextReceivers: []
@@ -116,6 +116,35 @@ KtNamedClassOrObjectSymbol:
isInline: false
isInner: true
modality: OPEN
name: InnerClass
origin: JAVA
superTypes: [
KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Any
]
symbolKind: CLASS_MEMBER
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
deprecationStatus: null
KtNamedClassOrObjectSymbol:
annotationsList: []
classIdIfNonLocal: JavaClass.NestedClass
classKind: CLASS
companionObject: null
contextReceivers: []
isActual: false
isData: false
isExpect: false
isExternal: false
isFun: false
isInline: false
isInner: false
modality: OPEN
name: NestedClass
origin: JAVA
superTypes: [
@@ -126,7 +155,7 @@ KtNamedClassOrObjectSymbol:
]
symbolKind: CLASS_MEMBER
typeParameters: []
visibility: PackageVisibility
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
deprecationStatus: null