From 3b1071b42be7780b4b15a5b9009260676a4761d2 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Wed, 22 Mar 2023 00:21:23 +0100 Subject: [PATCH] [FIR LT] Use FILLER_TOKENS instead of DOC_AND_COMMENT_TOKENS in startOffsetSkippingComments --- .../kotlin/diagnostics/LightTreePositioningStrategy.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategy.kt b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategy.kt index d5d030b2685..f2b1d6fe77e 100644 --- a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategy.kt +++ b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategy.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.diagnostics import com.intellij.lang.LighterASTNode -import com.intellij.openapi.util.Ref import com.intellij.openapi.util.TextRange import com.intellij.psi.TokenType import com.intellij.util.diff.FlyweightCapableTreeStructure @@ -107,7 +106,7 @@ val KtLightSourceElement.startOffsetSkippingComments: Int // The solution to find first non comment children will not work here. `treeStructure` can have different root // than original program. Because of that `startOffset` is relative and not in absolute value. - val comments = children.takeWhile { it.tokenType in DOC_AND_COMMENT_TOKENS } + val comments = children.takeWhile { it.tokenType in FILLER_TOKENS } return startOffset + comments.sumOf { it.textLength } }