feat: lint

Author: psteinroe

Cargo.lock

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 text-size = "1.1.1"
 line_index.workspace = true
-parser.workspace = true
+sql_parser.workspace = true
 
 [dev-dependencies]
 

crates/base_db/Cargo.toml

@@ -1,6 +1,7 @@
 use std::ops::Sub;
 
-use parser::get_statements;
+use line_index::LineIndex;
+use sql_parser::extract_sql_statement_ranges;
 use text_size::{TextLen, TextRange, TextSize};
 
 use crate::document::{Document, StatementRef};
@@ -124,11 +125,14 @@ impl Change {
                     .into_iter()
                     .map(|s| StatementChange::Deleted(s)),
             );
-            doc.statement_ranges = get_statements(&self.text)
+            // TODO also use errors returned by extract sql statement ranges
+            doc.statement_ranges = extract_sql_statement_ranges(&self.text)
+                .ranges
                 .iter()
-                .map(|(range, _)| range.clone())
+                .map(|r| r.clone())
                 .collect();
             doc.text = self.text.clone();
+            doc.line_index = LineIndex::new(&doc.text);
 
             changed_statements.extend(
                 doc.statement_refs()
@@ -181,6 +185,7 @@ impl Change {
                 });
 
             doc.text = self.apply_to_text(&doc.text);
+            doc.line_index = LineIndex::new(&doc.text);
         } else {
             // change across stmts
 
@@ -215,6 +220,7 @@ impl Change {
             }
 
             doc.text = self.apply_to_text(&doc.text);
+            doc.line_index = LineIndex::new(&doc.text);
 
             if doc.text.text_len() < max {
                 max = doc.text.text_len();
@@ -243,7 +249,7 @@ impl Change {
                         + 1,
             );
 
-            for (range, text) in get_statements(extracted_text) {
+            for range in extract_sql_statement_ranges(extracted_text).ranges {
                 match doc
                     .statement_ranges
                     .binary_search_by(|r| r.start().cmp(&range.start()))
@@ -253,7 +259,7 @@ impl Change {
                         doc.statement_ranges.insert(pos, range);
                         changed_statements.push(StatementChange::Added(StatementRef {
                             idx: pos,
-                            text: text.to_string(),
+                            text: extracted_text[range].to_string(),
                             document_url: doc.url.clone(),
                         }));
                     }
@@ -294,7 +300,7 @@ impl DocumentChange {
 
 #[cfg(test)]
 mod tests {
-    use parser::get_statements;
+    use sql_parser::extract_sql_statement_ranges;
     use text_size::{TextRange, TextSize};
 
     use crate::{
@@ -344,7 +350,7 @@ mod tests {
         assert_eq!("select id,test from users\nselect 1;", d.text);
         assert_eq!(d.statement_ranges.len(), 2);
 
-        for (r, _) in &get_statements(&d.text) {
+        for r in &extract_sql_statement_ranges(&d.text).ranges {
             assert_eq!(
                 d.statement_ranges.iter().position(|x| r == x).is_some(),
                 true,

crates/base_db/src/change.rs

@@ -1,7 +1,7 @@
 use std::{hash::Hash, hash::Hasher, ops::RangeBounds, usize};
 
 use line_index::LineIndex;
-use parser::get_statements;
+use sql_parser::extract_sql_statement_ranges;
 use text_size::{TextRange, TextSize};
 
 use crate::PgLspPath;
@@ -51,10 +51,11 @@ impl Document {
     pub fn new(params: DocumentParams) -> Document {
         Document {
             version: 0,
-            // todo: update get statements to return just the range
-            statement_ranges: get_statements(&params.text)
+            // todo: use errors returned by extract_sql_statement_ranges
+            statement_ranges: extract_sql_statement_ranges(&params.text)
+                .ranges
                 .iter()
-                .map(|(range, _)| range.clone())
+                .map(|range| range.clone())
                 .collect(),
             line_index: LineIndex::new(&params.text),
             text: params.text,
@@ -69,6 +70,16 @@ impl Document {
             .map(|idx| self.statement_ref(idx))
     }
 
+    pub fn statement_at_offset_with_range(
+        &self,
+        offset: &TextSize,
+    ) -> Option<(TextRange, StatementRef)> {
+        self.statement_ranges
+            .iter()
+            .position(|r| r.contains(offset))
+            .map(|idx| self.statement_ref_with_range(idx))
+    }
+
     pub fn drain_statements(&mut self) -> Vec<StatementRef> {
         self.statement_ranges
             .drain(..)
@@ -120,4 +131,20 @@ impl Document {
             })
             .unwrap()
     }
+
+    pub fn statement_ref_with_range(&self, pos: usize) -> (TextRange, StatementRef) {
+        self.statement_ranges
+            .get(pos)
+            .map(|range| {
+                (
+                    range.clone(),
+                    StatementRef {
+                        document_url: self.url.clone(),
+                        text: self.text[range.clone()].to_string(),
+                        idx: pos,
+                    },
+                )
+            })
+            .unwrap()
+    }
 }

crates/base_db/src/diagnostics.rs

@@ -1,11 +1,9 @@
 #![feature(extract_if, lazy_cell, test)]
 
 mod change;
-mod diagnostics;
 mod document;
 mod path;
 
 pub use change::{Change, ChangedStatement, DocumentChange, StatementChange};
-pub use diagnostics::{Diagnostic, DiagnosticSource, Severity};
 pub use document::{Document, DocumentParams, StatementRef};
 pub use path::PgLspPath;

crates/base_db/src/document.rs

@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 use text_size::TextRange;
 
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct Diagnostic {
     pub message: String,
     pub description: Option<String>,

crates/base_db/src/lib.rs

@@ -2,27 +2,29 @@ mod resolve;
 
 use resolve::Hoverable;
 use schema_cache::SchemaCache;
-use text_size::{TextRange, TextSize};
+use text_size::TextRange;
 
 pub struct HoverParams<'a> {
     pub position: text_size::TextSize,
     pub source: String,
     pub enriched_ast: Option<&'a sql_parser::EnrichedAst>,
-    pub tree: &'a tree_sitter::Tree,
+    pub tree: Option<&'a tree_sitter::Tree>,
     pub schema_cache: SchemaCache,
 }
 
 #[derive(Debug)]
 pub struct HoverResult {
-    range: Option<TextRange>,
-    content: String,
+    pub range: Option<TextRange>,
+    pub content: String,
 }
 
 pub fn hover(params: HoverParams) -> Option<HoverResult> {
     let elem = if params.enriched_ast.is_some() {
         resolve::resolve_from_enriched_ast(params.position, params.enriched_ast.unwrap())
+    } else if params.tree.is_some() {
+        resolve::resolve_from_tree_sitter(params.position, params.tree.unwrap(), &params.source)
     } else {
-        resolve::resolve_from_tree_sitter(params.position, params.tree, &params.source)
+        None
     };
 
     if elem.is_none() {
@@ -38,7 +40,7 @@ pub fn hover(params: HoverParams) -> Option<HoverResult> {
                 content: if t.comment.is_some() {
                     format!("{}\n{}", t.name, t.comment.as_ref().unwrap())
                 } else {
-                    t.name.clone()
+                    format!("Hello from the lsp. This is the table {}", t.name.clone())
                 },
             })
         }

crates/diagnostics/src/lib.rs

@@ -7,6 +7,7 @@ edition = "2021"
 text-size = "1.1.1"
 dashmap = "5.5.3"
 base_db.workspace =  true
+lint.workspace =  true
 hover.workspace =  true
 sql_parser.workspace = true
 diagnostics.workspace = true