diff --git a/.release-notes/fix-lsp-definition-ranges.md b/.release-notes/fix-lsp-definition-ranges.md
new file mode 100644
index 000000000..3a1c42764
--- /dev/null
+++ b/.release-notes/fix-lsp-definition-ranges.md
@@ -0,0 +1,5 @@
+## Fix LSP definition and type-definition ranges
+
+`textDocument/definition` and `textDocument/typeDefinition` responses now return a range that covers the full declaration — from the opening keyword to the end of the body. Previously the range covered only the declaration keyword (`class`, `fun`, etc.).
+
+Range computation now also correctly handles the last type declaration in a file. Previously the compiler's synthesized default constructors could cause the final entity's range to extend to an incorrect position; this no longer occurs.
diff --git a/.release-notes/lsp-symbol-range.md b/.release-notes/lsp-symbol-range.md
new file mode 100644
index 000000000..3d63bbb56
--- /dev/null
+++ b/.release-notes/lsp-symbol-range.md
@@ -0,0 +1,5 @@
+## Fix LSP symbol ranges
+
+LSP clients that use `textDocument/documentSymbol` (the outline/breadcrumb view in most editors) could produce a "selectionRange must be contained in range" error, causing the entire symbol list to be rejected. This is now fixed.
+
+In addition, symbol ranges across both `textDocument/documentSymbol` and `workspace/symbol` now correctly cover the full declaration — from the opening keyword to the end of the body. Previously, `textDocument/documentSymbol` ranges covered only the declaration keyword (`class`, `fun`, etc.), and `workspace/symbol` ranges covered only the identifier. Highlighting a symbol or jumping to it now selects the whole declaration.
diff --git a/src/libponyc/codegen/codegen.c b/src/libponyc/codegen/codegen.c
index b12867144..788e10267 100644
--- a/src/libponyc/codegen/codegen.c
+++ b/src/libponyc/codegen/codegen.c
@@ -284,7 +284,6 @@ static void init_runtime(compile_t* c)
     LLVM_MEMORYEFFECTS_ARG(LLVM_MEMORYEFFECTS_READWRITE) |
     LLVM_MEMORYEFFECTS_INACCESSIBLEMEM(LLVM_MEMORYEFFECTS_READWRITE));
   LLVM_DECLARE_ATTRIBUTEREF(noalias_attr, noalias, 0);
-  LLVM_DECLARE_ATTRIBUTEREF(noreturn_attr, noreturn, 0);
   LLVM_DECLARE_ATTRIBUTEREF(deref_actor_attr, dereferenceable,
     PONY_ACTOR_PAD_SIZE + align_value);
   LLVM_DECLARE_ATTRIBUTEREF(align_attr, align, align_value);
@@ -607,12 +606,6 @@ static void init_runtime(compile_t* c)
   LLVMAddAttributeAtIndex(value, LLVMAttributeFunctionIndex, nounwind_attr);
   LLVMAddAttributeAtIndex(value, LLVMAttributeFunctionIndex, memory_readonly);
 
-  // void pony_error()
-  type = LLVMFunctionType(c->void_type, NULL, 0, false);
-  value = LLVMAddFunction(c->module, "pony_error", type);
-
-  LLVMAddAttributeAtIndex(value, LLVMAttributeFunctionIndex, noreturn_attr);
-
   // i32 memcmp(i8*, i8*, intptr)
   params[0] = c->ptr;
   params[1] = c->ptr;
diff --git a/src/libponyc/codegen/gencall.c b/src/libponyc/codegen/gencall.c
index 916c78f85..90688a6b8 100644
--- a/src/libponyc/codegen/gencall.c
+++ b/src/libponyc/codegen/gencall.c
@@ -1057,10 +1057,9 @@ LLVMValueRef gen_call(compile_t* c, ast_t* ast)
   {
     r = c->none_instance;
   }
-
-  if(c_m->try_return_info.return_type != TRYRETURNTYPE_NONE)
+  else if(c_m->try_return_info.return_type != TRYRETURNTYPE_NONE)
   {
-    r = unwrap_try_return_value(c, &c_m->try_return_info, r, m->result);
+    r = unwrap_try_return_value_jump_if_error(c, &c_m->try_return_info, r);
   }
 
   if(return_by_value)
diff --git a/src/libponyc/codegen/gencontrol.c b/src/libponyc/codegen/gencontrol.c
index 16fc47986..931b1ff4c 100644
--- a/src/libponyc/codegen/gencontrol.c
+++ b/src/libponyc/codegen/gencontrol.c
@@ -621,12 +621,11 @@ LLVMValueRef gen_return(compile_t* c, ast_t* ast)
     partial_ret = c_m->try_return_info.return_type != TRYRETURNTYPE_NONE;
   }
 
-  if(LLVMGetTypeKind(r_type) || partial_ret)
+  if(LLVMGetTypeKind(r_type) != LLVMVoidTypeKind)
   {
     if(partial_ret)
     {
-      compile_type_t* ret_c_t = (compile_type_t*)c->frame->m->result->c_type;
-      r_type = ret_c_t->use_type;
+      r_type = get_try_return_unwrapped_type(&c_m->try_return_info);
     }
     ast_t* type = deferred_reify(c->frame->reify, ast_type(expr), c->opt);
     LLVMValueRef ret = gen_assign_cast(c, r_type, value, type);
@@ -634,7 +633,7 @@ LLVMValueRef gen_return(compile_t* c, ast_t* ast)
 
     if(partial_ret)
     {
-      ret = wrap_try_return_success(c, &c_m->try_return_info, ret, c->frame->m->result);
+      ret = wrap_try_return_success(c, &c_m->try_return_info, ret);
     }
 
     codegen_scope_lifetime_end(c);
@@ -720,7 +719,6 @@ LLVMValueRef gen_try(compile_t* c, ast_t* ast)
       return NULL;
 
     gen_expr(c, then_clause);
-
     else_block = LLVMGetInsertBlock(c->builder);
     LLVMBuildBr(c->builder, post_block);
   }
@@ -947,7 +945,7 @@ LLVMValueRef gen_error(compile_t* c, ast_t* ast)
 
     pony_assert(c_m->try_return_info.return_type != TRYRETURNTYPE_NONE);
 
-    LLVMValueRef ret = wrap_try_return_error(c, &c_m->try_return_info, r_m->result);
+    LLVMValueRef ret = wrap_try_return_error(c, &c_m->try_return_info);
     genfun_build_ret(c, ret);
   }
 
