From 2febcb175daef0abacef833a14bfbdd7769a2556 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 30 Dec 2013 15:57:34 +0400 Subject: [PATCH] Minor: typo fixed --- .../java/lazy/descriptors/LazyJavaClassMemberScope.kt | 4 ++-- .../resolve/java/lazy/descriptors/LazyJavaMemberScope.kt | 2 +- .../java/lazy/descriptors/LazyJavaPackageFragmentScope.kt | 4 ++-- .../jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt index d014a24133f..d4abc96d6d3 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt @@ -47,7 +47,7 @@ public class LazyJavaClassMemberScope( override fun computeMemberIndex(): MemberIndex { return object : ClassMemberIndex(jClass, { !enumClassObject && !it.isStatic() }) { // For SAM-constructors - override fun getAllMetodNames(): Collection = super.getAllMetodNames() + getAllClassNames() + override fun getAllMethodNames(): Collection = super.getAllMethodNames() + getAllClassNames() } } @@ -160,7 +160,7 @@ public class LazyJavaClassMemberScope( if (field != null) { EnumEntrySyntheticClassDescriptor.create(c.storageManager, getContainingDeclaration(), name, c.storageManager.createLazyValue { - memberIndex().getAllFieldNames() + memberIndex().getAllMetodNames() + memberIndex().getAllFieldNames() + memberIndex().getAllMethodNames() }) } else null diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt index c00599b5446..7cba3917241 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -204,7 +204,7 @@ public abstract class LazyJavaMemberScope( } override fun getFunctions(name: Name) = _functions(name) - protected open fun getAllFunctionNames(): Collection = memberIndex().getAllMetodNames() + protected open fun getAllFunctionNames(): Collection = memberIndex().getAllMethodNames() val _properties = c.storageManager.createMemoizedFunction { (name: Name) -> diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt index 9773b52e6b9..c75cd75b8db 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt @@ -38,9 +38,9 @@ public abstract class LazyJavaPackageFragmentScope( } protected fun computeMemberIndexForSamConstructors(delegate: MemberIndex): MemberIndex = object : MemberIndex by delegate { - override fun getAllMetodNames(): Collection { + override fun getAllMethodNames(): Collection { val jClass = c.finder.findClass(fqName) - return delegate.getAllMetodNames() + + return delegate.getAllMethodNames() + // For SAM-constructors getAllClassNames() + jClass.inn({ jC -> jC.getInnerClasses().map { c -> c.getName() }}, listOf()) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt index f9894678678..92d6f451218 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.utils.valuesToMap trait MemberIndex { fun findMethodsByName(name: Name): Collection - fun getAllMetodNames(): Collection + fun getAllMethodNames(): Collection fun findFieldByName(name: Name): JavaField? fun getAllFieldNames(): Collection @@ -35,7 +35,7 @@ trait MemberIndex { object EMPTY_MEMBER_INDEX : MemberIndex { override fun findMethodsByName(name: Name) = listOf() - override fun getAllMetodNames() = listOf() + override fun getAllMethodNames() = listOf() override fun findFieldByName(name: Name): JavaField? = null override fun getAllFieldNames() = listOf() @@ -62,7 +62,7 @@ open class ClassMemberIndex(val jClass: JavaClass, filter: (JavaMember) -> Boole return methods[name] ?: listOf() } - override fun getAllMetodNames(): Collection = jClass.getAllMethods().iterator().filter(methodFilter).map { m -> m.getName() }.toList() + override fun getAllMethodNames(): Collection = jClass.getAllMethods().iterator().filter(methodFilter).map { m -> m.getName() }.toList() override fun findFieldByName(name: Name): JavaField? = fields[name] override fun getAllFieldNames() = jClass.getAllFields().iterator().filter(memberFilter).map { m -> m.getName() }.toList()