MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

extend PyFrameAccessor to avoid instanceof (PY-22535)

Browse Source
This commit is contained in:
Liana.Bakradze
2017-02-14 11:04:15 +03:00
parent 9b00ed3e44
commit d508a6d17e
4 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/pydevSrc/com/jetbrains/python/debugger/PyFrameAccessor.java
+3
View File
@@ -2,6 +2,7 @@ package com.jetbrains.python.debugger;
import com.intellij.xdebugger.XSourcePosition;
import com.intellij.xdebugger.frame.XValueChildrenList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
@@ -31,4 +32,6 @@ public interface PyFrameAccessor {
XSourcePosition getSourcePositionForType(String type);
default void showNumericContainer(PyDebugValue value) {}
default void setDataChangedCallback(@NotNull Runnable runnable) {}
}
python/src/com/jetbrains/python/console/PydevConsoleCommunication.java
+15
View File
@@ -692,4 +692,19 @@ public class PydevConsoleCommunication extends AbstractConsoleCommunication impl
public void showNumericContainer(PyDebugValue value) {
PyViewNumericContainerAction.showNumericViewer(myProject, value);
}
@Override
public void setDataChangedCallback(@NotNull Runnable runnable) {
addCommunicationListener(new ConsoleCommunicationListener() {
@Override
public void commandExecuted(boolean more) {
runnable.run();
}
@Override
public void inputRequested() {
}
});
}
}
python/src/com/jetbrains/python/debugger/PyDebugProcess.java
+10
View File
@@ -1149,6 +1149,16 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr
PyViewNumericContainerAction.showNumericViewer(getProject(), value);
}
@Override
public void setDataChangedCallback(@NotNull Runnable runnable) {
getSession().addSessionListener(new XDebugSessionListener() {
@Override
public void stackFrameChanged() {
runnable.run();
}
});
}
@Nullable
private static XSourcePosition typeToPosition(PyType pyType) {
final PyClassType classType = PyUtil.as(pyType, PyClassType.class);
python/src/com/jetbrains/python/debugger/containerview/PyDataViewerPanel.java
+5 -27
View File
@@ -30,14 +30,13 @@ import com.intellij.ui.components.JBLabel;
import com.intellij.ui.table.JBTable;
import com.intellij.util.TextFieldCompletionProvider;
import com.intellij.util.ui.UIUtil;
import com.intellij.xdebugger.XDebugSession;
import com.intellij.xdebugger.XDebugSessionListener;
import com.intellij.xdebugger.frame.XNamedValue;
import com.intellij.xdebugger.frame.XValueChildrenList;
import com.jetbrains.python.PythonFileType;
import com.jetbrains.python.console.PydevConsoleCommunication;
import com.jetbrains.python.console.pydev.ConsoleCommunicationListener;
import com.jetbrains.python.debugger.*;
import com.jetbrains.python.debugger.ArrayChunk;
import com.jetbrains.python.debugger.PyDebugValue;
import com.jetbrains.python.debugger.PyDebuggerException;
import com.jetbrains.python.debugger.PyFrameAccessor;
import com.jetbrains.python.debugger.array.AsyncArrayTableModel;
import com.jetbrains.python.debugger.array.JBTableWithRowHeaders;
import org.jetbrains.annotations.NotNull;
@@ -83,28 +82,7 @@ public class PyDataViewerPanel extends JPanel {
}
private void setupChangeListener() {
if (myFrameAccessor instanceof PyDebugProcess) {
XDebugSession session = ((PyDebugProcess)myFrameAccessor).getSession();
session.addSessionListener(new XDebugSessionListener() {
@Override
public void stackFrameChanged() {
updateModel();
}
});
}
if (myFrameAccessor instanceof PydevConsoleCommunication) {
((PydevConsoleCommunication)myFrameAccessor).addCommunicationListener(new ConsoleCommunicationListener() {
@Override
public void commandExecuted(boolean more) {
ApplicationManager.getApplication().invokeLater(() -> updateModel());
}
@Override
public void inputRequested() {
}
});
}
myFrameAccessor.setDataChangedCallback(() -> ApplicationManager.getApplication().invokeLater(() -> updateModel()));
}
private void updateModel() {