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

EA-65692 - assert: FileDocumentManagerImpl.getDocument

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-03-02 19:31:20 +03:00
parent 8ace098ebb
commit 4ff5c2c3fa
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/diff/FileContent.java
+8 -1
View File
@@ -15,11 +15,13 @@
*/
package com.intellij.openapi.diff;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
@@ -45,7 +47,12 @@ public class FileContent extends DiffContent {
@Override
public Document getDocument() {
if (myDocument == null && DiffContentUtil.isTextFile(myFile)) {
myDocument = FileDocumentManager.getInstance().getDocument(myFile);
myDocument = ApplicationManager.getApplication().runReadAction(new Computable<Document>() {
@Override
public Document compute() {
return FileDocumentManager.getInstance().getDocument(myFile);
}
});
}
return myDocument;
}