merge main

Author: psteinroe

Cargo.lock

@@ -41,6 +41,7 @@ tokio              = "1.40.0"
 ignore             = "0.4.23"
 anyhow             = "1.0.92"
 smallvec           = { version = "1.13.2", features = ["union", "const_new", "serde"] }
+tower-lsp = "0.20.0"
 sqlx = { version = "0.8.2", features = [ "runtime-async-std", "tls-rustls", "postgres", "json" ] }
 
 # postgres specific crates

Cargo.toml

@@ -0,0 +1,15 @@
+# Auto-Completions
+
+## What does this crate do?
+
+The `pg_completions` identifies and ranks autocompletion items that can be displayed in your code editor.
+Its main export is the `complete` function. The function takes a PostgreSQL statement, a cursor position, and a datastructure representing the underlying databases schema. It returns a list of completion items.
+
+Postgres's statement-parsing-engine, `libpg_query`, which is used in other parts of this LSP, is only capable of parsing _complete and valid_ statements. Since autocompletion should work for incomplete statements, we rely heavily on tree-sitter – an incremental parsing library.
+
+### Working with TreeSitter
+
+In the `pg_test_utils` crate, there's a binary that parses an SQL file and prints out the matching tree-sitter tree.
+This makes writing tree-sitter queries for this crate easy.
+
+To print a tree, run `cargo run --bin tree_print -- -f <your_sql_file>`.

crates/pg_completions/README.md

@@ -1,29 +1,50 @@
-use crate::{CompletionItem, CompletionResult};
+use crate::{item::CompletionItem, CompletionResult};
 
-pub struct CompletionBuilder<'a> {
-    pub items: Vec<CompletionItem<'a>>,
+pub(crate) struct CompletionBuilder {
+    items: Vec<CompletionItem>,
 }
 
-pub struct CompletionConfig {}
+impl CompletionBuilder {
+    pub fn new() -> Self {
+        CompletionBuilder { items: vec![] }
+    }
 
-impl<'a> From<&'a CompletionConfig> for CompletionBuilder<'a> {
-    fn from(_config: &CompletionConfig) -> Self {
-        Self { items: Vec::new() }
+    pub fn add_item(&mut self, item: CompletionItem) {
+        self.items.push(item);
     }
-}
 
-impl<'a> CompletionBuilder<'a> {
-    pub fn finish(mut self) -> CompletionResult<'a> {
-        self.items.sort_by(|a, b| {
-            b.preselect
-                .cmp(&a.preselect)
-                .then_with(|| b.score.cmp(&a.score))
-                .then_with(|| a.data.label().cmp(b.data.label()))
-        });
+    pub fn finish(mut self) -> CompletionResult {
+        self.items
+            .sort_by(|a, b| b.score.cmp(&a.score).then_with(|| a.label.cmp(&b.label)));
 
-        self.items.dedup_by(|a, b| a.data.label() == b.data.label());
+        self.items.dedup_by(|a, b| a.label == b.label);
         self.items.truncate(crate::LIMIT);
-        let Self { items, .. } = self;
+
+        let should_preselect_first_item = self.should_preselect_first_item();
+
+        let items: Vec<CompletionItem> = self
+            .items
+            .into_iter()
+            .enumerate()
+            .map(|(idx, mut item)| {
+                if idx == 0 {
+                    item.preselected = Some(should_preselect_first_item);
+                }
+                item.into()
+            })
+            .collect();
+
         CompletionResult { items }
     }
+
+    fn should_preselect_first_item(&mut self) -> bool {
+        let mut items_iter = self.items.iter();
+        let first = items_iter.next();
+        let second = items_iter.next();
+
+        first.is_some_and(|f| match second {
+            Some(s) => (f.score - s.score) > 10,
+            None => true,
+        })
+    }
 }