diff --git a/src/libponyc/codegen/gendesc.c b/src/libponyc/codegen/gendesc.c
index 58ad069ac..ffa2cd52b 100644
--- a/src/libponyc/codegen/gendesc.c
+++ b/src/libponyc/codegen/gendesc.c
@@ -74,8 +74,7 @@ static LLVMValueRef make_unbox_function(compile_t* c, reach_type_t* t,
   LLVMTypeRef ret_type = NULL;
   if(needs_error_wrap)
   {
-    compile_type_t* wrapped_c_t = (compile_type_t * )c_m->try_return_info.t->c_type;
-    ret_type = wrapped_c_t->use_type;
+    ret_type = get_try_return_wrapped_type(&c_m->try_return_info);
   }
   else
   {
@@ -132,7 +131,7 @@ static LLVMValueRef make_unbox_function(compile_t* c, reach_type_t* t,
 
   if(needs_error_wrap)
   {
-    result = wrap_try_return_success(c, &c_m->try_return_info, result, m->result);
+    result = wrap_try_return_success(c, &c_m->try_return_info, result);
   }
 
   genfun_build_ret(c, result);
@@ -217,9 +216,7 @@ static LLVMValueRef make_error_wrap_function(compile_t* c,
 
   TryReturnInfo tr_info = init_try_return_info();
 
-  compile_type_t* ret_c_t = (compile_type_t*)m->result->c_type;
-  LLVMTypeRef wrapped_ret =
-    generate_try_return_type(c, &tr_info, m->result, ret_c_t->use_type);
+  LLVMTypeRef wrapped_ret = generate_try_return_type(c, &tr_info, m->result);
 
   const char* wrap_name = genname_error_wrap(m->full_name);
   LLVMTypeRef wrap_type = LLVMFunctionType(wrapped_ret, params, count, false);
@@ -236,12 +233,11 @@ static LLVMValueRef make_error_wrap_function(compile_t* c,
   LLVMValueRef result = codegen_call(c, f_type, c_m->func, args, count,
     m->cap != TK_AT);
 
-  result = wrap_try_return_success(c, &tr_info, result, m->result);
+  result = wrap_try_return_success(c, &tr_info, result);
   genfun_build_ret(c, result);
 
   codegen_finishfun(c);
 
-  delete_try_return_info(&tr_info);
   ponyint_pool_free_size(buf_size, params);
   ponyint_pool_free_size(args_size, args);
   return wrap_fun;
diff --git a/src/libponyc/codegen/genfun.c b/src/libponyc/codegen/genfun.c
index 028c72dba..7b31e9369 100644
--- a/src/libponyc/codegen/genfun.c
+++ b/src/libponyc/codegen/genfun.c
@@ -21,8 +21,6 @@
 
 static void compile_method_free(void* p)
 {
-  compile_method_t* c_m = (compile_method_t*)p;
-  delete_try_return_info(&c_m->try_return_info);
   POOL_FREE(compile_method_t, p);
 }
 
@@ -122,9 +120,7 @@ static void make_signature(compile_t* c, reach_type_t* t,
   LLVMTypeRef partial_ret_type = NULL;
   if(ast_id(ast_childidx(m->fun->ast, 5)) == TK_QUESTION)
   {
-    compile_type_t* res_c_t = (compile_type_t*)m->result->c_type;
-    partial_ret_type = generate_try_return_type(c, &c_m->try_return_info, m->result,
-      res_c_t->use_type);
+    partial_ret_type = generate_try_return_type(c, &c_m->try_return_info, m->result);
   }
 
   if(m->return_by_value)
@@ -169,21 +165,13 @@ static void make_signature(compile_t* c, reach_type_t* t,
       {
         // First argument when return by value is a pointer where the
         // value should be stored.
-        if(c_m->try_return_info.return_type != TRYRETURNTYPE_NONE)
+        if(m->result->underlying != TK_TUPLETYPE)
         {
-          compile_type_t* partial_ret_c_t = (compile_type_t*)c_m->try_return_info.t->c_type;
-          tparams[0] = partial_ret_c_t->use_type;
+          tparams[0] = ((compile_type_t*)m->result->c_type)->use_type;
         }
         else
         {
-          if(m->result->underlying != TK_TUPLETYPE)
-          {
-            tparams[0] = ((compile_type_t*)m->result->c_type)->use_type;
-          }
-          else
-          {
-            tparams[0] = ((compile_type_t*)m->result->c_type)->structure_ptr;
-          }
+          tparams[0] = ((compile_type_t*)m->result->c_type)->structure_ptr;
         }
       }
     }
@@ -633,16 +621,8 @@ static bool genfun_fun(compile_t* c, reach_type_t* t, reach_method_t* m)
 
       LLVMValueRef ret = NULL;
 
-      bool assign_cast = true;
-
-      if(c_m->try_return_info.return_type != TRYRETURNTYPE_NONE)
-      {
-        ret = wrap_try_return_success(c, &c_m->try_return_info, value, m->result);
-      }
-      else if(return_by_value && return_value_lowered)
+      if(return_by_value && return_value_lowered)
       {
-        assign_cast = false;
-
         if(m->result->underlying != TK_TUPLETYPE)
         {
           ret = load_lowered_return_value_from_ptr(c, value, r_type, m->result);
@@ -656,16 +636,24 @@ static bool genfun_fun(compile_t* c, reach_type_t* t, reach_method_t* m)
       }
       else
       {
-        ret = value;
-      }
+        if(c_m->try_return_info.return_type == TRYRETURNTYPE_OTHER)
+        {
+          r_type = get_try_return_unwrapped_type(&c_m->try_return_info);
+        }
 
-      if(assign_cast)
-      {
-        ast_t* body_type = deferred_reify(m->fun, ast_type(body), c->opt);
-        ret = gen_assign_cast(c, r_type, ret, body_type);
-        ast_free_unattached(body_type);
+        if(c_m->try_return_info.return_type != TRYRETURNTYPE_BOOL)
+        {
+          ast_t* body_type = deferred_reify(m->fun, ast_type(body), c->opt);
+          ret = gen_assign_cast(c, r_type, value, body_type);
+          ast_free_unattached(body_type);
 
-        ast_free_unattached(r_result);
+          ast_free_unattached(r_result);
+        }
+
+        if(c_m->try_return_info.return_type != TRYRETURNTYPE_NONE)
+        {
+          ret = wrap_try_return_success(c, &c_m->try_return_info, ret);
+        }
       }
 
       if(ret == NULL)
@@ -756,7 +744,7 @@ static bool genfun_new(compile_t* c, reach_type_t* t, reach_method_t* m)
 
   if(c_m->try_return_info.return_type != TRYRETURNTYPE_NONE)
   {
-    value = wrap_try_return_success(c, &c_m->try_return_info, value, m->result);
+    value = wrap_try_return_success(c, &c_m->try_return_info, value);
   }
 
   // Return 'this'.
@@ -795,13 +783,18 @@ static bool genfun_newbe(compile_t* c, reach_type_t* t, reach_method_t* m)
   if(value == NULL)
     return false;
 
-  if(c_m->try_return_info.return_type != TRYRETURNTYPE_NONE)
+  codegen_scope_lifetime_end(c);
+
+  if(c_m->try_return_info.return_type == TRYRETURNTYPE_NONE)
   {
-    value = wrap_try_return_success(c, &c_m->try_return_info, value, m->result);
+    genfun_build_ret_void(c);
+  }
+  else
+  {
+    value = wrap_try_return_success(c, &c_m->try_return_info, value);
+    genfun_build_ret(c, value);
   }
 
-  codegen_scope_lifetime_end(c);
-  genfun_build_ret_void(c);
   codegen_finishfun(c);
 
   // Generate the sender.
@@ -841,6 +834,7 @@ static void copy_subordinate(reach_method_t* m)
     compile_method_t* c_m2 = (compile_method_t*)m2->c_method;
     c_m2->func_type = c_m->func_type;
     c_m2->func = c_m->func;
+    c_m2->try_return_info = c_m->try_return_info;
     m2 = m2->subordinate;
   }
 }
@@ -972,7 +966,7 @@ static bool genfun_forward(compile_t* c, reach_type_t* t,
 
   if(c_m2->try_return_info.return_type != TRYRETURNTYPE_NONE)
   {
-    ret = unwrap_try_return_value(c, &c_m2->try_return_info, ret, m2->result);
+    ret = unwrap_try_return_value_jump_if_error(c, &c_m2->try_return_info, ret);
   }
 
   ret = gen_assign_cast(c, ((compile_type_t*)m->result->c_type)->use_type, ret,
@@ -980,10 +974,11 @@ static bool genfun_forward(compile_t* c, reach_type_t* t,
 
   if(c_m->try_return_info.return_type != TRYRETURNTYPE_NONE)
   {
-    ret = wrap_try_return_success(c, &c_m->try_return_info, ret, m->result);
+    ret = wrap_try_return_success(c, &c_m->try_return_info, ret);
   }
 
   genfun_build_ret(c, ret);
+
   codegen_finishfun(c);
   ponyint_pool_free_size(buf_size, args);
 
diff --git a/src/libponyc/codegen/genprim.c b/src/libponyc/codegen/genprim.c
index 41740859b..6c2355a05 100644
--- a/src/libponyc/codegen/genprim.c
+++ b/src/libponyc/codegen/genprim.c
@@ -447,7 +447,7 @@ static void pointer_to_reftype(compile_t* c, void* data, token_id cap)
 
   // We need to generate the TryReturnInfo here as it doesn't go through any
   // make_signature
-  generate_try_return_type(c, &c_m->try_return_info, t, t_elem->use_type);
+  generate_try_return_type(c, &c_m->try_return_info, t);
 
   start_function(c, t, m, t_elem->use_type, &c_t->use_type, 1);
 
@@ -586,7 +586,7 @@ static void nullable_pointer_apply(compile_t* c, void* data, token_id cap)
 
   // We need to generate the TryReturnInfo here as it doesn't go through any
   // make_signature
-  generate_try_return_type(c, &c_m->try_return_info, t, t_elem->use_type);
+  generate_try_return_type(c, &c_m->try_return_info, t);
 
   start_function(c, t, m, t_elem->use_type, &c_t->use_type, 1);
 
diff --git a/src/libponyc/codegen/gentryreturn.cc b/src/libponyc/codegen/gentryreturn.cc
index 8d1e95084..da1b27562 100644
--- a/src/libponyc/codegen/gentryreturn.cc
+++ b/src/libponyc/codegen/gentryreturn.cc
@@ -14,110 +14,78 @@
 extern "C" TryReturnInfo init_try_return_info()
 {
   TryReturnInfo ret;
-  ret.t = NULL;
   ret.return_type = TRYRETURNTYPE_NONE;
+  ret.wrapped_type = NULL;
+  ret.unwrapped_type = NULL;
   return ret;
 }
 
 
-extern "C" void delete_try_return_info(TryReturnInfo* try_return_info)
-{
-  if(try_return_info->t != NULL)
-  {
-    if(try_return_info->t->c_type != NULL)
-    {
-      POOL_FREE(compile_type_t, try_return_info->t->c_type);
-      try_return_info->t->c_type = NULL;
-    }
-
-    POOL_FREE(reach_type_t, try_return_info->t);
-    try_return_info->t = NULL;
-  }
-}
-
-
 extern "C" LLVMTypeRef generate_try_return_type(compile_t* c, TryReturnInfo* try_return_info,
-  reach_type_t* type, LLVMTypeRef use_type)
+  reach_type_t* type)
 {
   compile_type_t* ret_c_t = (compile_type_t*)type->c_type;
   LLVMTypeKind return_type_kind = LLVMGetTypeKind(ret_c_t->use_type);
+  LLVMTypeRef ret = NULL;
 
-  // Create a fake reach_type_t in order to get it through the pass by value lowering
-  reach_type_t* fake_reach_type = POOL_ALLOC(reach_type_t);
-  memset(fake_reach_type, 0, sizeof(reach_type_t));
-
-  compile_type_t* fake_c_t = POOL_ALLOC(compile_type_t);
-  memset(fake_c_t, 0, sizeof(compile_type_t));
-  fake_c_t->free_fn = NULL;
-  fake_reach_type->c_type = (compile_opaque_t*)fake_c_t;
-
-  try_return_info->t = fake_reach_type;
+  try_return_info->unwrapped_type = type;
 
   if(is_none(type->ast))
   {
     reach_type_t* bool_reach_type = reach_type_name(c->reach, "Bool");
     compile_type_t* bool_c_t = (compile_type_t*)bool_reach_type->c_type;
-
-    fake_c_t->use_type = bool_c_t->use_type;
-    fake_c_t->mem_type = bool_c_t->use_type;
-    fake_c_t->structure_ptr = NULL;
-    fake_c_t->structure = NULL;
-    fake_c_t->abi_size = LLVMABISizeOfType(c->target_data, bool_c_t->use_type);
-
     try_return_info->return_type = TRYRETURNTYPE_BOOL;
+    try_return_info->wrapped_type = bool_c_t->use_type;
+    ret = bool_c_t->use_type;
   }
   else if(return_type_kind == LLVMPointerTypeKind ||
           is_pointer(type->ast) ||
           is_nullable_pointer(type->ast))
   {
-    compile_type_t* p_c_t = (compile_type_t*)type->c_type;
-
-    fake_c_t->use_type = p_c_t->use_type;
-    fake_c_t->mem_type = p_c_t->mem_type;
-    fake_c_t->structure_ptr = NULL;
-    fake_c_t->structure = NULL;
-    fake_c_t->abi_size = LLVMABISizeOfType(c->target_data, c->ptr);
-    
+    try_return_info->wrapped_type = ret_c_t->use_type;
     try_return_info->return_type = TRYRETURNTYPE_POINTER;
+    ret = ret_c_t->use_type;
   }
   else
   {
-    compile_type_t* p_c_t = (compile_type_t*)type->c_type;
-
-    LLVMTypeRef ret_type = p_c_t->mem_type;
     try_return_info->return_type = TRYRETURNTYPE_OTHER;
 
     reach_type_t* bool_reach_type = reach_type_name(c->reach, "Bool");
     LLVMTypeRef bool_type = ((compile_type_t*)bool_reach_type->c_type)->mem_type;
 
     LLVMTypeRef elements[2];
-    elements[0] = ret_type;
+    elements[0] = ret_c_t->mem_type;
     elements[1] = bool_type;
-    fake_c_t->structure = LLVMStructTypeInContext(c->context, elements, 2, false);
-
-    fake_c_t->use_type = fake_c_t->structure;
-    fake_c_t->mem_type = fake_c_t->structure;
-    fake_c_t->structure_ptr = c->ptr;
-    fake_c_t->abi_size = LLVMABISizeOfType(c->target_data, fake_c_t->structure);
+    ret = LLVMStructTypeInContext(c->context, elements, 2, false);
+    try_return_info->wrapped_type = ret;
   }
 
-  return fake_c_t->use_type;
+  return ret;
+}
+
+
+LLVMTypeRef get_try_return_wrapped_type(TryReturnInfo* try_return_info)
+{
+  return try_return_info->wrapped_type;
+}
+
+
+LLVMTypeRef get_try_return_unwrapped_type(TryReturnInfo* try_return_info)
+{
+  return ((compile_type_t*)try_return_info->unwrapped_type->c_type)->use_type;
 }
 
 
-extern "C" LLVMValueRef unwrap_try_return_value(compile_t* c, TryReturnInfo* try_return_info,
-  LLVMValueRef value, reach_type_t* return_reach_type)
+LLVMValueRef unwrap_try_return_bool(compile_t* c, TryReturnInfo* try_return_info,
+  LLVMValueRef value)
 {
   LLVMValueRef bool_expr = NULL;
-  LLVMValueRef tuple = NULL;
 
   switch(try_return_info->return_type)
   {
     case TRYRETURNTYPE_BOOL:
-    {
       bool_expr = LLVMBuildNot(c->builder, value, "");
       break;
-    }
 
     case TRYRETURNTYPE_POINTER:
       bool_expr = LLVMBuildIsNull(c->builder, value, "");
@@ -125,8 +93,6 @@ extern "C" LLVMValueRef unwrap_try_return_value(compile_t* c, TryReturnInfo* try
 
     case TRYRETURNTYPE_OTHER:
     {
-      compile_type_t* wrapper_c_t = (compile_type_t*)try_return_info->t->c_type;
-
       bool_expr = LLVMBuildExtractValue(c->builder, value, 1, "");
 
       reach_type_t* bool_reach_type = reach_type_name(c->reach, "Bool");
@@ -147,31 +113,13 @@ extern "C" LLVMValueRef unwrap_try_return_value(compile_t* c, TryReturnInfo* try
       break;
   }
 
-  LLVMBasicBlockRef error_block = codegen_block(c, "call_error");
-  LLVMBasicBlockRef continue_block = codegen_block(c, "call_continue");
-  LLVMBuildCondBr(c->builder, bool_expr, error_block, continue_block);
-
-  LLVMPositionBuilderAtEnd(c->builder, error_block);
-
-  if(c->frame->try_else_target != NULL)
-  {
-    // Inside a try block: branch to the error handler.
-    LLVMBuildBr(c->builder, c->frame->try_else_target);
-  }
-  else
-  {
-    reach_method_t* r_m = c->frame->m;
-    compile_method_t* c_m = (compile_method_t*)r_m->c_method;
-
-    pony_assert(c_m->try_return_info.return_type != TRYRETURNTYPE_NONE);
-
-    LLVMValueRef error_ret = wrap_try_return_error(c, &c_m->try_return_info, r_m->result);
-    genfun_build_ret(c, error_ret);
-  }
-
+  return bool_expr;
+}
 
-  LLVMPositionBuilderAtEnd(c->builder, continue_block);
 
+LLVMValueRef unwrap_try_return_value(compile_t* c, TryReturnInfo* try_return_info,
+  LLVMValueRef value)
+{
   LLVMValueRef result = NULL;
 
   switch(try_return_info->return_type)
@@ -187,10 +135,8 @@ extern "C" LLVMValueRef unwrap_try_return_value(compile_t* c, TryReturnInfo* try
     case TRYRETURNTYPE_OTHER:
     {
       result = LLVMBuildExtractValue(c->builder, value, 0, "");
-
-      compile_type_t* ret_c_t = (compile_type_t*)return_reach_type->c_type;
-      result = gen_assign_cast(c, ret_c_t->use_type, result, return_reach_type->ast);
-
+      LLVMTypeRef use_type = ((compile_type_t*)try_return_info->unwrapped_type->c_type)->use_type;
+      result = gen_assign_cast(c, use_type, result, try_return_info->unwrapped_type->ast_cap);
       break;
     }
 
@@ -202,8 +148,42 @@ extern "C" LLVMValueRef unwrap_try_return_value(compile_t* c, TryReturnInfo* try
 }
 
 
+extern "C" LLVMValueRef unwrap_try_return_value_jump_if_error(compile_t* c, TryReturnInfo* try_return_info,
+  LLVMValueRef value)
+{
+  LLVMValueRef bool_expr = unwrap_try_return_bool(c, try_return_info, value);
+
+  LLVMBasicBlockRef error_block = codegen_block(c, "partial_call_error");
+  LLVMBasicBlockRef continue_block = codegen_block(c, "partial_call_continue");
+  LLVMBuildCondBr(c->builder, bool_expr, error_block, continue_block);
+
+  LLVMPositionBuilderAtEnd(c->builder, error_block);
+
+  if(c->frame->try_else_target != NULL)
+  {
+    // Inside a try block: branch to the error handler.
+    LLVMBuildBr(c->builder, c->frame->try_else_target);
+  }
+  else
+  {
+    reach_method_t* r_m = c->frame->m;
+    compile_method_t* c_m = (compile_method_t*)r_m->c_method;
+
+    pony_assert(c_m->try_return_info.return_type != TRYRETURNTYPE_NONE);
+
+    LLVMValueRef error_ret = wrap_try_return_error(c, &c_m->try_return_info);
+    genfun_build_ret(c, error_ret);
+  }
+
+  LLVMMoveBasicBlockAfter(continue_block, LLVMGetInsertBlock(c->builder));
+  LLVMPositionBuilderAtEnd(c->builder, continue_block);
+
+  return unwrap_try_return_value(c, try_return_info, value);
+}
+
+
 extern "C" LLVMValueRef wrap_try_return_success(compile_t* c, TryReturnInfo* try_return_info,
-  LLVMValueRef value, reach_type_t* return_reach_type)
+  LLVMValueRef value)
 {
   LLVMValueRef ret = NULL;
   LLVMValueRef tuple = NULL;
@@ -227,15 +207,13 @@ extern "C" LLVMValueRef wrap_try_return_success(compile_t* c, TryReturnInfo* try
 
     case TRYRETURNTYPE_OTHER:
     {
-      compile_type_t* wrapper_c_t = (compile_type_t*)try_return_info->t->c_type;
-      compile_type_t* ret_c_t = (compile_type_t*)return_reach_type->c_type;
-
       reach_type_t* bool_type = reach_type_name(c->reach, "Bool");
       compile_type_t* bool_c_t = (compile_type_t*)bool_type->c_type;
 
-      LLVMValueRef tuple = LLVMGetUndef(wrapper_c_t->structure);
-      tuple = LLVMBuildInsertValue(c->builder, tuple,
-        gen_assign_cast(c, ret_c_t->mem_type, value, return_reach_type->ast), 0, "");
+      LLVMValueRef tuple = LLVMGetUndef(try_return_info->wrapped_type);
+      LLVMTypeRef mem_type = ((compile_type_t*)try_return_info->unwrapped_type->c_type)->mem_type;
+      LLVMValueRef value_mem = gen_assign_cast(c, mem_type, value, try_return_info->unwrapped_type->ast_cap);
+      tuple = LLVMBuildInsertValue(c->builder, tuple, value_mem, 0, "");
       ret = LLVMBuildInsertValue(c->builder, tuple, LLVMConstInt(bool_c_t->mem_type, 1, false), 1, "");
       break;
     }
@@ -248,8 +226,7 @@ extern "C" LLVMValueRef wrap_try_return_success(compile_t* c, TryReturnInfo* try
   return ret;
 }
 
-extern "C" LLVMValueRef wrap_try_return_error(compile_t* c, TryReturnInfo* try_return_info,
-  reach_type_t* return_reach_type)
+extern "C" LLVMValueRef wrap_try_return_error(compile_t* c, TryReturnInfo* try_return_info)
 {
   LLVMValueRef ret = NULL;
   LLVMValueRef tuple = NULL;
@@ -273,14 +250,12 @@ extern "C" LLVMValueRef wrap_try_return_error(compile_t* c, TryReturnInfo* try_r
 
     case TRYRETURNTYPE_OTHER:
     {
-      compile_type_t* wrapper_c_t = (compile_type_t*)try_return_info->t->c_type;
-      compile_type_t* ret_c_t = (compile_type_t*)return_reach_type->c_type;
-
       reach_type_t* bool_type = reach_type_name(c->reach, "Bool");
       compile_type_t* bool_c_t = (compile_type_t*)bool_type->c_type;
 
-      LLVMValueRef tuple = LLVMGetUndef(wrapper_c_t->structure);
-      tuple = LLVMBuildInsertValue(c->builder, tuple, LLVMConstNull(ret_c_t->mem_type), 0, "");
+      LLVMValueRef tuple = LLVMGetUndef(try_return_info->wrapped_type);
+      LLVMTypeRef mem_type = ((compile_type_t*)try_return_info->unwrapped_type->c_type)->mem_type;
+      tuple = LLVMBuildInsertValue(c->builder, tuple, LLVMConstNull(mem_type), 0, "");
       ret = LLVMBuildInsertValue(c->builder, tuple, LLVMConstInt(bool_c_t->mem_type, 0, false), 1, "");
       break;
     }
diff --git a/src/libponyc/codegen/gentryreturn.h b/src/libponyc/codegen/gentryreturn.h
index f00e0cd30..4837b5d93 100644
--- a/src/libponyc/codegen/gentryreturn.h
+++ b/src/libponyc/codegen/gentryreturn.h
@@ -18,26 +18,36 @@ typedef enum
 
 typedef struct TryReturnInfo_s
 {
-  reach_type_t* t;
   TryReturnType return_type;
+  LLVMTypeRef wrapped_type;
+  reach_type_t* unwrapped_type;
 }TryReturnInfo;
 
 
 TryReturnInfo init_try_return_info();
 
-void delete_try_return_info(TryReturnInfo* try_return_info);
-
 LLVMTypeRef generate_try_return_type(compile_t* c, TryReturnInfo* try_return_info,
-  reach_type_t* type, LLVMTypeRef use_type);
+  reach_type_t* type);
+
+LLVMTypeRef get_try_return_wrapped_type(TryReturnInfo* try_return_info);
+
+LLVMTypeRef get_try_return_unwrapped_type(TryReturnInfo* try_return_info);
+
+LLVMTypeRef get_try_return_unwrapped_type(TryReturnInfo* try_return_info);
+
+LLVMValueRef unwrap_try_return_bool(compile_t* c, TryReturnInfo* try_return_info,
+  LLVMValueRef value);
 
 LLVMValueRef unwrap_try_return_value(compile_t* c, TryReturnInfo* try_return_info,
-  LLVMValueRef value, reach_type_t* return_reach_type);
+  LLVMValueRef value);
+
+LLVMValueRef unwrap_try_return_value_jump_if_error(compile_t* c, TryReturnInfo* try_return_info,
+  LLVMValueRef value);
 
 LLVMValueRef wrap_try_return_success(compile_t* c, TryReturnInfo* try_return_info,
-  LLVMValueRef value, reach_type_t* return_reach_type);
+  LLVMValueRef value);
 
-LLVMValueRef wrap_try_return_error(compile_t* c, TryReturnInfo* try_return_info,
-  reach_type_t* return_reach_type);
+LLVMValueRef wrap_try_return_error(compile_t* c, TryReturnInfo* try_return_info);
 
 PONY_EXTERN_C_END
 
diff --git a/tools/pony-lsp/ast_source_span.pony b/tools/pony-lsp/ast_source_span.pony
new file mode 100644
index 000000000..964a6a5ba
--- /dev/null
+++ b/tools/pony-lsp/ast_source_span.pony
@@ -0,0 +1,141 @@
+use "pony_compiler"
+
+primitive ASTSourceSpan
+  """
+  Computes the true source span of an AST node, including all descendants
+  whose `source_file()` is None (synthetic container nodes) or matches
+  `doc_path` (leaf tokens from the current file). Descendants whose
+  source_file() is a non-empty string that does not match doc_path are
+  excluded — this filters trait method bodies merged from other files.
+
+  The optional `max_pos` parameter caps the end of the computed span:
+  only descendants whose end position is strictly less than `max_pos`
+  contribute to `_max`. Pass the start position of the next sibling
+  entity to prevent synthesized constructors (ponyc inserts them for
+  bare primitives, bare classes, etc.) from inflating the entity's range
+  into the next entity's lines.
+
+  Seeded with the node's own position and end_pos (if any) so that
+  declaration keywords (tk_fun, tk_class, etc.) are included even though
+  they are the node's token rather than a child.
+
+  Note: AST.span() short-circuits on keyword tokens returning only the
+  keyword extent; this helper always scans children to get the full body
+  range. Required by any LSP response that quotes a "full declaration
+  range" for entity or member declarations.
+
+  Returns None when the computed span is inverted (should not occur for
+  well-formed AST nodes).
+  """
+
+  fun tag apply(
+    n: AST box,
+    doc_path: String val,
+    max_pos: (Position | None) = None)
+    : ((Position, Position) | None)
+  =>
+    """
+    Compute the span of `n`, returning `(start, end)` in ponyc's native
+    `Position` units (1-based line, 1-based column, end inclusive), or
+    `None` if the computed span is inverted.
+    """
+    // Seed with this node's own extent. Declaration nodes like tk_fun and
+    // tk_class have end_pos() set to their keyword's last column — include
+    // that so the keyword itself is covered even if no children are visited.
+    let n_start = n.position()
+    let n_end =
+      match \exhaustive\ n.end_pos()
+      | let ep: Position => ep
+      | None => n_start
+      end
+
+    let visitor =
+      object ref is ASTVisitor
+        var _min: Position = n_start
+        var _max: Position = n_end
+
+        fun ref visit(child: AST box): VisitResult =>
+          // Exclude descendants from other source files. This is the
+          // primary filter for nodes that reach here via a synthetic
+          // (None source_file) intermediary: AST.visit()'s own
+          // _from_same_source() returns true when either side is None,
+          // so a chain our_file -> None-source -> other_file can pass
+          // AST.visit()'s check. The explicit test here catches that.
+          // Note: returning Continue still descends into the child's
+          // subtree — only the child's own position is excluded from
+          // the min/max accumulation, not its descendants.
+          match child.source_file()
+          | let sf: String val =>
+            if sf != doc_path then
+              return Continue
+            end
+          end
+          let pos = child.position()
+          if pos < _min then
+            _min = pos
+          end
+          let child_ep =
+            match \exhaustive\ child.end_pos()
+            | let ep: Position => ep
+            | None => pos
+            end
+          // Only extend _max if child_ep is within the allowed bound.
+          // This prevents synthesized constructors (whose body tokens
+          // ponyc positions at the start of the next sibling entity)
+          // from inflating the span past the current entity's content.
+          let ep_in_bounds =
+            match \exhaustive\ max_pos
+            | None => true
+            | let m: Position => child_ep < m
+            end
+          if ep_in_bounds and (child_ep > _max) then
+            _max = child_ep
+          end
+          Continue
+
+        fun ref leave(child: AST box): VisitResult =>
+          Continue
+
+        fun min(): Position =>
+          _min
+
+        fun max(): Position =>
+          _max
+      end
+    n.visit(visitor)
+
+    let min = visitor.min()
+    let max = visitor.max()
+    if min <= max then
+      (min, max)
+    else
+      None
+    end
+
+primitive ASTClampedRange
+  """
+  Computes a clamped `LspPositionRange` from an AST node.
+
+  Calls `ASTSourceSpan(node, doc_path, max_pos)` to get the full source
+  extent, then clamps the start to `node.position()`. The clamp prevents
+  positions from referenced types earlier in the file (e.g. in `type`
+  aliases) from pulling the start before the declaration keyword.
+
+  Returns `None` when `ASTSourceSpan` returns an inverted span.
+  """
+  fun tag apply(
+    node: AST box,
+    doc_path: String val,
+    max_pos: (Position | None) = None)
+    : (LspPositionRange | None)
+  =>
+    match \exhaustive\ ASTSourceSpan(node, doc_path, max_pos)
+    | (let s: Position, let e: Position) =>
+      let n_pos = node.position()
+      let clamped_start = if s < n_pos then n_pos else s end
+      LspPositionRange(
+        LspPosition.from_ast_pos(clamped_start),
+        LspPosition.from_ast_pos_end(e))
+    | None =>
+      None
+    end
diff --git a/tools/pony-lsp/sibling_bound.pony b/tools/pony-lsp/sibling_bound.pony
new file mode 100644
index 000000000..5c5723cc2
--- /dev/null
+++ b/tools/pony-lsp/sibling_bound.pony
@@ -0,0 +1,51 @@
+use "pony_compiler"
+
+primitive SiblingBound
+  """
+  Returns the start position of the AST sibling that immediately follows `n`
+  within `n`'s parent's children list, or None if `n` is the last child or
+  has no parent.
+
+  Pass as `max_pos` to `ASTSourceSpan` to cap span computation at the next
+  sibling's start. This prevents synthesized-constructor end-bleed: ponyc
+  positions synthesized default constructors at the start of the next entity,
+  so capping at the sibling start excludes those tokens from the current
+  node's computed span.
+  """
+  fun apply(n: AST box): (Position | None) =>
+    let n_source =
+      match \exhaustive\ n.source_file()
+      | let sf: String val => sf
+      | None => return None
+      end
+    match n.parent()
+    | let parent: AST box =>
+      var past_n = false
+      for child in parent.children() do
+        if child == n then
+          past_n = true
+        elseif past_n then
+          return _sibling_pos(child, n, n_source)
+        end
+      end
+    end
+    None
+
+  fun _sibling_pos(
+    child: AST box,
+    n: AST box,
+    n_source: String val)
+    : (Position | None)
+  =>
+    """
+    Returns `child.position()` if `child` is from the same source file as `n`
+    and its position strictly follows `n`'s position, otherwise None.
+    """
+    let child_pos = child.position()
+    if child_pos <= n.position() then
+      return None
+    end
+    match \exhaustive\ child.source_file()
+    | let sf: String val if sf == n_source => child_pos
+    | let _: (String val | None) => None
+    end
diff --git a/tools/pony-lsp/symbols.pony b/tools/pony-lsp/symbols.pony
index 888b5e4f6..ccd4e8c06 100644
--- a/tools/pony-lsp/symbols.pony
+++ b/tools/pony-lsp/symbols.pony
@@ -97,7 +97,7 @@ class DocumentSymbol
       .update("name", this.name)
       .update("kind", this.kind)
       .update("range", this.range.to_json())
-      .update("selectionRange", this.range.to_json())
+      .update("selectionRange", this.selection_range.to_json())
     if this.detail isnt None then
       obj = obj.update("detail", detail)
     end
@@ -127,7 +127,27 @@ primitive DocumentSymbols
     module: Module,
     channel: Channel): Array[DocumentSymbol] ref
   =>
+    """
+    Build DocumentSymbol trees for every top-level entity in the module.
+    """
     let symbols: Array[DocumentSymbol] ref = Array[DocumentSymbol].create(4)
+    // Collect entity start positions for look-ahead. Each entity's range
+    // is bounded by the next entity's start — this prevents synthesized
+    // constructors (which ponyc positions at the next entity's line) from
+    // inflating the entity's span.
+    let entity_starts = Array[Position].create()
+    for module_child in module.ast.children() do
+      match module_child.id()
+      | TokenIds.tk_interface()
+      | TokenIds.tk_trait()
+      | TokenIds.tk_primitive()
+      | TokenIds.tk_class()
+      | TokenIds.tk_type()
+      | TokenIds.tk_actor()
+      | TokenIds.tk_struct() => entity_starts.push(module_child.position())
+      end
+    end
+    var entity_idx: USize = 0
     for module_child in module.ast.children() do
       let maybe_kind =
         match module_child.id()
@@ -143,23 +163,18 @@ primitive DocumentSymbols
         end
       match maybe_kind
       | let kind: I64 =>
+        let max_pos: (Position | None) =
+          try entity_starts(entity_idx + 1)? else None end
+        entity_idx = entity_idx + 1
         try
           let id = module_child(0)?
           if id.id() == TokenIds.tk_id() then
             let name = id.token_value() as String
-            (let start_pos, let end_pos) = module_child.span()
-            let full_range =
-              LspPositionRange(
-                LspPosition.from_ast_pos(start_pos),
-                LspPosition.from_ast_pos(end_pos))
-            (let id_start, let id_end) = id.span()
-            let selection_range =
-              LspPositionRange(
-                LspPosition.from_ast_pos(id_start),
-                LspPosition.from_ast_pos(id_end))
+            (let full_range, let selection_range) =
+              this._symbol_ranges(module_child, id, name, channel, max_pos)?
             let symbol =
               DocumentSymbol(name, kind, full_range, selection_range)
-            this.find_members(module_child, symbol, channel)
+            this.find_members(module_child, symbol, channel, max_pos)
             symbols.push(symbol)
           else
             channel.log("Expecred TK_ID, got " + TokenIds.string(id.id()))
@@ -174,7 +189,8 @@ primitive DocumentSymbols
   fun tag find_members(
     entity: AST,
     symbol: DocumentSymbol ref,
-    channel: Channel)
+    channel: Channel,
+    max_pos: (Position | None) = None)
   =>
     let members =
       try
@@ -192,6 +208,13 @@ primitive DocumentSymbols
       return
     end
     for entity_child in members.children() do
+      // Skip members whose position is at or beyond max_pos. ponyc
+      // positions synthesized constructors at the start of the next
+      // entity in the file; max_pos is that entity's start position.
+      match max_pos
+      | let m: Position =>
+        if entity_child.position() >= m then continue end
+      end
       try
         let maybe_kind_and_idx =
           match entity_child.id()
@@ -213,19 +236,50 @@ primitive DocumentSymbols
             TokenIds.string(entity_child.id()) +
             ", got " + TokenIds.string(id.id()))?
           let name = id.token_value() as String
-          (let start_pos, let end_pos) = entity_child.span()
-          let full_range =
-            LspPositionRange(
-              LspPosition.from_ast_pos(start_pos),
-              LspPosition.from_ast_pos(end_pos))
-          (let id_start, let id_end) = id.span()
-          let selection_range =
-            LspPositionRange(
-              LspPosition.from_ast_pos(id_start),
-              LspPosition.from_ast_pos(id_end))
+          (let full_range, let selection_range) =
+            this._symbol_ranges(entity_child, id, name, channel, max_pos)?
           let member_symbol =
             DocumentSymbol(name, kind, full_range, selection_range)
           symbol.push_child(member_symbol)
         end
       end
     end
+
+  fun tag _symbol_ranges(
+    node: AST box,
+    id: AST box,
+    name: String,
+    channel: Channel,
+    max_pos: (Position | None) = None)
+    : (LspPositionRange, LspPositionRange) ?
+  =>
+    """
+    Compute the full declaration range and the identifier selection range
+    for an entity or member AST node. Raises error (logging to `channel`)
+    if `source_file()` is absent or if `ASTClampedRange` returns an inverted
+    span — callers inside a `try` block will skip the symbol on failure.
+    """
+    let doc_path =
+      try
+        node.source_file() as String val
+      else
+        channel.log(
+          "No source_file for " +
+          TokenIds.string(node.id()) + " '" + name + "'")
+        error
+      end
+    let full_range =
+      match \exhaustive\ ASTClampedRange(node, doc_path, max_pos)
+      | let r: LspPositionRange => r
+      | None =>
+        channel.log(
+          "Inverted source span for " +
+          TokenIds.string(node.id()) + " '" + name + "'")
+        error
+      end
+    (let id_start, let id_end) = id.span()
+    let selection_range =
+      LspPositionRange(
+        LspPosition.from_ast_pos(id_start),
+        LspPosition.from_ast_pos_end(id_end))
+    (full_range, selection_range)
diff --git a/tools/pony-lsp/test/_definition_integration_tests.pony b/tools/pony-lsp/test/_definition_integration_tests.pony
index cfeaadd98..ef0d0781b 100644
--- a/tools/pony-lsp/test/_definition_integration_tests.pony
+++ b/tools/pony-lsp/test/_definition_integration_tests.pony
@@ -19,6 +19,7 @@ primitive _DefinitionIntegrationTests is TestList
     test(_DefinitionGenericsIntegrationTest.create(server))
     test(_DefinitionTupleIntegrationTest.create(server))
     test(_DefinitionTypeAliasIntegrationTest.create(server))
+    test(_DefinitionLastEntityBarePrimTest.create(server))
 
 class \nodoc\ iso _DefinitionClassIntegrationTest is UnitTest
   let _server: _LspTestServer
@@ -33,13 +34,13 @@ class \nodoc\ iso _DefinitionClassIntegrationTest is UnitTest
       h,
       _server,
       "definition/_class.pony",
-      [ // field usages → field declaration (line 4, "let" keyword span)
-        (7, 4, _DefinitionChecker([("_class.pony", (4, 2), (4, 5))]))
-        (10, 4, _DefinitionChecker([("_class.pony", (4, 2), (4, 5))]))
+      [ // field usages → field declaration
+        (7, 4, _DefinitionChecker([("_class.pony", (4, 2), (4, 17))]))
+        (10, 4, _DefinitionChecker([("_class.pony", (4, 2), (4, 17))]))
         // parameter usage → parameter declaration (line 6, "v: U32" span)
         (7, 13, _DefinitionChecker([("_class.pony", (6, 13), (6, 19))]))
-        // method call → method declaration (line 9, "fun" keyword span)
-        (13, 9, _DefinitionChecker([("_class.pony", (9, 2), (9, 5))]))
+        // method call → method declaration
+        (13, 9, _DefinitionChecker([("_class.pony", (9, 2), (10, 10))]))
         // no definition on docstring content
         (1, 4, _DefinitionChecker([]))])
 
@@ -56,8 +57,8 @@ class \nodoc\ iso _DefinitionThisIntegrationTest is UnitTest
       h,
       _server,
       "definition/_class.pony",
-      [ // `this` in method body → enclosing class declaration (line 0)
-        (13, 4, _DefinitionChecker([("_class.pony", (0, 0), (0, 5))]))])
+      [ // `this` in method body → enclosing class declaration
+        (13, 4, _DefinitionChecker([("_class.pony", (0, 0), (13, 13))]))])
 
 class \nodoc\ iso _DefinitionKeywordsIntegrationTest is UnitTest
   let _server: _LspTestServer
@@ -95,7 +96,7 @@ class \nodoc\ iso _DefinitionTraitIntegrationTest is UnitTest
       _server,
       "definition/_trait.pony",
       [ // call via trait-typed receiver → trait method declaration (line 7)
-        (50, 6, _DefinitionChecker([("_trait.pony", (7, 2), (7, 5))]))])
+        (50, 6, _DefinitionChecker([("_trait.pony", (7, 2), (7, 25))]))])
 
 class \nodoc\ iso _DefinitionUnionIntegrationTest is UnitTest
   let _server: _LspTestServer
@@ -113,8 +114,8 @@ class \nodoc\ iso _DefinitionUnionIntegrationTest is UnitTest
       [ // call via union-typed receiver → one definition per union member
         // _DefLeft.shared (line 29) and _DefRight.shared (line 35)
         (53, 6, _DefinitionChecker(
-          [ ("_trait.pony", (29, 2), (29, 5))
-            ("_trait.pony", (35, 2), (35, 5))]))])
+          [ ("_trait.pony", (29, 2), (29, 24))
+            ("_trait.pony", (35, 2), (35, 24))]))])
 
 class \nodoc\ iso _DefinitionCrossFileIntegrationTest is UnitTest
   let _server: _LspTestServer
