Update to Avalonia 11

Takoooooo · Takoooooo · commit 2c1e2aa8b030 · 2023-07-05T20:13:53.000+03:00
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-rc1.1</AvaloniaVersion>
+    <AvaloniaVersion>11.0.0</AvaloniaVersion>
     <TextMateSharpVersion>1.0.55</TextMateSharpVersion>
     <VersionSuffix>beta</VersionSuffix>
   </PropertyGroup>
diff --git a/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj b/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
@@ -33,7 +33,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-	<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
     <ProjectReference Include="..\AvaloniaEdit\AvaloniaEdit.csproj" />
     <ProjectReference Include="..\AvaloniaEdit.TextMate\AvaloniaEdit.TextMate.csproj" />
   </ItemGroup>
diff --git a/src/AvaloniaEdit.TextMate/AvaloniaEdit.TextMate.csproj b/src/AvaloniaEdit.TextMate/AvaloniaEdit.TextMate.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageReference Include="TextMateSharp" Version="$(TextMateSharpVersion)" />
     <PackageReference Include="TextMateSharp.Grammars" Version="$(TextMateSharpVersion)" />
   </ItemGroup>
diff --git a/src/AvaloniaEdit/Editing/TextArea.cs b/src/AvaloniaEdit/Editing/TextArea.cs
@@ -1134,21 +1134,16 @@ public void RaiseScrollInvalidated(EventArgs e)
             _logicalScrollable?.RaiseScrollInvalidated(e);
         }
 
-        private class TextAreaTextInputMethodClient : ITextInputMethodClient
+        private class TextAreaTextInputMethodClient : TextInputMethodClient
         {
-            private ITextEditable _textEditable;
             private TextArea _textArea;
 
             public TextAreaTextInputMethodClient()
             {
 
             }
 
-            public event EventHandler CursorRectangleChanged;
-            public event EventHandler TextViewVisualChanged;
-            public event EventHandler SurroundingTextChanged;
-
-            public Rect CursorRectangle
+            public override Rect CursorRectangle
             {
                 get
                 {   
@@ -1170,13 +1165,13 @@ public Rect CursorRectangle
                 }
             }
 
-            public Visual TextViewVisual => _textArea;
+            public override Visual TextViewVisual => _textArea;
 
-            public bool SupportsPreedit => false;
+            public override bool SupportsPreedit => false;
 
-            public bool SupportsSurroundingText => true;
+            public override bool SupportsSurroundingText => true;
 
-            public TextInputMethodSurroundingText SurroundingText
+            public override string SurroundingText
             {
                 get
                 {
@@ -1187,26 +1182,15 @@ public TextInputMethodSurroundingText SurroundingText
 
                     var lineIndex = _textArea.Caret.Line;
 
-                    var position = _textArea.Caret.Position;
-
                     var documentLine = _textArea.Document.GetLineByNumber(lineIndex);
 
                     var text = _textArea.Document.GetText(documentLine.Offset, documentLine.Length);
 
-                    return new TextInputMethodSurroundingText
-                    {
-                        AnchorOffset = 0,
-                        CursorOffset = position.Column,
-                        Text = text
-                    };
+                    return text;
                 }
             }
 
-            public ITextEditable TextEditable
-            {
-                get => _textEditable;
-                set => _textEditable = value;
-            }
+            public override TextSelection Selection { get; set; }
 
             public void SetTextArea(TextArea textArea)
             {
@@ -1224,19 +1208,19 @@ public void SetTextArea(TextArea textArea)
                     _textArea.SelectionChanged += TextArea_SelectionChanged;
                 }
 
-                TextViewVisualChanged?.Invoke(this, EventArgs.Empty);
+                RaiseTextViewVisualChanged();
 
-                CursorRectangleChanged?.Invoke(this, EventArgs.Empty);
+                RaiseCursorRectangleChanged();
             }
 
             private void Caret_PositionChanged(object sender, EventArgs e)
             {
-                CursorRectangleChanged?.Invoke(this, e);
+                RaiseCursorRectangleChanged();
             }
 
             private void TextArea_SelectionChanged(object sender, EventArgs e)
             {
-                SurroundingTextChanged?.Invoke(this, e);
+                RaiseSurroundingTextChanged();
             }
 
             public void SelectInSurroundingText(int start, int end)
@@ -1253,15 +1237,10 @@ public void SelectInSurroundingText(int start, int end)
                     new TextViewPosition(selection.StartPosition.Line, end));
             }
 
-            public void SetPreeditText(string text)
+            public override void SetPreeditText(string text)
             {
               
             }
-
-            public void SetComposingRegion(TextRange? region)
-            {
-                //ToDo
-            }
         }
     }
 
diff --git a/test/AvaloniaEdit.Tests/AvaloniaEdit.Tests.csproj b/test/AvaloniaEdit.Tests/AvaloniaEdit.Tests.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-	<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
-	<PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Headless.NUnit" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="Moq" Version="4.18.4" />

Original file line number	Diff line number	Diff line change
`@@ -1134,21 +1134,16 @@ public void RaiseScrollInvalidated(EventArgs e)`
`1134`	`1134`	`_logicalScrollable?.RaiseScrollInvalidated(e);`
`1135`	`1135`	`}`
`1136`	`1136`
`1137`		`- private class TextAreaTextInputMethodClient : ITextInputMethodClient`
	`1137`	`+ private class TextAreaTextInputMethodClient : TextInputMethodClient`
