Adds recovery deps

Author: Archie Atkinson

src/justfile.rs

@@ -344,9 +344,24 @@ impl<'src> Justfile<'src> {
       }
     }
 
-    recipe.run(context, &scope, &positional, is_dependency)?;
+    let result = recipe.run(context, &scope, &positional, is_dependency);
 
-    if !context.config.no_dependencies {
+    if let Err(err) = result {
+      if recipe.recoveries().peekable().peek().is_none() {
+        return Err(err);
+      }
+
+      let mut ran = Ran::default();
+
+      for Dependency { recipe, arguments } in recipe.recoveries() {
+        let evaluated = arguments
+          .iter()
+          .map(|argument| evaluator.evaluate_expression(argument))
+          .collect::<RunResult<Vec<String>>>()?;
+
+        Self::run_recipe(&evaluated, context, &mut ran, recipe, true)?;
+      }
+    } else if !context.config.no_dependencies {
       let mut ran = Ran::default();
 
       for Dependency { recipe, arguments } in recipe.subsequents() {

src/lexer.rs

@@ -1117,6 +1117,12 @@ mod tests {
     tokens: (AmpersandAmpersand),
   }
 
+  test! {
+    name:   bar_bar,
+    text:   "||",
+    tokens: (BarBar),
+  }
+
   test! {
     name:   equals,
     text:   "=",

src/parser.rs

@@ -956,6 +956,22 @@ impl<'run, 'src> Parser<'run, 'src> {
       dependencies.append(&mut subsequents);
     }
 
+    let if_error = dependencies.len();
+
+    if self.accepted(BarBar)? {
+      let mut recoveries = Vec::new();
+
+      while let Some(recovery) = self.accept_dependency()? {
+        recoveries.push(recovery);
+      }
+
+      if recoveries.is_empty() {
+        return Err(self.unexpected_token()?);
+      }
+
+      dependencies.append(&mut recoveries);
+    }
+
     self.expect_eol()?;
 
     let body = self.parse_body()?;
@@ -1007,6 +1023,7 @@ impl<'run, 'src> Parser<'run, 'src> {
       dependencies,
       doc: doc.filter(|doc| !doc.is_empty()),
       file_depth: self.file_depth,
+      if_error,
       import_offsets: self.import_offsets.clone(),
       name,
       namepath: self
@@ -2533,7 +2550,7 @@ mod tests {
     column:  9,
     width:   1,
     kind:    UnexpectedToken{
-      expected: vec![AmpersandAmpersand, Comment, Eof, Eol, Identifier, ParenL],
+      expected: vec![AmpersandAmpersand, BarBar, Comment, Eof, Eol, Identifier, ParenL],
       found: Equals
     },
   }

src/recipe.rs

@@ -25,6 +25,7 @@ pub(crate) struct Recipe<'src, D = Dependency<'src>> {
   pub(crate) doc: Option<String>,
   #[serde(skip)]
   pub(crate) file_depth: u32,
+  pub(crate) if_error: usize,
   #[serde(skip)]
   pub(crate) import_offsets: Vec<usize>,
   pub(crate) name: Name<'src>,
@@ -503,7 +504,11 @@ impl<'src, D> Recipe<'src, D> {
   }
 
   pub(crate) fn subsequents(&self) -> impl Iterator<Item = &D> {
-    self.dependencies.iter().skip(self.priors)
+    self.dependencies[self.priors..self.if_error].iter()
+  }
+
+  pub(crate) fn recoveries(&self) -> impl Iterator<Item = &D> {
+    self.dependencies[self.if_error..].iter()
   }
 }
 

src/unresolved_recipe.rs

@@ -50,6 +50,7 @@ impl<'src> UnresolvedRecipe<'src> {
       dependencies,
       doc: self.doc,
       file_depth: self.file_depth,
+      if_error: self.if_error,
       import_offsets: self.import_offsets,
       name: self.name,
       namepath: self.namepath,

tests/json.rs

@@ -63,6 +63,7 @@ struct Recipe<'a> {
   body: Vec<Value>,
   dependencies: Vec<Dependency<'a>>,
   doc: Option<&'a str>,
+  if_error: u32,
   name: &'a str,
   namepath: &'a str,
   parameters: Vec<Parameter<'a>>,
@@ -277,6 +278,7 @@ fn dependencies() {
               ..default()
             }]
             .into(),
+            if_error: 1,
             priors: 1,
             ..default()
           },
@@ -356,6 +358,7 @@ fn dependency_argument() {
               .into(),
             }]
             .into(),
+            if_error: 1,
             priors: 1,
             ..default()
           },
@@ -601,6 +604,7 @@ fn priors() {
             .into(),
             name: "b",
             namepath: "b",
+            if_error: 2,
             priors: 1,
             ..default()
           },

tests/lib.rs

@@ -103,6 +103,7 @@ mod private;
 mod quiet;
 mod quote;
 mod readme;
+mod recoveries;
 mod recursion_limit;
 mod regexes;
 mod request;

tests/misc.rs

@@ -1634,7 +1634,7 @@ fn unexpected_token_in_dependency_position() {
     .arg("foo")
     .justfile("foo: 'bar'")
     .stderr(
-      "error: Expected '&&', comment, end of file, end of line, \
+      "error: Expected '&&', '||', comment, end of file, end of line, \
     identifier, or '(', but found string
  ——▶ justfile:1:6
   │