@@ -130,10 +131,10 @@ class \nodoc\ iso _DefinitionCrossFileIntegrationTest is UnitTest
       _server,
       "definition/_cross_usage.pony",
       [ // type reference in parameter → class declaration in other file
-        (13, 16, _DefinitionChecker([("_cross_target.pony", (0, 0), (0, 5))]))
+        (13, 16, _DefinitionChecker([("_cross_target.pony", (0, 0), (13, 21))]))
         // method call → method declaration in other file (line 13)
         (14, 8, _DefinitionChecker(
-          [("_cross_target.pony", (13, 2), (13, 5))]))])
+          [("_cross_target.pony", (13, 2), (13, 21))]))])
 
 class \nodoc\ iso _DefinitionGenericsIntegrationTest is UnitTest
   let _server: _LspTestServer
@@ -166,7 +167,7 @@ class \nodoc\ iso _DefinitionTupleIntegrationTest is UnitTest
       _server,
       "definition/_tuple.pony",
       [ // `_1` tuple element access → `let pair` declaration
-        (16, 9, _DefinitionChecker([("_tuple.pony", (15, 4), (15, 7))]))])
+        (16, 9, _DefinitionChecker([("_tuple.pony", (15, 4), (15, 26))]))])
 
 class \nodoc\ iso _DefinitionTypeAliasIntegrationTest is UnitTest
   let _server: _LspTestServer
