From d24f468b482d849e9f7a1c38792499eb95f83178 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 23 Oct 2014 09:32:24 +0200 Subject: [PATCH] skip null TextAttributesKey when processing var arg (EA-59728) --- platform/usageView/src/com/intellij/usages/ChunkExtractor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/usageView/src/com/intellij/usages/ChunkExtractor.java b/platform/usageView/src/com/intellij/usages/ChunkExtractor.java index b9db68c69ce3..ceba6f18df09 100644 --- a/platform/usageView/src/com/intellij/usages/ChunkExtractor.java +++ b/platform/usageView/src/com/intellij/usages/ChunkExtractor.java @@ -282,6 +282,7 @@ public class ChunkExtractor { ) { return true; } + if (key == null) continue; final TextAttributesKey fallbackAttributeKey = key.getFallbackAttributeKey(); if (fallbackAttributeKey != null && isHighlightedAsComment(fallbackAttributeKey)) { return true; @@ -295,6 +296,7 @@ public class ChunkExtractor { if (key == DefaultLanguageHighlighterColors.STRING || key == SyntaxHighlighterColors.STRING) { return true; } + if (key == null) continue; final TextAttributesKey fallbackAttributeKey = key.getFallbackAttributeKey(); if (fallbackAttributeKey != null && isHighlightedAsString(fallbackAttributeKey)) { return true;