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

surround with quotes in annotation params work for unresolved refs

Browse Source 
IDEA-188826
This commit is contained in:
Anna.Kozlova
2018-04-24 16:04:25 +02:00
parent a7da5544e8
commit 2800ac30f3
4 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java
View File

@@ -34,10 +34,11 @@ public class DefaultQuickFixProvider extends UnresolvedReferenceQuickFixProvider
return;
}
QuickFixFactory quickFixFactory = QuickFixFactory.getInstance();
registrar.register(new ImportClassFix(ref));
registrar.register(new StaticImportConstantFix(ref));
registrar.register(new QualifyStaticConstantFix(ref));
registrar.register(QuickFixFactory.getInstance().createSetupJDKFix());
registrar.register(quickFixFactory.createSetupJDKFix());
OrderEntryFix.registerFixes(registrar, ref);
@@ -76,6 +77,8 @@ public class DefaultQuickFixProvider extends UnresolvedReferenceQuickFixProvider
registrar.register(new CreateClassFromUsageFix(ref, CreateClassKind.CLASS));
registrar.register(new CreateInnerClassFromUsageFix(ref, CreateClassKind.CLASS));
}
SurroundWithQuotesAnnotationParameterValueFix.register(registrar, ref);
}
@NotNull

32
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java
View File

@@ -15,11 +15,13 @@
*/
package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.codeInsight.daemon.QuickFixActionRegistrar;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
@@ -37,17 +39,21 @@ public class SurroundWithQuotesAnnotationParameterValueFix implements IntentionA
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
if (!myValue.isValid() || !myExpectedType.isValid() || !(myExpectedType instanceof PsiClassType)) {
if (!myValue.isValid() || !myExpectedType.isValid()) {
return false;
}
final PsiClass resolvedType = ((PsiClassType)myExpectedType).resolve();
return resolvedType != null && CommonClassNames.JAVA_LANG_STRING.equals(resolvedType.getQualifiedName()) && myValue instanceof PsiLiteralExpression;
final PsiClass resolvedType = PsiUtil.resolveClassInType(myExpectedType);
if (resolvedType != null && CommonClassNames.JAVA_LANG_STRING.equals(resolvedType.getQualifiedName())) {
return myValue instanceof PsiLiteralExpression ||
myValue instanceof PsiReferenceExpression && ((PsiReferenceExpression)myValue).resolve() == null;
}
return false;
}
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
String newText = myValue.getText();
newText = StringUtil.stripQuotesAroundValue(newText);
newText = StringUtil.unquoteString(newText);
newText = "\"" + newText + "\"";
PsiElement newToken = JavaPsiFacade.getInstance(project).getElementFactory().createExpressionFromText(newText, null);
final PsiElement newElement = myValue.replace(newToken);
@@ -72,4 +78,22 @@ public class SurroundWithQuotesAnnotationParameterValueFix implements IntentionA
}
public static void register(@NotNull QuickFixActionRegistrar registrar,
@NotNull PsiJavaCodeReferenceElement ref) {
if (ref instanceof PsiReferenceExpression) {
PsiElement parent = ref.getParent();
if (parent instanceof PsiNameValuePair && ((PsiNameValuePair)parent).getValue() == ref) {
PsiReference reference = parent.getReference();
if (reference != null) {
PsiElement annotationMethod = reference.resolve();
if (annotationMethod instanceof PsiMethod) {
PsiType returnType = ((PsiMethod)annotationMethod).getReturnType();
if (returnType != null) {
registrar.register(new SurroundWithQuotesAnnotationParameterValueFix((PsiReferenceExpression)ref, returnType));
}
}
}
}
}
}
}

9
java/java-tests/testData/codeInsight/surroundWithQuotesStringAnnotationParameterValue/afterUnresolved.java Normal file
View File

@@ -0,0 +1,9 @@
// "Surround annotation parameter value with quotes" "true"
class X {
@SuppressWarnings("unused")
void m() {
}
}

9
java/java-tests/testData/codeInsight/surroundWithQuotesStringAnnotationParameterValue/beforeUnresolved.java Normal file
View File

@@ -0,0 +1,9 @@
// "Surround annotation parameter value with quotes" "true"
class X {
@SuppressWarnings(unu<caret>sed)
void m() {
}
}