From bd661fcf82a232beef4d5e69a929bbbe8fe4d46d Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Mon, 10 Jun 2019 17:25:43 +0900
Subject: [PATCH] Method sepatators: separate single-expression functions
 (KT-30782)

#KT-30782 Fixed
---
 .../idea/highlighter/markers/KotlinLineMarkerProvider.kt   | 2 +-
 idea/testData/codeInsight/lineMarker/MethodSeparators.kt   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
index 37d93fc6fd8..ea9ccef4e16 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
@@ -71,7 +71,7 @@ class KotlinLineMarkerProvider : LineMarkerProviderDescriptor() {
     private fun PsiElement?.canHaveSeparator() =
         this is KtFunction || this is KtClassInitializer || (this is KtProperty && !isLocal)
 
-    private fun PsiElement.wantsSeparator() = StringUtil.getLineBreakCount(text) > 0
+    private fun PsiElement.wantsSeparator() = this is KtFunction || StringUtil.getLineBreakCount(text) > 0
 
     private fun createLineSeparatorByElement(element: PsiElement): LineMarkerInfo<PsiElement> {
         val anchor = PsiTreeUtil.getDeepestFirst(element)
diff --git a/idea/testData/codeInsight/lineMarker/MethodSeparators.kt b/idea/testData/codeInsight/lineMarker/MethodSeparators.kt
index 189f9f80b15..f7fd72eaff1 100644
--- a/idea/testData/codeInsight/lineMarker/MethodSeparators.kt
+++ b/idea/testData/codeInsight/lineMarker/MethodSeparators.kt
@@ -33,5 +33,10 @@ class Foo {
     }
 
     <lineMarker descr="null">fun</lineMarker> quux() {}
-    fun xyzzy() {}
+
+    <lineMarker descr="null">fun</lineMarker> xyzzy() {}
+
+    <lineMarker descr="null">fun</lineMarker> f1() = 1
+
+    <lineMarker descr="null">fun</lineMarker> f2() = 2
 }