From 80bcc5129450c02c4d074ad91af5255cf71efcf2 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jonathan.d.turner@gmail.com>
Date: Thu, 8 Aug 2019 17:09:38 +1200
Subject: [PATCH] get tests passing by fixing classifying external

---
 src/cli.rs | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/cli.rs b/src/cli.rs
index dd8f48d0b..e39978bf0 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -478,30 +478,28 @@ fn classify_command(
                         args,
                     }))
                 }
-                false => match context.get_command(name).as_ref() {
-                    Command::Static(_command) => {
-                        let arg_list_strings: Vec<Spanned<String>> = match call.children() {
-                            //Some(args) => args.iter().map(|i| i.as_external_arg(source)).collect(),
-                            Some(args) => args
-                                .iter()
-                                .filter_map(|i| match i {
-                                    TokenNode::Whitespace(_) => None,
-                                    other => Some(Spanned::from_item(
-                                        other.as_external_arg(source),
-                                        other.span(),
-                                    )),
-                                })
-                                .collect(),
-                            None => vec![],
-                        };
+                false => {
+                    let arg_list_strings: Vec<Spanned<String>> = match call.children() {
+                        //Some(args) => args.iter().map(|i| i.as_external_arg(source)).collect(),
+                        Some(args) => args
+                            .iter()
+                            .filter_map(|i| match i {
+                                TokenNode::Whitespace(_) => None,
+                                other => Some(Spanned::from_item(
+                                    other.as_external_arg(source),
+                                    other.span(),
+                                )),
+                            })
+                            .collect(),
+                        None => vec![],
+                    };
 
-                        Ok(ClassifiedCommand::External(ExternalCommand {
-                            name: name.to_string(),
-                            name_span: Some(head.span().clone()),
-                            args: arg_list_strings,
-                        }))
-                    }
-                },
+                    Ok(ClassifiedCommand::External(ExternalCommand {
+                        name: name.to_string(),
+                        name_span: Some(head.span().clone()),
+                        args: arg_list_strings,
+                    }))
+                }
             }
         }