Fixed parsing tags in behavior files.

Fixed parsing tags in behavior files.
Added more diagnostics.
Fixed parsing workspcases.

Author: cgagner

README.md

@@ -115,6 +115,8 @@ testing with.
 * [X] Add warning for missing include
 * [ ] Add better warning message for missing quote
 * [ ] Add warning if MOOS mission file has a parameter with an empty string.
+* [X] Fix tags in behavior files
+* [ ] Figure out if the MOOS configuration blocks use '#' for comments.
 
 
 ### Planned Features

src/cache.rs

@@ -154,7 +154,10 @@ impl FileType {
             .and_then(std::ffi::OsStr::to_str)
             .unwrap_or("");
 
-        if filename.starts_with("plug_") || filename.starts_with("meta_") {
+        if filename.starts_with("plug_")
+            || filename.starts_with("plugs_")
+            || filename.starts_with("meta_")
+        {
             match extension {
                 "moos" | "moos++" => return Self::PlugMoosMission,
                 "bhv" | "bhv++" => return Self::PlugBehavior,

src/workspace.rs

@@ -2,8 +2,9 @@
 // a large repository
 
 use lsp_server::{Connection, Message};
-use lsp_types::{PublishDiagnosticsParams, Url};
+use lsp_types::{DiagnosticSeverity, PublishDiagnosticsParams, Url};
 use moos_parser::PlugParser;
+use std::collections::HashSet;
 use std::fs::{self, DirEntry};
 use std::io;
 use std::path::{Path, PathBuf};
@@ -105,7 +106,24 @@ pub fn scan_workspace(
     root_path: String,
     root_uri: Url,
 ) -> anyhow::Result<()> {
-    let added = visit_dirs(Path::new(&root_path), root_path.as_str(), &root_uri);
+    // NOTE: Need to make sure that the root ends with a '/' so it is treated
+    // as a directory.
+    let mut clean_root_path = root_path.clone();
+    let mut clean_root_uri = root_uri.clone();
+    if !clean_root_path.ends_with('/') {
+        clean_root_path.push('/');
+    }
+    let mut path = root_uri.path().to_string();
+    if !path.ends_with('/') {
+        path.push('/');
+    }
+    clean_root_uri.set_path(&path);
+
+    let added = visit_dirs(
+        Path::new(&clean_root_path),
+        clean_root_path.as_str(),
+        &clean_root_uri,
+    );
 
     let sender = connection.sender.clone();
 
@@ -117,40 +135,48 @@ pub fn scan_workspace(
         std::thread::sleep(std::time::Duration::from_millis(2000));
 
         let start = Instant::now();
-
+        let mut failed_files: HashSet<String> = HashSet::new();
         for path_url in added {
             if let Ok(text) = fs::read_to_string(path_url.path) {
                 if let Ok(cache) = &mut cache.lock() {
                     let document = cache.insert(&path_url.url, text);
 
-                    // TODO: Send diagnostics - Sending the diagnostics using
-                    // the method below does not seem to work for VSCode.
-                    // There are some mentions that the LSP protocol only
-                    // allows sending diagnostics for opened buffers.
-
-                    // let diagnostics = PublishDiagnosticsParams::new(
-                    //     path_url.url.clone(),
-                    //     document.diagnostics.clone(),
-                    //     None,
-                    // );
-
-                    // let params = serde_json::to_value(&diagnostics).unwrap();
-                    // use lsp_types::notification::Notification;
-                    // let notification = lsp_server::Notification {
-                    //     method: lsp_types::notification::PublishDiagnostics::METHOD.to_string(),
-                    //     params,
-                    // };
-
-                    // if let Ok(r) = sender.send(Message::Notification(notification)) {
-                    // } else {
-                    //     tracing::error!("Failed to send notification: {:?}", root_path);
-                    // }
+                    for diag in &document.diagnostics {
+                        if let Some(severity) = diag.severity {
+                            match severity {
+                                DiagnosticSeverity::ERROR | DiagnosticSeverity::WARNING => {
+                                    failed_files
+                                        .insert(document.uri.to_string().replace("file://", ""));
+                                }
+                                _ => {}
+                            }
+                        }
+                    }
+
+                    let diagnostics = PublishDiagnosticsParams::new(
+                        path_url.url.clone(),
+                        document.diagnostics.clone(),
+                        None,
+                    );
+
+                    let params = serde_json::to_value(&diagnostics).unwrap();
+                    use lsp_types::notification::Notification;
+                    let notification = lsp_server::Notification {
+                        method: lsp_types::notification::PublishDiagnostics::METHOD.to_string(),
+                        params,
+                    };
+
+                    if let Ok(r) = sender.send(Message::Notification(notification)) {
+                    } else {
+                        tracing::error!("Failed to send notification: {:?}", root_path);
+                    }
                 }
             }
         }
 
         let diff = (Instant::now() - start).as_millis() as f64 * 1e-3;
-        tracing::info!("Workspace: parse time: {diff}")
+        tracing::info!("Workspace: parse time: {diff}");
+        tracing::info!("Failed files: {:?}", failed_files);
     });
 
     Ok(())