diff options
Diffstat (limited to 'platform/lang-api/src/com/intellij/psi/codeStyle')
2 files changed, 4 insertions, 9 deletions
diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java index c6d4c738c1fd..fdc9a662df1d 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java @@ -31,7 +31,6 @@ import org.jdom.Element; } ) public class LegacyCodeStyleSettingsManager implements PersistentStateComponent<Element> { - private Element myState; @Override diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementSectionRule.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementSectionRule.java index 9e9e9c0caa0f..2f7249f9d22d 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementSectionRule.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementSectionRule.java @@ -53,7 +53,7 @@ public class ArrangementSectionRule implements Cloneable { } public static ArrangementSectionRule create(@Nullable String start, @Nullable String end, @NotNull StdArrangementMatchRule... rules) { - return create(start, end, ContainerUtil.newArrayList(rules)); + return create(start, end, rules.length == 0 ? ContainerUtil.<StdArrangementMatchRule>emptyList() : ContainerUtil.newArrayList(rules)); } public static ArrangementSectionRule create(@Nullable String start, @Nullable String end, @NotNull List<StdArrangementMatchRule> rules) { @@ -68,14 +68,10 @@ public class ArrangementSectionRule implements Cloneable { return new ArrangementSectionRule(start, end, matchRules); } - @Nullable - private static StdArrangementMatchRule createSectionRule(@Nullable String comment, @NotNull ArrangementSettingsToken token) { - if (StringUtil.isEmpty(comment)) { - return null; - } - final ArrangementAtomMatchCondition type = new ArrangementAtomMatchCondition(token); + @NotNull + private static StdArrangementMatchRule createSectionRule(@NotNull String comment, @NotNull ArrangementSettingsToken token) { final ArrangementAtomMatchCondition text = new ArrangementAtomMatchCondition(StdArrangementTokens.Regexp.TEXT, comment); - final ArrangementMatchCondition condition = ArrangementUtil.combine(type, text); + final ArrangementMatchCondition condition = ArrangementUtil.combine(new ArrangementAtomMatchCondition(token), text); return new StdArrangementMatchRule(new StdArrangementEntryMatcher(condition)); } |