feat(lsp): improve documentation and completion

Author: SergioRibera

Cargo.lock

@@ -10,3 +10,4 @@ serde_json = { version = "1", features = ["std"] }
 tokio = { version = "1.37", default-features = false, features = ["rt-multi-thread", "io-std", "macros"] }
 serde = { version = "1.0.210", features = ["derive"] }
 regex = "1.10.6"
+walkdir = "2.5.0"

lsp/Cargo.toml

@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 use dashmap::DashMap;
 use serde::Deserialize;
@@ -67,9 +67,10 @@ impl Backend {
         config.clone()
     }
 
-    async fn load_env_vars(&self, modified_file: Option<&Path>) {
+    async fn load_env_vars(&self, workdir: Option<PathBuf>, modified_file: Option<&Path>) {
         let configs = self.get_configs().await;
         let mut envs = DashMap::new();
+        let regex = regex::Regex::new(&configs.dotenv_environment).unwrap();
 
         if configs.load_shell {
             envs.extend(std::env::vars().map(|(k, v)| (k, (v, None))));
@@ -81,10 +82,38 @@ impl Backend {
             }));
         }
 
-        // load envfiles
+        // load all envfiles
+        if let Some(workdir) = workdir.and_then(|v| {
+            regex
+                .is_match(v.file_name().unwrap().to_str().unwrap())
+                .then_some(v)
+        }) {
+            let files = walkdir::WalkDir::new(workdir)
+                .into_iter()
+                .filter_map(|e| {
+                    if e.as_ref().is_ok_and(|f| {
+                        f.path().is_file() && regex.is_match(f.path().to_str().unwrap_or(""))
+                    }) {
+                        e.ok()
+                    } else {
+                        None
+                    }
+                })
+                .collect::<Vec<_>>();
+            for entry in files {
+                let path = entry.path();
+                self.client
+                    .log_message(MessageType::INFO, &format!("File match: {path:?}"))
+                    .await;
+
+                let content = std::fs::read_to_string(path).unwrap();
+                envs.extend(parse_dotenv(&content));
+            }
+        }
+        // Load changed env files
         if let Some(modified_file) = modified_file.and_then(|v| {
-            let r = regex::Regex::new(&configs.dotenv_environment).unwrap();
-            r.is_match(v.file_name().unwrap().to_str().unwrap())
+            regex
+                .is_match(v.file_name().unwrap().to_str().unwrap())
                 .then_some(v)
         }) {
             let content = std::fs::read_to_string(modified_file).unwrap();
@@ -112,6 +141,9 @@ impl LanguageServer for Backend {
             *config = serde_json::from_value(options).unwrap();
         }
 
+        self.load_env_vars(params.root_uri.map(|root| PathBuf::from(root.path())), None)
+            .await;
+
         Ok(InitializeResult {
             server_info: Some(ServerInfo {
                 name: env!("CARGO_PKG_NAME").to_owned(),
@@ -136,12 +168,12 @@ impl LanguageServer for Backend {
     }
 
     async fn did_open(&self, params: DidOpenTextDocumentParams) {
-        self.load_env_vars(Some(Path::new(params.text_document.uri.path())))
+        self.load_env_vars(None, Some(Path::new(params.text_document.uri.path())))
             .await
     }
 
     async fn did_change(&self, params: DidChangeTextDocumentParams) {
-        self.load_env_vars(Some(Path::new(params.text_document.uri.path())))
+        self.load_env_vars(None, Some(Path::new(params.text_document.uri.path())))
             .await
     }
 
@@ -158,7 +190,26 @@ impl LanguageServer for Backend {
             .map(|env| {
                 let key = env.key().to_owned();
                 let (value, docs) = env.value();
+                let documentation = if configs.show_documentation {
+                    docs.as_ref().map(|d| {
+                        let value = if configs.show_content_on_docs && !value.is_empty() {
+                            format!("{d}\n\ncontent: {value}")
+                        } else {
+                            d.clone()
+                        };
+                        Documentation::MarkupContent(MarkupContent {
+                            value,
+                            kind: configs
+                                .documentation_kind
+                                .clone()
+                                .unwrap_or(MarkupKind::Markdown),
+                        })
+                    })
+                } else {
+                    None
+                };
                 CompletionItem {
+                    documentation,
                     label: key.clone(),
                     kind: Some(configs.item_kind),
                     text_edit: Some(CompletionTextEdit::Edit(TextEdit::new(
@@ -169,15 +220,6 @@ impl LanguageServer for Backend {
                             key
                         },
                     ))),
-                    documentation: docs.as_ref().map(|d| {
-                        Documentation::MarkupContent(MarkupContent {
-                            kind: configs
-                                .documentation_kind
-                                .clone()
-                                .unwrap_or(MarkupKind::Markdown),
-                            value: d.clone(),
-                        })
-                    }),
                     ..Default::default()
                 }
             })