A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Added MEF to MAUI Blazor + more clean up
Etienne Baudouxa3b601cfdb0a
diff --git a/src/app/dev/DevToys.Api/IMefProvider.cs b/src/app/dev/DevToys.Api/IMefProvider.csindex 08eaffb5d..c083d10ba 100644--- a/src/app/dev/DevToys.Api/IMefProvider.cs+++ b/src/app/dev/DevToys.Api/IMefProvider.cs@@ -14,4 +14,10 @@ public interface IMefProvider/// Imports the given type./// </summary>IEnumerable<Lazy<TExport, TMetadataView>> ImportMany<TExport, TMetadataView>();++ /// <summary>+ /// Satisfies the imports of the specified <paramref name="object"/> exactly once and they will not ever be recomposed.+ /// </summary>+ /// <param name="object">The object containing MEF components to import.</param>+ void SatisfyImports(object @object);}diff --git a/src/app/dev/DevToys.Core/Debugger/DebuggerHelper.cs b/src/app/dev/DevToys.Core/Debugger/DebuggerHelper.csindex cfdc762aa..83fe2c1fd 100644--- a/src/app/dev/DevToys.Core/Debugger/DebuggerHelper.cs+++ b/src/app/dev/DevToys.Core/Debugger/DebuggerHelper.cs@@ -1,19 +1,21 @@-namespace DevToys.Core.Debugger;+namespace DevToys.Core.Debugger;public static class DebuggerHelper{public static async Task<bool> WaitForDebuggerAsync(TimeSpan? limit = null){- #if DEBUG+#if DEBUGlimit ??= TimeSpan.FromSeconds(60);var source = new CancellationTokenSource(limit.Value);-+Console.WriteLine($"◉ Waiting {limit.Value.TotalSeconds} secs for debugger (PID: {Process.GetCurrentProcess().Id})...");try{- await Task.Run(async () => {- while (!System.Diagnostics.Debugger.IsAttached) {+ await Task.Run(async () =>+ {+ while (!System.Diagnostics.Debugger.IsAttached)+ {await Task.Delay(TimeSpan.FromMilliseconds(100), source.Token);}}, source.Token);@@ -23,13 +25,13 @@ public static class DebuggerHelper// it's ok}- Console.WriteLine(System.Diagnostics.Debugger.IsAttached- ? "✔ Debugger attached"+ Console.WriteLine(System.Diagnostics.Debugger.IsAttached+ ? "✔ Debugger attached": "✕ Continuing without debugger");return System.Diagnostics.Debugger.IsAttached;- #else+#elsereturn await Task.FromResult(false);- #endif+#endif}}diff --git a/src/app/dev/DevToys.Core/Mef/MefComposer.cs b/src/app/dev/DevToys.Core/Mef/MefComposer.csindex 01c57bfd9..4e719feaf 100644--- a/src/app/dev/DevToys.Core/Mef/MefComposer.cs+++ b/src/app/dev/DevToys.Core/Mef/MefComposer.cs@@ -15,7 +15,7 @@ public sealed class MefComposer : IDisposablepublic IMefProvider Provider { get; }- public ExportProvider ExportProvider { get; private set; }+ public CompositionContainer ExportProvider { get; private set; }public MefComposer(Assembly[]? assemblies = null, params object[] customExports){@@ -34,10 +34,7 @@ public sealed class MefComposer : IDisposablepublic void Dispose(){- if (ExportProvider is not null)- {- ((CompositionContainer)ExportProvider).Dispose();- }+ ExportProvider?.Dispose();_isExportProviderDisposed = true;}@@ -49,7 +46,7 @@ public sealed class MefComposer : IDisposableInitializeMef();}- private ExportProvider InitializeMef()+ private CompositionContainer InitializeMef(){if (!_isExportProviderDisposed){diff --git a/src/app/dev/DevToys.Core/Mef/MefProvider.cs b/src/app/dev/DevToys.Core/Mef/MefProvider.csindex 86d815e23..303b4f6d5 100644--- a/src/app/dev/DevToys.Core/Mef/MefProvider.cs+++ b/src/app/dev/DevToys.Core/Mef/MefProvider.cs@@ -6,7 +6,7 @@ namespace DevToys.Core.Mef;[Export(typeof(IMefProvider))]internal sealed class MefProvider : IMefProvider{- internal ExportProvider? ExportProvider { get; set; }+ internal CompositionContainer? ExportProvider { get; set; }public TExport Import<TExport>(){@@ -17,4 +17,9 @@ internal sealed class MefProvider : IMefProvider{return ExportProvider!.GetExports<TExport, TMetadataView>();}++ public void SatisfyImports(object @object)+ {+ ExportProvider!.SatisfyImportsOnce(@object);+ }}diff --git a/src/app/dev/DevToys.MonacoEditor/CodeEditor/CodeEditorPresenter.Windows.cs b/src/app/dev/DevToys.MonacoEditor/CodeEditor/CodeEditorPresenter.Windows.csindex 9ddab8cf1..9c129381f 100644--- a/src/app/dev/DevToys.MonacoEditor/CodeEditor/CodeEditorPresenter.Windows.cs+++ b/src/app/dev/DevToys.MonacoEditor/CodeEditor/CodeEditorPresenter.Windows.cs@@ -29,7 +29,7 @@ namespace DevToys.MonacoEditor;/// </summary>public sealed partial class CodeEditorPresenter : UserControl, ICodeEditorPresenter{- private static readonly List<TypedEventHandler<WebView2, CoreWebView2WebMessageReceivedEventArgs>> Handlers = new();+ private static readonly List<TypedEventHandler<WebView2, CoreWebView2WebMessageReceivedEventArgs>> handlers = new();private enum PropertyAction{@@ -361,7 +361,7 @@ public sealed partial class CodeEditorPresenter : UserControl, ICodeEditorPresen}}- Handlers.Add(Handler);+ handlers.Add(Handler);_webView.WebMessageReceived += Handler;}diff --git a/src/app/dev/DevToys.MonacoEditor/Extensions/ICodeEditorPresenterExtensions.cs b/src/app/dev/DevToys.MonacoEditor/Extensions/ICodeEditorPresenterExtensions.csindex 7331c858f..de7e5da04 100644--- a/src/app/dev/DevToys.MonacoEditor/Extensions/ICodeEditorPresenterExtensions.cs+++ b/src/app/dev/DevToys.MonacoEditor/Extensions/ICodeEditorPresenterExtensions.cs@@ -76,7 +76,7 @@ internal static class ICodeEditorPresenterExtensionsreturn default;}- private static readonly JsonSerializerSettings _settings = new()+ private static readonly JsonSerializerSettings settings = new(){NullValueHandling = NullValueHandling.Ignore,ContractResolver = new CamelCasePropertyNamesContractResolver()@@ -149,7 +149,7 @@ internal static class ICodeEditorPresenterExtensionselse{// TODO: Need JSON.parse?- return JsonConvert.SerializeObject(item, _settings);+ return JsonConvert.SerializeObject(item, settings);}}).ToArray();@@ -168,7 +168,7 @@ internal static class ICodeEditorPresenterExtensionscatch (Exception ex){Debug.WriteLine($"Error {ex.Message} {ex.StackTrace} {ex.InnerException?.Message})");- return default(T);+ return default;}}}diff --git a/src/app/dev/DevToys.MonacoEditor/Monaco/Editor/StandaloneEditorConstructionOptions.cs b/src/app/dev/DevToys.MonacoEditor/Monaco/Editor/StandaloneEditorConstructionOptions.csindex f3b7e5376..76a0b076c 100644--- a/src/app/dev/DevToys.MonacoEditor/Monaco/Editor/StandaloneEditorConstructionOptions.cs+++ b/src/app/dev/DevToys.MonacoEditor/Monaco/Editor/StandaloneEditorConstructionOptions.cs@@ -25,12 +25,12 @@ public sealed class StandaloneEditorConstructionOptions : IStandaloneEditorConstreturn default;}- private bool SetPropertyValue<T>(T newValue, [CallerMemberName] string? propertyName = null)+ private bool SetPropertyValue<T>(T? newValue, [CallerMemberName] string? propertyName = null){if (propertyName == null)throw new ArgumentNullException(nameof(propertyName));- if (EqualityComparer<T>.Default.Equals(newValue, GetPropertyValue<T>(propertyName)))+ if (EqualityComparer<T?>.Default.Equals(newValue, GetPropertyValue<T>(propertyName)))return false;_propertyBackingDictionary[propertyName] = newValue;diff --git a/src/app/dev/DevToys.MonacoEditor/Monaco/Helpers/CssStyleBroker.cs b/src/app/dev/DevToys.MonacoEditor/Monaco/Helpers/CssStyleBroker.csindex 7ac1a21c6..ffb6cb283 100644--- a/src/app/dev/DevToys.MonacoEditor/Monaco/Helpers/CssStyleBroker.cs+++ b/src/app/dev/DevToys.MonacoEditor/Monaco/Helpers/CssStyleBroker.cs@@ -8,7 +8,7 @@ namespace DevToys.MonacoEditor.Monaco.Helpers;/// </summary>internal sealed class CssStyleBroker : IDisposable{- private static uint Id = 0;+ private static uint id = 0;// Track styles registered to this particular editor.private static readonly Dictionary<uint, WeakReference<ICssStyle>> registry = new();@@ -39,7 +39,7 @@ internal sealed class CssStyleBroker : IDisposable/// <returns></returns>public static uint Register(ICssStyle style){- uint id = Id++;+ uint id = CssStyleBroker.id++;registry.Add(id, new WeakReference<ICssStyle>(style));return id;}diff --git a/src/app/dev/DevToys.MonacoEditor/Monaco/Range.cs b/src/app/dev/DevToys.MonacoEditor/Monaco/Range.csindex 180f06165..c04cdb3e4 100644--- a/src/app/dev/DevToys.MonacoEditor/Monaco/Range.cs+++ b/src/app/dev/DevToys.MonacoEditor/Monaco/Range.cs@@ -72,9 +72,9 @@ public sealed class Range : IRangepublic bool ContainsRange(IRange range){bool isStart = StartLineNumber <= range.StartLineNumber;- bool isStartColumn = (StartLineNumber == range.StartLineNumber) ? StartColumn <= range.StartColumn : true;+ bool isStartColumn = StartLineNumber != range.StartLineNumber || StartColumn <= range.StartColumn;bool isEnd = EndLineNumber >= range.EndLineNumber;- bool isEndColumn = (EndLineNumber == range.EndLineNumber) ? EndColumn >= range.EndColumn : true;+ bool isEndColumn = EndLineNumber != range.EndLineNumber || EndColumn >= range.EndColumn;return isStart && isStartColumn && isEnd && isEndColumn;}diff --git a/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.cs b/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.csindex d1b8afa8f..eb4a7c8bf 100644--- a/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.cs+++ b/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.cs@@ -74,11 +74,11 @@ internal sealed partial class ParentAccessor : IDisposablepublic Task<string> CallEvent(string name, string[] parameters){Debug.WriteLine($"Event {name}");- if (_events.ContainsKey(name))+ if (_events.TryGetValue(name, out Func<string[], Task<string>>? @event)){Debug.WriteLine($"Parameters: {parameters != null} - {parameters?.Length.ToString() ?? "N/A"}");parameters ??= Array.Empty<string>();- return _events[name].Invoke(parameters);+ return @event.Invoke(parameters);}return Task.FromResult(string.Empty);@@ -100,9 +100,9 @@ internal sealed partial class ParentAccessor : IDisposable/// <returns>True if method was found in registration.</returns>public bool CallAction(string name){- if (_actions.ContainsKey(name))+ if (_actions.TryGetValue(name, out Action? @event)){- _actions[name]?.Invoke();+ @event.Invoke();return true;}@@ -117,9 +117,9 @@ internal sealed partial class ParentAccessor : IDisposable/// <returns>True if method was found in registration.</returns>public bool CallActionWithParameters(string name, string[] parameters){- if (_actionParameters.ContainsKey(name))+ if (_actionParameters.TryGetValue(name, out Action<string[]>? @event)){- _actionParameters[name]?.Invoke(parameters);+ @event.Invoke(parameters);return true;}diff --git a/src/app/dev/DevToys.UI.EntryPoint/App.xaml.cs b/src/app/dev/DevToys.UI.EntryPoint/App.xaml.csindex cba2897ec..be89ae1cb 100644--- a/src/app/dev/DevToys.UI.EntryPoint/App.xaml.cs+++ b/src/app/dev/DevToys.UI.EntryPoint/App.xaml.cs@@ -128,8 +128,10 @@ public sealed partial class App : Application/// </summary>/// <param name="sender">The source of the suspend request.</param>/// <param name="e">Details about the suspend request.</param>+#if __WINDOWS__[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "<Pending>")][System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "<Pending>")]+#endifprivate void OnSuspending(object sender, SuspendingEventArgs e){SuspendingDeferral deferral = e.SuspendingOperation.GetDeferral();diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/MefComponentBase.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/MefComponentBase.csnew file mode 100644index 000000000..f8af06e9c--- /dev/null+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/MefComponentBase.cs@@ -0,0 +1,19 @@+using DevToys.Api;+using Microsoft.AspNetCore.Components;+using Microsoft.Fast.Components.FluentUI;++namespace DevToys.MauiBlazor.Components;++internal abstract class MefComponentBase : FluentComponentBase+{+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.+ [Inject]+ protected IMefProvider MefProvider { get; set; }+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.++ protected override void OnInitialized()+ {+ MefProvider.SatisfyImports(this);+ base.OnInitialized();+ }+}diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/MauiProgram.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/MauiProgram.csindex 5ed037f92..0165507e1 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/MauiProgram.cs+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/MauiProgram.cs@@ -1,11 +1,14 @@using Microsoft.Extensions.Logging;using Microsoft.Fast.Components.FluentUI.Infrastructure;using Microsoft.Fast.Components.FluentUI;+using DevToys.Core.Mef;namespace DevToys.MauiBlazor;public static class MauiProgram{+ private static readonly MefComposer mefComposer = new();+public static MauiApp CreateMauiApp(){MauiAppBuilder builder = MauiApp.CreateBuilder();@@ -26,6 +29,8 @@ public static class MauiProgrambuilder.Logging.AddDebug();#endif+ builder.Services.AddSingleton(provider => mefComposer.Provider);+return builder.Build();}}diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.csnew file mode 100644index 000000000..fb92534a3--- /dev/null+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.cs@@ -0,0 +1,18 @@+using DevToys.Api;+using Microsoft.AspNetCore.Components;++namespace DevToys.MauiBlazor.Shared;++public partial class MainLayout : LayoutComponentBase+{+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.+ [Inject]+ protected IMefProvider MefProvider { get; set; }+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.++ protected override void OnInitialized()+ {+ MefProvider.SatisfyImports(this);+ base.OnInitialized();+ }+}