Skip to content

Change debugger type field back to "PowerShell" from powershell #1773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
],
"debuggers": [
{
"type": "powershell",
"type": "PowerShell",
"label": "PowerShell",
"enableBreakpointsFor": {
"languageIds": [
Expand All @@ -329,7 +329,7 @@
"description": "Launch current file (in active editor window) under debugger",
"body": {
"name": "PowerShell Launch Current File",
"type": "powershell",
"type": "PowerShell",
"request": "launch",
"script": "^\"\\${file}\"",
"args": [],
Expand All @@ -341,7 +341,7 @@
"description": "Launch current file (in active editor window) under debugger in a temporary Integrated Console.",
"body": {
"name": "PowerShell Launch Current File in Temporary Console",
"type": "powershell",
"type": "PowerShell",
"request": "launch",
"script": "^\"\\${file}\"",
"args": [],
Expand All @@ -354,7 +354,7 @@
"description": "Launch current file (in active editor window) under debugger, prompting first for script arguments",
"body": {
"name": "PowerShell Launch Current File w/Args Prompt",
"type": "powershell",
"type": "PowerShell",
"request": "launch",
"script": "^\"\\${file}\"",
"args": [
Expand All @@ -368,7 +368,7 @@
"description": "Launch specified script or path to script under debugger",
"body": {
"name": "PowerShell Launch ${Script}",
"type": "powershell",
"type": "PowerShell",
"request": "launch",
"script": "^\"\\${workspaceFolder}/${Script}\"",
"args": [],
Expand All @@ -380,7 +380,7 @@
"description": "Invokes Pester tests under debugger",
"body": {
"name": "PowerShell Pester Tests",
"type": "powershell",
"type": "PowerShell",
"request": "launch",
"script": "Invoke-Pester",
"args": [],
Expand All @@ -392,7 +392,7 @@
"description": "Open host process picker to select process to attach debugger to",
"body": {
"name": "PowerShell Attach to Host Process",
"type": "powershell",
"type": "PowerShell",
"request": "attach",
"processId": "^\"\\${command:PickPSHostProcess}\"",
"runspaceId": 1
Expand All @@ -403,7 +403,7 @@
"description": "Start interactive session (Debug Console) under debugger",
"body": {
"name": "PowerShell Interactive Session",
"type": "powershell",
"type": "PowerShell",
"request": "launch",
"cwd": ""
}
Expand Down
5 changes: 3 additions & 2 deletions src/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,9 @@ export class SessionManager implements Middleware {
if (!this.suppressRestartPrompt &&
(settings.useX86Host !== this.sessionSettings.useX86Host ||
settings.powerShellExePath.toLowerCase() !== this.sessionSettings.powerShellExePath.toLowerCase() ||
settings.developer.powerShellExePath.toLowerCase() !==
this.sessionSettings.developer.powerShellExePath.toLowerCase() ||
(settings.developer.powerShellExePath ? settings.developer.powerShellExePath.toLowerCase() : null) !==
Copy link
Contributor Author

@rkeithhill rkeithhill Feb 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really wish TypeScript had C#'s ?! operator.

(this.sessionSettings.developer.powerShellExePath
? this.sessionSettings.developer.powerShellExePath.toLowerCase() : null) ||
settings.developer.editorServicesLogLevel.toLowerCase() !==
this.sessionSettings.developer.editorServicesLogLevel.toLowerCase() ||
settings.developer.bundledModulesPath.toLowerCase() !==
Expand Down