Merge pull request #305 from AvaloniaUI/preview5

Update to preview 5
AvaloniaUI · Feb 6, 2023 · 04a5abd · 04a5abd
2 parents e627ba4 + 8a83e8f
commit 04a5abd
Show file tree

Hide file tree

Showing 28 changed files with 187 additions and 115 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <AvaloniaVersion>11.0.0-preview2</AvaloniaVersion>
+    <AvaloniaVersion>11.0.0-preview5</AvaloniaVersion>
     <TextMateSharpVersion>1.0.50</TextMateSharpVersion>
     <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
     <VersionSuffix>beta</VersionSuffix>

diff --git a/src/AvaloniaEdit.Demo/App.xaml b/src/AvaloniaEdit.Demo/App.xaml
@@ -1,9 +1,10 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:cc="clr-namespace:AvaloniaEdit.CodeCompletion;assembly=AvaloniaEdit"
-             x:Class="AvaloniaEdit.Demo.App">
+             x:Class="AvaloniaEdit.Demo.App"
+             RequestedThemeVariant="Dark">
   <Application.Styles>
-    <FluentTheme Mode="Dark" />
+    <FluentTheme />
     <StyleInclude Source="avares://AvaloniaEdit/AvaloniaEdit.xaml" />
 
     <!--Code completion-->

diff --git a/src/AvaloniaEdit/AvaloniaEditCommands.cs b/src/AvaloniaEdit/AvaloniaEditCommands.cs
@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Input;
 using Avalonia.Platform;
@@ -112,17 +113,10 @@ public static class ApplicationCommands
         public static RoutedCommand Redo { get; } = new RoutedCommand(nameof(Redo), new KeyGesture(Key.Y, PlatformCommandKey));
         public static RoutedCommand Find { get; } = new RoutedCommand(nameof(Find), new KeyGesture(Key.F, PlatformCommandKey));
         public static RoutedCommand Replace { get; } = new RoutedCommand(nameof(Replace), GetReplaceKeyGesture());
-
-        private static OperatingSystemType GetOperatingSystemType()
-        {
-            return AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().OperatingSystem;
-        }
 
         private static KeyModifiers GetPlatformCommandKey()
-        {
-            var os = GetOperatingSystemType();
-
-            if (os == OperatingSystemType.OSX)
+        {            
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
                 return KeyModifiers.Meta;
             }
@@ -132,9 +126,7 @@ private static KeyModifiers GetPlatformCommandKey()
 
         private static KeyGesture GetReplaceKeyGesture()
         {
-            var os = GetOperatingSystemType();
-
-            if (os == OperatingSystemType.OSX)
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
                 return new KeyGesture(Key.F, KeyModifiers.Meta | KeyModifiers.Alt);
             }

diff --git a/src/AvaloniaEdit/Editing/AbstractMargin.cs b/src/AvaloniaEdit/Editing/AbstractMargin.cs
@@ -22,6 +22,7 @@
 using AvaloniaEdit.Document;
 using AvaloniaEdit.Rendering;
 using Avalonia.Controls;
+using AvaloniaEdit.Utils;
 
 namespace AvaloniaEdit.Editing
 {

diff --git a/src/AvaloniaEdit/Editing/DottedLineMargin.cs b/src/AvaloniaEdit/Editing/DottedLineMargin.cs
@@ -35,7 +35,7 @@ public static class DottedLineMargin
         /// <summary>
         /// Creates a vertical dotted line to separate the line numbers from the text view.
         /// </summary>
-        public static IControl Create()
+        public static Control Create()
         {
             var line = new Line
             {
@@ -55,7 +55,7 @@ public static IControl Create()
         /// <summary>
         /// Gets whether the specified UIElement is the result of a DottedLineMargin.Create call.
         /// </summary>
-        public static bool IsDottedLineMargin(IControl element)
+        public static bool IsDottedLineMargin(Control element)
         {
             var l = element as Line;
             return l != null && l.Tag == Tag;

diff --git a/src/AvaloniaEdit/Editing/TextArea.cs b/src/AvaloniaEdit/Editing/TextArea.cs
@@ -128,13 +128,13 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
             }
         }
 
-        internal void AddChild(IVisual visual)
+        internal void AddChild(Visual visual)
         {
             VisualChildren.Add(visual);
             InvalidateArrange();
         }
 
-        internal void RemoveChild(IVisual visual)
+        internal void RemoveChild(Visual visual)
         {
             VisualChildren.Remove(visual);
         }
@@ -686,14 +686,14 @@ private void CaretPositionChanged(object sender, EventArgs e)
             });
         }
 
