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

Fixes after review (PY-9537)

Browse Source
This commit is contained in:
Elizaveta Shashkova
2017-09-25 21:04:30 +03:00
parent ddd7957dcf
commit a763a26102
8 changed files with 56 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/pydevSrc/com/jetbrains/python/debugger/pydev/ClientModeMultiProcessDebugger.java
+4 -4
View File
@@ -327,10 +327,10 @@ public class ClientModeMultiProcessDebugger implements ProcessDebugger {
}
@Override
public void setNextStatement(String threadId,
XSourcePosition sourcePosition,
String functionName,
PyDebugCallback<Pair<Boolean, String>> callback) {
public void setNextStatement(@NotNull String threadId,
@NotNull XSourcePosition sourcePosition,
@Nullable String functionName,
@NotNull PyDebugCallback<Pair<Boolean, String>> callback) {
debugger(threadId).setNextStatement(threadId, sourcePosition, functionName, callback);
}
python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
+4 -4
View File
@@ -362,10 +362,10 @@ public class MultiProcessDebugger implements ProcessDebugger {
}
@Override
public void setNextStatement(String threadId,
XSourcePosition sourcePosition,
String functionName,
PyDebugCallback<Pair<Boolean, String>> callback) {
public void setNextStatement(@NotNull String threadId,
@NotNull XSourcePosition sourcePosition,
@Nullable String functionName,
@NotNull PyDebugCallback<Pair<Boolean, String>> callback) {
debugger(threadId).setNextStatement(threadId, sourcePosition, functionName, callback);
}
python/pydevSrc/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
+4 -4
View File
@@ -81,10 +81,10 @@ public interface ProcessDebugger {
void resumeOrStep(String threadId, ResumeOrStepCommand.Mode mode);
void setNextStatement(String threadId,
XSourcePosition sourcePosition,
String functionName,
PyDebugCallback<Pair<Boolean, String>> callback);
void setNextStatement(@NotNull String threadId,
@NotNull XSourcePosition sourcePosition,
@Nullable String functionName,
@NotNull PyDebugCallback<Pair<Boolean, String>> callback);
void setTempBreakpoint(@NotNull String type, @NotNull String file, int line);
python/pydevSrc/com/jetbrains/python/debugger/pydev/ProtocolParser.java
+2 -2
View File
@@ -140,9 +140,9 @@ public class ProtocolParser {
String[] values = payload.split("\t");
if (values.length > 0) {
boolean success = values[0].equals("True");
String errorMessage = "Error: ";
String errorMessage = "Error";
if (values.length > 1) {
errorMessage += values[1];
errorMessage = errorMessage + ": " + values[1];
}
return new Pair<>(success, errorMessage);
}
python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
+4 -4
View File
@@ -402,10 +402,10 @@ public class RemoteDebugger implements ProcessDebugger {
}
@Override
public void setNextStatement(String threadId,
XSourcePosition sourcePosition,
String functionName,
PyDebugCallback<Pair<Boolean, String>> callback) {
public void setNextStatement(@NotNull String threadId,
@NotNull XSourcePosition sourcePosition,
@Nullable String functionName,
@NotNull PyDebugCallback<Pair<Boolean, String>> callback) {
final SetNextStatementCommand command = new SetNextStatementCommand(this, threadId, sourcePosition, functionName, callback);
execute(command);
}
python/pydevSrc/com/jetbrains/python/debugger/pydev/SetNextStatementCommand.java
+9 -7
View File
@@ -3,17 +3,19 @@ package com.jetbrains.python.debugger.pydev;
import com.intellij.openapi.util.Pair;
import com.intellij.xdebugger.XSourcePosition;
import com.jetbrains.python.debugger.PyDebuggerException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class SetNextStatementCommand extends AbstractThreadCommand {
private int myLine;
private String myFunctionName;
private final PyDebugCallback<Pair<Boolean, String>> myCallback;
@NotNull private final PyDebugCallback<Pair<Boolean, String>> myCallback;
@Nullable private String myFunctionName;
protected SetNextStatementCommand(RemoteDebugger debugger,
String threadId,
XSourcePosition sourcePosition,
String functionName,
PyDebugCallback<Pair<Boolean, String>> callback) {
protected SetNextStatementCommand(@NotNull RemoteDebugger debugger,
@NotNull String threadId,
@NotNull XSourcePosition sourcePosition,
@Nullable String functionName,
@NotNull PyDebugCallback<Pair<Boolean, String>> callback) {
super(debugger, SET_NEXT_STATEMENT, threadId);
myLine = sourcePosition.getLine();
myFunctionName = functionName;
python/src/com/jetbrains/python/debugger/PyDebugProcess.java
+3 -3
View File
@@ -545,14 +545,14 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr
}
public void startSetNextStatement(@Nullable XSuspendContext context,
XSourcePosition sourcePosition,
PyDebugCallback<Pair<Boolean, String>> callback) {
@NotNull XSourcePosition sourcePosition,
@NotNull PyDebugCallback<Pair<Boolean, String>> callback) {
if (!checkCanPerformCommands()) return;
dropFrameCaches();
if (isConnected()) {
String threadId = threadIdBeforeResumeOrStep(context);
for (PyThreadInfo suspendedThread : mySuspendedThreads) {
if (threadId == null || threadId.equals(suspendedThread.getId())) {
if (threadId != null && threadId.equals(suspendedThread.getId())) {
myDebugger.setNextStatement(threadId, sourcePosition, getFunctionName(sourcePosition), callback);
break;
}
python/src/com/jetbrains/python/debugger/PySetNextStatementAction.kt
+26 -23
View File
@@ -19,46 +19,47 @@ import com.intellij.codeInsight.hint.HintManager
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.CommonDataKeys
import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.ModalityState
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Pair
import com.intellij.util.ui.UIUtil
import com.intellij.xdebugger.XDebugSession
import com.intellij.xdebugger.impl.DebuggerSupport
import com.intellij.xdebugger.impl.XDebuggerUtilImpl
import com.intellij.xdebugger.impl.actions.DebuggerActionHandler
import com.intellij.xdebugger.impl.actions.XDebuggerActionBase
import com.intellij.xdebugger.impl.actions.XDebuggerSuspendedActionHandler
import com.jetbrains.python.debugger.pydev.PyDebugCallback
class PySetNextStatementAction : XDebuggerActionBase(true) {
private val LOG = Logger.getInstance("#com.jetbrains.python.debugger.PySetNextStatementAction")
private val mySetNextStatementActionHandler: XDebuggerSuspendedActionHandler
private val setNextStatementActionHandler: XDebuggerSuspendedActionHandler
init {
mySetNextStatementActionHandler = object : XDebuggerSuspendedActionHandler() {
setNextStatementActionHandler = object : XDebuggerSuspendedActionHandler() {
override fun perform(session: XDebugSession, dataContext: DataContext) {
val debugProcess = session.debugProcess
if (debugProcess is PyDebugProcess) {
val position = XDebuggerUtilImpl.getCaretPosition(session.project, dataContext) ?: return
val editor = CommonDataKeys.EDITOR.getData(dataContext) ?: FileEditorManager.getInstance(session.project).selectedTextEditor
debugProcess
.startSetNextStatement(debugProcess.getSession().suspendContext, position, object : PyDebugCallback<Pair<Boolean, String>> {
override fun ok(response: Pair<Boolean, String>) {
if (!response.first && editor != null) {
UIUtil.invokeLaterIfNeeded {
val debugProcess = session.debugProcess as? PyDebugProcess ?: return
val position = XDebuggerUtilImpl.getCaretPosition(session.project, dataContext) ?: return
val editor = CommonDataKeys.EDITOR.getData(dataContext) ?: FileEditorManager.getInstance(session.project).selectedTextEditor
val suspendContext = debugProcess.session.suspendContext
ApplicationManager.getApplication().executeOnPooledThread(Runnable {
debugProcess.startSetNextStatement(suspendContext, position, object : PyDebugCallback<Pair<Boolean, String>> {
override fun ok(response: Pair<Boolean, String>) {
if (!response.first && editor != null) {
ApplicationManager.getApplication().invokeLater(Runnable {
if (!editor.isDisposed) {
editor.caretModel.moveToOffset(position.offset)
HintManager.getInstance().showErrorHint(editor, response.second)
}
}
}, ModalityState.defaultModalityState())
}
}
override fun error(e: PyDebuggerException) {
LOG.error(e)
}
})
}
override fun error(e: PyDebuggerException) {
LOG.error(e)
}
})
})
}
override fun isEnabled(project: Project, event: AnActionEvent): Boolean {
@@ -67,11 +68,13 @@ class PySetNextStatementAction : XDebuggerActionBase(true) {
}
}
override fun getHandler(debuggerSupport: DebuggerSupport): DebuggerActionHandler {
return mySetNextStatementActionHandler
}
override fun getHandler(debuggerSupport: DebuggerSupport) = setNextStatementActionHandler
override fun isHidden(event: AnActionEvent): Boolean {
return !PyDebugSupportUtils.isPythonConfigurationSelected(event.getData(CommonDataKeys.PROJECT))
}
companion object {
private val LOG = Logger.getInstance("#com.jetbrains.python.debugger.PySetNextStatementAction")
}
}