Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KON-692 Fix "StackOverflowError" Exception when trying to find indirect parents #1583

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,20 @@ class KoParentDeclarationForKoSourceDeclarationProviderTest {
null,
null,
),
arguments(
"class-with-parent-interface-with-the-same-name",
KoInterfaceDeclaration::class,
KoClassDeclaration::class,
null,
"com.samplepackage.SampleInterface.SampleName",
),
arguments(
"class-with-parent-class-with-the-same-name",
KoClassDeclaration::class,
KoInterfaceDeclaration::class,
null,
"com.samplepackage.SampleInterface.SampleName",
),
)

@Suppress("unused", "detekt.LongMethod")
Expand Down Expand Up @@ -364,6 +378,13 @@ class KoParentDeclarationForKoSourceDeclarationProviderTest {
null,
null,
),
arguments(
"interface-with-parent-interface-with-the-same-name",
KoInterfaceDeclaration::class,
KoClassDeclaration::class,
null,
"com.samplepackage.SampleInterface.SampleName",
),
)

@Suppress("unused", "detekt.LongMethod")
Expand Down Expand Up @@ -510,6 +531,20 @@ class KoParentDeclarationForKoSourceDeclarationProviderTest {
null,
null,
),
arguments(
"object-with-parent-interface-with-the-same-name",
KoInterfaceDeclaration::class,
KoClassDeclaration::class,
null,
"com.samplepackage.SampleInterface.SampleName",
),
arguments(
"object-with-parent-class-with-the-same-name",
KoClassDeclaration::class,
KoInterfaceDeclaration::class,
null,
"com.samplepackage.SampleInterface.SampleName",
),
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.samplepackage

data class SampleName(val data: String) : SampleInterface.SampleName()

interface SampleInterface {
open class SampleName
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.samplepackage

data class SampleName(val data: String) : SampleInterface.SampleName

interface SampleInterface {
interface SampleName
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.samplepackage

interface SampleName : SampleInterface.SampleName

interface SampleInterface {
interface SampleName
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.samplepackage

object SampleName : SampleInterface.SampleName()

interface SampleInterface {
open class SampleName
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.samplepackage

object SampleName : SampleInterface.SampleName

interface SampleInterface {
interface SampleName
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,13 @@ internal class KoParentDeclarationCore(
if (import.alias != null) {
import.alias?.name == innerName
} else {
import.name.substringAfterLast(".") == innerName
import.name.substringAfterLast(".") == outerName
}
}

val fullyQualifiedName =
import
?.name
?: (containingFile.packagee?.name + "." + name)
import?.name
?: "${containingFile.packagee?.name?.let { "$it." } ?: ""}$name"

val isAlias = import?.alias != null

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ fun getClass(
?: containingFile
.classes()
.firstOrNull { decl -> decl.fullyQualifiedName == declarationQualifiedName }
?: containingFile
.classes()
.firstOrNull { decl -> decl.name == name }
}

fun getInterface(
Expand All @@ -84,9 +81,6 @@ fun getInterface(
?: containingFile
.interfaces()
.firstOrNull { decl -> decl.fullyQualifiedName == declarationQualifiedName }
?: containingFile
.interfaces()
.firstOrNull { decl -> decl.name == name }
}

fun getObject(
Expand All @@ -108,9 +102,6 @@ fun getObject(
?: containingFile
.objects()
.firstOrNull { decl -> decl.fullyQualifiedName == declarationQualifiedName }
?: containingFile
.objects()
.firstOrNull { decl -> decl.name == name }
}

fun getTypeAlias(
Expand Down
Loading