Skip to content

Commit f5d6e12

Browse files
committed
refactor: use List<T> instead of AvaloniaList<T> since it is not used for bindings
Signed-off-by: leo <longshuang@msn.cn>
1 parent 64a41dc commit f5d6e12

File tree

2 files changed

+20
-22
lines changed

2 files changed

+20
-22
lines changed

src/ViewModels/Repository.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Threading;
77
using System.Threading.Tasks;
88

9-
using Avalonia.Collections;
109
using Avalonia.Controls;
1110
using Avalonia.Media;
1211
using Avalonia.Media.Imaging;
@@ -1221,23 +1220,26 @@ public void OpenWorktree(Models.Worktree worktree)
12211220
App.GetLauncer()?.OpenRepositoryInTab(node, null);
12221221
}
12231222

1224-
public AvaloniaList<Models.OpenAIService> GetPreferedOpenAIServices()
1223+
public List<Models.OpenAIService> GetPreferedOpenAIServices()
12251224
{
12261225
var services = Preferences.Instance.OpenAIServices;
12271226
if (services == null || services.Count == 0)
12281227
return [];
12291228

12301229
if (services.Count == 1)
1231-
return services;
1230+
return [services[0]];
12321231

12331232
var prefered = _settings.PreferedOpenAIService;
1233+
var all = new List<Models.OpenAIService>();
12341234
foreach (var service in services)
12351235
{
12361236
if (service.Name.Equals(prefered, StringComparison.Ordinal))
12371237
return [service];
1238+
1239+
all.Add(service);
12381240
}
12391241

1240-
return services;
1242+
return all;
12411243
}
12421244

12431245
public ContextMenu CreateContextMenuForGitFlow()

src/ViewModels/WorkingCopy.cs

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,28 +1452,24 @@ public ContextMenu CreateContextForOpenAI()
14521452
App.OpenDialog(dialog);
14531453
return null;
14541454
}
1455-
else
1456-
{
1457-
var menu = new ContextMenu() { Placement = PlacementMode.TopEdgeAlignedLeft };
14581455

1459-
foreach (var service in services)
1456+
var menu = new ContextMenu() { Placement = PlacementMode.TopEdgeAlignedLeft };
1457+
foreach (var service in services)
1458+
{
1459+
var dup = service;
1460+
var item = new MenuItem();
1461+
item.Header = service.Name;
1462+
item.Click += (_, e) =>
14601463
{
1461-
var dup = service;
1462-
1463-
var item = new MenuItem();
1464-
item.Header = service.Name;
1465-
item.Click += (_, e) =>
1466-
{
1467-
var dialog = new Views.AIAssistant(dup, _repo.FullPath, this, _staged);
1468-
App.OpenDialog(dialog);
1469-
e.Handled = true;
1470-
};
1471-
1472-
menu.Items.Add(item);
1473-
}
1464+
var dialog = new Views.AIAssistant(dup, _repo.FullPath, this, _staged);
1465+
App.OpenDialog(dialog);
1466+
e.Handled = true;
1467+
};
14741468

1475-
return menu;
1469+
menu.Items.Add(item);
14761470
}
1471+
1472+
return menu;
14771473
}
14781474

14791475
private List<Models.Change> GetVisibleUnstagedChanges(List<Models.Change> unstaged)

0 commit comments

Comments
 (0)