From 1a5a291880530a24513a76ec850ea29950ce45f6 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 27 Jan 2011 12:11:23 +0100 Subject: [PATCH] restore changes reverted because of failed push --- .../jetbrains/python/editor/PyEnterBetweenBracketsHandler.java | 2 +- python/src/com/jetbrains/python/editor/PythonEnterHandler.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/python/src/com/jetbrains/python/editor/PyEnterBetweenBracketsHandler.java b/python/src/com/jetbrains/python/editor/PyEnterBetweenBracketsHandler.java index a97237fb33b2..0ceb1e79eb2e 100644 --- a/python/src/com/jetbrains/python/editor/PyEnterBetweenBracketsHandler.java +++ b/python/src/com/jetbrains/python/editor/PyEnterBetweenBracketsHandler.java @@ -6,7 +6,7 @@ import com.intellij.codeInsight.editorActions.enter.EnterBetweenBracesHandler; * @author yole */ public class PyEnterBetweenBracketsHandler extends EnterBetweenBracesHandler { - // TODO yole, fix compile @Override + @Override protected boolean isBracePair(char c1, char c2) { return c1 == '[' && c2 == ']'; } diff --git a/python/src/com/jetbrains/python/editor/PythonEnterHandler.java b/python/src/com/jetbrains/python/editor/PythonEnterHandler.java index 0d1581b4c1a1..e13480e7cfbe 100644 --- a/python/src/com/jetbrains/python/editor/PythonEnterHandler.java +++ b/python/src/com/jetbrains/python/editor/PythonEnterHandler.java @@ -7,6 +7,7 @@ import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; +import com.intellij.openapi.editor.actions.SplitLineAction; import com.intellij.openapi.util.Ref; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; @@ -46,7 +47,7 @@ public class PythonEnterHandler implements EnterHandlerDelegate { if (!(file instanceof PyFile)) { return Result.Continue; } - final Boolean isSplitLine = null; // TODO yole, fix compile //DataManager.getInstance().loadFromDataContext(dataContext, SplitLineAction.SPLIT_LINE_KEY); + final Boolean isSplitLine = DataManager.getInstance().loadFromDataContext(dataContext, SplitLineAction.SPLIT_LINE_KEY); if (isSplitLine != null) { return Result.Continue; }