[SourceEditor] Unified selection surrounding providers.

+ Fixed unit tests.

1 files changed, 15 insertions, 16 deletions

diff --git a/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/VirtualIndentModeTests.cs b/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/VirtualIndentModeTests.cs
index eca5dfc2d7..6f63ea1d6b 100644
--- a/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/VirtualIndentModeTests.cs
+++ b/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/VirtualIndentModeTests.cs
@@ -29,6 +29,7 @@ using NUnit.Framework;
 using System.Linq;
 using Gtk;
 using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace Mono.TextEditor.Tests
 {
@@ -52,7 +53,7 @@ namespace Mono.TextEditor.Tests
 			MiscActions.InsertNewLine (data);
 			
 			Assert.AreEqual ("\n\n\n\n", data.Document.Text);
-			Assert.AreEqual (data.IndentationTracker.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
+			Assert.AreEqual (data.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
 		}
 
 		[Test]
@@ -64,7 +65,7 @@ namespace Mono.TextEditor.Tests
 			CaretMoveActions.LineEnd (data);
 			
 			Assert.AreEqual ("\n\n\n", data.Document.Text);
-			Assert.AreEqual (data.IndentationTracker.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
+			Assert.AreEqual (data.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
 		}
 
 		[Test]
@@ -75,7 +76,7 @@ namespace Mono.TextEditor.Tests
 			Assert.AreEqual (4, data.Caret.DesiredColumn);
 
 			CaretMoveActions.Down (data);
-			Assert.AreEqual (data.IndentationTracker.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
+			Assert.AreEqual (data.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
 			CaretMoveActions.Down (data);
 			
 			Assert.AreEqual (4, data.Caret.Column);
@@ -92,7 +93,7 @@ namespace Mono.TextEditor.Tests
 			Assert.AreEqual (4, data.Caret.DesiredColumn);
 
 			CaretMoveActions.Up (data);
-			Assert.AreEqual (data.IndentationTracker.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
+			Assert.AreEqual (data.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
 			CaretMoveActions.Up (data);
 			
 			Assert.AreEqual (4, data.Caret.Column);
@@ -113,7 +114,7 @@ namespace Mono.TextEditor.Tests
 			CaretMoveActions.Down (data);
 
 
-			int indentColumn = data.IndentationTracker.GetVirtualIndentationColumn (2, 1);
+			int indentColumn = data.GetVirtualIndentationColumn (2, 1);
 			Assert.AreEqual (indentColumn, data.Caret.Column);
 			Assert.AreEqual (data.LogicalToVisualLocation (2, indentColumn).Column, data.Caret.DesiredColumn);
 		}
@@ -134,7 +135,7 @@ namespace Mono.TextEditor.Tests
 			CaretMoveActions.Down (data);
 			CaretMoveActions.Up (data);
 
-			int indentColumn = data.IndentationTracker.GetVirtualIndentationColumn (2, 1);
+			int indentColumn = data.GetVirtualIndentationColumn (2, 1);
 			Assert.AreEqual (indentColumn, data.Caret.Column);
 			Assert.AreEqual (data.LogicalToVisualLocation (2, indentColumn).Column, data.Caret.DesiredColumn);
 		}
@@ -144,11 +145,11 @@ namespace Mono.TextEditor.Tests
 		{
 			var data = CreateData ("\n\n\n");
 			CaretMoveActions.Right (data);
-			Assert.AreEqual (new DocumentLocation (1, data.IndentationTracker.GetVirtualIndentationColumn (2, 1)), data.Caret.Location);
+			Assert.AreEqual (new DocumentLocation (1, data.GetVirtualIndentationColumn (2, 1)), data.Caret.Location);
 			CaretMoveActions.Right (data);
 			Assert.AreEqual (new DocumentLocation (2, 1), data.Caret.Location);
 			CaretMoveActions.Right (data);
-			Assert.AreEqual (new DocumentLocation (2, data.IndentationTracker.GetVirtualIndentationColumn (2, 1)), data.Caret.Location);
+			Assert.AreEqual (new DocumentLocation (2, data.GetVirtualIndentationColumn (2, 1)), data.Caret.Location);
 		}
 
 		[Test]
@@ -160,14 +161,14 @@ namespace Mono.TextEditor.Tests
 			CaretMoveActions.Right (data);
 			Assert.AreEqual (new DocumentLocation (2, 1), data.Caret.Location);
 			CaretMoveActions.Right (data);
-			Assert.AreEqual (new DocumentLocation (2, data.IndentationTracker.GetVirtualIndentationColumn (2, 1)), data.Caret.Location);
+			Assert.AreEqual (new DocumentLocation (2, data.GetVirtualIndentationColumn (2, 1)), data.Caret.Location);
 		}
 
 		[Test]
 		public void TestBackspaceRightBehavior ()
 		{
 			var data = CreateData ("test\n\n\n");
-			data.Caret.Location = new DocumentLocation (2, data.IndentationTracker.GetVirtualIndentationColumn (2, 1));
+			data.Caret.Location = new DocumentLocation (2, data.GetVirtualIndentationColumn (2, 1));
 			DeleteActions.Backspace (data);
 			Assert.AreEqual (new DocumentLocation (1, 5), data.Caret.Location);
 			Assert.AreEqual ("test\n\n", data.Document.Text);
@@ -221,7 +222,7 @@ namespace Mono.TextEditor.Tests
 			DeleteActions.Backspace (data);
 			Assert.AreEqual ("\n\n\n", data.Document.Text);
 
-			Assert.AreEqual (data.IndentationTracker.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
+			Assert.AreEqual (data.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
 		}
 		
 		[Test]
@@ -312,7 +313,7 @@ namespace Mono.TextEditor.Tests
 			data.Remove (0, "Hello".Length);
 
 			Assert.AreEqual ("\n\n", data.Document.Text);
-			Assert.AreEqual (data.IndentationTracker.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
+			Assert.AreEqual (data.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
 		}
 		
 		[Test]
@@ -324,7 +325,7 @@ namespace Mono.TextEditor.Tests
 			data.Insert (0, "Hello");
 
 			Assert.AreEqual ("Hello\n\n", data.Document.Text);
-			Assert.AreEqual (data.IndentationTracker.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
+			Assert.AreEqual (data.GetVirtualIndentationColumn (2, 1), data.Caret.Column);
 		}
 
 
@@ -452,9 +453,7 @@ namespace Mono.TextEditor.Tests
 		{
 			var data = CreateData ("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n\t\t\r\n\r\n");
 			data.Options.DefaultEolMarker = "\r\n";
-			data.IndentationTracker = new DefaultIndentationTracker (data.Document) {
-				SupportedFeatures = IndentatitonTrackerFeatures.All
-			};
+			data.IndentationTracker = new DefaultIndentationTracker (data.Document);
 			data.Caret.Location = new DocumentLocation (4, 3);
 
 			DeleteActions.Backspace (data);