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

Minor: typo fixed

Browse Source
This commit is contained in:
Andrey Breslav
2013-12-30 15:57:34 +04:00
parent 308e438671
commit 2febcb175d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+2 -2
View File
@@ -47,7 +47,7 @@ public class LazyJavaClassMemberScope(
override fun computeMemberIndex(): MemberIndex { override fun computeMemberIndex(): MemberIndex {
return object : ClassMemberIndex(jClass, { !enumClassObject && !it.isStatic() }) { return object : ClassMemberIndex(jClass, { !enumClassObject && !it.isStatic() }) {
// For SAM-constructors // For SAM-constructors
override fun getAllMetodNames(): Collection<Name> = super.getAllMetodNames() + getAllClassNames() override fun getAllMethodNames(): Collection<Name> = super.getAllMethodNames() + getAllClassNames()
} }
} }
@@ -160,7 +160,7 @@ public class LazyJavaClassMemberScope(
if (field != null) { if (field != null) {
EnumEntrySyntheticClassDescriptor.create(c.storageManager, getContainingDeclaration(), name, EnumEntrySyntheticClassDescriptor.create(c.storageManager, getContainingDeclaration(), name,
c.storageManager.createLazyValue { c.storageManager.createLazyValue {
memberIndex().getAllFieldNames() + memberIndex().getAllMetodNames() memberIndex().getAllFieldNames() + memberIndex().getAllMethodNames()
}) })
} }
else null else null
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
+1 -1
View File
@@ -204,7 +204,7 @@ public abstract class LazyJavaMemberScope(
} }
override fun getFunctions(name: Name) = _functions(name) override fun getFunctions(name: Name) = _functions(name)
protected open fun getAllFunctionNames(): Collection<Name> = memberIndex().getAllMetodNames() protected open fun getAllFunctionNames(): Collection<Name> = memberIndex().getAllMethodNames()
val _properties = c.storageManager.createMemoizedFunction { val _properties = c.storageManager.createMemoizedFunction {
(name: Name) -> (name: Name) ->
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt
+2 -2
View File
@@ -38,9 +38,9 @@ public abstract class LazyJavaPackageFragmentScope(
} }
protected fun computeMemberIndexForSamConstructors(delegate: MemberIndex): MemberIndex = object : MemberIndex by delegate { protected fun computeMemberIndexForSamConstructors(delegate: MemberIndex): MemberIndex = object : MemberIndex by delegate {
override fun getAllMetodNames(): Collection<Name> { override fun getAllMethodNames(): Collection<Name> {
val jClass = c.finder.findClass(fqName) val jClass = c.finder.findClass(fqName)
return delegate.getAllMetodNames() + return delegate.getAllMethodNames() +
// For SAM-constructors // For SAM-constructors
getAllClassNames() + getAllClassNames() +
jClass.inn({ jC -> jC.getInnerClasses().map { c -> c.getName() }}, listOf()) jClass.inn({ jC -> jC.getInnerClasses().map { c -> c.getName() }}, listOf())
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt
+3 -3
View File
@@ -27,7 +27,7 @@ import org.jetbrains.jet.utils.valuesToMap
trait MemberIndex { trait MemberIndex {
fun findMethodsByName(name: Name): Collection<JavaMethod> fun findMethodsByName(name: Name): Collection<JavaMethod>
fun getAllMetodNames(): Collection<Name> fun getAllMethodNames(): Collection<Name>
fun findFieldByName(name: Name): JavaField? fun findFieldByName(name: Name): JavaField?
fun getAllFieldNames(): Collection<Name> fun getAllFieldNames(): Collection<Name>
@@ -35,7 +35,7 @@ trait MemberIndex {
object EMPTY_MEMBER_INDEX : MemberIndex { object EMPTY_MEMBER_INDEX : MemberIndex {
override fun findMethodsByName(name: Name) = listOf<JavaMethod>() override fun findMethodsByName(name: Name) = listOf<JavaMethod>()
override fun getAllMetodNames() = listOf<Name>() override fun getAllMethodNames() = listOf<Name>()
override fun findFieldByName(name: Name): JavaField? = null override fun findFieldByName(name: Name): JavaField? = null
override fun getAllFieldNames() = listOf<Name>() override fun getAllFieldNames() = listOf<Name>()
@@ -62,7 +62,7 @@ open class ClassMemberIndex(val jClass: JavaClass, filter: (JavaMember) -> Boole
return methods[name] ?: listOf() return methods[name] ?: listOf()
} }
override fun getAllMetodNames(): Collection<Name> = jClass.getAllMethods().iterator().filter(methodFilter).map { m -> m.getName() }.toList() override fun getAllMethodNames(): Collection<Name> = jClass.getAllMethods().iterator().filter(methodFilter).map { m -> m.getName() }.toList()
override fun findFieldByName(name: Name): JavaField? = fields[name] override fun findFieldByName(name: Name): JavaField? = fields[name]
override fun getAllFieldNames() = jClass.getAllFields().iterator().filter(memberFilter).map { m -> m.getName() }.toList() override fun getAllFieldNames() = jClass.getAllFields().iterator().filter(memberFilter).map { m -> m.getName() }.toList()