From 9299ca2491231bb47acf14ff3adb881fac82fb1b Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 28 Nov 2012 17:50:03 +0400 Subject: [PATCH] IDEA-95452 -1: -1 java.lang.AssertionError: -1 --- .../src/com/intellij/openapi/editor/impl/EditorImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index 125f5f806e2f..86a2d2b81b60 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -3262,10 +3262,11 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi int lineHeight = myLineHeight; if (lineHeight == -1) { FontMetrics fontMetrics = myEditorComponent.getFontMetrics(myScheme.getFont(EditorFontType.PLAIN)); - lineHeight = (int)(fontMetrics.getHeight() * (isOneLineMode() ? 1 : myScheme.getLineSpacing())); - if (lineHeight == 0) { - lineHeight = fontMetrics.getHeight(); - if (lineHeight == 0) { + int fontMetricsHeight = fontMetrics.getHeight(); + lineHeight = (int)(fontMetricsHeight * (isOneLineMode() ? 1 : myScheme.getLineSpacing())); + if (lineHeight <= 0) { + lineHeight = fontMetricsHeight; + if (lineHeight <= 0) { lineHeight = 12; } }