Merge branch 'master' of https://github.com/PowerShell/PSReadLine into sqliteHistory

Author: jshigetomi

.gitignore

@@ -9,9 +9,6 @@ PSReadline.zip
 [Oo]bj/
 .ionide/
 
-# VSCode directories that are not at the repository root
-/**/.vscode/
-
 # mstest test results
 TestResults
 FakesAssemblies/

.vscode/launch.json

@@ -4,7 +4,24 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-
+        {
+            "name": "Launch PSReadLine",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "pwsh",
+            "args": [
+                "-NonInteractive",
+                "-NoProfile",
+                "-NoExit",
+                "-Command",
+                "Import-Module '${workspaceFolder}/PSReadLine/bin/Debug/netstandard2.0/PSReadLine.psd1'"
+            ],
+            "console": "integratedTerminal",
+            "justMyCode": false,
+            "suppressJITOptimizations": true,
+            "enableStepFiltering": false,
+            "preLaunchTask": "Build",
+        },
         {
             "name": ".NET Core Attach",
             "type": "coreclr",
@@ -16,4 +33,4 @@
             }
         }
     ]
-}
+}

.vscode/tasks.json

@@ -0,0 +1,90 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+        {
+            "label": "Bootstrap",
+            "type": "shell",
+            "command": "pwsh",
+            "args": [
+                "./build.ps1",
+                "-Bootstrap"
+            ],
+            "group": "build",
+            "detail": "Install build prerequisites (InvokeBuild, .NET SDK)"
+        },
+        {
+            "label": "Build",
+            "type": "shell",
+            "command": "pwsh",
+            "args": [
+                "./build.ps1",
+                "-Configuration",
+                "${input:configuration}"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$msCompile"
+            ],
+            "detail": "Build with user-selected configuration"
+        },
+        {
+            "label": "Run Tests",
+            "type": "shell",
+            "command": "pwsh",
+            "args": [
+                "./build.ps1",
+                "-Test",
+                "-Configuration",
+                "${input:configuration}",
+                "-Framework",
+                "${input:framework}"
+            ],
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "presentation": {
+                "focus": true,
+                "panel": "dedicated",
+                "clear": true
+            },
+            "detail": "Run unit tests with selected configuration and framework"
+        },
+        {
+            "label": "Clean",
+            "type": "shell",
+            "command": "pwsh",
+            "args": [
+                "./build.ps1",
+                "-Clean"
+            ],
+            "group": "build",
+            "detail": "Clean build artifacts"
+        }
+    ],
+    "inputs": [
+        {
+            "id": "configuration",
+            "description": "Build Configuration",
+            "type": "pickString",
+            "options": [
+                "Debug",
+                "Release"
+            ],
+            "default": "Debug"
+        },
+        {
+            "id": "framework",
+            "description": "Target Framework",
+            "type": "pickString",
+            "options": [
+                "net472",
+                "net6.0"
+            ],
+            "default": "net6.0"
+        }
+    ]
+}

PSReadLine/ReadLine.cs

@@ -1047,16 +1047,28 @@ public static void DigitArgument(ConsoleKeyInfo? key = null, object arg = null)
         public static void InvokePrompt(ConsoleKeyInfo? key = null, object arg = null)
         {
             var console = _singleton._console;
-            console.CursorVisible = false;
 
             if (arg is int newY)
             {
+                if (newY < 0 || newY >= console.BufferHeight)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(arg));
+                }
+
+                console.CursorVisible = false;
                 console.SetCursorPosition(0, newY);
             }
             else
             {
                 newY = _singleton._initialY - _singleton._options.ExtraPromptLineCount;
 
+                // Silently return if user has implicitly requested an impossible prompt invocation.
+                if (newY < 0)
+                {
+                    return;
+                }
+
+                console.CursorVisible = false;
                 console.SetCursorPosition(0, newY);
 
                 // We need to rewrite the prompt, so blank out everything from a previous prompt invocation

PSReadLine/SamplePSReadLineProfile.ps1

@@ -522,7 +522,7 @@ Set-PSReadLineKeyHandler -Key F1 `
 
 #
 # Ctrl+Shift+j then type a key to mark the current directory.
-# Ctrj+j then the same key will change back to that directory without
+# Ctrl+j then the same key will change back to that directory without
 # needing to type cd and won't change the command line.
 
 #