Pass in displayName to SessionMgr, adjust banner whitespace

Author: rkeithhill

src/main.ts

@@ -136,6 +136,7 @@ export function activate(context: vscode.ExtensionContext): void {
             requiredEditorServicesVersion,
             logger,
             documentSelector,
+            PackageJSON.displayName,
             PackageJSON.version,
             telemetryReporter);
 

src/session.ts

@@ -4,6 +4,7 @@
 
 import fs = require("fs");
 import net = require("net");
+import * as os from "os";
 import path = require("path");
 import * as semver from "semver";
 import vscode = require("vscode");
@@ -35,6 +36,7 @@ export enum SessionStatus {
 }
 
 export class SessionManager implements Middleware {
+    public HostName: string;
     public HostVersion: string;
     public PowerShellExeDetails: IPowerShellExeDetails;
     private ShowSessionMenuCommandName = "PowerShell.ShowSessionMenu";
@@ -68,11 +70,13 @@ export class SessionManager implements Middleware {
         private requiredEditorServicesVersion: string,
         private log: Logger,
         private documentSelector: DocumentSelector,
+        private hostName: string,
         private version: string,
         private reporter: TelemetryReporter) {
 
         this.platformDetails = getPlatformDetails();
 
+        this.HostName = hostName;
         this.HostVersion = version;
         this.telemetryReporter = reporter;
 
@@ -81,7 +85,7 @@ export class SessionManager implements Middleware {
 
         this.log.write(
             `Visual Studio Code v${vscode.version} ${procBitness}`,
-            `PowerShell Extension v${this.HostVersion}`,
+            `${this.HostName} Extension v${this.HostVersion}`,
             `Operating System: ${OperatingSystem[this.platformDetails.operatingSystem]} ${osBitness}`);
 
         // Fix the host version so that PowerShell can consume it.
@@ -192,15 +196,7 @@ export class SessionManager implements Middleware {
         if (this.sessionSettings.integratedConsole.suppressStartupBanner) {
             this.editorServicesArgs += "-StartupBanner '' ";
         } else {
-            const packageJSON: any = require("../../package.json");
-            const previewStr = (packageJSON.name.toLowerCase() === "powershell-preview") ? "Preview " : "";
-
-            const startupBanner = `
-
-            =====> PowerShell ${previewStr}Integrated Console v${this.HostVersion} <=====
-
-            `;
-
+            const startupBanner = `=====> ${this.HostName} Integrated Console v${this.HostVersion} <=====${os.EOL}`;
             this.editorServicesArgs += `-StartupBanner "${startupBanner}" `;
         }