1 files changed, 12 insertions, 25 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextEditorResolver.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextEditorResolver.cs
index 5c1006a192..6d6ec4ab16 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextEditorResolver.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextEditorResolver.cs
@@ -26,39 +26,26 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using Mono.TextEditor;
 using Mono.Addins;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.Gui.Content
 {
 	public interface ITextEditorResolver
 	{
-		ResolveResult GetLanguageItem (int offset);
-		ResolveResult GetLanguageItem (int offset, string expression);
+		ISymbol GetLanguageItem (int offset);
+		ISymbol GetLanguageItem (int offset, string expression);
 	}
 	
 	public interface ITextEditorResolverProvider
 	{
-		ResolveResult GetLanguageItem (MonoDevelop.Ide.Gui.Document document, int offset, out DomRegion expressionRegion);
-		ResolveResult GetLanguageItem (MonoDevelop.Ide.Gui.Document document, int offset, string identifier);
-
-		string CreateTooltip (MonoDevelop.Ide.Gui.Document document, int offset, ResolveResult result, string errorInformations, Gdk.ModifierType modifierState);
-
-	}
-	
-	public interface ITextEditorMemberPositionProvider
-	{
-		IUnresolvedTypeDefinition GetTypeAt (int offset);
-		IUnresolvedMember GetMemberAt (int offset);
+		ISymbol GetLanguageItem (Document document, int offset, out DocumentRegion expressionRegion);
+		ISymbol GetLanguageItem (Document document, int offset, string identifier);
 	}
-	
-	
+
 	public static class TextEditorResolverService
 	{
 		static List<TextEditorResolverProviderCodon> providers = new List<TextEditorResolverProviderCodon> ();
@@ -85,16 +72,16 @@ namespace MonoDevelop.Ide.Gui.Content
 			return codon.CreateResolver ();
 		}
 
-		public static ResolveResult GetLanguageItem (this MonoDevelop.Ide.Gui.Document document, int offset, out DomRegion expressionRegion)
-		{

-			if (document == null)

+		public static ISymbol GetLanguageItem (this Document document, int offset, out DocumentRegion expressionRegion)
+		{
+			if (document == null)
 				throw new System.ArgumentNullException ("document");
 
-			var textEditorResolver = TextEditorResolverService.GetProvider (document.Editor.Document.MimeType);
+			var textEditorResolver = TextEditorResolverService.GetProvider (document.Editor.MimeType);
 			if (textEditorResolver != null) {
 				return textEditorResolver.GetLanguageItem (document, offset, out expressionRegion);
 			}
-			expressionRegion = DomRegion.Empty;
+			expressionRegion = DocumentRegion.Empty;
 			return null;
 		}
 	}