Merge pull request #33827 from sharwell/caret-visible

sharwell · web-flow · commit 68db1a0f2fce · 2019-03-08T11:25:36.000-06:00
Ensure the caret is visible after commit
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompletion/CommitManager.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompletion/CommitManager.cs
@@ -213,6 +213,10 @@ private AsyncCompletionData.CommitBehavior Commit(
                     {
                         view.TryMoveCaretToAndEnsureVisible(new SnapshotPoint(subjectBuffer.CurrentSnapshot, mappedSpan.Start.Position + adjustedNewText.Length));
                     }
+                    else
+                    {
+                        view.Caret.EnsureVisible();
+                    }
                 }
 
                 includesCommitCharacter = change.IncludesCommitCharacter;
diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpIntelliSense.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpIntelliSense.cs
@@ -331,7 +331,7 @@ int P { get { $$} }
 assertCaretPosition: true);
         }
 
-        [ConditionalWpfFact(typeof(LegacyCompletionCondition)), Trait(Traits.Feature, Traits.Features.Completion)]
+        [WpfFact, Trait(Traits.Feature, Traits.Features.Completion)]
         [WorkItem(33822, "https://github.com/dotnet/roslyn/issues/33822")]
         public void EnsureTheCaretIsVisibleAfterALongEdit()
         {

Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,10 @@ private AsyncCompletionData.CommitBehavior Commit(`
`213`	`213`	`{`
`214`	`214`	`view.TryMoveCaretToAndEnsureVisible(new SnapshotPoint(subjectBuffer.CurrentSnapshot, mappedSpan.Start.Position + adjustedNewText.Length));`
`215`	`215`	`}`
	`216`	`+ else`
	`217`	`+ {`
	`218`	`+ view.Caret.EnsureVisible();`
	`219`	`+ }`
`216`	`220`	`}`
`217`	`221`
`218`	`222`	`includesCommitCharacter = change.IncludesCommitCharacter;`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ int P { get { $$} }`
`331`	`331`	`assertCaretPosition: true);`
`332`	`332`	`}`
`333`	`333`
`334`		`- [ConditionalWpfFact(typeof(LegacyCompletionCondition)), Trait(Traits.Feature, Traits.Features.Completion)]`
	`334`	`+ [WpfFact, Trait(Traits.Feature, Traits.Features.Completion)]`
`335`	`335`	`[WorkItem(33822, "https://github.com/dotnet/roslyn/issues/33822")]`
`336`	`336`	`public void EnsureTheCaretIsVisibleAfterALongEdit()`
`337`	`337`	`{`