refactor: command palette auto-selection (#1937)

love-linger · love-linger · commit e7bd7bb43c1e · 2025-11-26T14:50:08.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/ViewModels/BlameCommandPalette.cs b/src/ViewModels/BlameCommandPalette.cs
@@ -91,16 +91,28 @@ private void UpdateVisible()
 if (string.IsNullOrEmpty(_filter))
{
 VisibleFiles = _repoFiles;
+
+ if (string.IsNullOrEmpty(_selectedFile))
+ SelectedFile = _repoFiles[0];
 }
 else
{
 var visible = new List<string>();
+
 foreach (var f in _repoFiles)
{
 if (f.Contains(_filter, StringComparison.OrdinalIgnoreCase))
 visible.Add(f);
 }
+
+ var autoSelected = _selectedFile;
+ if (visible.Count == 0)
+ autoSelected = null;
+ else if (string.IsNullOrEmpty(_selectedFile) || !visible.Contains(_selectedFile))
+ autoSelected = visible[0];
+
 VisibleFiles = visible;
+ SelectedFile = autoSelected;
 }
 }
 }
diff --git a/src/ViewModels/BranchCompareCommandPalette.cs b/src/ViewModels/BranchCompareCommandPalette.cs
@@ -79,7 +79,14 @@ private void UpdateBranches()
 return l.IsLocal ? -1 : 1;
 });
 
+ var autoSelected = _selectedBranch;
+ if (branches.Count == 0)
+ autoSelected = null;
+ else if (_selectedBranch == null || !branches.Contains(_selectedBranch))
+ autoSelected = branches[0];
+
 Branches = branches;
+ SelectedBranch = autoSelected;
 }
 
 private Launcher _launcher;
diff --git a/src/ViewModels/CheckoutCommandPalette.cs b/src/ViewModels/CheckoutCommandPalette.cs
@@ -84,7 +84,14 @@ private void UpdateBranches()
 return l.IsLocal ? -1 : 1;
 });
 
+ var autoSelected = _selectedBranch;
+ if (branches.Count == 0)
+ autoSelected = null;
+ else if (_selectedBranch == null || !branches.Contains(_selectedBranch))
+ autoSelected = branches[0];
+
 Branches = branches;
+ SelectedBranch = autoSelected;
 }
 
 private Launcher _launcher;
diff --git a/src/ViewModels/FileHistoryCommandPalette.cs b/src/ViewModels/FileHistoryCommandPalette.cs
@@ -85,16 +85,28 @@ private void UpdateVisible()
 if (string.IsNullOrEmpty(_filter))
{
 VisibleFiles = _repoFiles;
+
+ if (string.IsNullOrEmpty(_selectedFile))
+ SelectedFile = _repoFiles[0];
 }
 else
{
 var visible = new List<string>();
+
 foreach (var f in _repoFiles)
{
 if (f.Contains(_filter, StringComparison.OrdinalIgnoreCase))
 visible.Add(f);
 }
+
+ var autoSelected = _selectedFile;
+ if (visible.Count == 0)
+ autoSelected = null;
+ else if (string.IsNullOrEmpty(_selectedFile) || !visible.Contains(_selectedFile))
+ autoSelected = visible[0];
+
 VisibleFiles = visible;
+ SelectedFile = autoSelected;
 }
 }
 }
diff --git a/src/ViewModels/MergeCommandPalette.cs b/src/ViewModels/MergeCommandPalette.cs
@@ -80,7 +80,14 @@ private void UpdateBranches()
 return l.IsLocal ? -1 : 1;
 });
 
+ var autoSelected = _selectedBranch;
+ if (branches.Count == 0)
+ autoSelected = null;
+ else if (_selectedBranch == null || !branches.Contains(_selectedBranch))
+ autoSelected = branches[0];
+
 Branches = branches;
+ SelectedBranch = autoSelected;
 }
 
 private Launcher _launcher = null;
