diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpFakeInspection.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpFakeInspection.java index 474066432583..789fd7abdbad 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpFakeInspection.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpFakeInspection.java @@ -179,7 +179,8 @@ public class CustomRegExpFakeInspection extends LocalInspectionTool { return; } final CustomRegExpInspection inspection = getRegExpInspection(profile); - final InspectionMetaDataDialog dialog = inspection.createMetaDataDialog(project, myConfiguration); + final InspectionMetaDataDialog dialog = + inspection.createMetaDataDialog(project, profile.getDisplayName(), myConfiguration); if (isCleanupAllowed()) { dialog.showCleanupOption(myConfiguration.isCleanup()); } diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpInspection.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpInspection.java index ee1717934f9b..ddeea7672f04 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpInspection.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpInspection.java @@ -188,7 +188,7 @@ public class CustomRegExpInspection extends LocalInspectionTool implements Dynam } @NotNull - public InspectionMetaDataDialog createMetaDataDialog(Project project, @Nullable RegExpInspectionConfiguration configuration) { + public InspectionMetaDataDialog createMetaDataDialog(Project project, @NotNull String profileName, @Nullable RegExpInspectionConfiguration configuration) { Function nameValidator = name -> { for (RegExpInspectionConfiguration current : myConfigurations) { if ((configuration == null || !configuration.getUuid().equals(current.getUuid())) && @@ -199,9 +199,9 @@ public class CustomRegExpInspection extends LocalInspectionTool implements Dynam return null; }; if (configuration == null) { - return new InspectionMetaDataDialog(project, nameValidator); + return new InspectionMetaDataDialog(project, profileName, nameValidator); } - return new InspectionMetaDataDialog(project, nameValidator, configuration.getName(), configuration.getDescription(), + return new InspectionMetaDataDialog(project, profileName, nameValidator, configuration.getName(), configuration.getDescription(), configuration.getProblemDescriptor(), configuration.getSuppressId()); } diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpProfileActionProvider.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpProfileActionProvider.java index 37009909eb6f..535126aebda0 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpProfileActionProvider.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpProfileActionProvider.java @@ -40,7 +40,8 @@ public class RegExpProfileActionProvider extends InspectionProfileActionProvider @Override public void actionPerformed(@NotNull AnActionEvent e) { - final RegExpDialog dialog = new RegExpDialog(e.getProject(), true, myReplace ? RegExpInspectionConfiguration.InspectionPattern.EMPTY_REPLACE_PATTERN : null); + final RegExpDialog dialog = + new RegExpDialog(e.getProject(), true, myReplace ? RegExpInspectionConfiguration.InspectionPattern.EMPTY_REPLACE_PATTERN : null); if (!dialog.showAndGet()) return; final RegExpInspectionConfiguration.InspectionPattern pattern = dialog.getPattern(); @@ -48,7 +49,7 @@ public class RegExpProfileActionProvider extends InspectionProfileActionProvider final CustomRegExpInspection inspection = CustomRegExpInspection.getCustomRegExpInspection(profile); final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; - final InspectionMetaDataDialog metaDataDialog = inspection.createMetaDataDialog(project, null); + final InspectionMetaDataDialog metaDataDialog = inspection.createMetaDataDialog(project, profile.getDisplayName(), null); if (pattern.replacement() != null) { metaDataDialog.showCleanupOption(false); } diff --git a/platform/analysis-api/resources/messages/InspectionsBundle.properties b/platform/analysis-api/resources/messages/InspectionsBundle.properties index cd79e8a26e6f..be17509b6e25 100644 --- a/platform/analysis-api/resources/messages/InspectionsBundle.properties +++ b/platform/analysis-api/resources/messages/InspectionsBundle.properties @@ -327,7 +327,7 @@ power.save.mode.widget.tooltip.disabled=Power save mode: disabled dialog.message.suppress.id.must.match.regex=Suppress ID must match regex [a-zA-Z_0-9.-]+ dialog.message.name.must.not.be.empty=Name must not be empty -dialog.title.user.defined.inspection=User Defined Inspection +dialog.title.user.defined.inspection=User Defined Inspection in ''{0}'' checkbox.cleanup.inspection=&Cleanup inspection label.inspection.name=Inspection name: label.description=&Description: diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionMetaDataDialog.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionMetaDataDialog.java index 2e87f6d4a877..a024bcf390f7 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionMetaDataDialog.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionMetaDataDialog.java @@ -38,11 +38,13 @@ public final class InspectionMetaDataDialog extends DialogWrapper { private boolean showCleanupOption = false; public InspectionMetaDataDialog(@NotNull Project project, + @NotNull String profileName, @NotNull Function nameValidator) { - this(project, nameValidator, null, null, null, null); + this(project, profileName, nameValidator, null, null, null, null); } public InspectionMetaDataDialog(@NotNull Project project, + @NotNull String profileName, @NotNull Function nameValidator, @NlsSafe String name, @NlsSafe String description, @@ -60,7 +62,7 @@ public final class InspectionMetaDataDialog extends DialogWrapper { mySuppressIdTextField = new JTextField(suppressId); myCleanupCheckbox = new JBCheckBox(InspectionsBundle.message("checkbox.cleanup.inspection")); myNameValidator = nameValidator; - setTitle(InspectionsBundle.message("dialog.title.user.defined.inspection")); + setTitle(InspectionsBundle.message("dialog.title.user.defined.inspection", profileName)); } @Override diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/SSBasedInspection.java b/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/SSBasedInspection.java index 91a81d4bd487..27b886e0a6ef 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/SSBasedInspection.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/SSBasedInspection.java @@ -286,7 +286,7 @@ public class SSBasedInspection extends LocalInspectionTool implements DynamicGro return removed; } - public InspectionMetaDataDialog createMetaDataDialog(Project project, @Nullable Configuration configuration) { + public InspectionMetaDataDialog createMetaDataDialog(Project project, @NotNull String profileName, @Nullable Configuration configuration) { final List configurations = getConfigurations(); final Function nameValidator = name -> { for (Configuration current : configurations) { @@ -298,9 +298,9 @@ public class SSBasedInspection extends LocalInspectionTool implements DynamicGro return null; }; if (configuration == null) { - return new InspectionMetaDataDialog(project, nameValidator); + return new InspectionMetaDataDialog(project, profileName, nameValidator); } - return new InspectionMetaDataDialog(project, nameValidator, configuration.getName(), configuration.getDescription(), + return new InspectionMetaDataDialog(project, profileName, nameValidator, configuration.getName(), configuration.getDescription(), configuration.getProblemDescriptor(), configuration.getSuppressId()); } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchFakeInspection.java b/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchFakeInspection.java index dcd8e6867581..d34a9eba32b4 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchFakeInspection.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchFakeInspection.java @@ -182,7 +182,7 @@ public class StructuralSearchFakeInspection extends LocalInspectionTool { return; } final SSBasedInspection inspection = SSBasedInspection.getStructuralSearchInspection(profile); - final InspectionMetaDataDialog dialog = inspection.createMetaDataDialog(project, myMainConfiguration); + final InspectionMetaDataDialog dialog = inspection.createMetaDataDialog(project, profile.getDisplayName(), myMainConfiguration); if (isCleanupAllowed()) { dialog.showCleanupOption(myMainConfiguration.isCleanup()); } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchProfileActionProvider.java b/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchProfileActionProvider.java index 9b435627634d..00fbdba1103d 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchProfileActionProvider.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchProfileActionProvider.java @@ -105,7 +105,7 @@ public class StructuralSearchProfileActionProvider extends InspectionProfileActi @NotNull InspectionProfileImpl profile) { final SSBasedInspection inspection = SSBasedInspection.getStructuralSearchInspection(profile); if (!ApplicationManager.getApplication().isUnitTestMode()) { - InspectionMetaDataDialog dialog = inspection.createMetaDataDialog(project, null); + InspectionMetaDataDialog dialog = inspection.createMetaDataDialog(project, profile.getDisplayName(), null); if (configuration instanceof ReplaceConfiguration) { dialog.showCleanupOption(false); }