diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorPainter.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorPainter.java index 08c0be633551..121711675c5c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorPainter.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorPainter.java @@ -37,6 +37,7 @@ import com.intellij.ui.JBColor; import com.intellij.util.Processor; import com.intellij.util.ui.UIUtil; import gnu.trove.TFloatArrayList; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -283,7 +284,8 @@ class EditorPainter { } } - float paintLineLayoutWithEffect(Graphics2D g, LineLayout layout, float x, float y, Color effectColor, EffectType effectType) { + float paintLineLayoutWithEffect(Graphics2D g, LineLayout layout, float x, float y, + @Nullable Color effectColor, @Nullable EffectType effectType) { float initialX = x; for (LineLayout.VisualFragment fragment : layout.getFragmentsInVisualOrder(x)) { fragment.draw(g, x, y); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorView.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorView.java index c7212d497702..2ddae167d1ec 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorView.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorView.java @@ -299,7 +299,9 @@ public class EditorView implements Disposable { LineLayout getFoldRegionLayout(FoldRegion foldRegion) { LineLayout layout = foldRegion.getUserData(FOLD_REGION_TEXT_LAYOUT); if (layout == null) { - layout = new LineLayout(this, foldRegion.getPlaceholderText(), myEditor.getFoldingModel().getPlaceholderAttributes().getFontType(), + TextAttributes placeholderAttributes = myEditor.getFoldingModel().getPlaceholderAttributes(); + layout = new LineLayout(this, foldRegion.getPlaceholderText(), + placeholderAttributes == null ? Font.PLAIN : placeholderAttributes.getFontType(), myFontRenderContext); foldRegion.putUserData(FOLD_REGION_TEXT_LAYOUT, layout); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/VisualLineFragmentsIterator.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/VisualLineFragmentsIterator.java index 9340c473f275..9aec6168f619 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/VisualLineFragmentsIterator.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/VisualLineFragmentsIterator.java @@ -271,7 +271,9 @@ class VisualLineFragmentsIterator implements Iterator