Merge pull request #500 from Eijebong/features

Add support for cargo features

Author: Xanewok

src/build/cargo.rs

@@ -147,6 +147,9 @@ fn run_cargo(compilation_cx: Arc<Mutex<CompilationContext>>,
                                 // TODO: Support more crate target types
                                 &[], false, &[], false, &[], false,
                                 false),
+        features: &opts.features,
+        all_features: opts.all_features,
+        no_default_features: opts.no_default_features,
         .. CompileOptions::default(&config, CompileMode::Check)
     };
 
@@ -438,6 +441,9 @@ struct CargoOptions {
     bins: bool,
     all: bool,
     exclude: Vec<String>,
+    all_features: bool,
+    no_default_features: bool,
+    features: Vec<String>,
 }
 
 impl Default for CargoOptions {
@@ -450,6 +456,9 @@ impl Default for CargoOptions {
             bins: false,
             all: false,
             exclude: vec![],
+            all_features: false,
+            no_default_features: false,
+            features: vec![],
         }
     }
 }
@@ -466,6 +475,9 @@ impl CargoOptions {
                 package,
                 all,
                 target: config.target.clone(),
+                features: config.features.clone(),
+                all_features: config.all_features,
+                no_default_features: config.no_default_features,
                 .. CargoOptions::default()
             }
         } else {
@@ -486,6 +498,9 @@ impl CargoOptions {
                 lib,
                 bin,
                 target: config.target.clone(),
+                features: config.features.clone(),
+                all_features: config.all_features,
+                no_default_features: config.no_default_features,
                 .. CargoOptions::default()
             }
         }

src/config.rs

@@ -117,6 +117,9 @@ pub struct Config {
     /// Cargo target dir. If set overrides the default one.
     #[serde(skip_deserializing, skip_serializing)]
     pub target_dir: Option<PathBuf>,
+    pub features: Vec<String>,
+    pub all_features: bool,
+    pub no_default_features: bool,
 }
 
 impl Default for Config {
@@ -138,6 +141,9 @@ impl Default for Config {
             build_on_save: false,
             use_crate_blacklist: true,
             target_dir: None,
+            features: vec![],
+            all_features: false,
+            no_default_features: false,
         };
         result.normalise();
         result

src/test/mod.rs

@@ -712,8 +712,73 @@ fn test_find_impls() {
     // ]);
 }
 
+#[test]
+fn test_features() {
+    let mut env = Environment::new("features");
+
+    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.features = vec!["foo".to_owned()]);
+    let (mut server, results) = env.mock_server(messages);
+    // Initialise 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#""message":"cannot find struct, variant or union type `Bar` in this scope""#),
+                                       ExpectedMessage::new(None).expect_contains("diagnosticsEnd")]);
+}
+
+#[test]
+fn test_all_features() {
+    let mut env = Environment::new("features");
+
+    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_features = true);
+    let (mut server, results) = env.mock_server(messages);
+    // Initialise 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("diagnosticsEnd")]);
+}
+
+#[test]
+fn test_no_default_features() {
+    let mut env = Environment::new("features");
+
+    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.no_default_features = true;
+        c.features = vec!["foo".to_owned(), "bar".to_owned()]
+    });
+    let (mut server, results) = env.mock_server(messages);
+    // Initialise 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#""message":"cannot find struct, variant or union type `Baz` in this scope""#),
+                                       ExpectedMessage::new(None).expect_contains("diagnosticsEnd")]);
+}
+
 // #[test]
-// fn test_handle_utf8_directory) {
+// fn test_handle_utf8_directory() {
 //     let mut env = Environment::new("unicødë");
 //
 //     let root_path = env.cache.abs_path(Path::new("."));
@@ -733,3 +798,4 @@ fn test_find_impls() {
 //                                            .expect_contains(root_url.path())
 //                                            .expect_contains("struct is never used: `Unused`"),
 //                                        ExpectedMessage::new(None).expect_contains("diagnosticsEnd")]);
+// }

test_data/features/Cargo.lock

@@ -0,0 +1,10 @@
+[package]
+name = "features"
+version = "0.1.0"
+authors = ["Bastien Orivel <eijebong@bananium.fr>"]
+
+[features]
+default = ["baz"]
+foo = []
+bar = []
+baz = []

test_data/features/Cargo.toml

@@ -0,0 +1,14 @@
+#[cfg(feature = "foo")]
+pub struct Foo;
+
+#[cfg(feature = "bar")]
+pub struct Bar;
+
+#[cfg(feature = "baz")]
+pub struct Baz;
+
+fn main() {
+    Foo {};
+    Bar {};
+    Baz {};
+}