-        public static readonly DirectProperty<TextArea, ObservableCollection<IControl>> LeftMarginsProperty
-            = AvaloniaProperty.RegisterDirect<TextArea, ObservableCollection<IControl>>(nameof(LeftMargins),
+        public static readonly DirectProperty<TextArea, ObservableCollection<Control>> LeftMarginsProperty
+            = AvaloniaProperty.RegisterDirect<TextArea, ObservableCollection<Control>>(nameof(LeftMargins),
                 c => c.LeftMargins);
 
         /// <summary>
         /// Gets the collection of margins displayed to the left of the text view.
         /// </summary>
-        public ObservableCollection<IControl> LeftMargins { get; } = new ObservableCollection<IControl>();
+        public ObservableCollection<Control> LeftMargins { get; } = new ObservableCollection<Control>();
 
         private void LeftMargins_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
@@ -1122,10 +1122,10 @@ bool ILogicalScrollable.CanVerticallyScroll
             }
         }
 
-        public bool BringIntoView(IControl target, Rect targetRect) =>
+        public bool BringIntoView(Control target, Rect targetRect) =>
             _logicalScrollable?.BringIntoView(target, targetRect) ?? default(bool);
 
-        IControl ILogicalScrollable.GetControlInDirection(NavigationDirection direction, IControl from)
+        Control ILogicalScrollable.GetControlInDirection(NavigationDirection direction, Control from)
             => _logicalScrollable?.GetControlInDirection(direction, from);
 
         public void RaiseScrollInvalidated(EventArgs e)
@@ -1168,7 +1168,7 @@ public Rect CursorRectangle
                 }
             }
 
-            public IVisual TextViewVisual => _textArea;
+            public Visual TextViewVisual => _textArea;
 
             public bool SupportsPreedit => false;
 

