diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-25 20:12:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-24 20:55:36 +0000 |
| commit | 6044be7330c93bc8dacb0f63e62da8029f39a16f (patch) | |
| tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /platform/platform-impl/src/com/intellij/openapi/editor/impl/BorderEffect.java | |
| parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
| parent | e5266e2343c8d275d79fa0be725180d0fe3a993c (diff) | |
| download | idea-6044be7330c93bc8dacb0f63e62da8029f39a16f.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/editor/impl/BorderEffect.java')
| -rw-r--r-- | platform/platform-impl/src/com/intellij/openapi/editor/impl/BorderEffect.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/BorderEffect.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/BorderEffect.java index cc1a23f6f8e5..2872699c8012 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/BorderEffect.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/BorderEffect.java @@ -86,6 +86,8 @@ public class BorderEffect { markupModel.processRangeHighlightersOverlappingWith(myStartOffset, myEndOffset, new Processor<RangeHighlighterEx>() { @Override public boolean process(RangeHighlighterEx rangeHighlighter) { + if (!rangeHighlighter.getEditorFilter().avaliableIn(myEditor)) return true; + TextAttributes textAttributes = rangeHighlighter.getTextAttributes(); if (isBorder(textAttributes) && intersectsRange(rangeHighlighter)) { paintBorder(rangeHighlighter, textAttributes); |