Merge branch 'master' into features/NetAnalyzers/CA2211

azure-pipelines-integrationtests.yml

@@ -13,14 +13,14 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET Core SDK 6.0.404'
     inputs:
-      version: 6.0.401
+      version: 6.0.404
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.100'
+    displayName: 'Use .NET Core SDK 7.0.101'
     inputs:
-      version: 7.0.100
+      version: 7.0.101
       
   - script: system_profiler SPDisplaysDataType |grep Resolution
   
@@ -51,14 +51,14 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET Core SDK 6.0.404'
     inputs:
-      version: 6.0.401
+      version: 6.0.404
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.100'
+    displayName: 'Use .NET Core SDK 7.0.101'
     inputs:
-      version: 7.0.100
+      version: 7.0.101
 
   - task: Windows Application Driver@0
     inputs:

azure-pipelines.yml

@@ -30,14 +30,14 @@ jobs:
     vmImage: 'ubuntu-20.04'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET Core SDK 6.0.404'
     inputs:
-      version: 6.0.401
+      version: 6.0.404
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0'
+    displayName: 'Use .NET Core SDK 7.0.101'
     inputs:
-      version: 7.0.100
+      version: 7.0.101
 
   - task: CmdLine@2
     displayName: 'Install Workloads'
@@ -67,14 +67,14 @@ jobs:
     vmImage: 'macos-12'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET Core SDK 6.0.404'
     inputs:
-      version: 6.0.401
+      version: 6.0.404
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.100'
+    displayName: 'Use .NET Core SDK 7.0.101'
     inputs:
-      version: 7.0.100
+      version: 7.0.101
 
   - task: CmdLine@2
     displayName: 'Install Workloads'
@@ -138,14 +138,14 @@ jobs:
     SolutionDir: '$(Build.SourcesDirectory)'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET Core SDK 6.0.404'
     inputs:
-      version: 6.0.401
+      version: 6.0.404
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.100'
+    displayName: 'Use .NET Core SDK 7.0.101'
     inputs:
-      version: 7.0.100
+      version: 7.0.101
 
   - task: CmdLine@2
     displayName: 'Install Workloads'

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "7.0.100",
+        "version": "7.0.101",
         "rollForward": "latestFeature"
     },
     "msbuild-sdks": {

samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs

@@ -17,7 +17,7 @@ namespace ControlCatalog.Pages
             this.Get<TextBlock>("TimePickerDesc").Text = "Use a TimePicker to let users set a time in your app, for example " +
                 "to set a reminder. The TimePicker displays three controls for hour, minute, and AM / PM(if necessary).These controls " +
                 "are easy to use with touch or mouse, and they can be styled and configured in several different ways. " +
-                "12 - hour or 24 - hour clock and visiblility of AM / PM is dynamically set based on user time settings, or can be overridden.";
+                "12 - hour or 24 - hour clock and visibility of AM / PM is dynamically set based on user time settings, or can be overridden.";
 
 
         }

src/Avalonia.Base/Rendering/Composition/Compositor.cs

@@ -111,7 +111,7 @@ namespace Avalonia.Rendering.Composition
                 }
             }
             
-            batch.CommitedAt = Server.Clock.Elapsed;
+            batch.CommittedAt = Server.Clock.Elapsed;
             _server.EnqueueBatch(batch);
             
             lock (_pendingBatchLock)

src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs

@@ -48,7 +48,7 @@ internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisua
         }
     }
 
-    protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+    protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt)
     {
         if (reader.Read<byte>() == 1)
         {
@@ -56,7 +56,7 @@ internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisua
             _renderCommands = reader.ReadObject<CompositionDrawList?>();
             _contentBounds = null;
         }
-        base.DeserializeChangesCore(reader, commitedAt);
+        base.DeserializeChangesCore(reader, committedAt);
     }
 
     protected override void RenderCore(CompositorDrawingContextProxy canvas, Rect currentTransformedClip)

