ok

Author: juleswritescode

crates/pgt_hover/src/hoverables/postgres_type.rs

@@ -6,12 +6,20 @@ use pgt_treesitter::TreesitterContext;
 use crate::{contextual_priority::ContextualPriority, to_markdown::ToHoverMarkdown};
 
 impl ToHoverMarkdown for PostgresType {
-    fn hover_headline<W: Write>(&self, writer: &mut W, _schema_cache: &SchemaCache) -> Result<(), std::fmt::Error> {
+    fn hover_headline<W: Write>(
+        &self,
+        writer: &mut W,
+        _schema_cache: &SchemaCache,
+    ) -> Result<(), std::fmt::Error> {
         write!(writer, "`{}.{}` (Custom Type)", self.schema, self.name)?;
         Ok(())
     }
 
-    fn hover_body<W: Write>(&self, writer: &mut W, schema_cache: &SchemaCache) -> Result<bool, std::fmt::Error> {
+    fn hover_body<W: Write>(
+        &self,
+        writer: &mut W,
+        schema_cache: &SchemaCache,
+    ) -> Result<bool, std::fmt::Error> {
         if let Some(comment) = &self.comment {
             write!(writer, "Comment: '{}'", comment)?;
             writeln!(writer)?;
@@ -26,7 +34,13 @@ impl ToHoverMarkdown for PostgresType {
                 write!(writer, "- {}", attribute.name)?;
 
                 if let Some(type_info) = schema_cache.find_type_by_id(attribute.type_id) {
-                    write!(writer, ": {}.{}", type_info.schema, type_info.name)?;
+                    write!(writer, ": ")?;
+
+                    if type_info.schema != "pg_catalog" {
+                        write!(writer, "{}.", type_info.schema)?;
+                    }
+
+                    write!(writer, "{}", type_info.name)?;
                 } else {
                     write!(writer, " (type_id: {})", attribute.type_id)?;
                 }
@@ -52,7 +66,11 @@ impl ToHoverMarkdown for PostgresType {
         Ok(true)
     }
 
-    fn hover_footer<W: Write>(&self, writer: &mut W, _schema_cache: &SchemaCache) -> Result<bool, std::fmt::Error> {
+    fn hover_footer<W: Write>(
+        &self,
+        writer: &mut W,
+        _schema_cache: &SchemaCache,
+    ) -> Result<bool, std::fmt::Error> {
         writeln!(writer)?;
         Ok(true)
     }

crates/pgt_hover/tests/hover_integration_tests.rs

@@ -518,3 +518,21 @@ async fn test_grant_table_hover(test_db: PgPool) {
 
     test_hover_at_cursor("grant_select", query, None, &test_db).await;
 }
+
+#[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+async fn hover_on_types(test_db: PgPool) {
+    let setup = r#"create type compfoo as (f1 int, f2 text);"#;
+
+    let query = format!(
+        "create function getfoo() returns setof comp{}foo as $$ select fooid, fooname from foo $$ language sql;",
+        QueryWithCursorPosition::cursor_marker()
+    );
+
+    test_hover_at_cursor(
+        "hover_custom_type_with_properties",
+        query,
+        Some(setup),
+        &test_db,
+    )
+    .await;
+}

crates/pgt_hover/tests/snapshots/hover_custom_type_with_properties.snap

@@ -0,0 +1,24 @@
+---
+source: crates/pgt_hover/tests/hover_integration_tests.rs
+expression: snapshot
+---
+# Input
+```sql
+create function getfoo() returns setof compfoo as $$ select fooid, fooname from foo $$ language sql;
+                                           ↑ hovered here
+```
+
+# Hover Results
+### `public.compfoo` (Custom Type)  
+```plain  
+Attributes:
+- f1: int4
+- f2: text
+
+  
+```  
+---    
+```plain  
+
+  
+```