MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-14 18:05:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Show inspection profile name in the title when adding or editing custom inspection

Browse Source 
GitOrigin-RevId: 0c44686658bd8b5ae3c34672fca983f63f38ad93
This commit is contained in:
Bas Leijdekkers
2023-11-14 17:40:08 +01:00
committed by intellij-monorepo-bot
parent 2960f7659b
commit de38ffbad9
8 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpFakeInspection.java
View File

@@ -179,7 +179,8 @@ public class CustomRegExpFakeInspection extends LocalInspectionTool {
return; return;
} }
final CustomRegExpInspection inspection = getRegExpInspection(profile); final CustomRegExpInspection inspection = getRegExpInspection(profile);
final InspectionMetaDataDialog dialog = inspection.createMetaDataDialog(project, myConfiguration); final InspectionMetaDataDialog dialog =
inspection.createMetaDataDialog(project, profile.getDisplayName(), myConfiguration);
if (isCleanupAllowed()) { if (isCleanupAllowed()) {
dialog.showCleanupOption(myConfiguration.isCleanup()); dialog.showCleanupOption(myConfiguration.isCleanup());
} }

6
RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpInspection.java
View File

@@ -188,7 +188,7 @@ public class CustomRegExpInspection extends LocalInspectionTool implements Dynam
} }
@NotNull @NotNull
public InspectionMetaDataDialog createMetaDataDialog(Project project, @Nullable RegExpInspectionConfiguration configuration) { public InspectionMetaDataDialog createMetaDataDialog(Project project, @NotNull String profileName, @Nullable RegExpInspectionConfiguration configuration) {
Function<String, @Nullable @NlsContexts.DialogMessage String> nameValidator = name -> { Function<String, @Nullable @NlsContexts.DialogMessage String> nameValidator = name -> {
for (RegExpInspectionConfiguration current : myConfigurations) { for (RegExpInspectionConfiguration current : myConfigurations) {
if ((configuration == null || !configuration.getUuid().equals(current.getUuid())) && if ((configuration == null || !configuration.getUuid().equals(current.getUuid())) &&
@@ -199,9 +199,9 @@ public class CustomRegExpInspection extends LocalInspectionTool implements Dynam
return null; return null;
}; };
if (configuration == 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()); configuration.getProblemDescriptor(), configuration.getSuppressId());
} }

5
RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpProfileActionProvider.java
View File

@@ -40,7 +40,8 @@ public class RegExpProfileActionProvider extends InspectionProfileActionProvider
@Override @Override
public void actionPerformed(@NotNull AnActionEvent e) { 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; if (!dialog.showAndGet()) return;
final RegExpInspectionConfiguration.InspectionPattern pattern = dialog.getPattern(); final RegExpInspectionConfiguration.InspectionPattern pattern = dialog.getPattern();
@@ -48,7 +49,7 @@ public class RegExpProfileActionProvider extends InspectionProfileActionProvider
final CustomRegExpInspection inspection = CustomRegExpInspection.getCustomRegExpInspection(profile); final CustomRegExpInspection inspection = CustomRegExpInspection.getCustomRegExpInspection(profile);
final Project project = e.getData(CommonDataKeys.PROJECT); final Project project = e.getData(CommonDataKeys.PROJECT);
if (project == null) return; if (project == null) return;
final InspectionMetaDataDialog metaDataDialog = inspection.createMetaDataDialog(project, null); final InspectionMetaDataDialog metaDataDialog = inspection.createMetaDataDialog(project, profile.getDisplayName(), null);
if (pattern.replacement() != null) { if (pattern.replacement() != null) {
metaDataDialog.showCleanupOption(false); metaDataDialog.showCleanupOption(false);
} }

2
platform/analysis-api/resources/messages/InspectionsBundle.properties
View File

@@ -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.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.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 checkbox.cleanup.inspection=&Cleanup inspection
label.inspection.name=Inspection name: label.inspection.name=Inspection name:
label.description=&Description: label.description=&Description:

6
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionMetaDataDialog.java
View File

@@ -38,11 +38,13 @@ public final class InspectionMetaDataDialog extends DialogWrapper {
private boolean showCleanupOption = false; private boolean showCleanupOption = false;
public InspectionMetaDataDialog(@NotNull Project project, public InspectionMetaDataDialog(@NotNull Project project,
@NotNull String profileName,
@NotNull Function<String, @Nullable @NlsContexts.DialogMessage String> nameValidator) { @NotNull Function<String, @Nullable @NlsContexts.DialogMessage String> nameValidator) {
this(project, nameValidator, null, null, null, null); this(project, profileName, nameValidator, null, null, null, null);
} }
public InspectionMetaDataDialog(@NotNull Project project, public InspectionMetaDataDialog(@NotNull Project project,
@NotNull String profileName,
@NotNull Function<String, @Nullable @NlsContexts.DialogMessage String> nameValidator, @NotNull Function<String, @Nullable @NlsContexts.DialogMessage String> nameValidator,
@NlsSafe String name, @NlsSafe String name,
@NlsSafe String description, @NlsSafe String description,
@@ -60,7 +62,7 @@ public final class InspectionMetaDataDialog extends DialogWrapper {
mySuppressIdTextField = new JTextField(suppressId); mySuppressIdTextField = new JTextField(suppressId);
myCleanupCheckbox = new JBCheckBox(InspectionsBundle.message("checkbox.cleanup.inspection")); myCleanupCheckbox = new JBCheckBox(InspectionsBundle.message("checkbox.cleanup.inspection"));
myNameValidator = nameValidator; myNameValidator = nameValidator;
setTitle(InspectionsBundle.message("dialog.title.user.defined.inspection")); setTitle(InspectionsBundle.message("dialog.title.user.defined.inspection", profileName));
} }
@Override @Override

6
platform/structuralsearch/source/com/intellij/structuralsearch/inspection/SSBasedInspection.java
View File

@@ -286,7 +286,7 @@ public class SSBasedInspection extends LocalInspectionTool implements DynamicGro
return removed; return removed;
} }
public InspectionMetaDataDialog createMetaDataDialog(Project project, @Nullable Configuration configuration) { public InspectionMetaDataDialog createMetaDataDialog(Project project, @NotNull String profileName, @Nullable Configuration configuration) {
final List<Configuration> configurations = getConfigurations(); final List<Configuration> configurations = getConfigurations();
final Function<String, @Nullable @NlsContexts.DialogMessage String> nameValidator = name -> { final Function<String, @Nullable @NlsContexts.DialogMessage String> nameValidator = name -> {
for (Configuration current : configurations) { for (Configuration current : configurations) {
@@ -298,9 +298,9 @@ public class SSBasedInspection extends LocalInspectionTool implements DynamicGro
return null; return null;
}; };
if (configuration == 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()); configuration.getProblemDescriptor(), configuration.getSuppressId());
} }

2
platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchFakeInspection.java
View File

@@ -182,7 +182,7 @@ public class StructuralSearchFakeInspection extends LocalInspectionTool {
return; return;
} }
final SSBasedInspection inspection = SSBasedInspection.getStructuralSearchInspection(profile); final SSBasedInspection inspection = SSBasedInspection.getStructuralSearchInspection(profile);
final InspectionMetaDataDialog dialog = inspection.createMetaDataDialog(project, myMainConfiguration); final InspectionMetaDataDialog dialog = inspection.createMetaDataDialog(project, profile.getDisplayName(), myMainConfiguration);
if (isCleanupAllowed()) { if (isCleanupAllowed()) {
dialog.showCleanupOption(myMainConfiguration.isCleanup()); dialog.showCleanupOption(myMainConfiguration.isCleanup());
} }

2
platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchProfileActionProvider.java
View File

@@ -105,7 +105,7 @@ public class StructuralSearchProfileActionProvider extends InspectionProfileActi
@NotNull InspectionProfileImpl profile) { @NotNull InspectionProfileImpl profile) {
final SSBasedInspection inspection = SSBasedInspection.getStructuralSearchInspection(profile); final SSBasedInspection inspection = SSBasedInspection.getStructuralSearchInspection(profile);
if (!ApplicationManager.getApplication().isUnitTestMode()) { if (!ApplicationManager.getApplication().isUnitTestMode()) {
InspectionMetaDataDialog dialog = inspection.createMetaDataDialog(project, null); InspectionMetaDataDialog dialog = inspection.createMetaDataDialog(project, profile.getDisplayName(), null);
if (configuration instanceof ReplaceConfiguration) { if (configuration instanceof ReplaceConfiguration) {
dialog.showCleanupOption(false); dialog.showCleanupOption(false);
} }