src/Avalonia.Base/Rendering/Composition/Server/ServerCustomCompositionVisual.cs

@@ -16,9 +16,9 @@ internal class ServerCompositionCustomVisual : ServerCompositionContainerVisual,
         _handler.Attach(this);
     }
 
-    protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+    protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt)
     {
-        base.DeserializeChangesCore(reader, commitedAt);
+        base.DeserializeChangesCore(reader, committedAt);
         var count = reader.Read<int>();
         for (var c = 0; c < count; c++)
         {
@@ -79,4 +79,4 @@ internal class ServerCompositionCustomVisual : ServerCompositionContainerVisual,
                 ?.Log(_handler, $"Exception in {_handler.GetType().Name}.{nameof(CompositionCustomVisualHandler.OnRender)} {{0}}", e);
         }
     }
-}
+}

src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs

@@ -14,7 +14,7 @@ namespace Avalonia.Rendering.Composition.Server
     {
         public List<T> List { get; } = new List<T>();
 
-        protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+        protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt)
         {
             if (reader.Read<byte>() == 1)
             {
@@ -23,7 +23,7 @@ namespace Avalonia.Rendering.Composition.Server
                 for (var c = 0; c < count; c++) 
                     List.Add(reader.ReadObject<T>());
             }
-            base.DeserializeChangesCore(reader, commitedAt);
+            base.DeserializeChangesCore(reader, committedAt);
         }
 
         public override long LastChangedBy

src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs

