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

Cleanup: KotlinLineMarkerProvider

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-06-07 15:39:39 +03:00
parent cfd1a54463
commit f139847e47
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+3 -3
View File
@@ -307,7 +307,7 @@ private fun collectOverriddenPropertyAccessors(
val mappingToJava = HashMap<PsiElement, KtNamedDeclaration>()
for (property in properties) {
if (property.isOverridable()) {
property.toPossiblyFakeLightMethods().forEach { mappingToJava.put(it, property) }
property.toPossiblyFakeLightMethods().forEach { mappingToJava[it] = property }
mappingToJava[property] = property
}
}
@@ -410,9 +410,9 @@ private fun collectOverriddenFunctions(functions: Collection<KtNamedFunction>, r
if (function.isOverridable()) {
val method = LightClassUtil.getLightClassMethod(function) ?: KtFakeLightMethod.get(function)
if (method != null) {
mappingToJava.put(method, function)
mappingToJava[method] = function
}
mappingToJava.put(function, function)
mappingToJava[function] = function
}
}
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt.172
+3 -3
View File
@@ -298,7 +298,7 @@ private fun collectOverriddenPropertyAccessors(
val mappingToJava = HashMap<PsiElement, KtNamedDeclaration>()
for (property in properties) {
if (property.isOverridable()) {
property.toPossiblyFakeLightMethods().forEach { mappingToJava.put(it, property) }
property.toPossiblyFakeLightMethods().forEach { mappingToJava[it] = property }
mappingToJava[property] = property
}
}
@@ -401,9 +401,9 @@ private fun collectOverriddenFunctions(functions: Collection<KtNamedFunction>, r
if (function.isOverridable()) {
val method = LightClassUtil.getLightClassMethod(function) ?: KtFakeLightMethod.get(function)
if (method != null) {
mappingToJava.put(method, function)
mappingToJava[method] = function
}
mappingToJava.put(function, function)
mappingToJava[function] = function
}
}