Skip to content

Commit 2f08a67

juleswritescode juleswritescode

authored

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

1 parent a2e4640 commit 2f08a67Copy full SHA for 2f08a67

File tree

11 files changed

+28

-8

lines changed

.sqlx
- query-97da37af0d64378cb622cab14bb3b0ce33a0002d170200d77afeee60a7977278.json
crates
- pgt_completions/src
  - builder.rs
  - item.rs
  - providers
- pgt_lsp/src/handlers
  - completions.rs
- pgt_schema_cache/src
  - columns.rs
  - queries
    - columns.sql

11 files changed

+28

-8

lines changed

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

Lines changed: 13 additions & 7 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎crates/pgt_completions/src/builder.rs`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ pub(crate) struct PossibleCompletionItem<'a> {`
`12`	`12`	`pub score: CompletionScore<'a>,`
`13`	`13`	`pub filter: CompletionFilter<'a>,`
`14`	`14`	`pub completion_text: Option<CompletionText>,`
	`15`	`+ pub detail: Option<String>,`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`pub(crate) struct CompletionBuilder<'a> {`
`@@ -70,6 +71,7 @@ impl<'a> CompletionBuilder<'a> {`
`70`	`71`	`kind: item.kind,`
`71`	`72`	`label: item.label,`
`72`	`73`	`preselected,`
	`74`	`+ detail: item.detail,`
`73`	`75`
`74`	`76`	`// wonderous Rust syntax ftw`
`75`	`77`	`sort_text: format!("{:0>padding$}", idx, padding = max_padding),`

`‎crates/pgt_completions/src/item.rs`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ pub struct CompletionItem {`
`54`	`54`	`pub kind: CompletionItemKind,`
`55`	`55`	`/// String used for sorting by LSP clients.`
`56`	`56`	`pub sort_text: String,`
	`57`	`+ pub detail: Option<String>,`
`57`	`58`
`58`	`59`	`pub completion_text: Option<CompletionText>,`
`59`	`60`	`}`

`‎crates/pgt_completions/src/providers/columns.rs`

Lines changed: 1 addition & 0 deletions

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

`‎crates/pgt_completions/src/providers/functions.rs`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ pub fn complete_functions<'a>(ctx: &'a CompletionContext, builder: &mut Completi`
`22`	`22`	`filter: CompletionFilter::from(relevance),`
`23`	`23`	`description: format!("Schema: {}", func.schema),`
`24`	`24`	`kind: CompletionItemKind::Function,`
	`25`	`+ detail: None,`
`25`	`26`	`completion_text: Some(get_completion_text(ctx, func)),`
`26`	`27`	`};`
`27`	`28`

`‎crates/pgt_completions/src/providers/policies.rs`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ pub fn complete_policies<'a>(ctx: &CompletionContext<'a>, builder: &mut Completi`
`50`	`50`	`description: pol.table_name.to_string(),`
`51`	`51`	`kind: CompletionItemKind::Policy,`
`52`	`52`	`completion_text,`
	`53`	`+ detail: None,`
`53`	`54`	`};`
`54`	`55`
`55`	`56`	`builder.add_item(item);`

`‎crates/pgt_completions/src/providers/schemas.rs`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ pub fn complete_schemas<'a>(ctx: &'a CompletionContext, builder: &mut Completion`
`16`	`16`	`kind: crate::CompletionItemKind::Schema,`
`17`	`17`	`score: CompletionScore::from(relevance.clone()),`
`18`	`18`	`filter: CompletionFilter::from(relevance),`
	`19`	`+ detail: None,`
`19`	`20`	`completion_text: None,`
`20`	`21`	`};`
`21`	`22`

`‎crates/pgt_completions/src/providers/tables.rs`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ pub fn complete_tables<'a>(ctx: &'a CompletionContext, builder: &mut CompletionB`
`19`	`19`	`filter: CompletionFilter::from(relevance),`
`20`	`20`	`description: format!("Schema: {}", table.schema),`
`21`	`21`	`kind: CompletionItemKind::Table,`
	`22`	`+ detail: None,`
`22`	`23`	`completion_text: get_completion_text_with_schema_or_alias(`
`23`	`24`	`ctx,`
`24`	`25`	`&table.name,`

`‎crates/pgt_lsp/src/handlers/completions.rs`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,10 @@ pub fn get_completions(`
`41`	`41`	`label: i.label,`
`42`	`42`	`label_details: Some(CompletionItemLabelDetails {`
`43`	`43`	`description: Some(i.description),`
`44`		`- detail: Some(format!(" {}", i.kind)),`
	`44`	`+ detail: i`
	`45`	`+ .detail`
	`46`	`+ .map(\|s\| format!(" {}", s))`
	`47`	`+ .or(Some(format!(" {}", i.kind))),`
`45`	`48`	`}),`
`46`	`49`	`preselect: Some(i.preselected),`
`47`	`50`	`sort_text: Some(i.sort_text),`

`‎crates/pgt_schema_cache/src/columns.rs`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ pub struct Column {`
`48`	`48`
`49`	`49`	`pub schema_name: String,`
`50`	`50`	`pub type_id: i64,`
	`51`	`+ pub type_name: String,`
`51`	`52`	`pub is_nullable: bool,`
`52`	`53`
`53`	`54`	`pub is_primary_key: bool,`

0 commit comments

Comments

(0)