Merge pull request #39 from TylerLeonhardt/bundle-pses

Move to bundle PowerShellEditorServices

build.ps1

@@ -15,6 +15,10 @@ param(
     $Watch
 )
 
+if (!(Test-Path "$PSScriptRoot/PowerShellEditorServices")) {
+    & "$PSScriptRoot/downloadPSES.ps1"
+}
+
 if (!(Get-Command npm)) {
     throw "You must install Node.js & npm."
 }

src/downloadPSES.ps1 → downloadPSES.ps1

@@ -12,7 +12,7 @@ $ErrorActionPreference = "Stop"
 # Progress doesn't display properly in vim
 $ProgressPreference = "SilentlyContinue"
 
-Push-Location (Join-Path $PSScriptRoot ..)
+Push-Location $PSScriptRoot
 
 $repo = "PowerShell/PowerShellEditorServices"
 $file = "PowerShellEditorServices.zip"

package.json

@@ -36,7 +36,8 @@
         "syntaxes",
         "src/downloadPSES.ps1",
         "README.md",
-        "LICENSE"
+        "LICENSE",
+        "PowerShellEditorServices"
     ],
     "contributes": {
         "languages": [
@@ -292,12 +293,9 @@
         "watch": "tsc -watch -p ./"
     },
     "extensionDependencies": [],
-    "dependencies": {
-        "node-powershell": "^4.0.0"
-    },
+    "dependencies": {},
     "devDependencies": {
         "@types/node": "^10.3.3",
-        "@types/node-powershell": "^3.1.0",
         "typescript": "^3.0.3",
         "coc.nvim": "^0.0.71"
     }

src/client/process.ts

@@ -3,16 +3,12 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-import cp = require("child_process");
 import fs = require("fs");
-import net = require("net");
-import os = require("os");
 import path = require("path");
 import vscode = require("coc.nvim");
 import Settings = require("./settings");
 import utils = require("./utils");
 import crypto = require("crypto");
-import Shell from "node-powershell";
 
 export class PowerShellProcess {
     public static escapeSingleQuotes(pspath: string): string {
@@ -43,23 +39,9 @@ export class PowerShellProcess {
 
         // If PowerShellEditorServices is not downloaded yet, run the install script to do so.
         if (!fs.existsSync(this.bundledModulesPath)) {
-            let notification = vscode.workspace.createStatusBarItem(0, { progress: true})
-            notification.text = "Downloading PowerShellEditorServices..."
-            notification.show()
-
-            const ps = new Shell({
-                executionPolicy: 'Bypass',
-                noProfile: true
-            });
-
-            ps.addCommand(path.join(this.cocPowerShellRoot, "src", "downloadPSES.ps1"));
-            await ps.invoke()
-                .catch(e => logger.appendLine("error downloading PSES: " + e))
-                .finally(() => {
-                notification.hide()
-                notification.dispose()
-            });
-
+            const errMessage = "[Error] PowerShell Editor Services not found. Package is not in the correct format."
+            this.log.appendLine(errMessage);
+            throw errMessage;
         }
 
         this.log.appendLine("starting.")