diff options
3 files changed, 11 insertions, 8 deletions
diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java index 3165209eb5d..1f700b1672c 100644 --- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java +++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java @@ -381,12 +381,12 @@ public class TextMultiCaretSelectionCommandsTest { @Test public void testStopMultiSelection_withMultiSelectionAndCaretAtBeginning_revokesSelectionAndKeepsFirstCaretOffset() throws Exception { - setSelection(new IRegion[] { new Region(0, 0), new Region(0, 7), new Region(L1_LEN, 7) }); - assertEquals(0, widget.getCaretOffset()); + setSelection(new IRegion[] { new Region(0, 7), new Region(L1_LEN, 7) }); + assertEquals(7, widget.getCaretOffset()); executeCommand(STOP_MULTI_SELECTION); - assertEquals(0, widget.getCaretOffset()); - assertArrayEquals(new IRegion[] { new Region(0, 0) }, getSelection()); + assertEquals(7, widget.getCaretOffset()); + assertArrayEquals(new IRegion[] { new Region(7, 0) }, getSelection()); } @Test diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/multiselection/AbstractMultiSelectionHandler.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/multiselection/AbstractMultiSelectionHandler.java index f16c20b8eca..e8f7a40eab1 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/multiselection/AbstractMultiSelectionHandler.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/multiselection/AbstractMultiSelectionHandler.java @@ -221,11 +221,15 @@ abstract class AbstractMultiSelectionHandler extends AbstractHandler { } protected int getCaretOffset() { - return getWidget().getCaretOffset(); + IRegion[] regions = getSelectedRegions(); + if (regions == null) { + return -1; + } + return regions[0].getOffset() + regions[0].getLength(); } - protected void setCaretOffset(int offset) { - getWidget().setCaretOffset(offset); + protected void setCaretOffset(int caretOffset) { + selectRegion(offsetAsCaretRegion(caretOffset)); } protected IRegion findNextMatch(IRegion region) throws ExecutionException { diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/multiselection/StopMultiSelectionHandler.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/multiselection/StopMultiSelectionHandler.java index 3672da17c69..46a75dcea03 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/multiselection/StopMultiSelectionHandler.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/multiselection/StopMultiSelectionHandler.java @@ -32,7 +32,6 @@ public class StopMultiSelectionHandler extends AbstractMultiSelectionHandler { private void stopMultiSelection() throws ExecutionException { int caretOffset = getCaretOffset(); selectRegion(offsetAsCaretRegion(caretOffset)); - setCaretOffset(caretOffset); setAnchorRegion(null); } } |