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-82288 Merge dialog broken in current EAP 116.32

Browse Source
This commit is contained in:
irengrig
2012-03-06 15:11:21 +04:00
parent f9783d18e8
commit b361b10dbc
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/diff/impl/external/MultiLevelDiffTool.java
Vendored
+11 -5
View File
@@ -21,10 +21,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CustomShortcutSet;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.diff.DiffContent;
import com.intellij.openapi.diff.DiffRequest;
import com.intellij.openapi.diff.DiffTool;
import com.intellij.openapi.diff.DiffViewer;
import com.intellij.openapi.diff.*;
import com.intellij.openapi.diff.impl.CompositeDiffPanel;
import com.intellij.openapi.diff.impl.DiffUtil;
import com.intellij.openapi.keymap.KeymapManager;
@@ -161,10 +158,19 @@ public class MultiLevelDiffTool implements DiffTool, DiscloseMultiRequest {
AbstractProperty.AbstractPropertyContainer config = DiffManagerImpl.getInstanceEx().getProperties();
if (isFile && DiffManagerImpl.ENABLE_FILES.value(config)) return false;
if (! isFile && DiffManagerImpl.ENABLE_FOLDERS.value(config)) return false;
return true;
return ! (DiffViewerType.merge.equals(request.getType()) && contentsWriteable(request));
//return request.haveMultipleLayers();
}
private boolean contentsWriteable(DiffRequest request) {
final DiffContent[] contents = request.getContents();
for (DiffContent content : contents) {
if (content != null && content.getDocument().isWritable()) return true;
}
return false;
}
@Override
public DiffViewer createComponent(String title, DiffRequest request, Window window, Disposable parentDisposable) {
// should not be called for it