restore changes reverted because of failed push

This commit is contained in:
Dmitry Jemerov
2011-01-27 12:11:23 +01:00
parent 282a6491c7
commit 1a5a291880
2 changed files with 3 additions and 2 deletions
@@ -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 == ']';
}
@@ -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;
}