azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Method sepatators: separate single-expression functions (KT-30782)

Browse Source 
#KT-30782 Fixed
This commit is contained in:
Toshiaki Kameyama
2019-06-10 17:25:43 +09:00
committed by Nikolay Krasko
parent ade51588f9
commit bd661fcf82
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+1 -1
View File
@@ -71,7 +71,7 @@ class KotlinLineMarkerProvider : LineMarkerProviderDescriptor() {
private fun PsiElement?.canHaveSeparator() = private fun PsiElement?.canHaveSeparator() =
this is KtFunction || this is KtClassInitializer || (this is KtProperty && !isLocal) 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> { private fun createLineSeparatorByElement(element: PsiElement): LineMarkerInfo<PsiElement> {
val anchor = PsiTreeUtil.getDeepestFirst(element) val anchor = PsiTreeUtil.getDeepestFirst(element)
idea/testData/codeInsight/lineMarker/MethodSeparators.kt
Vendored
+6 -1
View File
@@ -33,5 +33,10 @@ class Foo {
} }
<lineMarker descr="null">fun</lineMarker> quux() {} <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
} }