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

[debugger] differentiate source of breakpoint toggling, IDEA-349250

Browse Source 
Differentiate toggling by gutter click (automagical selection of the best breakpoint variant) and by shortcut (selection of the nearest breakpoint by caret position).

Toggling from gutter doesn't move the caret and tries to choose the best breakpoint variant (not yet chooses, but work in progress).
Toggling by shortcut can move the caret and chooses the nearest breakpoint variant.

GitOrigin-RevId: 8f4f68b5ed57155907f1f0dd2447a6813a84e4ca
This commit is contained in:
Vladimir Parfinenko
2024-03-28 15:13:12 +00:00
committed by intellij-monorepo-bot
parent 2d47a09903
commit 82964a08f5
10 changed files with 81 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
+6 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.modcommand.ActionContext;
import com.intellij.model.psi.PsiSymbolReference;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
@@ -618,7 +619,11 @@ public interface CodeInsightTestFixture extends IdeaProjectTestFixture {
void type(@NotNull String s);
void performEditorAction(@NotNull String actionId);
default void performEditorAction(@NotNull String actionId) {
performEditorAction(actionId, null);
}
void performEditorAction(@NotNull String actionId, @Nullable AnActionEvent actionEvent);
/**
* If the action is visible and enabled, perform it.
platform/testFramework/src/com/intellij/testFramework/fixtures/EditorTestFixture.java
+5 -2
View File
@@ -126,11 +126,14 @@ public class EditorTestFixture {
}
public boolean performEditorAction(@NotNull String actionId) {
DataContext dataContext = getEditorDataContext();
return performEditorAction(actionId, null);
}
public boolean performEditorAction(@NotNull String actionId, @Nullable AnActionEvent actionEvent) {
ActionManagerEx managerEx = ActionManagerEx.getInstanceEx();
AnAction action = managerEx.getAction(actionId);
AnActionEvent event = new AnActionEvent(null, dataContext, ActionPlaces.UNKNOWN, new Presentation(), managerEx, 0);
AnActionEvent event = actionEvent != null ? actionEvent
: new AnActionEvent(null, getEditorDataContext(), ActionPlaces.UNKNOWN, new Presentation(), managerEx, 0);
PerformWithDocumentsCommitted.commitDocumentsIfNeeded(action, event);
ActionUtil.performDumbAwareUpdate(action, event, false);
if (event.getPresentation().isEnabled()) {
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+2 -2
View File
@@ -994,9 +994,9 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
}
@Override
public void performEditorAction(@NotNull String actionId) {
public void performEditorAction(@NotNull String actionId, @Nullable AnActionEvent actionEvent) {
assertInitialized();
EdtTestUtil.runInEdtAndWait(() -> myEditorTestFixture.performEditorAction(actionId));
EdtTestUtil.runInEdtAndWait(() -> myEditorTestFixture.performEditorAction(actionId, actionEvent));
}
@NotNull
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerLineChangeHandler.kt
+1 -1
View File
@@ -61,7 +61,7 @@ open class XDebuggerLineChangeIconProvider(val project: Project) {
open suspend fun getIcon(position: XSourcePositionImpl, editor: Editor): Icon? {
return readAction {
blockingContextToIndicator {
val types = XBreakpointUtil.getAvailableLineBreakpointTypes(project, position, editor)
val types = XBreakpointUtil.getAvailableLineBreakpointTypes(project, position, false, editor)
types.firstOrNull()?.enabledIcon
}
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java
+23 -9
View File
@@ -143,7 +143,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
final int line,
final boolean temporary) {
XSourcePositionImpl position = XSourcePositionImpl.create(file, line);
return toggleAndReturnLineBreakpoint(project, Collections.singletonList(type), position, temporary, null, true);
return toggleAndReturnLineBreakpoint(project, Collections.singletonList(type), position, false, temporary, null, true);
}
/**
@@ -278,16 +278,30 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
return bestBreakpoint;
}
/**
* @deprecated use {@link #toggleAndReturnLineBreakpoint(Project, List, XSourcePosition, boolean, boolean, Editor, boolean)}
*/
@Deprecated
@NotNull
public static Promise<@Nullable XLineBreakpoint> toggleAndReturnLineBreakpoint(@NotNull final Project project,
@NotNull List<? extends XLineBreakpointType> types,
@NotNull final XSourcePosition position,
final boolean temporary,
@Nullable final Editor editor,
boolean canRemove) {
@NotNull List<? extends XLineBreakpointType> types,
@NotNull final XSourcePosition position,
final boolean temporary,
@Nullable final Editor editor,
boolean canRemove) {
return toggleAndReturnLineBreakpoint(project, types, position, true, temporary, editor, canRemove);
}
@NotNull
public static Promise<@Nullable XLineBreakpoint> toggleAndReturnLineBreakpoint(@NotNull final Project project,
@NotNull List<? extends XLineBreakpointType> types,
@NotNull final XSourcePosition position,
boolean selectVariantByPositionColumn,
final boolean temporary,
@Nullable final Editor editor,
boolean canRemove) {
final VirtualFile file = position.getFile();
final int line = position.getLine();
final int caretOffset = position.getOffset();
final XBreakpointManager breakpointManager = XDebuggerManager.getInstance(project).getBreakpointManager();
Promise<List<? extends XLineBreakpointType.XLineBreakpointVariant>> variantsAsync = getLineBreakpointVariants(project, types, position);
@@ -295,7 +309,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
return variantsAsync.then(variantsWithAll -> {
var variants = variantsWithAll.stream().filter(v -> !v.isMultiVariant()).toList();
var breakpointOrVariant = getBestMatchingBreakpoint(caretOffset,
var breakpointOrVariant = getBestMatchingBreakpoint(selectVariantByPositionColumn ? position.getOffset() : 0,
Stream.concat(
types.stream().flatMap(t -> breakpointManager.findBreakpointsAtLine(t, file, line).stream()),
variants.stream()).iterator(),
@@ -381,7 +395,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
}
}
final int defaultIndex = getIndexOfBestMatchingInlineVariant(caretOffset, variants);
final int defaultIndex = getIndexOfBestMatchingInlineVariant(position.getOffset(), variants);
final MySelectionListener selectionListener = new MySelectionListener();
BaseListPopupStep<XLineBreakpointType.XLineBreakpointVariant> step =
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/AddLineBreakpointAction.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class AddLineBreakpointAction extends DumbAwareAction {
if (editor == null) return;
XSourcePosition position = getLineBreakpointPosition(e);
assert position != null;
XBreakpointUtil.toggleLineBreakpoint(project, position, editor, false, false, true)
XBreakpointUtil.toggleLineBreakpoint(project, position, false, editor, false, false, true)
.onSuccess(bp -> {
if (bp != null && isConditional()) {
EditorGutterComponentEx gutter = (EditorGutterComponentEx)editor.getGutter();
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XToggleLineBreakpointActionHandler.java
+1
View File
@@ -73,6 +73,7 @@ public class XToggleLineBreakpointActionHandler extends DebuggerActionHandler {
if (processedLines.add(position.getLine())) {
XBreakpointUtil.toggleLineBreakpoint(project,
position,
!isFromGutterClick,
editor,
isAltClick || myTemporary,
!isFromGutterClick,
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointUtil.java
+40 -12
View File
@@ -145,6 +145,24 @@ public final class XBreakpointUtil {
return null;
}
/**
* Toggle line breakpoint with editor support:
* - unfolds folded block on the line
* - if folded, checks if line breakpoints could be toggled inside folded text
*
* @deprecated use {@link #toggleLineBreakpoint(Project, XSourcePosition, boolean, Editor, boolean, boolean, boolean)}
*/
@Deprecated
@NotNull
public static Promise<@Nullable XLineBreakpoint> toggleLineBreakpoint(@NotNull Project project,
@NotNull XSourcePosition position,
@Nullable Editor editor,
boolean temporary,
boolean moveCaret,
boolean canRemove) {
return toggleLineBreakpoint(project, position, true, editor, temporary, moveCaret, canRemove);
}
/**
* Toggle line breakpoint with editor support:
* - unfolds folded block on the line
@@ -152,23 +170,24 @@ public final class XBreakpointUtil {
*/
@NotNull
public static Promise<@Nullable XLineBreakpoint> toggleLineBreakpoint(@NotNull Project project,
@NotNull XSourcePosition position,
@Nullable Editor editor,
boolean temporary,
boolean moveCaret,
boolean canRemove) {
Pair<List<XLineBreakpointType>, Integer> info = getAvailableLineBreakpointInfo(project, position, editor);
@NotNull XSourcePosition position,
boolean selectVariantByPositionColumn,
@Nullable Editor editor,
boolean temporary,
boolean moveCaret,
boolean canRemove) {
Pair<List<XLineBreakpointType>, Integer> info = getAvailableLineBreakpointInfo(project, position, selectVariantByPositionColumn, editor);
List<XLineBreakpointType> typeWinner = info.first;
int lineWinner = info.second;
int lineStart = position.getLine();
if (typeWinner.isEmpty()) {
return rejectedPromise(new RuntimeException("Cannot find appropriate type"));
}
int lineStart = position.getLine();
XSourcePosition winPosition = (lineStart == lineWinner) ? position : XSourcePositionImpl.create(position.getFile(), lineWinner);
Promise<XLineBreakpoint> res =
XDebuggerUtilImpl.toggleAndReturnLineBreakpoint(project, typeWinner, winPosition, temporary, editor, canRemove);
XDebuggerUtilImpl.toggleAndReturnLineBreakpoint(project, typeWinner, winPosition, selectVariantByPositionColumn, temporary, editor, canRemove);
if (editor != null && lineStart != lineWinner) {
int offset = editor.getDocument().getLineStartOffset(lineWinner);
@@ -181,13 +200,21 @@ public final class XBreakpointUtil {
}
public static List<XLineBreakpointType> getAvailableLineBreakpointTypes(@NotNull Project project,
@NotNull XSourcePosition position,
@NotNull XSourcePosition linePosition,
@Nullable Editor editor) {
return getAvailableLineBreakpointInfo(project, position, editor).first;
return getAvailableLineBreakpointTypes(project, linePosition, false, editor);
}
public static List<XLineBreakpointType> getAvailableLineBreakpointTypes(@NotNull Project project,
@NotNull XSourcePosition position,
boolean selectTypeByPositionColumn,
@Nullable Editor editor) {
return getAvailableLineBreakpointInfo(project, position, selectTypeByPositionColumn, editor).first;
}
private static Pair<List<XLineBreakpointType>, Integer> getAvailableLineBreakpointInfo(@NotNull Project project,
@NotNull XSourcePosition position,
boolean selectTypeByPositionColumn,
@Nullable Editor editor) {
int lineStart = position.getLine();
VirtualFile file = position.getFile();
@@ -196,9 +223,10 @@ public final class XBreakpointUtil {
return Pair.create(Collections.emptyList(), -1);
}
// for folded text check each line and find out type with the biggest priority
// for folded text check each line and find out type with the biggest priority,
// do it unless we were asked to select type strictly by caret position
int linesEnd = lineStart;
if (editor != null) {
if (editor != null && !selectTypeByPositionColumn) {
FoldRegion region = FoldingUtil.findFoldRegionStartingAtLine(editor, lineStart);
if (region != null && !region.isExpanded()) {
linesEnd = region.getDocument().getLineNumber(region.getEndOffset());
plugins/ide-features-trainer/src/training/learn/lesson/general/run/CommonDebugLesson.kt
+1 -1
View File
@@ -341,7 +341,7 @@ abstract class CommonDebugLesson(id: String) : KLesson(id, LessonsBundle.message
val line = logicalPosition.line
val createPosition = XDebuggerUtil.getInstance().createPosition(virtualFile, line)
?: error("Can't create source position: $line at $virtualFile")
XBreakpointUtil.toggleLineBreakpoint(project, createPosition, editor, false, false, true)
XBreakpointUtil.toggleLineBreakpoint(project, createPosition, false, editor, false, false, true)
//breakpointManager.addLineBreakpoint()
}
}
plugins/ide-features-trainer/src/training/onboarding/NewProjectOnboardingTipsImpl.kt
+1 -1
View File
@@ -82,7 +82,7 @@ private fun installTipsInFirstEditor(editor: Editor, project: Project, info: Onb
if (offset != null) {
val position = XDebuggerUtil.getInstance().createPositionByOffset(file, offset) ?: return
XBreakpointUtil.toggleLineBreakpoint(project, position, editor, false, false, true)
XBreakpointUtil.toggleLineBreakpoint(project, position, true, editor, false, false, true)
}
val pathToRunningFile = file.path