Add 'val KClass.declaredProperties', make getProperties a property

core/reflection.jvm/src/kotlin/reflect/KClassExtensions.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlin.reflect
+
+import kotlin.reflect.jvm.internal.KClassImpl
+
+public val <T> KClass<T>.declaredProperties: Collection<KMemberProperty<T, *>>
+    get() = (this as KClassImpl<T>).getProperties(declared = true)
+
+public val <T> KClass<T>.declaredExtensionProperties: Collection<KMemberExtensionProperty<T, *, *>>
+    get() = (this as KClassImpl<T>).getExtensionProperties(declared = true)

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt

@@ -43,39 +43,39 @@ class KClassImpl<T>(override val jClass: Class<T>) : KCallableContainerImpl(), K
         return if (name.isSpecial()) null else name.asString()
     }
 
-    override fun getProperties(): Collection<KMemberProperty<T, *>> {
-        return scope.getAllDescriptors().stream()
-                .filterIsInstance<PropertyDescriptor>()
-                .filter { descriptor ->
-                    descriptor.getExtensionReceiverParameter() == null
-                }
-                .map { descriptor ->
-                    if (descriptor.isVar()) KMutableMemberPropertyImpl<T, Any?>(this) { descriptor }
-                    else KMemberPropertyImpl<T, Any?>(this) { descriptor }
-                }
-                .toList()
-    }
+    override val properties: Collection<KMemberProperty<T, *>>
+            get() = getProperties(declared = false)
 
-    override fun getExtensionProperties(): Collection<KMemberExtensionProperty<T, *, *>> {
-        return scope.getAllDescriptors().stream()
-                .filterIsInstance<PropertyDescriptor>()
-                .filter { descriptor ->
-                    descriptor.getExtensionReceiverParameter() != null
-                }
-                .map { descriptor ->
-                    if (descriptor.isVar()) KMutableMemberExtensionPropertyImpl<T, Any?, Any?>(this) { descriptor }
-                    else KMemberExtensionPropertyImpl<T, Any?, Any?>(this) { descriptor }
-                }
-                .toList()
-    }
+    override val extensionProperties: Collection<KMemberExtensionProperty<T, *, *>>
+            get() = getExtensionProperties(declared = false)
 
-    fun memberProperty(name: String): KMemberProperty<T, *> {
-        return KMemberPropertyImpl<T, Any>(this, findPropertyDescriptor(name))
-    }
+    fun getProperties(declared: Boolean): Collection<KMemberProperty<T, *>> =
+            getProperties(extension = false, declared = declared) { descriptor ->
+                if (descriptor.isVar()) KMutableMemberPropertyImpl<T, Any?>(this) { descriptor }
+                else KMemberPropertyImpl<T, Any?>(this) { descriptor }
+            }
 
-    fun mutableMemberProperty(name: String): KMutableMemberProperty<T, *> {
-        return KMutableMemberPropertyImpl<T, Any>(this, findPropertyDescriptor(name))
-    }
+    fun getExtensionProperties(declared: Boolean): Collection<KMemberExtensionProperty<T, *, *>> =
+            getProperties(extension = true, declared = declared) { descriptor ->
+                if (descriptor.isVar()) KMutableMemberExtensionPropertyImpl<T, Any?, Any?>(this) { descriptor }
+                else KMemberExtensionPropertyImpl<T, Any?, Any?>(this) { descriptor }
+            }
+
+    private fun <P : KProperty<*>> getProperties(extension: Boolean, declared: Boolean, create: (PropertyDescriptor) -> P): Collection<P> =
+            scope.getAllDescriptors().sequence()
+                    .filterIsInstance<PropertyDescriptor>()
+                    .filter { descriptor ->
+                        (descriptor.getExtensionReceiverParameter() != null) == extension &&
+                        (descriptor.getKind().isReal() || !declared)
+                    }
+                    .map(create)
+                    .toList()
+
+    fun memberProperty(name: String): KMemberProperty<T, *> =
+            KMemberPropertyImpl<T, Any>(this, findPropertyDescriptor(name))
+
+    fun mutableMemberProperty(name: String): KMutableMemberProperty<T, *> =
+            KMutableMemberPropertyImpl<T, Any>(this, findPropertyDescriptor(name))
 
     override fun equals(other: Any?): Boolean =
             other is KClassImpl<*> && jClass == other.jClass