Resolve properties within annotation bodies

src/main/kotlin/org/pkl/lsp/ast/Type.kt

@@ -86,6 +86,10 @@ class PklDeclaredTypeImpl(
         if (filterChildren) elems.filter { it is PklTypeName || it is Terminal } else elems
       }
 
+  // Within a PklAnnotation, [ctx] spans the object body, too. Without narrowing the span to the
+  // type name, nodes within the object body would resolve to this type.
+  override val span: Span by lazy { if (filterChildren) name.span else super.span }
+
   override val name: PklTypeName by lazy {
     toTypeName(super.children[qualifiedIdentifierIdx] as PklQualifiedIdentifier)
   }

src/test/kotlin/org/pkl/lsp/GoToDefinitionTest.kt

@@ -60,6 +60,45 @@ class GoToDefinitionTest : LspTestBase() {
     assertThat(resolved.parentOfTypes(PklClass::class)!!.name).isEqualTo("MyClass")
   }
 
+  @Test
+  fun `resolve annotation type`() {
+    createPklFile(
+      """
+      class MyAnnotation extends Annotation {
+        name: String
+      }
+
+      @MyAnnot<caret>ation { name = "Bob" }
+      value: String
+    """
+        .trimIndent()
+    )
+    val resolved = goToDefinition().single()
+    assertThat(resolved).isInstanceOf(PklClass::class.java)
+    resolved as PklClass
+    assertThat(resolved.name).isEqualTo("MyAnnotation")
+  }
+
+  @Test
+  fun `resolve annotation property`() {
+    createPklFile(
+      """
+      class MyAnnotation extends Annotation {
+        name: String
+      }
+
+      @MyAnnotation { na<caret>me = "Bob" }
+      value: String
+    """
+        .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("MyAnnotation")
+  }
+
   @Test
   fun `resolve function name`() {
     createPklFile(

src/test/kotlin/org/pkl/lsp/HoverTest.kt

@@ -43,6 +43,26 @@ class HoverTest : LspTestBase() {
     assertThat(hoverText).contains("This is the docs for foo!")
   }
 
+  @Test
+  fun `annotation property`() {
+    createPklFile(
+      """
+      class MyAnnotation extends Annotation {
+        /// The name.
+        name: String
+      }
+
+      @MyAnnotation { na<caret>me = "Bob" }
+      value: String
+    """
+        .trimIndent()
+    )
+    val hoverText = getHoverText()
+    assertThat(hoverText).contains("name: String")
+    assertThat(hoverText).contains("The name.")
+    assertThat(hoverText).doesNotContain("class MyAnnotation")
+  }
+
   @Test
   fun `member links get rendered`() {
     createPklFile(