Merge branch 'master' into release/1.4.2

Author: daviwil

.vscode/tasks.json

@@ -2,7 +2,7 @@
     "version": "2.0.0",
 
     "windows": {
-        "command": "${env:windir}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
+        "command": "${env:windir}/System32/WindowsPowerShell/v1.0/powershell.exe",
         "args": [ "-NoProfile", "-ExecutionPolicy", "Bypass" ]
     },
     "linux": {
@@ -14,8 +14,6 @@
         "args": [ "-NoProfile" ]
     },
 
-    "showOutput": "always",
-
     "tasks": [
         {
             "taskName": "Install",

ISSUE_TEMPLATE.md

@@ -1,11 +1,14 @@
 <!--
 
-Please fill in these details so that we can help you!
+BEFORE SUBMITTING A NEW ISSUE, PLEASE READ THE FAQ!!
+https://github.com/PowerShell/vscode-powershell/wiki/FAQ
 
-If you are filing an issue related to PowerShell syntax coloring/highlighting,
-please file it at the EditorSyntax repo:
+If your issue is not addressed by the FAQ, please
+fill in the following details so that we can help you!
 
-https://github.com/PowerShell/EditorSyntax/issues
+The more repro details you can provide, along with a zip
+of the log files from your session, the better the chances
+are for a quick resolution.
 
 -->
 
@@ -17,7 +20,7 @@ https://github.com/PowerShell/EditorSyntax/issues
 - Output from `$PSVersionTable`:
 
 ```
-Copy / paste the below commands into the PowerShell Integrated Terminal, and paste the output here
+Copy / paste the following commands into the PowerShell Integrated Console, and paste the output here:
 
 code -v
 $pseditor.EditorServicesVersion

README.md

@@ -19,6 +19,8 @@ that Visual Studio Code provides.
 Read the [installation instructions](https://github.com/PowerShell/PowerShell/blob/master/docs/learning-powershell/using-vscode.md)
 to get more details on how to use the extension on these platforms.
 
+Read the [FAQ](https://github.com/PowerShell/vscode-powershell/wiki/FAQ) for answers to common questions.
+
 ## Features
 
 - Syntax highlighting

examples/.vscode/tasks.json

@@ -33,7 +33,7 @@
 
     // Start PowerShell
     "windows": {
-        "command": "${env:windir}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
+        "command": "${env:windir}/System32/WindowsPowerShell/v1.0/powershell.exe",
         "args": [ "-NoProfile", "-ExecutionPolicy", "Bypass" ]
     },
     "linux": {
@@ -45,15 +45,11 @@
         "args": [ "-NoProfile" ]
     },
 
-    // Show the output window always
-    "showOutput": "always",
-
     // Associate with test task runner
     "tasks": [
         {
             "taskName": "Clean",
             "suppressTaskName": true,
-            "showOutput": "always",
             "args": [
                 "Write-Host 'Invoking PSake...'; Invoke-PSake build.ps1 -taskList Clean;",
                 "Invoke-Command { Write-Host 'Completed Clean task in task runner.' }"
@@ -63,7 +59,6 @@
             "taskName": "Build",
             "suppressTaskName": true,
             "isBuildCommand": true,
-            "showOutput": "always",
             "args": [
                 "Write-Host 'Invoking PSake...'; Invoke-PSake build.ps1 -taskList Build;",
                 "Invoke-Command { Write-Host 'Completed Build task in task runner.' }"
@@ -72,7 +67,6 @@
         {
             "taskName": "Publish",
             "suppressTaskName": true,
-            "showOutput": "always",
             "args": [
                 "Write-Host 'Invoking PSake...'; Invoke-PSake build.ps1 -taskList Publish;",
                 "Invoke-Command { Write-Host 'Completed Publish task in task runner.' }"
@@ -82,9 +76,8 @@
             "taskName": "Test",
             "suppressTaskName": true,
             "isTestCommand": true,
-            "showOutput": "always",
             "args": [
-                "Write-Host 'Invoking Pester...'; Invoke-Pester -PesterOption @{IncludeVSCodeMarker=$true};",
+                "Write-Host 'Invoking Pester...'; $ProgressPreference = 'SilentlyContinue'; Invoke-Pester -PesterOption @{IncludeVSCodeMarker=$true};",
                 "Invoke-Command { Write-Host 'Completed Test task in task runner.' }"
             ],
             "problemMatcher": "$pester"

examples/Assets/script.js

@@ -0,0 +1,3 @@
+var h1 = document.createElement('h1');
+h1.appendChild(document.createTextNode('Hello from JavaScript!'));
+document.body.appendChild(h1);

examples/Assets/style.css

@@ -0,0 +1,4 @@
+body {
+    color: white;
+    background-color: cornflowerblue;
+}

examples/ContentViewTest.ps1

@@ -0,0 +1,8 @@
+$params = @{
+    HtmlBodyContent = "Testing JavaScript and CSS paths..."
+    JavaScriptPaths = ".\Assets\script.js"
+    StyleSheetPaths = ".\Assets\style.css"
+}
+
+$view = New-VSCodeHtmlContentView -Title "Test View" -ShowInColumn Two
+Set-VSCodeHtmlContentView -View $view @params

package.json

@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@types/node": "^6.0.40",
-    "typescript": "^2.0.3",
+    "typescript": "2.3.x",
     "vsce": "^1.18.0",
     "vscode": "^1.1.0",
     "mocha": "^2.3.3",
@@ -75,7 +75,7 @@
       },
       {
         "command": "PowerShell.OpenInISE",
-        "key": "ctrl+shift+i",
+        "key": "shift+alt+i",
         "when": "editorTextFocus && editorLangId == 'powershell'"
       }
     ],
@@ -230,14 +230,14 @@
             }
           },
           {
-            "label": "PowerShell: Launch - Current File w/Args Prompt",
+            "label": "PowerShell: Launch Current File w/Args Prompt",
             "description": "Launch current file (in active editor window) under debugger, prompting first for script arguments",
             "body": {
               "type": "PowerShell",
               "request": "launch",
               "name": "PowerShell Launch Current File w/Args Prompt",
               "script": "^\"\\${file}\"",
-              "args": [],
+              "args": [ "^\"\\${command:SpecifyScriptArgs}\"" ],
               "cwd": "^\"\\${file}\""
             }
           },

scripts/Start-EditorServices.ps1

@@ -44,7 +44,7 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogPath,
 
-    [ValidateSet("Normal", "Verbose", "Error")]
+    [ValidateSet("Normal", "Verbose", "Error", "Diagnostic")]
     $LogLevel,
 
 	[Parameter(Mandatory=$true)]

src/features/CustomViews.ts

@@ -50,7 +50,7 @@ export class CustomViewsFeature implements IFeature {
             args => {
                 this.contentProvider.setHtmlContentView(
                     args.id,
-                    args.htmlBodyContent);
+                    args.htmlContent);
             });
 
         languageClient.onRequest(
@@ -119,7 +119,7 @@ class PowerShellContentProvider implements vscode.TextDocumentContentProvider {
         )
     }
 
-    public setHtmlContentView(id: string, content: string) {
+    public setHtmlContentView(id: string, content: HtmlContent) {
         let uriString = this.getUri(id);
         let view: CustomView = this.viewIndex[uriString];
 
@@ -160,7 +160,11 @@ abstract class CustomView {
 
 class HtmlContentView extends CustomView {
 
-    private htmlContent: string = "";
+    private htmlContent: HtmlContent = {
+        bodyContent: "",
+        javaScriptPaths: [],
+        styleSheetPaths: []
+    };
 
     constructor(
         id: string,
@@ -169,17 +173,49 @@ class HtmlContentView extends CustomView {
         super(id, title, CustomViewType.HtmlContent);
     }
 
-    setContent(htmlContent: string) {
+    setContent(htmlContent: HtmlContent) {
         this.htmlContent = htmlContent;
     }
 
     appendContent(content: string) {
-        this.htmlContent += content;
+        this.htmlContent.bodyContent += content;
     }
 
     getContent(): string {
-        // Return an HTML page which disables JavaScript in content by default
-        return `<html><head><meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src *; style-src 'self'; script-src 'none';"></head><body>${this.htmlContent}</body></html>`;
+        var styleSrc = "none";
+        var styleTags = "";
+
+        function getNonce(): number {
+            return Math.floor(Math.random() * 100000) + 100000;
+        }
+
+        if (this.htmlContent.styleSheetPaths &&
+            this.htmlContent.styleSheetPaths.length > 0) {
+            styleSrc = "";
+            this.htmlContent.styleSheetPaths.forEach(
+                p => {
+                    var nonce = getNonce();
+                    styleSrc += `'nonce-${nonce}' `;
+                    styleTags += `<link nonce="${nonce}" href="${p}" rel="stylesheet" type="text/css" />\n`;
+                });
+        }
+
+        var scriptSrc = "none";
+        var scriptTags = "";
+
+        if (this.htmlContent.javaScriptPaths &&
+            this.htmlContent.javaScriptPaths.length > 0) {
+            scriptSrc = "";
+            this.htmlContent.javaScriptPaths.forEach(
+                p => {
+                    var nonce = getNonce();
+                    scriptSrc += `'nonce-${nonce}' `;
+                    scriptTags += `<script nonce="${nonce}" src="${p}"></script>\n`;
+                });
+        }
+
+        // Return an HTML page with the specified content
+        return `<html><head><meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src *; style-src ${styleSrc}; script-src ${scriptSrc};">${styleTags}</head><body>\n${this.htmlContent.bodyContent}\n${scriptTags}</body></html>`;
     }
 }
 
@@ -226,9 +262,15 @@ namespace SetHtmlContentViewRequest {
             'powerShell/setHtmlViewContent');
 }
 
+interface HtmlContent {
+    bodyContent: string;
+    javaScriptPaths: string[];
+    styleSheetPaths: string[];
+}
+
 interface SetHtmlContentViewRequestArguments {
     id: string;
-    htmlBodyContent: string;
+    htmlContent: HtmlContent;
 }
 
 namespace AppendHtmlOutputViewRequest {