From 0795d56c1cd30858e20416076bf9203136730c1d Mon Sep 17 00:00:00 2001
From: WatsonThink <36229086+WatsonThink@users.noreply.github.com>
Date: Mon, 15 Feb 2021 17:41:49 +0900
Subject: [PATCH] Source path including tilda (#3059)

* Use expand_path to handle the path including tilda

* Publish path::expand_path for using in nu-command

* cargo fmt

Co-authored-by: Wataru Yamaguchi <nagisamark2@gmail.com>
---
 crates/nu-command/src/commands/source.rs | 3 ++-
 crates/nu-parser/src/lib.rs              | 1 +
 crates/nu-parser/src/parse.rs            | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/commands/source.rs b/crates/nu-command/src/commands/source.rs
index 3f2a99c9b8..43ff400580 100644
--- a/crates/nu-command/src/commands/source.rs
+++ b/crates/nu-command/src/commands/source.rs
@@ -2,6 +2,7 @@ use crate::prelude::*;
 use nu_engine::WholeStreamCommand;
 
 use nu_errors::ShellError;
+use nu_parser::expand_path;
 use nu_protocol::{Signature, SyntaxShape};
 use nu_source::Tagged;
 
@@ -46,7 +47,7 @@ pub async fn source(args: CommandArgs) -> Result<OutputStream, ShellError> {
     // Note: this is a special case for setting the context from a command
     // In this case, if we don't set it now, we'll lose the scope that this
     // variable should be set into.
-    let contents = std::fs::read_to_string(&filename.item);
+    let contents = std::fs::read_to_string(expand_path(&filename.item).into_owned());
     match contents {
         Ok(contents) => {
             let result = crate::script::run_script_standalone(contents, true, &ctx, false).await;
diff --git a/crates/nu-parser/src/lib.rs b/crates/nu-parser/src/lib.rs
index 724ce9b07e..92f728090b 100644
--- a/crates/nu-parser/src/lib.rs
+++ b/crates/nu-parser/src/lib.rs
@@ -15,6 +15,7 @@ pub use lex::lexer::{lex, parse_block};
 pub use lex::tokens::{LiteBlock, LiteCommand, LiteGroup, LitePipeline};
 pub use parse::{classify_block, garbage, parse, parse_full_column_path, parse_math_expression};
 pub use path::expand_ndots;
+pub use path::expand_path;
 pub use scope::ParserScope;
 pub use shapes::shapes;
 pub use signature::{Signature, SignatureRegistry};
diff --git a/crates/nu-parser/src/parse.rs b/crates/nu-parser/src/parse.rs
index 32e9607144..35e77987f2 100644
--- a/crates/nu-parser/src/parse.rs
+++ b/crates/nu-parser/src/parse.rs
@@ -1788,7 +1788,9 @@ fn parse_call(
                 )),
             );
         }
-        if let Ok(contents) = std::fs::read_to_string(&lite_cmd.parts[1].item) {
+        if let Ok(contents) =
+            std::fs::read_to_string(expand_path(&lite_cmd.parts[1].item).into_owned())
+        {
             let _ = parse(&contents, 0, scope);
         } else {
             return (