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-215972 diff: use codestyle for specific language in diff editors

Browse Source 
GitOrigin-RevId: b3d815ad12a8a2296c098b6258934e0126332f23
This commit is contained in:
Aleksey Pivovarov
2019-06-11 18:04:56 +03:00
committed by intellij-monorepo-bot
parent 74a51d3301
commit 70be3096a2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+6
View File
@@ -51,6 +51,7 @@ import com.intellij.openapi.editor.highlighter.EditorHighlighter;
import com.intellij.openapi.editor.highlighter.EditorHighlighterFactory;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileEditor.impl.text.TextEditorImpl;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.PlainTextFileType;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
@@ -190,6 +191,11 @@ public class DiffUtil {
editor.getSettings().setTabSize(indentOptions.TAB_SIZE);
editor.getSettings().setUseTabCharacter(indentOptions.USE_TAB_CHARACTER);
}
Language language = content != null ? content.getUserData(DiffUserDataKeys.LANGUAGE) : null;
if (language == null) language = TextEditorImpl.getDocumentLanguage(editor);
editor.getSettings().setLanguage(language);
editor.getSettings().setCaretRowShown(false);
editor.reinitSettings();
}