Upd Declaration PRoviders

lib/src/main/kotlin/com/lemonappdev/konsist/core/declaration/provider/KoDeclarationProvider.kt

@@ -1,20 +1,20 @@
 package com.lemonappdev.konsist.core.declaration.provider
 
 import com.lemonappdev.konsist.api.KoModifier
-import com.lemonappdev.konsist.core.declaration.KoClassDeclarationImpl
-import com.lemonappdev.konsist.core.declaration.KoCompanionObjectDeclarationImpl
-import com.lemonappdev.konsist.core.declaration.KoDeclarationImpl
-import com.lemonappdev.konsist.core.declaration.KoFunctionDeclarationImpl
-import com.lemonappdev.konsist.core.declaration.KoInterfaceDeclarationImpl
-import com.lemonappdev.konsist.core.declaration.KoObjectDeclarationImpl
-import com.lemonappdev.konsist.core.declaration.KoPropertyDeclarationImpl
+import com.lemonappdev.konsist.core.declaration.KoClassDeclaration
+import com.lemonappdev.konsist.core.declaration.KoCompanionObjectDeclaration
+import com.lemonappdev.konsist.core.declaration.KoDeclaration
+import com.lemonappdev.konsist.core.declaration.KoFunctionDeclaration
+import com.lemonappdev.konsist.core.declaration.KoInterfaceDeclaration
+import com.lemonappdev.konsist.core.declaration.KoObjectDeclaration
+import com.lemonappdev.konsist.core.declaration.KoPropertyDeclaration
 
 interface KoDeclarationProvider {
     fun declarations(
         modifiers: List<KoModifier> = emptyList(),
         includeNested: Boolean = false,
         includeLocal: Boolean = false,
-    ): Sequence<KoDeclarationImpl>
+    ): Sequence<KoDeclaration>
 
     fun containsDeclarations(
         name: String,
@@ -28,7 +28,7 @@ interface KoClassProvider : KoDeclarationProvider {
         modifiers: List<KoModifier> = emptyList(),
         includeNested: Boolean = false,
         includeLocal: Boolean = false,
-    ): Sequence<KoClassDeclarationImpl> =
+    ): Sequence<KoClassDeclaration> =
         KoDeclarationProviderUtil.getKoDeclarations(declarations(), modifiers, includeNested, includeLocal)
 
     fun containsClass(
@@ -43,7 +43,7 @@ interface KoInterfaceProvider : KoDeclarationProvider {
     fun interfaces(
         modifiers: List<KoModifier> = emptyList(),
         includeNested: Boolean = false,
-    ): Sequence<KoInterfaceDeclarationImpl> =
+    ): Sequence<KoInterfaceDeclaration> =
         KoDeclarationProviderUtil.getKoDeclarations(declarations(), modifiers, includeNested)
 
     fun containsInterface(
@@ -58,7 +58,7 @@ interface KoObjectProvider : KoDeclarationProvider {
     fun objects(
         modifiers: List<KoModifier> = emptyList(),
         includeNested: Boolean = false,
-    ): Sequence<KoObjectDeclarationImpl> = KoDeclarationProviderUtil.getKoDeclarations(declarations(), modifiers, includeNested)
+    ): Sequence<KoObjectDeclaration> = KoDeclarationProviderUtil.getKoDeclarations(declarations(), modifiers, includeNested)
 
     fun containsObject(
         name: String,
@@ -71,7 +71,7 @@ interface KoCompanionObjectProvider : KoDeclarationProvider {
     fun companionObjects(
         modifiers: List<KoModifier> = emptyList(),
         includeNested: Boolean = false,
-    ): Sequence<KoCompanionObjectDeclarationImpl> = KoDeclarationProviderUtil.getKoDeclarations(declarations(), modifiers, includeNested)
+    ): Sequence<KoCompanionObjectDeclaration> = KoDeclarationProviderUtil.getKoDeclarations(declarations(), modifiers, includeNested)
 
     fun containsCompanionObject(
         name: String,
@@ -85,7 +85,7 @@ interface KoPropertyProvider : KoDeclarationProvider {
         modifiers: List<KoModifier> = emptyList(),
         includeNested: Boolean = false,
         includeLocal: Boolean = false,
-    ): Sequence<KoPropertyDeclarationImpl> = KoDeclarationProviderUtil.getKoDeclarations(declarations(), modifiers, includeNested, includeLocal)
+    ): Sequence<KoPropertyDeclaration> = KoDeclarationProviderUtil.getKoDeclarations(declarations(), modifiers, includeNested, includeLocal)
 
     fun containsProperty(
         name: String,
@@ -101,7 +101,7 @@ interface KoFunctionProvider : KoDeclarationProvider {
         modifiers: List<KoModifier> = emptyList(),
         includeNested: Boolean = false,
         includeLocal: Boolean = false,
-    ): Sequence<KoFunctionDeclarationImpl> = KoDeclarationProviderUtil.getKoDeclarations(declarations(), modifiers, includeNested, includeLocal)
+    ): Sequence<KoFunctionDeclaration> = KoDeclarationProviderUtil.getKoDeclarations(declarations(), modifiers, includeNested, includeLocal)
 
     fun containsFunction(
         name: String,

lib/src/main/kotlin/com/lemonappdev/konsist/core/declaration/provider/KoDeclarationProviderUtil.kt

@@ -4,7 +4,8 @@ import com.lemonappdev.konsist.api.KoModifier
 import com.lemonappdev.konsist.core.declaration.KoClassDeclarationImpl
 import com.lemonappdev.konsist.core.declaration.KoCompanionObjectDeclarationImpl
 import com.lemonappdev.konsist.core.declaration.KoComplexDeclarationImpl
-import com.lemonappdev.konsist.core.declaration.KoDeclarationImpl
+import com.lemonappdev.konsist.core.declaration.KoDeclaration
+import com.lemonappdev.konsist.core.declaration.KoFunctionDeclaration
 import com.lemonappdev.konsist.core.declaration.KoFunctionDeclarationImpl
 import com.lemonappdev.konsist.core.declaration.KoInterfaceDeclarationImpl
 import com.lemonappdev.konsist.core.declaration.KoObjectDeclarationImpl
@@ -17,8 +18,8 @@ import org.jetbrains.kotlin.psi.KtObjectDeclaration
 import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation
 
-object KoDeclarationProviderUtil {
-    inline fun <reified T : KoDeclarationImpl> getKoDeclarations(
+internal object KoDeclarationProviderUtil {
+    inline fun <reified T : KoDeclaration> getKoDeclarations(
         ktDeclarationContainer: KtDeclarationContainer,
         modifiers: List<KoModifier>,
         includeNested: Boolean = false,
@@ -48,8 +49,8 @@ object KoDeclarationProviderUtil {
         return getKoDeclarations(declarations, modifiers, includeNested, includeLocal)
     }
 
-    inline fun <reified T : KoDeclarationImpl> getKoDeclarations(
-        declarations: Sequence<KoDeclarationImpl>,
+    inline fun <reified T : KoDeclaration> getKoDeclarations(
+        declarations: Sequence<KoDeclaration>,
         modifiers: List<KoModifier>,
         includeNested: Boolean = false,
         includeLocal: Boolean = false,
@@ -93,9 +94,9 @@ object KoDeclarationProviderUtil {
         return result.filterIsInstance<T>()
     }
 
-    fun localDeclarations(koFunctions: Sequence<KoFunctionDeclarationImpl>): Sequence<KoDeclarationImpl> {
-        val localDeclarations = mutableListOf<KoDeclarationImpl>()
-        val nestedDeclarations = mutableListOf<KoDeclarationImpl>()
+    fun localDeclarations(koFunctions: Sequence<KoFunctionDeclaration>): Sequence<KoDeclaration> {
+        val localDeclarations = mutableListOf<KoDeclaration>()
+        val nestedDeclarations = mutableListOf<KoDeclaration>()
 
         koFunctions.forEach { koFunction ->
             koFunction.localDeclarations().forEach {

lib/src/main/kotlin/com/lemonappdev/konsist/core/declaration/provider/KoLocalDeclarationProvider.kt

@@ -1,30 +1,30 @@
 package com.lemonappdev.konsist.core.declaration.provider
 
-import com.lemonappdev.konsist.core.declaration.KoClassDeclarationImpl
-import com.lemonappdev.konsist.core.declaration.KoDeclarationImpl
-import com.lemonappdev.konsist.core.declaration.KoFunctionDeclarationImpl
-import com.lemonappdev.konsist.core.declaration.KoPropertyDeclarationImpl
+import com.lemonappdev.konsist.core.declaration.KoClassDeclaration
+import com.lemonappdev.konsist.core.declaration.KoDeclaration
+import com.lemonappdev.konsist.core.declaration.KoFunctionDeclaration
+import com.lemonappdev.konsist.core.declaration.KoPropertyDeclaration
 
 interface KoLocalDeclarationProvider {
-    fun localDeclarations(): Sequence<KoDeclarationImpl>
+    fun localDeclarations(): Sequence<KoDeclaration>
 
     fun containsLocalDeclarations(name: String) = localDeclarations().any { it.name == name }
 }
 
 interface KoLocalClassProvider : KoLocalDeclarationProvider {
-    fun localClasses(): Sequence<KoClassDeclarationImpl> = localDeclarations().filterIsInstance<KoClassDeclarationImpl>()
+    fun localClasses(): Sequence<KoClassDeclaration> = localDeclarations().filterIsInstance<KoClassDeclaration>()
 
     fun containsLocalClass(name: String): Boolean = localClasses().any { it.name == name }
 }
 
 interface KoLocalPropertyProvider : KoLocalDeclarationProvider {
-    fun localProperties(): Sequence<KoPropertyDeclarationImpl> = localDeclarations().filterIsInstance<KoPropertyDeclarationImpl>()
+    fun localProperties(): Sequence<KoPropertyDeclaration> = localDeclarations().filterIsInstance<KoPropertyDeclaration>()
 
     fun containsLocalProperty(name: String): Boolean = localProperties().any { it.name == name }
 }
 
 interface KoLocalFunctionProvider : KoLocalDeclarationProvider {
-    fun localFunctions(): Sequence<KoFunctionDeclarationImpl> = localDeclarations().filterIsInstance<KoFunctionDeclarationImpl>()
+    fun localFunctions(): Sequence<KoFunctionDeclaration> = localDeclarations().filterIsInstance<KoFunctionDeclaration>()
 
     fun containsLocalFunction(name: String): Boolean = localFunctions().any { it.name == name }
 }