@@ -182,15 +183,49 @@ class \nodoc\ iso _DefinitionTypeAliasIntegrationTest is UnitTest
       _server,
       "definition/_type_alias.pony",
       [ // `Map` type alias in `Map[String, U32]` → Map type alias declaration
-        (17, 13, _DefinitionChecker([("map.pony", (3, 0), (3, 4))]))
-        // `String` type arg in `Map[String, U32]` → String class declaration
-        (17, 17, _DefinitionChecker([("string.pony", (8, 0), (8, 5))]))
+        (17, 13, _DefinitionChecker([("map.pony", (3, 0), (7, 7))]))
+        // `String` type arg in `Map[String, U32]` → String class declaration    -- DISABLED --
+        //(17, 17, _DefinitionChecker([("string.pony", (8, 0), (1682, 25))]))
         // `U32` type arg in `Map[String, U32]` → U32 primitive declaration
         (17, 25, _DefinitionChecker(
-          [("unsigned.pony", (185, 0), (185, 9))]))
+          [("unsigned.pony", (185, 0), (255, 60))]))
         // `_Alias` usage → type alias declaration (line 2)
         (19, 20, _DefinitionChecker(
-          [("_type_alias.pony", (2, 0), (2, 4))]))])
+          [("_type_alias.pony", (2, 0), (2, 18))]))
+       ])
+
+class \nodoc\ iso _DefinitionLastEntityBarePrimTest is UnitTest
+  """
+  goto_definition from the return-type annotation `_DefLastBarePrim` on line 1.
+  The cursor is on a `tk_nominal` in the return type, so `DefinitionResolver`
+  resolves directly to the `tk_primitive` entity node. `SiblingBound(node)`
+  returns `None` for this last entity, so `ASTClampedRange` runs without a
+  `max_pos` cap. This test guards against synthesized-constructor tokens
+  inflating the range end past the identifier when there is no next sibling.
+
+  _bare_prim.pony layout (0-indexed):
+    line 0: class _DefUsesBarePrim
+    line 1:   fun get(): _DefLastBarePrim =>
+    line 2:     _DefLastBarePrim
+    line 3: (blank)
+    line 4: primitive _DefLastBarePrim
+
+  Cursor at (1, 13) — `_DefLastBarePrim` as a return type. Expected definition
+  range: (4, 0)-(4, 26), the full `primitive _DefLastBarePrim` declaration.
+  """
+  let _server: _LspTestServer
+
+  new iso create(server: _LspTestServer) =>
+    _server = server
+
+  fun name(): String => "definition/integration/last_entity_bare_prim"
+
+  fun apply(h: TestHelper) =>
+    _RunLspChecks(
+      h,
+      _server,
+      "definition/_bare_prim.pony",
+      [ (1, 13, _DefinitionChecker([("_bare_prim.pony", (4, 0), (4, 26))]))])
 
 type DefinitionExpectation is (String val, (I64, I64), (I64, I64))
 
