From 832a84551058fbe3518966f591c3d6ed081acfd3 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Mon, 5 Feb 2024 17:00:50 +0100 Subject: [PATCH] [java-intentions] Edit Contract, Edit Range: remove on references, keep on declarations only Also fixes EA-945090 - T: PsiSearchHelperImpl.processFilesConcurrentlyDespiteWriteActions GitOrigin-RevId: 94cca91f42d6595a33edc1e8b2ba89ac38ee65bc --- .../intellij/codeInspection/dataFlow/EditContractIntention.java | 2 +- .../intellij/codeInspection/dataFlow/EditRangeIntention.java | 2 +- .../tests/testData/quickfix/declaringJavaClass/customEnum.kt | 1 - .../testData/quickfix/declaringJavaClass/customEnum.kt.after | 1 - .../testData/quickfix/typeMismatch/paramTypeLambdaMismatch.kt | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/dataFlow/EditContractIntention.java b/java/java-impl-inspections/src/com/intellij/codeInspection/dataFlow/EditContractIntention.java index 752582a12283..18475ab6247a 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/dataFlow/EditContractIntention.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/dataFlow/EditContractIntention.java @@ -39,7 +39,7 @@ public final class EditContractIntention extends BaseIntentionAction implements } private static @Nullable PsiMethod getTargetMethod(Editor editor, PsiFile file) { - final PsiModifierListOwner owner = AddAnnotationPsiFix.getContainer(file, editor.getCaretModel().getOffset(), true); + final PsiModifierListOwner owner = AddAnnotationPsiFix.getContainer(file, editor.getCaretModel().getOffset()); if (owner instanceof PsiMethod && ExternalAnnotationsManagerImpl.areExternalAnnotationsApplicable(owner)) { PsiElement original = owner.getOriginalElement(); return original instanceof PsiMethod ? (PsiMethod)original : (PsiMethod)owner; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/dataFlow/EditRangeIntention.java b/java/java-impl-inspections/src/com/intellij/codeInspection/dataFlow/EditRangeIntention.java index b4dee0b91939..49af99696e89 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/dataFlow/EditRangeIntention.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/dataFlow/EditRangeIntention.java @@ -36,7 +36,7 @@ public final class EditRangeIntention extends BaseIntentionAction implements Low @Nullable private static PsiModifierListOwner getTarget(Editor editor, PsiFile file) { - final PsiModifierListOwner owner = AddAnnotationPsiFix.getContainer(file, editor.getCaretModel().getOffset(), true); + final PsiModifierListOwner owner = AddAnnotationPsiFix.getContainer(file, editor.getCaretModel().getOffset()); LongRangeSet rangeFromType = rangeFromType(owner); if (rangeFromType == null || !ExternalAnnotationsManagerImpl.areExternalAnnotationsApplicable(owner)) return null; PsiElement original = owner.getOriginalElement(); diff --git a/plugins/kotlin/idea/tests/testData/quickfix/declaringJavaClass/customEnum.kt b/plugins/kotlin/idea/tests/testData/quickfix/declaringJavaClass/customEnum.kt index 4bb60afd4886..7cb995cfac61 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/declaringJavaClass/customEnum.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/declaringJavaClass/customEnum.kt @@ -1,5 +1,4 @@ // "Replace with 'declaringJavaClass'" "true" -// ACTION: Add method contract to 'getDeclaringClass()'... // ACTION: Introduce local variable // ACTION: Put calls on separate lines // ACTION: Replace with 'declaringJavaClass' diff --git a/plugins/kotlin/idea/tests/testData/quickfix/declaringJavaClass/customEnum.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/declaringJavaClass/customEnum.kt.after index c058bf93cbd3..15b769fcd85e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/declaringJavaClass/customEnum.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/declaringJavaClass/customEnum.kt.after @@ -1,5 +1,4 @@ // "Replace with 'declaringJavaClass'" "true" -// ACTION: Add method contract to 'getDeclaringClass()'... // ACTION: Introduce local variable // ACTION: Put calls on separate lines // ACTION: Replace with 'declaringJavaClass' diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/paramTypeLambdaMismatch.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/paramTypeLambdaMismatch.kt index d727cddb7e07..79afaa4f3e18 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/paramTypeLambdaMismatch.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/paramTypeLambdaMismatch.kt @@ -3,7 +3,6 @@ // ACTION: Add full qualifier // ACTION: Change parameter 'block' type of function 'str' to 'Object' // ACTION: Create function 'str' -// ACTION: Edit method contract of 'Object()'... // ACTION: Introduce import alias fun fn() { str(Object())