Fix typos

Update docstring

Author: lionel-

crates/ark/src/lsp/diagnostics.rs

@@ -66,8 +66,7 @@ pub struct DiagnosticContext<'a> {
     pub library: &'a Library,
 
     /// The symbols exported by packages loaded via `library()` calls in this
-    /// document. Currently global. TODO: Store individual exports in a BTreeMap
-    /// sorted by position in the source?
+    /// document. Currently global.
     pub library_symbols: BTreeMap<Point, HashSet<String>>,
 
     // Whether or not we're inside of a formula.
@@ -84,7 +83,7 @@ impl Default for DiagnosticsConfig {
 }
 
 impl<'a> DiagnosticContext<'a> {
-    pub fn new(contents: &'a Rope, library: &'a crate::lsp::inputs::library::Library) -> Self {
+    pub fn new(contents: &'a Rope, library: &'a Library) -> Self {
         Self {
             contents,
             document_symbols: Vec::new(),
@@ -103,21 +102,20 @@ impl<'a> DiagnosticContext<'a> {
         symbols.insert(name.to_string(), location);
     }
 
-    // First, check document symbols.
     pub fn has_definition(&self, name: &str, start_position: Point) -> bool {
+        // Check document symbols
         for symbols in &self.document_symbols {
             if symbols.contains_key(name) {
                 return true;
             }
         }
 
-        // Then, check workspace symbols.
+        // Check workspace symbols
         if self.workspace_symbols.contains(name) {
             return true;
         }
 
-        // Finally, check package symbols from `library()` calls.
-        // Check all symbols exported by `library()` before the given position.
+        // Check all symbols exported by `library()` calls before the given position
         for (library_position, exports) in self.library_symbols.iter() {
             if *library_position > start_position {
                 break;
@@ -127,7 +125,7 @@ impl<'a> DiagnosticContext<'a> {
             }
         }
 
-        // Finally, check session symbols.
+        // Finally, check session symbols
         self.session_symbols.contains(name)
     }
 }

crates/ark/src/lsp/diagnostics_syntax.rs

@@ -309,10 +309,11 @@ mod tests {
     use crate::lsp::diagnostics::DiagnosticContext;
     use crate::lsp::diagnostics_syntax::syntax_diagnostics;
     use crate::lsp::documents::Document;
+    use crate::lsp::inputs::library::Library;
 
     fn text_diagnostics(text: &str) -> Vec<Diagnostic> {
         let document = Document::new(text, None);
-        let library = crate::lsp::inputs::library::Library::default();
+        let library = Library::default();
         let context = DiagnosticContext::new(&document.contents, &library);
         let diagnostics = syntax_diagnostics(document.ast.root_node(), &context).unwrap();
         diagnostics

crates/ark/src/lsp/inputs/package.rs

@@ -14,8 +14,8 @@ use crate::lsp::inputs::package_namespace::Namespace;
 /// Represents an R package and its metadata relevant for static analysis.
 #[derive(Clone, Debug)]
 pub struct Package {
-    /// Path to the directory that contains `DESCRIPTION`. Could be an installed
-    /// package, or a package source.
+    /// Path to the directory that contains `DESCRIPTION` and `NAMESPACE`. Can
+    /// be an installed package or a package source.
     pub path: PathBuf,
 
     pub description: Description,