diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementEntryType.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementEntryType.java
index 8f4a6eeecb7a..773b7664f60b 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementEntryType.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementEntryType.java
@@ -31,5 +31,5 @@ public enum ArrangementEntryType {
 
   CONST, VAR, PROPERTY, EVENT_HANDLER, STATIC_INIT,
 
-  NAMESPACE
+  NAMESPACE, TRAIT
 }
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 6e429b3ade03..bfd647011ace 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
@@ -46,7 +46,9 @@ public class DefaultArrangementSettingsRepresentationManager implements Arrangem
 
       ArrangementEntryType.STATIC_INIT, ArrangementEntryType.CONST, ArrangementEntryType.VAR,
       ArrangementEntryType.PROPERTY, ArrangementEntryType.EVENT_HANDLER,
-      
+
+      ArrangementEntryType.NAMESPACE, ArrangementEntryType.TRAIT,
+
       // Visibility.
       ArrangementModifier.PUBLIC, ArrangementModifier.PROTECTED, ArrangementModifier.PACKAGE_PRIVATE, ArrangementModifier.PRIVATE,