Update EnsureTheCaretIsVisibleAfterALongEdit to account for larger mo…

…nitors See #33822
dotnet · Mar 2, 2019 · cc9076c · cc9076c
1 parent 30c3dc6
commit cc9076c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 9 deletions.
diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpIntelliSense.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpIntelliSense.cs
@@ -330,26 +330,31 @@ int P { get { $$} }
 assertCaretPosition: true);
         }
 
-        [WpfFact, Trait(Traits.Feature, Traits.Features.Completion)]
+        [ConditionalWpfFact(typeof(LegacyCompletionCondition)), Trait(Traits.Feature, Traits.Features.Completion)]
+        [WorkItem(33822, "https://github.com/dotnet/roslyn/issues/33822")]
         public void EnsureTheCaretIsVisibleAfterALongEdit()
         {
-            SetUpEditor(@"
+            var visibleColumns = VisualStudio.Editor.GetVisibleColumnCount();
+            var variableName = new string('a', (int)(0.75 * visibleColumns));
+            SetUpEditor($@"
 public class Program
-{
+{{
     static void Main(string[] args)
-    {
-        var aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = 0;
-        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = $$
-    }
-}");
+    {{
+        var {variableName} = 0;
+        {variableName} = $$
+    }}
+}}");
 
+            Assert.True(variableName.Length > 0);
             VisualStudio.Editor.SendKeys(
                 VirtualKey.Delete,
                 "aaa",
                 VirtualKey.Tab);
             var actualText = VisualStudio.Editor.GetText();
-            Assert.Contains("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", actualText);
+            Assert.Contains($"{variableName} = {variableName}", actualText);
             Assert.True(VisualStudio.Editor.IsCaretOnScreen());
+            Assert.True(VisualStudio.Editor.GetCaretColumn() > visibleColumns, "This test is inconclusive if the view didn't need to move to keep the caret on screen.");
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.Completion)]

diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/TextViewWindow_InProc.cs b/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/TextViewWindow_InProc.cs
@@ -132,6 +132,14 @@ public string[] GetCurrentClassifications()
                 }
             });
 
+        public int GetVisibleColumnCount()
+        {
+            return ExecuteOnActiveView(view =>
+            {
+                return (int)Math.Ceiling(view.ViewportWidth / Math.Max(view.FormattedLineSource.ColumnWidth, 1));
+            });
+        }
+
         public void PlaceCaret(
             string marker,
             int charsOffset,
@@ -211,6 +219,16 @@ public int GetCaretPosition()
                 return bufferPosition.Position;
             });
 
+        public int GetCaretColumn()
+        {
+            return ExecuteOnActiveView(view =>
+            {
+                var startOfLine = view.Caret.ContainingTextViewLine.Start.Position;
+                var caretVirtualPosition = view.Caret.Position.VirtualBufferPosition;
+                return caretVirtualPosition.Position - startOfLine + caretVirtualPosition.VirtualSpaces;
+            });
+        }
+
         protected T ExecuteOnActiveView<T>(Func<IWpfTextView, T> action)
             => InvokeOnUIThread(() =>
             {

diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/OutOfProcess/TextViewWindow_OutOfProc.cs b/src/VisualStudio/IntegrationTest/TestUtilities/OutOfProcess/TextViewWindow_OutOfProc.cs
@@ -26,12 +26,18 @@ internal TextViewWindow_OutOfProc(VisualStudioInstance visualStudioInstance)
         public int GetCaretPosition()
             => _textViewWindowInProc.GetCaretPosition();
 
+        public int GetCaretColumn()
+            => _textViewWindowInProc.GetCaretColumn();
+
         public string[] GetCompletionItems()
         {
             WaitForCompletionSet();
             return _textViewWindowInProc.GetCompletionItems();
         }
 
+        public int GetVisibleColumnCount()
+            => _textViewWindowInProc.GetVisibleColumnCount();
+
         public void PlaceCaret(
             string marker,
             int charsOffset = 0,