Move the 'application/validation/resolution' portion of rename OOP.

src/EditorFeatures/Core.Wpf/InlineRename/AbstractEditorInlineRenameService.InlineRenameLocationSet.cs

@@ -11,6 +11,7 @@
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Rename;
 using Microsoft.CodeAnalysis.Rename.ConflictEngine;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
 {
@@ -43,8 +44,7 @@ public async Task<IInlineRenameReplacementInfo> GetReplacementsAsync(string repl
                 var conflicts = await _renameLocationSet.ResolveConflictsAsync(
                     _renameInfo.GetFinalSymbolName(replacementText), nonConflictSymbols: null, cancellationToken: cancellationToken).ConfigureAwait(false);
 
-                if (conflicts.ErrorMessage != null)
-                    throw new ArgumentException(conflicts.ErrorMessage);
+                Contract.ThrowIfTrue(conflicts.ErrorMessage != null);
 
                 return new InlineRenameReplacementInfo(conflicts);
             }

src/EditorFeatures/Core/Implementation/EncapsulateField/AbstractEncapsulateFieldCommandHandler.cs

@@ -64,7 +64,7 @@ private bool Execute(EncapsulateFieldCommandArgs args, IUIThreadOperationScope w
 
             var service = document.GetLanguageService<AbstractEncapsulateFieldService>();
 
-            var result = service.EncapsulateFieldAsync(document, spans.First().Span.ToTextSpan(), true, cancellationToken).WaitAndGetResult(cancellationToken);
+            var result = service.EncapsulateFieldsInSpanAsync(document, spans.First().Span.ToTextSpan(), true, cancellationToken).WaitAndGetResult(cancellationToken);
 
             // We are about to show a modal UI dialog so we should take over the command execution
             // wait context. That means the command system won't attempt to show its own wait dialog 
@@ -91,8 +91,8 @@ private bool Execute(EncapsulateFieldCommandArgs args, IUIThreadOperationScope w
                     string.Format(EditorFeaturesResources.Preview_Changes_0, EditorFeaturesResources.Encapsulate_Field),
                      "vs.csharp.refactoring.preview",
                     EditorFeaturesResources.Encapsulate_Field_colon,
-                    result.GetNameAsync(cancellationToken).WaitAndGetResult(cancellationToken),
-                    result.GetGlyphAsync(cancellationToken).WaitAndGetResult(cancellationToken),
+                    result.Name,
+                    result.Glyph,
                     finalSolution,
                     document.Project.Solution);
             }

src/EditorFeatures/Test2/Rename/RenameEngineResult.vb

@@ -49,7 +49,8 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
                 workspaceXml As XElement,
                 renameTo As String,
                 host As TestHost,
-                Optional changedOptionSet As Dictionary(Of OptionKey, Object) = Nothing) As RenameEngineResult
+                Optional changedOptionSet As Dictionary(Of OptionKey, Object) = Nothing,
+                Optional expectFailure As Boolean = False) As RenameEngineResult
             Dim workspace = TestWorkspace.CreateWorkspace(workspaceXml)
             workspace.SetTestLogger(AddressOf helper.WriteLine)
 
@@ -84,8 +85,12 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
                     workspace.CurrentSolution, symbol, optionSet, CancellationToken.None).Result
 
                 Dim result = locations.ResolveConflictsAsync(renameTo, nonConflictSymbols:=Nothing, cancellationToken:=CancellationToken.None).GetAwaiter().GetResult()
-                If result.ErrorMessage IsNot Nothing Then
-                    Throw New ArgumentException(result.ErrorMessage)
+
+                If expectFailure Then
+                    Assert.NotNull(result.ErrorMessage)
+                    Return engineResult
+                Else
+                    Assert.Null(result.ErrorMessage)
                 End If
 
                 engineResult = New RenameEngineResult(workspace, result, renameTo)
@@ -188,12 +193,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
                 ElseIf isRenameWithinStringOrComment AndAlso newToken.FullSpan.Contains(newLocation) Then
                     newText = newToken.ToFullString().Substring(newLocation.Start - newToken.FullSpan.Start, newLocation.Length)
                 Else
-                    Dim newNode = newToken.Parent
-                    While (newNode IsNot Nothing AndAlso newNode.Span <> newLocation)
-                        newNode = newNode.Parent
-                    End While
-
-                    newText = newNode.ToString()
+                    newText = newTree.GetText().ToString(newLocation)
                 End If
 
                 Assert.Equal(replacementText, newText)

src/EditorFeatures/Test2/Rename/RenameEngineTests.vb

@@ -3672,11 +3672,10 @@ Class C
         <WorkItem(627297, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/627297")>
         <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.Rename)>
         Public Sub Bug622086_CSRenameVarNotSupported(host As TestHost)
-            Assert.ThrowsAny(Of ArgumentException)(Sub()
-                                                       Dim result = RenameEngineResult.Create(_outputHelper,
-                <Workspace>
-                    <Project Language="C#" AssemblyName="Project1" CommonReferences="true">
-                        <Document><![CDATA[
+            Dim result = RenameEngineResult.Create(_outputHelper,
+<Workspace>
+    <Project Language="C#" AssemblyName="Project1" CommonReferences="true">
+        <Document><![CDATA[
 using System;
 
 namespace X
@@ -3691,9 +3690,8 @@ namespace X
 }
 ]]>]
                         </Document>
-                    </Project>
-                </Workspace>, host:=host, renameTo:="Int32")
-                                                   End Sub)
+    </Project>
+</Workspace>, host:=host, renameTo:="Int32", expectFailure:=True)
         End Sub
 
         <WorkItem(627297, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/627297")>
@@ -3731,11 +3729,10 @@ namespace X
         <WorkItem(627297, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/627297")>
         <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.Rename)>
         Public Sub Bug622086_CSRenameDynamicNotSupported(host As TestHost)
-            Assert.ThrowsAny(Of ArgumentException)(Sub()
-                                                       Dim result = RenameEngineResult.Create(_outputHelper,
-                <Workspace>
-                    <Project Language="C#" AssemblyName="Project1" CommonReferences="true">
-                        <Document><![CDATA[
+            Dim result = RenameEngineResult.Create(_outputHelper,
+<Workspace>
+    <Project Language="C#" AssemblyName="Project1" CommonReferences="true">
+        <Document><![CDATA[
 using System;
 
 namespace X
@@ -3750,9 +3747,8 @@ namespace X
 }
 ]]>]
                         </Document>
-                    </Project>
-                </Workspace>, host:=host, renameTo:="Int32")
-                                                   End Sub)
+    </Project>
+</Workspace>, host:=host, renameTo:="Int32", expectFailure:=True)
         End Sub
 
         <WorkItem(627297, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/627297")>

src/EditorFeatures/TestUtilities/InProcRemoteHostClientFactory.cs

@@ -18,7 +18,7 @@ namespace Microsoft.CodeAnalysis.Test.Utilities.RemoteHost
 {
     internal static class RemoteHostOptions
     {
-        public static readonly Option<bool> RemoteHostTest = new Option<bool>(
+        public static readonly Option2<bool> RemoteHostTest = new Option2<bool>(
             nameof(RemoteHostOptions), nameof(RemoteHostTest), defaultValue: false);
     }