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

Expect/actual companion object: set gutter on leaf element

Browse Source 
May fix KT-21113
This commit is contained in:
Mikhail Glukhikh
2018-06-09 14:40:19 +03:00
parent 0a2ed054f1
commit 232d340118
7 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+5 -5
View File
@@ -333,11 +333,11 @@ private fun collectOverriddenPropertyAccessors(
private val KtNamedDeclaration.expectOrActualAnchor
get() =
nameIdentifier
?: (this as? KtConstructor<*>)?.let {
it.getConstructorKeyword() ?: it.getValueParameterList()?.leftParenthesis
}
?: this
nameIdentifier ?: when (this) {
is KtConstructor<*> -> getConstructorKeyword() ?: getValueParameterList()?.leftParenthesis
is KtObjectDeclaration -> getObjectKeyword()
else -> null
} ?: this
private fun collectActualMarkers(
declaration: KtNamedDeclaration,
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt.172
+5 -5
View File
@@ -331,11 +331,11 @@ private fun collectOverriddenPropertyAccessors(
private val KtNamedDeclaration.expectOrActualAnchor
get() =
nameIdentifier
?: (this as? KtConstructor<*>)?.let {
it.getConstructorKeyword() ?: it.getValueParameterList()?.leftParenthesis
}
?: this
nameIdentifier ?: when (this) {
is KtConstructor<*> -> getConstructorKeyword() ?: getValueParameterList()?.leftParenthesis
is KtObjectDeclaration -> getObjectKeyword()
else -> null
} ?: this
private fun collectActualMarkers(
declaration: KtNamedDeclaration,