Skip to content
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
4 changes: 2 additions & 2 deletions src/main/kotlin/org/pkl/lsp/type/ComputeExprType.kt
Original file line number Diff line number Diff line change
Expand Up @@ -410,9 +410,9 @@ private fun doComputeSubscriptExprType(
base: PklBaseModule,
context: PklProject?,
) =
when (receiverType) {
when (val unaliased = receiverType.unaliased(base, context)) {
is Type.StringLiteral -> base.stringType
is Type.Reference -> receiverType.valueTypeForSubscriptKeyType(getKeyType(), base, context)
is Type.Reference -> unaliased.valueTypeForSubscriptKeyType(getKeyType(), base, context)
else -> {
val receiverClassType = receiverType.toClassType(base, context)
when {
Expand Down
28 changes: 28 additions & 0 deletions src/test/kotlin/org/pkl/lsp/GoToDefinitionTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,34 @@ class GoToDefinitionTest : LspTestBase() {
assertThat(resolved.parentOfTypes(PklClass::class)!!.name).isEqualTo("Bird")
}

@Test
fun `resolve reference subscript through typealias`() {
createPklFile(
"""
import "pkl:ref"

typealias MyReference<T> = ref.Reference<Domain, T>

class Domain extends ref.Domain

class Bird {
/// The name of the bird
name: String
}

r: MyReference<Listing<Bird>>

res = r[0].na<caret>me
"""
.trimIndent()
)
val resolved = goToDefinition().single()
assertThat(resolved).isInstanceOf(PklClassProperty::class.java)
resolved as PklClassProperty
assertThat(resolved.name).isEqualTo("name")
assertThat(resolved.parentOfTypes(PklClass::class)!!.name).isEqualTo("Bird")
}

@Test
fun `resolve unqualified member link`() {
createPklFile(
Expand Down
Loading