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

IDEA-72454 hungs up after attempt to select text [more cases]

Browse Source
This commit is contained in:
Alexey Pegov
2011-08-31 18:19:25 +04:00
parent a6ce48bc18
commit f25c4eb3f1
4 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/PasteHandler.java
+14 -13
View File
@@ -69,10 +69,22 @@ public class PasteHandler extends EditorActionHandler implements EditorTextInser
return;
}
DataContext context = new DataContext() {
@Override
public Object getData(@NonNls String dataId) {
if (TRANSFERABLE_PROVIDER.equals(dataId)) {
return transferableProvider;
}
return dataContext.getData(dataId);
}
};
final Project project = editor.getProject();
if (project == null || editor.isColumnMode() || editor.getSelectionModel().hasBlockSelection()) {
if (myOriginalHandler != null) {
myOriginalHandler.execute(editor, dataContext);
myOriginalHandler.execute(editor, context);
}
return;
}
@@ -81,24 +93,13 @@ public class PasteHandler extends EditorActionHandler implements EditorTextInser
if (file == null) {
if (myOriginalHandler != null) {
myOriginalHandler.execute(editor, dataContext);
myOriginalHandler.execute(editor, context);
}
return;
}
document.startGuardedBlockChecking();
try {
DataContext context = new DataContext() {
@Override
public Object getData(@NonNls String dataId) {
if (TRANSFERABLE_PROVIDER.equals(dataId)) {
return transferableProvider;
}
return dataContext.getData(dataId);
}
};
for(PasteProvider provider: Extensions.getExtensions(EP_NAME)) {
if (provider.isPasteEnabled(context)) {
provider.performPaste(context);
platform/platform-api/src/com/intellij/openapi/editor/EditorModificationUtil.java
+7 -1
View File
@@ -169,8 +169,14 @@ public class EditorModificationUtil {
}
public static void pasteFromClipboardAsBlock(Editor editor) {
Transferable content = getClipboardContent(editor);
pasteTransferableAsBlock(editor, null);
}
public static void pasteTransferableAsBlock(Editor editor, @Nullable Transferable content) {
if (content == null) {
content = getClipboardContent(editor);
}
if (content != null) {
try {
int caretLine = editor.getCaretModel().getLogicalPosition().line;
platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteAction.java
+13 -3
View File
@@ -30,18 +30,28 @@ import com.intellij.openapi.editor.EditorModificationUtil;
import com.intellij.openapi.editor.actionSystem.EditorAction;
import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.util.Producer;
import java.awt.datatransfer.Transferable;
public class PasteAction extends EditorAction {
public static final String TRANSFERABLE_PROVIDER = "PasteTransferableProvider";
public PasteAction() {
super(new Handler());
}
private static class Handler extends EditorWriteActionHandler {
public void executeWriteAction(Editor editor, DataContext dataContext) {
Producer<Transferable> producer = (Producer<Transferable>)dataContext.getData(TRANSFERABLE_PROVIDER);
if (editor.isColumnMode() || editor.getSelectionModel().hasBlockSelection()) {
EditorModificationUtil.pasteFromClipboardAsBlock(editor);
} else {
editor.putUserData(EditorEx.LAST_PASTED_REGION, EditorModificationUtil.pasteFromClipboard(editor));
EditorModificationUtil.pasteTransferableAsBlock(editor, producer == null ? null : producer.produce());
}
else {
editor.putUserData(EditorEx.LAST_PASTED_REGION,
producer == null ? EditorModificationUtil.pasteFromClipboard(editor) :
EditorModificationUtil.pasteFromTransferrable(producer.produce(), editor));
}
}
}
platform/platform-impl/src/com/intellij/openapi/editor/actions/SimplePasteAction.java
+11 -2
View File
@@ -32,6 +32,9 @@ import com.intellij.openapi.editor.EditorModificationUtil;
import com.intellij.openapi.editor.actionSystem.EditorAction;
import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.util.Producer;
import java.awt.datatransfer.Transferable;
public class SimplePasteAction extends EditorAction {
public SimplePasteAction() {
@@ -48,10 +51,16 @@ public class SimplePasteAction extends EditorAction {
private static class Handler extends EditorWriteActionHandler {
public void executeWriteAction(Editor editor, DataContext dataContext) {
Producer<Transferable> producer = (Producer<Transferable>) dataContext.getData(PasteAction.TRANSFERABLE_PROVIDER);
if (editor.isColumnMode()) {
EditorModificationUtil.pasteFromClipboardAsBlock(editor);
EditorModificationUtil.pasteTransferableAsBlock(editor, producer == null ? null : producer.produce());
} else {
editor.putUserData(EditorEx.LAST_PASTED_REGION, EditorModificationUtil.pasteFromClipboard(editor));
editor.putUserData(EditorEx.LAST_PASTED_REGION,
producer == null ?
EditorModificationUtil.pasteFromClipboard(editor)
: EditorModificationUtil.pasteFromTransferrable(producer.produce(), editor));
}
}
}