Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-02 01:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix recommending parent folder

Browse Source
This commit is contained in:
Thomas
2023-01-04 20:27:53 +00:00
parent bfdb7202ff
commit 51eb85afec
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Terminal.Gui/Windows/FileDialog2.cs
View File

@@ -430,7 +430,7 @@ namespace Terminal.Gui {
return false;
}
internal void GenerateSuggestions (params string [] suggestions)
internal void GenerateSuggestions (FileDialogState state, params string [] suggestions)
{
if (!CursorIsAtEnd()) {
return;
@@ -446,12 +446,19 @@ namespace Terminal.Gui {
var term = path.Substring (last + 1);
if(term.Equals(state?.Directory?.Name))
{
ClearSuggestions();
return;
}
// TODO: Be case insensitive on Windows
var validSuggestions = suggestions
.Where (s => s.StartsWith (term))
.OrderBy (m => m.Length)
.ToArray ();
// nothing to suggest
if (validSuggestions.Length == 0 || validSuggestions [0].Length == term.Length) {
ClearSuggestions ();
@@ -479,11 +486,9 @@ namespace Terminal.Gui {
e => e.FileSystemInfo is DirectoryInfo d
? d.Name + System.IO.Path.DirectorySeparatorChar
: e.FileSystemInfo.Name)
.ToList ();
.ToArray ();
suggestions.Add(state.Directory.Name);
GenerateSuggestions (suggestions.ToArray());
GenerateSuggestions (state, suggestions);
}
internal void SetTextTo (FileSystemInfo fileSystemInfo)

4
UnitTests/FileDialog2Tests.cs
View File

@@ -30,7 +30,7 @@ namespace Terminal.Gui.Core {
tb.Text = "c:/fish";
tb.CursorPosition = tb.Text.Length;
tb.GenerateSuggestions ("fish", "fishes");
tb.GenerateSuggestions (null, "fish", "fishes");
// should not report success for autocompletion because we already have that exact
// string
@@ -48,7 +48,7 @@ namespace Terminal.Gui.Core {
tb.Text = @"c:/fi";
tb.CursorPosition = tb.Text.Length;
tb.GenerateSuggestions ("fish", "fishes");
tb.GenerateSuggestions (null, "fish", "fishes");
Assert.True (tb.AcceptSelectionIfAny ());
Assert.Equal (@"c:\fish", tb.Text);