diff --git a/src/ViewModels/OpenFileCommandPalette.cs b/src/ViewModels/OpenFileCommandPalette.cs
@@ -86,16 +86,28 @@ private void UpdateVisible()
 if (string.IsNullOrEmpty(_filter))
{
 VisibleFiles = _repoFiles;
+
+ if (string.IsNullOrEmpty(_selectedFile))
+ SelectedFile = _repoFiles[0];
 }
 else
{
 var visible = new List<string>();
+
 foreach (var f in _repoFiles)
{
 if (f.Contains(_filter, StringComparison.OrdinalIgnoreCase))
 visible.Add(f);
 }
+
+ var autoSelected = _selectedFile;
+ if (visible.Count == 0)
+ autoSelected = null;
+ else if (string.IsNullOrEmpty(_selectedFile) || !visible.Contains(_selectedFile))
+ autoSelected = visible[0];
+
 VisibleFiles = visible;
+ SelectedFile = autoSelected;
 }
 }
 }
diff --git a/src/ViewModels/RepositoryCommandPalette.cs b/src/ViewModels/RepositoryCommandPalette.cs
@@ -82,6 +82,7 @@ public RepositoryCommandPalette(Launcher launcher, Repository repo)
 }));
 
 _visibleCmds = _cmds;
+ _selectedCmd = _cmds[0];
 }
 
 public override void Cleanup()
@@ -116,13 +117,20 @@ private void UpdateVisible()
 else
{
 var visible = new List<RepositoryCommandPaletteCmd>();
- foreach (var cmd in VisibleCmds)
+
+ foreach (var cmd in _cmds)
{
 if (cmd.Key.Contains(_filter, StringComparison.OrdinalIgnoreCase) ||
 cmd.Label.Contains(_filter, StringComparison.OrdinalIgnoreCase))
 visible.Add(cmd);
 }
+
+ var autoSelected = _selectedCmd;
+ if (!visible.Contains(_selectedCmd))
+ autoSelected = visible.Count > 0 ? visible[0] : null;
+
 VisibleCmds = visible;
+ SelectedCmd = autoSelected;
 }
 }
 
