Merge pull request #135 from PowerShell/daviwil/minor-fixes

A few minor fixes for the 0.4.0 release

Author: daviwil

src/PowerShellEditorServices.Host.x86/Microsoft.PowerShell.EditorServices.Host.DebugAdapter.x86.cmd

@@ -53,9 +53,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Microsoft.PowerShell.EditorServices.Host.DebugAdapter.x86.cmd">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <None Include="..\PowerShellEditorServices.Host\App.config">
       <Link>App.config</Link>
     </None>

src/PowerShellEditorServices.Host.x86/PowerShellEditorServices.Host.x86.csproj

@@ -54,9 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <Content Include="Microsoft.PowerShell.EditorServices.Host.DebugAdapter.cmd">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\submodules\PSScriptAnalyzer\Engine\ScriptAnalyzerEngine.csproj">

src/PowerShellEditorServices.Host/Microsoft.PowerShell.EditorServices.Host.DebugAdapter.cmd

@@ -21,8 +21,6 @@
   </metadata>
   <files>
     <file src="bin\$configuration$\$id$.exe" target="lib\net45\" />
-    <file src="bin\$configuration$\$id$.DebugAdapter.cmd" target="content\" />
     <file src="..\PowerShellEditorServices.Host.x86\bin\$configuration$\$id$.x86.exe" target="lib\net45\" />
-    <file src="..\PowerShellEditorServices.Host.x86\bin\$configuration$\$id$.DebugAdapter.x86.cmd" target="content\" />
   </files>
 </package>

src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.csproj

@@ -18,6 +18,28 @@ class Program
         [STAThread]
         static void Main(string[] args)
         {
+#if DEBUG
+            bool waitForDebugger =
+                args.Any(
+                    arg => 
+                        string.Equals(
+                            arg,
+                            "/waitForDebugger",
+                            StringComparison.InvariantCultureIgnoreCase));
+
+            // Should we wait for the debugger before starting?
+            if (waitForDebugger)
+            {
+                // Wait for 25 seconds and then continue
+                int waitCountdown = 25;
+                while (!Debugger.IsAttached && waitCountdown > 0)
+                {
+                    Thread.Sleep(1000);
+                    waitCountdown--;
+                }
+            }
+#endif
+
             string logPath = null;
             string logPathArgument =
                 args.FirstOrDefault(
@@ -31,6 +53,23 @@ static void Main(string[] args)
                 logPath = logPathArgument.Substring(9).Trim('"');
             }
 
+            LogLevel logLevel = LogLevel.Normal;
+            string logLevelArgument =
+                args.FirstOrDefault(
+                    arg => 
+                        arg.StartsWith(
+                            "/logLevel:",
+                            StringComparison.InvariantCultureIgnoreCase));
+
+            if (!string.IsNullOrEmpty(logLevelArgument))
+            {
+                // Attempt to parse the log level
+                Enum.TryParse<LogLevel>(
+                    logLevelArgument.Substring(10).Trim('"'),
+                    true,
+                    out logLevel);
+            }
+
             bool runDebugAdapter =
                 args.Any(
                     arg => 
@@ -54,46 +93,8 @@ static void Main(string[] args)
                 server = new LanguageServer();
             }
 
-            // Start the logger with the specified log path
-            // TODO: Set the level based on command line parameter
-            Logger.Initialize(logPath, LogLevel.Verbose);
-
-#if DEBUG
-            bool waitForDebugger =
-                args.Any(
-                    arg => 
-                        string.Equals(
-                            arg,
-                            "/waitForDebugger",
-                            StringComparison.InvariantCultureIgnoreCase));
-
-            // Should we wait for the debugger before starting?
-            if (waitForDebugger)
-            {
-                Logger.Write(LogLevel.Normal, "Waiting for debugger to attach before continuing...");
-
-                // Wait for 15 seconds and then continue
-                int waitCountdown = 15;
-                while (!Debugger.IsAttached && waitCountdown > 0)
-                {
-                    Thread.Sleep(1000);
-                    waitCountdown--;
-                }
-
-                if (Debugger.IsAttached)
-                {
-                    Logger.Write(
-                        LogLevel.Normal,
-                        "Debugger attached, continuing startup sequence");
-                }
-                else if (waitCountdown == 0)
-                {
-                    Logger.Write(
-                        LogLevel.Normal,
-                        "Timed out while waiting for debugger to attach, continuing startup sequence");
-                }
-            }
-#endif
+            // Start the logger with the specified log path and level
+            Logger.Initialize(logPath, logLevel);
 
             FileVersionInfo fileVersionInfo =
                 FileVersionInfo.GetVersionInfo(
@@ -102,8 +103,9 @@ static void Main(string[] args)
             Logger.Write(
                 LogLevel.Normal,
                 string.Format(
-                    "PowerShell Editor Services Host v{0} starting...",
-                    fileVersionInfo.FileVersion));
+                    "PowerShell Editor Services Host v{0} starting (pid {1})...",
+                    fileVersionInfo.FileVersion,
+                    Process.GetCurrentProcess().Id));
 
             // Start the server
             server.Start().Wait();

src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.nuspec

@@ -905,10 +905,15 @@ private void WritePromptToHost(Func<PSCommand, string> invokeAction)
                 Environment.NewLine,
                 false);
 
+            // Trim the '>' off the end of the prompt string to reduce
+            // user confusion about where they can type.
+            // TODO: Eventually put this behind a setting, #133
+            promptString = promptString.TrimEnd(' ', '>', '\r', '\n');
+
             // Write the prompt string
             this.WriteOutput(
                 promptString,
-                false);
+                true);
         }
 
         private void WritePromptWithRunspace(Runspace runspace)
@@ -974,7 +979,8 @@ private void OnDebuggerStop(object sender, DebuggerStopEventArgs e)
                     null));
 
             // Write out the debugger prompt
-            this.WritePromptWithNestedPipeline();
+            // TODO: Eventually re-enable this and put it behind a setting, #133
+            //this.WritePromptWithNestedPipeline();
 
             // Raise the event for the debugger service
             if (this.DebuggerStop != null)

src/PowerShellEditorServices.Host/Program.cs

@@ -79,9 +79,9 @@ await this.powerShellContext.ExecuteScriptString(
                         new string[] { Environment.NewLine },
                         StringSplitOptions.None);
 
-            // The output should be 3 lines: the expected string,
-            // an empty line, and the prompt string.
-            Assert.Equal(3, normalOutputLines.Length);
+            // The output should be 4 lines: the expected string, an
+            // empty line, the prompt string, and another empty line.
+            Assert.Equal(4, normalOutputLines.Length);
             Assert.Equal(
                 TestOutputString,
                 normalOutputLines[0]);