MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: fix "Jump To Source" from diff for change from VCS

Browse Source 
set highlightFile from FilePath
This commit is contained in:
Aleksey Pivovarov
2015-04-10 19:31:34 +03:00
parent 7673ea89ce
commit 4a4e05dc9d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/contents/FileAwareDocumentContent.java
+4 -4
View File
@@ -11,7 +11,6 @@ import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.LineSeparator;
import org.jetbrains.annotations.NotNull;
@@ -63,7 +62,7 @@ public class FileAwareDocumentContent extends DocumentContentImpl {
private final Project myProject;
private Document myDocument;
private FileType myFileType;
private VirtualFile myLocalFile;
private VirtualFile myHighlightFile;
private LineSeparator mySeparator;
private Charset myCharset;
@@ -78,6 +77,7 @@ public class FileAwareDocumentContent extends DocumentContentImpl {
@NotNull
private Builder init(@NotNull FilePath path) {
path.refresh();
myHighlightFile = path.getVirtualFile();
myFileType = path.getFileType();
myCharset = path.getCharset(myProject);
return this;
@@ -85,7 +85,7 @@ public class FileAwareDocumentContent extends DocumentContentImpl {
@NotNull
private Builder init(@NotNull VirtualFile highlightFile) {
myLocalFile = highlightFile;
myHighlightFile = highlightFile;
myFileType = highlightFile.getFileType();
myCharset = highlightFile.getCharset();
return this;
@@ -111,7 +111,7 @@ public class FileAwareDocumentContent extends DocumentContentImpl {
@NotNull
public FileAwareDocumentContent build() {
if (FileTypes.UNKNOWN.equals(myFileType)) myFileType = PlainTextFileType.INSTANCE;
return new FileAwareDocumentContent(myProject, myDocument, myFileType, myLocalFile, mySeparator, myCharset);
return new FileAwareDocumentContent(myProject, myDocument, myFileType, myHighlightFile, mySeparator, myCharset);
}
}
}