@@ -104,13 +104,13 @@ namespace Avalonia.Rendering.Composition.Server
         }
 
         protected void SetAnimatedValue<T>(CompositionProperty prop, ref T field,
-            TimeSpan commitedAt, IAnimationInstance animation) where T : struct
+            TimeSpan committedAt, IAnimationInstance animation) where T : struct
         {
             if (IsActive && _animations.TryGetValue(prop, out var oldAnimation))
                 oldAnimation.Deactivate();
             _animations[prop] = animation;
             
-            animation.Initialize(commitedAt, ExpressionVariant.Create(field), prop);
+            animation.Initialize(committedAt, ExpressionVariant.Create(field), prop);
             if(IsActive)
                 animation.Activate();
             
@@ -165,7 +165,7 @@ namespace Avalonia.Rendering.Composition.Server
 
         public virtual CompositionProperty? GetCompositionProperty(string fieldName) => null;
 
-        protected virtual void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+        protected virtual void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt)
         {
             if (this is IDisposable disp
                 && reader.Read<byte>() == 1)
@@ -174,7 +174,7 @@ namespace Avalonia.Rendering.Composition.Server
         
         public void DeserializeChanges(BatchStreamReader reader, Batch batch)
         {
-            DeserializeChangesCore(reader, batch.CommitedAt);
+            DeserializeChangesCore(reader, batch.CommittedAt);
             ValuesInvalidated();
             ItselfLastChangedBy = batch.SequenceId;
         }

src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs

@@ -29,7 +29,7 @@ namespace Avalonia.Rendering.Composition.Transport
 
         
         public BatchStreamData Changes { get; private set; }
-        public TimeSpan CommitedAt { get; set; }
+        public TimeSpan CommittedAt { get; set; }
         
         public void Complete()
         {

src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs

@@ -303,7 +303,7 @@ namespace Avalonia.Rendering.SceneGraph
             if (ClipToBounds)
             {
                 context.Transform = Matrix.Identity;
-                if (ClipToBoundsRadius.IsEmpty)
+                if (ClipToBoundsRadius.IsDefault)
                     context.PushClip(ClipBounds);
                 else
                     context.PushClip(new RoundedRect(ClipBounds, ClipToBoundsRadius));

src/Avalonia.Controls.DataGrid/DataGrid.cs

@@ -51,15 +51,10 @@ namespace Avalonia.Controls
         private const string DATAGRID_elementTopLeftCornerHeaderName = "PART_TopLeftCornerHeader";
         private const string DATAGRID_elementTopRightCornerHeaderName = "PART_TopRightCornerHeader";
         private const string DATAGRID_elementBottomRightCornerHeaderName = "PART_BottomRightCorner";
-        private const string DATAGRID_elementValidationSummary = "PART_ValidationSummary";
         private const string DATAGRID_elementVerticalScrollbarName = "PART_VerticalScrollbar";
-
-        private const bool DATAGRID_defaultAutoGenerateColumns = true;
         internal const bool DATAGRID_defaultCanUserReorderColumns = true;
         internal const bool DATAGRID_defaultCanUserResizeColumns = true;
         internal const bool DATAGRID_defaultCanUserSortColumns = true;
-        private const DataGridRowDetailsVisibilityMode DATAGRID_defaultRowDetailsVisibility = DataGridRowDetailsVisibilityMode.VisibleWhenSelected;
-        private const DataGridSelectionMode DATAGRID_defaultSelectionMode = DataGridSelectionMode.Extended;
 
         /// <summary>
         /// The default order to use for columns when there is no <see cref="DisplayAttribute.Order"/>
@@ -3299,7 +3294,7 @@ namespace Avalonia.Controls
                 newCell.IsVisible = column.IsVisible;
                 if (row.OwningGrid.CellTheme is {} cellTheme)
                 {
-                    newCell.SetValue(ThemeProperty, cellTheme, BindingPriority.TemplatedParent);
+                    newCell.SetValue(ThemeProperty, cellTheme, BindingPriority.Template);
                 }
             }
             row.Cells.Insert(column.Index, newCell);

src/Avalonia.Controls.DataGrid/DataGridColumn.cs

@@ -897,7 +897,7 @@ namespace Avalonia.Controls
             result[!ContentControl.ContentTemplateProperty] = this[!HeaderTemplateProperty];
             if (OwningGrid.ColumnHeaderTheme is {} columnTheme)
             {
-                result.SetValue(StyledElement.ThemeProperty, columnTheme, BindingPriority.TemplatedParent);
+                result.SetValue(StyledElement.ThemeProperty, columnTheme, BindingPriority.Template);
             }
 
             return result;

src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs

@@ -673,7 +673,7 @@ namespace Avalonia.Controls
             };
             if (OwningGrid.ColumnHeaderTheme is {} columnHeaderTheme)
             {
-                dragIndicator.SetValue(ThemeProperty, columnHeaderTheme, BindingPriority.TemplatedParent);
+                dragIndicator.SetValue(ThemeProperty, columnHeaderTheme, BindingPriority.Template);
             }
 
             dragIndicator.PseudoClasses.Add(":dragIndicator");

src/Avalonia.Controls.DataGrid/DataGridRow.cs

@@ -253,7 +253,7 @@ namespace Avalonia.Controls
                     };
                     if (OwningGrid.CellTheme is {} cellTheme)
                     {
-                        _fillerCell.SetValue(ThemeProperty, cellTheme, BindingPriority.TemplatedParent);
+                        _fillerCell.SetValue(ThemeProperty, cellTheme, BindingPriority.Template);
                     }
                     if (_cellsElement != null)
                     {

src/Avalonia.Controls.DataGrid/DataGridRows.cs

@@ -1029,7 +1029,7 @@ namespace Avalonia.Controls
                 dataGridRow.DataContext = dataContext;
                 if (RowTheme is {} rowTheme)
                 {
-                    dataGridRow.SetValue(ThemeProperty, rowTheme, BindingPriority.TemplatedParent);
+                    dataGridRow.SetValue(ThemeProperty, rowTheme, BindingPriority.Template);
                 }
                 CompleteCellsCollection(dataGridRow);
 
@@ -2743,7 +2743,7 @@ namespace Avalonia.Controls
             groupHeader.Level = rowGroupInfo.Level;
             if (RowGroupTheme is {} rowGroupTheme)
             {
-                groupHeader.SetValue(ThemeProperty, rowGroupTheme, BindingPriority.TemplatedParent);
+                groupHeader.SetValue(ThemeProperty, rowGroupTheme, BindingPriority.Template);
             }
 
             // Set the RowGroupHeader's PropertyName. Unfortunately, CollectionViewGroup doesn't have this

src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using Avalonia.Metadata;
 
 namespace Avalonia.Controls.ApplicationLifetimes
@@ -19,7 +18,7 @@ namespace Avalonia.Controls.ApplicationLifetimes
 
         /// <summary>
         /// Gets the arguments passed to the
-        /// <see cref="ClassicDesktopStyleApplicationLifetimeExtensions.StartWithClassicDesktopLifetime{T}(T, string[], ShutdownMode)"/>
+        /// <see cref="ClassicDesktopStyleApplicationLifetimeExtensions.StartWithClassicDesktopLifetime(AppBuilder, string[], ShutdownMode)"/>
         /// method.
         /// </summary>
         string[]? Args { get; }

src/Avalonia.Controls/BorderVisual.cs

@@ -50,7 +50,7 @@ class CompositionBorderVisual : CompositionDrawListVisual
             if (ClipToBounds)
             {
                 var clipRect = Root!.SnapToDevicePixels(new Rect(new Size(Size.X, Size.Y)));
-                if (_cornerRadius.IsEmpty)
+                if (_cornerRadius.IsDefault)
                     canvas.PushClip(clipRect);
                 else
                     canvas.PushClip(new RoundedRect(clipRect, _cornerRadius));
@@ -63,9 +63,9 @@ class CompositionBorderVisual : CompositionDrawListVisual
             
         }
 
-        protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+        protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt)
         {
-            base.DeserializeChangesCore(reader, commitedAt);
+            base.DeserializeChangesCore(reader, committedAt);
             if (reader.Read<bool>())
                 _cornerRadius = reader.Read<CornerRadius>();
         }
