Skip to content

Commit 81ab66c

Browse files
committed
Merge branch 'master' of https://github.com/PowerShell/vscode-powershell into PSSA_CheckInnerBraceAndPipe
2 parents 5affe06 + ca479c4 commit 81ab66c

File tree

17 files changed

+281
-16
lines changed

17 files changed

+281
-16
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ that Visual Studio Code provides.
1212
- **Linux** with PowerShell Core (all PowerShell-supported distributions)
1313
- **macOS and OS X** with PowerShell Core
1414

15-
Read the [installation instructions](https://github.com/PowerShell/PowerShell/blob/master/docs/learning-powershell/using-vscode.md)
15+
Read the [installation instructions](https://docs.microsoft.com/en-us/powershell/scripting/components/vscode/using-vscode)
1616
to get more details on how to use the extension on these platforms.
1717

1818
Read the [FAQ](https://github.com/PowerShell/vscode-powershell/wiki/FAQ) for answers to common questions.
@@ -38,7 +38,7 @@ In the Extensions pane, search for "PowerShell" extension and install it there.
3838
get notified automatically about any future extension updates!
3939

4040
You can also install a VSIX package from our [Releases page](https://github.com/PowerShell/vscode-powershell/releases) by following the
41-
[Install from a VSIX](https://code.visualstudio.com/docs/extensions/install-extension#_install-from-a-vsix)
41+
[Install from a VSIX](https://code.visualstudio.com/docs/editor/extension-gallery#_install-from-a-vsix)
4242
instructions. The easiest way is through the command line:
4343

4444
```

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '1.10.2-insiders-{build}'
1+
version: '1.10.3-insiders-{build}'
22
image: Visual Studio 2017
33
clone_depth: 10
44
skip_tags: true

docs/development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ to before you can proceed.
1616
Insiders means the extension can be developed ready for new features
1717
and changes in the next VSCode release.
1818

19-
5. Install [Node.js](https://nodejs.org/en/) 6.0.0 or higher.
19+
5. Install [Node.js](https://nodejs.org/en/) 8.x or higher.
2020

2121
## Building the Code
2222

docs/ise_compatibility.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# ISE Compatibility
22

3+
# ATTENTION! THIS DOC HAS MOVED
4+
5+
[THIS DOC IS NOW HOSTED ON DOCS.MICROSOFT.COM.](https://docs.microsoft.com/en-us/powershell/scripting/components/vscode/how-to-replicate-the-ise-experience-in-vscode)
6+
7+
PLEASE REFER TO THE DOC THERE FOR FUTURE REFERENCE AS ANY CHANGES WILL BE MADE TO THAT DOC.
8+
9+
## Summary
10+
311
While the PowerShell extension for VSCode does not seek
412
complete feature parity with the PowerShell ISE,
513
there are features in place to make the VSCode experience more natural

docs/remoting.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# PowerShell Remote Editing and Debugging in VSCode
22

3+
# ATTENTION! THIS DOC HAS MOVED
4+
5+
[THIS DOC IS NOW HOSTED ON DOCS.MICROSOFT.COM.](https://docs.microsoft.com/en-us/powershell/scripting/components/vscode/using-vscode-for-remote-editing-and-debugging)
6+
7+
PLEASE REFER TO THE DOC THERE FOR FUTURE REFERENCE AS ANY CHANGES WILL BE MADE TO THAT DOC.
8+
9+
## Summary
10+
311
For those of you that were familiar with the ISE, you may recall that you were able to use run `psedit file.ps1` from the integrated console to open files - local or remote - right in the ISE.
412

513
As it turns out, this feature is also availible out of the box in the PowerShell extension for VSCode. This guide will show you how to do it.

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "PowerShell",
33
"displayName": "PowerShell",
4-
"version": "1.10.2",
4+
"version": "1.10.3",
55
"publisher": "ms-vscode",
66
"description": "Develop PowerShell scripts in Visual Studio Code!",
77
"engines": {
@@ -72,7 +72,8 @@
7272
"PowerShellCommandExplorer": [
7373
{
7474
"id": "PowerShellCommands",
75-
"name": "PowerShell Commands"
75+
"name": "PowerShell Commands",
76+
"when": "config.powershell.sideBar.CommandExplorerVisibility"
7677
}
7778
]
7879
},
@@ -113,16 +114,20 @@
113114
},
114115
{
115116
"command": "PowerShell.RefreshCommandsExplorer",
116-
"title": "Refresh",
117+
"title": "Refresh Command Explorer",
117118
"icon": {
118-
"light": "resources/light/refresh.svg",
119-
"dark": "resources/dark/refresh.svg"
119+
"light": "resources/light/sync.svg",
120+
"dark": "resources/dark/sync.svg"
120121
},
121122
"category": "PowerShell"
122123
},
123124
{
124125
"command": "PowerShell.InsertCommand",
125126
"title": "Insert Command",
127+
"icon": {
128+
"light": "resources/light/pencil.svg",
129+
"dark": "resources/dark/pencil.svg"
130+
},
126131
"category": "PowerShell"
127132
},
128133
{
@@ -133,6 +138,10 @@
133138
{
134139
"command": "PowerShell.ShowHelp",
135140
"title": "Get Help for Command",
141+
"icon": {
142+
"light": "resources/light/question.svg",
143+
"dark": "resources/dark/question.svg"
144+
},
136145
"category": "PowerShell"
137146
},
138147
{
@@ -202,6 +211,16 @@
202211
}
203212
],
204213
"menus": {
214+
"commandPalette": [
215+
{
216+
"command": "PowerShell.InsertCommand",
217+
"when": "false"
218+
},
219+
{
220+
"command": "PowerShell.RefreshCommandsExplorer",
221+
"when": "config.powershell.sideBar.CommandExplorerVisibility"
222+
}
223+
],
205224
"editor/context": [
206225
{
207226
"when": "editorLangId == powershell",
@@ -224,11 +243,13 @@
224243
"view/item/context": [
225244
{
226245
"command": "PowerShell.ShowHelp",
227-
"when": "view == PowerShellCommands"
246+
"when": "view == PowerShellCommands",
247+
"group": "inline@1"
228248
},
229249
{
230250
"command": "PowerShell.InsertCommand",
231-
"when": "view == PowerShellCommands"
251+
"when": "view == PowerShellCommands",
252+
"group": "inline@2"
232253
}
233254
]
234255
},
@@ -456,6 +477,11 @@
456477
"type": "object",
457478
"title": "PowerShell Configuration",
458479
"properties": {
480+
"powershell.sideBar.CommandExplorerVisibility": {
481+
"type": "boolean",
482+
"default":true,
483+
"description": "Specifies the visibility of the Command Explorer in the PowerShell Side Bar."
484+
},
459485
"powershell.powerShellExePath": {
460486
"type": "string",
461487
"default": "",

resources/dark/pencil.svg

Lines changed: 56 additions & 0 deletions
Loading

resources/dark/question.svg

Lines changed: 56 additions & 0 deletions
Loading

resources/dark/refresh.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

resources/dark/sync.svg

Lines changed: 56 additions & 0 deletions
Loading

resources/light/pencil.svg

Lines changed: 1 addition & 0 deletions
Loading

resources/light/question.svg

Lines changed: 1 addition & 0 deletions
Loading

resources/light/refresh.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)