diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/ArrangementUtil.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/ArrangementUtil.java
index b53f24a14781..1ae9ca86d1ca 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/ArrangementUtil.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/ArrangementUtil.java
@@ -130,7 +130,7 @@ public class ArrangementUtil {
    * @param document      target document against which the ranges are built
    * @return              expanded range if possible; <code>null</code> otherwise
    */
-  @Nullable
+  @NotNull
   public static TextRange expandToLine(@NotNull TextRange initialRange, @NotNull Document document) {
     int startLine = document.getLineNumber(initialRange.getStartOffset());
     int startOffsetToUse = document.getLineStartOffset(startLine);
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 acf8cb418834..e4f64df63be1 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
@@ -27,5 +27,7 @@ import com.intellij.psi.codeStyle.arrangement.ArrangementEntry;
  */
 public enum ArrangementEntryType {
   
-  CLASS, FIELD, CONSTRUCTOR, METHOD, ENUM, INTERFACE
+  CLASS, FIELD, CONSTRUCTOR, METHOD, ENUM, INTERFACE,
+
+  CONST, VAR, PROPERTY, EVENT_HANDLER, STATIC_INIT
 }
diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementModifier.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementModifier.java
index 0ac9a4466a1c..fe710b9f55b1 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementModifier.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementModifier.java
@@ -25,5 +25,7 @@ public enum ArrangementModifier {
   PUBLIC, PROTECTED, PRIVATE, PACKAGE_PRIVATE,
   //endregion
   
-  STATIC, FINAL, TRANSIENT, VOLATILE, SYNCHRONIZED, ABSTRACT
+  STATIC, FINAL, TRANSIENT, VOLATILE, SYNCHRONIZED, ABSTRACT,
+
+  OVERRIDE // e.g. ActionScript keyword
 }