Skip to content

Toggle View/ViewModel now supports Avalonia (axaml) #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luislhg merged 1 commit into from
Jan 8, 2026
Merged

Toggle View/ViewModel now supports Avalonia (axaml) #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions BrightXaml.Extensibility/Commands/ToggleViewModelCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public ToggleViewModelCommand(TraceSource traceSource, IDialogService dialogServ
Icon = new(ImageMoniker.KnownValues.Binding, IconSettings.IconAndText),
//Icon = new(ImageMoniker.KnownValues.Code, IconSettings.IconAndText),
Shortcuts = [new CommandShortcutConfiguration(ModifierKey.Control, Key.E, ModifierKey.Control, Key.Q)],
EnabledWhen = ActivationConstraint.ClientContext(ClientContextKey.Shell.ActiveSelectionPath, @"\.(cs|xaml)$"),
EnabledWhen = ActivationConstraint.ClientContext(ClientContextKey.Shell.ActiveSelectionPath, @"\.(cs|xaml|axaml)$"),

// TODO: These don't work specifically for this command!
//EnabledWhen = ActivationConstraint.ClientContext(ClientContextKey.Shell.ActiveEditorContentType, @"\.(cs)$"),
Expand Down Expand Up @@ -81,10 +81,14 @@ public override async Task ExecuteCommandAsync(IClientContext context, Cancellat
activeProjectPath += Path.DirectorySeparatorChar;

if (fileName.EndsWith(".xaml", StringComparison.InvariantCultureIgnoreCase) ||
fileName.EndsWith(".xaml.cs", StringComparison.InvariantCultureIgnoreCase))
fileName.EndsWith(".xaml.cs", StringComparison.InvariantCultureIgnoreCase) ||
fileName.EndsWith(".axaml", StringComparison.InvariantCultureIgnoreCase) ||
fileName.EndsWith(".axaml.cs", StringComparison.InvariantCultureIgnoreCase))
{
// Existing logic to find and open ViewModel.
string fileNameWithoutExtension = fileName.Replace(".xaml.cs", string.Empty).Replace(".xaml", string.Empty);
string fileNameWithoutExtension = fileName
.Replace(".xaml.cs", string.Empty).Replace(".xaml", string.Empty)
.Replace(".axaml.cs", string.Empty).Replace(".axaml", string.Empty);
var possibleViewModels = ViewModelHelper.GetViewModelNamePossibilities(fileNameWithoutExtension);

var files = await workspace
Expand Down Expand Up @@ -138,7 +142,8 @@ public override async Task ExecuteCommandAsync(IClientContext context, Cancellat
.QueryProjectsAsync(project => project
.Get(p => p.Files)
.Where(f => f.Path.StartsWith(activeProjectPath, StringComparison.InvariantCultureIgnoreCase) &&
f.FileName.EndsWith(".xaml", StringComparison.InvariantCultureIgnoreCase))
(f.FileName.EndsWith(".xaml", StringComparison.InvariantCultureIgnoreCase) ||
f.FileName.EndsWith(".axaml", StringComparison.InvariantCultureIgnoreCase)))
.With(f => new { f.FileName, f.Path }), cancellationToken);

var possibleFiles = files.Where(f => possibleViews.Contains(f.FileName)).Select(f => f.Path).ToList();
Expand Down
9 changes: 8 additions & 1 deletion BrightXaml.Extensibility/Utilities/ViewModelHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public static List<string> GetViewModelNamePossibilities(string xamlName)
public static List<string> GetViewNamePossibilities(string viewModelName)
{
const string suffixXaml = ".xaml";
const string suffixAxaml = ".axaml";
string treatedName = viewModelName.Replace("ViewModel", string.Empty, StringComparison.InvariantCultureIgnoreCase);
var possibilities = new List<string>
{
Expand All @@ -42,7 +43,13 @@ public static List<string> GetViewNamePossibilities(string viewModelName)
treatedName + "Page" + suffixXaml,
treatedName + "Window" + suffixXaml,
treatedName + "Content" + suffixXaml, // (only VS Extensibility uses this).
treatedName + suffixXaml
treatedName + suffixXaml,
// Avalonia extensions
treatedName + "View" + suffixAxaml,
treatedName + "Page" + suffixAxaml,
treatedName + "Window" + suffixAxaml,
treatedName + "Content" + suffixAxaml,
treatedName + suffixAxaml
};

return possibilities;
Expand Down
5 changes: 5 additions & 0 deletions BrightXaml.ExtensibilityTests/Utilities/ViewModelHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ public void GetViewModelNamePossibilitiesTest(string xamlName, string expected)
[DataRow("MainViewModel", "MainWindow.xaml")]
[DataRow("MainViewModel", "Main.xaml")]
[DataRow("MainWindowViewModel", "MainWindowContent.xaml")]
[DataRow("MainViewModel", "MainView.axaml")]
[DataRow("MainViewModel", "MainPage.axaml")]
[DataRow("MainViewModel", "MainWindow.axaml")]
[DataRow("MainViewModel", "Main.axaml")]
[DataRow("MainWindowViewModel", "MainWindowContent.axaml")]
public void GetViewNamePossibilitiesTest(string viewModelName, string expected)
{
var possibilities = ViewModelHelper.GetViewNamePossibilities(viewModelName);
Expand Down