From a193c5ed261f6a511e2111a4f8b0d9a8d5cc6c9e Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 11 Oct 2010 15:55:33 +0400
Subject: [PATCH] enter in subscription expression (PY-1992)

---
 .../src/com/jetbrains/python/editor/PythonEnterHandler.java   | 3 ++-
 python/src/com/jetbrains/python/formatter/PyBlock.java        | 3 ++-
 python/testSrc/com/jetbrains/python/PyEditingTest.java        | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/python/src/com/jetbrains/python/editor/PythonEnterHandler.java b/python/src/com/jetbrains/python/editor/PythonEnterHandler.java
index 28c5405b9954..ebe513774863 100644
--- a/python/src/com/jetbrains/python/editor/PythonEnterHandler.java
+++ b/python/src/com/jetbrains/python/editor/PythonEnterHandler.java
@@ -31,7 +31,8 @@ public class PythonEnterHandler implements EnterHandlerDelegate {
     PyArgumentList.class,
     PyParameterList.class,
     PyFunction.class,
-    PySliceExpression.class
+    PySliceExpression.class,
+    PySubscriptionExpression.class
   };
 
   @Override
diff --git a/python/src/com/jetbrains/python/formatter/PyBlock.java b/python/src/com/jetbrains/python/formatter/PyBlock.java
index 38d213b37880..9d1bf5fb3f6e 100644
--- a/python/src/com/jetbrains/python/formatter/PyBlock.java
+++ b/python/src/com/jetbrains/python/formatter/PyBlock.java
@@ -46,7 +46,8 @@ public class PyBlock implements ASTBlock {
                                                                       PyElementTypes.PARAMETER_LIST,
                                                                       PyElementTypes.TUPLE_EXPRESSION,
                                                                       PyElementTypes.PARENTHESIZED_EXPRESSION,
-                                                                      PyElementTypes.SLICE_EXPRESSION);
+                                                                      PyElementTypes.SLICE_EXPRESSION,
+                                                                      PyElementTypes.SUBSCRIPTION_EXPRESSION);
 
   private static final TokenSet ourBrackets = TokenSet.create(PyTokenTypes.LPAR, PyTokenTypes.RPAR,
                                                               PyTokenTypes.LBRACE, PyTokenTypes.RBRACE,
diff --git a/python/testSrc/com/jetbrains/python/PyEditingTest.java b/python/testSrc/com/jetbrains/python/PyEditingTest.java
index 60556d11e405..23ae43a15ad5 100644
--- a/python/testSrc/com/jetbrains/python/PyEditingTest.java
+++ b/python/testSrc/com/jetbrains/python/PyEditingTest.java
@@ -146,6 +146,10 @@ public class PyEditingTest extends PyLightFixtureTestCase {
     doTestEnter("a = some_list[<caret>slice_start:slice_end]", "a = some_list[\n    slice_start:slice_end]");
   }
 
+  public void testEnterInSubscriptionExpression() {  // PY-1992
+    doTestEnter("a = some_list[<caret>slice_start]", "a = some_list[\n    slice_start]");
+  }
+
   private void doTestEnter(String before, final String after) {
     int pos = before.indexOf("<caret>");
     before = before.replace("<caret>", "");