Changed root namespace for grun tool.

Added back missing try/catch that was removed while debugging.

Author: wiredwiz

Grun/Grun.csproj

@@ -6,7 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B614368A-F4C9-409F-8896-CB1DA204AD6D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>Org.Edgerunner.ANTLR4.Tools.Testing.GrunDotNet</RootNamespace>
+    <RootNamespace>Org.Edgerunner.ANTLR4.Tools.Testing.Grun</RootNamespace>
     <AssemblyName>Grun</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -64,7 +64,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="HighlightingTokenCache.cs" />
+    <Compile Include="SyntaxHighlighting\ConsoleWrapperColor.cs" />
+    <Compile Include="SyntaxHighlighting\HighlightingTokenCache.cs" />
     <Compile Include="Options.cs">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Compile>
@@ -75,6 +76,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="SyntaxHighlighting\ConsoleWrapperText.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Grun.Net.config">
@@ -109,5 +111,6 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Grun/Options.cs

@@ -36,7 +36,7 @@
 
 using CommandLine;
 
-namespace Org.Edgerunner.ANTLR4.Tools.Testing.GrunDotNet
+namespace Org.Edgerunner.ANTLR4.Tools.Testing.Grun
 {
    /// <summary>
    /// Class that represents command line options.

Grun/Program.cs

@@ -60,15 +60,15 @@
 using Org.Edgerunner.ANTLR4.Tools.Testing.Configuration;
 using Org.Edgerunner.ANTLR4.Tools.Testing.Extensions;
 using Org.Edgerunner.ANTLR4.Tools.Testing.Grammar;
-using Org.Edgerunner.ANTLR4.Tools.Testing.GrunDotNet.Properties;
+using Org.Edgerunner.ANTLR4.Tools.Testing.Grun.Properties;
 using Org.Edgerunner.ANTLR4.Tools.Testing.GrunWin;
 using Org.Edgerunner.ANTLR4.Tools.Testing.GrunWin.Editor.SyntaxHighlighting;
 
 using Console = Colorful.Console;
 using Parser = CommandLine.Parser;
 
 // ReSharper disable RedundantNameQualifier
-namespace Org.Edgerunner.ANTLR4.Tools.Testing.GrunDotNet
+namespace Org.Edgerunner.ANTLR4.Tools.Testing.Grun
 {
    /// <summary>
    /// Class that represents the entry point into the program.
@@ -87,8 +87,8 @@ internal class Program
       // ReSharper disable once MethodTooLong
       private static void Main(string[] args)
       {
-         //try
-         //{
+         try
+         {
          LoadApplicationSettings();
          Console.BackgroundColor = _Settings.EditorBackgroundColor;
          Console.ForegroundColor = _Settings.EditorTextColor;
@@ -268,17 +268,17 @@ private static void Main(string[] args)
          Console.WriteLine(Resources.PressAnyKeyMessage);
          Console.ReadKey();
 #endif
-         //         }
-         //         // ReSharper disable once CatchAllClause
-         //         catch (Exception ex)
-         //         {
-         //            Console.WriteLine(ex.Message);
-         //            Console.WriteLine(ex.StackTrace);
-         //#if DEBUG
-         //            Console.WriteLine(Resources.PressAnyKeyMessage);
-         //            Console.ReadKey();
-         //#endif
-         //         }
+                  }
+                  // ReSharper disable once CatchAllClause
+                  catch (Exception ex)
+                  {
+                     Console.WriteLine(ex.Message);
+                     Console.WriteLine(ex.StackTrace);
+         #if DEBUG
+                     Console.WriteLine(Resources.PressAnyKeyMessage);
+                     Console.ReadKey();
+         #endif
+                  }
       }
 
       private static void HighlightSyntaxInConsole(int lineOffset, Analyzer analyzer, ISyntaxHighlightingGuide guide)

Grun/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.20081.14")]
-[assembly: AssemblyFileVersion("1.0.20081.14")]
+[assembly: AssemblyVersion("1.0.20081.15")]
+[assembly: AssemblyFileVersion("1.0.20081.15")]