Refactoring: Update for Roslyn API changes

Author: sandyarmstrong

main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RefactoryCommands.cs

@@ -109,10 +109,11 @@ internal static async Task SortAndRemoveUnusedImports (Document originalDocument
 			var workspace = originalDocument.Project.Solution.Workspace;
 
 			var unnecessaryImportsService = originalDocument.GetLanguageService<IRemoveUnnecessaryImportsService> ();
+			var organizeImportsService = originalDocument.GetLanguageService<IOrganizeImportsService> ();
 
 			// Remove unnecessary imports and sort them
 			var removedImportsDocument = await unnecessaryImportsService.RemoveUnnecessaryImportsAsync (originalDocument, cancellationToken);
-			var resultDocument = await OrganizeImportsService.OrganizeImportsAsync (removedImportsDocument, cancellationToken);
+			var resultDocument = await organizeImportsService.OrganizeImportsAsync (removedImportsDocument, cancellationToken);
 
 			// Apply the document change if needed
 			if (resultDocument != originalDocument) {

main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/StreamingFindUsagesPresenter.cs

@@ -24,6 +24,11 @@ public FindUsagesContext StartSearch (string title, bool supportsReferences)
 		{
 			return new MonoDevelopFindUsagesContext ();
 		}
+
+		public FindUsagesContext StartSearchWithCustomColumns(string title, bool supportsReferences, bool includeContainingTypeAndMemberColumns, bool includeKindColumn)
+		{
+			return StartSearch(title, supportsReferences);
+		}
 	}
 
 	sealed class MonoDevelopFindUsagesContext : FindUsagesContext