From bc5d3daab53e250ecb4efed64d0f1b384734fd38 Mon Sep 17 00:00:00 2001 From: iSazonov Date: Tue, 20 Jun 2017 17:27:09 +0300 Subject: [PATCH 1/5] Add link to VS Code docs --- .github/CONTRIBUTING.md | 7 ++++++- docs/learning-powershell/using-vscode.md | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6d698cb190a..73131ca19ad 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -61,6 +61,10 @@ To run the spellchecker, follow the steps as follows: ## Contributing to Code +### Code Editors + +[You can use multiplatform Visual Studio Code (VS Code)][use-vscode-editor] + ### Building and testing #### Building PowerShell @@ -302,4 +306,5 @@ Once you sign a CLA, all your existing and future pull requests will be labeled [open-issue]: https://github.com/PowerShell/PowerShell/issues [up-for-grabs]: https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs [semantic linefeeds]: http://rhodesmill.org/brandon/2012/one-sentence-per-line/ -[PowerShell-Docs]: https://github.com/powershell/powershell-docs/ \ No newline at end of file +[PowerShell-Docs]: https://github.com/powershell/powershell-docs/ +[use-vscode-editor]:../docs/learning-powershell/using-vscode.md#editing-with-visual-studio-code diff --git a/docs/learning-powershell/using-vscode.md b/docs/learning-powershell/using-vscode.md index 1d99ed09cb6..224bdcf3977 100644 --- a/docs/learning-powershell/using-vscode.md +++ b/docs/learning-powershell/using-vscode.md @@ -71,6 +71,22 @@ If you wish to use a specific installation of PowerShell with Visual Studio Code 3. Replace the setting with the path to the desired PowerShell executable 4. Save the settings file and restart Visual Studio Code +#### Configuration settings for Visual Studio Code + +By using the steps in the previous paragraph you can add onfiguration settings in `settings.json`. + +We recommend the following configuration settings for Visual Studio Code: + +```json +{ + "csharp.suppressDotnetRestoreNotification": true, + "editor.renderWhitespace": "all", + "editor.renderControlCharacters": true, + "omnisharp.projectLoadTimeout": 120, + "files.trimTrailingWhitespace": true +} +``` + Debugging with Visual Studio Code ---- ### No-workspace debugging From 49f019c55eaa8e47e670bce84ccaa91df9904f14 Mon Sep 17 00:00:00 2001 From: Ilya Date: Tue, 20 Jun 2017 23:59:41 +0600 Subject: [PATCH 2/5] Update using-vscode.md --- docs/learning-powershell/using-vscode.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/learning-powershell/using-vscode.md b/docs/learning-powershell/using-vscode.md index 224bdcf3977..25c535d0e6e 100644 --- a/docs/learning-powershell/using-vscode.md +++ b/docs/learning-powershell/using-vscode.md @@ -75,7 +75,7 @@ If you wish to use a specific installation of PowerShell with Visual Studio Code By using the steps in the previous paragraph you can add onfiguration settings in `settings.json`. -We recommend the following configuration settings for Visual Studio Code: +We recommend the following configuration settings for Visual Studio Code: ```json { From 5e5ccd623f148fe8ddaae711ad5e74c375a5c127 Mon Sep 17 00:00:00 2001 From: Ilya Date: Wed, 21 Jun 2017 00:01:11 +0600 Subject: [PATCH 3/5] Update CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 73131ca19ad..22eada2f0f9 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -63,7 +63,7 @@ To run the spellchecker, follow the steps as follows: ### Code Editors -[You can use multiplatform Visual Studio Code (VS Code)][use-vscode-editor] +You should use the multi-platform [Visual Studio Code (VS Code)][use-vscode-editor] ### Building and testing From 615458711f3d6f55ecd501708812a93ff909f458 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Wed, 21 Jun 2017 09:53:48 -0700 Subject: [PATCH 4/5] Fix a typo --- docs/learning-powershell/using-vscode.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/learning-powershell/using-vscode.md b/docs/learning-powershell/using-vscode.md index 25c535d0e6e..d73ecedc11b 100644 --- a/docs/learning-powershell/using-vscode.md +++ b/docs/learning-powershell/using-vscode.md @@ -53,7 +53,7 @@ To exit Visual Studio Code, **File->Exit**. If you wish to use a specific installation of PowerShell with Visual Studio Code, you will need to add a new variable to your user settings file. -1. Click **File -> Preferences -> User Settings** +1. Click **File -> Preferences -> Settings** 2. Two editor panes will appear. In the right-most pane (`settings.json`), insert the setting below appropriate for your OS somewhere between the two curly brackets (`{` and `}`) and replace ** with the installed PowerShell version: @@ -73,7 +73,7 @@ If you wish to use a specific installation of PowerShell with Visual Studio Code #### Configuration settings for Visual Studio Code -By using the steps in the previous paragraph you can add onfiguration settings in `settings.json`. +By using the steps in the previous paragraph you can add configuration settings in `settings.json`. We recommend the following configuration settings for Visual Studio Code: From 0b787fed8a2489aadcbfc70ca9b49b4290142f83 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Wed, 21 Jun 2017 09:57:31 -0700 Subject: [PATCH 5/5] Minor updates to 'Contributing.md' --- .github/CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 22eada2f0f9..3220d4a3189 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -61,9 +61,9 @@ To run the spellchecker, follow the steps as follows: ## Contributing to Code -### Code Editors +### Code Editor -You should use the multi-platform [Visual Studio Code (VS Code)][use-vscode-editor] +You should use the multi-platform [Visual Studio Code (VS Code)][use-vscode-editor]. ### Building and testing @@ -307,4 +307,4 @@ Once you sign a CLA, all your existing and future pull requests will be labeled [up-for-grabs]: https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs [semantic linefeeds]: http://rhodesmill.org/brandon/2012/one-sentence-per-line/ [PowerShell-Docs]: https://github.com/powershell/powershell-docs/ -[use-vscode-editor]:../docs/learning-powershell/using-vscode.md#editing-with-visual-studio-code +[use-vscode-editor]: ../docs/learning-powershell/using-vscode.md#editing-with-visual-studio-code