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: use passed FileType - fix typo

Browse Source 
follow-up: 4fd30ddb1b
This commit is contained in:
Aleksey Pivovarov
2017-04-05 17:01:28 +03:00
parent 18c4f549a2
commit 1c445b6a24
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
-9
View File
@@ -18,7 +18,6 @@ package com.intellij.openapi.diff.impl.settings;
import com.intellij.application.options.colors.ColorAndFontSettingsListener;
import com.intellij.application.options.colors.PreviewPanel;
import com.intellij.diff.DiffContentFactory;
import com.intellij.diff.DiffContext;
import com.intellij.diff.contents.DiffContent;
import com.intellij.diff.requests.ContentDiffRequest;
@@ -30,14 +29,12 @@ import com.intellij.diff.util.DiffUtil;
import com.intellij.diff.util.TextDiffTypeFactory.TextDiffTypeImpl;
import com.intellij.diff.util.ThreeSide;
import com.intellij.openapi.diff.DiffBundle;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.LogicalPosition;
import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.editor.event.*;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.ex.util.EditorUtil;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.ui.IdeBorderFactory;
@@ -112,12 +109,6 @@ class DiffPreviewPanel implements PreviewPanel {
myContents = Arrays.asList(DiffPreviewProvider.getContents());
}
private static DiffContent convert(@NotNull com.intellij.openapi.diff.DiffContent content) {
Document document = content.getDocument();
FileType fileType = content.getContentType();
return DiffContentFactory.getInstance().create(null, document, fileType);
}
@NotNull
@Override
public List<DiffContent> getContents() {
platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java
+3 -3
View File
@@ -51,9 +51,9 @@ public abstract class DiffPreviewProvider {
@NotNull String right,
@NotNull FileType fileType) {
return new DiffContent[]{
createContent(left, StdFileTypes.JAVA),
createContent(center, StdFileTypes.JAVA),
createContent(right, StdFileTypes.JAVA)};
createContent(left, fileType),
createContent(center, fileType),
createContent(right, fileType)};
}
@NotNull