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

[diff]: remove hacky code with write-once document and add WriteAction

Browse Source
This commit is contained in:
Nadya Zabrodina
2017-05-17 17:22:53 +03:00
parent 570528accd
commit 8b481db96f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/tool/ApplyPatchViewer.java
+3 -3
View File
@@ -36,6 +36,7 @@ import com.intellij.icons.AllIcons;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.ex.ActionUtil;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.command.UndoConfirmationPolicy;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.diff.DiffBundle;
@@ -43,7 +44,6 @@ import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.event.VisibleAreaListener;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.ex.EditorMarkupModel;
import com.intellij.openapi.editor.impl.DocumentImpl;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.BooleanGetter;
@@ -102,7 +102,7 @@ class ApplyPatchViewer implements DataProvider, Disposable {
DocumentContent resultContent = request.getResultContent();
DocumentContent patchContent = DiffContentFactory.getInstance().create(new DocumentImpl("", true), resultContent);
DocumentContent patchContent = DiffContentFactory.getInstance().create(EditorFactory.getInstance().createDocument(""), resultContent);
myResultHolder = TextEditorHolder.create(myProject, resultContent);
myPatchHolder = TextEditorHolder.create(myProject, patchContent);
@@ -302,7 +302,7 @@ class ApplyPatchViewer implements DataProvider, Disposable {
Document patchDocument = myPatchEditor.getDocument();
patchDocument.setText(builder.getPatchContent());
WriteAction.run(() -> patchDocument.setText(builder.getPatchContent()));
LineNumberConvertor convertor1 = builder.getLineConvertor1();
LineNumberConvertor convertor2 = builder.getLineConvertor2();