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

Line Marking: Place header/impl markers after override/inheritance

Browse Source 
#KT-19074 Fixed
This commit is contained in:
Alexey Sedunov
2017-08-10 14:46:38 +03:00
parent e3963fccf4
commit 98eb990f30
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+11 -9
View File
@@ -90,19 +90,21 @@ class KotlinLineMarkerProvider : LineMarkerProvider {
}
}
}
if (element is KtNamedDeclaration) {
if (element.hasModifier(KtTokens.HEADER_KEYWORD)) {
collectImplementationMarkers(element, result)
}
else if (element.hasModifier(KtTokens.IMPL_KEYWORD)) {
collectHeaderMarkers(element, result)
}
}
}
collectOverriddenFunctions(functions, result)
collectOverriddenPropertyAccessors(properties, result)
for (element in elements) {
if (element !is KtNamedDeclaration) continue
if (element.hasModifier(KtTokens.HEADER_KEYWORD)) {
collectImplementationMarkers(element, result)
}
else if (element.hasModifier(KtTokens.IMPL_KEYWORD)) {
collectHeaderMarkers(element, result)
}
}
}
}