From 8fccc46696e8b87e7c968dd6f4a1b91d2c0dc9f3 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 7 Sep 2012 12:52:11 +0400 Subject: [PATCH] EA-35497 - assert: JavaParserUtil.parseFragment --- .../daemon/impl/quickfix/AddDefaultConstructorFix.java | 8 ++++---- .../intention/impl/config/QuickFixFactoryImpl.java | 2 +- .../intellij/codeInsight/intention/QuickFixFactory.java | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddDefaultConstructorFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddDefaultConstructorFix.java index 4118d62129e6..4cd483e4509a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddDefaultConstructorFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddDefaultConstructorFix.java @@ -28,15 +28,15 @@ public class AddDefaultConstructorFix extends AddMethodFix { } public AddDefaultConstructorFix(PsiClass aClass, @PsiModifier.ModifierConstant final String modifier) { - super(generateConstructor(aClass, modifier), aClass); + super(generateConstructor(aClass.getName(), modifier), aClass); setText(QuickFixBundle.message("add.default.constructor.text", VisibilityUtil.toPresentableText(modifier), aClass.getName())); } - private static String generateConstructor(PsiClass aClass, @PsiModifier.ModifierConstant final String modifier) { + private static String generateConstructor(final String className, @PsiModifier.ModifierConstant final String modifier) { if (modifier == PsiModifier.PACKAGE_LOCAL) { - return aClass.getName() + "() {}"; + return className + "() {}"; } - return modifier + " " + aClass.getName() + "() {}"; + return modifier + " " + className + "() {}"; } @Override diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java index 6b241e3080a3..124636cb063f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java @@ -91,7 +91,7 @@ public class QuickFixFactoryImpl extends QuickFixFactory { @Override public LocalQuickFixAndIntentionActionOnPsiElement createAddConstructorFix(@NotNull PsiClass aClass, String modifier) { - return new AddDefaultConstructorFix(aClass, modifier); + return aClass.getName() != null ? new AddDefaultConstructorFix(aClass, modifier) : null; } @Override diff --git a/java/openapi/src/com/intellij/codeInsight/intention/QuickFixFactory.java b/java/openapi/src/com/intellij/codeInsight/intention/QuickFixFactory.java index b3bfc4994f78..87ad87d99caa 100644 --- a/java/openapi/src/com/intellij/codeInsight/intention/QuickFixFactory.java +++ b/java/openapi/src/com/intellij/codeInsight/intention/QuickFixFactory.java @@ -50,6 +50,7 @@ public abstract class QuickFixFactory { public abstract LocalQuickFixAndIntentionActionOnPsiElement createImplementMethodsFix(@NotNull PsiClass psiElement); public abstract LocalQuickFixAndIntentionActionOnPsiElement createMethodThrowsFix(@NotNull PsiMethod method, @NotNull PsiClassType exceptionClass, boolean shouldThrow, boolean showContainingClass); public abstract LocalQuickFixAndIntentionActionOnPsiElement createAddDefaultConstructorFix(@NotNull PsiClass aClass); + @Nullable public abstract LocalQuickFixAndIntentionActionOnPsiElement createAddConstructorFix(@NotNull PsiClass aClass, @PsiModifier.ModifierConstant String modifier); public abstract LocalQuickFixAndIntentionActionOnPsiElement createMethodParameterTypeFix(@NotNull PsiMethod method, int index, @NotNull PsiType newType, boolean fixWholeHierarchy); public abstract LocalQuickFixAndIntentionActionOnPsiElement createMakeClassInterfaceFix(@NotNull PsiClass aClass);