From 4bc64b8014bee70d526d9d2c1f1a2ca000d4b3fe Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 20 Jun 2016 18:15:23 +0200 Subject: [PATCH] PsiElement.getNode() is nullable (EA-84534 - NPE: DocCommentConverterKt.content) (cherry picked from commit c3e38dd) --- j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt index 0210b4e1398..ab4d2257372 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt @@ -31,7 +31,7 @@ object EmptyDocCommentConverter: DocCommentConverter { fun PsiDocTag.content(): String = children - .dropWhile { it.node.elementType == JavaDocTokenType.DOC_TAG_NAME } + .dropWhile { it?.node?.elementType == JavaDocTokenType.DOC_TAG_NAME } .dropWhile { it is PsiWhiteSpace } - .filterNot { it.node.elementType == JavaDocTokenType.DOC_COMMENT_LEADING_ASTERISKS } + .filterNot { it?.node?.elementType == JavaDocTokenType.DOC_COMMENT_LEADING_ASTERISKS } .joinToString("") { it.text }