LSP: Add autocomplete & hover functionality, and jump to target name

starlark/src/analysis/definition.rs

@@ -21,6 +21,7 @@ use crate::analysis::bind::scope;
 use crate::analysis::bind::Assigner;
 use crate::analysis::bind::Bind;
 use crate::analysis::bind::Scope;
+use crate::analysis::exported::ExportedSymbol;
 use crate::codemap::CodeMap;
 use crate::codemap::Pos;
 use crate::codemap::ResolvedSpan;
@@ -416,18 +417,20 @@ impl LspModule {
         }
     }
 
+    /// Get the list of symbols exported by this module.
+    pub(crate) fn get_exported_symbols(&self) -> Vec<ExportedSymbol> {
+        self.ast.exported_symbols()
+    }
+
     /// Attempt to find the location in this module where an exported symbol is defined.
     pub(crate) fn find_exported_symbol(&self, name: &str) -> Option<ResolvedSpan> {
-        self.ast
-            .exported_symbols()
-            .iter()
-            .find_map(|(span, symbol)| {
-                if *symbol == name {
-                    Some(span.resolve_span())
-                } else {
-                    None
-                }
-            })
+        self.ast.exported_symbols().iter().find_map(|symbol| {
+            if symbol.name == name {
+                Some(symbol.span.resolve_span())
+            } else {
+                None
+            }
+        })
     }
 
     /// Attempt to find the location in this module where a member of a struct (named `name`)

starlark/src/analysis/exported.rs

@@ -21,30 +21,49 @@ use crate::syntax::ast::DefP;
 use crate::syntax::ast::Stmt;
 use crate::syntax::AstModule;
 
+pub enum ExportedSymbolKind {
+    Variable,
+    Method,
+}
+
+pub struct ExportedSymbol<'a> {
+    pub name: &'a str,
+    pub span: FileSpan,
+    pub kind: ExportedSymbolKind,
+}
+
 impl AstModule {
     /// Which symbols are exported by this module. These are the top-level assignments,
     /// including function definitions. Any symbols that start with `_` are not exported.
-    pub fn exported_symbols(&self) -> Vec<(FileSpan, &str)> {
+    pub fn exported_symbols(&self) -> Vec<ExportedSymbol> {
         // Map since we only want to store the first of each export
         // IndexMap since we want the order to match the order they were defined in
         let mut result: SmallMap<&str, _> = SmallMap::new();
         for x in self.top_level_statements() {
             match &**x {
                 Stmt::Assign(dest, _) | Stmt::AssignModify(dest, _, _) => {
                     dest.visit_lvalue(|name| {
-                        result.entry(&name.0).or_insert(name.span);
+                        result.entry(&name.0).or_insert(ExportedSymbol {
+                            name: &name.0,
+                            span: self.file_span(name.span),
+                            kind: ExportedSymbolKind::Variable,
+                        });
                     });
                 }
                 Stmt::Def(DefP { name, .. }) => {
-                    result.entry(&name.0).or_insert(name.span);
+                    result.entry(&name.0).or_insert(ExportedSymbol {
+                        name: &name.0,
+                        span: self.file_span(name.span),
+                        kind: ExportedSymbolKind::Method,
+                    });
                 }
                 _ => {}
             }
         }
         result
             .into_iter()
             .filter(|(name, _)| !name.starts_with('_'))
-            .map(|(name, span)| (self.file_span(span), name))
+            .map(|(_, exported_symbol)| exported_symbol)
             .collect()
     }
 }
@@ -73,7 +92,7 @@ d = 2
         );
         let res = modu.exported_symbols();
         assert_eq!(
-            res.map(|(loc, name)| format!("{} {}", loc, name)),
+            res.map(|symbol| format!("{} {}", symbol.span, symbol.name)),
             &["X:3:5-6 b", "X:4:1-2 d"]
         );
     }

starlark/src/analysis/mod.rs

@@ -27,7 +27,7 @@ use crate::syntax::AstModule;
 mod bind;
 pub(crate) mod definition;
 mod dubious;
-mod exported;
+pub(crate) mod exported;
 mod find_call_name;
 mod flow;
 mod incompatible;

starlark/src/codemap.rs

@@ -392,7 +392,7 @@ impl CodeMap {
 
 /// A line and column.
 #[derive(Copy, Clone, Dupe, Hash, Eq, PartialEq, Debug)]
-struct LineCol {
+pub(crate) struct LineCol {
     /// The line number within the file (0-indexed).
     pub line: usize,
 
@@ -542,6 +542,13 @@ impl From<ResolvedSpan> for lsp_types::Range {
 }
 
 impl ResolvedSpan {
+    pub(crate) fn contains(&self, pos: LineCol) -> bool {
+        (self.begin_line < pos.line
+            || (self.begin_line == pos.line && self.begin_column <= pos.column))
+            && (self.end_line > pos.line
+                || (self.end_line == pos.line && self.end_column >= pos.column))
+    }
+
     fn from_span(begin: LineCol, end: LineCol) -> Self {
         Self {
             begin_line: begin.line,