Improve the path completion and tilde support in path

Author: daxian-dbw

shell/AIShell.Integration/AIShell.psd1

@@ -7,7 +7,7 @@
     CompanyName = 'Microsoft Corporation'
     Copyright = '(c) Microsoft Corporation. All rights reserved.'
     Description = 'Integration with the AIShell to provide intelligent shell experience'
-    PowerShellVersion = '7.4'
+    PowerShellVersion = '7.4.6'
     FunctionsToExport = @()
     CmdletsToExport = @('Start-AIShell','Invoke-AIShell','Resolve-Error')
     VariablesToExport = '*'

shell/AIShell.Kernel/Command/CodeCommand.cs

@@ -25,7 +25,7 @@ public CodeCommand()
         post.AddArgument(nth);
 
         var append = new Option<bool>("--append", "Append to the end of the file.");
-        var file = new Argument<FileInfo>("file", "The file path to save the code to.");
+        var file = new Argument<string>("file", "The file path to save the code to.");
         save.AddArgument(file);
         save.AddOption(append);
 
@@ -88,7 +88,7 @@ private void CopyAction(int nth)
         shell.OnUserAction(new CodePayload(UserAction.CodeCopy, code));
     }
 
-    private void SaveAction(FileInfo file, bool append)
+    private void SaveAction(string path, bool append)
     {
         var shell = (Shell)Shell;
         var host = shell.Host;
@@ -100,6 +100,22 @@ private void SaveAction(FileInfo file, bool append)
             return;
         }
 
+        if (string.IsNullOrEmpty(path))
+        {
+            host.WriteErrorLine($"Please specify a file path for saving the code.");
+            return;
+        }
+
+        path = Utils.ResolveTilde(path);
+        FileInfo file = new(path);
+
+        string fullName = file.FullName;
+        if (Directory.Exists(fullName))
+        {
+            host.WriteErrorLine($"The specified path '{fullName}' points to an existing directory. Please specify a file path instead.");
+            return;
+        }
+
         try
         {
             using FileStream stream = file.Open(append ? FileMode.Append : FileMode.Create, FileAccess.Write, FileShare.None);

shell/AIShell.Kernel/Command/CommandRunner.cs

@@ -35,7 +35,7 @@ internal CommandRunner(Shell shell)
             new RefreshCommand(),
             new RetryCommand(),
             new HelpCommand(),
-            new RenderCommand(),
+            //new RenderCommand(),
         };
 
         LoadCommands(buildin, Core);

shell/AIShell.Kernel/Utility/ReadLineHelper.cs

@@ -88,7 +88,41 @@ private List<CompletionResult> CompleteCommandName(string wildcard)
 
     private List<CompletionResult> CompleteFileSystemPath(string wordToComplete)
     {
-        if (!Path.IsPathFullyQualified(wordToComplete))
+        bool startsWithTilde = false;
+        string homeDirectory = null;
+        List<CompletionResult> result = null;
+
+        // Check if the path starts with tilde.
+        static bool StartsWithTilde(string path)
+        {
+            return !string.IsNullOrEmpty(path)
+                && path.Length >= 2
+                && path[0] is '~'
+                && path[1] == Path.DirectorySeparatorChar;
+        }
+
+        // Check if the path should be quoted.
+        string QuoteIfNeeded(string path)
+        {
+            // Do not add quoting if the original string is already quoted.
+            return !wordToComplete.Contains(' ') && path.Contains(' ') ? $"\"{path}\"" : path;
+        }
+
+        // Add one result to the result list.
+        void AddOneResult(string path, bool isContainer)
+        {
+            result ??= [];
+            string filePath = startsWithTilde ? path.Replace(homeDirectory, "~") : path;
+            string text = QuoteIfNeeded(filePath);
+
+            CompletionResultType resultType = isContainer
+                ? CompletionResultType.ProviderContainer
+                : CompletionResultType.ProviderItem;
+            result.Add(new CompletionResult(text, text, resultType, toolTip: null));
+        }
+
+        if (!Path.IsPathFullyQualified(wordToComplete) &&
+            (startsWithTilde = StartsWithTilde(wordToComplete)) is false)
         {
             return null;
         }
@@ -105,32 +139,28 @@ private List<CompletionResult> CompleteFileSystemPath(string wordToComplete)
             fileName = Path.GetFileName(wordToComplete) + "*";
         }
 
+        if (startsWithTilde)
+        {
+            rootPath = Utils.ResolveTilde(rootPath);
+            homeDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        }
+
         if (!Directory.Exists(rootPath))
         {
             return null;
         }
 
-        List<CompletionResult> result = null;
         foreach (string dir in Directory.EnumerateDirectories(rootPath, fileName, _enumerationOptions))
         {
-            result ??= new();
-            string text = QuoteIfNeeded(dir);
-            result.Add(new CompletionResult(text, text, CompletionResultType.ProviderContainer, toolTip: null));
+            AddOneResult(dir, isContainer: true);
         }
 
         foreach (string file in Directory.EnumerateFiles(rootPath, fileName, _enumerationOptions))
         {
-            result ??= new();
-            string text = QuoteIfNeeded(file);
-            result.Add(new CompletionResult(text, text, CompletionResultType.ProviderItem, toolTip: null));
+            AddOneResult(file, isContainer: false);
         }
 
         return result;
-
-        static string QuoteIfNeeded(string path)
-        {
-            return path.Contains(' ') ? $"\"{path}\"" : path;
-        }
     }
 
     /// <summary>

shell/AIShell.Kernel/Utility/Utils.cs

@@ -84,6 +84,30 @@ internal static JsonSerializerOptions GetJsonSerializerOptions()
         };
     }
 
+    /// <summary>
+    /// Try resolving the leading tilde in a path.
+    /// </summary>
+    internal static string ResolveTilde(string path)
+    {
+        if (path.StartsWith('~'))
+        {
+            string home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+
+            if (path.Length is 1)
+            {
+                // The path is just '~'.
+                return home;
+            }
+
+            if (path[1] == Path.DirectorySeparatorChar)
+            {
+                return Path.Join(home, path.AsSpan(2));
+            }
+        }
+
+        return path;
+    }
+
     /// <summary>
     /// Check if the <paramref name="left"/> contains <paramref name="right"/> regardless of
     /// the leading and trailing space characters on each line if both are multi-line strings.