Follow symbolic links when walking directories

src/highlighting/theme_set.rs

@@ -3,7 +3,6 @@ use super::settings::*;
 use super::super::LoadingError;
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
-use walkdir::WalkDir;
 
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct ThemeSet {
@@ -23,7 +22,7 @@ impl ThemeSet {
     /// This is god for enumerating before loading one with [`get_theme`](#method.get_theme)
     pub fn discover_theme_paths<P: AsRef<Path>>(folder: P) -> Result<Vec<PathBuf>, LoadingError> {
         let mut themes = Vec::new();
-        for entry in WalkDir::new(folder) {
+        for entry in crate::utils::walk_dir(folder) {
             let entry = entry.map_err(LoadingError::WalkDir)?;
             if entry.path().extension().map_or(false, |e| e == "tmTheme") {
                 themes.push(entry.path().to_owned());

src/lib.rs

@@ -40,6 +40,7 @@ pub mod highlighting;
 pub mod html;
 pub mod parsing;
 pub mod util;
+mod utils;
 
 use std::io::Error as IoError;
 use std::error::Error;

src/parsing/syntax_set.rs

@@ -9,8 +9,6 @@ use super::super::LoadingError;
 
 use std::collections::{HashMap, HashSet, BTreeSet};
 use std::path::Path;
-#[cfg(feature = "yaml-load")]
-use walkdir::WalkDir;
 use std::io::{self, BufRead, BufReader};
 use std::fs::File;
 use std::mem;
@@ -479,7 +477,7 @@ impl SyntaxSetBuilder {
         folder: P,
         lines_include_newline: bool
     ) -> Result<(), LoadingError> {
-        for entry in WalkDir::new(folder).sort_by(|a, b| a.file_name().cmp(b.file_name())) {
+        for entry in crate::utils::walk_dir(folder).sort_by(|a, b| a.file_name().cmp(b.file_name())) {
             let entry = entry.map_err(LoadingError::WalkDir)?;
             if entry.path().extension().map_or(false, |e| e == "sublime-syntax") {
                 let syntax = load_syntax_file(entry.path(), lines_include_newline)?;

src/utils.rs

@@ -0,0 +1,11 @@
+//! Private library utilities that are not exposed to clients since we don't
+//! want to make semver guarantees about them
+
+use std::path::Path;
+
+use walkdir::WalkDir;
+
+/// Private helper to walk a dir and also follow symbolic links.
+pub fn walk_dir<P: AsRef<Path>>(folder: P) -> WalkDir {
+    WalkDir::new(folder).follow_links(true)
+}