1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
--- helix-loader/src/grammar.rs.orig 2024-03-30 13:28:02 UTC
+++ helix-loader/src/grammar.rs
@@ -86,7 +86,6 @@ fn ensure_git_is_available() -> Result<()> {
}
fn ensure_git_is_available() -> Result<()> {
- helix_stdx::env::which("git")?;
Ok(())
}
@@ -96,57 +95,6 @@ pub fn fetch_grammars() -> Result<()> {
// We do not need to fetch local grammars.
let mut grammars = get_grammar_configs()?;
grammars.retain(|grammar| !matches!(grammar.source, GrammarSource::Local { .. }));
-
- println!("Fetching {} grammars", grammars.len());
- let results = run_parallel(grammars, fetch_grammar);
-
- let mut errors = Vec::new();
- let mut git_updated = Vec::new();
- let mut git_up_to_date = 0;
- let mut non_git = Vec::new();
-
- for (grammar_id, res) in results {
- match res {
- Ok(FetchStatus::GitUpToDate) => git_up_to_date += 1,
- Ok(FetchStatus::GitUpdated { revision }) => git_updated.push((grammar_id, revision)),
- Ok(FetchStatus::NonGit) => non_git.push(grammar_id),
- Err(e) => errors.push((grammar_id, e)),
- }
- }
-
- non_git.sort_unstable();
- git_updated.sort_unstable_by(|a, b| a.0.cmp(&b.0));
-
- if git_up_to_date != 0 {
- println!("{} up to date git grammars", git_up_to_date);
- }
-
- if !non_git.is_empty() {
- println!("{} non git grammars", non_git.len());
- println!("\t{:?}", non_git);
- }
-
- if !git_updated.is_empty() {
- println!("{} updated grammars", git_updated.len());
- // We checked the vec is not empty, unwrapping will not panic
- let longest_id = git_updated.iter().map(|x| x.0.len()).max().unwrap();
- for (id, rev) in git_updated {
- println!(
- "\t{id:width$} now on {rev}",
- id = id,
- width = longest_id,
- rev = rev
- );
- }
- }
-
- if !errors.is_empty() {
- let len = errors.len();
- for (i, (grammar, error)) in errors.into_iter().enumerate() {
- println!("Failure {}/{len}: {grammar} {error}", i + 1);
- }
- bail!("{len} grammars failed to fetch");
- }
Ok(())
}
|
