feat(completions): show data type for columns (#402)

Author: juleswritescode

.sqlx/query-fc0a0aa6d2a06bf3103d26a0233ae86f456892fa9ce48854a8b960cdf2d11a45.json renamed to .sqlx/query-97da37af0d64378cb622cab14bb3b0ce33a0002d170200d77afeee60a7977278.json

@@ -12,6 +12,7 @@ pub(crate) struct PossibleCompletionItem<'a> {
     pub score: CompletionScore<'a>,
     pub filter: CompletionFilter<'a>,
     pub completion_text: Option<CompletionText>,
+    pub detail: Option<String>,
 }
 
 pub(crate) struct CompletionBuilder<'a> {
@@ -70,6 +71,7 @@ impl<'a> CompletionBuilder<'a> {
                     kind: item.kind,
                     label: item.label,
                     preselected,
+                    detail: item.detail,
 
                     // wonderous Rust syntax ftw
                     sort_text: format!("{:0>padding$}", idx, padding = max_padding),

crates/pgt_completions/src/builder.rs

@@ -54,6 +54,7 @@ pub struct CompletionItem {
     pub kind: CompletionItemKind,
     /// String used for sorting by LSP clients.
     pub sort_text: String,
+    pub detail: Option<String>,
 
     pub completion_text: Option<CompletionText>,
 }

crates/pgt_completions/src/item.rs

@@ -20,6 +20,7 @@ pub fn complete_columns<'a>(ctx: &CompletionContext<'a>, builder: &mut Completio
             description: format!("Table: {}.{}", col.schema_name, col.table_name),
             kind: CompletionItemKind::Column,
             completion_text: None,
+            detail: Some(col.type_name.to_string()),
         };
 
         // autocomplete with the alias in a join clause if we find one

crates/pgt_completions/src/providers/columns.rs

@@ -22,6 +22,7 @@ pub fn complete_functions<'a>(ctx: &'a CompletionContext, builder: &mut Completi
             filter: CompletionFilter::from(relevance),
             description: format!("Schema: {}", func.schema),
             kind: CompletionItemKind::Function,
+            detail: None,
             completion_text: Some(get_completion_text(ctx, func)),
         };
 

crates/pgt_completions/src/providers/functions.rs

@@ -50,6 +50,7 @@ pub fn complete_policies<'a>(ctx: &CompletionContext<'a>, builder: &mut Completi
             description: pol.table_name.to_string(),
             kind: CompletionItemKind::Policy,
             completion_text,
+            detail: None,
         };
 
         builder.add_item(item);

crates/pgt_completions/src/providers/policies.rs

@@ -16,6 +16,7 @@ pub fn complete_schemas<'a>(ctx: &'a CompletionContext, builder: &mut Completion
             kind: crate::CompletionItemKind::Schema,
             score: CompletionScore::from(relevance.clone()),
             filter: CompletionFilter::from(relevance),
+            detail: None,
             completion_text: None,
         };
 

crates/pgt_completions/src/providers/schemas.rs

@@ -19,6 +19,7 @@ pub fn complete_tables<'a>(ctx: &'a CompletionContext, builder: &mut CompletionB
             filter: CompletionFilter::from(relevance),
             description: format!("Schema: {}", table.schema),
             kind: CompletionItemKind::Table,
+            detail: None,
             completion_text: get_completion_text_with_schema_or_alias(
                 ctx,
                 &table.name,

crates/pgt_completions/src/providers/tables.rs

@@ -41,7 +41,10 @@ pub fn get_completions(
             label: i.label,
             label_details: Some(CompletionItemLabelDetails {
                 description: Some(i.description),
-                detail: Some(format!(" {}", i.kind)),
+                detail: i
+                    .detail
+                    .map(|s| format!(" {}", s))
+                    .or(Some(format!(" {}", i.kind))),
             }),
             preselect: Some(i.preselected),
             sort_text: Some(i.sort_text),

crates/pgt_lsp/src/handlers/completions.rs

@@ -48,6 +48,7 @@ pub struct Column {
 
     pub schema_name: String,
     pub type_id: i64,
+    pub type_name: String,
     pub is_nullable: bool,
 
     pub is_primary_key: bool,

crates/pgt_schema_cache/src/columns.rs

@@ -35,6 +35,7 @@ select
   ts.class_kind :: char as "class_kind!",
   ts.schema_name,
   atts.atttypid :: int8 as "type_id!",
+  tps.typname as "type_name",
   not atts.attnotnull as "is_nullable!",
   nullif(
     information_schema._pg_char_max_length (atts.atttypid, atts.atttypmod),
@@ -51,6 +52,7 @@ from
   and atts.attnum = ix.attnum
   left join pg_catalog.pg_attrdef def on atts.attrelid = def.adrelid
   and atts.attnum = def.adnum
+  left join pg_catalog.pg_type tps on tps.oid = atts.atttypid
 where
   -- system columns, such as `cmax` or `tableoid`, have negative `attnum`s
   atts.attnum >= 0