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

IDEA-95372 Arrangement: Provide visual indication for duplicate rules

Browse Source
This commit is contained in:
Svetlana.Zemlyanskay
2014-09-11 12:20:29 +04:00
parent a367187f31
commit 8ebbce4ab9
2 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java
+38 -15
View File
@@ -527,35 +527,58 @@ public class ArrangementMatchingRulesControl extends JBTable {
private class MyValidator {
@Nullable
private String validate(int index) {
if (mySectionRuleManager == null || getModel().getSize() < index) {
if (getModel().getSize() < index) {
return null;
}
if (mySectionRuleManager != null) {
final ArrangementSectionRuleData data = extractSectionText(index);
if (data != null) {
return validateSectionRule(data, index);
}
}
final Object target = getModel().getElementAt(index);
if (target instanceof StdArrangementMatchRule) {
final Set<String> rules = ContainerUtil.newHashSet();
for (int i = 0; i < index; i++) {
final Object element = getModel().getElementAt(i);
if (element instanceof StdArrangementMatchRule) {
final StdArrangementMatchRule rule = (StdArrangementMatchRule)element;
rules.add(rule.toString());
}
}
if (rules.contains(target.toString())) {
return ApplicationBundle.message("arrangement.settings.validation.duplicate.matching.rule");
}
}
return null;
}
@Nullable
private String validateSectionRule(@NotNull ArrangementSectionRuleData data, int index) {
int startSectionIndex = -1;
final Set<String> rules = ContainerUtil.newHashSet();
final Set<String> sectionRules = ContainerUtil.newHashSet();
for (int i = 0; i < index; i++) {
final ArrangementSectionRuleData section = extractSectionText(i);
if (section != null) {
startSectionIndex = section.isSectionStart() ? i : -1;
if (StringUtil.isNotEmpty(section.getText())) {
rules.add(section.getText());
sectionRules.add(section.getText());
}
}
}
if (StringUtil.isNotEmpty(data.getText()) && sectionRules.contains(data.getText())) {
return ApplicationBundle.message("arrangement.settings.validation.duplicate.section.text");
}
final ArrangementSectionRuleData data = extractSectionText(index);
if (data != null) {
if (StringUtil.isNotEmpty(data.getText()) && rules.contains(data.getText())) {
return ApplicationBundle.message("arrangement.settings.validation.duplicate.section.text");
if (!data.isSectionStart()) {
if (startSectionIndex == -1) {
return ApplicationBundle.message("arrangement.settings.validation.end.section.rule.without.start");
}
if (!data.isSectionStart()) {
if (startSectionIndex == -1) {
return ApplicationBundle.message("arrangement.settings.validation.end.section.rule.without.start");
}
else if (startSectionIndex == index - 1) {
return ApplicationBundle.message("arrangement.settings.validation.empty.section.rule");
}
else if (startSectionIndex == index - 1) {
return ApplicationBundle.message("arrangement.settings.validation.empty.section.rule");
}
}
return null;
platform/platform-resources-en/src/messages/ApplicationBundle.properties
+1
View File
@@ -623,6 +623,7 @@ arrangement.settings.additional.force.rearrange.always=Always
arrangement.settings.additional.force.rearrange.never=Never
arrangement.settings.additional.force.rearrange.according.to.dialog=Use current mode (toggled in the Reformat Code dialog)
arrangement.settings.additional.title=Additional settings
arrangement.settings.validation.duplicate.matching.rule=Matching rule have to be unique in the current settings. Duplicated rules will be ignored.
arrangement.settings.validation.duplicate.section.text=Section text have to be unique in the current settings. Rule with duplicated text will be ignored.
arrangement.settings.validation.empty.section.rule=Section should contain at least one arrangement entry otherwise it will be never inserted.
arrangement.settings.validation.end.section.rule.without.start=Can not find start section rule for the current end rule.