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

Make project compilable after member scope refinement

Browse Source
This commit is contained in:
Denis Zharkov
2015-12-22 07:59:04 +03:00
parent ec0ec55ab5
commit b6edddbe8b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt
+1 -1
View File
@@ -29,7 +29,7 @@ public fun <T> Collection<T>?.concat(collection: Collection<T>): Collection<T>?
if (this == null) { if (this == null) {
return collection return collection
} }
if (this is LinkedHashSet<*>) { if (this is LinkedHashSet) {
addAll(collection) addAll(collection)
return this return this
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt
+1 -1
View File
@@ -282,7 +282,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(
override fun computeHashCode(e: PsiElement?): Int { override fun computeHashCode(e: PsiElement?): Int {
return when (e) { return when (e) {
null -> 0 null -> 0
is KtLightElement<*, *> -> e.getOrigin().hashCode() * 31 + (e.name?.hashCode() ?: 0) is KtLightElement<*, *> -> (e.getOrigin()?.hashCode() ?: 0) * 31 + (e.name?.hashCode() ?: 0)
else -> e.hashCode() else -> e.hashCode()
} }
} }