Merge pull request #695 from estin/master

Fix #191 check tests directory via 'all-targets' cargo flag

Author: nrc

README.md

@@ -115,6 +115,9 @@ Currently we accept the following options:
 * `analyze_package` (`String`, defaults to `""`) When `workspace_mode` is
   enabled, analysis will be only provided for the specified package (runs as
   if `-p <analyze_package>` was passed).
+* `all_targets` (`bool`, defaults to `false`) checks the project as if you were
+  running `cargo check --all-targets`. I.e., check all targets and integration
+  tests too.
 
 
 ## Troubleshooting

src/build/cargo.rs

@@ -173,7 +173,7 @@ fn run_cargo(
             false,
             &[],
             false,
-            false,
+            opts.all_targets,
         ),
         features: &opts.features,
         all_features: opts.all_features,
@@ -413,7 +413,13 @@ impl Executor for RlsExecutor {
             // Because we only try to emulate `cargo test` using `cargo check`, so for now
             // assume crate_type arg (i.e. in `cargo test` it isn't specified for --test targets)
             // and build test harness only for final crate type
-            let crate_type = crate_type.expect("no crate-type in rustc command line");
+            let crate_type = if config.all_targets {
+                // Crate type may be undefined when `all_targets` is true, for example for integration tests
+                crate_type.unwrap_or("undefined".to_owned())
+            } else {
+                // Panic if crate type undefined for other cases
+                crate_type.expect("no crate-type in rustc command line")
+            };
             let build_lib = *config.build_lib.as_ref();
             let is_final_crate_type = crate_type == "bin" || (crate_type == "lib" && build_lib);
 
@@ -512,6 +518,7 @@ struct CargoOptions {
     no_default_features: bool,
     features: Vec<String>,
     jobs: Option<u32>,
+    all_targets: bool,
 }
 
 impl Default for CargoOptions {
@@ -525,6 +532,7 @@ impl Default for CargoOptions {
             no_default_features: false,
             features: vec![],
             jobs: None,
+            all_targets: false
         }
     }
 }
@@ -538,6 +546,7 @@ impl CargoOptions {
                 all_features: config.all_features,
                 no_default_features: config.no_default_features,
                 jobs: config.jobs,
+                all_targets: config.all_targets,
                 ..CargoOptions::default()
             }
         } else {
@@ -562,6 +571,7 @@ impl CargoOptions {
                 all_features: config.all_features,
                 no_default_features: config.no_default_features,
                 jobs: config.jobs,
+                all_targets: config.all_targets,
                 ..CargoOptions::default()
             }
         }

src/config.rs

@@ -132,6 +132,7 @@ pub struct Config {
     pub all_features: bool,
     pub no_default_features: bool,
     pub jobs: Option<u32>,
+    pub all_targets: bool,
 }
 
 impl Default for Config {
@@ -156,6 +157,7 @@ impl Default for Config {
             all_features: false,
             no_default_features: false,
             jobs: None,
+            all_targets: false,
         };
         result.normalise();
         result

src/test/mod.rs

@@ -1478,3 +1478,39 @@ fn test_deglob() {
         ],
     );
 }
+
+#[test]
+fn test_all_targets() {
+    let mut env = Environment::new("bin_lib");
+
+    let root_path = env.cache.abs_path(Path::new("."));
+
+    let messages = vec![
+        initialize(0, root_path.as_os_str().to_str().map(|x| x.to_owned())).to_string(),
+    ];
+
+    env.with_config(|c| {
+        c.all_targets = true;
+        c.cfg_test = true;
+    });
+    let (mut server, results) = env.mock_server(messages);
+    // Initialize and build.
+    assert_eq!(
+        ls_server::LsService::handle_message(&mut server),
+        ls_server::ServerStateChange::Continue
+    );
+    expect_messages(
+        results.clone(),
+        &[
+            ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
+            ExpectedMessage::new(None).expect_contains("beginBuild"),
+            ExpectedMessage::new(None).expect_contains("diagnosticsBegin"),
+
+            ExpectedMessage::new(None)
+                .expect_contains(r#"bin_lib/tests/tests.rs"#)
+                .expect_contains(r#"unused variable: `unused_var`"#),
+
+            ExpectedMessage::new(None).expect_contains("diagnosticsEnd"),
+        ],
+    );
+}

test_data/bin_lib/tests/tests.rs

@@ -0,0 +1,5 @@
+#[test]
+fn test_some_foo() {
+    let unused_var = true;
+    assert!(true);
+}