diff --git a/src/Views/BlameCommandPalette.axaml.cs b/src/Views/BlameCommandPalette.axaml.cs
@@ -36,10 +36,7 @@ protected override void OnKeyDown(KeyEventArgs e)
 if (FilterTextBox.IsKeyboardFocusWithin)
{
 if (vm.VisibleFiles.Count > 0)
-{
 FileListBox.Focus(NavigationMethod.Directional);
- vm.SelectedFile = vm.VisibleFiles[0];
- }
 
 e.Handled = true;
 return;
diff --git a/src/Views/BranchCompareCommandPalette.axaml.cs b/src/Views/BranchCompareCommandPalette.axaml.cs
@@ -36,10 +36,7 @@ protected override void OnKeyDown(KeyEventArgs e)
 if (FilterTextBox.IsKeyboardFocusWithin)
{
 if (vm.Branches.Count > 0)
-{
 BranchListBox.Focus(NavigationMethod.Directional);
- vm.SelectedBranch = vm.Branches[0];
- }
 
 e.Handled = true;
 return;
diff --git a/src/Views/CheckoutCommandPalette.axaml.cs b/src/Views/CheckoutCommandPalette.axaml.cs
@@ -36,10 +36,7 @@ protected override async void OnKeyDown(KeyEventArgs e)
 if (FilterTextBox.IsKeyboardFocusWithin)
{
 if (vm.Branches.Count > 0)
-{
 BranchListBox.Focus(NavigationMethod.Directional);
- vm.SelectedBranch = vm.Branches[0];
- }
 
 e.Handled = true;
 return;
diff --git a/src/Views/FileHistoryCommandPalette.axaml.cs b/src/Views/FileHistoryCommandPalette.axaml.cs
@@ -36,10 +36,7 @@ protected override void OnKeyDown(KeyEventArgs e)
 if (FilterTextBox.IsKeyboardFocusWithin)
{
 if (vm.VisibleFiles.Count > 0)
-{
 FileListBox.Focus(NavigationMethod.Directional);
- vm.SelectedFile = vm.VisibleFiles[0];
- }
 
 e.Handled = true;
 return;
diff --git a/src/Views/MergeCommandPalette.axaml.cs b/src/Views/MergeCommandPalette.axaml.cs
@@ -36,10 +36,7 @@ protected override void OnKeyDown(KeyEventArgs e)
 if (FilterTextBox.IsKeyboardFocusWithin)
{
 if (vm.Branches.Count > 0)
-{
 BranchListBox.Focus(NavigationMethod.Directional);
- vm.SelectedBranch = vm.Branches[0];
- }
 
 e.Handled = true;
 return;
diff --git a/src/Views/OpenFileCommandPalette.axaml.cs b/src/Views/OpenFileCommandPalette.axaml.cs
@@ -36,10 +36,7 @@ protected override void OnKeyDown(KeyEventArgs e)
 if (FilterTextBox.IsKeyboardFocusWithin)
{
 if (vm.VisibleFiles.Count > 0)
-{
 FileListBox.Focus(NavigationMethod.Directional);
- vm.SelectedFile = vm.VisibleFiles[0];
- }
 
 e.Handled = true;
 return;
diff --git a/src/Views/RepositoryCommandPalette.axaml.cs b/src/Views/RepositoryCommandPalette.axaml.cs
@@ -36,10 +36,7 @@ protected override void OnKeyDown(KeyEventArgs e)
 if (FilterTextBox.IsKeyboardFocusWithin)
{
 if (vm.VisibleCmds.Count > 0)
-{
 CmdListBox.Focus(NavigationMethod.Directional);
- vm.SelectedCmd = vm.VisibleCmds[0];
- }
 
 e.Handled = true;
 return;

Original file line number	Diff line number	Diff line change
`@@ -91,16 +91,28 @@ private void UpdateVisible()`
`91`	`91`	`if(string.IsNullOrEmpty(_filter))`
`92`	`92`	`{`
`93`	`93`	`VisibleFiles=_repoFiles;`
	`94`	`+`
	`95`	`+if(string.IsNullOrEmpty(_selectedFile))`
	`96`	`+SelectedFile=_repoFiles[0];`
`94`	`97`	`}`
`95`	`98`	`else`
`96`	`99`	`{`
`97`	`100`	`varvisible=newList<string>();`
	`101`	`+`
`98`	`102`	`foreach(varfin_repoFiles)`
`99`	`103`	`{`
`100`	`104`	`if(f.Contains(_filter,StringComparison.OrdinalIgnoreCase))`
`101`	`105`	`visible.Add(f);`
`102`	`106`	`}`
	`107`	`+`
	`108`	`+varautoSelected=_selectedFile;`
	`109`	`+if(visible.Count==0)`
	`110`	`+autoSelected=null;`
	`111`	`+elseif(string.IsNullOrEmpty(_selectedFile)\|\|!visible.Contains(_selectedFile))`
	`112`	`+autoSelected=visible[0];`
	`113`	`+`
`103`	`114`	`VisibleFiles=visible;`
	`115`	`+SelectedFile=autoSelected;`
`104`	`116`	`}`
`105`	`117`	`}`
`106`	`118`	`}`
-Original file line number
+Diff line change
 returnl.IsLocal?-1:1;
 });
 +varautoSelected=_selectedBranch;
 +if(branches.Count==0)
 +autoSelected=null;
 +elseif(_selectedBranch==null||!branches.Contains(_selectedBranch))
 +autoSelected=branches[0];
++
 Branches=branches;
 +SelectedBranch=autoSelected;
+}
 privateLauncher_launcher;
Original file line number	Diff line number	Diff line change
`@@ -85,16 +85,28 @@ private void UpdateVisible()`
`85`	`85`	`if(string.IsNullOrEmpty(_filter))`
`86`	`86`	`{`
`87`	`87`	`VisibleFiles=_repoFiles;`
	`88`	`+`
	`89`	`+if(string.IsNullOrEmpty(_selectedFile))`
	`90`	`+SelectedFile=_repoFiles[0];`
`88`	`91`	`}`
`89`	`92`	`else`
`90`	`93`	`{`
`91`	`94`	`varvisible=newList<string>();`
	`95`	`+`
`92`	`96`	`foreach(varfin_repoFiles)`
`93`	`97`	`{`
`94`	`98`	`if(f.Contains(_filter,StringComparison.OrdinalIgnoreCase))`
`95`	`99`	`visible.Add(f);`
`96`	`100`	`}`
	`101`	`+`
	`102`	`+varautoSelected=_selectedFile;`
	`103`	`+if(visible.Count==0)`
	`104`	`+autoSelected=null;`
	`105`	`+elseif(string.IsNullOrEmpty(_selectedFile)\|\|!visible.Contains(_selectedFile))`
	`106`	`+autoSelected=visible[0];`
	`107`	`+`
`97`	`108`	`VisibleFiles=visible;`
	`109`	`+SelectedFile=autoSelected;`
`98`	`110`	`}`
`99`	`111`	`}`
`100`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,16 +86,28 @@ private void UpdateVisible()`
`86`	`86`	`if(string.IsNullOrEmpty(_filter))`
`87`	`87`	`{`
`88`	`88`	`VisibleFiles=_repoFiles;`
	`89`	`+`
	`90`	`+if(string.IsNullOrEmpty(_selectedFile))`
	`91`	`+SelectedFile=_repoFiles[0];`
`89`	`92`	`}`
`90`	`93`	`else`
`91`	`94`	`{`
`92`	`95`	`varvisible=newList<string>();`
	`96`	`+`
`93`	`97`	`foreach(varfin_repoFiles)`
`94`	`98`	`{`
`95`	`99`	`if(f.Contains(_filter,StringComparison.OrdinalIgnoreCase))`
`96`	`100`	`visible.Add(f);`
`97`	`101`	`}`
	`102`	`+`
	`103`	`+varautoSelected=_selectedFile;`
	`104`	`+if(visible.Count==0)`
	`105`	`+autoSelected=null;`
	`106`	`+elseif(string.IsNullOrEmpty(_selectedFile)\|\|!visible.Contains(_selectedFile))`
	`107`	`+autoSelected=visible[0];`
	`108`	`+`
`98`	`109`	`VisibleFiles=visible;`
	`110`	`+SelectedFile=autoSelected;`
`99`	`111`	`}`
`100`	`112`	`}`
`101`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public RepositoryCommandPalette(Launcher launcher, Repository repo)`
`82`	`82`	`}));`
`83`	`83`
`84`	`84`	`_visibleCmds=_cmds;`
	`85`	`+_selectedCmd=_cmds[0];`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`publicoverridevoidCleanup()`
`@@ -116,13 +117,20 @@ private void UpdateVisible()`
`116`	`117`	`else`
`117`	`118`	`{`
`118`	`119`	`varvisible=newList<RepositoryCommandPaletteCmd>();`
`119`		`-foreach(varcmdinVisibleCmds)`
	`120`	`+`
	`121`	`+foreach(varcmdin_cmds)`
`120`	`122`	`{`
`121`	`123`	`if(cmd.Key.Contains(_filter,StringComparison.OrdinalIgnoreCase)\|\|`
`122`	`124`	`cmd.Label.Contains(_filter,StringComparison.OrdinalIgnoreCase))`
`123`	`125`	`visible.Add(cmd);`
`124`	`126`	`}`
	`127`	`+`
	`128`	`+varautoSelected=_selectedCmd;`
	`129`	`+if(!visible.Contains(_selectedCmd))`
	`130`	`+autoSelected=visible.Count>0?visible[0]:null;`
	`131`	`+`
`125`	`132`	`VisibleCmds=visible;`
	`133`	`+SelectedCmd=autoSelected;`
`126`	`134`	`}`
`127`	`135`	`}`
`128`	`136`
-Original file line number
+Diff line change
 if(FilterTextBox.IsKeyboardFocusWithin)
+{
 if(vm.VisibleFiles.Count>0)
 -{
 FileListBox.Focus(NavigationMethod.Directional);
 -vm.SelectedFile=vm.VisibleFiles[0];
 -}
 e.Handled=true;
 return;