Make CharacterReader internal.

api/Avalonia.nupkg.xml

@@ -7,6 +7,30 @@
     <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
     <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Avalonia.Utilities.CharacterReader</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Avalonia.Utilities.IdentifierParser</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Avalonia.Utilities.KeywordParser</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Avalonia.Utilities.StyleClassParser</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Diagnostics.AppliedStyle.get_HasActivator</Target>

src/Avalonia.Base/Utilities/CharacterReader.cs

@@ -2,11 +2,7 @@
 
 namespace Avalonia.Utilities
 {
-    // TODO12: This should not be public
-#if !BUILDTASK
-    public
-#endif
-    ref struct CharacterReader
+    internal ref struct CharacterReader
     {
         private ReadOnlySpan<char> _s;
 

src/Avalonia.Base/Utilities/IdentifierParser.cs

@@ -3,10 +3,7 @@
 
 namespace Avalonia.Utilities
 {
-#if !BUILDTASK
-    public
-#endif
-    static class IdentifierParser
+    internal static class IdentifierParser
     {
         public static ReadOnlySpan<char> ParseIdentifier(this
 #if NET7SDK

src/Avalonia.Base/Utilities/KeywordParser.cs

@@ -2,10 +2,7 @@
 
 namespace Avalonia.Utilities
 {
-#if !BUILDTASK
-    public
-#endif
-    static class KeywordParser
+    internal static class KeywordParser
     {
         public static bool CheckKeyword(this ref CharacterReader r, string keyword)
         {

src/Avalonia.Base/Utilities/StyleClassParser.cs

@@ -3,10 +3,7 @@
 
 namespace Avalonia.Utilities
 {
-#if !BUILDTASK
-    public
-#endif
-    static class StyleClassParser
+    internal static class StyleClassParser
     {
         public static ReadOnlySpan<char> ParseStyleClass(this ref CharacterReader r)
         {

src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs

@@ -22,8 +22,7 @@ public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode nod
 
                 if (binding.Arguments.Count > 0 && binding.Arguments[0] is XamlAstTextNode bindingPathText)
                 {
-                    var reader = new CharacterReader(bindingPathText.Text.AsSpan());
-                    var (nodes, _) = BindingExpressionGrammar.Parse(ref reader);
+                    var (nodes, _) = BindingExpressionGrammar.Parse(bindingPathText.Text);
 
                     if (convertedNode != null)
                     {
@@ -48,8 +47,7 @@ public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode nod
 
                     if (bindingPathAssignment != null && bindingPathAssignment.Values[0] is XamlAstTextNode pathValue)
                     {
-                        var reader = new CharacterReader(pathValue.Text.AsSpan());
-                        var (nodes, _) = BindingExpressionGrammar.Parse(ref reader);
+                        var (nodes, _) = BindingExpressionGrammar.Parse(pathValue.Text);
 
                         if (nodes.Count == 1 && nodes[0] is BindingExpressionGrammar.EmptyExpressionNode)
                         {

src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs

@@ -64,7 +64,7 @@ public static IXamlIlAvaloniaPropertyNode CreateNode(AstTransformationContext co
         {
             XamlAstNamePropertyReference forgedReference;
 
-            var parsedPropertyName = PropertyParser.Parse(new CharacterReader(propertyName.AsSpan()));
+            var parsedPropertyName = PropertyParser.Parse(propertyName);
             if(parsedPropertyName.owner == null)
                 forgedReference = new XamlAstNamePropertyReference(lineInfo, selectorTypeReference,
                     propertyName, selectorTypeReference);

src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs

@@ -1,10 +1,17 @@
-using Avalonia.Data.Core;
+using System;
+using Avalonia.Data.Core;
 using Avalonia.Utilities;
 
 namespace Avalonia.Markup.Xaml.Parsers
 {
     internal class PropertyParser
     {
+        public static (string? ns, string? owner, string name) Parse(string text)
+        {
+            var r = new CharacterReader(text.AsSpan());
+            return Parse(r);
+        }
+
         public static (string? ns, string? owner, string name) Parse(CharacterReader r)
         {
             if (r.End)

src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs

@@ -1,10 +1,10 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Data.Core;
-using Avalonia.Utilities;
 using System;
 using System.Collections.Generic;
+using Avalonia.Data.Core;
+using Avalonia.Utilities;
 
 namespace Avalonia.Markup.Parsers
 {
@@ -18,6 +18,12 @@ internal static class BindingExpressionGrammar
     {
         private static readonly List<INode> s_pool = new();
 
+        public static (List<INode> Nodes, SourceMode Mode) Parse(string text)
+        {
+            var r = new CharacterReader(text.AsSpan());
+            return Parse(ref r);
+        }
+
         public static (List<INode> Nodes, SourceMode Mode) Parse(ref CharacterReader r)
         {
             var result = new List<INode>();