Add partial semantic analysis for unmapped files

Author: kraigher

README.md

@@ -88,7 +88,7 @@ This repository includes a medium sized example [project](example_project/README
 
 ### Configuration
 The language server uses a configuration file in the [TOML](https://github.com/toml-lang/toml) format named `vhdl_ls.toml`.
-The file contains the library mapping of all files within the project. Files outside of the project without library mapping are checked for syntax errors only.
+The file contains the library mapping of all files within the project.
 
 `vhdl_ls` will load configuration files in the following order of priority (first to last):
 1. A file named `.vhdl_ls.toml` in the user home folder.

vhdl_lang/src/analysis/root.rs

@@ -327,7 +327,7 @@ impl DesignRoot {
         FindAllReferences::search(self, decl_pos)
     }
 
-    pub(super) fn symbol_utf8(&self, name: &str) -> Symbol {
+    pub fn symbol_utf8(&self, name: &str) -> Symbol {
         self.symbols.symtab().insert_utf8(name)
     }
 

vhdl_lang/src/project.rs

@@ -167,9 +167,15 @@ impl Project {
             } else {
                 // File is not part of the project
                 // @TODO use config wildcards to map to library
+
+                // Add unmapped files to an anonymous library work
+                // To still get some semantic analysis for unmapped files
+                let mut library_names = FnvHashSet::default();
+                library_names.insert(self.root.symbol_utf8("work"));
+
                 SourceFile {
                     source: source.clone(),
-                    library_names: FnvHashSet::default(),
+                    library_names,
                     parser_diagnostics: vec![],
                     design_file: DesignFile::default(),
                 }
@@ -311,6 +317,41 @@ lib.files = ['file.vhd']
         check_no_diagnostics(&project.analyse());
     }
 
+    #[test]
+    fn unmapped_libraries_are_analyzed() {
+        let mut messages = Vec::new();
+        let mut project = Project::from_config(&Config::default(), &mut messages);
+        assert_eq!(messages, vec![]);
+        let diagnostics = project.analyse();
+        check_no_diagnostics(&diagnostics);
+
+        let root = tempfile::tempdir().unwrap();
+        let vhdl_file_path = root.path().join("file.vhd");
+        std::fs::write(
+            &vhdl_file_path,
+            "
+entity ent is
+end ent;
+
+architecture rtl of ent is
+begin
+end architecture;
+
+architecture rtl of ent is
+begin
+end architecture;
+",
+        )
+        .unwrap();
+        let source = Source::from_latin1_file(&vhdl_file_path).unwrap();
+
+        project.update_source(&source);
+        let diagnostics = project.analyse();
+        assert_eq!(diagnostics.len(), 1);
+        let diag = diagnostics.first().unwrap();
+        assert_eq!(diag.message, "Duplicate architecture 'rtl' of entity 'ent'")
+    }
+
     /// Test that the same file can be added to several libraries
     #[test]
     fn test_same_file_in_multiple_libraries() {

vhdl_ls/src/rpc_channel.rs

@@ -41,7 +41,10 @@ pub trait RpcChannel {
     }
 
     fn push_msg(&self, msg: Message) {
-        if msg.message_type == vhdl_lang::MessageType::Error {
+        if matches!(
+            msg.message_type,
+            vhdl_lang::MessageType::Warning | vhdl_lang::MessageType::Error
+        ) {
             self.window_show_message(to_lsp_message_type(&msg.message_type), msg.message.clone());
         }
         self.window_log_message(to_lsp_message_type(&msg.message_type), msg.message);
@@ -150,6 +153,10 @@ pub mod test_support {
             self.expect_notification_contains("window/logMessage", contains);
         }
 
+        pub fn expect_warning_contains(&self, contains: impl Into<String>) {
+            self.expect_error_contains(contains)
+        }
+
         pub fn expect_message_contains(&self, contains: impl Into<String>) {
             let contains = contains.into();
             self.expect_notification_contains("window/logMessage", contains);

vhdl_ls/src/vhdl_server.rs

@@ -71,11 +71,11 @@ impl<T: RpcChannel + Clone> VHDLServer<T> {
             }
             Err(ref err) => {
                 self.rpc_channel.push_msg(Message::error(format!(
-                    "Found no vhdl_ls.toml config file in the workspace root path: {}",
+                    "Library mapping is unknown due to missing vhdl_ls.toml config file in the workspace root path: {}",
                     err
                 )));
                 self.rpc_channel.push_msg(Message::warning(
-                    "Found no library mapping, semantic analysis disabled, will perform syntax checking only",
+                    "Without library mapping semantic analysis might be incorrect",
                 ));
             }
         };
@@ -352,7 +352,7 @@ impl<T: RpcChannel + Clone> InitializedVHDLServer<T> {
             self.project.update_source(&source);
             self.publish_diagnostics();
         } else {
-            self.push_msg(Message::info(format!(
+            self.push_msg(Message::warning(format!(
                 "Opening file {} that is not part of the project",
                 file_name.to_string_lossy()
             )));
@@ -598,9 +598,9 @@ mod tests {
     }
 
     fn expect_missing_config_messages(mock: &RpcMock) {
-        mock.expect_error_contains("Found no vhdl_ls.toml config file in the workspace root path");
-        mock.expect_message_contains(
-            "Found no library mapping, semantic analysis disabled, will perform syntax checking only",
+        mock.expect_error_contains("Library mapping is unknown due to missing vhdl_ls.toml config file in the workspace root path");
+        mock.expect_warning_contains(
+            "Without library mapping semantic analysis might be incorrect",
         );
     }
 
@@ -642,7 +642,7 @@ end entity ent;
             },
         };
 
-        mock.expect_message_contains("is not part of the project");
+        mock.expect_warning_contains("is not part of the project");
 
         server.text_document_did_open_notification(&did_open);
     }
@@ -694,7 +694,7 @@ end entity ent2;
             version: None,
         };
 
-        mock.expect_message_contains("is not part of the project");
+        mock.expect_warning_contains("is not part of the project");
 
         mock.expect_notification("textDocument/publishDiagnostics", publish_diagnostics);
         server.text_document_did_open_notification(&did_open);
@@ -825,7 +825,7 @@ lib.files = [
         );
 
         expect_loaded_config_messages(&mock, &config_uri);
-        mock.expect_message_contains("missing_file.vhd");
+        mock.expect_warning_contains("missing_file.vhd");
         initialize_server(&mut server, root_uri);
     }