feature netcore3 support #168

icsharpcode/AvalonEdit#168 (partial) TextDocument changes will be updated separately.

Author: ScriptSwoons

src/AvaloniaEdit/Editing/DottedLineMargin.cs

@@ -53,16 +53,6 @@ public static IControl Create()
             return line;
         }
 
-        /// <summary>
-        /// Creates a vertical dotted line to separate the line numbers from the text view.
-        /// </summary>
-        internal static IControl Create(IControl editor)
-        {
-            var line = (Line)Create();
-            line.Bind(Shape.StrokeProperty, new Binding("LineNumbersForeground") { Source = editor });
-            return line;
-        }
-
         /// <summary>
         /// Gets whether the specified UIElement is the result of a DottedLineMargin.Create call.
         /// </summary>

src/AvaloniaEdit/Folding/FoldingSection.cs

@@ -124,73 +124,6 @@ public string Title
         /// </summary>
         public string TextContent => _manager.Document.GetText(StartOffset, EndOffset - StartOffset);
 
-        /// <summary>
-        /// Gets the content of the collapsed lines as tooltip text.
-        /// </summary>
-        public string TooltipText
-        {
-            get
-            {
-                // This fixes SD-1394:
-                // Each line is checked for leading indentation whitespaces. If
-                // a line has the same or more indentation than the first line,
-                // it is reduced. If a line is less indented than the first line
-                // the indentation is removed completely.
-                //
-                // See the following example:
-                // 	line 1
-                // 		line 2
-                // 			line 3
-                //  line 4
-                //
-                // is reduced to:
-                // line 1
-                // 	line 2
-                // 		line 3
-                // line 4
-
-                var startLine = _manager.Document.GetLineByOffset(StartOffset);
-                var endLine = _manager.Document.GetLineByOffset(EndOffset);
-                var builder = new StringBuilder();
-
-                var current = startLine;
-                ISegment startIndent = TextUtilities.GetLeadingWhitespace(_manager.Document, startLine);
-
-                while (current != endLine.NextLine)
-                {
-                    ISegment currentIndent = TextUtilities.GetLeadingWhitespace(_manager.Document, current);
-
-                    if (current == startLine && current == endLine)
-                        builder.Append(_manager.Document.GetText(StartOffset, EndOffset - StartOffset));
-                    else if (current == startLine)
-                    {
-                        if (current.EndOffset - StartOffset > 0)
-                            builder.AppendLine(_manager.Document.GetText(StartOffset, current.EndOffset - StartOffset).TrimStart());
-                    }
-                    else if (current == endLine)
-                    {
-                        builder.Append(startIndent.Length <= currentIndent.Length
-                            ? _manager.Document.GetText(current.Offset + startIndent.Length,
-                                EndOffset - current.Offset - startIndent.Length)
-                            : _manager.Document.GetText(current.Offset + currentIndent.Length,
-                                EndOffset - current.Offset - currentIndent.Length));
-                    }
-                    else
-                    {
-                        builder.AppendLine(startIndent.Length <= currentIndent.Length
-                            ? _manager.Document.GetText(current.Offset + startIndent.Length,
-                                current.Length - startIndent.Length)
-                            : _manager.Document.GetText(current.Offset + currentIndent.Length,
-                                current.Length - currentIndent.Length));
-                    }
-
-                    current = current.NextLine;
-                }
-
-                return builder.ToString();
-            }
-        }
-
         /// <summary>
         /// Gets/Sets an additional object associated with this folding section.
         /// </summary>

src/AvaloniaEdit/Search/SearchPanel.cs

@@ -240,7 +240,10 @@ public void RegisterCommands(ICollection<RoutedCommandBinding> commandBindings)
         /// </summary>
         public void Uninstall()
         {
-            CloseAndRemove();
+            Close();
+            _textArea.DocumentChanged -= TextArea_DocumentChanged;
+            if (_currentDocument != null)
+                _currentDocument.TextChanged -= TextArea_Document_TextChanged;
             _textArea.DefaultInputHandler.NestedInputHandlers.Remove(_handler);
         }
 
@@ -490,17 +493,6 @@ public void Close()
             _textArea.Focus();
         }
 
-        /// <summary>
-        /// Closes the SearchPanel and removes it.
-        /// </summary>
-        private void CloseAndRemove()
-        {
-            Close();
-            _textArea.DocumentChanged -= TextArea_DocumentChanged;
-            if (_currentDocument != null)
-                _currentDocument.TextChanged -= TextArea_Document_TextChanged;
-        }
-
         /// <summary>
         /// Opens the an existing search panel.
         /// </summary>