Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IDEX-4129: scroll document to execution point #320

Merged
merged 1 commit into from
Feb 15, 2016
Merged

IDEX-4129: scroll document to execution point #320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions ...client/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/debug/DebuggerPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.google.inject.Singleton;
import com.google.web.bindery.event.shared.EventBus;
import com.google.web.bindery.event.shared.HandlerRegistration;

import org.eclipse.che.api.machine.gwt.client.events.ExtServerStateEvent;
import org.eclipse.che.api.machine.gwt.client.events.ExtServerStateHandler;
import org.eclipse.che.api.promises.client.Operation;
Expand Down Expand Up @@ -69,6 +68,9 @@
import org.eclipse.che.ide.ext.java.jdi.shared.Value;
import org.eclipse.che.ide.ext.java.jdi.shared.Variable;
import org.eclipse.che.ide.ext.java.shared.JarEntry;
import org.eclipse.che.ide.jseditor.client.document.Document;
import org.eclipse.che.ide.jseditor.client.text.TextPosition;
import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter;
import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter;
import org.eclipse.che.ide.project.node.FileReferenceNode;
import org.eclipse.che.ide.rest.AsyncRequestCallback;
Expand Down Expand Up @@ -323,7 +325,7 @@ private void onEventListReceived(@NotNull DebuggerEventList eventList) {
}

VirtualFile activeFile = null;
EditorPartPresenter activeEditor = editorAgent.getActiveEditor();
final EditorPartPresenter activeEditor = editorAgent.getActiveEditor();
if (activeEditor != null) {
activeFile = activeEditor.getEditorInput().getFile();
}
Expand Down Expand Up @@ -356,6 +358,7 @@ private void onEventListReceived(@NotNull DebuggerEventList eventList) {
@Override
public void onSuccess(VirtualFile result) {
breakpointManager.setCurrentBreakpoint(finalLocation.getLineNumber() - 1);
scrollEditorToExecutionPoint((EmbeddedTextEditorPresenter) editorAgent.getActiveEditor());
}

@Override
Expand All @@ -365,7 +368,9 @@ public void onFailure(Throwable caught) {
});
} else {
breakpointManager.setCurrentBreakpoint(location.getLineNumber() - 1);
scrollEditorToExecutionPoint((EmbeddedTextEditorPresenter) activeEditor);
}

getStackFrameDump();
changeButtonsEnableState(true);
}
Expand Down Expand Up @@ -998,4 +1003,13 @@ private boolean isDebuggerConnected() {
private void invalidateDebugInfo() {
debuggerInfo = EmptyDebuggerInfo.INSTANCE;
}

private void scrollEditorToExecutionPoint(EmbeddedTextEditorPresenter editor) {
Document document = editor.getDocument();

if (document != null) {
TextPosition newPosition = new TextPosition(executionPoint.getLineNumber(), 0);
document.setCursorPosition(newPosition);
}
}
}