diff --git a/src/AvaloniaEdit/Rendering/FormattedTextElement.cs b/src/AvaloniaEdit/Rendering/FormattedTextElement.cs
@@ -118,7 +118,7 @@ public FormattedTextRun(FormattedTextElement element, TextRunProperties properti
 		/// </summary>
 		public FormattedTextElement Element { get; }
 
-		public override ReadOnlySlice<char> Text { get; }
+		public override ReadOnlyMemory<char> Text { get; }
 
 		/// <inheritdoc/>
 		public override TextRunProperties Properties { get; }

diff --git a/src/AvaloniaEdit/Rendering/InlineObjectRun.cs b/src/AvaloniaEdit/Rendering/InlineObjectRun.cs
@@ -75,7 +75,7 @@ public InlineObjectRun(int length, TextRunProperties? properties, Control elemen
 			if (length <= 0)
 				throw new ArgumentOutOfRangeException(nameof(length), length, "Value must be positive");
 
-			TextSourceLength = length;
+			Length = length;
 			Properties = properties ?? throw new ArgumentNullException(nameof(properties));
 			Element = element ?? throw new ArgumentNullException(nameof(element));
 
@@ -95,7 +95,7 @@ public InlineObjectRun(int length, TextRunProperties? properties, Control elemen
 
 		public override TextRunProperties? Properties { get; }
 
-		public override int TextSourceLength { get; }
+		public override int Length { get; }
 
 		public override double Baseline
 		{

diff --git a/src/AvaloniaEdit/Rendering/PointerHoverLogic.cs b/src/AvaloniaEdit/Rendering/PointerHoverLogic.cs
@@ -33,7 +33,7 @@ public class PointerHoverLogic : IDisposable
         private const double PointerHoverHeight = 2;
         private static readonly TimeSpan PointerHoverTime = TimeSpan.FromMilliseconds(400);
 
-        private readonly IControl _target;
+        private readonly Control _target;
 
         private DispatcherTimer _timer;
         private Point _hoverStartPoint;
@@ -43,7 +43,7 @@ public class PointerHoverLogic : IDisposable
         /// <summary>
         /// Creates a new instance and attaches itself to the <paramref name="target" /> UIElement.
         /// </summary>
-        public PointerHoverLogic(IControl target)
+        public PointerHoverLogic(Control target)
         {
             _target = target ?? throw new ArgumentNullException(nameof(target));
             _target.PointerExited += OnPointerLeave;

diff --git a/src/AvaloniaEdit/Rendering/SimpleTextSource.cs b/src/AvaloniaEdit/Rendering/SimpleTextSource.cs
@@ -37,7 +37,7 @@ public TextRun GetTextRun(int textSourceCharacterIndex)
 		{
 			if (textSourceCharacterIndex < _text.Length)
 				return new TextCharacters(
-					new ReadOnlySlice<char>(_text.AsMemory(), textSourceCharacterIndex,
+					_text.AsMemory().Slice(textSourceCharacterIndex,
 						_text.Length - textSourceCharacterIndex), _properties);
 
 			return new TextEndOfParagraph(1);

diff --git a/src/AvaloniaEdit/Rendering/SingleCharacterElementGenerator.cs b/src/AvaloniaEdit/Rendering/SingleCharacterElementGenerator.cs
@@ -167,7 +167,7 @@ public override TextRun CreateTextRun(int startVisualColumn, ITextRunConstructio
 				if (startVisualColumn == VisualColumn)
 					return new TabGlyphRun(this, TextRunProperties);
 				else if (startVisualColumn == VisualColumn + 1)
-					return new TextCharacters(new ReadOnlySlice<char>("\t".AsMemory(), VisualColumn + 1, 1), TextRunProperties);
+					return new TextCharacters("\t".AsMemory(), TextRunProperties);
 				else
 					throw new ArgumentOutOfRangeException(nameof(startVisualColumn));
 			}

diff --git a/src/AvaloniaEdit/Rendering/TextView.cs b/src/AvaloniaEdit/Rendering/TextView.cs
@@ -1206,7 +1206,7 @@ protected override Size ArrangeOverride(Size finalSize)
                                 Debug.WriteLine(distance);
                             }
 
-                            offset += span.TextSourceLength;
+                            offset += span.Length;
                         }
                         pos = new Point(pos.X, pos.Y + textLine.Height);
                     }
@@ -1950,7 +1950,7 @@ private static ImmutablePen CreateFrozenPen(IBrush brush)
             return pen;
         }
 
-        bool ILogicalScrollable.BringIntoView(IControl target, Rect rectangle)
+        bool ILogicalScrollable.BringIntoView(Control target, Rect rectangle)
         {
             if (rectangle.IsEmpty || target == null || target == this || !this.IsVisualAncestorOf(target))
             {
@@ -1967,7 +1967,7 @@ bool ILogicalScrollable.BringIntoView(IControl target, Rect rectangle)
             return true;
         }
 
-        IControl ILogicalScrollable.GetControlInDirection(NavigationDirection direction, IControl from)
+        Control ILogicalScrollable.GetControlInDirection(NavigationDirection direction, Control from)
         {
             return null;
         }

diff --git a/src/AvaloniaEdit/Rendering/VisualLineElement.cs b/src/AvaloniaEdit/Rendering/VisualLineElement.cs
@@ -106,9 +106,9 @@ internal void SetTextRunProperties(VisualLineElementTextRunProperties p)
 		/// Retrieves the text span immediately before the visual column.
 		/// </summary>
 		/// <remarks>This method is used for word-wrapping in bidirectional text.</remarks>
-		public virtual ReadOnlySlice<char> GetPrecedingText(int visualColumnLimit, ITextRunConstructionContext context)
+		public virtual ReadOnlyMemory<char> GetPrecedingText(int visualColumnLimit, ITextRunConstructionContext context)
 		{
-			return ReadOnlySlice<char>.Empty;
+			return ReadOnlyMemory<char>.Empty;
 		}
 
 		/// <summary>

diff --git a/src/AvaloniaEdit/Rendering/VisualLineLinkText.cs b/src/AvaloniaEdit/Rendering/VisualLineLinkText.cs
@@ -110,7 +110,12 @@ protected internal override void OnPointerPressed(PointerPressedEventArgs e)
             if (!e.Handled && LinkIsClickable(e.KeyModifiers))
             {
                 var eventArgs = new OpenUriRoutedEventArgs(NavigateUri) { RoutedEvent = OpenUriEvent };
-                e.Source.RaiseEvent(eventArgs);
+
+                if(e.Source is Interactive interactive)
+                {
+                    interactive.RaiseEvent(eventArgs);
+                }
+
                 e.Handled = true;
             }
         }

diff --git a/src/AvaloniaEdit/Rendering/VisualLineText.cs b/src/AvaloniaEdit/Rendering/VisualLineText.cs
@@ -68,14 +68,7 @@ public override TextRun CreateTextRun(int startVisualColumn, ITextRunConstructio
 				offset,
 				DocumentLength - relativeOffset);
 
-            var bufferOffset = RelativeTextOffset;
-
-            if (bufferOffset + text.Count > text.Text.Length)
-            {
-                bufferOffset = 0;
-            }
-
-            var textSlice = new ReadOnlySlice<char>(text.Text.AsMemory(), text.Offset, text.Count, bufferOffset);
+			var textSlice = text.Text.AsMemory().Slice(text.Offset, text.Count);
 
             return new TextCharacters(textSlice, TextRunProperties);
         }
@@ -88,7 +81,7 @@ public override bool IsWhitespace(int visualColumn)
 		}
 
 		/// <inheritdoc/>
-		public override ReadOnlySlice<char> GetPrecedingText(int visualColumnLimit, ITextRunConstructionContext context)
+		public override ReadOnlyMemory<char> GetPrecedingText(int visualColumnLimit, ITextRunConstructionContext context)
 		{
 			if (context == null)
 				throw new ArgumentNullException(nameof(context));
@@ -97,7 +90,7 @@ public override ReadOnlySlice<char> GetPrecedingText(int visualColumnLimit, ITex
 
 			var text = context.GetText(context.VisualLine.FirstDocumentLine.Offset + RelativeTextOffset, relativeOffset);
 
-			return new ReadOnlySlice<char>(text.Text.AsMemory(), text.Offset, text.Count);
+			return text.Text.AsMemory().Slice(text.Offset, text.Count);
 		}
 
 		/// <inheritdoc/>

diff --git a/src/AvaloniaEdit/Rendering/VisualLineTextSource.cs b/src/AvaloniaEdit/Rendering/VisualLineTextSource.cs
@@ -51,9 +51,9 @@ public TextRun GetTextRun(int textSourceCharacterIndex)
 						TextRun run = element.CreateTextRun(textSourceCharacterIndex, this);
 						if (run == null)
 							throw new ArgumentNullException(element.GetType().Name + ".CreateTextRun");
-						if (run.TextSourceLength == 0)
+						if (run.Length == 0)
 							throw new ArgumentException("The returned TextRun must not have length 0.", element.GetType().Name + ".Length");
-						if (relativeOffset + run.TextSourceLength > element.VisualLength)
+						if (relativeOffset + run.Length > element.VisualLength)
 							throw new ArgumentException("The returned TextRun is too long.", element.GetType().Name + ".CreateTextRun");
 						if (run is InlineObjectRun inlineRun) {
 							inlineRun.VisualLine = VisualLine;
@@ -102,7 +102,7 @@ private TextRun CreateTextRunForNewLine()
             return new FormattedTextRun(textElement, GlobalTextRunProperties);
         }
 
-        public ReadOnlySlice<char> GetPrecedingText(int textSourceCharacterIndexLimit)
+        public ReadOnlyMemory<char> GetPrecedingText(int textSourceCharacterIndexLimit)
 		{
 			try {
 				foreach (VisualLineElement element in VisualLine.Elements) {
@@ -118,7 +118,7 @@ public ReadOnlySlice<char> GetPrecedingText(int textSourceCharacterIndexLimit)
 					}
 				}
 
-				return ReadOnlySlice<char>.Empty;
+				return ReadOnlyMemory<char>.Empty;
 			} catch (Exception ex) {
 				Debug.WriteLine(ex.ToString());
 				throw;

diff --git a/src/AvaloniaEdit/RoutedCommand.cs b/src/AvaloniaEdit/RoutedCommand.cs
@@ -21,22 +21,29 @@ public RoutedCommand(string name, KeyGesture keyGesture = null)
 
         static RoutedCommand()
         {
-            CanExecuteEvent.AddClassHandler<IRoutedCommandBindable>(CanExecuteEventHandler);
-            ExecutedEvent.AddClassHandler<IRoutedCommandBindable>(ExecutedEventHandler);
+            CanExecuteEvent.AddClassHandler<Interactive>(CanExecuteEventHandler);
+            ExecutedEvent.AddClassHandler<Interactive>(ExecutedEventHandler);
         }
 
-        private static void CanExecuteEventHandler(IRoutedCommandBindable control, CanExecuteRoutedEventArgs args)
+        private static void CanExecuteEventHandler(Interactive control, CanExecuteRoutedEventArgs args)
         {
-            var binding = control.CommandBindings.Where(c => c != null)
-                .FirstOrDefault(c => c.Command == args.Command && c.DoCanExecute(control, args));
-            args.CanExecute = binding != null;
+            if (control is IRoutedCommandBindable bindable)
+            {
+                var binding = bindable.CommandBindings.Where(c => c != null)
+               .FirstOrDefault(c => c.Command == args.Command && c.DoCanExecute(control, args));
+                args.CanExecute = binding != null;
+            }
         }
 
-        private static void ExecutedEventHandler(IRoutedCommandBindable control, ExecutedRoutedEventArgs args)
+        private static void ExecutedEventHandler(Interactive control, ExecutedRoutedEventArgs args)
         {
-            // ReSharper disable once UnusedVariable
-            var binding = control.CommandBindings.Where(c => c != null)
-                .FirstOrDefault(c => c.Command == args.Command && c.DoExecuted(control, args));
+            if (control is IRoutedCommandBindable bindable)
+            {
+                // ReSharper disable once UnusedVariable
+                var binding = bindable.CommandBindings.Where(c => c != null)
+                    .FirstOrDefault(c => c.Command == args.Command && c.DoExecuted(control, args));
+
+            }
         }
 
         public static RoutedEvent<CanExecuteRoutedEventArgs> CanExecuteEvent { get; } = RoutedEvent.Register<CanExecuteRoutedEventArgs>(nameof(CanExecuteEvent), RoutingStrategies.Bubble, typeof(RoutedCommand));
@@ -79,7 +86,7 @@ event EventHandler ICommand.CanExecuteChanged
         }
     }
 
-    public interface IRoutedCommandBindable : IInteractive
+    public interface IRoutedCommandBindable
     {
         IList<RoutedCommandBinding> CommandBindings { get; }
     }

diff --git a/src/AvaloniaEdit/Search/SearchPanel.cs b/src/AvaloniaEdit/Search/SearchPanel.cs
@@ -28,6 +28,7 @@
 using AvaloniaEdit.Document;
 using AvaloniaEdit.Editing;
 using AvaloniaEdit.Rendering;
+using AvaloniaEdit.Utils;
 
 namespace AvaloniaEdit.Search
 {