MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] k2: ignore abstract functions when detecting non-paired equals/hashcode (KTIJ-25777)

Browse Source 
GitOrigin-RevId: be864df114f27af71204eafd383c149e1f582f79
This commit is contained in:
Anna Kozlova
2023-06-10 16:51:37 +00:00
committed by intellij-monorepo-bot
parent 93b19392f4
commit 78b56a913a
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/EqualsOrHashCodeInspection.kt
+3 -2
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol
import org.jetbrains.kotlin.analysis.api.types.KtType
import org.jetbrains.kotlin.config.ApiVersion
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.idea.base.facet.platform.platform
import org.jetbrains.kotlin.idea.base.projectStructure.languageVersionSettings
import org.jetbrains.kotlin.idea.base.psi.classIdIfNonLocal
@@ -55,6 +56,7 @@ class EqualsOrHashCodeInspection : AbstractKotlinInspection() {
}
private fun KtAnalysisSession.matchesEqualsMethodSignature(function: KtFunctionSymbol): Boolean {
if (function.modality == Modality.ABSTRACT) return false
if (function.name != EQUALS) return false
if (function.typeParameters.isNotEmpty()) return false
val param = function.valueParameters.singleOrNull() ?: return false
@@ -66,6 +68,7 @@ class EqualsOrHashCodeInspection : AbstractKotlinInspection() {
}
private fun KtAnalysisSession.matchesHashCodeMethodSignature(function: KtFunctionSymbol): Boolean {
if (function.modality == Modality.ABSTRACT) return false
if (function.name != HASH_CODE) return false
if (function.typeParameters.isNotEmpty()) return false
if (function.valueParameters.isNotEmpty()) return false
@@ -341,12 +344,10 @@ class EqualsOrHashCodeInspection : AbstractKotlinInspection() {
Pair(
classOrObjectMemberDeclarations.singleOrNull {
val function = it.getSymbol() as? KtFunctionSymbol ?: return@singleOrNull false
if (function.name != EQUALS) return@singleOrNull false
matchesEqualsMethodSignature(function)
} as? KtNamedFunction,
classOrObjectMemberDeclarations.singleOrNull {
val function = it.getSymbol() as? KtFunctionSymbol ?: return@singleOrNull false
if (function.name != HASH_CODE) return@singleOrNull false
matchesHashCodeMethodSignature(function)
} as? KtNamedFunction,
)
plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/K2LocalInspectionTestGenerated.java
+5
View File
@@ -1671,6 +1671,11 @@ public abstract class K2LocalInspectionTestGenerated extends AbstractK2LocalInsp
runTest("../../../idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsInExpectClass.kt");
}
@TestMetadata("equalsInInterface.kt")
public void testEqualsInInterface() throws Exception {
runTest("../../../idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsInInterface.kt");
}
@TestMetadata("equalsWithKotlinAnyParam.kt")
public void testEqualsWithKotlinAnyParam() throws Exception {
runTest("../../../idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam.kt");
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
+5
View File
@@ -5238,6 +5238,11 @@ public abstract class LocalInspectionTestGenerated extends AbstractLocalInspecti
runTest("testData/inspectionsLocal/equalsOrHashCode/equalsInExpectClass.kt");
}
@TestMetadata("equalsInInterface.kt")
public void testEqualsInInterface() throws Exception {
runTest("testData/inspectionsLocal/equalsOrHashCode/equalsInInterface.kt");
}
@TestMetadata("equalsWithKotlinAnyParam.kt")
public void testEqualsWithKotlinAnyParam() throws Exception {
runTest("testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam.kt");
plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsInInterface.kt
+4
View File
@@ -0,0 +1,4 @@
// PROBLEM: none
interface <caret>I {
override fun equals(other: Any?): Boolean
}