MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 13:31:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-inspections] PsiDiamondTypeUtil: fix method comparison

Browse Source 
IDEA-298142 Type parameter is not omitted in the quick-fix preview

GitOrigin-RevId: 4a0e238a5c124e6be6230994bccdfc742d4da72e
This commit is contained in:
Tagir Valeev
2022-07-19 17:50:40 +02:00
committed by intellij-monorepo-bot
parent b9a2e79c7c
commit 8269f89b1a
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-psi-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java
View File

@@ -291,7 +291,7 @@ public final class PsiDiamondTypeUtil {
exprCopy.getTypeArgumentList().replace(list);
final JavaResolveResult copyResult = exprCopy.resolveMethodGenerics();
if (method != copyResult.getElement()) return false;
if (!method.isEquivalentTo(copyResult.getElement())) return false;
final PsiSubstitutor psiSubstitutor = copyResult.getSubstitutor();
for (int i = 0, length = typeParameters.length; i < length; i++) {
PsiTypeParameter typeParameter = typeParameters[i];

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalNull/afterSimplePreview.java Normal file
View File

@@ -0,0 +1,11 @@
// "Replace with 'Optional.empty()'" "true-preview"
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.OptionalInt;
public class Test {
Optional<Integer> foo(boolean flag) {
return flag ? Optional.of(42) : Optional.empty();
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalNull/beforeSimplePreview.java Normal file
View File

@@ -0,0 +1,11 @@
// "Replace with 'Optional.empty()'" "true-preview"
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.OptionalInt;
public class Test {
Optional<Integer> foo(boolean flag) {
return flag ? Optional.of(42) : n<caret>ull;
}
}