From 830bb8fb384e398b1ed2af540bf53995388092ad Mon Sep 17 00:00:00 2001 From: Alexander Doroshko Date: Mon, 15 Oct 2012 20:22:53 +0400 Subject: [PATCH] Option to group ActionScript property field with corresponding getter/setter --- .../arrangement/group/ArrangementGroupingType.java | 6 ++++-- .../DefaultArrangementSettingsRepresentationManager.java | 7 +++++++ .../src/messages/ApplicationBundle.properties | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/group/ArrangementGroupingType.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/group/ArrangementGroupingType.java index 81c0f62d041b..e38ae55da354 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/group/ArrangementGroupingType.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/group/ArrangementGroupingType.java @@ -24,8 +24,10 @@ package com.intellij.psi.codeStyle.arrangement.group; public enum ArrangementGroupingType { GETTERS_AND_SETTERS, - + OVERRIDDEN_METHODS, - DEPENDENT_METHODS + DEPENDENT_METHODS, + + GROUP_PROPERTY_FIELD_WITH_GETTER_SETTER } diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/settings/DefaultArrangementSettingsRepresentationManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/settings/DefaultArrangementSettingsRepresentationManager.java index a370db1f8ef1..6e429b3ade03 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/settings/DefaultArrangementSettingsRepresentationManager.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/settings/DefaultArrangementSettingsRepresentationManager.java @@ -43,12 +43,17 @@ public class DefaultArrangementSettingsRepresentationManager implements Arrangem // Types. ArrangementEntryType.FIELD, ArrangementEntryType.CONSTRUCTOR, ArrangementEntryType.METHOD, ArrangementEntryType.CLASS, ArrangementEntryType.INTERFACE, ArrangementEntryType.ENUM, + + ArrangementEntryType.STATIC_INIT, ArrangementEntryType.CONST, ArrangementEntryType.VAR, + ArrangementEntryType.PROPERTY, ArrangementEntryType.EVENT_HANDLER, // Visibility. ArrangementModifier.PUBLIC, ArrangementModifier.PROTECTED, ArrangementModifier.PACKAGE_PRIVATE, ArrangementModifier.PRIVATE, // Other common modifiers. ArrangementModifier.STATIC, ArrangementModifier.FINAL, + + ArrangementModifier.OVERRIDE, // Semi-common modifiers. ArrangementModifier.ABSTRACT, @@ -91,6 +96,8 @@ public class DefaultArrangementSettingsRepresentationManager implements Arrangem ApplicationBundle.message("arrangement.settings.groups.overridden.methods")); GROUPING_TYPES.put(ArrangementGroupingType.DEPENDENT_METHODS, ApplicationBundle.message("arrangement.settings.groups.dependent.methods")); + GROUPING_TYPES.put(ArrangementGroupingType.GROUP_PROPERTY_FIELD_WITH_GETTER_SETTER, + ApplicationBundle.message("arrangement.settings.groups.property.field")); assert GROUPING_TYPES.size() == ArrangementGroupingType.values().length; } diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index 044966a4cbfe..3c4dfa357fea 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -567,6 +567,7 @@ arrangement.action.rule.move.down.text=Move down arrangement.action.rule.move.down.description=Move selected arrangement rule down arrangement.settings.section.groups=Grouping rules arrangement.settings.section.match=Matching rules +arrangement.settings.groups.property.field=Group property field with corresponding getter/setter arrangement.settings.groups.dependent.methods=Keep dependent methods together arrangement.settings.groups.overridden.methods=Keep overridden methods together arrangement.settings.groups.getters.and.setters.together=Keep getters and setters together