update

Author: observerw

python/src/lsap/hover.py

@@ -34,11 +34,11 @@ async def __call__(self, req: HoverRequest) -> HoverResponse | None:
         file_path, lsp_pos = loc_resp.file_path, loc_resp.position.to_lsp()
         hover = await self.client.request_hover(file_path, lsp_pos)
 
-        if not hover:
+        if hover is None:
             return None
 
         contents = ""
-        if isinstance(hover.contents, str):
+        if isinstance(hover.value, str):
             contents = hover.contents
         elif isinstance(hover.contents, list):
             contents = "\n".join(

python/src/lsap/symbol.py

@@ -2,7 +2,7 @@
 
 from functools import cached_property
 from pathlib import Path
-from typing import Protocol, override
+from typing import Protocol, override, runtime_checkable
 
 from attrs import define
 from lsap_schema.symbol import SymbolRequest, SymbolResponse
@@ -18,6 +18,7 @@
 from .symbol_outline import SymbolOutlineCapability
 
 
+@runtime_checkable
 class SymbolClient(
     WithRequestDocumentSymbol,
     WithRequestHover,

schema/src/lsap_schema/__init__.py

@@ -84,7 +84,14 @@
 )
 
 # Types
-from .types import Position, Range, SymbolInfo, SymbolKind
+from .types import (
+    Position,
+    Range,
+    SymbolCodeInfo,
+    SymbolDetailInfo,
+    SymbolInfo,
+    SymbolKind,
+)
 
 # Workspace
 from .workspace_symbol import (
@@ -140,6 +147,8 @@
     "SymbolScope",
     "Position",
     "Range",
+    "SymbolCodeInfo",
+    "SymbolDetailInfo",
     "SymbolInfo",
     "SymbolKind",
     # Reference

schema/src/lsap_schema/abc.py

@@ -27,18 +27,6 @@ def format(self, template_name: str = "markdown") -> str:
                 )
 
 
-class SymbolInfoRequest(Request):
-    """
-    Base request for retrieving symbol information.
-    """
-
-    include_hover: bool = True
-    """Whether to include hover/documentation information"""
-
-    include_code: bool = False
-    """Whether to include the symbol's source code content"""
-
-
 class PaginatedRequest(Request):
     """
     Base request for paginated results.

schema/src/lsap_schema/definition.py

@@ -2,12 +2,12 @@
 
 from pydantic import ConfigDict
 
-from .abc import Response, SymbolInfoRequest
+from .abc import Response
 from .locate import LocateRequest
-from .types import SymbolInfo
+from .types import SymbolCodeInfo
 
 
-class DefinitionRequest(LocateRequest, SymbolInfoRequest):
+class DefinitionRequest(LocateRequest):
     """
     Finds the definition, declaration, or type definition of a symbol.
 
@@ -28,30 +28,19 @@ class DefinitionRequest(LocateRequest, SymbolInfoRequest):
 {%- for item in items -%}
 ## `{{ item.file_path }}`: {{ item.path | join: "." }} (`{{ item.kind }}`)
 
-{% if item.detail -%}
-{{ item.detail }}
-
-{% endif -%}
-{% if item.hover != nil -%}
-### Documentation
-{{ item.hover }}
-
-{% endif -%}
-{% if item.code != nil -%}
 ### Content
 ```{{ item.file_path.suffix | remove_first: "." }}
 {{ item.code }}
 ```
 
-{% endif -%}
-{%- endfor -%}
+{% endfor -%}
 {%- endif %}
 """
 
 
 class DefinitionResponse(Response):
     request: DefinitionRequest
-    items: list[SymbolInfo]
+    items: list[SymbolCodeInfo]
 
     model_config = ConfigDict(
         json_schema_extra={

schema/src/lsap_schema/hover.py

@@ -18,12 +18,12 @@ class HoverRequest(LocateRequest):
 markdown_template: Final = """
 # Hover Information
 
-{{ contents }}
+{{ content }}
 """
 
 
 class HoverResponse(Response):
-    contents: str
+    content: str
     """The hover content, usually markdown."""
 
     model_config = ConfigDict(

schema/src/lsap_schema/locate.py

@@ -62,7 +62,7 @@ class Locate(BaseModel):
     """Text pattern with marker for exact position; if no marker, positions at match start."""
 
     marker: str = HERE
-    """Position marker in find pattern. Change if source contains the default '<HERE>'."""
+    """Position marker in find pattern. Change this if source contains the default '<HERE>'."""
 
     @model_validator(mode="after")
     def check_valid_locate(self):
@@ -79,7 +79,7 @@ def check_valid_locate(self):
 
 class LocateRange(BaseModel):
     """
-    Locate a range for operations like codeAction.
+    Locate a range.
 
     Examples:
         # Select symbol body

schema/src/lsap_schema/reference.py

@@ -5,14 +5,14 @@
 
 from .abc import PaginatedRequest, PaginatedResponse
 from .locate import LocateRequest
-from .types import SymbolInfo
+from .types import SymbolDetailInfo
 
 
 class ReferenceItem(BaseModel):
     file_path: Path
     line: int = Field(..., description="1-based line number")
     code: str = Field(..., description="Surrounding code snippet")
-    symbol: SymbolInfo | None = Field(
+    symbol: SymbolDetailInfo | None = Field(
         None, description="The symbol containing this reference"
     )
 

schema/src/lsap_schema/symbol.py

@@ -2,49 +2,31 @@
 
 from pydantic import ConfigDict
 
-from .abc import Response, SymbolInfoRequest
+from .abc import Response
 from .locate import LocateRequest
-from .types import SymbolInfo
+from .types import SymbolCodeInfo
 
 
-class SymbolRequest(LocateRequest, SymbolInfoRequest):
+class SymbolRequest(LocateRequest):
     """
     Retrieves detailed information about a symbol at a specific location.
 
     Use this to get the documentation (hover) and source code implementation
     of a symbol to understand its purpose and usage.
     """
 
-    include_hover: bool = False
-    """Whether to include hover/documentation information"""
-
-    include_code: bool = True
-    """Whether to include the symbol's source code content"""
-
 
 markdown_template: Final = """
 # Symbol: `{{ path | join: "." }}` (`{{ kind }}`) at `{{ file_path }}`
 
-{% if detail != nil -%}
-## Detail
-{{ detail }}
-{%- endif %}
-
-{% if hover != nil -%}
-## Documentation
-{{ hover }}
-{%- endif %}
-
-{% if code != nil -%}
 ## Implementation
 ```{{ file_path.suffix | remove_first: "." }}
 {{ code }}
 ```
-{%- endif %}
 """
 
 
-class SymbolResponse(SymbolInfo, Response):
+class SymbolResponse(SymbolCodeInfo, Response):
     model_config = ConfigDict(
         json_schema_extra={
             "markdown": markdown_template,

schema/src/lsap_schema/symbol_outline.py

@@ -3,11 +3,11 @@
 
 from pydantic import ConfigDict
 
-from .abc import Response, SymbolInfoRequest
-from .types import SymbolInfo
+from .abc import Request, Response
+from .types import SymbolDetailInfo
 
 
-class SymbolOutlineRequest(SymbolInfoRequest):
+class SymbolOutlineRequest(Request):
     """
     Retrieves a hierarchical outline of symbols within a file.
 
@@ -24,20 +24,16 @@ class SymbolOutlineRequest(SymbolInfoRequest):
 {% for item in items -%}
 {% assign level = item.path | size | plus: 1 -%}
 {% for i in (1..level) %}#{% endfor %} {{ item.path | join: "." }} (`{{ item.kind }}`)
-{%- if item.detail %}
 {{ item.detail }}
-{%- endif %}
-{%- if item.hover %}
 {{ item.hover | strip | truncate: 120 }}
-{%- endif %}
 
 {% endfor -%}
 """
 
 
 class SymbolOutlineResponse(Response):
     file_path: Path
-    items: list[SymbolInfo]
+    items: list[SymbolDetailInfo]
 
     model_config = ConfigDict(
         json_schema_extra={