@@ -73,4 +73,4 @@ class CompositionBorderVisual : CompositionDrawListVisual
         protected override bool HandlesClipToBounds => true;
     }
 
-}
+}

src/Avalonia.Controls/SelectableTextBlock.cs

@@ -300,7 +300,11 @@ namespace Avalonia.Controls
 
                         _wordSelectionStart = SelectionStart;
 
-                        SelectionEnd = StringUtils.NextWord(text, index);
+                        if (!StringUtils.IsEndOfWord(text, index))
+                        {
+                            SelectionEnd = StringUtils.NextWord(text, index);
+                        }
+                        
                         break;
                     case 3:
                         _wordSelectionStart = -1;

src/Avalonia.Controls/TextBox.cs

@@ -1475,7 +1475,11 @@ namespace Avalonia.Controls
 
                         _wordSelectionStart = SelectionStart;
 
-                        SelectionEnd = StringUtils.NextWord(text, index);
+                        if (!StringUtils.IsEndOfWord(text, index))
+                        {
+                            SelectionEnd = StringUtils.NextWord(text, index);
+                        }
+
                         break;
                     case 3:
                         _wordSelectionStart = -1;

src/Avalonia.Controls/Utils/StringUtils.cs

@@ -67,6 +67,55 @@ namespace Avalonia.Controls.Utils
             }
         }
 
