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

fix paste in text fields (case when selection exists before paste)

Browse Source 
fixes regression after commit f27254d
This commit is contained in:
Dmitry Batrak
2016-07-20 17:12:40 +03:00
parent e47f43512f
commit d700be3620
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaretModel.java
+15 -3
View File
@@ -16,14 +16,14 @@
package com.intellij.openapi.editor.textarea;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.event.CaretListener;
import com.intellij.openapi.editor.markup.TextAttributes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.text.BadLocationException;
import javax.swing.text.JTextComponent;
import javax.swing.text.*;
import java.util.Collections;
import java.util.List;
@@ -65,7 +65,19 @@ public class TextComponentCaretModel implements CaretModel {
@Override
public void moveToOffset(final int offset, boolean locateBeforeSoftWrap) {
myTextComponent.setCaretPosition(Math.min(offset, myTextComponent.getText().length()));
int targetOffset = Math.min(offset, myTextComponent.getText().length());
int currentPosition = myTextComponent.getCaretPosition();
// We try to preserve selection, to match EditorImpl behaviour.
// It's only possible though, if target offset is located at either end of existing selection.
if (targetOffset != currentPosition) {
if (targetOffset == myTextComponent.getCaret().getMark()) {
myTextComponent.setCaretPosition(currentPosition);
myTextComponent.moveCaretPosition(targetOffset);
}
else {
myTextComponent.setCaretPosition(targetOffset);
}
}
}
@Override