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

Method sepatators: show separator between companion object and function

Browse Source 
#KT-24352 Fixed
This commit is contained in:
Toshiaki Kameyama
2019-09-14 09:09:01 +09:00
committed by Vladimir Dolzhenko
parent 5942446274
commit e8aa14a283
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+4 -1
View File
@@ -65,7 +65,10 @@ 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)
|| ((this is KtObjectDeclaration && this.isCompanion()))
private fun PsiElement.wantsSeparator() = this is KtFunction || StringUtil.getLineBreakCount(text) > 0 private fun PsiElement.wantsSeparator() = this is KtFunction || StringUtil.getLineBreakCount(text) > 0
idea/testData/codeInsight/lineMarker/MethodSeparators.kt
Vendored
+4
View File
@@ -39,4 +39,8 @@ class Foo {
<lineMarker descr="null">fun</lineMarker> f1() = 1 <lineMarker descr="null">fun</lineMarker> f1() = 1
<lineMarker descr="null">fun</lineMarker> f2() = 2 <lineMarker descr="null">fun</lineMarker> f2() = 2
<lineMarker descr="null">companion</lineMarker> object {
const val C = 1
}
} }