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

disable create method from usage/change signature based on void argument (IDEA-205710)

Browse Source
This commit is contained in:
Anna.Kozlova
2019-01-31 16:59:11 +01:00
parent c70be8885a
commit f2b9476d0f
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
View File

@@ -336,7 +336,7 @@ public class ChangeMethodSignatureFromUsageFix implements IntentionAction/*, Hig
else {
if (PsiPolyExpressionUtil.isPolyExpression(expression)) return null;
PsiType exprType = RefactoringUtil.getTypeByExpression(expression);
if (exprType == null) return null;
if (exprType == null || PsiType.VOID.equals(exprType)) return null;
if (exprType instanceof PsiDisjunctionType) {
exprType = ((PsiDisjunctionType)exprType).getLeastUpperBound();
}
@@ -412,7 +412,7 @@ public class ChangeMethodSignatureFromUsageFix implements IntentionAction/*, Hig
if (varargParam != null && pi >= parameters.length) return false;
if (PsiPolyExpressionUtil.isPolyExpression(expression)) return false;
PsiType exprType = RefactoringUtil.getTypeByExpression(expression);
if (exprType == null) return false;
if (exprType == null || PsiType.VOID.equals(exprType)) return false;
if (exprType instanceof PsiDisjunctionType) {
exprType = ((PsiDisjunctionType)exprType).getLeastUpperBound();
}

6
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
View File

@@ -87,10 +87,14 @@ public class CreateMethodFromUsageFix extends CreateFromUsageBaseFix {
public static boolean hasErrorsInArgumentList(final PsiMethodCallExpression call) {
Project project = call.getProject();
PsiExpressionList argumentList = call.getArgumentList();
for (PsiExpression expression : argumentList.getExpressions()) {
PsiType type = expression.getType();
if (type == null || PsiType.VOID.equals(type)) return true;
}
Document document = PsiDocumentManager.getInstance(project).getDocument(call.getContainingFile());
if (document == null) return true;
PsiExpressionList argumentList = call.getArgumentList();
final TextRange argRange = argumentList.getTextRange();
return !DaemonCodeAnalyzerEx.processHighlights(document, project, HighlightSeverity.ERROR,
//strictly inside arg list

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage/beforeVoidExpressionInArgument.java Normal file
View File

@@ -0,0 +1,9 @@
// "Change 1st parameter of method 'foo' from 'String' to 'void'" "false"
public class S {
void bar() {}
void foo(String s) {}
{
foo(b<caret>ar());
}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/beforeVoidArgument.java Normal file
View File

@@ -0,0 +1,8 @@
// "Create method 'bar'" "false"
class Test {
{
ba<caret>r(foo());
}
void foo() {}
}