Skip to content

Commit 8700ee0

Browse files
Remove the rest of the experimental Notebook API (PowerShell#3212)
Resolves PowerShell#3209. I missed quite a bit when removing the codebase, but this should be the last of it. Also updates the `package-lock.json` with the bumped version.
1 parent c2d01ef commit 8700ee0

15 files changed

+3
-205
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ npm-debug.log
1414
.vscode-test/
1515
*.DS_Store
1616
test-results.xml
17-
vscode.d.ts
1817
test/.vscode/settings.json

.vscode/launch.json

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"runtimeExecutable": "${execPath}",
3939
"args": [
4040
"--disable-extensions",
41-
"--enable-proposed-api",
4241
"ms-vscode.powershell-preview",
4342
"--extensionDevelopmentPath=${workspaceFolder}",
4443
"--extensionTestsPath=${workspaceFolder}/out/test/testRunner.js",

package-lock.json

+1-65
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-73
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@
4343
"onCommand:PowerShell.RegisterExternalExtension",
4444
"onCommand:PowerShell.UnregisterExternalExtension",
4545
"onCommand:PowerShell.GetPowerShellVersionDetails",
46-
"onView:PowerShellCommands",
47-
"onNotebook:PowerShellNotebookModeDefault",
48-
"onNotebookEditor:PowerShellNotebookModeDefault",
49-
"onNotebook:PowerShellNotebookModeOption",
50-
"onNotebookEditor:PowerShellNotebookModeOption"
46+
"onView:PowerShellCommands"
5147
],
5248
"dependencies": {
5349
"node-fetch": "~2.6.1",
@@ -77,7 +73,6 @@
7773
"tslint": "~6.1.3",
7874
"typescript": "~4.1.5",
7975
"vsce": "~1.85.0",
80-
"vscode-dts": "~0.3.1",
8176
"vscode-test": "~1.4.0"
8277
},
8378
"extensionDependencies": [
@@ -86,8 +81,7 @@
8681
"scripts": {
8782
"compile": "tsc -v && tsc -p ./ && tslint -p ./",
8883
"compile-watch": "tsc -watch -p ./",
89-
"test": "node ./out/test/runTests.js",
90-
"download-api": "vscode-dts dev"
84+
"test": "node ./out/test/runTests.js"
9185
},
9286
"contributes": {
9387
"breakpoints": [
@@ -113,29 +107,6 @@
113107
}
114108
]
115109
},
116-
"notebookProvider": [
117-
{
118-
"viewType": "PowerShellNotebookModeDefault",
119-
"displayName": "Powershell Notebook",
120-
"selector": [
121-
{
122-
"filenamePattern": "*.[Nn]otebook.ps1"
123-
}
124-
],
125-
"priority": "default"
126-
},
127-
{
128-
"viewType": "PowerShellNotebookModeOption",
129-
"displayName": "Powershell Notebook",
130-
"selector": [
131-
{
132-
"excludeFileNamePattern": "*.Notebook.ps1",
133-
"filenamePattern": "*.ps1"
134-
}
135-
],
136-
"priority": "option"
137-
}
138-
],
139110
"keybindings": [
140111
{
141112
"command": "PowerShell.ShowHelp",
@@ -231,24 +202,6 @@
231202
"dark": "resources/dark/play.svg"
232203
}
233204
},
234-
{
235-
"command": "PowerShell.EnableNotebookMode",
236-
"title": "(Preview) Enable Notebook Mode",
237-
"category": "PowerShell",
238-
"icon": {
239-
"light": "resources/light/book.svg",
240-
"dark": "resources/dark/book.svg"
241-
}
242-
},
243-
{
244-
"command": "PowerShell.DisableNotebookMode",
245-
"title": "(Preview) Disable Notebook Mode",
246-
"category": "PowerShell",
247-
"icon": {
248-
"light": "resources/light/file-code.svg",
249-
"dark": "resources/dark/file-code.svg"
250-
}
251-
},
252205
{
253206
"command": "PowerShell.RestartSession",
254207
"title": "Restart Current Session",
@@ -424,16 +377,6 @@
424377
"when": "editorLangId == powershell && config.powershell.buttons.showRunButtons",
425378
"command": "PowerShell.RunSelection",
426379
"group": "navigation@101"
427-
},
428-
{
429-
"when": "editorLangId == powershell && config.powershell.notebooks.showToggleButton",
430-
"command": "PowerShell.EnableNotebookMode",
431-
"group": "navigation@102"
432-
},
433-
{
434-
"when": "resourceLangId == powershell && notebookEditorFocused",
435-
"command": "PowerShell.DisableNotebookMode",
436-
"group": "navigation@102"
437380
}
438381
],
439382
"editor/title/context": [
@@ -949,20 +892,6 @@
949892
"type": "boolean",
950893
"default": false,
951894
"description": "Show buttons in the editor titlebar for moving the panel around."
952-
},
953-
"powershell.notebooks.showToggleButton": {
954-
"type": "boolean",
955-
"default": false,
956-
"description": "Controls whether we show or hide the buttons to toggle Notebook mode in the top right."
957-
},
958-
"powershell.notebooks.saveMarkdownCellsAs": {
959-
"type": "string",
960-
"enum": [
961-
"BlockComment",
962-
"LineComment"
963-
],
964-
"default": "BlockComment",
965-
"description": "Controls what new markdown cells in Notebook Mode get saved as in the PowerShell file."
966895
}
967896
}
968897
},

resources/dark/book.svg

-3
This file was deleted.

resources/dark/file-code.svg

-3
This file was deleted.

resources/light/book.svg

-3
This file was deleted.

resources/light/file-code.svg

-3
This file was deleted.

test/features/testNotebookFiles/blockCommentsWithTextOnSameLine.ps1

-20
This file was deleted.

test/features/testNotebookFiles/onlyCode.ps1

-1
This file was deleted.

test/features/testNotebookFiles/onlyMarkdown.ps1

-3
This file was deleted.

test/features/testNotebookFiles/simple.Notebook.ps1

-2
This file was deleted.

test/features/testNotebookFiles/simpleBlockComments.ps1

-11
This file was deleted.

test/features/testNotebookFiles/simpleLineComments.ps1

-7
This file was deleted.

test/features/testNotebookFiles/simpleMixedComments.ps1

-9
This file was deleted.

0 commit comments

Comments
 (0)