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

merge: mark files dirty in MergeApplication

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-08-20 20:27:53 +03:00
parent efa82e57c5
commit 0d409b8184
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/applications/MergeApplication.java
+2 -6
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.diff.DiffBundle;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
@@ -49,8 +50,6 @@ public class MergeApplication extends ApplicationStarterBase {
}
public void processCommand(@NotNull String[] args, @Nullable String currentDirectory) throws Exception {
// TODO: try to guess 'right' project ?
final String path1 = args[1];
final String path2 = args[2];
final String path3 = args[3];
@@ -66,10 +65,7 @@ public class MergeApplication extends ApplicationStarterBase {
if (file3 == null) throw new Exception("Can't find file " + path3);
if (file4 == null) throw new Exception("Can't find file " + path4);
file1.refresh(false, true);
file2.refresh(false, true);
file3.refresh(false, true);
file4.refresh(false, true);
VfsUtil.markDirtyAndRefresh(false, false, false, file1, file2, file3, file4);
Project project = getProject();