diff --git a/tools/pony-lsp/test/_document_symbol_integration_tests.pony b/tools/pony-lsp/test/_document_symbol_integration_tests.pony
new file mode 100644
index 000000000..4971fac4a
--- /dev/null
+++ b/tools/pony-lsp/test/_document_symbol_integration_tests.pony
@@ -0,0 +1,648 @@
+use ".."
+use "pony_test"
+use "files"
+use "json"
+
+primitive _DocumentSymbolIntegrationTests is TestList
+  new make() => None
+
+  fun tag tests(test: PonyTest) =>
+    let workspace_dir = Path.join(Path.dir(__loc.file()), "workspace")
+    let server = _LspTestServer(workspace_dir)
+    // All fixtures live under workspace/document_symbol/ so the whole
+    // suite compiles a single package once (the test server's first-
+    // `publish_diagnostics` gate only drains pending requests on the
+    // initial compile — a mid-suite package switch would race the new
+    // compile and hand documentSymbol requests an empty module).
+    test(_DocSymContainmentTest.create(server))
+    test(_DocSymRangeTest.create(server))
+    test(_DocSymEntityKindsTest.create(server))
+    test(_DocSymMemberKindsTest.create(server))
+    test(_DocSymCrossFileTraitTest.create(server))
+    test(_DocSymTypeAliasRangeTest.create(server))
+    test(_DocSymPrimitiveRangeTest.create(server))
+
+class \nodoc\ iso _DocSymContainmentTest is UnitTest
+  """
+  Regression guard for #5240 follow-up: every symbol's selectionRange must
+  be contained within its range. Checks the top-level symbols and all
+  nested children recursively.
+  """
+  let _server: _LspTestServer
+
+  new iso create(server: _LspTestServer) =>
+    _server = server
+
+  fun name(): String =>
+    "document_symbol/integration/containment"
+
+  fun apply(h: TestHelper) =>
+    _RunLspChecks(
+      h,
+      _server,
+      "document_symbol/_ds_containment.pony",
+      [(0, 0, _DocSymContainmentChecker)])
+
+class \nodoc\ iso _DocSymRangeTest is UnitTest
+  """
+  Verifies that documentSymbol returns the full declaration range for
+  two representative symbols, asserting all four coordinates of both
+  `range` and `selectionRange` exactly.
+
+  "_DsContainment" — `range` must span from the `class` keyword to the
+  end of the class body; `selectionRange` covers the identifier only.
+
+  "increment" — `range` must span from the `fun` keyword to the end of
+  the method body; `selectionRange` covers the identifier only.
+
+  Exact position tuples are derived from the fixture layout in
+  `document_symbol/_ds_containment.pony`. Reformatting that file
+  invalidates the tuples below.
+  """
+  let _server: _LspTestServer
+
+  new iso create(server: _LspTestServer) =>
+    _server = server
+
+  fun name(): String =>
+    "document_symbol/integration/range"
+
+  fun apply(h: TestHelper) =>
+    _RunLspChecks(
+      h,
+      _server,
+      "document_symbol/_ds_containment.pony",
+      [ ( 0, 0,
+          _DocSymRangeChecker(
+            "_DsContainment",
+            None,
+                      // range: (start_line, start_char, end_line, end_char)
+            (0, 0, 18, 10),
+            // selectionRange: (start_line, start_char, end_line, end_char)
+            (0, 6, 0, 20)))
+        ( 0, 1,
+          _DocSymRangeChecker(
+            "increment",
+            "_DsContainment",
+            (13, 2, 15, 10),
+            (13, 10, 13, 19)))])
+
+class \nodoc\ iso _DocSymEntityKindsTest is UnitTest
+  """
+  Asserts that every Pony entity token surfaces as a top-level
+  DocumentSymbol with the LSP SymbolKind it is mapped to by
+  `DocumentSymbols.from_module`:
+    class, actor, primitive, type  → sk_class (5)
+    trait, interface               → sk_interface (11)
+    struct                         → sk_struct (23)
+
+  Regression guard against silent edits to the `tk_*` → SymbolKind
+  match table at `tools/pony-lsp/symbols.pony:153-163`.
+  """
+  let _server: _LspTestServer
+
+  new iso create(server: _LspTestServer) =>
+    _server = server
+
+  fun name(): String =>
+    "document_symbol/integration/entity_kinds"
+
+  fun apply(h: TestHelper) =>
+    _RunLspChecks(
+      h,
+      _server,
+      "document_symbol/_ds_ent_interface.pony",
+      [ ( 0, 0,
+          _DocSymTopLevelKindsChecker(
+            [ ("_DsEntClass", 5)
+              ("_DsEntActor", 5)
+              ("_DsEntTrait", 11)
+              ("_DsEntInterface", 11)
+              ("_DsEntPrimitive", 5)
+              ("_DsEntStruct", 23)
+              ("_DsEntType", 5)]))])
+
+class \nodoc\ iso _DocSymMemberKindsTest is UnitTest
+  """
+  Asserts that every member token surfaces as a child DocumentSymbol
+  under its enclosing entity with the LSP SymbolKind it is mapped to
+  by `DocumentSymbols.find_members`:
+    tk_new                         → constructor (9)
+    tk_fun, tk_be                  → method (6)
+    tk_flet, tk_fvar, tk_embed     → field (8)
+
+  Regression guard against silent edits to the member `tk_*` →
+  SymbolKind match table at `tools/pony-lsp/symbols.pony:214-220`.
+  """
+  let _server: _LspTestServer
+
+  new iso create(server: _LspTestServer) =>
+    _server = server
+
+  fun name(): String =>
+    "document_symbol/integration/member_kinds"
+
+  fun apply(h: TestHelper) =>
+    _RunLspChecks(
+      h,
+      _server,
+      "document_symbol/_ds_member_host.pony",
+      [ ( 0, 0,
+          _DocSymChildKindsChecker(
+            "_DsMemberHost",
+            [ ("_let_field", 8)
+              ("_var_field", 8)
+              ("_embed_field", 8)
+              ("create", 9)
+              ("ds_fun", 6)
+              ("ds_be", 6)]))])
+
+class \nodoc\ iso _DocSymCrossFileTraitTest is UnitTest
+  """
+  Regression guard for the source-file filter in `ASTSourceSpan`.
+
+  `_DsImpl` (in `_ds_impl.pony`) inherits `ds_default_method` from
+  `_DsTrait` (in `_ds_trait.pony`) without overriding it. ponyc merges
+  the trait's default body into the impl's AST, but the merged tokens
+  carry the trait file's `source_file()`. `ASTSourceSpan` filters those
+  descendants out when computing the impl's span.
+
+  If the filter regresses, `_DsImpl.range.end.line` would jump to a line
+  in the trait file (past line 20). The assertion below caps end.line
+  well below that, so any drift into the trait file is detected.
+  """
+  let _server: _LspTestServer
+
+  new iso create(server: _LspTestServer) =>
+    _server = server
+
+  fun name(): String =>
+    "document_symbol/integration/cross_file_trait"
+
+  fun apply(h: TestHelper) =>
+    _RunLspChecks(
+      h,
+      _server,
+      "document_symbol/_ds_impl.pony",
+      [ ( 0, 0,
+          _DocSymMaxEndLineChecker("_DsImpl", 15))])
+
+class \nodoc\ iso _DocSymTypeAliasRangeTest is UnitTest
+  """
+  Verifies that a `type` alias has a range covering the entire
+  declaration — from the `type` keyword to the end of the nominal
+  reference — and a selectionRange covering only the identifier.
+
+  Regression guard for cross-entity bleed: type aliases hold usage-site
+  positions for the nominal reference, so `ASTSourceSpan` must not drift
+  into the referenced entity's tokens.
+
+  Exact positions are derived from `_ds_ent_interface.pony` line 23
+  (1-based) = line 22 (0-based):
+    `type _DsEntType is _DsEntClass`
+     ^0                            ^30
+          ^5        ^15
+  """
+  let _server: _LspTestServer
+
+  new iso create(server: _LspTestServer) =>
+    _server = server
+
+  fun name(): String =>
+    "document_symbol/integration/type_alias_range"
+
+  fun apply(h: TestHelper) =>
+    _RunLspChecks(
+      h,
+      _server,
+      "document_symbol/_ds_ent_interface.pony",
+      [ ( 0, 0,
+          _DocSymRangeChecker(
+            "_DsEntType",
+            None,
+            (22, 0, 22, 30),
+            (22, 5, 22, 15)))])
+
+class \nodoc\ iso _DocSymPrimitiveRangeTest is UnitTest
+  """
+  Verifies that a bare `primitive` (no explicit body) has a range
+  covering only the declaration line — from the `primitive` keyword to
+  the end of the identifier — and a selectionRange covering only the
+  identifier.
+
+  Exact positions are derived from `_ds_ent_interface.pony` line 18
+  (1-based) = line 17 (0-based):
+    `primitive _DsEntPrimitive`
+     ^0                       ^25
+               ^10            ^25
+  """
+  let _server: _LspTestServer
+
+  new iso create(server: _LspTestServer) =>
+    _server = server
+
+  fun name(): String =>
+    "document_symbol/integration/primitive_range"
+
+  fun apply(h: TestHelper) =>
+    _RunLspChecks(
+      h,
+      _server,
+      "document_symbol/_ds_ent_interface.pony",
+      [ ( 0, 0,
+          _DocSymRangeChecker(
+            "_DsEntPrimitive",
+            None,
+            (17, 0, 17, 25),
+            (17, 10, 17, 25)))])
+
+class val _DocSymContainmentChecker
+  """
+  Validates that every DocumentSymbol (and every nested child) in a
+  textDocument/documentSymbol response has selectionRange contained
+  within range.
+  """
+  new val create() => None
+
+  fun lsp_method(): String =>
+    Methods.text_document().document_symbol()
+
+  fun lsp_range(): (None | (I64, I64, I64, I64)) =>
+    None
+
+  fun lsp_context(): (None | JsonObject) =>
+    None
+
+  fun lsp_extra_params(): (None | JsonObject) =>
+    None
+
+  fun check(res: ResponseMessage val, h: TestHelper): Bool =>
+    match res.result
+    | let arr: JsonArray =>
+      var ok = true
+      for item in arr.values() do
+        ok = _check_symbol(item, h) and ok
+      end
+      ok
+    else
+      h.fail("documentSymbol: expected array result, got null")
+      false
+    end
+
+  fun _check_symbol(item: JsonValue, h: TestHelper): Bool =>
+    var ok = true
+    try
+      let name = JsonNav(item)("name").as_string()?
+      let r_sl = JsonNav(item)("range")("start")("line").as_i64()?
+      let r_sc = JsonNav(item)("range")("start")("character").as_i64()?
+      let r_el = JsonNav(item)("range")("end")("line").as_i64()?
+      let r_ec = JsonNav(item)("range")("end")("character").as_i64()?
+      let s_sl = JsonNav(item)("selectionRange")("start")("line").as_i64()?
+      let s_sc = JsonNav(item)("selectionRange")("start")("character").as_i64()?
+      let s_el = JsonNav(item)("selectionRange")("end")("line").as_i64()?
+      let s_ec = JsonNav(item)("selectionRange")("end")("character").as_i64()?
+
+      // selectionRange.start must be >= range.start
+      let start_ok =
+        (s_sl > r_sl) or ((s_sl == r_sl) and (s_sc >= r_sc))
+      if not h.assert_true(
+        start_ok,
+        "documentSymbol '" + name +
+        "': selectionRange.start (" + s_sl.string() + ":" + s_sc.string() +
+        ") must be >= range.start (" + r_sl.string() + ":" + r_sc.string() +
+        ")")
+      then
+        ok = false
+      end
+
+      // selectionRange.end must be <= range.end
+      let end_ok =
+        (s_el < r_el) or ((s_el == r_el) and (s_ec <= r_ec))
+      if not h.assert_true(
+        end_ok,
+        "documentSymbol '" + name +
+        "': selectionRange.end (" + s_el.string() + ":" + s_ec.string() +
+        ") must be <= range.end (" + r_el.string() + ":" + r_ec.string() +
+        ")")
+      then
+        ok = false
+      end
+
+      // Recurse into children if present.
+      try
+        let children = JsonNav(item)("children").as_array()?
+        for child in children.values() do
+          ok = _check_symbol(child, h) and ok
+        end
+      end
+    else
+      h.fail("documentSymbol: malformed symbol entry")
+      ok = false
+    end
+    ok
+
+class val _DocSymRangeChecker
+  """
+  Validates that a named symbol (optionally nested under a named parent)
+  in a documentSymbol response has the expected exact `range` and
+  `selectionRange` coordinates. Asserting all four coordinates of both
+  fields catches regressions that collapse a range to `{0,0}-{0,0}` or
+  that set `range` to a keyword-only span.
+  """
+  let _symbol_name: String
+  let _parent_name: (String | None)
+  let _range: (I64, I64, I64, I64)
+  let _selection_range: (I64, I64, I64, I64)
+
+  new val create(
+    symbol_name: String,
+    parent_name: (String | None),
+    range': (I64, I64, I64, I64),
+    selection_range': (I64, I64, I64, I64))
+  =>
+    _symbol_name = symbol_name
+    _parent_name = parent_name
+    _range = range'
+    _selection_range = selection_range'
+
+  fun lsp_method(): String =>
+    Methods.text_document().document_symbol()
+
+  fun lsp_range(): (None | (I64, I64, I64, I64)) =>
+    None
+
+  fun lsp_context(): (None | JsonObject) =>
+    None
+
+  fun lsp_extra_params(): (None | JsonObject) =>
+    None
+
+  fun check(res: ResponseMessage val, h: TestHelper): Bool =>
+    match res.result
+    | let arr: JsonArray =>
+      let found = _find(arr, _symbol_name, _parent_name)
+      match found
+      | None =>
+        h.fail(
+          "documentSymbol: symbol '" + _symbol_name +
+          "' not found in response")
+        false
+      else
+        _assert_ranges(found, h)
+      end
+    else
+      h.fail("documentSymbol: expected array result, got null")
+      false
+    end
+
+  fun _find(
+    arr: JsonArray,
+    name: String,
+    parent: (String | None))
+    : JsonValue
+  =>
+    for item in arr.values() do
+      try
+        let item_name = JsonNav(item)("name").as_string()?
+        match \exhaustive\ parent
+        | None =>
+          if item_name == name then return item end
+        | let p: String =>
+          if item_name == p then
+            try
+              let children = JsonNav(item)("children").as_array()?
+              for child in children.values() do
+                try
+                  if JsonNav(child)("name").as_string()? == name then
+                    return child
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+    None
+
+  fun _assert_ranges(item: JsonValue, h: TestHelper): Bool =>
+    (let exp_r_sl, let exp_r_sc, let exp_r_el, let exp_r_ec) = _range
+    (let exp_s_sl, let exp_s_sc, let exp_s_el, let exp_s_ec) = _selection_range
+    var ok = true
+    try
+      let r_sl = JsonNav(item)("range")("start")("line").as_i64()?
+      let r_sc = JsonNav(item)("range")("start")("character").as_i64()?
+      let r_el = JsonNav(item)("range")("end")("line").as_i64()?
+      let r_ec = JsonNav(item)("range")("end")("character").as_i64()?
+      let s_sl = JsonNav(item)("selectionRange")("start")("line").as_i64()?
+      let s_sc = JsonNav(item)("selectionRange")("start")("character").as_i64()?
+      let s_el = JsonNav(item)("selectionRange")("end")("line").as_i64()?
+      let s_ec = JsonNav(item)("selectionRange")("end")("character").as_i64()?
+
+      ok = h.assert_eq[I64](
+        exp_r_sl, r_sl, _symbol_name + ": range.start.line") and ok
+      ok = h.assert_eq[I64](
+        exp_r_sc, r_sc, _symbol_name + ": range.start.character") and ok
+      ok = h.assert_eq[I64](
+        exp_r_el, r_el, _symbol_name + ": range.end.line") and ok
+      ok = h.assert_eq[I64](
+        exp_r_ec, r_ec, _symbol_name + ": range.end.character") and ok
+      ok = h.assert_eq[I64](
+        exp_s_sl, s_sl, _symbol_name + ": selectionRange.start.line") and ok
+      ok = h.assert_eq[I64](
+        exp_s_sc,
+        s_sc,
+        _symbol_name + ": selectionRange.start.character") and ok
+      ok = h.assert_eq[I64](
+        exp_s_el, s_el, _symbol_name + ": selectionRange.end.line") and ok
+      ok = h.assert_eq[I64](
+        exp_s_ec, s_ec, _symbol_name + ": selectionRange.end.character") and ok
+    else
+      h.fail(_symbol_name + ": malformed symbol entry")
+      ok = false
+    end
+    ok
+
+class val _DocSymTopLevelKindsChecker
+  """
+  Validates that the documentSymbol response contains exactly the
+  expected list of top-level (name, kind) pairs, in any order.
+  """
+  let _expected: Array[(String, I64)] val
+
+  new val create(expected: Array[(String, I64)] val) =>
+    _expected = expected
+
+  fun lsp_method(): String =>
+    Methods.text_document().document_symbol()
+
+  fun lsp_range(): (None | (I64, I64, I64, I64)) =>
+    None
+
+  fun lsp_context(): (None | JsonObject) =>
+    None
+
+  fun lsp_extra_params(): (None | JsonObject) =>
+    None
+
+  fun check(res: ResponseMessage val, h: TestHelper): Bool =>
+    var ok = true
+    match res.result
+    | let arr: JsonArray =>
+      ok = h.assert_eq[USize](
+        _expected.size(),
+        arr.size(),
+        "documentSymbol: top-level count") and ok
+      for (exp_name, exp_kind) in _expected.values() do
+        var found = false
+        for item in arr.values() do
+          try
+            let n = JsonNav(item)("name").as_string()?
+            let k = JsonNav(item)("kind").as_i64()?
+            if (n == exp_name) and (k == exp_kind) then
+              found = true
+              break
+            end
+          end
+        end
+        ok = h.assert_true(
+          found,
+          "documentSymbol: expected top-level symbol '" + exp_name +
+          "' with kind " + exp_kind.string() + " not found") and ok
+      end
+    else
+      h.fail("documentSymbol: expected array result, got null")
+      ok = false
+    end
+    ok
+
+class val _DocSymChildKindsChecker
+  """
+  Finds `_parent_name` at the top level of the documentSymbol response,
+  then validates that its `children` array contains exactly the
+  expected list of (name, kind) pairs, in any order.
+  """
+  let _parent_name: String
+  let _expected: Array[(String, I64)] val
+
+  new val create(
+    parent_name: String,
+    expected: Array[(String, I64)] val)
+  =>
+    _parent_name = parent_name
+    _expected = expected
+
+  fun lsp_method(): String =>
+    Methods.text_document().document_symbol()
+
+  fun lsp_range(): (None | (I64, I64, I64, I64)) =>
+    None
+
+  fun lsp_context(): (None | JsonObject) =>
+    None
+
+  fun lsp_extra_params(): (None | JsonObject) =>
+    None
+
+  fun check(res: ResponseMessage val, h: TestHelper): Bool =>
+    match res.result
+    | let arr: JsonArray =>
+      for item in arr.values() do
+        try
+          if JsonNav(item)("name").as_string()? == _parent_name then
+            return _check_children(item, h)
+          end
+        end
+      end
+      h.fail(
+        "documentSymbol: parent '" + _parent_name + "' not found")
+      false
+    else
+      h.fail("documentSymbol: expected array result, got null")
+      false
+    end
+
+  fun _check_children(parent: JsonValue, h: TestHelper): Bool =>
+    var ok = true
+    try
+      let children = JsonNav(parent)("children").as_array()?
+      ok = h.assert_eq[USize](
+        _expected.size(),
+        children.size(),
+        "documentSymbol '" + _parent_name + "': children count") and ok
+      for (exp_name, exp_kind) in _expected.values() do
+        var found = false
+        for child in children.values() do
+          try
+            let n = JsonNav(child)("name").as_string()?
+            let k = JsonNav(child)("kind").as_i64()?
+            if (n == exp_name) and (k == exp_kind) then
+              found = true
+              break
+            end
+          end
+        end
+        ok = h.assert_true(
+          found,
+          "documentSymbol '" + _parent_name +
+          "': expected child '" + exp_name + "' with kind " +
+          exp_kind.string() + " not found") and ok
+      end
+    else
+      h.fail(
+        "documentSymbol '" + _parent_name +
+        "': children array missing")
+      ok = false
+    end
+    ok
+
+class val _DocSymMaxEndLineChecker
+  """
+  Asserts that a named top-level symbol's range.end.line is strictly
+  less than `_max_end_line`. Used to detect source-file filter
+  regressions where the range inflates to include descendants from
+  other files.
+  """
+  let _symbol_name: String
+  let _max_end_line: I64
+
+  new val create(symbol_name: String, max_end_line: I64) =>
+    _symbol_name = symbol_name
+    _max_end_line = max_end_line
+
+  fun lsp_method(): String =>
+    Methods.text_document().document_symbol()
+
+  fun lsp_range(): (None | (I64, I64, I64, I64)) =>
+    None
+
+  fun lsp_context(): (None | JsonObject) =>
+    None
+
+  fun lsp_extra_params(): (None | JsonObject) =>
+    None
+
+  fun check(res: ResponseMessage val, h: TestHelper): Bool =>
+    match res.result
+    | let arr: JsonArray =>
+      for item in arr.values() do
+        try
+          if JsonNav(item)("name").as_string()? == _symbol_name then
+            let end_line =
+              JsonNav(item)("range")("end")("line").as_i64()?
+            return h.assert_true(
+              end_line < _max_end_line,
+              _symbol_name +
+              ": range.end.line (" + end_line.string() +
+              ") should be < " + _max_end_line.string() +
+              " (source-file filter)")
+          end
+        end
+      end
+      h.fail(
+        "documentSymbol: symbol '" + _symbol_name + "' not found")
+      false
+    else
+      h.fail("documentSymbol: expected array result, got null")
+      false
+    end
diff --git a/tools/pony-lsp/test/_selection_range_integration_tests.pony b/tools/pony-lsp/test/_selection_range_integration_tests.pony
index 5d9a9d8ed..664284b69 100644
--- a/tools/pony-lsp/test/_selection_range_integration_tests.pony
+++ b/tools/pony-lsp/test/_selection_range_integration_tests.pony
@@ -15,6 +15,8 @@ primitive _SelectionRangeIntegrationTests is TestList
     test(_SelectionRangeKeywordTest.create(server))
     test(_SelectionRangePositionsArrayTest.create(server))
     test(_SelectionRangeEmptyPositionsTest.create(server))
+    test(_SelectionRangePrimitiveBoundTest.create(server))
+    test(_SelectionRangeCrossFileTraitTest.create(server))
 
 class \nodoc\ iso _SelectionRangeTokenTest is UnitTest
   """
@@ -359,3 +361,85 @@ class val _SelectionRangeChecker
       "(" + sl.string() + ":" + sc.string() +
       ")-(" + el.string() + ":" + ec.string() + ")"
     end
+
+class \nodoc\ iso _SelectionRangePrimitiveBoundTest is UnitTest
+  """
+  Regression test for synthesized-constructor end-bleed in SelectionRanges.
+
+  ponyc inserts a synthesized `create` constructor for bare primitives and
+  positions its tokens at the start of the next entity. Without the
+  SiblingBound cap, ASTSourceSpan would include those tokens when computing
+  the primitive's span, inflating the range into the next entity's lines.
+
+  Fixture: `selection_range/_sr_edge_cases.pony`
+    line 0: primitive _SrPrimA
+    line 1: primitive _SrPrimB
+
+  Cursor at (0, 0) — the `primitive` keyword of `_SrPrimA`.  The innermost
+  SelectionRange entry is the `tk_primitive` node.  With the SiblingBound cap
+  (max_pos = start of _SrPrimB), the synthesized constructor tokens are
+  excluded and the span correctly ends at (0, 18) — the last char of
+  `_SrPrimA`.  Without the cap, the span's end would bleed onto line 1.
+  """
+  let _server: _LspTestServer
+
+  new iso create(server: _LspTestServer) =>
+    _server = server
+
+  fun name(): String =>
+    "selection_range/integration/primitive_bound"
+
+  fun apply(h: TestHelper) =>
+    _RunLspChecks(
+      h,
+      _server,
+      "selection_range/_sr_edge_cases.pony",
+      [ (0, 0,
+        _SelectionRangeChecker(recover val
+          [as _SrCheck: (0, 0, 2, (0, 0, 0, 18))]
+        end))])
+
+class \nodoc\ iso _SelectionRangeCrossFileTraitTest is UnitTest
+  """
+  Regression test for SiblingBound guard 2 (cross-source-file sibling).
+
+  ponyc merges default trait methods into implementing classes. The merged
+  node appears as a sibling in tk_members with the trait file's source_file().
+  SiblingBound._sibling_pos must return None (guard 2) rather than returning
+  the trait-file position as max_pos.
+
+  Fixture: _sr_cross_impl.pony implements _SrCrossTrait from
+  _sr_cross_trait.pony.
+  sr_own_method is on 1-indexed line 3 of the impl file; the merged
+  sr_cross_default is on 1-indexed line 4 of the trait file.
+  sr_cross_default.line (4) > sr_own_method.line (3), so guard 1
+  (child_pos <= n.position()) does NOT fire; guard 2 fires instead.
+
+  Without guard 2, max_pos would be (line=4, col=3) from the trait file.
+  The body token `42` is on impl line 4 at columns 5-6. ep_in_bounds =
+  (4, 6) < (4, 3) is false, so the body would be excluded from the method's
+  span. The method range would shrink to just the fun header, and the `42`
+  token's range (on the next line) would fail the LSP containment check.
+
+  _sr_cross_impl.pony layout (0-indexed):
+    line 1: class _SrCrossImpl is _SrCrossTrait
+    line 2:   fun sr_own_method(): U32 =>
+    line 3:     42                              <- cursor here (3, 4)
+  """
+  let _server: _LspTestServer
+
+  new iso create(server: _LspTestServer) =>
+    _server = server
+
+  fun name(): String =>
+    "selection_range/integration/cross_file_trait"
+
+  fun apply(h: TestHelper) =>
+    _RunLspChecks(
+      h,
+      _server,
+      "selection_range/_sr_cross_impl.pony",
+      [ (3, 4,
+        _SelectionRangeChecker(recover val
+          [as _SrCheck: (3, 4, 3, None)]
+        end))])
diff --git a/tools/pony-lsp/test/_type_definition_integration_tests.pony b/tools/pony-lsp/test/_type_definition_integration_tests.pony
index 837271d07..d0980c32b 100644
--- a/tools/pony-lsp/test/_type_definition_integration_tests.pony
+++ b/tools/pony-lsp/test/_type_definition_integration_tests.pony
@@ -19,13 +19,13 @@ class \nodoc\ iso _TypeDefinitionLocalVarIntegrationTest is UnitTest
   """
   Cursor on `obj` in `demo()` (line 28, col 4) — explicitly annotated let.
   type_definition.pony layout (0-indexed lines/cols):
-    line 21:  class _TypeDefTarget          target declaration (21,0)-(21,5)
+    line 21:  class _TypeDefTarget          target declaration (21,0)-(23,10)
     line 25:  class _TypeDefUser
     line 26:    fun demo() =>
     line 27:      let obj: _TypeDefTarget = ...
     line 28:      obj                            obj at (28,4)
 
-  Expects type definition at class _TypeDefTarget (21,0)-(21,5).
+  Expects type definition at class _TypeDefTarget (21,0)-(23,10).
   """
   let _server: _LspTestServer
 
@@ -40,17 +40,17 @@ class \nodoc\ iso _TypeDefinitionLocalVarIntegrationTest is UnitTest
       _server,
       "type_definition/type_definition.pony",
       [ (28, 4, _TypeDefinitionChecker(
-        [("type_definition.pony", (21, 0), (21, 5))]))])
+        [("type_definition.pony", (21, 0), (23, 10))]))])
 
 class \nodoc\ iso _TypeDefinitionParamIntegrationTest is UnitTest
   """
   Cursor on `target` in `with_param()` (line 31, col 4) — typed parameter.
   type_definition.pony layout (0-indexed lines/cols):
-    line 21:  class _TypeDefTarget          target declaration (21,0)-(21,5)
+    line 21:  class _TypeDefTarget          target declaration (21,0)-(23,10)
     line 30:    fun with_param(target: _TypeDefTarget) =>
     line 31:      target                             target at (31,4)
 
-  Expects type definition at class _TypeDefTarget (21,0)-(21,5).
+  Expects type definition at class _TypeDefTarget (21,0)-(23,10).
   """
   let _server: _LspTestServer
 
@@ -65,7 +65,7 @@ class \nodoc\ iso _TypeDefinitionParamIntegrationTest is UnitTest
       _server,
       "type_definition/type_definition.pony",
       [ (31, 4, _TypeDefinitionChecker(
-        [("type_definition.pony", (21, 0), (21, 5))]))])
+        [("type_definition.pony", (21, 0), (23, 10))]))])
 
 class \nodoc\ iso _TypeDefinitionNoTypeIntegrationTest is UnitTest
   """
@@ -91,12 +91,12 @@ class \nodoc\ iso _TypeDefinitionInferredIntegrationTest is UnitTest
   Cursor on `x` in `inferred_demo()` (line 35, col 4) — type inferred from
   `_TypeDefTarget.create()`, no explicit annotation.
   type_definition.pony layout (0-indexed lines/cols):
-    line 21:  class _TypeDefTarget          target declaration (21,0)-(21,5)
+    line 21:  class _TypeDefTarget          target declaration (21,0)-(23,10)
     line 33:    fun inferred_demo() =>
     line 34:      let x = _TypeDefTarget.create()
     line 35:      x                              x at (35,4)
 
-  Expects type definition at class _TypeDefTarget (21,0)-(21,5).
+  Expects type definition at class _TypeDefTarget (21,0)-(23,10).
   """
   let _server: _LspTestServer
 
@@ -111,7 +111,7 @@ class \nodoc\ iso _TypeDefinitionInferredIntegrationTest is UnitTest
       _server,
       "type_definition/type_definition.pony",
       [ (35, 4, _TypeDefinitionChecker(
-        [("type_definition.pony", (21, 0), (21, 5))]))])
+        [("type_definition.pony", (21, 0), (23, 10))]))])
 
 class val _TypeDefinitionChecker
   let _expected: Array[DefinitionExpectation] val
diff --git a/tools/pony-lsp/test/_workspace_symbol_integration_tests.pony b/tools/pony-lsp/test/_workspace_symbol_integration_tests.pony
index 546b2b04f..b1b25a14d 100644
--- a/tools/pony-lsp/test/_workspace_symbol_integration_tests.pony
+++ b/tools/pony-lsp/test/_workspace_symbol_integration_tests.pony
@@ -9,26 +9,26 @@ primitive _WorkspaceSymbolIntegrationTests is TestList
   fun tag tests(test: PonyTest) =>
     let workspace_dir = Path.join(Path.dir(__loc.file()), "workspace")
     let server = _LspTestServer(workspace_dir)
-    let fixture = "references/referenced_class.pony"
-    test(_WsSymExactMatchTest.create(server, fixture))
-    test(_WsSymSubstringMatchTest.create(server, fixture))
-    test(_WsSymSubstringInMiddleTest.create(server, fixture))
-    test(_WsSymCaseInsensitiveTest.create(server, fixture))
-    test(_WsSymMemberTest.create(server, fixture))
-    test(_WsSymNoMatchTest.create(server, fixture))
-    test(_WsSymEmptyQueryTest.create(server, fixture))
+    // All fixtures live under workspace/workspace_symbol/ so the suite
+    // compiles a single package once.
+    test(_WsSymExactMatchTest.create(server))
+    test(_WsSymSubstringMatchTest.create(server))
+    test(_WsSymSubstringInMiddleTest.create(server))
+    test(_WsSymCaseInsensitiveTest.create(server))
+    test(_WsSymMemberTest.create(server))
+    test(_WsSymNoMatchTest.create(server))
+    test(_WsSymEmptyQueryTest.create(server))
+    test(_WsSymRangeTest.create(server))
 
 class \nodoc\ iso _WsSymExactMatchTest is UnitTest
   """
-  Query "ReferencedClass" → exactly 1 top-level result named "ReferencedClass"
-  with symbol kind 5 (class).
+  Query "_WsSymHost" → exactly 1 top-level result named "_WsSymHost"
+  with symbol kind 5 (class; actors are reported as sk_class).
   """
   let _server: _LspTestServer
-  let _fixture: String val
 
-  new iso create(server: _LspTestServer, fixture: String val) =>
+  new iso create(server: _LspTestServer) =>
     _server = server
-    _fixture = fixture
 
   fun name(): String =>
     "workspace_symbol/integration/exact_match"
@@ -37,22 +37,21 @@ class \nodoc\ iso _WsSymExactMatchTest is UnitTest
     _RunLspChecks(
       h,
       _server,
-      _fixture,
+      "workspace_symbol/_ws_sym_host.pony",
       [ ( 0, 0,
           _WsSymChecker(
-            "ReferencedClass",
-            [("ReferencedClass", 5, "referenced_class.pony", None)]))])
+            "_WsSymHost",
+            [("_WsSymHost", 5, "_ws_sym_host.pony", None)]))])
 
 class \nodoc\ iso _WsSymSubstringMatchTest is UnitTest
   """
-  Query "Referenced" → matches "ReferencedClass" only (prefix substring).
+  Query "_WsSym" → prefix substring matches both top-level entities
+  `_WsSymHost` (actor) and `_WsSymInner` (class).
   """
   let _server: _LspTestServer
-  let _fixture: String val
 
-  new iso create(server: _LspTestServer, fixture: String val) =>
+  new iso create(server: _LspTestServer) =>
     _server = server
-    _fixture = fixture
 
   fun name(): String =>
     "workspace_symbol/integration/substring_match"
@@ -61,23 +60,22 @@ class \nodoc\ iso _WsSymSubstringMatchTest is UnitTest
     _RunLspChecks(
       h,
       _server,
-      _fixture,
+      "workspace_symbol/_ws_sym_host.pony",
       [ ( 0, 0,
           _WsSymChecker(
-            "Referenced",
-            [("ReferencedClass", 5, "referenced_class.pony", None)]))])
+            "_WsSym",
+            [ ("_WsSymHost", 5, "_ws_sym_host.pony", None)
+              ("_WsSymInner", 5, "_ws_sym_host.pony", None)]))])
 
 class \nodoc\ iso _WsSymSubstringInMiddleTest is UnitTest
   """
-  Query "Class" → matches "ReferencedClass" via substring in the middle.
+  Query "Host" → matches `_WsSymHost` via substring in the middle.
   Distinguishes substring matching from prefix-only matching.
   """
   let _server: _LspTestServer
-  let _fixture: String val
 
-  new iso create(server: _LspTestServer, fixture: String val) =>
+  new iso create(server: _LspTestServer) =>
     _server = server
-    _fixture = fixture
 
   fun name(): String =>
     "workspace_symbol/integration/substring_in_middle"
@@ -86,22 +84,20 @@ class \nodoc\ iso _WsSymSubstringInMiddleTest is UnitTest
     _RunLspChecks(
       h,
       _server,
-      _fixture,
+      "workspace_symbol/_ws_sym_host.pony",
       [ ( 0, 0,
           _WsSymChecker(
-            "Class",
-            [("ReferencedClass", 5, "referenced_class.pony", None)]))])
+            "Host",
+            [("_WsSymHost", 5, "_ws_sym_host.pony", None)]))])
 
 class \nodoc\ iso _WsSymCaseInsensitiveTest is UnitTest
   """
-  Query "referencedclass" (all lower-case) → still matches "ReferencedClass".
+  Query "_wssymhost" (all lower-case) → still matches `_WsSymHost`.
   """
   let _server: _LspTestServer
-  let _fixture: String val
 
-  new iso create(server: _LspTestServer, fixture: String val) =>
+  new iso create(server: _LspTestServer) =>
     _server = server
-    _fixture = fixture
 
   fun name(): String =>
     "workspace_symbol/integration/case_insensitive"
@@ -110,23 +106,21 @@ class \nodoc\ iso _WsSymCaseInsensitiveTest is UnitTest
     _RunLspChecks(
       h,
       _server,
-      _fixture,
+      "workspace_symbol/_ws_sym_host.pony",
       [ ( 0, 0,
           _WsSymChecker(
-            "referencedclass",
-            [("ReferencedClass", 5, "referenced_class.pony", None)]))])
+            "_wssymhost",
+            [("_WsSymHost", 5, "_ws_sym_host.pony", None)]))])
 
 class \nodoc\ iso _WsSymMemberTest is UnitTest
   """
-  Query "increment" → matches the method "increment" inside "ReferencedClass",
-  which should appear with containerName "ReferencedClass".
+  Query "increment" → matches the method `increment` inside `_WsSymHost`,
+  which should appear with containerName "_WsSymHost".
   """
   let _server: _LspTestServer
-  let _fixture: String val
 
-  new iso create(server: _LspTestServer, fixture: String val) =>
+  new iso create(server: _LspTestServer) =>
     _server = server
-    _fixture = fixture
 
   fun name(): String =>
     "workspace_symbol/integration/member_match"
@@ -135,23 +129,21 @@ class \nodoc\ iso _WsSymMemberTest is UnitTest
     _RunLspChecks(
       h,
       _server,
-      _fixture,
+      "workspace_symbol/_ws_sym_host.pony",
       [ ( 0, 0,
           _WsSymChecker(
             "increment",
-            [ ("increment", 6, "referenced_class.pony",
-                "ReferencedClass")]))])
+            [ ("increment", 6, "_ws_sym_host.pony",
+                "_WsSymHost")]))])
 
 class \nodoc\ iso _WsSymNoMatchTest is UnitTest
   """
   Query "zzznomatch" → empty result array.
   """
   let _server: _LspTestServer
-  let _fixture: String val
 
-  new iso create(server: _LspTestServer, fixture: String val) =>
+  new iso create(server: _LspTestServer) =>
     _server = server
-    _fixture = fixture
 
   fun name(): String =>
     "workspace_symbol/integration/no_match"
@@ -160,20 +152,18 @@ class \nodoc\ iso _WsSymNoMatchTest is UnitTest
     _RunLspChecks(
       h,
       _server,
-      _fixture,
+      "workspace_symbol/_ws_sym_host.pony",
       [(0, 0, _WsSymChecker("zzznomatch", []))])
 
 class \nodoc\ iso _WsSymEmptyQueryTest is UnitTest
   """
-  Empty query → all symbols from the fixture file are returned: the
-  top-level class, its field, constructor, and two methods.
+  Empty query → all symbols from the fixture: the top-level actor and
+  class, plus every member (var/let/embed fields, constructor, fun, be).
   """
   let _server: _LspTestServer
-  let _fixture: String val
 
-  new iso create(server: _LspTestServer, fixture: String val) =>
+  new iso create(server: _LspTestServer) =>
     _server = server
-    _fixture = fixture
 
   fun name(): String =>
     "workspace_symbol/integration/empty_query"
@@ -182,15 +172,82 @@ class \nodoc\ iso _WsSymEmptyQueryTest is UnitTest
     _RunLspChecks(
       h,
       _server,
-      _fixture,
+      "workspace_symbol/_ws_sym_host.pony",
       [ ( 0, 0,
           _WsSymChecker(
             "",
-            [ ("ReferencedClass", 5, "referenced_class.pony", None)
-              ("_count", 8, "referenced_class.pony", "ReferencedClass")
-              ("create", 9, "referenced_class.pony", "ReferencedClass")
-              ("increment", 6, "referenced_class.pony", "ReferencedClass")
-              ("maybe", 6, "referenced_class.pony", "ReferencedClass")]))])
+            [ ("_WsSymHost", 5, "_ws_sym_host.pony", None)
+              ("_count", 8, "_ws_sym_host.pony", "_WsSymHost")
+              ("_name", 8, "_ws_sym_host.pony", "_WsSymHost")
+              ("_inner", 8, "_ws_sym_host.pony", "_WsSymHost")
+              ("create", 9, "_ws_sym_host.pony", "_WsSymHost")
+              ("increment", 6, "_ws_sym_host.pony", "_WsSymHost")
+              ("ping", 6, "_ws_sym_host.pony", "_WsSymHost")
+              ("_WsSymInner", 5, "_ws_sym_host.pony", None)
+              ("create", 9, "_ws_sym_host.pony", "_WsSymInner")]))])
+
+class \nodoc\ iso _WsSymRangeTest is UnitTest
+  """
+  Verifies that workspace/symbol returns the full declaration range for
+  every member and top-level token kind. Each check asserts the exact
+  LSP range (start_line, start_char, end_line, end_char), not just the
+  start column — a degenerate `{0,0}-{0,0}` response would pass a one-
+  coordinate check.
+
+  Exact position tuples are derived from the fixture layout in
+  `workspace_symbol/_ws_sym_host.pony`; see the comment at the top of
+  that file for the coupling note.
+
+  Coverage map (symbol → token kind asserted):
+    _WsSymHost   → tk_actor
+    _count       → tk_fvar
+    _name        → tk_flet
+    _inner       → tk_embed
+    create       → tk_new
+    increment    → tk_fun
+    ping         → tk_be
+    _WsSymInner  → tk_class
+  """
+  let _server: _LspTestServer
+
+  new iso create(server: _LspTestServer) =>
+    _server = server
+
+  fun name(): String =>
+    "workspace_symbol/integration/range"
+
+  fun apply(h: TestHelper) =>
+    // Distinct dummy (line, character) per check so the pony_test
+    // action strings are unique — failure diagnostics will point at the
+    // specific assertion rather than all sharing one action id.
+    _RunLspChecks(
+      h,
+      _server,
+      "workspace_symbol/_ws_sym_host.pony",
+      [ ( 0, 0,
+          _WsSymRangeChecker(
+            "_WsSymHost", "_WsSymHost", None, (5, 0, 18, 10)))
+        ( 0, 1,
+          _WsSymRangeChecker(
+            "_count", "_count", "_WsSymHost", (6, 2, 6, 17)))
+        ( 0, 2,
+          _WsSymRangeChecker(
+            "_name", "_name", "_WsSymHost", (7, 2, 7, 19)))
+        ( 0, 3,
+          _WsSymRangeChecker(
+            "_inner", "_inner", "_WsSymHost", (8, 2, 8, 27)))
+        ( 0, 4,
+          _WsSymRangeChecker(
+            "create", "create", "_WsSymHost", (10, 2, 11, 14)))
+        ( 0, 5,
+          _WsSymRangeChecker(
+            "increment", "increment", "_WsSymHost", (13, 2, 15, 10)))
+        ( 0, 6,
+          _WsSymRangeChecker(
+            "ping", "ping", "_WsSymHost", (17, 2, 18, 10)))
+        ( 0, 7,
+          _WsSymRangeChecker(
+            "_WsSymInner", "_WsSymInner", None, (20, 0, 20, 17)))])
 
 class val _WsSymChecker
   """
@@ -287,3 +344,89 @@ class val _WsSymChecker
       end
     end
     ok
+
+class val _WsSymRangeChecker
+  """
+  Validates that a named symbol in a workspace/symbol response has a
+  location.range equal to the expected (start_line, start_char, end_line,
+  end_char) tuple. Asserting all four coordinates catches regressions
+  that collapse the range to `{0,0}-{0,0}` or any other degenerate span
+  — a single-coordinate check would be silently satisfied by several
+  wrong values.
+
+  The optional `container` parameter disambiguates symbols whose names
+  are not unique within a fixture (e.g. two `create` constructors).
+  When `None`, any symbol with the matching name is accepted.
+  """
+  let _query: String
+  let _symbol_name: String
+  let _container: (String | None)
+  let _expected: (I64, I64, I64, I64)
+
+  new val create(
+    query: String,
+    symbol_name: String,
+    container: (String | None),
+    expected: (I64, I64, I64, I64))
+  =>
+    _query = query
+    _symbol_name = symbol_name
+    _container = container
+    _expected = expected
+
+  fun lsp_method(): String =>
+    Methods.workspace().symbol()
+
+  fun lsp_range(): (None | (I64, I64, I64, I64)) =>
+    None
+
+  fun lsp_context(): (None | JsonObject) =>
+    None
+
+  fun lsp_extra_params(): (None | JsonObject) =>
+    JsonObject.update("query", _query)
+
+  fun check(res: ResponseMessage val, h: TestHelper): Bool =>
+    (let exp_sl, let exp_sc, let exp_el, let exp_ec) = _expected
+    match res.result
+    | let arr: JsonArray =>
+      for item in arr.values() do
+        try
+          let container: (String | None) =
+            try JsonNav(item)("containerName").as_string()? else None end
+          let container_ok =
+            match (_container, container)
+            | (None, None) => true
+            | (let a: String, let b: String) => a == b
+            else false
+            end
+          let name_ok =
+            JsonNav(item)("name").as_string()? == _symbol_name
+          if name_ok and container_ok then
+            let r = JsonNav(item)("location")("range")
+            let sl = r("start")("line").as_i64()?
+            let sc = r("start")("character").as_i64()?
+            let el = r("end")("line").as_i64()?
+            let ec = r("end")("character").as_i64()?
+            var ok =
+              h.assert_eq[I64](
+                exp_sl, sl, _symbol_name + ": range.start.line")
+            ok = h.assert_eq[I64](
+              exp_sc, sc, _symbol_name + ": range.start.character") and ok
+            ok = h.assert_eq[I64](
+              exp_el, el, _symbol_name + ": range.end.line") and ok
+            ok = h.assert_eq[I64](
+              exp_ec, ec, _symbol_name + ": range.end.character") and ok
+            return ok
+          end
+        end
+      end
+      h.fail(
+        "workspace/symbol '" + _query +
+        "': expected symbol '" + _symbol_name + "' not found")
+      false
+    else
+      h.fail(
+        "workspace/symbol '" + _query + "': expected array result, got null")
+      false
+    end
diff --git a/tools/pony-lsp/test/main.pony b/tools/pony-lsp/test/main.pony
index 33a950dc1..eeaea2cc5 100644
--- a/tools/pony-lsp/test/main.pony
+++ b/tools/pony-lsp/test/main.pony
@@ -28,6 +28,7 @@ actor Main is TestList
     _DefinitionIntegrationTests.make().tests(test)
     _TypeDefinitionIntegrationTests.make().tests(test)
     _DocumentHighlightIntegrationTests.make().tests(test)
+    _DocumentSymbolIntegrationTests.make().tests(test)
     _InlayHintIntegrationTests.make().tests(test)
     _ReferencesIntegrationTests.make().tests(test)
     _RenameIntegrationTests.make().tests(test)
diff --git a/tools/pony-lsp/test/workspace/definition/_bare_prim.pony b/tools/pony-lsp/test/workspace/definition/_bare_prim.pony
new file mode 100644
index 000000000..4368b6100
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/definition/_bare_prim.pony
@@ -0,0 +1,5 @@
+class _DefUsesBarePrim
+  fun get(): _DefLastBarePrim =>
+    _DefLastBarePrim
+
+primitive _DefLastBarePrim
diff --git a/tools/pony-lsp/test/workspace/document_symbol/_ds_containment.pony b/tools/pony-lsp/test/workspace/document_symbol/_ds_containment.pony
new file mode 100644
index 000000000..334154755
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/document_symbol/_ds_containment.pony
@@ -0,0 +1,19 @@
+class _DsContainment
+  """
+  Fixture for `document_symbol/integration/containment` and
+  `document_symbol/integration/range`. Layout mirrors
+  `references/referenced_class.pony` so `fun ref increment` lands on a
+  known line, giving the range test a meaningful min_end_line below the
+  keyword-only span.
+  """
+  var _count: U32 = 0
+
+  new create() =>
+    _count = 0
+
+  fun ref increment(): U32 =>
+    _count = _count + 1
+    _count
+
+  fun maybe(): (U32 | None) =>
+    None
diff --git a/tools/pony-lsp/test/workspace/document_symbol/_ds_ent_interface.pony b/tools/pony-lsp/test/workspace/document_symbol/_ds_ent_interface.pony
new file mode 100644
index 000000000..225ff7f46
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/document_symbol/_ds_ent_interface.pony
@@ -0,0 +1,23 @@
+// Fixture for `document_symbol/integration/entity_kinds` — exercises every
+// top-level entity token that `DocumentSymbols.from_module` maps to an LSP
+// SymbolKind (class, actor, trait, interface, primitive, struct, type).
+//
+// Regression guard against silent edits to the `tk_*` → SymbolKind match
+// table at `tools/pony-lsp/symbols.pony:153-163`.
+
+class _DsEntClass
+
+actor _DsEntActor
+
+trait _DsEntTrait
+  fun ds_trait_method(): U32
+
+interface _DsEntInterface
+  fun ds_interface_method(): U32
+
+primitive _DsEntPrimitive
+
+struct _DsEntStruct
+  let _f: U32 = 0
+
+type _DsEntType is _DsEntClass
diff --git a/tools/pony-lsp/test/workspace/document_symbol/_ds_impl.pony b/tools/pony-lsp/test/workspace/document_symbol/_ds_impl.pony
new file mode 100644
index 000000000..59e667377
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/document_symbol/_ds_impl.pony
@@ -0,0 +1,13 @@
+// Fixture for `document_symbol/integration/cross_file_trait` — impl half.
+//
+// `_DsImpl` inherits `ds_default_method` from `_DsTrait` (defined in
+// `_ds_trait.pony`) without overriding it. After ponyc sugar, the default
+// method's body is merged into `_DsImpl`'s AST, but its tokens carry the
+// trait file's `source_file()`. `ASTSourceSpan` filters those out when
+// building the class's documentSymbol `range`.
+//
+// The test asserts that `_DsImpl.range.end.line` stays within this
+// file — a regression in the source-file filter would inflate the end
+// line to match the trait file, well past this file's length.
+
+class _DsImpl is _DsTrait
diff --git a/tools/pony-lsp/test/workspace/document_symbol/_ds_member_host.pony b/tools/pony-lsp/test/workspace/document_symbol/_ds_member_host.pony
new file mode 100644
index 000000000..0f0f03056
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/document_symbol/_ds_member_host.pony
@@ -0,0 +1,24 @@
+// Fixture for `document_symbol/integration/member_kinds` — exercises every
+// member token that `DocumentSymbols.find_members` maps to an LSP SymbolKind
+// (`tk_new` → constructor; `tk_fun`/`tk_be` → method; `tk_flet`/`tk_fvar`/
+// `tk_embed` → field).
+//
+// Regression guard against silent edits to the member `tk_*` → SymbolKind
+// match table at `tools/pony-lsp/symbols.pony:214-220`. Actor so that
+// behaviours (`be`) are legal.
+
+actor _DsMemberHost
+  let _let_field: U32 = 0
+  var _var_field: U32 = 0
+  embed _embed_field: _DsEmbedTarget = _DsEmbedTarget
+
+  new create() =>
+    None
+
+  fun ref ds_fun(): U32 =>
+    _var_field
+
+  be ds_be() =>
+    None
+
+class _DsEmbedTarget
diff --git a/tools/pony-lsp/test/workspace/document_symbol/_ds_trait.pony b/tools/pony-lsp/test/workspace/document_symbol/_ds_trait.pony
new file mode 100644
index 000000000..a43d717f8
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/document_symbol/_ds_trait.pony
@@ -0,0 +1,27 @@
+// Fixture for `document_symbol/integration/cross_file_trait` — trait half.
+//
+// The trait provides a default method body. ponyc merges that default
+// into classes that declare `is _DsTrait` without overriding it, so the
+// implementing class's AST contains descendant tokens whose
+// `source_file()` points *here*, not at the impl file. `ASTSourceSpan`
+// filters those out so the impl class's documentSymbol `range` stays
+// within its own file.
+//
+// The padding lines below push the trait method body past line 20. If
+// the source-file filter in `ASTSourceSpan` regresses, the impl class's
+// `range.end.line` in `_ds_impl.pony` would jump to this file's line
+// numbers — detectable as an end.line past the impl file's actual end.
+//
+// Pairs with `_ds_impl.pony`.
+
+trait _DsTrait
+  """
+  Trait with a default method so ponyc merges its body into
+  non-overriding implementers.
+  """
+
+  fun ds_default_method(): U32 =>
+    let a: U32 = 0
+    let b: U32 = 0
+    let c: U32 = 0
+    a + b + c + 1
diff --git a/tools/pony-lsp/test/workspace/document_symbol/document_symbol.pony b/tools/pony-lsp/test/workspace/document_symbol/document_symbol.pony
new file mode 100644
index 000000000..582579069
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/document_symbol/document_symbol.pony
@@ -0,0 +1,24 @@
+"""
+Test fixtures for exercising LSP textDocument/documentSymbol functionality.
+
+Each file in this package targets a specific slice of `DocumentSymbols`:
+
+  _ds_containment.pony — layout mirrors the references fixture; drives
+    the containment and range integration tests (selectionRange ⊆ range,
+    full-declaration range spans past the keyword).
+
+  _ds_ent_interface.pony — one of every top-level entity token
+    (`tk_class`, `tk_actor`, `tk_trait`, `tk_interface`, `tk_primitive`,
+    `tk_struct`, `tk_type`) to guard the entity → SymbolKind map in
+    `DocumentSymbols.from_module`.
+
+  member_kinds.pony — one of every member token (`tk_new`, `tk_fun`,
+    `tk_be`, `tk_flet`, `tk_fvar`, `tk_embed`) under an actor so
+    behaviours are legal; guards the member → SymbolKind map in
+    `DocumentSymbols.find_members`.
+
+  _ds_trait.pony / _ds_impl.pony — trait with a default method body and
+    a non-overriding implementer. Regression guard for the source-file
+    filter in `ASTSourceSpan`: if the filter drops, the impl class's
+    range.end.line inflates into the trait file's lines.
+"""
diff --git a/tools/pony-lsp/test/workspace/selection_range/_sr_cross_impl.pony b/tools/pony-lsp/test/workspace/selection_range/_sr_cross_impl.pony
new file mode 100644
index 000000000..021422df4
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/selection_range/_sr_cross_impl.pony
@@ -0,0 +1,4 @@
+// Fixture for SiblingBound cross-source-file guard (guard 2) test.
+class _SrCrossImpl is _SrCrossTrait
+  fun sr_own_method(): U32 =>
+    42
diff --git a/tools/pony-lsp/test/workspace/selection_range/_sr_cross_trait.pony b/tools/pony-lsp/test/workspace/selection_range/_sr_cross_trait.pony
new file mode 100644
index 000000000..1481d0982
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/selection_range/_sr_cross_trait.pony
@@ -0,0 +1,5 @@
+// Fixture for SiblingBound cross-source-file guard (guard 2) test.
+// Pairs with _sr_cross_impl.pony.
+trait _SrCrossTrait
+  fun sr_cross_default(): U32 =>
+    0
diff --git a/tools/pony-lsp/test/workspace/selection_range/_sr_edge_cases.pony b/tools/pony-lsp/test/workspace/selection_range/_sr_edge_cases.pony
new file mode 100644
index 000000000..0792b9321
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/selection_range/_sr_edge_cases.pony
@@ -0,0 +1,2 @@
+primitive _SrPrimA
+primitive _SrPrimB
diff --git a/tools/pony-lsp/test/workspace/workspace_symbol/_ws_sym_host.pony b/tools/pony-lsp/test/workspace/workspace_symbol/_ws_sym_host.pony
new file mode 100644
index 000000000..a0dd542a3
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/workspace_symbol/_ws_sym_host.pony
@@ -0,0 +1,21 @@
+// Fixture for workspace/symbol integration tests. Reformatting this
+// file (reindenting, moving members, renaming) invalidates the exact
+// (line, col) tuples asserted by `_WsSymRangeTest` in
+// `_workspace_symbol_integration_tests.pony`. Keep it stable.
+
+actor _WsSymHost
+  var _count: U32 = 0
+  let _name: String = ""
+  embed _inner: Array[U8] = Array[U8]
+
+  new create() =>
+    _count = 0
+
+  fun ref increment(): U32 =>
+    _count = _count + 1
+    _count
+
+  be ping() =>
+    None
+
+class _WsSymInner
diff --git a/tools/pony-lsp/test/workspace/workspace_symbol/workspace_symbol.pony b/tools/pony-lsp/test/workspace/workspace_symbol/workspace_symbol.pony
new file mode 100644
index 000000000..bd80431ea
--- /dev/null
+++ b/tools/pony-lsp/test/workspace/workspace_symbol/workspace_symbol.pony
@@ -0,0 +1,9 @@
+"""
+Test fixtures for exercising LSP workspace/symbol functionality.
+
+  _ws_sym_host.pony — an actor + trailing class covering every member
+    token (`tk_new`, `tk_fun`, `tk_be`, `tk_flet`, `tk_fvar`, `tk_embed`)
+    plus two top-level entity tokens (`tk_actor`, `tk_class`). Drives
+    the match-semantics tests (exact / substring / case / container /
+    empty / no-match) and the range test.
+"""
diff --git a/tools/pony-lsp/workspace/selection_ranges.pony b/tools/pony-lsp/workspace/selection_ranges.pony
index 3363543bc..3b0129012 100644
--- a/tools/pony-lsp/workspace/selection_ranges.pony
+++ b/tools/pony-lsp/workspace/selection_ranges.pony
@@ -58,7 +58,7 @@ primitive SelectionRanges
     var last_el: USize = 0
     var last_ec: USize = 0
 
-    // TODO(perf): _source_span traverses each ancestor's entire subtree, so
+    // TODO(perf): ASTSourceSpan traverses each ancestor's entire subtree, so
     // total work is O(sum of subtree sizes) ≈ O(depth * module_node_count).
     // A bottom-up approach — one full traversal recording spans by node, then
     // reading cached values per chain entry — would reduce this to O(N).
@@ -66,8 +66,15 @@ primitive SelectionRanges
     while i > 0 do
       i = i - 1
       let n = try chain(i)? else continue end
-      match \exhaustive\ _source_span(n, doc_path)
+      match \exhaustive\ ASTSourceSpan(n, doc_path, SiblingBound(n))
       | (let s: Position, let e: Position) =>
+        // Note: no clamped-start correction here, unlike _symbol_ranges and
+        // _node_location. Selection ranges must grow outward — an ancestor's
+        // range legitimately starts before n.position() when real descendants
+        // (e.g. earlier tokens in a sequence) extend the span backwards.
+        // Clamping to n.position() would move a parent's start forward past
+        // its own child's start, breaking the LSP containment requirement.
+        //
         // Deduplicate: skip if this span is identical to the last emitted.
         let sl = s.line()
         let sc = s.column()
@@ -102,83 +109,3 @@ primitive SelectionRanges
     end
     result
 
-  fun _source_span(
-    n: AST box,
-    doc_path: String val)
-    : ((Position, Position) | None)
-  =>
-    """
-    Compute the source span of AST node `n`, including all descendants
-    whose `source_file()` is None (synthetic container nodes) or matches
-    `doc_path` (leaf tokens from the current file). Descendants whose
-    source_file() is a non-empty string that does not match doc_path are
-    excluded — this filters trait method bodies merged from other files.
-
-    Seeded with the node's own position and end_pos (if any) so that
-    declaration keywords (tk_fun, tk_class, etc.) are included even though
-    they are the node's token rather than a child.
-
-    Note: span() short-circuits on keyword tokens returning only the keyword
-    extent; this visitor always scans children to get the full body range.
-
-    Returns None when the computed span is inverted (should not occur for
-    well-formed AST nodes).
-    """
-    // Seed with this node's own extent. Declaration nodes like tk_fun and
-    // tk_class have end_pos() set to their keyword's last column — include
-    // that so the keyword itself is covered even if no children are visited.
-    let n_start = n.position()
-    let n_end =
-      match \exhaustive\ n.end_pos()
-      | let ep: Position => ep
-      | None => n_start
-      end
-
-    let visitor =
-      object ref is ASTVisitor
-        var _min: Position = n_start
-        var _max: Position = n_end
-
-        fun ref visit(child: AST box): VisitResult =>
-          // Exclude descendants from other source files. Note: returning
-          // Continue (not Stop) still descends into the child's subtree;
-          // AST.visit() itself pre-filters children by _from_same_source(),
-          // so this check is defence-in-depth.
-          match child.source_file()
-          | let sf: String val =>
-            if sf != doc_path then
-              return Continue
-            end
-          end
-          let pos = child.position()
-          if pos < _min then
-            _min = pos
-          end
-          let child_ep =
-            match \exhaustive\ child.end_pos()
-            | let ep: Position => ep
-            | None => pos
-            end
-          if child_ep > _max then
-            _max = child_ep
-          end
-          Continue
-
-        fun ref leave(child: AST box): VisitResult =>
-          Continue
-
-        fun min(): Position =>
-          _min
-
-        fun max(): Position =>
-          _max
-      end
-    n.visit(visitor)
-
-    let min = visitor.min()
-    let max = visitor.max()
-    if min <= max then
-      (min, max)
-    else
-      None
-    end
diff --git a/tools/pony-lsp/workspace/workspace_manager.pony b/tools/pony-lsp/workspace/workspace_manager.pony
index 983421262..104890805 100644
--- a/tools/pony-lsp/workspace/workspace_manager.pony
+++ b/tools/pony-lsp/workspace/workspace_manager.pony
@@ -754,20 +754,13 @@ actor WorkspaceManager
       this._channel.log(ast.debug())
       var json_arr = JsonArray
       for ast_definition in ast.definitions().values() do
-        (let start_pos, let end_pos) = ast_definition.span()
-        try
-          json_arr =
-            json_arr.push(
-              LspLocation(
-                Uris.from_path(ast_definition.source_file() as String val),
-                LspPositionRange(
-                  LspPosition.from_ast_pos(start_pos),
-                  LspPosition.from_ast_pos_end(end_pos))
-              ).to_json()
-            )
-        else
+        match \exhaustive\ _node_location(ast_definition)
+        | let loc: LspLocation val =>
+          json_arr = json_arr.push(loc.to_json())
+        | None =>
           this._channel.log(
-            "No source file found for definition: " + ast_definition.debug())
+            "No source file found for definition: " +
+              ast_definition.debug())
         end
       end
       this._channel.send(ResponseMessage(request.id, json_arr))
