From 8163dfb048ebe709b00c3fa1fa0c4ecbe945fd3d Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Mon, 17 Apr 2017 19:31:31 +0300 Subject: [PATCH] Fixes: - Don't write editor font name twice when old font settings are used - Return font family from getFontName() as expected by tests --- .../openapi/editor/colors/impl/AbstractColorsScheme.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java index be98e808a10f..2e94083d50a1 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java @@ -249,7 +249,7 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement @Override public String getEditorFontName() { - return getFont(EditorFontType.PLAIN).getFontName(); + return getFont(EditorFontType.PLAIN).getFamily(); } @Override @@ -601,10 +601,6 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement JdomKt.addOptionTag(parentNode, EDITOR_QUICK_JAVADOC_FONT_SIZE, getQuickDocFontSize().toString()); } - if (useOldFontFormat) { - JdomKt.addOptionTag(parentNode, EDITOR_FONT_NAME, myFontPreferences.getFontFamily()); - } - Element colorElements = new Element(COLORS_ELEMENT); Element attrElements = new Element(ATTRIBUTES_ELEMENT);