Enhance formatting and repair capabilities in NuShell (#124)

Author: fdncred

src/formatting.rs

@@ -19,6 +19,7 @@ use nu_formatter::Mode;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use std::convert::TryFrom;
 use std::{
+    collections::BTreeMap,
     io::{self, Write},
     path::{Path, PathBuf},
 };
@@ -334,9 +335,22 @@ fn discover_nu_files(
         })
         .collect();
 
+    let nu_files = deduplicate_discovered_files(nu_files);
+
     Ok((nu_files, invalid_paths))
 }
 
+fn deduplicate_discovered_files(paths: Vec<PathBuf>) -> Vec<PathBuf> {
+    let mut unique: BTreeMap<PathBuf, PathBuf> = BTreeMap::new();
+
+    for path in paths {
+        let key = path.canonicalize().unwrap_or_else(|_| path.clone());
+        unique.entry(key).or_insert(path);
+    }
+
+    unique.into_values().collect()
+}
+
 /// Build override rules for excluded patterns
 fn build_overrides(excludes: &[String]) -> Result<ignore::overrides::Override, ConfigError> {
     let mut builder = OverrideBuilder::new(".");
@@ -466,4 +480,29 @@ mod tests {
         let exit_code = display_diagnostic_and_compute_exit_code(&results, check_mode);
         assert_eq!(exit_code, expected);
     }
+
+    #[test]
+    fn discover_nu_files_deduplicates_overlapping_paths() {
+        let dir = tempdir().unwrap();
+        let nested = dir.path().join("nested");
+        fs::create_dir_all(&nested).unwrap();
+
+        let target = nested.join("a.nu");
+        fs::write(&target, "let x = 1").unwrap();
+
+        let (files, invalid) =
+            discover_nu_files(vec![dir.path().to_path_buf(), nested.clone()], &[])
+                .expect("discovery should succeed");
+
+        assert!(invalid.is_empty());
+
+        let canonical_target = target.canonicalize().unwrap();
+        let matches = files
+            .iter()
+            .filter_map(|path| path.canonicalize().ok())
+            .filter(|path| *path == canonical_target)
+            .count();
+
+        assert_eq!(matches, 1, "file should be discovered exactly once");
+    }
 }

src/main.rs

@@ -7,6 +7,7 @@ let z = 3 # inline comment
 # consecutive
 # comments
 def foo [] { 1 }
-def bar [] { 
-# comment inside block
-print "hello" }
+def bar [] {
+    # comment inside block
+    print "hello"
+}

tests/fixtures/expected/comment.nu

@@ -0,0 +1,3 @@
+def foo []: nothing -> nothing {
+    let xs = [1 2 3]
+}

tests/fixtures/expected/issue108.nu

@@ -0,0 +1,5 @@
+def foo []: nothing -> nothing {
+    for h in [1 2 3] {
+        print $h
+    }
+}

tests/fixtures/expected/issue109.nu

@@ -0,0 +1,6 @@
+def foo []: nothing -> nothing {
+    let x = (bar
+        "4444444444444444444444444444444444444444"
+        "5555555555555555555555555555555555555555"
+    )
+}

tests/fixtures/expected/issue110.nu

@@ -0,0 +1,4 @@
+def foo []: bool -> bool {
+    let yesno: bool = ($in | str trim) == "yes"
+    $yesno
+}

tests/fixtures/expected/issue116.nu

@@ -0,0 +1,7 @@
+def foo []: nothing -> nothing {
+    let result = $items | from json | if ($in | default [] | where value == "ERR" | is-empty) {
+        $in # test
+    } else {
+        null
+    }
+}

tests/fixtures/expected/issue119.nu

@@ -0,0 +1,3 @@
+def foo [] {
+    if true { 1 } else { 2 }
+}

tests/fixtures/expected/issue120.nu

@@ -0,0 +1,3 @@
+def foo [] {
+    if true { 1 } else { 2 }
+}