@@ -798,20 +791,13 @@ actor WorkspaceManager
       match ast.ast_type()
       | let type_ast: AST =>
         for type_def in type_ast.definitions().values() do
-          (let start_pos, let end_pos) = type_def.span()
-          try
-            json_arr =
-              json_arr.push(
-                LspLocation(
-                  Uris.from_path(type_def.source_file() as String val),
-                  LspPositionRange(
-                    LspPosition.from_ast_pos(start_pos),
-                    LspPosition.from_ast_pos_end(end_pos))
-                ).to_json()
-              )
-          else
+          match \exhaustive\ _node_location(type_def)
+          | let loc: LspLocation val =>
+            json_arr = json_arr.push(loc.to_json())
+          | None =>
             this._channel.log(
-              "No source file found for type definition: " + type_def.debug())
+              "No source file found for type definition: " +
+                type_def.debug())
           end
         end
       end
@@ -884,7 +870,7 @@ actor WorkspaceManager
                       .update("uri", file_uri)
                       .update(
                         "range",
-                        symbol.selection_range.to_json())))
+                        symbol.range.to_json())))
           end
           for child in symbol.children.values() do
             if _symbol_matches(child.name, query_lower) then
@@ -900,7 +886,7 @@ actor WorkspaceManager
                         .update("uri", file_uri)
                         .update(
                           "range",
-                          child.selection_range.to_json())))
+                          child.range.to_json())))
             end
           end
         end
@@ -908,6 +894,25 @@ actor WorkspaceManager
     end
     aggregator.add_results(results)
 
+  fun _node_location(node: AST box): (LspLocation val | None) =>
+    """
+    Builds an `LspLocation` for `node`.
+
+    Returns `None` if the node has no source file (e.g. synthesised nodes)
+    or if the computed source span is inverted.
+    """
+    try
+      let doc_path = node.source_file() as String val
+      let range =
+        match \exhaustive\ ASTClampedRange(node, doc_path, SiblingBound(node))
+        | let r: LspPositionRange => r
+        | None => error
+        end
+      LspLocation(Uris.from_path(doc_path), range)
+    else
+      None
+    end
+
   fun _symbol_matches(name: String, query_lower: String): Bool =>
     """
     Returns true if `name` matches `query_lower` (already lowercased).