diff --git a/.gitignore b/.gitignore
index ad235ecf73..9b9b8027fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,4 @@ npm-debug.log
.vscode-test/
*.DS_Store
test-results.xml
-vscode.d.ts
test/.vscode/settings.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
index a5cedb6ca6..e27b257da4 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -38,7 +38,6 @@
"runtimeExecutable": "${execPath}",
"args": [
"--disable-extensions",
- "--enable-proposed-api",
"ms-vscode.powershell-preview",
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/out/test/testRunner.js",
diff --git a/package-lock.json b/package-lock.json
index 2f178189c1..772dfaac4d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "powershell-preview",
- "version": "2020.9.0",
+ "version": "2021.2.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -1379,12 +1379,6 @@
"integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==",
"dev": true
},
- "kleur": {
- "version": "3.0.3",
- "resolved": "https://botbuilder.myget.org/F/botframework-cli/npm/kleur/-/kleur-3.0.3.tgz",
- "integrity": "sha1-p5yezIbuHOP6YgbRIWxQHxR/wH4=",
- "dev": true
- },
"leven": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -2008,16 +2002,6 @@
"integrity": "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg=",
"dev": true
},
- "prompts": {
- "version": "2.4.0",
- "resolved": "https://botbuilder.myget.org/F/botframework-cli/npm/prompts/-/prompts-2.4.0.tgz",
- "integrity": "sha1-SqXeByOiMdHukSHED99mPfc/Ydc=",
- "dev": true,
- "requires": {
- "kleur": "^3.0.3",
- "sisteransi": "^1.0.5"
- }
- },
"punycode": {
"version": "2.1.1",
"resolved": "https://botbuilder.myget.org/F/botframework-cli/npm/punycode/-/punycode-2.1.1.tgz",
@@ -2224,12 +2208,6 @@
}
}
},
- "sisteransi": {
- "version": "1.0.5",
- "resolved": "https://botbuilder.myget.org/F/botframework-cli/npm/sisteransi/-/sisteransi-1.0.5.tgz",
- "integrity": "sha1-E01oEpd1ZDfMBcoBNw06elcQde0=",
- "dev": true
- },
"slice-ansi": {
"version": "2.1.0",
"resolved": "https://botbuilder.myget.org/F/botframework-cli/npm/slice-ansi/-/slice-ansi-2.1.0.tgz",
@@ -2591,48 +2569,6 @@
}
}
},
- "vscode-dts": {
- "version": "0.3.1",
- "resolved": "https://botbuilder.myget.org/F/botframework-cli/npm/vscode-dts/-/vscode-dts-0.3.1.tgz",
- "integrity": "sha1-BwVUp/yar16FRmoFGb8yBnMIzfQ=",
- "dev": true,
- "requires": {
- "minimist": "^1.2.0",
- "prompts": "^2.1.0",
- "rimraf": "^3.0.0"
- },
- "dependencies": {
- "glob": {
- "version": "7.1.6",
- "resolved": "https://botbuilder.myget.org/F/botframework-cli/npm/glob/-/glob-7.1.6.tgz",
- "integrity": "sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=",
- "dev": true,
- "requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- }
- },
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://botbuilder.myget.org/F/botframework-cli/npm/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=",
- "dev": true
- },
- "rimraf": {
- "version": "3.0.2",
- "resolved": "https://botbuilder.myget.org/F/botframework-cli/npm/rimraf/-/rimraf-3.0.2.tgz",
- "integrity": "sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho=",
- "dev": true,
- "requires": {
- "glob": "^7.1.3"
- }
- }
- }
- },
"vscode-extension-telemetry": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.6.tgz",
diff --git a/package.json b/package.json
index 3bd6c22144..28c1864ad9 100644
--- a/package.json
+++ b/package.json
@@ -43,11 +43,7 @@
"onCommand:PowerShell.RegisterExternalExtension",
"onCommand:PowerShell.UnregisterExternalExtension",
"onCommand:PowerShell.GetPowerShellVersionDetails",
- "onView:PowerShellCommands",
- "onNotebook:PowerShellNotebookModeDefault",
- "onNotebookEditor:PowerShellNotebookModeDefault",
- "onNotebook:PowerShellNotebookModeOption",
- "onNotebookEditor:PowerShellNotebookModeOption"
+ "onView:PowerShellCommands"
],
"dependencies": {
"node-fetch": "~2.6.1",
@@ -77,7 +73,6 @@
"tslint": "~6.1.3",
"typescript": "~4.1.5",
"vsce": "~1.85.0",
- "vscode-dts": "~0.3.1",
"vscode-test": "~1.4.0"
},
"extensionDependencies": [
@@ -86,8 +81,7 @@
"scripts": {
"compile": "tsc -v && tsc -p ./ && tslint -p ./",
"compile-watch": "tsc -watch -p ./",
- "test": "node ./out/test/runTests.js",
- "download-api": "vscode-dts dev"
+ "test": "node ./out/test/runTests.js"
},
"contributes": {
"breakpoints": [
@@ -113,29 +107,6 @@
}
]
},
- "notebookProvider": [
- {
- "viewType": "PowerShellNotebookModeDefault",
- "displayName": "Powershell Notebook",
- "selector": [
- {
- "filenamePattern": "*.[Nn]otebook.ps1"
- }
- ],
- "priority": "default"
- },
- {
- "viewType": "PowerShellNotebookModeOption",
- "displayName": "Powershell Notebook",
- "selector": [
- {
- "excludeFileNamePattern": "*.Notebook.ps1",
- "filenamePattern": "*.ps1"
- }
- ],
- "priority": "option"
- }
- ],
"keybindings": [
{
"command": "PowerShell.ShowHelp",
@@ -231,24 +202,6 @@
"dark": "resources/dark/play.svg"
}
},
- {
- "command": "PowerShell.EnableNotebookMode",
- "title": "(Preview) Enable Notebook Mode",
- "category": "PowerShell",
- "icon": {
- "light": "resources/light/book.svg",
- "dark": "resources/dark/book.svg"
- }
- },
- {
- "command": "PowerShell.DisableNotebookMode",
- "title": "(Preview) Disable Notebook Mode",
- "category": "PowerShell",
- "icon": {
- "light": "resources/light/file-code.svg",
- "dark": "resources/dark/file-code.svg"
- }
- },
{
"command": "PowerShell.RestartSession",
"title": "Restart Current Session",
@@ -424,16 +377,6 @@
"when": "editorLangId == powershell && config.powershell.buttons.showRunButtons",
"command": "PowerShell.RunSelection",
"group": "navigation@101"
- },
- {
- "when": "editorLangId == powershell && config.powershell.notebooks.showToggleButton",
- "command": "PowerShell.EnableNotebookMode",
- "group": "navigation@102"
- },
- {
- "when": "resourceLangId == powershell && notebookEditorFocused",
- "command": "PowerShell.DisableNotebookMode",
- "group": "navigation@102"
}
],
"editor/title/context": [
@@ -949,20 +892,6 @@
"type": "boolean",
"default": false,
"description": "Show buttons in the editor titlebar for moving the panel around."
- },
- "powershell.notebooks.showToggleButton": {
- "type": "boolean",
- "default": false,
- "description": "Controls whether we show or hide the buttons to toggle Notebook mode in the top right."
- },
- "powershell.notebooks.saveMarkdownCellsAs": {
- "type": "string",
- "enum": [
- "BlockComment",
- "LineComment"
- ],
- "default": "BlockComment",
- "description": "Controls what new markdown cells in Notebook Mode get saved as in the PowerShell file."
}
}
},
diff --git a/resources/dark/book.svg b/resources/dark/book.svg
deleted file mode 100644
index 4d433d56e3..0000000000
--- a/resources/dark/book.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/resources/dark/file-code.svg b/resources/dark/file-code.svg
deleted file mode 100644
index d2a7c4eab0..0000000000
--- a/resources/dark/file-code.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/resources/light/book.svg b/resources/light/book.svg
deleted file mode 100644
index 95a115b2e0..0000000000
--- a/resources/light/book.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/resources/light/file-code.svg b/resources/light/file-code.svg
deleted file mode 100644
index cb42220622..0000000000
--- a/resources/light/file-code.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/test/features/testNotebookFiles/blockCommentsWithTextOnSameLine.ps1 b/test/features/testNotebookFiles/blockCommentsWithTextOnSameLine.ps1
deleted file mode 100644
index d1f2bf7133..0000000000
--- a/test/features/testNotebookFiles/blockCommentsWithTextOnSameLine.ps1
+++ /dev/null
@@ -1,20 +0,0 @@
-<#
-Foo
-bar
-baz
-#>
-Get-ChildItem
-<# ========
-# A
-========= #>
-Get-ChildItem
-<# ========
-# B
-#>
-Get-ChildItem
-<#
-# C
-========= #>
-Get-ChildItem
-<# D #>
-Get-ChildItem
\ No newline at end of file
diff --git a/test/features/testNotebookFiles/onlyCode.ps1 b/test/features/testNotebookFiles/onlyCode.ps1
deleted file mode 100644
index 916d38265f..0000000000
--- a/test/features/testNotebookFiles/onlyCode.ps1
+++ /dev/null
@@ -1 +0,0 @@
-Get-ChildItem
diff --git a/test/features/testNotebookFiles/onlyMarkdown.ps1 b/test/features/testNotebookFiles/onlyMarkdown.ps1
deleted file mode 100644
index fa2d22dd81..0000000000
--- a/test/features/testNotebookFiles/onlyMarkdown.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-# # h1
-# **bold**
-# text
\ No newline at end of file
diff --git a/test/features/testNotebookFiles/simple.Notebook.ps1 b/test/features/testNotebookFiles/simple.Notebook.ps1
deleted file mode 100644
index b213540649..0000000000
--- a/test/features/testNotebookFiles/simple.Notebook.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-# asdf
-gci
diff --git a/test/features/testNotebookFiles/simpleBlockComments.ps1 b/test/features/testNotebookFiles/simpleBlockComments.ps1
deleted file mode 100644
index 5183f4e135..0000000000
--- a/test/features/testNotebookFiles/simpleBlockComments.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-<#
-Foo
-bar
-baz
-#>
-Get-ChildItem
-<#
-Foo
-bar
-baz
-#>
\ No newline at end of file
diff --git a/test/features/testNotebookFiles/simpleLineComments.ps1 b/test/features/testNotebookFiles/simpleLineComments.ps1
deleted file mode 100644
index 39943e3e04..0000000000
--- a/test/features/testNotebookFiles/simpleLineComments.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-# Foo
-# bar
-# baz
-Get-ChildItem
-# Foo
-# bar
-# baz
\ No newline at end of file
diff --git a/test/features/testNotebookFiles/simpleMixedComments.ps1 b/test/features/testNotebookFiles/simpleMixedComments.ps1
deleted file mode 100644
index 48a855d9bc..0000000000
--- a/test/features/testNotebookFiles/simpleMixedComments.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-# Foo
-# bar
-# baz
-Get-ChildItem
-<#
-Foo
-bar
-baz
-#>
\ No newline at end of file