clean up; latest C#; add avaloniaedit

Author: fuzzzerd

.vscode/settings.json

@@ -18,5 +18,16 @@
         "titleBar.inactiveBackground": "#dd053199",
         "titleBar.inactiveForeground": "#e7e7e799"
     },
-    "peacock.color": "#dd0531"
+    "peacock.color": "#dd0531",
+    "cSpell.words": [
+        "Avalonia",
+        "filemaker",
+        "fmxmlsnippet",
+        "Mvvm",
+        "xdoc",
+        "XMFD",
+        "XMSC",
+        "XMSS",
+        "XMTB"
+    ]
 }

SharpFM.App/App.axaml

@@ -6,5 +6,6 @@
 
     <Application.Styles>
         <FluentTheme />
+        <StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
     </Application.Styles>
 </Application>

SharpFM.App/MainWindow.axaml

@@ -3,18 +3,25 @@
     xmlns:vm="using:SharpFM.App.ViewModels"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+    xmlns:AvaloniaEdit="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
+    mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="500"
     x:DataType="vm:MainWindowViewModel"
     x:Class="SharpFM.App.MainWindow"
     Title="SharpFM">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100" />
             <ColumnDefinition Width="200" />
-            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="300" />
+            <ColumnDefinition Width="300" />
         </Grid.ColumnDefinitions>
 
-        <Button Grid.Column="0" Command="{Binding PasteTextCommand}">Click me</Button>
+        <Button 
+            Grid.Column="0" 
+            Command="{Binding PasteTextCommand}">
+            Paste
+        </Button>
+
         <ListBox
             Grid.Column="1"
             ItemsSource="{Binding Keys}"
@@ -34,8 +41,18 @@
             </ListBox.ItemTemplate>
         </ListBox>
 
-        <TextBox
-            Grid.Column="2"
-            Text="{Binding SelectedClip.XmlData}" />
+        <StackPanel Grid.Column="2"
+            Grid.ColumnSpan="2">
+
+            <TextBox
+                Height="250"
+                Text="{Binding SelectedClip.XmlData}" />
+
+            <AvaloniaEdit:TextEditor
+                Height="250"
+                x:Name="avaloniaEditor"
+                ShowLineNumbers="True"
+                FontFamily="Cascadia Code,Consolas,Menlo,Monospace"/>
+        </StackPanel>
     </Grid>
 </Window>

SharpFM.App/MainWindow.axaml.cs

@@ -1,5 +1,7 @@
+using System;
 using System.Collections.ObjectModel;
 using Avalonia.Controls;
+using AvaloniaEdit;
 using SharpFM.Core;
 
 namespace SharpFM.App;
@@ -9,5 +11,8 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
+
+        var editor = this.FindControl<TextEditor>("avaloniaEditor") ?? throw new Exception("no control");
+        editor.Document = new AvaloniaEdit.Document.TextDocument("Hello world");
     }
 }

SharpFM.App/SharpFM.App.csproj

@@ -3,18 +3,19 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
 
-
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="11.0.2" />
     <PackageReference Include="Avalonia.Desktop" Version="11.0.2" />
     <PackageReference Include="Avalonia.Xaml.Interactions" Version="11.0.2" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.2" />
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.2" />
+    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.1" />
 
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.2" />

SharpFM.App/ViewModels/MainWindowViewModel.cs

@@ -4,7 +4,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -53,7 +52,7 @@ private async Task DoGetClipboardDataAsync()
         {
             if (string.IsNullOrEmpty(format)) { continue; }
 
-            object clipData = await provider.GetDataAsync(format);
+            object? clipData = await provider.GetDataAsync(format);
 
             if (!(clipData is byte[] dataObj))
             {
@@ -63,6 +62,8 @@ private async Task DoGetClipboardDataAsync()
 
             var clip = new FileMakerClip("new-clip", format, dataObj);
 
+            if(clip is null) { continue; }
+
             // don't bother adding a duplicate. For some reason entries were getting entered twice per clip
             // this is not the most efficient method to detect it, but it works well enough for now
             if (Keys.Any(k => k.XmlData == clip.XmlData))
@@ -75,7 +76,7 @@ private async Task DoGetClipboardDataAsync()
     }
 
     [ObservableProperty]
-    private ObservableCollection<FileMakerClip>? _keys;
+    private ObservableCollection<FileMakerClip> _keys;
 
     //public ObservableCollection<FileMakerClip> Layouts { get; }