Merge pull request #360 from IvaYan/master

danipen · web-flow · commit e9cb45e865da · 2023-07-19T10:23:19.000+02:00
Fix NRE on losing focus #359
diff --git a/src/AvaloniaEdit/Editing/TextArea.cs b/src/AvaloniaEdit/Editing/TextArea.cs
@@ -1192,7 +1192,12 @@ public override string SurroundingText
 
             public override TextSelection Selection
             {
-                get => new TextSelection(_textArea.Caret.Position.Column, _textArea.Caret.Position.Column + _textArea.Selection.Length);
+                get
+                {
+                    if (_textArea == null)
+                        return new TextSelection(0, 0);
+                    return new TextSelection(_textArea.Caret.Position.Column, _textArea.Caret.Position.Column + _textArea.Selection.Length);
+                }
                 set
                 {
                     var selection = _textArea.Selection;

Original file line number	Diff line number	Diff line change
`@@ -1192,7 +1192,12 @@ public override string SurroundingText`
`1192`	`1192`
`1193`	`1193`	`public override TextSelection Selection`
`1194`	`1194`	`{`
`1195`		`- get => new TextSelection(_textArea.Caret.Position.Column, _textArea.Caret.Position.Column + _textArea.Selection.Length);`
	`1195`	`+ get`
	`1196`	`+ {`
	`1197`	`+ if (_textArea == null)`
	`1198`	`+ return new TextSelection(0, 0);`
	`1199`	`+ return new TextSelection(_textArea.Caret.Position.Column, _textArea.Caret.Position.Column + _textArea.Selection.Length);`
	`1200`	`+ }`
`1196`	`1201`	`set`
`1197`	`1202`	`{`
`1198`	`1203`	`var selection = _textArea.Selection;`