`1138`	`1138`	`{`
`1139`		`- private ITextEditable _textEditable;`
`1140`	`1139`	`private TextArea _textArea;`
`1141`	`1140`
`1142`	`1141`	`public TextAreaTextInputMethodClient()`
`1143`	`1142`	`{`
`1144`	`1143`
`1145`	`1144`	`}`
`1146`	`1145`
`1147`		`- public event EventHandler CursorRectangleChanged;`
`1148`		`- public event EventHandler TextViewVisualChanged;`
`1149`		`- public event EventHandler SurroundingTextChanged;`
`1150`		`-`
`1151`		`- public Rect CursorRectangle`
	`1146`	`+ public override Rect CursorRectangle`
`1152`	`1147`	`{`
`1153`	`1148`	`get`
`1154`	`1149`	`{`
`@@ -1170,13 +1165,13 @@ public Rect CursorRectangle`
`1170`	`1165`	`}`
`1171`	`1166`	`}`
`1172`	`1167`
`1173`		`- public Visual TextViewVisual => _textArea;`
	`1168`	`+ public override Visual TextViewVisual => _textArea;`
`1174`	`1169`
`1175`		`- public bool SupportsPreedit => false;`
	`1170`	`+ public override bool SupportsPreedit => false;`
`1176`	`1171`
`1177`		`- public bool SupportsSurroundingText => true;`
	`1172`	`+ public override bool SupportsSurroundingText => true;`
`1178`	`1173`
`1179`		`- public TextInputMethodSurroundingText SurroundingText`
	`1174`	`+ public override string SurroundingText`
`1180`	`1175`	`{`
`1181`	`1176`	`get`
`1182`	`1177`	`{`
`@@ -1187,26 +1182,15 @@ public TextInputMethodSurroundingText SurroundingText`
`1187`	`1182`
`1188`	`1183`	`var lineIndex = _textArea.Caret.Line;`
`1189`	`1184`
`1190`		`- var position = _textArea.Caret.Position;`
`1191`		`-`
`1192`	`1185`	`var documentLine = _textArea.Document.GetLineByNumber(lineIndex);`
`1193`	`1186`
`1194`	`1187`	`var text = _textArea.Document.GetText(documentLine.Offset, documentLine.Length);`
`1195`	`1188`
`1196`		`- return new TextInputMethodSurroundingText`
`1197`		`- {`
`1198`		`- AnchorOffset = 0,`
`1199`		`- CursorOffset = position.Column,`
`1200`		`- Text = text`
`1201`		`- };`
	`1189`	`+ return text;`
`1202`	`1190`	`}`
`1203`	`1191`	`}`
`1204`	`1192`
`1205`		`- public ITextEditable TextEditable`
`1206`		`- {`
`1207`		`- get => _textEditable;`
`1208`		`- set => _textEditable = value;`
`1209`		`- }`
	`1193`	`+ public override TextSelection Selection { get; set; }`
`1210`	`1194`
`1211`	`1195`	`public void SetTextArea(TextArea textArea)`
`1212`	`1196`	`{`
`@@ -1224,19 +1208,19 @@ public void SetTextArea(TextArea textArea)`
`1224`	`1208`	`_textArea.SelectionChanged += TextArea_SelectionChanged;`
`1225`	`1209`	`}`
`1226`	`1210`
`1227`		`- TextViewVisualChanged?.Invoke(this, EventArgs.Empty);`
	`1211`	`+ RaiseTextViewVisualChanged();`
`1228`	`1212`
`1229`		`- CursorRectangleChanged?.Invoke(this, EventArgs.Empty);`
	`1213`	`+ RaiseCursorRectangleChanged();`
`1230`	`1214`	`}`
`1231`	`1215`
`1232`	`1216`	`private void Caret_PositionChanged(object sender, EventArgs e)`
`1233`	`1217`	`{`
`1234`		`- CursorRectangleChanged?.Invoke(this, e);`
	`1218`	`+ RaiseCursorRectangleChanged();`
`1235`	`1219`	`}`
`1236`	`1220`
`1237`	`1221`	`private void TextArea_SelectionChanged(object sender, EventArgs e)`
`1238`	`1222`	`{`
`1239`		`- SurroundingTextChanged?.Invoke(this, e);`
	`1223`	`+ RaiseSurroundingTextChanged();`
`1240`	`1224`	`}`
`1241`	`1225`
`1242`	`1226`	`public void SelectInSurroundingText(int start, int end)`
`@@ -1253,15 +1237,10 @@ public void SelectInSurroundingText(int start, int end)`
`1253`	`1237`	`new TextViewPosition(selection.StartPosition.Line, end));`
`1254`	`1238`	`}`
`1255`	`1239`
`1256`		`- public void SetPreeditText(string text)`
	`1240`	`+ public override void SetPreeditText(string text)`
`1257`	`1241`	`{`
`1258`	`1242`
`1259`	`1243`	`}`
`1260`		`-`
`1261`		`- public void SetComposingRegion(TextRange? region)`
`1262`		`- {`
`1263`		`- //ToDo`
`1264`		`- }`
`1265`	`1244`	`}`
`1266`	`1245`	`}`
`1267`	`1246`