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

Minor. Moved stuff from companion object to top-level.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2015-04-17 15:26:50 +03:00
parent 11020cacfd
commit 5eadf4db17
1 changed files with 125 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+17 -19
View File
@@ -78,14 +78,14 @@ public class KotlinLineMarkerProvider : LineMarkerProvider {
collectOverridingAccessors(functions, result) collectOverridingAccessors(functions, result)
collectOverridingPropertiesAccessors(properties, result) collectOverridingPropertiesAccessors(properties, result)
} }
}
companion object { private val OVERRIDING_MARK: Icon = AllIcons.Gutter.OverridingMethod
public val OVERRIDING_MARK: Icon = AllIcons.Gutter.OverridingMethod private val IMPLEMENTING_MARK: Icon = AllIcons.Gutter.ImplementingMethod
public val IMPLEMENTING_MARK: Icon = AllIcons.Gutter.ImplementingMethod private val OVERRIDDEN_MARK: Icon = AllIcons.Gutter.OverridenMethod
protected val OVERRIDDEN_MARK: Icon = AllIcons.Gutter.OverridenMethod private val IMPLEMENTED_MARK: Icon = AllIcons.Gutter.ImplementedMethod
protected val IMPLEMENTED_MARK: Icon = AllIcons.Gutter.ImplementedMethod
private val SUBCLASSED_CLASS = MarkerType( private val SUBCLASSED_CLASS = MarkerType(
{ getPsiClass(it)?.let { MarkerType.getSubclassedClassTooltip(it) } }, { getPsiClass(it)?.let { MarkerType.getSubclassedClassTooltip(it) } },
object : LineMarkerNavigator() { object : LineMarkerNavigator() {
override fun browse(e: MouseEvent?, element: PsiElement?) { override fun browse(e: MouseEvent?, element: PsiElement?) {
@@ -93,7 +93,7 @@ public class KotlinLineMarkerProvider : LineMarkerProvider {
} }
}) })
private val OVERRIDDEN_FUNCTION = MarkerType( private val OVERRIDDEN_FUNCTION = MarkerType(
{ getPsiMethod(it)?.let { getOverriddenMethodTooltip(it) } }, { getPsiMethod(it)?.let { getOverriddenMethodTooltip(it) } },
object : LineMarkerNavigator() { object : LineMarkerNavigator() {
override fun browse(e: MouseEvent?, element: PsiElement?) { override fun browse(e: MouseEvent?, element: PsiElement?) {
@@ -101,7 +101,7 @@ public class KotlinLineMarkerProvider : LineMarkerProvider {
} }
}) })
private val OVERRIDDEN_PROPERTY = MarkerType( private val OVERRIDDEN_PROPERTY = MarkerType(
{ it?.let { getOverriddenPropertyTooltip(it.getParent() as JetProperty) } }, { it?.let { getOverriddenPropertyTooltip(it.getParent() as JetProperty) } },
object : LineMarkerNavigator() { object : LineMarkerNavigator() {
override fun browse(e: MouseEvent?, element: PsiElement?) { override fun browse(e: MouseEvent?, element: PsiElement?) {
@@ -109,11 +109,11 @@ public class KotlinLineMarkerProvider : LineMarkerProvider {
} }
}) })
private fun isImplementsAndNotOverrides(descriptor: CallableMemberDescriptor, overriddenMembers: Collection<CallableMemberDescriptor>): Boolean { private fun isImplementsAndNotOverrides(descriptor: CallableMemberDescriptor, overriddenMembers: Collection<CallableMemberDescriptor>): Boolean {
return descriptor.getModality() != Modality.ABSTRACT && overriddenMembers.all { it.getModality() == Modality.ABSTRACT } return descriptor.getModality() != Modality.ABSTRACT && overriddenMembers.all { it.getModality() == Modality.ABSTRACT }
} }
private fun collectSuperDeclarationMarkers(declaration: JetDeclaration, result: MutableCollection<LineMarkerInfo<*>>) { private fun collectSuperDeclarationMarkers(declaration: JetDeclaration, result: MutableCollection<LineMarkerInfo<*>>) {
assert((declaration is JetNamedFunction || declaration is JetProperty)) assert((declaration is JetNamedFunction || declaration is JetProperty))
if (!declaration.hasModifier(JetTokens.OVERRIDE_KEYWORD)) return if (!declaration.hasModifier(JetTokens.OVERRIDE_KEYWORD)) return
@@ -135,9 +135,9 @@ public class KotlinLineMarkerProvider : LineMarkerProvider {
) )
result.add(marker) result.add(marker)
} }
private fun collectInheritedClassMarker(element: JetClass, result: MutableCollection<LineMarkerInfo<*>>) { private fun collectInheritedClassMarker(element: JetClass, result: MutableCollection<LineMarkerInfo<*>>) {
val isTrait = element.isTrait() val isTrait = element.isTrait()
if (!(isTrait || element.hasModifier(JetTokens.OPEN_KEYWORD) || element.hasModifier(JetTokens.ABSTRACT_KEYWORD))) { if (!(isTrait || element.hasModifier(JetTokens.OPEN_KEYWORD) || element.hasModifier(JetTokens.ABSTRACT_KEYWORD))) {
return return
@@ -157,9 +157,9 @@ public class KotlinLineMarkerProvider : LineMarkerProvider {
SUBCLASSED_CLASS.getTooltip(), SUBCLASSED_CLASS.getTooltip(),
SUBCLASSED_CLASS.getNavigationHandler() SUBCLASSED_CLASS.getNavigationHandler()
)) ))
} }
private fun collectOverridingPropertiesAccessors(properties: Collection<JetProperty>, result: MutableCollection<LineMarkerInfo<*>>) { private fun collectOverridingPropertiesAccessors(properties: Collection<JetProperty>, result: MutableCollection<LineMarkerInfo<*>>) {
val mappingToJava = Maps.newHashMap<PsiMethod, JetProperty>() val mappingToJava = Maps.newHashMap<PsiMethod, JetProperty>()
for (property in properties) { for (property in properties) {
if (property.isOverridable()) { if (property.isOverridable()) {
@@ -188,9 +188,9 @@ public class KotlinLineMarkerProvider : LineMarkerProvider {
GutterIconRenderer.Alignment.RIGHT GutterIconRenderer.Alignment.RIGHT
)) ))
} }
} }
private fun collectOverridingAccessors(functions: Collection<JetNamedFunction>, result: MutableCollection<LineMarkerInfo<*>>) { private fun collectOverridingAccessors(functions: Collection<JetNamedFunction>, result: MutableCollection<LineMarkerInfo<*>>) {
val mappingToJava = Maps.newHashMap<PsiMethod, JetNamedFunction>() val mappingToJava = Maps.newHashMap<PsiMethod, JetNamedFunction>()
for (function in functions) { for (function in functions) {
if (function.isOverridable()) { if (function.isOverridable()) {
@@ -217,6 +217,4 @@ public class KotlinLineMarkerProvider : LineMarkerProvider {
GutterIconRenderer.Alignment.RIGHT GutterIconRenderer.Alignment.RIGHT
)) ))
} }
}
}
} }