Revert "Set the cursor to the place where a user hits tab key (#7023)"

daxian-dbw · web-flow · commit c90f53fac2e4 · 2018-06-19T10:54:48.000-07:00
This reverts commit 8805ca2.
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs
@@ -97,12 +97,6 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt
                 // Update the progress pane only when the timer set up the update flag or WriteProgress is completed.
                 // As a result, we do not block WriteProgress and whole script and eliminate unnecessary console locks and updates.
                 _progPane.Show(_pendingProgress);
-
-                // Reset the cursor back to where it started
-                if (record.RecordType == ProgressRecordType.Completed)
-                {
-                    _progPane.Hide();
-                }
             }
         }
 
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs
@@ -99,20 +99,12 @@ class ProgressPane
 
                 //if the cursor is at the bottom, create screen buffer space by scrolling
                 int scrollRows = rows - ((_rawui.BufferSize.Height - 1) - _location.Y);
+                for (int i = 0; i < rows; i++)
+                {
+                    Console.Out.Write('\n');
+                }
                 if (scrollRows > 0)
                 {
-                    // The following can be possibly replaced by Console.Write ("\x1b[" + scrollRows + "S");
-                    // For details, see https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
-
-                    // Scroll the console screen up by 'scrollRows'
-                    var bottomLocation = _location;
-                    bottomLocation.Y = _rawui.BufferSize.Height;
-                    _rawui.CursorPosition = bottomLocation;
-                    for (int i = 0; i < scrollRows; i++)
-                    {
-                        Console.Out.Write('\n');
-                    }
-
                     _location.Y -= scrollRows;
                     _savedCursor.Y -= scrollRows;
                 }
diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -2252,7 +2252,7 @@ internal void ThrowIfWriteNotPermitted(bool needsToWriteToPipeline)
             {
                 // Only generate these exceptions if a pipeline has already been declared as the 'writing' pipeline.
                 // Otherwise, these are probably infrastructure messages and can be ignored.
-                if (this.PipelineProcessor?._permittedToWrite != null)
+                if (this.PipelineProcessor._permittedToWrite != null)
                 {
                     throw PSTraceSource.NewInvalidOperationException(
                         PipelineStrings.WriteNotPermitted);

Original file line number	Diff line number	Diff line change
`@@ -97,12 +97,6 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt`
`97`	`97`	`// Update the progress pane only when the timer set up the update flag or WriteProgress is completed.`
`98`	`98`	`// As a result, we do not block WriteProgress and whole script and eliminate unnecessary console locks and updates.`
`99`	`99`	`_progPane.Show(_pendingProgress);`
`100`		`-`
`101`		`- // Reset the cursor back to where it started`
`102`		`- if (record.RecordType == ProgressRecordType.Completed)`
`103`		`- {`
`104`		`- _progPane.Hide();`
`105`		`- }`
`106`	`100`	`}`
`107`	`101`	`}`
`108`	`102`
Original file line number	Diff line number	Diff line change
`@@ -2252,7 +2252,7 @@ internal void ThrowIfWriteNotPermitted(bool needsToWriteToPipeline)`
`2252`	`2252`	`{`
`2253`	`2253`	`// Only generate these exceptions if a pipeline has already been declared as the 'writing' pipeline.`
`2254`	`2254`	`// Otherwise, these are probably infrastructure messages and can be ignored.`
`2255`		`- if (this.PipelineProcessor?._permittedToWrite != null)`
	`2255`	`+ if (this.PipelineProcessor._permittedToWrite != null)`
`2256`	`2256`	`{`
`2257`	`2257`	`throw PSTraceSource.NewInvalidOperationException(`
`2258`	`2258`	`PipelineStrings.WriteNotPermitted);`