+        public static bool IsEndOfWord(string text, int index)
+        {
+            if (index >= text.Length)
+            {
+                return true;
+            }
+
+            var codepoint = new Codepoint(text[index]);
+        
+            if (!codepoint.IsWhiteSpace)
+            {
+                return false;
+            }
+            // A 'word' starts with an AlphaNumeric or some punctuation symbols immediately
+            // preceeded by lwsp.
+            if (index > 0)
+            {
+                var nextCodePoint = new Codepoint(text[index + 1]);
+
+                if (nextCodePoint.IsBreakChar)
+                {
+                    return true;
+                }
+            }
+
+            switch (codepoint.GeneralCategory)
+            {
+                case GeneralCategory.LowercaseLetter:
+                case GeneralCategory.TitlecaseLetter:
+                case GeneralCategory.UppercaseLetter:
+                case GeneralCategory.DecimalNumber:
+                case GeneralCategory.LetterNumber:
+                case GeneralCategory.OtherNumber:
+                case GeneralCategory.DashPunctuation:
+                case GeneralCategory.InitialPunctuation:
+                case GeneralCategory.OpenPunctuation:
+                case GeneralCategory.CurrencySymbol:
+                case GeneralCategory.MathSymbol:
+                    return false;
+
+                // TODO: How do you do this in .NET?
+                // case UnicodeCategory.OtherPunctuation:
+                //    // words cannot start with '.', but they can start with '&' or '*' (for example)
+                //    return g_unichar_break_type(buffer->text[index]) == G_UNICODE_BREAK_ALPHABETIC;
+                default:
+                    return true;
+            }
+        }
+
         public static int PreviousWord(string text, int cursor)
         {
             if (string.IsNullOrEmpty(text))

src/Avalonia.OpenGL/Avalonia.OpenGL.csproj

@@ -13,4 +13,9 @@
     <Import Project="..\..\build\DevAnalyzers.props" />
     <Import Project="..\..\build\SourceGenerators.props" />
     <Import Project="..\..\build\TrimmingEnable.props" />
+
+  <ItemGroup>
+    <Compile Remove="..\Shared\SourceGeneratorAttributes.cs"/>
+    <None Include="..\Shared\SourceGeneratorAttributes.cs" Visible="false"/>
+  </ItemGroup>
 </Project>

src/Browser/Avalonia.Browser/webapp/package-lock.json

@@ -2162,9 +2162,9 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.0"
@@ -4699,9 +4699,9 @@
       "dev": true
     },
     "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "requires": {
         "minimist": "^1.2.0"

src/tools/DevAnalyzers/GenericVirtualAnalyzer.cs

@@ -16,7 +16,7 @@ public class GenericVirtualAnalyzer : DiagnosticAnalyzer
         "Performance",
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        description: "Generic virtual methods affect JIT startup time adversly and should be avoided.");
+        description: "Generic virtual methods affect JIT startup time adversely and should be avoided.");
 
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
 

src/tools/DevGenerators/CompositionGenerator/Generator.cs

@@ -257,7 +257,7 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
             if (cl.Properties.Count > 0)
             {
                 server = server.AddMembers(((MethodDeclarationSyntax)ParseMemberDeclaration(
-                            $"protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt){{}}")
+                            $"protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan committedAt){{}}")
                         !)
                     .WithBody(ApplyDeserializeChangesEpilogue(deserializeMethodBody, cl)));
                 server = server.AddMembers(MethodDeclaration(ParseTypeName("void"), "OnFieldsDeserialized")
@@ -481,7 +481,7 @@ return;
         private static BlockSyntax DeserializeChangesPrologue(GClass cl)
         {
             return Block(ParseStatement($@"
-base.DeserializeChangesCore(reader, commitedAt);
+base.DeserializeChangesCore(reader, committedAt);
 DeserializeChangesExtra(reader);
 var changed = reader.Read<{ChangedFieldsTypeName(cl)}>();
 "));
@@ -500,7 +500,7 @@ var changed = reader.Read<{ChangedFieldsTypeName(cl)}>();
             {
                 code = $@"
     if((changed & {changedFieldsType}.{prop.Name}Animated) == {changedFieldsType}.{prop.Name}Animated)
-            SetAnimatedValue({CompositionPropertyField(prop)}, ref {PropertyBackingFieldName(prop)}, commitedAt, reader.ReadObject<IAnimationInstance>());
+            SetAnimatedValue({CompositionPropertyField(prop)}, ref {PropertyBackingFieldName(prop)}, committedAt, reader.ReadObject<IAnimationInstance>());
     else ";
             }