Skip to content

Fix recursive path handling for workspace/didChangeWatchedFiles #1047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2020
Merged

Fix recursive path handling for workspace/didChangeWatchedFiles #1047

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions src/language_server_protocol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use crate::{
viewport,
};
use anyhow::{anyhow, Context, Error, Result};
use glob::glob;
use itertools::Itertools;
use jsonrpc_core::Value;
use log::{debug, error, info, warn};
Expand Down Expand Up @@ -2724,13 +2725,27 @@ impl LanguageClient {
self.update(|state| {
if let Some(ref mut watcher) = state.watchers.get_mut(language_id) {
for w in &opt.watchers {
let recursive_mode = if w.glob_pattern.ends_with("**") {
notify::RecursiveMode::Recursive
} else {
notify::RecursiveMode::NonRecursive
};
watcher
.watch(w.glob_pattern.trim_end_matches("**"), recursive_mode)?;
info!("Watching glob pattern: {}", &w.glob_pattern);
for entry in glob(&w.glob_pattern)? {
match entry {
Ok(path) => {
let mode = if path.is_dir() {
notify::RecursiveMode::Recursive
} else {
notify::RecursiveMode::NonRecursive
};
debug!(
"Watching path {} with mode {:?}",
path.display(),
mode
);
watcher.watch(path, mode)?;
}
Err(e) => {
warn!("Error globbing for {}: {}", w.glob_pattern, e)
}
}
}
}
}
Ok(())
Expand Down