From f87f6f474d5b57990764cd449bfdab613ad81bf1 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 28 Sep 2015 16:58:24 +0300 Subject: [PATCH] IDEA-111268 lst: respect code style in gutter popup --- .../intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java index 961aef00130a..8ad4bb199250 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java @@ -43,6 +43,7 @@ import com.intellij.openapi.editor.markup.LineMarkerRenderer; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.fileEditor.FileDocumentManager; +import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Pair; @@ -67,7 +68,8 @@ import java.util.ArrayList; import java.util.EventObject; import java.util.List; -import static com.intellij.diff.util.DiffUtil.*; +import static com.intellij.diff.util.DiffUtil.getDiffType; +import static com.intellij.diff.util.DiffUtil.getLineCount; /** * @author irengrig @@ -342,6 +344,9 @@ public class LineStatusTrackerDrawing { EditorEx uEditor = (EditorEx)EditorFactory.getInstance().createViewer(doc, tracker.getProject()); uEditor.setColorsScheme(editor.getColorsScheme()); + FileType fileType = tracker.getVirtualFile().getFileType(); + DiffUtil.setEditorCodeStyle(tracker.getProject(), uEditor, fileType); + EditorHighlighterFactory highlighterFactory = EditorHighlighterFactory.getInstance(); EditorHighlighter highlighter = highlighterFactory.createEditorHighlighter(tracker.getProject(), getFileName(tracker.getDocument())); uEditor.setHighlighter(highlighter);