From e334f693b2e5b7913a70fb1900c0eef2176aa050 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 31 May 2018 00:32:14 +0300 Subject: [PATCH] Minor: Do not place line markers in code fragments and in non-Kotlin files --- .../idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt | 6 ++++++ .../highlighter/KotlinSuspendCallLineMarkerProvider.kt.172 | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt index 93d2c77ba4b..2786c04f2b3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt @@ -55,6 +55,12 @@ class KotlinSuspendCallLineMarkerProvider : LineMarkerProvider { ProgressManager.checkCanceled() if (element !is KtExpression) continue + + val containingFile = element.containingFile + if (containingFile !is KtFile || containingFile is KtCodeFragment) { + continue + } + val lineNumber = element.getLineNumber() if (lineNumber in markedLineNumbers) continue if (!element.hasSuspendCalls()) continue diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt.172 b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt.172 index 26ad7843158..282be3f7b38 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt.172 +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt.172 @@ -56,6 +56,12 @@ class KotlinSuspendCallLineMarkerProvider : LineMarkerProvider { ProgressManager.checkCanceled() if (element !is KtExpression) continue + + val containingFile = element.containingFile + if (containingFile !is KtFile || containingFile is KtCodeFragment) { + continue + } + val lineNumber = element.getLineNumber() if (lineNumber in markedLineNumbers) continue if (!element.hasSuspendCalls()) continue