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

[AA] allow navigation from '==' to the equals method of lhs

Browse Source
This commit is contained in:
Anna Kozlova
2023-01-13 13:45:29 +01:00
committed by teamcity
parent 825432074f
commit 86cc57ac39
12 changed files with 137 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+18
View File
@@ -160,6 +160,18 @@ public class Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exte
runTest("analysis/analysis-api/testData/referenceResolve/EnumValues.kt");
}
@Test
@TestMetadata("EqualsOperator.kt")
public void testEqualsOperator() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/EqualsOperator.kt");
}
@Test
@TestMetadata("EqualsOperatorNoInfix.kt")
public void testEqualsOperatorNoInfix() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/EqualsOperatorNoInfix.kt");
}
@Test
@TestMetadata("explicitFunctionalInterfaceInvoke_globalVal.kt")
public void testExplicitFunctionalInterfaceInvoke_globalVal() throws Exception {
@@ -352,6 +364,12 @@ public class Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exte
runTest("analysis/analysis-api/testData/referenceResolve/NamedClassObject.kt");
}
@Test
@TestMetadata("NotEqualsOperator.kt")
public void testNotEqualsOperator() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/NotEqualsOperator.kt");
}
@Test
@TestMetadata("PackageReference.kt")
public void testPackageReference() throws Exception {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirReferenceResolveHelper.kt
+26
View File
@@ -30,8 +30,10 @@ import org.jetbrains.kotlin.fir.references.*
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.dfa.unwrapSmartcastExpression
import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnmatchedTypeArgumentsError
import org.jetbrains.kotlin.fir.resolve.scope
import org.jetbrains.kotlin.fir.resolve.toSymbol
import org.jetbrains.kotlin.fir.resolve.transformers.FirImportResolveTransformer
import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
import org.jetbrains.kotlin.fir.scopes.impl.FirExplicitSimpleImportingScope
import org.jetbrains.kotlin.fir.scopes.processClassifiersByName
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
@@ -46,6 +48,7 @@ import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelector
import org.jetbrains.kotlin.psi.psiUtil.unwrapNullability
import org.jetbrains.kotlin.util.OperatorNameConventions
import org.jetbrains.kotlin.utils.addIfNotNull
internal object FirReferenceResolveHelper {
@@ -216,10 +219,33 @@ internal object FirReferenceResolveHelper {
getSymbolByDelegatedConstructorCall(expression, adjustedResolutionExpression, fir, session, symbolBuilder)
is FirResolvable -> getSymbolsByResolvable(fir, expression, session, symbolBuilder)
is FirNamedArgumentExpression -> getSymbolsByNameArgumentExpression(expression, analysisSession, symbolBuilder)
is FirEqualityOperatorCall -> getSymbolsByEqualsName(fir, session, analysisSession, symbolBuilder)
else -> handleUnknownFirElement(expression, analysisSession, session, symbolBuilder)
}
}
private fun getSymbolsByEqualsName(
expression: FirEqualityOperatorCall,
session: FirSession,
analysisSession: KtFirAnalysisSession,
symbolBuilder: KtSymbolByFirBuilder
): Collection<KtSymbol> {
val lhs = expression.arguments.firstOrNull() ?: return emptyList()
val scope = lhs.typeRef.coneType.scope(
session,
analysisSession.getScopeSessionFor(analysisSession.useSiteSession),
FakeOverrideTypeCalculator.DoNothing
) ?: return emptyList()
return buildList {
scope.processFunctionsByName(OperatorNameConventions.EQUALS) { functionSymbol ->
val parameterSymbol = functionSymbol.valueParameterSymbols.singleOrNull()
if (parameterSymbol != null && parameterSymbol.fir.returnTypeRef.isNullableAny) {
add(functionSymbol.buildSymbol(symbolBuilder))
}
}
}
}
private fun getSymbolByDelegatedConstructorCall(
expression: KtSimpleNameExpression,
adjustedResolutionExpression: KtElement,
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+18
View File
@@ -160,6 +160,18 @@ public class FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated ex
runTest("analysis/analysis-api/testData/referenceResolve/EnumValues.kt");
}
@Test
@TestMetadata("EqualsOperator.kt")
public void testEqualsOperator() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/EqualsOperator.kt");
}
@Test
@TestMetadata("EqualsOperatorNoInfix.kt")
public void testEqualsOperatorNoInfix() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/EqualsOperatorNoInfix.kt");
}
@Test
@TestMetadata("explicitFunctionalInterfaceInvoke_globalVal.kt")
public void testExplicitFunctionalInterfaceInvoke_globalVal() throws Exception {
@@ -352,6 +364,12 @@ public class FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated ex
runTest("analysis/analysis-api/testData/referenceResolve/NamedClassObject.kt");
}
@Test
@TestMetadata("NotEqualsOperator.kt")
public void testNotEqualsOperator() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/NotEqualsOperator.kt");
}
@Test
@TestMetadata("PackageReference.kt")
public void testPackageReference() throws Exception {
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java
Generated
+18
View File
@@ -160,6 +160,18 @@ public class FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerate
runTest("analysis/analysis-api/testData/referenceResolve/EnumValues.kt");
}
@Test
@TestMetadata("EqualsOperator.kt")
public void testEqualsOperator() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/EqualsOperator.kt");
}
@Test
@TestMetadata("EqualsOperatorNoInfix.kt")
public void testEqualsOperatorNoInfix() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/EqualsOperatorNoInfix.kt");
}
@Test
@TestMetadata("explicitFunctionalInterfaceInvoke_globalVal.kt")
public void testExplicitFunctionalInterfaceInvoke_globalVal() throws Exception {
@@ -352,6 +364,12 @@ public class FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerate
runTest("analysis/analysis-api/testData/referenceResolve/NamedClassObject.kt");
}
@Test
@TestMetadata("NotEqualsOperator.kt")
public void testNotEqualsOperator() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/NotEqualsOperator.kt");
}
@Test
@TestMetadata("PackageReference.kt")
public void testPackageReference() throws Exception {
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+18
View File
@@ -160,6 +160,18 @@ public class FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exten
runTest("analysis/analysis-api/testData/referenceResolve/EnumValues.kt");
}
@Test
@TestMetadata("EqualsOperator.kt")
public void testEqualsOperator() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/EqualsOperator.kt");
}
@Test
@TestMetadata("EqualsOperatorNoInfix.kt")
public void testEqualsOperatorNoInfix() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/EqualsOperatorNoInfix.kt");
}
@Test
@TestMetadata("explicitFunctionalInterfaceInvoke_globalVal.kt")
public void testExplicitFunctionalInterfaceInvoke_globalVal() throws Exception {
@@ -352,6 +364,12 @@ public class FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exten
runTest("analysis/analysis-api/testData/referenceResolve/NamedClassObject.kt");
}
@Test
@TestMetadata("NotEqualsOperator.kt")
public void testNotEqualsOperator() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/NotEqualsOperator.kt");
}
@Test
@TestMetadata("PackageReference.kt")
public void testPackageReference() throws Exception {
analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+18
View File
@@ -160,6 +160,18 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerate
runTest("analysis/analysis-api/testData/referenceResolve/EnumValues.kt");
}
@Test
@TestMetadata("EqualsOperator.kt")
public void testEqualsOperator() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/EqualsOperator.kt");
}
@Test
@TestMetadata("EqualsOperatorNoInfix.kt")
public void testEqualsOperatorNoInfix() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/EqualsOperatorNoInfix.kt");
}
@Test
@TestMetadata("explicitFunctionalInterfaceInvoke_globalVal.kt")
public void testExplicitFunctionalInterfaceInvoke_globalVal() throws Exception {
@@ -352,6 +364,12 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerate
runTest("analysis/analysis-api/testData/referenceResolve/NamedClassObject.kt");
}
@Test
@TestMetadata("NotEqualsOperator.kt")
public void testNotEqualsOperator() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/NotEqualsOperator.kt");
}
@Test
@TestMetadata("PackageReference.kt")
public void testPackageReference() throws Exception {
analysis/analysis-api/testData/referenceResolve/EqualsOperator.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package test
class A(val n: Any) {
override infix fun equals(other: Any?): Boolean = other is A && other.n <caret>== n
}
analysis/analysis-api/testData/referenceResolve/EqualsOperator.txt
Vendored
+2
View File
@@ -0,0 +1,2 @@
Resolved to:
0: (in kotlin.Any) open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/referenceResolve/EqualsOperatorNoInfix.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package test
class A(val n: Any) {
override fun equals(other: Any?): Boolean = other is A && other.n <caret>== n
}
analysis/analysis-api/testData/referenceResolve/EqualsOperatorNoInfix.txt
Vendored
+2
View File
@@ -0,0 +1,2 @@
Resolved to:
0: (in kotlin.Any) open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/referenceResolve/NotEqualsOperator.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package test
class A(val n: Any) {
override infix fun equals(other: Any?): Boolean = other is A && other.n <caret>!= n
}
analysis/analysis-api/testData/referenceResolve/NotEqualsOperator.txt
Vendored
+2
View File
@@ -0,0 +1,2 @@
Resolved to:
0: (in kotlin.Any) open operator fun equals(other: kotlin.Any?): kotlin.Boolean