From 8aa51b940faf79396e17e2a4ae445b9b7e59b66f Mon Sep 17 00:00:00 2001
From: codFather2 <dimalitva6@gmail.com>
Date: Tue, 13 Feb 2018 17:15:05 +0300
Subject: [PATCH 01/12] WIP: AddRoslyn

---
 CSharpMinifier.GUI/App.config                 |  34 ++++-
 CSharpMinifier.GUI/CSharpMinifier.GUI.csproj  |   4 +-
 .../Properties/Resources.Designer.cs          |   4 +-
 .../Properties/Settings.Designer.cs           |   2 +-
 CSharpMinifier.GUI/frmMain.cs                 |   2 +-
 .../CSharpMinifier.Tests.csproj               |   5 +-
 CSharpMinifier.Tests/app.config               |  31 +++++
 CSharpMinifier/CSharpMinifier.csproj          |  88 ++++++++++++-
 CSharpMinifier/IMinifier.cs                   |  11 ++
 CSharpMinifier/Minifier.cs                    |   5 +-
 CSharpMinifier/Rewriters/CSharpRewriter.cs    |  80 ++++++++++++
 CSharpMinifier/RoslynMinifier.cs              | 119 ++++++++++++++++++
 CSharpMinifier/app.config                     |  31 +++++
 CSharpMinifier/packages.config                |  43 +++++++
 14 files changed, 444 insertions(+), 15 deletions(-)
 create mode 100644 CSharpMinifier.Tests/app.config
 create mode 100644 CSharpMinifier/IMinifier.cs
 create mode 100644 CSharpMinifier/Rewriters/CSharpRewriter.cs
 create mode 100644 CSharpMinifier/RoslynMinifier.cs
 create mode 100644 CSharpMinifier/app.config

diff --git a/CSharpMinifier.GUI/App.config b/CSharpMinifier.GUI/App.config
index f8ac8ea..58a5513 100644
--- a/CSharpMinifier.GUI/App.config
+++ b/CSharpMinifier.GUI/App.config
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="CSharpMinifier.GUI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+            <section name="CSharpMinifier.GUI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
     </startup>
     <userSettings>
         <CSharpMinifier.GUI.Properties.Settings>
@@ -72,4 +72,32 @@
             </setting>
         </CSharpMinifier.GUI.Properties.Settings>
     </userSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/CSharpMinifier.GUI/CSharpMinifier.GUI.csproj b/CSharpMinifier.GUI/CSharpMinifier.GUI.csproj
index ec4383a..3172442 100644
--- a/CSharpMinifier.GUI/CSharpMinifier.GUI.csproj
+++ b/CSharpMinifier.GUI/CSharpMinifier.GUI.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CSharpMinifier.GUI</RootNamespace>
     <AssemblyName>CSharpMinifier.GUI</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
diff --git a/CSharpMinifier.GUI/Properties/Resources.Designer.cs b/CSharpMinifier.GUI/Properties/Resources.Designer.cs
index f33943e..a3d61f5 100644
--- a/CSharpMinifier.GUI/Properties/Resources.Designer.cs
+++ b/CSharpMinifier.GUI/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace CSharpMinifier.GUI.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/CSharpMinifier.GUI/Properties/Settings.Designer.cs b/CSharpMinifier.GUI/Properties/Settings.Designer.cs
index d83e7f8..d4972a9 100644
--- a/CSharpMinifier.GUI/Properties/Settings.Designer.cs
+++ b/CSharpMinifier.GUI/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace CSharpMinifier.GUI.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/CSharpMinifier.GUI/frmMain.cs b/CSharpMinifier.GUI/frmMain.cs
index a15b4e9..0c84aca 100644
--- a/CSharpMinifier.GUI/frmMain.cs
+++ b/CSharpMinifier.GUI/frmMain.cs
@@ -125,7 +125,7 @@ private void btnMinify_Click(object sender, EventArgs e)
 				EnumToIntConversion = cbEnumToIntConversion.Checked,
 				Unsafe = cbUnsafe.Checked
 			};
-			Minifier minifier = new Minifier(minifierOptions);
+			IMinifier minifier = new RoslynMinifier(minifierOptions);
 			tbOutput.Text = !cbMinifyFiles.Checked ? minifier.MinifyFromString(tbInput.Text) : minifier.MinifyFiles(Sources.Select(source => source.Value).ToArray());
 
 			tbInputLength.Text = tbInput.Text.Length.ToString();
diff --git a/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj b/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
index 58e2244..53ecf4a 100644
--- a/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
+++ b/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CSharpMinifier.Tests</RootNamespace>
     <AssemblyName>CSharpMinifier.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -53,6 +53,7 @@
     <Compile Include="Samples\Test2.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/CSharpMinifier.Tests/app.config b/CSharpMinifier.Tests/app.config
new file mode 100644
index 0000000..9b6361b
--- /dev/null
+++ b/CSharpMinifier.Tests/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/CSharpMinifier/CSharpMinifier.csproj b/CSharpMinifier/CSharpMinifier.csproj
index a59b708..81482cf 100644
--- a/CSharpMinifier/CSharpMinifier.csproj
+++ b/CSharpMinifier/CSharpMinifier.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CSharpMinifier</RootNamespace>
     <AssemblyName>CSharpMinifier</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -50,6 +50,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.Xml.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CodeAnalysis, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    </Reference>
     <Reference Include="Mono.Cecil, Version=0.9.5.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.dll</HintPath>
@@ -67,10 +73,80 @@
       <HintPath>..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Diagnostics.FileVersionInfo, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.StackTrace, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net46\System.Security.Cryptography.Algorithms.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net46\System.Security.Cryptography.X509Certificates.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Text.Encoding.CodePages, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Thread, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XPath, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XPath.XDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CompileUtils.cs" />
+    <Compile Include="IMinifier.cs" />
     <Compile Include="MinifyEnumsAstVisitor.cs" />
     <Compile Include="MinifyTypesAstVisitor.cs" />
     <Compile Include="NameNode.cs" />
@@ -84,13 +160,21 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RandomIdGenerator.cs" />
     <Compile Include="ResolveResultType.cs" />
+    <Compile Include="Rewriters\CSharpRewriter.cs" />
+    <Compile Include="RoslynMinifier.cs" />
     <Compile Include="Substitutor.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CSharpMinifier/IMinifier.cs b/CSharpMinifier/IMinifier.cs
new file mode 100644
index 0000000..3617d75
--- /dev/null
+++ b/CSharpMinifier/IMinifier.cs
@@ -0,0 +1,11 @@
+namespace CSharpMinifier
+{
+    public interface IMinifier
+    {
+        string Minify();
+
+        string MinifyFiles(string[] csFiles);
+
+        string MinifyFromString(string csharpCode);
+    }
+}
diff --git a/CSharpMinifier/Minifier.cs b/CSharpMinifier/Minifier.cs
index 07a7c3b..e674155 100644
--- a/CSharpMinifier/Minifier.cs
+++ b/CSharpMinifier/Minifier.cs
@@ -4,6 +4,7 @@
 using ICSharpCode.NRefactory.CSharp.TypeSystem;
 using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis.CSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,10 +12,11 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using ICSharpCode.NRefactory.Documentation;
 
 namespace CSharpMinifier
 {
-	public class Minifier
+	public class Minifier : IMinifier
 	{
 		private static string[] NameKeys = new string[] { "Name", "LiteralValue", "Keyword" };
 		private const string VarId = "var";
@@ -123,7 +125,6 @@ public string MinifyFiles(string[] csFiles)
 		public string MinifyFromString(string csharpCode)
 		{
 			SyntaxTree = new CSharpParser().Parse(csharpCode, ParserTempFileName);
-
 			return Minify();
 		}
 
diff --git a/CSharpMinifier/Rewriters/CSharpRewriter.cs b/CSharpMinifier/Rewriters/CSharpRewriter.cs
new file mode 100644
index 0000000..ad4197b
--- /dev/null
+++ b/CSharpMinifier/Rewriters/CSharpRewriter.cs
@@ -0,0 +1,80 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+
+namespace CSharpMinifier.Rewriters
+{
+    class CSharpRewriter : CSharpSyntaxRewriter
+    {
+        private readonly SemanticModel _semanticModel;
+        public CSharpRewriter(SemanticModel semanticModel,bool visitIntoStructuredTrivia = true) : base(visitIntoStructuredTrivia)
+        {
+            _semanticModel = semanticModel;
+        }
+        
+        public override SyntaxNode VisitRegionDirectiveTrivia(RegionDirectiveTriviaSyntax node)
+        {
+            return null;
+        }
+
+        public override SyntaxNode VisitEndRegionDirectiveTrivia(EndRegionDirectiveTriviaSyntax node)
+        {
+            return null;
+        }
+
+        public override SyntaxNode VisitEmptyStatement(EmptyStatementSyntax node)
+        {
+            return null;
+        }
+
+        public override SyntaxNode VisitLocalDeclarationStatement(LocalDeclarationStatementSyntax node)
+        {
+            if (node.Declaration.Variables.Count > 1)
+            {
+                return node;
+            }
+            if (node.Declaration.Variables[0].Initializer == null)
+            {
+                return node;
+            }
+            VariableDeclaratorSyntax declarator = node.Declaration.Variables.First();
+            var variableName = declarator.Identifier;
+            TypeSyntax variableTypeName = node.Declaration.Type;
+            ITypeSymbol variableType =
+                (ITypeSymbol)_semanticModel.GetSymbolInfo(variableTypeName)
+                    .Symbol;
+            TypeInfo initializerInfo =
+                _semanticModel.GetTypeInfo(declarator
+                    .Initializer
+                    .Value);
+            if (Equals(variableType, initializerInfo.Type))
+            {
+                TypeSyntax varTypeName =
+                    IdentifierName("var")
+                        .WithLeadingTrivia(
+                            variableTypeName.GetLeadingTrivia())
+                        .WithTrailingTrivia(
+                            variableTypeName.GetTrailingTrivia());
+
+                return node.ReplaceNode(variableTypeName, varTypeName);
+            }
+
+            return base.VisitLocalDeclarationStatement(node);
+        }
+
+        public SyntaxTrivia CommentAndRegionsTriviaNodes(SyntaxTrivia arg1, SyntaxTrivia arg2)
+        {
+            if (arg1.IsKind(SyntaxKind.SingleLineCommentTrivia) || arg1.IsKind(SyntaxKind.MultiLineCommentTrivia)
+                || arg1.IsKind(SyntaxKind.RegionDirectiveTrivia) || arg1.IsKind(SyntaxKind.EndRegionDirectiveTrivia))
+            {
+                arg2 = SyntaxFactory.CarriageReturn;
+            }
+            else
+            {
+                arg2 = arg1;
+            }
+            return arg2;
+        }
+    }
+}
diff --git a/CSharpMinifier/RoslynMinifier.cs b/CSharpMinifier/RoslynMinifier.cs
new file mode 100644
index 0000000..5723494
--- /dev/null
+++ b/CSharpMinifier/RoslynMinifier.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CSharpMinifier.Rewriters;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+
+namespace CSharpMinifier
+{
+    public class RoslynMinifier : IMinifier
+    {
+        public SyntaxTree SyntaxTree { get; private set; }
+
+        public SemanticModel SemanticModel { get; private set; }
+
+        public MinifierOptions Options { get; private set; }
+
+        public List<string> IgnoredIdentifiers { get; private set; }
+
+        public List<string> IgnoredComments { get; private set; }
+
+        public RoslynMinifier(MinifierOptions options = null, string[] ignoredIdentifiers = null, string[] ignoredComments = null)
+        {
+            Options = options ?? new MinifierOptions();
+            IgnoredIdentifiers = ignoredIdentifiers?.ToList() ?? new List<string>();
+            IgnoredComments = ignoredComments?.ToList() ?? new List<string>();
+        }
+
+        public string MinifyFiles(string[] csFiles)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string MinifyFromString(string csharpCode)
+        {
+            SyntaxTree = CSharpSyntaxTree.ParseText(csharpCode);
+            var Mscorlib = MetadataReference.CreateFromFile(typeof(object).Assembly.Location);
+            var compilation = CSharpCompilation.Create("MyCompilation", new[] { SyntaxTree }, new[] { Mscorlib });
+            SemanticModel = compilation.GetSemanticModel(SyntaxTree);
+            return Minify();
+        }
+
+        public string Minify()
+        {
+            if (Options.CommentsRemoving || Options.RegionsRemoving)
+                RemoveCommentsAndRegions();
+
+            if (Options.LocalVarsCompressing || Options.UselessMembersCompressing)
+                CompressLocals();
+            if (Options.MembersCompressing || Options.UselessMembersCompressing)
+                CompressMembers();
+            if (Options.TypesCompressing)
+                CompressTypes();
+            if (Options.EnumToIntConversion)
+                ConvertEnumToInts();
+            if (Options.MiscCompressing || Options.NamespacesRemoving)
+                CompressMixed();
+
+            string result;
+            if (Options.SpacesRemoving)
+                result = GetStringWithoutSpaces();
+            else
+                result = SyntaxTree.ToString();
+
+            return result;
+        }
+
+        private void RemoveCommentsAndRegions()
+        {
+            var rewriter = new CSharpRewriter(SemanticModel);
+            var root = SyntaxTree.GetRoot();
+            root = rewriter.Visit(root);
+            var newRoot = root.ReplaceTrivia(root.DescendantTrivia(), rewriter.CommentAndRegionsTriviaNodes);
+            SyntaxTree = CSharpSyntaxTree.Create((CSharpSyntaxNode)newRoot);
+        }
+
+        private void CompressLocals()
+        {
+            var root = (CompilationUnitSyntax)SyntaxTree.GetRoot();
+            var locals = root.DescendantNodes().OfType<VariableDeclarationSyntax>();
+            foreach (var variables in locals.Select(l => l.Variables))
+            {
+                foreach (var variable in variables)
+                {
+                }
+            }
+            var localsCopy = locals;
+        }
+
+        private string GetStringWithoutSpaces()
+        {
+            throw new NotImplementedException();
+        }
+
+        private void CompressMixed()
+        {
+            throw new NotImplementedException();
+        }
+
+        private void ConvertEnumToInts()
+        {
+            throw new NotImplementedException();
+        }
+
+        private void CompressTypes()
+        {
+            throw new NotImplementedException();
+        }
+
+        private void CompressMembers()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/CSharpMinifier/app.config b/CSharpMinifier/app.config
new file mode 100644
index 0000000..9b6361b
--- /dev/null
+++ b/CSharpMinifier/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/CSharpMinifier/packages.config b/CSharpMinifier/packages.config
index 3cccab0..dc1fc0b 100644
--- a/CSharpMinifier/packages.config
+++ b/CSharpMinifier/packages.config
@@ -1,5 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ICSharpCode.NRefactory" version="5.5.1" targetFramework="net40" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.Common" version="2.6.1" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="2.6.1" targetFramework="net46" />
   <package id="Mono.Cecil" version="0.9.5.4" targetFramework="net40" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net46" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net46" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net46" />
+  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net46" />
+  <package id="System.Console" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net46" />
+  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net46" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net46" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net46" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net46" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net46" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net46" />
+  <package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net46" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net46" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net46" />
+  <package id="System.Text.Encoding.CodePages" version="4.3.0" targetFramework="net46" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading.Thread" version="4.3.0" targetFramework="net46" />
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XPath" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net46" />
 </packages>
\ No newline at end of file

From 898f3f927f4c6a7063d99b1f8731f85025df609a Mon Sep 17 00:00:00 2001
From: codeFather2 <Dmitry.Litovchenko1@yandex.ru>
Date: Wed, 14 Feb 2018 00:09:40 +0300
Subject: [PATCH 02/12] WIP: Roslyn adaptation

---
 CSharpMinifier/Rewriters/CSharpRewriter.cs | 43 +++++++---------------
 CSharpMinifier/RoslynMinifier.cs           | 17 +++++----
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/CSharpMinifier/Rewriters/CSharpRewriter.cs b/CSharpMinifier/Rewriters/CSharpRewriter.cs
index ad4197b..d60ef67 100644
--- a/CSharpMinifier/Rewriters/CSharpRewriter.cs
+++ b/CSharpMinifier/Rewriters/CSharpRewriter.cs
@@ -8,9 +8,13 @@ namespace CSharpMinifier.Rewriters
     class CSharpRewriter : CSharpSyntaxRewriter
     {
         private readonly SemanticModel _semanticModel;
+        private readonly string[] _namesGenerator;
+        private int _currentIndex = 0;
+
         public CSharpRewriter(SemanticModel semanticModel,bool visitIntoStructuredTrivia = true) : base(visitIntoStructuredTrivia)
         {
             _semanticModel = semanticModel;
+            _namesGenerator = new string[]{ "a","b","c","d","e","f","g","h","j","l","m","n"};
         }
         
         public override SyntaxNode VisitRegionDirectiveTrivia(RegionDirectiveTriviaSyntax node)
@@ -30,37 +34,18 @@ public override SyntaxNode VisitEmptyStatement(EmptyStatementSyntax node)
 
         public override SyntaxNode VisitLocalDeclarationStatement(LocalDeclarationStatementSyntax node)
         {
-            if (node.Declaration.Variables.Count > 1)
-            {
-                return node;
-            }
-            if (node.Declaration.Variables[0].Initializer == null)
-            {
-                return node;
-            }
-            VariableDeclaratorSyntax declarator = node.Declaration.Variables.First();
-            var variableName = declarator.Identifier;
-            TypeSyntax variableTypeName = node.Declaration.Type;
-            ITypeSymbol variableType =
-                (ITypeSymbol)_semanticModel.GetSymbolInfo(variableTypeName)
-                    .Symbol;
-            TypeInfo initializerInfo =
-                _semanticModel.GetTypeInfo(declarator
-                    .Initializer
-                    .Value);
-            if (Equals(variableType, initializerInfo.Type))
-            {
-                TypeSyntax varTypeName =
-                    IdentifierName("var")
-                        .WithLeadingTrivia(
-                            variableTypeName.GetLeadingTrivia())
-                        .WithTrailingTrivia(
-                            variableTypeName.GetTrailingTrivia());
+            return base.VisitLocalDeclarationStatement(node);
+        }
 
-                return node.ReplaceNode(variableTypeName, varTypeName);
+        public override SyntaxNode VisitVariableDeclarator(VariableDeclaratorSyntax node)
+        {
+            if (node.IsKind(SyntaxKind.VariableDeclarator))
+            {
+                var newNode= node.ReplaceToken(node.Identifier, Identifier(_namesGenerator[_currentIndex]));
+                _currentIndex++;
+                return newNode;
             }
-
-            return base.VisitLocalDeclarationStatement(node);
+            return base.VisitVariableDeclarator(node);
         }
 
         public SyntaxTrivia CommentAndRegionsTriviaNodes(SyntaxTrivia arg1, SyntaxTrivia arg2)
diff --git a/CSharpMinifier/RoslynMinifier.cs b/CSharpMinifier/RoslynMinifier.cs
index 5723494..e058fff 100644
--- a/CSharpMinifier/RoslynMinifier.cs
+++ b/CSharpMinifier/RoslynMinifier.cs
@@ -48,7 +48,7 @@ public string Minify()
         {
             if (Options.CommentsRemoving || Options.RegionsRemoving)
                 RemoveCommentsAndRegions();
-
+            return SyntaxTree.GetRoot().ToFullString();
             if (Options.LocalVarsCompressing || Options.UselessMembersCompressing)
                 CompressLocals();
             if (Options.MembersCompressing || Options.UselessMembersCompressing)
@@ -81,14 +81,15 @@ private void RemoveCommentsAndRegions()
         private void CompressLocals()
         {
             var root = (CompilationUnitSyntax)SyntaxTree.GetRoot();
-            var locals = root.DescendantNodes().OfType<VariableDeclarationSyntax>();
-            foreach (var variables in locals.Select(l => l.Variables))
-            {
-                foreach (var variable in variables)
-                {
-                }
+            var methods = root.DescendantNodes()
+            .OfType<MethodDeclarationSyntax>().ToList();
+            var localSymbols = SemanticModel
+                .LookupSymbols(methods.First().Body.Span.Start)
+                .Where(sym => sym.Kind == SymbolKind.Local);
+            foreach(var localSymbol in localSymbols)
+            {                
             }
-            var localsCopy = locals;
+            var i = 1;
         }
 
         private string GetStringWithoutSpaces()

From 9ed00c85a98c4e5056ad4d8bc1418a6a4144e8a2 Mon Sep 17 00:00:00 2001
From: codFather2 <dimalitva6@gmail.com>
Date: Wed, 14 Feb 2018 16:31:24 +0300
Subject: [PATCH 03/12] WIP: Add LocalCompress roslyn

---
 CSharpMinifier/CSharpMinifier.csproj       |  1 +
 CSharpMinifier/IdentifierGenerator.cs      | 92 ++++++++++++++++++++++
 CSharpMinifier/Rewriters/CSharpRewriter.cs | 45 +++++++----
 CSharpMinifier/RoslynMinifier.cs           | 68 +---------------
 4 files changed, 126 insertions(+), 80 deletions(-)
 create mode 100644 CSharpMinifier/IdentifierGenerator.cs

diff --git a/CSharpMinifier/CSharpMinifier.csproj b/CSharpMinifier/CSharpMinifier.csproj
index 81482cf..a9b41a3 100644
--- a/CSharpMinifier/CSharpMinifier.csproj
+++ b/CSharpMinifier/CSharpMinifier.csproj
@@ -146,6 +146,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CompileUtils.cs" />
+    <Compile Include="IdentifierGenerator.cs" />
     <Compile Include="IMinifier.cs" />
     <Compile Include="MinifyEnumsAstVisitor.cs" />
     <Compile Include="MinifyTypesAstVisitor.cs" />
diff --git a/CSharpMinifier/IdentifierGenerator.cs b/CSharpMinifier/IdentifierGenerator.cs
new file mode 100644
index 0000000..4f0914f
--- /dev/null
+++ b/CSharpMinifier/IdentifierGenerator.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace CSharpMinifier
+{
+    public class IdentifierGenerator
+    {
+        public Dictionary<VariableDeclaratorSyntax, string> RenamedVariables { get; private set; }
+
+        public Dictionary<MethodDeclarationSyntax, string> RenamedMethods { get; private set; }
+
+        public Dictionary<TypeDeclarationSyntax, string> RenamedTypes { get; private set; }
+
+        private List<string> _existingNames = new List<string>();
+
+        private const int FirstSymbolCode = 97;
+        private const int LastSymbolCode = 122;
+
+        private static string[] _cSharpKeywords = new string[]
+        {
+            "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char",
+            "checked", "class", "const", "continue", "decimal", "default", "delegate", "do", "double",
+            "else", "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float",
+            "for", "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal",
+            "is", "lock", "long", "namespace", "new", "null", "object", "operator", "out",
+            "override", "params", "private", "protected", "public", "readonly", "ref", "return", "sbyte",
+            "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch",
+            "this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe",
+            "ushort", "using", "virtual", "void", "volatile", "while"
+        };
+
+        public IdentifierGenerator()
+        {
+            RenamedVariables = new Dictionary<VariableDeclaratorSyntax, string>();
+            RenamedMethods = new Dictionary<MethodDeclarationSyntax, string>();
+            RenamedTypes = new Dictionary<TypeDeclarationSyntax, string>();
+        }
+
+        public string GetNextName(SyntaxNode node)
+        {
+            if (_existingNames.Count > 0)
+            {
+                string lastName = _existingNames[_existingNames.Count - 1];
+                string nextName = IncrementName(lastName);
+                _existingNames.Add(nextName);
+                AddToDictionary(node);
+                return nextName;
+            }
+            var firstSymbol = Char.ConvertFromUtf32(FirstSymbolCode);
+            _existingNames.Add(firstSymbol);
+            AddToDictionary(node);
+            return firstSymbol;
+        }
+
+        private void AddToDictionary(SyntaxNode node)
+        {
+            switch (node.Kind())
+            {
+                case SyntaxKind.MethodDeclaration:
+                    RenamedMethods.Add((MethodDeclarationSyntax)node, LastName);
+                    break;
+                case SyntaxKind.VariableDeclarator:
+                    RenamedVariables.Add((VariableDeclaratorSyntax)node, LastName);
+                    break;
+                case SyntaxKind.ClassDeclaration:
+                    RenamedTypes.Add((TypeDeclarationSyntax)node, LastName);
+                    break;
+            }
+        }
+
+
+        private string LastName => _existingNames.LastOrDefault();
+
+        private string IncrementName(string lastName)
+        {
+            char lastChar = lastName[lastName.Length - 1];
+            string fragment = lastName.Substring(0, lastName.Length - 1);
+            if (lastChar < LastSymbolCode)
+            {
+                lastChar++;
+                return fragment + lastChar;
+            }
+            return IncrementName(fragment) + Char.ConvertFromUtf32(FirstSymbolCode);
+        }
+    }
+}
diff --git a/CSharpMinifier/Rewriters/CSharpRewriter.cs b/CSharpMinifier/Rewriters/CSharpRewriter.cs
index d60ef67..16123ed 100644
--- a/CSharpMinifier/Rewriters/CSharpRewriter.cs
+++ b/CSharpMinifier/Rewriters/CSharpRewriter.cs
@@ -1,6 +1,10 @@
-using Microsoft.CodeAnalysis;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Mono.CSharp;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace CSharpMinifier.Rewriters
@@ -8,13 +12,14 @@ namespace CSharpMinifier.Rewriters
     class CSharpRewriter : CSharpSyntaxRewriter
     {
         private readonly SemanticModel _semanticModel;
-        private readonly string[] _namesGenerator;
-        private int _currentIndex = 0;
+        private MinifierOptions _options;
+        private IdentifierGenerator _identifierGenerator; 
 
-        public CSharpRewriter(SemanticModel semanticModel,bool visitIntoStructuredTrivia = true) : base(visitIntoStructuredTrivia)
+        public CSharpRewriter(SemanticModel semanticModel, MinifierOptions options = null, bool visitIntoStructuredTrivia = true) : base(visitIntoStructuredTrivia)
         {
             _semanticModel = semanticModel;
-            _namesGenerator = new string[]{ "a","b","c","d","e","f","g","h","j","l","m","n"};
+            _options = options ?? new MinifierOptions();
+            _identifierGenerator = new IdentifierGenerator();
         }
         
         public override SyntaxNode VisitRegionDirectiveTrivia(RegionDirectiveTriviaSyntax node)
@@ -32,28 +37,40 @@ public override SyntaxNode VisitEmptyStatement(EmptyStatementSyntax node)
             return null;
         }
 
-        public override SyntaxNode VisitLocalDeclarationStatement(LocalDeclarationStatementSyntax node)
-        {
-            return base.VisitLocalDeclarationStatement(node);
-        }
-
         public override SyntaxNode VisitVariableDeclarator(VariableDeclaratorSyntax node)
         {
-            if (node.IsKind(SyntaxKind.VariableDeclarator))
+            if (_options.LocalVarsCompressing)
             {
-                var newNode= node.ReplaceToken(node.Identifier, Identifier(_namesGenerator[_currentIndex]));
-                _currentIndex++;
+                var name = _identifierGenerator.GetNextName(node);
+                var newNode = node.WithIdentifier(Identifier(name));
                 return newNode;
             }
             return base.VisitVariableDeclarator(node);
         }
 
+        public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node)
+        {
+            if(_options.LocalVarsCompressing && _identifierGenerator.RenamedVariables.Any(i => i.Key.Identifier.ValueText == node.Identifier.ValueText))
+            {
+                var newName = _identifierGenerator.RenamedVariables.First(i => i.Key.Identifier.ValueText == node.Identifier.ValueText && node.FullSpan.IntersectsWith(i.Key.Parent.Parent.Parent.FullSpan)).Value;
+                return node.WithIdentifier(Identifier(newName)
+                    .WithTriviaFrom(node.Identifier));
+            }
+            return base.VisitIdentifierName(node);
+        }
+
+        public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax node)
+        {
+            return base.VisitPropertyDeclaration(node);
+        }
+
+
         public SyntaxTrivia CommentAndRegionsTriviaNodes(SyntaxTrivia arg1, SyntaxTrivia arg2)
         {
             if (arg1.IsKind(SyntaxKind.SingleLineCommentTrivia) || arg1.IsKind(SyntaxKind.MultiLineCommentTrivia)
                 || arg1.IsKind(SyntaxKind.RegionDirectiveTrivia) || arg1.IsKind(SyntaxKind.EndRegionDirectiveTrivia))
             {
-                arg2 = SyntaxFactory.CarriageReturn;
+                arg2 = CarriageReturn;
             }
             else
             {
diff --git a/CSharpMinifier/RoslynMinifier.cs b/CSharpMinifier/RoslynMinifier.cs
index e058fff..f2a8b67 100644
--- a/CSharpMinifier/RoslynMinifier.cs
+++ b/CSharpMinifier/RoslynMinifier.cs
@@ -46,75 +46,11 @@ public string MinifyFromString(string csharpCode)
 
         public string Minify()
         {
-            if (Options.CommentsRemoving || Options.RegionsRemoving)
-                RemoveCommentsAndRegions();
-            return SyntaxTree.GetRoot().ToFullString();
-            if (Options.LocalVarsCompressing || Options.UselessMembersCompressing)
-                CompressLocals();
-            if (Options.MembersCompressing || Options.UselessMembersCompressing)
-                CompressMembers();
-            if (Options.TypesCompressing)
-                CompressTypes();
-            if (Options.EnumToIntConversion)
-                ConvertEnumToInts();
-            if (Options.MiscCompressing || Options.NamespacesRemoving)
-                CompressMixed();
-
-            string result;
-            if (Options.SpacesRemoving)
-                result = GetStringWithoutSpaces();
-            else
-                result = SyntaxTree.ToString();
-
-            return result;
-        }
-
-        private void RemoveCommentsAndRegions()
-        {
-            var rewriter = new CSharpRewriter(SemanticModel);
+            var rewriter = new CSharpRewriter(SemanticModel, Options);
             var root = SyntaxTree.GetRoot();
             root = rewriter.Visit(root);
             var newRoot = root.ReplaceTrivia(root.DescendantTrivia(), rewriter.CommentAndRegionsTriviaNodes);
-            SyntaxTree = CSharpSyntaxTree.Create((CSharpSyntaxNode)newRoot);
-        }
-
-        private void CompressLocals()
-        {
-            var root = (CompilationUnitSyntax)SyntaxTree.GetRoot();
-            var methods = root.DescendantNodes()
-            .OfType<MethodDeclarationSyntax>().ToList();
-            var localSymbols = SemanticModel
-                .LookupSymbols(methods.First().Body.Span.Start)
-                .Where(sym => sym.Kind == SymbolKind.Local);
-            foreach(var localSymbol in localSymbols)
-            {                
-            }
-            var i = 1;
-        }
-
-        private string GetStringWithoutSpaces()
-        {
-            throw new NotImplementedException();
-        }
-
-        private void CompressMixed()
-        {
-            throw new NotImplementedException();
-        }
-
-        private void ConvertEnumToInts()
-        {
-            throw new NotImplementedException();
-        }
-
-        private void CompressTypes()
-        {
-            throw new NotImplementedException();
-        }
-
-        private void CompressMembers()
-        {
-            throw new NotImplementedException();
+            return newRoot.ToFullString();
         }
     }
 }

From 862d133a0568715f6d19180b06e18d765c54a8b3 Mon Sep 17 00:00:00 2001
From: codFather2 <dimalitva6@gmail.com>
Date: Mon, 19 Feb 2018 18:52:38 +0300
Subject: [PATCH 04/12] WIP version

---
 CSharpMinifier.GUI/App.config              |  4 +
 CSharpMinifier.Tests/app.config            |  4 +
 CSharpMinifier/CSharpMinifier.csproj       | 42 ++++++++++-
 CSharpMinifier/IdentifierGenerator.cs      | 11 ++-
 CSharpMinifier/Rewriters/CSharpRewriter.cs | 87 ++++++++++++++++------
 CSharpMinifier/RoslynMinifier.cs           | 11 +--
 CSharpMinifier/app.config                  |  4 +
 CSharpMinifier/packages.config             | 15 +++-
 8 files changed, 139 insertions(+), 39 deletions(-)

diff --git a/CSharpMinifier.GUI/App.config b/CSharpMinifier.GUI/App.config
index 58a5513..de68365 100644
--- a/CSharpMinifier.GUI/App.config
+++ b/CSharpMinifier.GUI/App.config
@@ -98,6 +98,10 @@
         <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/CSharpMinifier.Tests/app.config b/CSharpMinifier.Tests/app.config
index 9b6361b..49196a3 100644
--- a/CSharpMinifier.Tests/app.config
+++ b/CSharpMinifier.Tests/app.config
@@ -26,6 +26,10 @@
         <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/CSharpMinifier/CSharpMinifier.csproj b/CSharpMinifier/CSharpMinifier.csproj
index a9b41a3..cccd22d 100644
--- a/CSharpMinifier/CSharpMinifier.csproj
+++ b/CSharpMinifier/CSharpMinifier.csproj
@@ -34,6 +34,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Esent.Interop, Version=1.9.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\ManagedEsent.1.9.4\lib\net40\Esent.Interop.dll</HintPath>
+    </Reference>
     <Reference Include="ICSharpCode.NRefactory, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.dll</HintPath>
@@ -56,6 +59,21 @@
     <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.6.1\lib\net46\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.6.1\lib\net46\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+    </Reference>
     <Reference Include="Mono.Cecil, Version=0.9.5.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.dll</HintPath>
@@ -82,6 +100,21 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Composition.AttributedModel, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Composition.AttributedModel.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Convention, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Composition.Convention.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Hosting, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Composition.Hosting.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Runtime, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Composition.Runtime.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.TypedParts, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Composition.TypedParts.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
+    </Reference>
     <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
     </Reference>
@@ -106,6 +139,10 @@
     <Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net46\System.Security.Cryptography.Algorithms.dll</HintPath>
       <Private>True</Private>
@@ -172,10 +209,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CSharpMinifier/IdentifierGenerator.cs b/CSharpMinifier/IdentifierGenerator.cs
index 4f0914f..82b31f0 100644
--- a/CSharpMinifier/IdentifierGenerator.cs
+++ b/CSharpMinifier/IdentifierGenerator.cs
@@ -15,7 +15,9 @@ public class IdentifierGenerator
 
         public Dictionary<MethodDeclarationSyntax, string> RenamedMethods { get; private set; }
 
-        public Dictionary<TypeDeclarationSyntax, string> RenamedTypes { get; private set; }
+        public Dictionary<ClassDeclarationSyntax, string> RenamedTypes { get; private set; }
+
+        public Dictionary<FieldDeclarationSyntax, string> RenamedFields { get; set; }
 
         private List<string> _existingNames = new List<string>();
 
@@ -39,7 +41,7 @@ public IdentifierGenerator()
         {
             RenamedVariables = new Dictionary<VariableDeclaratorSyntax, string>();
             RenamedMethods = new Dictionary<MethodDeclarationSyntax, string>();
-            RenamedTypes = new Dictionary<TypeDeclarationSyntax, string>();
+            RenamedTypes = new Dictionary<ClassDeclarationSyntax, string>();
         }
 
         public string GetNextName(SyntaxNode node)
@@ -69,7 +71,10 @@ private void AddToDictionary(SyntaxNode node)
                     RenamedVariables.Add((VariableDeclaratorSyntax)node, LastName);
                     break;
                 case SyntaxKind.ClassDeclaration:
-                    RenamedTypes.Add((TypeDeclarationSyntax)node, LastName);
+                    RenamedTypes.Add((ClassDeclarationSyntax)node, LastName);
+                    break;
+                case SyntaxKind.FieldDeclaration:
+                    RenamedFields.Add((FieldDeclarationSyntax)node, LastName);
                     break;
             }
         }
diff --git a/CSharpMinifier/Rewriters/CSharpRewriter.cs b/CSharpMinifier/Rewriters/CSharpRewriter.cs
index 16123ed..024fec3 100644
--- a/CSharpMinifier/Rewriters/CSharpRewriter.cs
+++ b/CSharpMinifier/Rewriters/CSharpRewriter.cs
@@ -1,67 +1,106 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Mono.CSharp;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Rename;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace CSharpMinifier.Rewriters
 {
     class CSharpRewriter : CSharpSyntaxRewriter
     {
-        private readonly SemanticModel _semanticModel;
+        private SemanticModel _semanticModel;
+        private AdhocWorkspace _workspace;
         private MinifierOptions _options;
         private IdentifierGenerator _identifierGenerator; 
 
-        public CSharpRewriter(SemanticModel semanticModel, MinifierOptions options = null, bool visitIntoStructuredTrivia = true) : base(visitIntoStructuredTrivia)
+        public CSharpRewriter(MinifierOptions options = null, bool visitIntoStructuredTrivia = true) : base(visitIntoStructuredTrivia)
         {
-            _semanticModel = semanticModel;
             _options = options ?? new MinifierOptions();
             _identifierGenerator = new IdentifierGenerator();
+            //Add cause MSBuild does not work without it
+            var _ = typeof(Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions);
         }
-        
-        public override SyntaxNode VisitRegionDirectiveTrivia(RegionDirectiveTriviaSyntax node)
+
+        public SyntaxNode VisitAndRename(SyntaxNode node)
         {
-            return null;
+            node = Visit(node);
+            return RenameAll(node);
         }
 
-        public override SyntaxNode VisitEndRegionDirectiveTrivia(EndRegionDirectiveTriviaSyntax node)
+        private SyntaxNode RenameAll(SyntaxNode node)
         {
-            return null;
+            var mscorlib = MetadataReference.CreateFromFile(typeof(object).Assembly.Location);
+            _workspace = new AdhocWorkspace();
+            var project = _workspace.AddProject("MinifierProject", LanguageNames.CSharp);
+            project = project.AddMetadataReference(mscorlib);
+            _workspace.TryApplyChanges(project.Solution);
+            var source = node.GetText();
+            var document = _workspace.AddDocument(project.Id, "Doc", source);
+            _semanticModel = document.GetSemanticModelAsync().Result;
+            var newNode = _semanticModel.SyntaxTree.GetRoot();
+            var newSolution = document.Project.Solution;
+            foreach (KeyValuePair<VariableDeclaratorSyntax, string> variable in _identifierGenerator.RenamedVariables)
+            {
+                var nodeToSearch = newNode.DescendantNodes()
+                    .OfType<VariableDeclaratorSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(variable.Key.Identifier.ValueText));
+                newNode = Rename(document, nodeToSearch, variable.Value);
+            }
+            foreach (var classToRename in _identifierGenerator.RenamedTypes)
+            {
+                var nodeToSearch = newNode.DescendantNodes()
+                    .OfType<ClassDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(classToRename.Key.Identifier.ValueText));
+                newNode = Rename(document, nodeToSearch, classToRename.Value);
+            }
+            foreach (var fieldToRename in _identifierGenerator.RenamedFields)
+            {
+                
+            }
+
+            newNode = newSolution.Projects.First().Documents.First().GetSemanticModelAsync().Result.SyntaxTree.GetRoot();
+            return newNode;
         }
 
-        public override SyntaxNode VisitEmptyStatement(EmptyStatementSyntax node)
+        private SyntaxNode Rename(Document document, SyntaxNode nodeToRename, string newName)
         {
-            return null;
+            var symbolInfo = _semanticModel.GetSymbolInfo(nodeToRename).Symbol ?? _semanticModel.GetDeclaredSymbol(nodeToRename);
+            var solution = Renamer.RenameSymbolAsync(document.Project.Solution, symbolInfo, newName,
+                _workspace.Options).Result;
+            _workspace.TryApplyChanges(solution);
+            document = _workspace.CurrentSolution.GetDocument(document.Id);
+            _semanticModel = document.GetSemanticModelAsync().Result;
+            return _semanticModel.SyntaxTree.GetRoot();
         }
 
-        public override SyntaxNode VisitVariableDeclarator(VariableDeclaratorSyntax node)
+        public override SyntaxNode VisitLocalDeclarationStatement(LocalDeclarationStatementSyntax node)
         {
             if (_options.LocalVarsCompressing)
             {
-                var name = _identifierGenerator.GetNextName(node);
-                var newNode = node.WithIdentifier(Identifier(name));
-                return newNode;
+                _identifierGenerator.GetNextName(node.Declaration.Variables.First());
             }
-            return base.VisitVariableDeclarator(node);
+            return base.VisitLocalDeclarationStatement(node);
         }
 
-        public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node)
+        public override SyntaxNode VisitClassDeclaration(ClassDeclarationSyntax node)
         {
-            if(_options.LocalVarsCompressing && _identifierGenerator.RenamedVariables.Any(i => i.Key.Identifier.ValueText == node.Identifier.ValueText))
+            if (_options.PublicCompressing)
             {
-                var newName = _identifierGenerator.RenamedVariables.First(i => i.Key.Identifier.ValueText == node.Identifier.ValueText && node.FullSpan.IntersectsWith(i.Key.Parent.Parent.Parent.FullSpan)).Value;
-                return node.WithIdentifier(Identifier(newName)
-                    .WithTriviaFrom(node.Identifier));
+                _identifierGenerator.GetNextName(node);
             }
-            return base.VisitIdentifierName(node);
+            return base.VisitClassDeclaration(node);
         }
 
-        public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax node)
+        public override SyntaxNode VisitFieldDeclaration(FieldDeclarationSyntax node)
         {
-            return base.VisitPropertyDeclaration(node);
+            if (_options.PublicCompressing)
+            {
+                _identifierGenerator.GetNextName(node);
+            }
+            return base.VisitFieldDeclaration(node);
         }
 
 
diff --git a/CSharpMinifier/RoslynMinifier.cs b/CSharpMinifier/RoslynMinifier.cs
index f2a8b67..9585734 100644
--- a/CSharpMinifier/RoslynMinifier.cs
+++ b/CSharpMinifier/RoslynMinifier.cs
@@ -14,9 +14,7 @@ namespace CSharpMinifier
     public class RoslynMinifier : IMinifier
     {
         public SyntaxTree SyntaxTree { get; private set; }
-
-        public SemanticModel SemanticModel { get; private set; }
-
+        
         public MinifierOptions Options { get; private set; }
 
         public List<string> IgnoredIdentifiers { get; private set; }
@@ -38,17 +36,14 @@ public string MinifyFiles(string[] csFiles)
         public string MinifyFromString(string csharpCode)
         {
             SyntaxTree = CSharpSyntaxTree.ParseText(csharpCode);
-            var Mscorlib = MetadataReference.CreateFromFile(typeof(object).Assembly.Location);
-            var compilation = CSharpCompilation.Create("MyCompilation", new[] { SyntaxTree }, new[] { Mscorlib });
-            SemanticModel = compilation.GetSemanticModel(SyntaxTree);
             return Minify();
         }
 
         public string Minify()
         {
-            var rewriter = new CSharpRewriter(SemanticModel, Options);
+            var rewriter = new CSharpRewriter(Options);
             var root = SyntaxTree.GetRoot();
-            root = rewriter.Visit(root);
+            root = rewriter.VisitAndRename(root);
             var newRoot = root.ReplaceTrivia(root.DescendantTrivia(), rewriter.CommentAndRegionsTriviaNodes);
             return newRoot.ToFullString();
         }
diff --git a/CSharpMinifier/app.config b/CSharpMinifier/app.config
index 9b6361b..49196a3 100644
--- a/CSharpMinifier/app.config
+++ b/CSharpMinifier/app.config
@@ -26,6 +26,10 @@
         <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/CSharpMinifier/packages.config b/CSharpMinifier/packages.config
index dc1fc0b..c138d71 100644
--- a/CSharpMinifier/packages.config
+++ b/CSharpMinifier/packages.config
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ICSharpCode.NRefactory" version="5.5.1" targetFramework="net40" />
-  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net46" />
+  <package id="ManagedEsent" version="1.9.4" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis" version="2.6.1" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />
   <package id="Microsoft.CodeAnalysis.Common" version="2.6.1" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis.CSharp" version="2.6.1" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="2.6.1" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.VisualBasic" version="2.6.1" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="2.6.1" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="2.6.1" targetFramework="net46" />
   <package id="Mono.Cecil" version="0.9.5.4" targetFramework="net40" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net46" />
+  <package id="System.Composition" version="1.0.31" targetFramework="net46" />
+  <package id="System.Composition.AttributedModel" version="1.0.31" targetFramework="net46" />
+  <package id="System.Composition.Convention" version="1.0.31" targetFramework="net46" />
+  <package id="System.Composition.Hosting" version="1.0.31" targetFramework="net46" />
+  <package id="System.Composition.Runtime" version="1.0.31" targetFramework="net46" />
+  <package id="System.Composition.TypedParts" version="1.0.31" targetFramework="net46" />
   <package id="System.Console" version="4.3.0" targetFramework="net46" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net46" />
   <package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net46" />
@@ -27,6 +39,7 @@
   <package id="System.Runtime" version="4.3.0" targetFramework="net46" />
   <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net46" />
   <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net46" />
   <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net46" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net46" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net46" />

From 569e4067e024a3219c010d9277ff607981373fc2 Mon Sep 17 00:00:00 2001
From: codeFather2 <Dmitry.Litovchenko1@yandex.ru>
Date: Mon, 19 Feb 2018 20:52:19 +0300
Subject: [PATCH 05/12] WIP: Move To Roslyn

---
 CSharpMinifier/IdentifierGenerator.cs      |  1 +
 CSharpMinifier/Rewriters/CSharpRewriter.cs | 26 +++++++++-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/CSharpMinifier/IdentifierGenerator.cs b/CSharpMinifier/IdentifierGenerator.cs
index 82b31f0..fe7dda0 100644
--- a/CSharpMinifier/IdentifierGenerator.cs
+++ b/CSharpMinifier/IdentifierGenerator.cs
@@ -42,6 +42,7 @@ public IdentifierGenerator()
             RenamedVariables = new Dictionary<VariableDeclaratorSyntax, string>();
             RenamedMethods = new Dictionary<MethodDeclarationSyntax, string>();
             RenamedTypes = new Dictionary<ClassDeclarationSyntax, string>();
+            RenamedFields = new Dictionary<FieldDeclarationSyntax, string>();
         }
 
         public string GetNextName(SyntaxNode node)
diff --git a/CSharpMinifier/Rewriters/CSharpRewriter.cs b/CSharpMinifier/Rewriters/CSharpRewriter.cs
index 024fec3..bf18ef1 100644
--- a/CSharpMinifier/Rewriters/CSharpRewriter.cs
+++ b/CSharpMinifier/Rewriters/CSharpRewriter.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.Rename;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
@@ -48,24 +45,19 @@ private SyntaxNode RenameAll(SyntaxNode node)
             {
                 var nodeToSearch = newNode.DescendantNodes()
                     .OfType<VariableDeclaratorSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(variable.Key.Identifier.ValueText));
-                newNode = Rename(document, nodeToSearch, variable.Value);
+                (newNode, document) = Rename(nodeToSearch, document, variable.Value);
             }
             foreach (var classToRename in _identifierGenerator.RenamedTypes)
             {
                 var nodeToSearch = newNode.DescendantNodes()
                     .OfType<ClassDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(classToRename.Key.Identifier.ValueText));
-                newNode = Rename(document, nodeToSearch, classToRename.Value);
-            }
-            foreach (var fieldToRename in _identifierGenerator.RenamedFields)
-            {
-                
+                (newNode, document) = Rename(nodeToSearch, document, classToRename.Value);
             }
 
-            newNode = newSolution.Projects.First().Documents.First().GetSemanticModelAsync().Result.SyntaxTree.GetRoot();
             return newNode;
         }
 
-        private SyntaxNode Rename(Document document, SyntaxNode nodeToRename, string newName)
+        private (SyntaxNode node, Document document) Rename(SyntaxNode nodeToRename, Document document, string newName)
         {
             var symbolInfo = _semanticModel.GetSymbolInfo(nodeToRename).Symbol ?? _semanticModel.GetDeclaredSymbol(nodeToRename);
             var solution = Renamer.RenameSymbolAsync(document.Project.Solution, symbolInfo, newName,
@@ -73,7 +65,7 @@ private SyntaxNode Rename(Document document, SyntaxNode nodeToRename, string new
             _workspace.TryApplyChanges(solution);
             document = _workspace.CurrentSolution.GetDocument(document.Id);
             _semanticModel = document.GetSemanticModelAsync().Result;
-            return _semanticModel.SyntaxTree.GetRoot();
+            return (_semanticModel.SyntaxTree.GetRoot(), document);
         }
 
         public override SyntaxNode VisitLocalDeclarationStatement(LocalDeclarationStatementSyntax node)
@@ -96,9 +88,13 @@ public override SyntaxNode VisitClassDeclaration(ClassDeclarationSyntax node)
 
         public override SyntaxNode VisitFieldDeclaration(FieldDeclarationSyntax node)
         {
-            if (_options.PublicCompressing)
+            if(_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals("private")))
             {
-                _identifierGenerator.GetNextName(node);
+                _identifierGenerator.GetNextName(node.Declaration.Variables.First());
+            }
+            else if (_options.PublicCompressing && node.Modifiers.Any(m => m.Value.Equals("public")))
+            {
+                _identifierGenerator.GetNextName(node.Declaration.Variables.First());
             }
             return base.VisitFieldDeclaration(node);
         }

From 5abeb53995ac7760de4ef050808dc751ceb38a2d Mon Sep 17 00:00:00 2001
From: codFather2 <dimalitva6@gmail.com>
Date: Tue, 20 Feb 2018 12:34:03 +0300
Subject: [PATCH 06/12] Add Properties

---
 CSharpMinifier/IdentifierGenerator.cs      | 16 ++++++++++------
 CSharpMinifier/Rewriters/CSharpRewriter.cs | 20 +++++++++++++++++++-
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/CSharpMinifier/IdentifierGenerator.cs b/CSharpMinifier/IdentifierGenerator.cs
index fe7dda0..6ce447d 100644
--- a/CSharpMinifier/IdentifierGenerator.cs
+++ b/CSharpMinifier/IdentifierGenerator.cs
@@ -17,7 +17,7 @@ public class IdentifierGenerator
 
         public Dictionary<ClassDeclarationSyntax, string> RenamedTypes { get; private set; }
 
-        public Dictionary<FieldDeclarationSyntax, string> RenamedFields { get; set; }
+        public Dictionary<PropertyDeclarationSyntax, string> RenamedProperties { get; set; }
 
         private List<string> _existingNames = new List<string>();
 
@@ -42,7 +42,7 @@ public IdentifierGenerator()
             RenamedVariables = new Dictionary<VariableDeclaratorSyntax, string>();
             RenamedMethods = new Dictionary<MethodDeclarationSyntax, string>();
             RenamedTypes = new Dictionary<ClassDeclarationSyntax, string>();
-            RenamedFields = new Dictionary<FieldDeclarationSyntax, string>();
+            RenamedProperties = new Dictionary<PropertyDeclarationSyntax, string>();
         }
 
         public string GetNextName(SyntaxNode node)
@@ -74,8 +74,8 @@ private void AddToDictionary(SyntaxNode node)
                 case SyntaxKind.ClassDeclaration:
                     RenamedTypes.Add((ClassDeclarationSyntax)node, LastName);
                     break;
-                case SyntaxKind.FieldDeclaration:
-                    RenamedFields.Add((FieldDeclarationSyntax)node, LastName);
+                case SyntaxKind.PropertyDeclaration:
+                    RenamedProperties.Add((PropertyDeclarationSyntax)node, LastName);
                     break;
             }
         }
@@ -85,14 +85,18 @@ private void AddToDictionary(SyntaxNode node)
 
         private string IncrementName(string lastName)
         {
+            if (lastName.Length <= 0)
+                lastName = "a";
             char lastChar = lastName[lastName.Length - 1];
             string fragment = lastName.Substring(0, lastName.Length - 1);
-            if (lastChar < LastSymbolCode)
+            while (lastChar < LastSymbolCode)
             {
                 lastChar++;
+                if (_cSharpKeywords.Contains(fragment + lastChar))
+                    continue;
                 return fragment + lastChar;
             }
             return IncrementName(fragment) + Char.ConvertFromUtf32(FirstSymbolCode);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/CSharpMinifier/Rewriters/CSharpRewriter.cs b/CSharpMinifier/Rewriters/CSharpRewriter.cs
index bf18ef1..7dada55 100644
--- a/CSharpMinifier/Rewriters/CSharpRewriter.cs
+++ b/CSharpMinifier/Rewriters/CSharpRewriter.cs
@@ -40,7 +40,6 @@ private SyntaxNode RenameAll(SyntaxNode node)
             var document = _workspace.AddDocument(project.Id, "Doc", source);
             _semanticModel = document.GetSemanticModelAsync().Result;
             var newNode = _semanticModel.SyntaxTree.GetRoot();
-            var newSolution = document.Project.Solution;
             foreach (KeyValuePair<VariableDeclaratorSyntax, string> variable in _identifierGenerator.RenamedVariables)
             {
                 var nodeToSearch = newNode.DescendantNodes()
@@ -53,6 +52,12 @@ private SyntaxNode RenameAll(SyntaxNode node)
                     .OfType<ClassDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(classToRename.Key.Identifier.ValueText));
                 (newNode, document) = Rename(nodeToSearch, document, classToRename.Value);
             }
+            foreach (var propertyToRename in _identifierGenerator.RenamedProperties)
+            {
+                var nodeToSearch = newNode.DescendantNodes()
+                    .OfType<PropertyDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(propertyToRename.Key.Identifier.ValueText));
+                (newNode, document) = Rename(nodeToSearch, document, propertyToRename.Value);
+            }
 
             return newNode;
         }
@@ -99,6 +104,19 @@ public override SyntaxNode VisitFieldDeclaration(FieldDeclarationSyntax node)
             return base.VisitFieldDeclaration(node);
         }
 
+        public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax node)
+        {
+            if (_options.PublicCompressing && node.Modifiers.Any(m => m.Value.Equals("public")))
+            {
+                _identifierGenerator.GetNextName(node);
+            }
+            else if (_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals("private")))
+            {
+                _identifierGenerator.GetNextName(node);
+            }
+            return base.VisitPropertyDeclaration(node);
+        }
+
 
         public SyntaxTrivia CommentAndRegionsTriviaNodes(SyntaxTrivia arg1, SyntaxTrivia arg2)
         {

From d2f9a5cee9786a85fd263f4931d328d682af8fab Mon Sep 17 00:00:00 2001
From: codeFather2 <Dmitry.Litovchenko1@yandex.ru>
Date: Fri, 23 Feb 2018 16:47:47 +0300
Subject: [PATCH 07/12] Add Minifying from files ref #35

---
 CSharpMinifier/CSharpMinifier.csproj          |  2 +-
 CSharpMinifier/IMinifier.cs                   |  2 -
 CSharpMinifier/IdentifierGenerator.cs         | 14 +--
 .../{CSharpRewriter.cs => TokensMinifier.cs}  | 88 ++++++++++++++-----
 CSharpMinifier/RoslynMinifier.cs              | 57 ++++++++----
 5 files changed, 113 insertions(+), 50 deletions(-)
 rename CSharpMinifier/Rewriters/{CSharpRewriter.cs => TokensMinifier.cs} (59%)

diff --git a/CSharpMinifier/CSharpMinifier.csproj b/CSharpMinifier/CSharpMinifier.csproj
index cccd22d..88a8e2f 100644
--- a/CSharpMinifier/CSharpMinifier.csproj
+++ b/CSharpMinifier/CSharpMinifier.csproj
@@ -198,7 +198,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RandomIdGenerator.cs" />
     <Compile Include="ResolveResultType.cs" />
-    <Compile Include="Rewriters\CSharpRewriter.cs" />
+    <Compile Include="Rewriters\TokensMinifier.cs" />
     <Compile Include="RoslynMinifier.cs" />
     <Compile Include="Substitutor.cs" />
   </ItemGroup>
diff --git a/CSharpMinifier/IMinifier.cs b/CSharpMinifier/IMinifier.cs
index 3617d75..58f8574 100644
--- a/CSharpMinifier/IMinifier.cs
+++ b/CSharpMinifier/IMinifier.cs
@@ -2,8 +2,6 @@
 {
     public interface IMinifier
     {
-        string Minify();
-
         string MinifyFiles(string[] csFiles);
 
         string MinifyFromString(string csharpCode);
diff --git a/CSharpMinifier/IdentifierGenerator.cs b/CSharpMinifier/IdentifierGenerator.cs
index fe7dda0..82664dc 100644
--- a/CSharpMinifier/IdentifierGenerator.cs
+++ b/CSharpMinifier/IdentifierGenerator.cs
@@ -21,8 +21,8 @@ public class IdentifierGenerator
 
         private List<string> _existingNames = new List<string>();
 
-        private const int FirstSymbolCode = 97;
-        private const int LastSymbolCode = 122;
+        private const int FirstSymbolCode = 'a';
+        private const int LastSymbolCode = 'z';
 
         private static string[] _cSharpKeywords = new string[]
         {
@@ -55,10 +55,10 @@ public string GetNextName(SyntaxNode node)
                 AddToDictionary(node);
                 return nextName;
             }
-            var firstSymbol = Char.ConvertFromUtf32(FirstSymbolCode);
-            _existingNames.Add(firstSymbol);
+            char firstSymbol = (char)FirstSymbolCode;
+            _existingNames.Add(firstSymbol.ToString());
             AddToDictionary(node);
-            return firstSymbol;
+            return firstSymbol.ToString();
         }
 
         private void AddToDictionary(SyntaxNode node)
@@ -85,6 +85,10 @@ private void AddToDictionary(SyntaxNode node)
 
         private string IncrementName(string lastName)
         {
+            if(lastName.Length == 0)
+            {
+                return "a";
+            }
             char lastChar = lastName[lastName.Length - 1];
             string fragment = lastName.Substring(0, lastName.Length - 1);
             if (lastChar < LastSymbolCode)
diff --git a/CSharpMinifier/Rewriters/CSharpRewriter.cs b/CSharpMinifier/Rewriters/TokensMinifier.cs
similarity index 59%
rename from CSharpMinifier/Rewriters/CSharpRewriter.cs
rename to CSharpMinifier/Rewriters/TokensMinifier.cs
index bf18ef1..6f93dd3 100644
--- a/CSharpMinifier/Rewriters/CSharpRewriter.cs
+++ b/CSharpMinifier/Rewriters/TokensMinifier.cs
@@ -8,53 +8,65 @@
 
 namespace CSharpMinifier.Rewriters
 {
-    class CSharpRewriter : CSharpSyntaxRewriter
+    class TokensMinifier : CSharpSyntaxRewriter
     {
         private SemanticModel _semanticModel;
         private AdhocWorkspace _workspace;
         private MinifierOptions _options;
         private IdentifierGenerator _identifierGenerator; 
 
-        public CSharpRewriter(MinifierOptions options = null, bool visitIntoStructuredTrivia = true) : base(visitIntoStructuredTrivia)
+        public TokensMinifier(AdhocWorkspace workspace, MinifierOptions options = null, bool visitIntoStructuredTrivia = true) : base(visitIntoStructuredTrivia)
         {
             _options = options ?? new MinifierOptions();
             _identifierGenerator = new IdentifierGenerator();
-            //Add cause MSBuild does not work without it
+            _workspace = workspace;
+            //Add cause MSBuild does not copy Charp.Workspace.dll
             var _ = typeof(Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions);
         }
 
-        public SyntaxNode VisitAndRename(SyntaxNode node)
+        public AdhocWorkspace VisitAndRename()
         {
-            node = Visit(node);
-            return RenameAll(node);
+            foreach(var project in _workspace.CurrentSolution.Projects)
+            {
+                foreach(var document in project.Documents)
+                {
+                    _semanticModel = document.GetSemanticModelAsync().Result;
+                    var node = _semanticModel.SyntaxTree.GetRoot();
+                    node = Visit(node);
+                    node = node.ReplaceTrivia(node.DescendantTrivia(), ReplaceTriviaNodes);
+                    RenameAll(document.WithSyntaxRoot(node));
+                }
+            }
+
+            return _workspace;
         }
 
-        private SyntaxNode RenameAll(SyntaxNode node)
-        {
-            var mscorlib = MetadataReference.CreateFromFile(typeof(object).Assembly.Location);
-            _workspace = new AdhocWorkspace();
-            var project = _workspace.AddProject("MinifierProject", LanguageNames.CSharp);
-            project = project.AddMetadataReference(mscorlib);
-            _workspace.TryApplyChanges(project.Solution);
-            var source = node.GetText();
-            var document = _workspace.AddDocument(project.Id, "Doc", source);
+        private void RenameAll(Document document)
+        {           
             _semanticModel = document.GetSemanticModelAsync().Result;
             var newNode = _semanticModel.SyntaxTree.GetRoot();
-            var newSolution = document.Project.Solution;
+
             foreach (KeyValuePair<VariableDeclaratorSyntax, string> variable in _identifierGenerator.RenamedVariables)
             {
                 var nodeToSearch = newNode.DescendantNodes()
                     .OfType<VariableDeclaratorSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(variable.Key.Identifier.ValueText));
                 (newNode, document) = Rename(nodeToSearch, document, variable.Value);
             }
+
+            foreach(var method in _identifierGenerator.RenamedMethods)
+            {
+                var nodeToSearch = newNode.DescendantNodes()
+                    .OfType<MethodDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(method.Key.Identifier.ValueText));
+                (newNode, document) = Rename(nodeToSearch, document, method.Value);
+            }
+
             foreach (var classToRename in _identifierGenerator.RenamedTypes)
             {
                 var nodeToSearch = newNode.DescendantNodes()
                     .OfType<ClassDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(classToRename.Key.Identifier.ValueText));
                 (newNode, document) = Rename(nodeToSearch, document, classToRename.Value);
             }
-
-            return newNode;
+            
         }
 
         private (SyntaxNode node, Document document) Rename(SyntaxNode nodeToRename, Document document, string newName)
@@ -99,17 +111,45 @@ public override SyntaxNode VisitFieldDeclaration(FieldDeclarationSyntax node)
             return base.VisitFieldDeclaration(node);
         }
 
+        public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node)
+        {
+            if (_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals("private")))
+            {
+                _identifierGenerator.GetNextName(node);
+            }
+            else if (_options.PublicCompressing && node.Modifiers.Any(m => m.Value.Equals("public")))
+            {
+                _identifierGenerator.GetNextName(node);
+            }
+            return base.VisitMethodDeclaration(node);
+        }
+
 
-        public SyntaxTrivia CommentAndRegionsTriviaNodes(SyntaxTrivia arg1, SyntaxTrivia arg2)
+        public SyntaxTrivia ReplaceTriviaNodes(SyntaxTrivia arg1, SyntaxTrivia arg2)
         {
-            if (arg1.IsKind(SyntaxKind.SingleLineCommentTrivia) || arg1.IsKind(SyntaxKind.MultiLineCommentTrivia)
-                || arg1.IsKind(SyntaxKind.RegionDirectiveTrivia) || arg1.IsKind(SyntaxKind.EndRegionDirectiveTrivia))
+            if(_options.CommentsRemoving || _options.RegionsRemoving)
             {
-                arg2 = CarriageReturn;
+                if (arg1.IsKind(SyntaxKind.SingleLineCommentTrivia) || arg1.IsKind(SyntaxKind.MultiLineCommentTrivia)
+                || arg1.IsKind(SyntaxKind.RegionDirectiveTrivia) || arg1.IsKind(SyntaxKind.EndRegionDirectiveTrivia))
+                {
+                    arg2 = CarriageReturn;
+                }
+                else
+                {
+                    arg2 = arg1;
+                }
             }
-            else
+            if (_options.SpacesRemoving)
             {
-                arg2 = arg1;
+                if (arg1.IsKind(SyntaxKind.WhitespaceTrivia) || arg1.IsKind(SyntaxKind.EndOfLineTrivia))
+                {
+                    arg2 = CarriageReturn;
+                }
+                else
+                {
+                    arg2 = arg1;
+                }
+                
             }
             return arg2;
         }
diff --git a/CSharpMinifier/RoslynMinifier.cs b/CSharpMinifier/RoslynMinifier.cs
index 9585734..d3ef0ea 100644
--- a/CSharpMinifier/RoslynMinifier.cs
+++ b/CSharpMinifier/RoslynMinifier.cs
@@ -1,51 +1,72 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using CSharpMinifier.Rewriters;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace CSharpMinifier
 {
     public class RoslynMinifier : IMinifier
     {
-        public SyntaxTree SyntaxTree { get; private set; }
-        
         public MinifierOptions Options { get; private set; }
 
         public List<string> IgnoredIdentifiers { get; private set; }
 
         public List<string> IgnoredComments { get; private set; }
 
+        private AdhocWorkspace _workspace;
+        private PortableExecutableReference _mscorlib;
+
         public RoslynMinifier(MinifierOptions options = null, string[] ignoredIdentifiers = null, string[] ignoredComments = null)
         {
             Options = options ?? new MinifierOptions();
             IgnoredIdentifiers = ignoredIdentifiers?.ToList() ?? new List<string>();
             IgnoredComments = ignoredComments?.ToList() ?? new List<string>();
+            _workspace = new AdhocWorkspace();
+            _mscorlib = MetadataReference.CreateFromFile(typeof(object).Assembly.Location);
         }
 
         public string MinifyFiles(string[] csFiles)
         {
-            throw new NotImplementedException();
+            var project = _workspace.AddProject("MinifierProject", LanguageNames.CSharp);
+            project = project.AddMetadataReference(_mscorlib);
+            _workspace.TryApplyChanges(project.Solution);
+            var tempName = "tempFile";
+
+            for(int i = 0; i < csFiles.Length; i++)
+            {
+                var syntaxTree = CSharpSyntaxTree.ParseText(csFiles[i]);                
+                _workspace.AddDocument(project.Id, tempName + i, syntaxTree.GetText());
+            }
+
+            _workspace = Minify(_workspace);
+            StringBuilder builder = new StringBuilder();
+            var minifiedSources = _workspace.CurrentSolution.Projects.First().Documents.Select(d => d.GetTextAsync().Result.ToString());
+
+            foreach (var source in minifiedSources)
+                builder.Append(source);
+
+            return builder.ToString();
         }
 
         public string MinifyFromString(string csharpCode)
         {
-            SyntaxTree = CSharpSyntaxTree.ParseText(csharpCode);
-            return Minify();
+            var syntaxTree = CSharpSyntaxTree.ParseText(csharpCode);
+            var project = _workspace.AddProject("MinifierProject", LanguageNames.CSharp);
+            project = project.AddMetadataReference(_mscorlib);
+            _workspace.TryApplyChanges(project.Solution);
+            var document = _workspace.AddDocument(project.Id, "Doc", syntaxTree.GetText());
+            _workspace = Minify(_workspace);
+
+            return _workspace.CurrentSolution.Projects.First()
+                .Documents.First().GetTextAsync().Result.ToString();
         }
 
-        public string Minify()
+        private AdhocWorkspace Minify(AdhocWorkspace workspace)
         {
-            var rewriter = new CSharpRewriter(Options);
-            var root = SyntaxTree.GetRoot();
-            root = rewriter.VisitAndRename(root);
-            var newRoot = root.ReplaceTrivia(root.DescendantTrivia(), rewriter.CommentAndRegionsTriviaNodes);
-            return newRoot.ToFullString();
-        }
+            var rewriter = new TokensMinifier(workspace, Options);
+            return rewriter.VisitAndRename();
+        }        
     }
-}
+}
\ No newline at end of file

From 243194d271950bd58be80fb662bc0d8b90f92318 Mon Sep 17 00:00:00 2001
From: codeFather2 <Dmitry.Litovchenko1@yandex.ru>
Date: Fri, 23 Feb 2018 16:54:36 +0300
Subject: [PATCH 08/12] Fix code style

---
 CSharpMinifier/IdentifierGenerator.cs      | 15 +++++++--------
 CSharpMinifier/Rewriters/TokensMinifier.cs |  6 +++---
 CSharpMinifier/RoslynMinifier.cs           |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/CSharpMinifier/IdentifierGenerator.cs b/CSharpMinifier/IdentifierGenerator.cs
index 82664dc..58d02c9 100644
--- a/CSharpMinifier/IdentifierGenerator.cs
+++ b/CSharpMinifier/IdentifierGenerator.cs
@@ -21,8 +21,8 @@ public class IdentifierGenerator
 
         private List<string> _existingNames = new List<string>();
 
-        private const int FirstSymbolCode = 'a';
-        private const int LastSymbolCode = 'z';
+        private const char FirstSymbolCode = 'a';
+        private const char LastSymbolCode = 'z';
 
         private static string[] _cSharpKeywords = new string[]
         {
@@ -54,11 +54,10 @@ public string GetNextName(SyntaxNode node)
                 _existingNames.Add(nextName);
                 AddToDictionary(node);
                 return nextName;
-            }
-            char firstSymbol = (char)FirstSymbolCode;
-            _existingNames.Add(firstSymbol.ToString());
+            }            
+            _existingNames.Add(FirstSymbolCode.ToString());
             AddToDictionary(node);
-            return firstSymbol.ToString();
+            return FirstSymbolCode.ToString();
         }
 
         private void AddToDictionary(SyntaxNode node)
@@ -85,7 +84,7 @@ private void AddToDictionary(SyntaxNode node)
 
         private string IncrementName(string lastName)
         {
-            if(lastName.Length == 0)
+            if (lastName.Length == 0)
             {
                 return "a";
             }
@@ -96,7 +95,7 @@ private string IncrementName(string lastName)
                 lastChar++;
                 return fragment + lastChar;
             }
-            return IncrementName(fragment) + Char.ConvertFromUtf32(FirstSymbolCode);
+            return IncrementName(fragment) + FirstSymbolCode;
         }
     }
 }
diff --git a/CSharpMinifier/Rewriters/TokensMinifier.cs b/CSharpMinifier/Rewriters/TokensMinifier.cs
index 6f93dd3..2d37f9b 100644
--- a/CSharpMinifier/Rewriters/TokensMinifier.cs
+++ b/CSharpMinifier/Rewriters/TokensMinifier.cs
@@ -24,7 +24,7 @@ public TokensMinifier(AdhocWorkspace workspace, MinifierOptions options = null,
             var _ = typeof(Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions);
         }
 
-        public AdhocWorkspace VisitAndRename()
+        public AdhocWorkspace MinifyIdentifiers()
         {
             foreach(var project in _workspace.CurrentSolution.Projects)
             {
@@ -100,7 +100,7 @@ public override SyntaxNode VisitClassDeclaration(ClassDeclarationSyntax node)
 
         public override SyntaxNode VisitFieldDeclaration(FieldDeclarationSyntax node)
         {
-            if(_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals("private")))
+            if (_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals("private")))
             {
                 _identifierGenerator.GetNextName(node.Declaration.Variables.First());
             }
@@ -127,7 +127,7 @@ public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node)
 
         public SyntaxTrivia ReplaceTriviaNodes(SyntaxTrivia arg1, SyntaxTrivia arg2)
         {
-            if(_options.CommentsRemoving || _options.RegionsRemoving)
+            if (_options.CommentsRemoving || _options.RegionsRemoving)
             {
                 if (arg1.IsKind(SyntaxKind.SingleLineCommentTrivia) || arg1.IsKind(SyntaxKind.MultiLineCommentTrivia)
                 || arg1.IsKind(SyntaxKind.RegionDirectiveTrivia) || arg1.IsKind(SyntaxKind.EndRegionDirectiveTrivia))
diff --git a/CSharpMinifier/RoslynMinifier.cs b/CSharpMinifier/RoslynMinifier.cs
index d3ef0ea..c057367 100644
--- a/CSharpMinifier/RoslynMinifier.cs
+++ b/CSharpMinifier/RoslynMinifier.cs
@@ -66,7 +66,7 @@ public string MinifyFromString(string csharpCode)
         private AdhocWorkspace Minify(AdhocWorkspace workspace)
         {
             var rewriter = new TokensMinifier(workspace, Options);
-            return rewriter.VisitAndRename();
+            return rewriter.MinifyIdentifiers();
         }        
     }
 }
\ No newline at end of file

From b6c5fd0060435cb51733253f0aec43c52ca23f1c Mon Sep 17 00:00:00 2001
From: codeFather2 <Dmitry.Litovchenko1@yandex.ru>
Date: Sat, 24 Feb 2018 13:36:21 +0300
Subject: [PATCH 09/12] Fix Merge conflicts

---
 CSharpMinifier/IdentifierGenerator.cs      |  1 -
 CSharpMinifier/Rewriters/TokensMinifier.cs | 19 ++-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/CSharpMinifier/IdentifierGenerator.cs b/CSharpMinifier/IdentifierGenerator.cs
index adf0b57..1bd082d 100644
--- a/CSharpMinifier/IdentifierGenerator.cs
+++ b/CSharpMinifier/IdentifierGenerator.cs
@@ -79,7 +79,6 @@ private void AddToDictionary(SyntaxNode node)
             }
         }
 
-
         private string LastName => _existingNames.LastOrDefault();
 
         private string IncrementName(string lastName)
diff --git a/CSharpMinifier/Rewriters/TokensMinifier.cs b/CSharpMinifier/Rewriters/TokensMinifier.cs
index 6861548..8c3a53d 100644
--- a/CSharpMinifier/Rewriters/TokensMinifier.cs
+++ b/CSharpMinifier/Rewriters/TokensMinifier.cs
@@ -45,10 +45,7 @@ private void RenameAll(Document document)
         {           
             _semanticModel = document.GetSemanticModelAsync().Result;
             var newNode = _semanticModel.SyntaxTree.GetRoot();
-<<<<<<< HEAD:CSharpMinifier/Rewriters/TokensMinifier.cs
 
-=======
->>>>>>> 5abeb53995ac7760de4ef050808dc751ceb38a2d:CSharpMinifier/Rewriters/CSharpRewriter.cs
             foreach (KeyValuePair<VariableDeclaratorSyntax, string> variable in _identifierGenerator.RenamedVariables)
             {
                 var nodeToSearch = newNode.DescendantNodes()
@@ -69,18 +66,7 @@ private void RenameAll(Document document)
                     .OfType<ClassDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(classToRename.Key.Identifier.ValueText));
                 (newNode, document) = Rename(nodeToSearch, document, classToRename.Value);
             }
-<<<<<<< HEAD:CSharpMinifier/Rewriters/TokensMinifier.cs
             
-=======
-            foreach (var propertyToRename in _identifierGenerator.RenamedProperties)
-            {
-                var nodeToSearch = newNode.DescendantNodes()
-                    .OfType<PropertyDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(propertyToRename.Key.Identifier.ValueText));
-                (newNode, document) = Rename(nodeToSearch, document, propertyToRename.Value);
-            }
-
-            return newNode;
->>>>>>> 5abeb53995ac7760de4ef050808dc751ceb38a2d:CSharpMinifier/Rewriters/CSharpRewriter.cs
         }
 
         private (SyntaxNode node, Document document) Rename(SyntaxNode nodeToRename, Document document, string newName)
@@ -125,7 +111,6 @@ public override SyntaxNode VisitFieldDeclaration(FieldDeclarationSyntax node)
             return base.VisitFieldDeclaration(node);
         }
 
-<<<<<<< HEAD:CSharpMinifier/Rewriters/TokensMinifier.cs
         public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node)
         {
             if (_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals("private")))
@@ -137,7 +122,8 @@ public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node)
                 _identifierGenerator.GetNextName(node);
             }
             return base.VisitMethodDeclaration(node);
-=======
+        }
+
         public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax node)
         {
             if (_options.PublicCompressing && node.Modifiers.Any(m => m.Value.Equals("public")))
@@ -149,7 +135,6 @@ public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax no
                 _identifierGenerator.GetNextName(node);
             }
             return base.VisitPropertyDeclaration(node);
->>>>>>> 5abeb53995ac7760de4ef050808dc751ceb38a2d:CSharpMinifier/Rewriters/CSharpRewriter.cs
         }
 
 

From b5b9f34d02626fe6ca0e4ec0248714c4f3a5b56a Mon Sep 17 00:00:00 2001
From: codeFather2 <Dmitry.Litovchenko1@yandex.ru>
Date: Mon, 12 Mar 2018 22:10:16 +0300
Subject: [PATCH 10/12] Remove old references to NRefactory

---
 .../CSharpMinifier.Tests.csproj               |   1 -
 CSharpMinifier.Tests/IdGeneratorTests.cs      |  32 -
 CSharpMinifier.Tests/MinifierTests.cs         |  20 +-
 CSharpMinifier/CSharpMinifier.csproj          |  28 -
 CSharpMinifier/MinIdGenerator.cs              |  67 --
 CSharpMinifier/Minifier.cs                    | 911 ------------------
 CSharpMinifier/MinifyEnumsAstVisitor.cs       |  44 -
 CSharpMinifier/MinifyLocalsAstVisitor.cs      | 147 ---
 CSharpMinifier/MinifyMembersAstVisitor.cs     | 178 ----
 CSharpMinifier/MinifyTypesAstVisitor.cs       |  91 --
 CSharpMinifier/NRefactoryUtils.cs             |  47 -
 CSharpMinifier/NameNode.cs                    |  25 -
 CSharpMinifier/NamesGenerator.cs              |  79 --
 CSharpMinifier/RandomIdGenerator.cs           |  77 --
 CSharpMinifier/ResolveResultType.cs           |  14 -
 CSharpMinifier/Rewriters/TokensMinifier.cs    |  24 +-
 CSharpMinifier/Substitutor.cs                 |  56 --
 CSharpMinifier/packages.config                |   1 -
 18 files changed, 25 insertions(+), 1817 deletions(-)
 delete mode 100644 CSharpMinifier.Tests/IdGeneratorTests.cs
 delete mode 100644 CSharpMinifier/MinIdGenerator.cs
 delete mode 100644 CSharpMinifier/Minifier.cs
 delete mode 100644 CSharpMinifier/MinifyEnumsAstVisitor.cs
 delete mode 100644 CSharpMinifier/MinifyLocalsAstVisitor.cs
 delete mode 100644 CSharpMinifier/MinifyMembersAstVisitor.cs
 delete mode 100644 CSharpMinifier/MinifyTypesAstVisitor.cs
 delete mode 100644 CSharpMinifier/NRefactoryUtils.cs
 delete mode 100644 CSharpMinifier/NameNode.cs
 delete mode 100644 CSharpMinifier/NamesGenerator.cs
 delete mode 100644 CSharpMinifier/RandomIdGenerator.cs
 delete mode 100644 CSharpMinifier/ResolveResultType.cs
 delete mode 100644 CSharpMinifier/Substitutor.cs

diff --git a/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj b/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
index 53ecf4a..d21f61c 100644
--- a/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
+++ b/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
@@ -41,7 +41,6 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IdGeneratorTests.cs" />
     <Compile Include="MinifierTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Samples\EnumToIntConversion.cs" />
diff --git a/CSharpMinifier.Tests/IdGeneratorTests.cs b/CSharpMinifier.Tests/IdGeneratorTests.cs
deleted file mode 100644
index b62ed78..0000000
--- a/CSharpMinifier.Tests/IdGeneratorTests.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using NUnit.Framework;
-using System.Collections.Generic;
-
-namespace CSharpMinifier.Tests
-{
-	[TestFixture]
-	public class IdGeneratorTests
-	{
-		[Test]
-		public void MinIdGeneratorTest()
-		{
-			var minIdGenerator = new MinIdGenerator();
-			for (int i = 0; i < MinIdGenerator.Chars0.Length; i++)
-				Assert.AreEqual(MinIdGenerator.Chars0[i].ToString(), minIdGenerator.Next());
-			for (int i = 0; i < MinIdGenerator.CharsN.Length; i++)
-				Assert.AreEqual(MinIdGenerator.Chars0[0].ToString() + MinIdGenerator.CharsN[i], minIdGenerator.Next());
-		}
-
-		[Test]
-		public void RandomIdGeneratorTest()
-		{
-			var randomIdGenerator = new RandomIdGenerator(1, 1);
-
-			var generatedIds = new HashSet<string>();
-			for (int i = 0; i < MinIdGenerator.Chars0.Length; i++)
-				generatedIds.Add(randomIdGenerator.Next());
-			
-			Assert.AreEqual(MinIdGenerator.Chars0.Length, generatedIds.Count);
-			Assert.AreEqual(MinIdGenerator.Chars0.Length - 1, randomIdGenerator.CurrentCombinationNumber);
-		}
-	}
-}
diff --git a/CSharpMinifier.Tests/MinifierTests.cs b/CSharpMinifier.Tests/MinifierTests.cs
index a6a3757..3f95f4d 100644
--- a/CSharpMinifier.Tests/MinifierTests.cs
+++ b/CSharpMinifier.Tests/MinifierTests.cs
@@ -31,7 +31,7 @@ public void RemoveSpaces()
 			{
 				SpacesRemoving = true
 			};
-			var minifier = new Minifier(minifierOptions);
+			var minifier = new RoslynMinifier(minifierOptions);
 			foreach (var sample in Samples)
 			{
 				var minified = minifier.MinifyFromString(sample.Value);
@@ -51,7 +51,7 @@ public void LineLengthConstraint()
 				LineLength = 80,
 				RegionsRemoving = true
 			};
-			var minifier = new Minifier(minifierOptions);
+			var minifier = new RoslynMinifier(minifierOptions);
 			foreach (var sample in Samples)
 			{
 				var minified = minifier.MinifyFromString(sample.Value);
@@ -67,7 +67,7 @@ public void RemoveComments()
 				SpacesRemoving = true,
 				CommentsRemoving = true
 			};
-			var minifier = new Minifier(minifierOptions);
+			var minifier = new RoslynMinifier(minifierOptions);
 
 			var test = Samples["Test1"];
 			if (!test.Contains("//") || !test.Contains("/*") || !test.Contains("*/"))
@@ -87,7 +87,7 @@ public void RemoveRegions()
 				SpacesRemoving = true,
 				RegionsRemoving = true
 			};
-			var minifier = new Minifier(minifierOptions);
+			var minifier = new RoslynMinifier(minifierOptions);
 
 			var test = Samples["Test1"];
 			if (!test.Contains("#region") || !test.Contains("#endregion"))
@@ -107,7 +107,7 @@ public void CompressIdentifiers()
 				MembersCompressing = true,
 				TypesCompressing = true
 			};
-			var minifier = new Minifier(minifierOptions);
+			var minifier = new RoslynMinifier(minifierOptions);
 			foreach (var sample in Samples)
 			{
 				var minified = minifier.MinifyFromString(sample.Value);
@@ -122,7 +122,7 @@ public void CompressMisc()
 			{
 				MiscCompressing = true
 			};
-			var minifier = new Minifier(minifierOptions);
+			var minifier = new RoslynMinifier(minifierOptions);
 			var minified = minifier.MinifyFromString(Samples["MiscCompression"]);
 			Assert.IsTrue(minified.Contains("255"));
 			Assert.IsTrue(minified.Contains("0x7048860F9180"));
@@ -134,7 +134,7 @@ public void CompressMisc()
 		[Test]
 		public void IgnoredIdAndComments()
 		{
-			var minifier = new Minifier(null, new string[] { "unminifiedId" }, new string[] { "unremovableComment", "/*unremovableComment1*/" });
+			var minifier = new RoslynMinifier(null, new string[] { "unminifiedId" }, new string[] { "unremovableComment", "/*unremovableComment1*/" });
 			var test = Samples["Test1"];
 			if (!test.Contains("unminifiedId") || !test.Contains("unremovableComment") || !test.Contains("/*unremovableComment1*/"))
 				Assert.Inconclusive("Invalid test sample for IgnoredIdAndComments test");
@@ -147,7 +147,7 @@ public void IgnoredIdAndComments()
 		[Test]
 		public void IncrementPlus()
 		{
-			var minifier = new Minifier(new MinifierOptions { LocalVarsCompressing = false });
+			var minifier = new RoslynMinifier(new MinifierOptions { LocalVarsCompressing = false });
 			var testCode =
 @"public class Test
 {
@@ -171,7 +171,7 @@ public void Main()
 		[Test]
 		public void NestedClassesWithSameInnterName()
 		{
-			var minifier = new Minifier();
+			var minifier = new RoslynMinifier();
 			var testCode =
 @"public static class A
 {
@@ -196,7 +196,7 @@ public void foo() {}
 		[Test]
 		public void ShouldProperlyConvertEnumWithoutInitializersToInt()
 		{
-			var minifier = new Minifier();
+			var minifier = new RoslynMinifier();
 			var minified = minifier.MinifyFromString(Samples["EnumToIntConversion"]);
 
 			Assert.IsTrue(CompileUtils.CanCompile(minified));
diff --git a/CSharpMinifier/CSharpMinifier.csproj b/CSharpMinifier/CSharpMinifier.csproj
index 88a8e2f..0463d6b 100644
--- a/CSharpMinifier/CSharpMinifier.csproj
+++ b/CSharpMinifier/CSharpMinifier.csproj
@@ -37,22 +37,6 @@
     <Reference Include="Esent.Interop, Version=1.9.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\ManagedEsent.1.9.4\lib\net40\Esent.Interop.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.NRefactory, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.NRefactory.Cecil, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.NRefactory.CSharp, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.CSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.NRefactory.Xml, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.Xml.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.CodeAnalysis, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
@@ -185,22 +169,10 @@
     <Compile Include="CompileUtils.cs" />
     <Compile Include="IdentifierGenerator.cs" />
     <Compile Include="IMinifier.cs" />
-    <Compile Include="MinifyEnumsAstVisitor.cs" />
-    <Compile Include="MinifyTypesAstVisitor.cs" />
-    <Compile Include="NameNode.cs" />
-    <Compile Include="MinIdGenerator.cs" />
-    <Compile Include="Minifier.cs" />
     <Compile Include="MinifierOptions.cs" />
-    <Compile Include="MinifyLocalsAstVisitor.cs" />
-    <Compile Include="MinifyMembersAstVisitor.cs" />
-    <Compile Include="NamesGenerator.cs" />
-    <Compile Include="NRefactoryUtils.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RandomIdGenerator.cs" />
-    <Compile Include="ResolveResultType.cs" />
     <Compile Include="Rewriters\TokensMinifier.cs" />
     <Compile Include="RoslynMinifier.cs" />
-    <Compile Include="Substitutor.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/CSharpMinifier/MinIdGenerator.cs b/CSharpMinifier/MinIdGenerator.cs
deleted file mode 100644
index 7f128b3..0000000
--- a/CSharpMinifier/MinIdGenerator.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System.Collections.Generic;
-using System.Text;
-
-namespace CSharpMinifier
-{
-	public class MinIdGenerator : NamesGenerator
-	{
-		public static string Chars0 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_";
-		public static string CharsN = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_";
-
-		List<int> _indexes;
-
-		public MinIdGenerator()
-			: base()
-		{
-		}
-
-		public override void Reset()
-		{
-			base.Reset();
-			_indexes = new List<int>();
-		}
-
-		public override string Next()
-		{
-			int i = _indexes.Count - 1;
-			bool inc;
-			do
-			{
-				if (i == -1)
-				{
-					_indexes.Add(0);
-					break;
-				}
-				_indexes[i] = _indexes[i] + 1;
-				inc = false;
-				if ((i == 0 && _indexes[i] >= Chars0.Length) || _indexes[i] >= CharsN.Length)
-				{
-					_indexes[i--] = 0;
-					inc = true;
-				}
-			}
-			while (inc);
-
-			StringBuilder result = new StringBuilder(_indexes.Count);
-			for (int j = 0; j < _indexes.Count; j++)
-				result.Append(j == 0 ? Chars0[_indexes[j]] : CharsN[_indexes[j]]);
-
-			CurrentCombination = result.ToString();
-			CurrentCombinationNumber++;
-			
-			return Prefix + CurrentCombination + Postfix;
-		}
-
-		public override int CurrentCombinationNumber
-		{
-			get
-			{
-				return base.CurrentCombinationNumber;
-			}
-			set
-			{
-				base.CurrentCombinationNumber = value;
-			}
-		}
-	}
-}
diff --git a/CSharpMinifier/Minifier.cs b/CSharpMinifier/Minifier.cs
deleted file mode 100644
index e674155..0000000
--- a/CSharpMinifier/Minifier.cs
+++ /dev/null
@@ -1,911 +0,0 @@
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using Microsoft.CodeAnalysis.CSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using ICSharpCode.NRefactory.Documentation;
-
-namespace CSharpMinifier
-{
-	public class Minifier : IMinifier
-	{
-		private static string[] NameKeys = new string[] { "Name", "LiteralValue", "Keyword" };
-		private const string VarId = "var";
-		public static string ParserTempFileName = "temp.cs";
-
-		private CSharpUnresolvedFile _unresolvedFile;
-		private IProjectContent _projectContent;
-		private ICompilation _compilation;
-		private CSharpAstResolver _resolver;
-		private AstNode _prevNode;
-
-		public SyntaxTree SyntaxTree
-		{
-			get;
-			private set;
-		}
-
-		public MinifierOptions Options
-		{
-			get;
-			private set;
-		}
-
-		public List<string> IgnoredIdentifiers
-		{
-			get;
-			private set;
-		}
-
-		public List<string> IgnoredComments
-		{
-			get;
-			private set;
-		}
-
-		#region Public
-
-		public Minifier(MinifierOptions options = null, string[] ignoredIdentifiers = null, string[] ignoredComments = null)
-		{
-			Options = options ?? new MinifierOptions();
-
-			_projectContent = new CSharpProjectContent();
-			var assemblies = new List<Assembly>
-				{
-					typeof(object).Assembly, // mscorlib
-					typeof(Uri).Assembly, // System.dll
-					typeof(Enumerable).Assembly, // System.Core.dll
-				};
-
-			var unresolvedAssemblies = new IUnresolvedAssembly[assemblies.Count];
-			Parallel.For(
-				0, assemblies.Count,
-				delegate (int i)
-				{
-					var loader = new CecilLoader();
-					var path = assemblies[i].Location;
-					unresolvedAssemblies[i] = loader.LoadAssemblyFile(assemblies[i].Location);
-				});
-			_projectContent = _projectContent.AddAssemblyReferences((IEnumerable<IUnresolvedAssembly>)unresolvedAssemblies);
-
-
-			IgnoredIdentifiers = ignoredIdentifiers == null ? new List<string>() : ignoredIdentifiers.ToList();
-			IgnoredComments = new List<string>();
-			if (ignoredComments != null)
-			{
-				foreach (string comment in ignoredComments)
-				{
-					var str = comment;
-					if (str.StartsWith("//"))
-						str = str.Substring("//".Length);
-					else if (str.StartsWith("/*") && str.EndsWith("*/"))
-						str = str.Substring("/*".Length, str.Length - "/*".Length - "*/".Length);
-					if (!IgnoredComments.Contains(str))
-						IgnoredComments.Add(str);
-				}
-			}
-		}
-
-		public string MinifyFiles(string[] csFiles)
-		{
-			CSharpParser parser = new CSharpParser();
-			SyntaxTree[] trees = csFiles.Select(file => parser.Parse(file, file + "_" + ParserTempFileName)).ToArray();
-
-			SyntaxTree globalTree = new SyntaxTree();
-			globalTree.FileName = ParserTempFileName;
-
-			var usings = new List<UsingDeclaration>();
-			var types = new List<TypeDeclaration>();
-			foreach (var tree in trees)
-			{
-				List<UsingDeclaration> treeUsings = new List<UsingDeclaration>();
-				GetUsingsAndRemoveUsingsAndNamespaces(tree, treeUsings, types);
-				usings.AddRange(treeUsings.Where(u1 => !usings.Exists(u2 => u2.Namespace == u1.Namespace)));
-			}
-
-			foreach (var u in usings)
-				globalTree.AddChild(u.Clone(), new Role<AstNode>("UsingDeclaration"));
-			foreach (var t in types)
-				globalTree.AddChild(t.Clone(), new Role<AstNode>("TypeDeclaration"));
-
-			SyntaxTree = globalTree;
-
-			return Minify();
-		}
-
-		public string MinifyFromString(string csharpCode)
-		{
-			SyntaxTree = new CSharpParser().Parse(csharpCode, ParserTempFileName);
-			return Minify();
-		}
-
-		public string Minify()
-		{
-			if (Options.CommentsRemoving || Options.RegionsRemoving)
-				RemoveCommentsAndRegions();
-
-			if (Options.LocalVarsCompressing || Options.UselessMembersCompressing)
-				CompressLocals();
-			if (Options.MembersCompressing || Options.UselessMembersCompressing)
-				CompressMembers();
-			if (Options.TypesCompressing)
-				CompressTypes();
-			if (Options.EnumToIntConversion)
-				ConvertEnumToInts();
-			if (Options.MiscCompressing || Options.NamespacesRemoving)
-				CompressMixed();
-
-			string result;
-			if (Options.SpacesRemoving)
-				result = GetStringWithoutSpaces();
-			else
-				result = SyntaxTree.ToString();
-
-			return result;
-		}
-
-		private void GetUsingsAndRemoveUsingsAndNamespaces(SyntaxTree tree, List<UsingDeclaration> usings, List<TypeDeclaration> types)
-		{
-			foreach (var child in tree.Children)
-				GetUsingsAndRemoveUsingsAndNamespaces(child, usings, types);
-		}
-
-		private void GetUsingsAndRemoveUsingsAndNamespaces(AstNode node, List<UsingDeclaration> usings, List<TypeDeclaration> types)
-		{
-			if (node.Role.ToString() == "Member" && node.GetType().Name == "UsingDeclaration")
-			{
-				usings.Add((UsingDeclaration)node);
-			}
-			else if (node.Role.ToString() == "Member" && node.GetType().Name == "NamespaceDeclaration")
-			{
-				AstNode parent = node.Parent;
-				foreach (AstNode child in node.Children)
-				{
-					if (child.NodeType == NodeType.TypeDeclaration)
-					{
-						types.Add((TypeDeclaration)child);
-					}
-					else if (child.ToString() == "Member" && child.GetType().Name == "NamespaceDeclaration")
-					{
-						GetUsingsAndRemoveUsingsAndNamespaces(child, usings, types);
-					}
-				}
-			}
-			else
-			{
-				if (node.Children.Count() >= 1)
-				{
-					foreach (var child in node.Children)
-						GetUsingsAndRemoveUsingsAndNamespaces(child, usings, types);
-				}
-			}
-		}
-
-		#endregion
-
-		#region Misc Compression
-
-		private void CompressMixed()
-		{
-			UpdateSyntaxTree();
-			CompileAndResolve();
-			TraverseNodes(SyntaxTree);
-		}
-
-		private void TraverseNodes(AstNode node)
-		{
-			foreach (var child in node.Children)
-			{
-				if (Options.MiscCompressing && child is PrimitiveExpression)
-				{
-					var primitiveExpression = (PrimitiveExpression)child;
-					if (IsIntegerNumber(primitiveExpression.Value))
-					{
-						string str = primitiveExpression.Value.ToString();
-						long number;
-						if (long.TryParse(str, out number))
-						{
-							string hex = "0x" + number.ToString("X");
-							primitiveExpression.SetValue(primitiveExpression.Value, str.Length < hex.Length ? str : hex);
-						}
-					}
-				}
-				else if (Options.MiscCompressing && child is CSharpModifierToken)
-				{
-					// private int a => int a
-					var modifier = ((CSharpModifierToken)child).Modifier;
-					if (modifier.HasFlag(Modifiers.Private) && (modifier & ~Modifiers.Private) == 0)
-						child.Remove();
-					else
-						modifier &= ~Modifiers.Private;
-				}
-				else if (Options.NamespacesRemoving && child is NamespaceDeclaration)
-				{
-					var childrenToRemove = child.Children.TakeWhile(c => !(c is CSharpTokenNode && c.Role.ToString() == "{"));
-					foreach (AstNode childToRemove in childrenToRemove)
-						childToRemove.Remove();
-					if (child.Children.Count() > 0)
-						child.Children.First().Remove();
-					if (child.Children.Count() > 0)
-						child.Children.Last().Remove();
-					var namespaceChildrens = child.Children;
-
-					var parent = child.Parent;
-					foreach (var c in parent.Children)
-					{
-						if (c == child)
-						{
-							foreach (var nsChildren in namespaceChildrens)
-								parent.InsertChildAfter(c, nsChildren.Clone(), new Role<AstNode>(nsChildren.Role.ToString()));
-							c.Remove();
-							break;
-						}
-					}
-					foreach (AstNode c in parent.Children)
-						TraverseNodes(c);
-				}
-				else if (Options.MiscCompressing && child is VariableDeclarationStatement)
-				{
-					// List<byte> a = new List<byte>() => var a = new List<byte>()
-					// var a = new b() => b a = new b()
-					var varDecExpr = (VariableDeclarationStatement)child;
-					if (!varDecExpr.Modifiers.HasFlag(Modifiers.Const))
-					{
-						var type = varDecExpr.Type.ToString().Replace(" ", "");
-						if (type == VarId)
-						{
-							// Resolving expression type.
-							CompileAndResolve();
-							var expectedType = _resolver.GetExpectedType(varDecExpr.Variables.Single().Initializer);
-							if (expectedType.Namespace != "System.Collections.Generic")
-							{
-								string typeStr = expectedType.Name;
-								bool replace = NamesGenerator.CSharpTypeSynonyms.TryGetValue(typeStr, out typeStr);
-								if (!replace)
-									typeStr = expectedType.Name;
-								if (typeStr.Length <= VarId.Length)
-									replace = true;
-								else
-									replace = false;
-								if (replace)
-								{
-									if (expectedType.Namespace == "System")
-										varDecExpr.Type = new PrimitiveType(typeStr);
-									else
-										varDecExpr.Type = new SimpleType(typeStr);
-								}
-							}
-						}
-						else
-						{
-							if (varDecExpr.Variables.Count == 1)
-							{
-								string typeStr;
-								var typeStrWithoutNamespaces = varDecExpr.Type.ToString();
-								typeStrWithoutNamespaces = typeStrWithoutNamespaces.Substring(typeStrWithoutNamespaces.LastIndexOf('.') + 1);
-								NamesGenerator.CSharpTypeSynonyms.TryGetValue(typeStrWithoutNamespaces, out typeStr);
-								if (typeStr == null)
-									typeStr = varDecExpr.Type.ToString();
-								var initializer = varDecExpr.Variables.Single().Initializer;
-								if (((typeStr == "string" || typeStr == "char" || typeStr == "bool") && initializer != NullReferenceExpression.Null)
-									|| initializer is ObjectCreateExpression)
-								{
-									if (VarId.Length < type.Length)
-										varDecExpr.Type = new SimpleType(VarId);
-								}
-							}
-						}
-					}
-					foreach (var variable in varDecExpr.Variables)
-						TraverseNodes(child);
-				}
-				else if (child is EmptyStatement)
-				{
-					// { ; ; } => {}
-					if (!(child.Parent is BlockStatement))
-					{
-						if (Options.Unsafe)
-						{
-							node.Remove();
-						}
-					}
-					else
-					{
-						child.Remove();
-					}
-				}
-				else
-				{
-					string role = child.Role.ToString();
-					if (Options.MiscCompressing && child is BlockStatement && role != "Body" && role != "TryBlock")
-					{
-						// if (a) { b; } => if (a) b;
-						var childrenCount = child.Children.Count(c => !(c is NewLineNode));
-						if (childrenCount == 3)
-							child.ReplaceWith(child.Children.Skip(1).FirstOrDefault(c => !(c is NewLineNode)));
-						else if (childrenCount < 3)
-						{
-							if (!(child.Parent is BlockStatement))
-							{
-								if (Options.Unsafe)
-								{
-									node.Remove();
-								}
-								else
-								{
-									child.ReplaceWith(new EmptyStatement());
-								}
-							}
-							else
-							{
-								child.Remove();
-							}
-						}
-					}
-					else if (Options.Unsafe && child is BinaryOperatorExpression)
-					{
-						// if (a == true) => if (a)
-						// if (a == false) => if (!a)
-						var binaryExpression = (BinaryOperatorExpression)child;
-						var primitiveExpression = binaryExpression.Left as PrimitiveExpression;
-						var expression = binaryExpression.Right;
-						if (primitiveExpression == null)
-						{
-							primitiveExpression = binaryExpression.Right as PrimitiveExpression;
-							expression = binaryExpression.Left;
-						}
-						if (primitiveExpression != null && primitiveExpression.Value is bool)
-						{
-							var boolean = (bool)primitiveExpression.Value;
-							expression.Remove();
-							if (boolean)
-								child.ReplaceWith(expression);
-							else
-								child.ReplaceWith(new UnaryOperatorExpression(UnaryOperatorType.Not, expression));
-						}
-					}
-					TraverseNodes(child);
-				}
-			}
-		}
-
-		public static bool IsIntegerNumber(object value)
-		{
-			return value is sbyte || value is byte ||
-				value is short || value is ushort || value is int ||
-				value is uint || value is long || value is ulong;
-		}
-
-		#endregion
-
-		#region Comments & Regions Removing
-
-		private void RemoveCommentsAndRegions()
-		{
-			RemoveCommentsAndRegions(SyntaxTree);
-		}
-
-		private void RemoveCommentsAndRegions(AstNode node)
-		{
-			foreach (AstNode children in node.Children)
-			{
-				if (Options.CommentsRemoving && children is Comment)
-				{
-					var properties = children.GetProperties();
-					var commentType = properties.GetPropertyValueEnum<CommentType>(children, "CommentType");
-					var content = properties.GetPropertyValue(children, "Content");
-					if (!IgnoredComments.Contains(content) && commentType != CommentType.InactiveCode)
-						children.Remove();
-				}
-				else if (Options.RegionsRemoving && children is PreProcessorDirective)
-				{
-					var type = children.GetPropertyValueEnum<PreProcessorDirectiveType>("Type");
-					switch (type)
-					{
-						case PreProcessorDirectiveType.Region:
-						case PreProcessorDirectiveType.Endregion:
-						case PreProcessorDirectiveType.Warning:
-							children.Remove();
-							break;
-					}
-				}
-				else
-					RemoveCommentsAndRegions(children);
-			}
-		}
-
-		#endregion
-
-		#region Identifiers Compressing
-
-		private void CompressLocals()
-		{
-			var localsVisitor = new MinifyLocalsAstVisitor(IgnoredIdentifiers);
-			CompileAndAcceptVisitor(localsVisitor);
-			var substitutor = new Substitutor(new MinIdGenerator());
-			var ignoredNames = new List<string>(IgnoredIdentifiers);
-			ignoredNames.AddRange(localsVisitor.NotLocalsIdNames);
-			var substituton = substitutor.Generate(localsVisitor.MethodVars, ignoredNames.ToArray());
-
-			var astSubstitution = new Dictionary<string, List<Tuple<string, List<AstNode>>>>();
-			foreach (var method in localsVisitor.MethodVars)
-			{
-				var localVarsAstNodes = new List<Tuple<string, List<AstNode>>>();
-				astSubstitution[method.Key] = localVarsAstNodes;
-				var localsSubst = substituton[method.Key];
-				foreach (NameNode localVar in method.Value)
-					localVarsAstNodes.Add(new Tuple<string, List<AstNode>>(localsSubst[localVar.Name], GetResolvedNodes(ResolveResultType.Local, localVar.Node)));
-			}
-
-			RenameOrRemoveNodes(astSubstitution, true, Options.LocalVarsCompressing);
-		}
-
-		private void CompressMembers()
-		{
-			var membersVisitor = new MinifyMembersAstVisitor(IgnoredIdentifiers, Options.ConsoleApp, Options.PublicCompressing, Options.ToStringMethodsRemoving);
-			CompileAndAcceptVisitor(membersVisitor);
-			var substitutor = new Substitutor(new MinIdGenerator());
-			var ignoredNames = new List<string>(IgnoredIdentifiers);
-			ignoredNames.AddRange(membersVisitor.NotMembersIdNames);
-			var substituton = substitutor.Generate(membersVisitor.TypesMembers, ignoredNames.ToArray());
-
-			var astSubstitution = new Dictionary<string, List<Tuple<string, List<AstNode>>>>();
-			foreach (var typeMembers in membersVisitor.TypesMembers)
-			{
-				var typeMembersAstNodes = new List<Tuple<string, List<AstNode>>>();
-				astSubstitution[typeMembers.Key] = typeMembersAstNodes;
-				var membersSubst = substituton[typeMembers.Key];
-				foreach (NameNode member in typeMembers.Value)
-					typeMembersAstNodes.Add(new Tuple<string, List<AstNode>>(membersSubst[member.Name], GetResolvedNodes(ResolveResultType.Member, member.Node)));
-			}
-
-			RenameOrRemoveNodes(astSubstitution, true, Options.MembersCompressing);
-		}
-
-		private void CompressTypes()
-		{
-			var typesVisitor = new MinifyTypesAstVisitor(IgnoredIdentifiers, Options.PublicCompressing);
-			CompileAndAcceptVisitor(typesVisitor);
-			var substitutor = new Substitutor(new MinIdGenerator());
-			var ignoredNames = new List<string>(IgnoredIdentifiers);
-			ignoredNames.AddRange(typesVisitor.NotTypesIdNames);
-			var substitution = substitutor.Generate(typesVisitor.Types, ignoredNames.ToArray());
-
-			var astSubstitution = new List<Tuple<string, List<AstNode>>>();
-			foreach (var type in typesVisitor.Types)
-				astSubstitution.Add(new Tuple<string, List<AstNode>>(substitution[type.Name], GetResolvedNodes(ResolveResultType.Type, type.Node)));
-
-			RenameOrRemoveNodes(astSubstitution, false, Options.TypesCompressing);
-		}
-
-		private void ConvertEnumToInts()
-		{
-			UpdateSyntaxTree();
-			var enumVisitor = new MinifyEnumsAstVisitor();
-			CompileAndAcceptVisitor(enumVisitor);
-
-			var members = enumVisitor.EnumMembers;
-			foreach (var member in members)
-			{
-				var enumTypeRefs = GetResolvedNodes(ResolveResultType.Type, member.Key);
-				int currentEnumValue = 0;
-				foreach (var enumMember in member.Value)
-				{
-					Expression initExpr = ((EnumMemberDeclaration)enumMember.Node).Initializer;
-					if (initExpr is PrimitiveExpression)
-					{
-						int.TryParse(((PrimitiveExpression)initExpr).Value.ToString(), out currentEnumValue);
-					}
-					var enumMemberRefs = GetResolvedNodes(ResolveResultType.Member, enumMember.Node);
-					foreach (var node in enumMemberRefs)
-					{
-						if (!(node is EntityDeclaration))
-						{
-							node.ReplaceWith(new PrimitiveExpression(currentEnumValue));
-						}
-					}
-					currentEnumValue++;
-				}
-				foreach (var typeRef in enumTypeRefs)
-					if (typeRef is SimpleType)
-						typeRef.ReplaceWith(new PrimitiveType("int"));
-				member.Key.Remove();
-			}
-		}
-
-		private void CompileAndAcceptVisitor(DepthFirstAstVisitor visitor)
-		{
-			CompileAndResolve();
-			SyntaxTree.AcceptVisitor(visitor);
-		}
-
-		private void CompileAndResolve()
-		{
-			_unresolvedFile = SyntaxTree.ToTypeSystem();
-			_projectContent = _projectContent.AddOrUpdateFiles(_unresolvedFile);
-			_compilation = _projectContent.CreateCompilation();
-			_resolver = new CSharpAstResolver(_compilation, SyntaxTree, _unresolvedFile);
-		}
-
-		private List<AstNode> GetResolvedNodes(ResolveResultType type, AstNode node)
-		{
-			var resolvedNodes = new List<AstNode>();
-			ResolveResult resolveResult = _resolver.Resolve(node);
-			if (resolveResult != null)
-			{
-				var findReferences = new FindReferences();
-				FoundReferenceCallback callback = delegate (AstNode matchNode, ResolveResult result)
-				{
-					resolvedNodes.Add(matchNode);
-				};
-
-				if (type == ResolveResultType.Local)
-				{
-					var localResolveResult = resolveResult as LocalResolveResult;
-					if (localResolveResult != null)
-						findReferences.FindLocalReferences(localResolveResult.Variable, _unresolvedFile, SyntaxTree, _compilation, callback, CancellationToken.None);
-				}
-				else if (type == ResolveResultType.Member)
-				{
-					var memberResolveResult = resolveResult as MemberResolveResult;
-					if (memberResolveResult != null)
-					{
-						var searchScopes = findReferences.GetSearchScopes(memberResolveResult.Member);
-						findReferences.FindReferencesInFile(searchScopes, _unresolvedFile, SyntaxTree, _compilation, callback, CancellationToken.None);
-					}
-				}
-				else if (type == ResolveResultType.Type)
-				{
-					var typeResolveResult = resolveResult as TypeResolveResult;
-					if (typeResolveResult != null)
-					{
-						var searchScopes = findReferences.GetSearchScopes(typeResolveResult.Type.GetDefinition());
-						findReferences.FindReferencesInFile(searchScopes, _unresolvedFile, SyntaxTree, _compilation, callback, CancellationToken.None);
-					}
-				}
-			}
-			else
-			{
-			}
-			return resolvedNodes;
-		}
-
-		private void RenameOrRemoveNodes(Dictionary<string, List<Tuple<string, List<AstNode>>>> substitution, bool removeOneRefNodes, bool rename)
-		{
-			foreach (var resolveNode in substitution)
-				RenameOrRemoveNodes(resolveNode.Value, removeOneRefNodes, rename);
-		}
-
-		private void RenameOrRemoveNodes(List<Tuple<string, List<AstNode>>> substitution, bool removeOneRefNodes, bool rename)
-		{
-			foreach (var node in substitution)
-			{
-				if (rename)
-				{
-					foreach (var astNode in node.Item2)
-						RenameNode(astNode, node.Item1);
-				}
-
-				var first = node.Item2.FirstOrDefault() as VariableInitializer;
-				if (removeOneRefNodes && Options.UselessMembersCompressing && first != null)
-				{
-					bool constNode = false;
-					var fieldDeclaration = first.Parent as FieldDeclaration;
-					if (fieldDeclaration != null)
-						constNode = fieldDeclaration.Modifiers.HasFlag(Modifiers.Const);
-					else
-					{
-						var varDeclaration = first.Parent as VariableDeclarationStatement;
-						if (varDeclaration != null)
-							constNode = varDeclaration.Modifiers.HasFlag(Modifiers.Const);
-					}
-
-					if (!constNode || first.Initializer == NullReferenceExpression.Null)
-					{
-						//if (node.Item2.Count == 1)
-						//	first.Parent.Remove();
-					}
-					else
-					{
-						var initializerStr = GetStringWithoutSpaces(first.Parent);
-						var exprStr = GetStringWithoutSpaces(first.Initializer);
-						if (initializerStr.Length + (node.Item2.Count - 1) * node.Item1.Length > (node.Item2.Count - 1) * exprStr.Length)
-						{
-							foreach (var child in node.Item2.Skip(1))
-							{
-								child.ReplaceWith(first.Initializer.Clone());
-							}
-							first.Parent.Remove();
-						}
-					}
-				}
-			}
-		}
-
-		private void RenameNode(AstNode node, string newName)
-		{
-			if (node is ParameterDeclaration)
-				((ParameterDeclaration)node).Name = newName;
-			else if (node is VariableInitializer)
-				((VariableInitializer)node).Name = newName;
-
-			else if (node is VariableInitializer)
-				((VariableInitializer)node).Name = newName;
-			else if (node is MethodDeclaration)
-				((MethodDeclaration)node).Name = newName;
-			else if (node is PropertyDeclaration)
-				((PropertyDeclaration)node).Name = newName;
-			else if (node is IndexerDeclaration)
-				((IndexerDeclaration)node).Name = newName;
-			else if (node is OperatorDeclaration)
-				((OperatorDeclaration)node).Name = newName;
-			else if (node is MemberReferenceExpression)
-				((MemberReferenceExpression)node).MemberName = newName;
-			else if (node is IdentifierExpression)
-				((IdentifierExpression)node).Identifier = newName;
-			else if (node is InvocationExpression)
-			{
-				var invExpression = (InvocationExpression)node;
-				if (invExpression.Target is IdentifierExpression)
-					((IdentifierExpression)invExpression.Target).Identifier = newName;
-				else if (invExpression.Target is MemberReferenceExpression)
-					((MemberReferenceExpression)invExpression.Target).MemberName = newName;
-				else
-				{
-				}
-			}
-			else if (node is NamedExpression)
-				((NamedExpression)node).Name = newName;
-			else if (node is TypeDeclaration)
-				((TypeDeclaration)node).Name = newName;
-			else if (node is SimpleType)
-				((SimpleType)node).Identifier = newName;
-			else if (node is EnumMemberDeclaration)
-				((EnumMemberDeclaration)node).Name = newName;
-			else
-			{
-			}
-		}
-
-		private void UpdateSyntaxTree()
-		{
-			// TODO: Fix it.
-			SyntaxTree = new CSharpParser().Parse(SyntaxTree.ToString(), ParserTempFileName);
-		}
-
-		#endregion
-
-		#region Removing of spaces and line breaks
-
-		private string GetStringWithoutSpaces()
-		{
-			UpdateSyntaxTree();
-			return GetStringWithoutSpaces(SyntaxTree.Children);
-		}
-
-		private string GetStringWithoutSpaces(AstNode node)
-		{
-			return GetStringWithoutSpaces(new List<AstNode>() { node });
-		}
-
-		private string GetStringWithoutSpaces(IEnumerable<AstNode> nodes)
-		{
-			StringBuilder line;
-			StringBuilder result;
-
-			result = new StringBuilder();
-			line = new StringBuilder(Options.LineLength);
-
-			_prevNode = null;
-			foreach (var node in nodes)
-			{
-				RemoveSpacesAndAppend(node, line, result);
-				if (node.Children.Count() <= 1 && !(node is NewLineNode))
-					_prevNode = node;
-			}
-			result.Append(line);
-
-			return result.ToString();
-		}
-
-		private void RemoveSpacesAndAppend(AstNode node, StringBuilder line, StringBuilder result)
-		{
-			if (node.Children.Count() == 0)
-			{
-				string indent = GetIndent(node, line);
-
-				string newString = indent + GetLeafNodeString(node);
-				if (Options.LineLength == 0)
-					result.Append(newString);
-				else
-				{
-					if (line.Length + newString.Length > Options.LineLength)
-					{
-						result.AppendLine(line.ToString());
-						line.Clear();
-						line.Append(newString.TrimStart());
-					}
-					else
-					{
-						line.Append(newString);
-					}
-				}
-			}
-			else
-			{
-				List<AstNode> children;
-				if (node is ArraySpecifier)
-				{
-					children = new List<AstNode>();
-					children.Add(node.Children.FirstOrDefault(c => c.Role.ToString() == "["));
-					children.AddRange(node.Children.Where(c => c.Role.ToString() != "[" && c.Role.ToString() != "]"));
-					children.AddRange(node.Children.Where(c => c.Role.ToString() == "]"));
-				}
-				else if (node is ArrayInitializerExpression)
-				{
-					var arrayInitExpr = (ArrayInitializerExpression)node;
-					children = node.Children.ToList();
-					int exprNodeInd1 = -1, exprNodeInd2 = -1, commaInd1 = -1;
-					for (int i = 0; i < children.Count; i++)
-					{
-						var c = children[i];
-						if (!(c is NewLineNode || c is CSharpTokenNode || c is Comment))
-						{
-							if (exprNodeInd1 == -1)
-								exprNodeInd1 = i;
-							else
-							{
-								exprNodeInd2 = i;
-								break;
-							}
-						}
-						else if (exprNodeInd1 > -1 && exprNodeInd2 == -1 && c.ToString() == ",")
-							commaInd1 = i;
-					}
-					if (exprNodeInd1 != -1 && commaInd1 == -1 && exprNodeInd2 != -1)
-						children.Insert(exprNodeInd1 + 1,
-							new CSharpTokenNode(TextLocation.Empty, Roles.Comma) { Role = Roles.Comma });
-				}
-				else
-					children = node.Children.ToList();
-				foreach (AstNode child in children)
-				{
-					RemoveSpacesAndAppend(child, line, result);
-					if (child.Children.Count() <= 1 && !(child is NewLineNode))
-						_prevNode = child;
-				}
-			}
-		}
-
-		private string GetIndent(AstNode node, StringBuilder line)
-		{
-			string indent = " ";
-			char last = (char)0;
-			if (line.Length != 0)
-			{
-				last = line[line.Length - 1];
-			}
-
-			if (last == ' ' || last == '\r' || last == '\n' || last == ';' || _prevNode == null || node == null)
-			{
-				indent = "";
-			}
-			else
-			{
-				var prevComment = _prevNode as Comment;
-				if (prevComment != null)
-				{
-					if (prevComment.CommentType == CommentType.SingleLine || prevComment.CommentType == CommentType.Documentation)
-						indent = Environment.NewLine;
-					else
-						indent = "";
-				}
-				else if (node is PreProcessorDirective || _prevNode is PreProcessorDirective)
-				{
-					indent = Environment.NewLine;
-				}
-				else
-				{
-					string prevNodeString = _prevNode.Role.ToString();
-					string nodeString = node.Role.ToString();
-					if (_prevNode is CSharpTokenNode && prevNodeString.All(c => !char.IsLetterOrDigit(c)))
-					{
-						if ((prevNodeString == "+" && nodeString != "++") ||
-							(prevNodeString == "-" && nodeString != "--") ||
-							(prevNodeString != "+" && prevNodeString != "-"))
-						{
-							indent = "";
-						}
-					}
-					else if (_prevNode is NewLineNode ||
-						_prevNode is EmptyStatement ||
-						(node is CSharpTokenNode && nodeString.All(c => !char.IsLetterOrDigit(c))) ||
-						node is NewLineNode ||
-						node is Comment)
-					{
-						indent = "";
-					}
-				}
-			}
-
-			return indent;
-		}
-
-		public static string GetLeafNodeString(AstNode node)
-		{
-			string nodeRole = node.Role.ToString();
-			var properties = node.GetProperties();
-			if (nodeRole == "Comment")
-			{
-				CommentType commentType = properties.GetPropertyValueEnum<CommentType>(node, "CommentType");
-				string content = properties.GetPropertyValue(node, "Content");
-				switch (commentType)
-				{
-					default:
-					case CommentType.SingleLine:
-						return "//" + content;
-					case CommentType.Documentation:
-						return "///" + content;
-					case CommentType.MultiLine:
-						return "/*" + content + "*/";
-					case CommentType.InactiveCode:
-						return content;
-					case CommentType.MultiLineDocumentation:
-						return "/**" + content + "*/";
-				}
-			}
-			else if (nodeRole == "Modifier")
-			{
-				return properties.GetPropertyValue(node, "Modifier").ToLower();
-			}
-			else if (nodeRole == "Target" || nodeRole == "Right")
-			{
-				string typeName = node.GetType().Name;
-				if (typeName == nameof(ThisReferenceExpression))
-					return "this";
-				else if (typeName == nameof(BaseReferenceExpression))
-					return "base";
-				else if (typeName == nameof(NullReferenceExpression))
-					return "null";
-			}
-			else if (nodeRole == "PreProcessorDirective")
-			{
-				var type = properties.GetPropertyValue(node, "Type").ToLower();
-				var argument = properties.GetPropertyValue(node, "Argument");
-				var result = "#" + type;
-				if (argument != string.Empty)
-					result += " " + argument;
-				return result;
-			}
-
-			if (node is ThisReferenceExpression)
-				return "this";
-			else if (node is BaseReferenceExpression)
-				return "base";
-			else if (node is NullReferenceExpression)
-				return "null";
-			else if (node is CSharpTokenNode || node is CSharpModifierToken)
-				return nodeRole;
-			else if (node is NewLineNode)
-				return "";
-			else if (node is EmptyStatement)
-				return ";";
-
-			return properties
-				.FirstOrDefault(p => NameKeys.Contains(p.Name))
-				.GetValue(node, null)
-				.ToString();
-		}
-
-		#endregion
-	}
-}
diff --git a/CSharpMinifier/MinifyEnumsAstVisitor.cs b/CSharpMinifier/MinifyEnumsAstVisitor.cs
deleted file mode 100644
index 57471c4..0000000
--- a/CSharpMinifier/MinifyEnumsAstVisitor.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using ICSharpCode.NRefactory.CSharp;
-using System.Collections.Generic;
-
-namespace CSharpMinifier
-{
-	public class MinifyEnumsAstVisitor : DepthFirstAstVisitor
-	{
-		private string _currentNamespace;
-		private List<NameNode> _currentEnumMembers;
-
-		public Dictionary<TypeDeclaration, List<NameNode>> EnumMembers
-		{
-			get;
-			private set;
-		}
-
-		public MinifyEnumsAstVisitor()
-		{
-			EnumMembers = new Dictionary<TypeDeclaration, List<NameNode>>();
-		}
-
-		public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
-		{
-			_currentNamespace = namespaceDeclaration.Name;
-			base.VisitNamespaceDeclaration(namespaceDeclaration);
-		}
-
-		public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
-		{
-			if (typeDeclaration.TypeKeyword.ToString() == "enum")
-			{
-				_currentEnumMembers = new List<NameNode>();
-				EnumMembers.Add(typeDeclaration, _currentEnumMembers);
-			}
-			base.VisitTypeDeclaration(typeDeclaration);
-		}
-
-		public override void VisitEnumMemberDeclaration(EnumMemberDeclaration enumMemberDeclaration)
-		{
-			_currentEnumMembers.Add(new NameNode(enumMemberDeclaration.Name, enumMemberDeclaration));
-			base.VisitEnumMemberDeclaration(enumMemberDeclaration);
-		}
-	}
-}
diff --git a/CSharpMinifier/MinifyLocalsAstVisitor.cs b/CSharpMinifier/MinifyLocalsAstVisitor.cs
deleted file mode 100644
index 51d55b0..0000000
--- a/CSharpMinifier/MinifyLocalsAstVisitor.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using ICSharpCode.NRefactory.CSharp;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace CSharpMinifier
-{
-	public class MinifyLocalsAstVisitor : DepthFirstAstVisitor
-	{
-		private string _currentNamespace;
-		private List<string> _currentTypes;
-		private List<NameNode> _currentMethodVars;
-		private IEnumerable<string> _ignoredLocals;
-
-		public HashSet<string> NotLocalsIdNames
-		{
-			get;
-			private set;
-		}
-
-		public Dictionary<string, List<NameNode>> MethodVars
-		{
-			get;
-			private set;
-		}
-
-		public MinifyLocalsAstVisitor(IEnumerable<string> ignoredLocals = null)
-		{
-			NotLocalsIdNames = new HashSet<string>();
-			MethodVars = new Dictionary<string, List<NameNode>>();
-			_ignoredLocals = ignoredLocals ?? new List<string>();
-			_currentTypes = new List<string>();
-		}
-
-		public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
-		{
-			_currentNamespace = namespaceDeclaration.Name;
-			base.VisitNamespaceDeclaration(namespaceDeclaration);
-		}
-
-		public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
-		{
-			_currentTypes.Add(typeDeclaration.Name);
-			base.VisitTypeDeclaration(typeDeclaration);
-			_currentTypes.RemoveAt(_currentTypes.Count - 1);
-		}
-
-		#region Visit members with body declarations
-
-		public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-		{
-			VisitMember(methodDeclaration.Name, methodDeclaration.Parameters.Select(p => p.Type.ToString()));
-			base.VisitMethodDeclaration(methodDeclaration);
-		}
-
-		public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
-		{
-			VisitMember(propertyDeclaration.Name);
-			base.VisitPropertyDeclaration(propertyDeclaration);
-		}
-
-		public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
-		{
-			foreach (var v in eventDeclaration.Variables)
-				VisitMember(v.Name);
-			base.VisitEventDeclaration(eventDeclaration);
-		}
-
-		public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
-		{
-			VisitMember(indexerDeclaration.Name, indexerDeclaration.Parameters.Select(p => p.Type.ToString()));
-			base.VisitIndexerDeclaration(indexerDeclaration);
-		}
-
-		public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
-		{
-			VisitMember(operatorDeclaration.Name, operatorDeclaration.Parameters.Select(p => p.Type.ToString()));
-			base.VisitOperatorDeclaration(operatorDeclaration);
-		}
-
-		public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
-		{
-			string prefix = "";
-			if ((constructorDeclaration.Modifiers & Modifiers.Static) == Modifiers.Static)
-				prefix = "static.";
-			VisitMember(prefix + constructorDeclaration.Name, constructorDeclaration.Parameters.Select(p => p.Type.ToString()));
-			base.VisitConstructorDeclaration(constructorDeclaration);
-		}
-
-		public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
-		{
-			VisitMember(destructorDeclaration.Name);
-			base.VisitDestructorDeclaration(destructorDeclaration);
-		}
-
-		private void VisitMember(string memberName, IEnumerable<string> parameters = null)
-		{
-			StringBuilder memberKey = new StringBuilder();
-			string prefix = string.IsNullOrEmpty(_currentNamespace) ? "" : "." + _currentNamespace;
-			memberKey.AppendFormat("{0}{1}.{2}", prefix, string.Join(".", _currentTypes), memberName);
-			if (parameters != null)
-			{
-				memberKey.Append('(');
-				foreach (var param in parameters)
-				{
-					memberKey.Append(param);
-					memberKey.Append(',');
-				}
-				if (parameters.Count() != 0)
-					memberKey.Remove(memberKey.Length - 1, 1);
-				memberKey.Append(')');
-			}
-			_currentMethodVars = new List<NameNode>();
-			MethodVars.Add(memberKey.ToString(), _currentMethodVars);
-		}
-
-		#endregion
-
-		#region Visit local declarations
-
-		public override void VisitParameterDeclaration(ParameterDeclaration parameterDeclaration)
-		{
-			if (!_ignoredLocals.Contains(parameterDeclaration.Name))
-				_currentMethodVars.Add(new NameNode(parameterDeclaration.Name, parameterDeclaration));
-			base.VisitParameterDeclaration(parameterDeclaration);
-		}
-
-		public override void VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement)
-		{
-			foreach (var varInitializer in variableDeclarationStatement.Variables)
-			{
-				if (!_ignoredLocals.Contains(varInitializer.Name))
-					_currentMethodVars.Add(new NameNode(varInitializer.Name, varInitializer));
-			}
-			base.VisitVariableDeclarationStatement(variableDeclarationStatement);
-		}
-
-		#endregion
-
-		public override void VisitIdentifier(Identifier identifier)
-		{
-			if (_currentMethodVars == null || _currentMethodVars.FirstOrDefault(v => v.Name == identifier.Name) == null)
-				NotLocalsIdNames.Add(identifier.Name);
-			base.VisitIdentifier(identifier);
-		}
-	}
-}
diff --git a/CSharpMinifier/MinifyMembersAstVisitor.cs b/CSharpMinifier/MinifyMembersAstVisitor.cs
deleted file mode 100644
index 7a4c5f8..0000000
--- a/CSharpMinifier/MinifyMembersAstVisitor.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using ICSharpCode.NRefactory.CSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace CSharpMinifier
-{
-	public class MinifyMembersAstVisitor : DepthFirstAstVisitor
-	{
-		private Stack<Tuple<string, CSharpTokenNode>> _currentNamespaces = new Stack<Tuple<string,CSharpTokenNode>>();
-		private Stack<Tuple<string, List<NameNode>, CSharpTokenNode>> _currentMembers = new Stack<Tuple<string, List<NameNode>, CSharpTokenNode>>();
-		private IEnumerable<string> _ignoredMembers;
-
-		public bool ConsoleApp
-		{
-			get;
-			private set;
-		}
-
-		public bool CompressPublic
-		{
-			get;
-			private set;
-		}
-
-		public bool RemoveToString
-		{
-			get;
-			private set;
-		}
-
-		public HashSet<string> NotMembersIdNames
-		{
-			get;
-			private set;
-		}
-
-		public Dictionary<string, List<NameNode>> TypesMembers
-		{
-			get;
-			private set;
-		}
-
-		public MinifyMembersAstVisitor(IEnumerable<string> ignoredMembers, bool consoleApp, bool compressPublic, bool removeToString)
-		{
-			TypesMembers = new Dictionary<string, List<NameNode>>();
-			NotMembersIdNames = new HashSet<string>();
-			_ignoredMembers = ignoredMembers ?? new List<string>();
-			ConsoleApp = consoleApp;
-			CompressPublic = compressPublic;
-			RemoveToString = removeToString;
-		}
-
-		public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
-		{
-			_currentNamespaces.Push(new Tuple<string, CSharpTokenNode>(namespaceDeclaration.Name, namespaceDeclaration.Children.LastOrDefault() as CSharpTokenNode));
-			base.VisitNamespaceDeclaration(namespaceDeclaration);
-		}
-
-		public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
-		{
-			string key = string.Join(".", _currentNamespaces.ToArray().Reverse().Select(ns => ns.Item1));
-			if (key != "")
-				key += ".";
-			key += string.Join(".", _currentMembers.ToArray().Reverse().Select(m => m.Item1));
-			if (key != "" && key[key.Length - 1] != '.')
-				key += ".";
-			key += typeDeclaration.Name;
-
-			List<NameNode> nameNodes;
-			if (!TypesMembers.ContainsKey(key))
-			{
-				nameNodes = new List<NameNode>();
-				TypesMembers.Add(key, nameNodes);
-			}
-			else
-				nameNodes = TypesMembers[key];
-
-			_currentMembers.Push(new Tuple<string, List<NameNode>, CSharpTokenNode>(typeDeclaration.Name, nameNodes,
-				(CSharpTokenNode)typeDeclaration.Children.Last()));
-
-			base.VisitTypeDeclaration(typeDeclaration);
-		}
-
-		#region Visit type members
-
-		public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
-		{
-			if (CheckModifiers(fieldDeclaration))
-				foreach (var v in fieldDeclaration.Variables)
-					if (!_ignoredMembers.Contains(v.Name))
-						_currentMembers.Peek().Item2.Add(new NameNode(v.Name, v));
-			base.VisitFieldDeclaration(fieldDeclaration);
-		}
-
-		public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-		{
-			if (CheckModifiers(methodDeclaration) && !_ignoredMembers.Contains(methodDeclaration.Name) &&
-				(ConsoleApp ? methodDeclaration.Name != "Main" : true) &&
-				(methodDeclaration.Modifiers & Modifiers.Override) != Modifiers.Override)
-					_currentMembers.Peek().Item2.Add(new NameNode(methodDeclaration.Name, methodDeclaration));
-			if (RemoveToString && methodDeclaration.Name == "ToString" && (methodDeclaration.Modifiers & Modifiers.Override) == Modifiers.Override)
-				methodDeclaration.Remove();
-			base.VisitMethodDeclaration(methodDeclaration);
-		}
-
-		public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
-		{
-			if (CheckModifiers(propertyDeclaration) && !_ignoredMembers.Contains(propertyDeclaration.Name) &&
-				(propertyDeclaration.Modifiers & Modifiers.Override) != Modifiers.Override)
-				_currentMembers.Peek().Item2.Add(new NameNode(propertyDeclaration.Name, propertyDeclaration));
-			base.VisitPropertyDeclaration(propertyDeclaration);
-		}
-
-		public override void VisitEnumMemberDeclaration(EnumMemberDeclaration enumMemberDeclaration)
-		{
-			if (!_ignoredMembers.Contains(enumMemberDeclaration.Name))
-				_currentMembers.Peek().Item2.Add(new NameNode(enumMemberDeclaration.Name, enumMemberDeclaration));
-			base.VisitEnumMemberDeclaration(enumMemberDeclaration);
-		}
-
-		public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
-		{
-			if (CheckModifiers(eventDeclaration) && !_ignoredMembers.Contains(eventDeclaration.Name))
-				foreach (var v in eventDeclaration.Variables)
-					_currentMembers.Peek().Item2.Add(new NameNode(v.Name, v));
-			base.VisitEventDeclaration(eventDeclaration);
-		}
-
-		public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
-		{
-			base.VisitIndexerDeclaration(indexerDeclaration);
-		}
-
-		public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
-		{
-			base.VisitOperatorDeclaration(operatorDeclaration);
-		}
-
-		public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
-		{
-			base.VisitConstructorDeclaration(constructorDeclaration);
-		}
-
-		public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
-		{
-			base.VisitDestructorDeclaration(destructorDeclaration);
-		}
-
-		#endregion
-
-		public override void VisitCSharpTokenNode(CSharpTokenNode token)
-		{
-			if (_currentNamespaces.Count != 0 && token == _currentNamespaces.Peek().Item2)
-			{
-				_currentNamespaces.Pop();
-			}
-			else if (_currentMembers.Count != 0 && token == _currentMembers.Peek().Item3)
-			{
-				_currentMembers.Pop();
-			}
-			base.VisitCSharpTokenNode(token);
-		}
-
-		public override void VisitIdentifier(Identifier identifier)
-		{
-			if (_currentMembers.Count == 0 || _currentMembers.Peek().Item2.FirstOrDefault(v => v.Name == identifier.Name) == null)
-				NotMembersIdNames.Add(identifier.Name);
-			base.VisitIdentifier(identifier);
-		}
-
-		private bool CheckModifiers(EntityDeclaration declaration)
-		{
-			return CompressPublic || (declaration.Modifiers & Modifiers.Public) == Modifiers.None;
-		}
-	}
-}
diff --git a/CSharpMinifier/MinifyTypesAstVisitor.cs b/CSharpMinifier/MinifyTypesAstVisitor.cs
deleted file mode 100644
index c9347dc..0000000
--- a/CSharpMinifier/MinifyTypesAstVisitor.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using ICSharpCode.NRefactory.CSharp;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace CSharpMinifier
-{
-	public class MinifyTypesAstVisitor : DepthFirstAstVisitor
-	{
-		private string _currentNamespace;
-		private List<NameNode> _currentMembers;
-		private IEnumerable<string> _ignoredTypes;
-
-		public bool CompressPublic
-		{
-			get;
-			private set;
-		}
-
-		public HashSet<string> NotTypesIdNames
-		{
-			get;
-			private set;
-		}
-
-		public List<NameNode> Types
-		{
-			get;
-			private set;
-		}
-
-		public MinifyTypesAstVisitor(IEnumerable<string> ignoredTypes, bool compressPublic)
-		{
-			_ignoredTypes = ignoredTypes;
-			CompressPublic = compressPublic;
-			Types = new List<NameNode>();
-			NotTypesIdNames = new HashSet<string>();
-		}
-
-		public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
-		{
-			_currentNamespace = namespaceDeclaration.Name;
-			base.VisitNamespaceDeclaration(namespaceDeclaration);
-		}
-
-		public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
-		{
-			_currentMembers = new List<NameNode>();
-			if (CheckModifiers(typeDeclaration) && !_ignoredTypes.Contains(typeDeclaration.Name))
-				Types.Add(new NameNode(typeDeclaration.Name, typeDeclaration));
-			base.VisitTypeDeclaration(typeDeclaration);
-		}
-
-		public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
-		{
-			foreach (var v in fieldDeclaration.Variables)
-				NotTypesIdNames.Add(v.Name);
-			base.VisitFieldDeclaration(fieldDeclaration);
-		}
-
-		public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-		{
-			NotTypesIdNames.Add(methodDeclaration.Name);
-			base.VisitMethodDeclaration(methodDeclaration);
-		}
-
-		public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
-		{
-			NotTypesIdNames.Add(propertyDeclaration.Name);
-			base.VisitPropertyDeclaration(propertyDeclaration);
-		}
-
-		public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
-		{
-			foreach (var v in eventDeclaration.Variables)
-				NotTypesIdNames.Add(v.Name);
-			base.VisitEventDeclaration(eventDeclaration);
-		}
-
-		public override void VisitIdentifier(Identifier identifier)
-		{
-			if (Types.FirstOrDefault(t => t.Name == identifier.Name) == null)
-				NotTypesIdNames.Add(identifier.Name);
-			base.VisitIdentifier(identifier);
-		}
-
-		private bool CheckModifiers(EntityDeclaration declaration)
-		{
-			return CompressPublic || (declaration.Modifiers & Modifiers.Public) == Modifiers.None;
-		}
-	}
-}
diff --git a/CSharpMinifier/NRefactoryUtils.cs b/CSharpMinifier/NRefactoryUtils.cs
deleted file mode 100644
index 0ebb452..0000000
--- a/CSharpMinifier/NRefactoryUtils.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using ICSharpCode.NRefactory.CSharp;
-using System;
-using System.Linq;
-using System.Reflection;
-
-namespace CSharpMinifier
-{
-	public static class NRefactoryUtils
-	{
-		public static PropertyInfo[] GetProperties(this AstNode node)
-		{
-			return node.GetType().GetProperties();
-		}
-
-		public static string GetPropertyValue(this AstNode node, string propertyName)
-		{
-			return node.GetType()
-					.GetProperties()
-					.GetPropertyValue(node, propertyName);
-		}
-
-		public static T GetPropertyValueEnum<T>(this AstNode node, string propertyName)
-		{
-			return (T)node.GetType()
-					.GetProperties()
-					.GetPropertyValueEnum<T>(node, propertyName);
-		}
-
-		public static string GetPropertyValue(this PropertyInfo[] properties, AstNode node, string propertyName)
-		{
-			return properties
-					.Where(p => p.Name == propertyName)
-					.FirstOrDefault()
-					.GetValue(node, null)
-					.ToString();
-		}
-
-		public static T GetPropertyValueEnum<T>(this PropertyInfo[] properties, AstNode node, string propertyName)
-		{
-			return (T)Enum.Parse(typeof(T), properties
-					.Where(p => p.Name == propertyName)
-					.FirstOrDefault()
-					.GetValue(node, null)
-					.ToString());
-		}
-	}
-}
diff --git a/CSharpMinifier/NameNode.cs b/CSharpMinifier/NameNode.cs
deleted file mode 100644
index cc58b82..0000000
--- a/CSharpMinifier/NameNode.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using ICSharpCode.NRefactory.CSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace CSharpMinifier
-{
-	public class NameNode
-	{
-		public string Name;
-		public AstNode Node;
-
-		public NameNode(string name, AstNode node)
-		{
-			Name = name;
-			Node = node;
-		}
-
-		public override string ToString()
-		{
-			return Name + "; " + Node.ToString();
-		}
-	}
-}
diff --git a/CSharpMinifier/NamesGenerator.cs b/CSharpMinifier/NamesGenerator.cs
deleted file mode 100644
index 62a1136..0000000
--- a/CSharpMinifier/NamesGenerator.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System.Collections.Generic;
-
-namespace CSharpMinifier
-{
-	public abstract class NamesGenerator
-	{
-		public static string[] CSharpKeywords = new string[]
-		{
-			"abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char",
-			"checked", "class", "const", "continue", "decimal", "default", "delegate", "do", "double",
-			"else", "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float",
-			"for", "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal",
-			"is", "lock", "long", "namespace", "new", "null", "object", "operator", "out",
-			"override", "params", "private", "protected", "public", "readonly", "ref", "return", "sbyte",
-			"sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch",
-			"this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe",
-			"ushort", "using", "virtual", "void", "volatile", "while"
-		};
-
-		public static Dictionary<string, string> CSharpTypeSynonyms = new Dictionary<string, string>()
-		{
-			{ "Boolean", "bool" },
-			{ "Char", "char" },
-			{ "Byte", "byte" },
-			{ "Double", "double" },
-			{ "False", "false" },
-			{ "Single", "float" },
-			{ "Int32", "int" },
-			{ "Int64", "long" },
-			{ "Object", "object" },
-			{ "SByte", "sbyte" },
-			{ "Int16", "short" },
-			{ "String", "string" },
-			{ "True", "true" },
-			{ "UInt32", "uint" },
-			{ "UInt64", "ulong" },
-			{ "UInt16", "ushort" }
-		};
-
-		public abstract string Next();
-
-		public NamesGenerator()
-		{
-			Reset();
-		}
-
-		public virtual void Reset()
-		{
-			CurrentCombinationNumber = -1;
-			CurrentCombination = string.Empty;
-			Prefix = "";
-			Postfix = "";
-		}
-
-		public virtual int CurrentCombinationNumber
-		{
-			get;
-			set;
-		}
-
-		public string CurrentCombination
-		{
-			get;
-			protected set;
-		}
-
-		public string Prefix
-		{
-			get;
-			protected set;
-		}
-
-		public string Postfix
-		{
-			get;
-			protected set;
-		}
-	}
-}
diff --git a/CSharpMinifier/RandomIdGenerator.cs b/CSharpMinifier/RandomIdGenerator.cs
deleted file mode 100644
index fbb39ca..0000000
--- a/CSharpMinifier/RandomIdGenerator.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace CSharpMinifier
-{
-	public class RandomIdGenerator : NamesGenerator
-	{
-		private List<string> _generatedIds;
-		private Random _random;
-
-		public int MinLength
-		{
-			get;
-			set;
-		}
-
-		public int MaxLength
-		{
-			get;
-			set;
-		}
-
-		public RandomIdGenerator(int minLength, int maxLength)
-			: base()
-		{
-			MinLength = minLength;
-			MaxLength = MaxLength;
-		}
-
-		public override void Reset()
-		{
-			_generatedIds = new List<string>();
-			_random = new Random();
-			base.Reset();
-		}
-
-		public override string Next()
-		{
-			int length = _random.Next(MinLength, MaxLength + 1);
-
-			if (CurrentCombinationNumber < _generatedIds.Count)
-			{
-				StringBuilder result = new StringBuilder(length);
-				do
-				{
-					result.Clear();
-					result.Append(MinIdGenerator.Chars0[_random.Next(MinIdGenerator.Chars0.Length)]);
-					for (int i = 1; i < length; i++)
-						result.Append(MinIdGenerator.CharsN[_random.Next(MinIdGenerator.CharsN.Length)]);
-					CurrentCombination = result.ToString();
-				}
-				while (_generatedIds.Contains(CurrentCombination));
-				_generatedIds.Add(CurrentCombination);
-			}
-			else
-				CurrentCombination = _generatedIds[CurrentCombinationNumber];
-
-			CurrentCombinationNumber++;
-			return Prefix + CurrentCombination + Postfix;
-		}
-
-		public override int CurrentCombinationNumber
-		{
-			get
-			{
-				return base.CurrentCombinationNumber;
-			}
-			set
-			{
-				CurrentCombination = CurrentCombinationNumber >= 0 && CurrentCombinationNumber < _generatedIds.Count ? _generatedIds[CurrentCombinationNumber] : "";
-				base.CurrentCombinationNumber = value;
-			}
-		}
-	}
-}
diff --git a/CSharpMinifier/ResolveResultType.cs b/CSharpMinifier/ResolveResultType.cs
deleted file mode 100644
index 6ba7436..0000000
--- a/CSharpMinifier/ResolveResultType.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace CSharpMinifier
-{
-	public enum ResolveResultType
-	{
-		Local,
-		Member,
-		Type
-	}
-}
diff --git a/CSharpMinifier/Rewriters/TokensMinifier.cs b/CSharpMinifier/Rewriters/TokensMinifier.cs
index 8c3a53d..014a1ac 100644
--- a/CSharpMinifier/Rewriters/TokensMinifier.cs
+++ b/CSharpMinifier/Rewriters/TokensMinifier.cs
@@ -32,8 +32,9 @@ public AdhocWorkspace MinifyIdentifiers()
                 {
                     _semanticModel = document.GetSemanticModelAsync().Result;
                     var node = _semanticModel.SyntaxTree.GetRoot();
+                    node = node.ReplaceTrivia(node.DescendantTrivia(), ReplaceSpaces);
+                    node = node.ReplaceTrivia(node.DescendantTrivia(), ReplaceCommentsAndRegions);
                     node = Visit(node);
-                    node = node.ReplaceTrivia(node.DescendantTrivia(), ReplaceTriviaNodes);
                     RenameAll(document.WithSyntaxRoot(node));
                 }
             }
@@ -138,12 +139,11 @@ public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax no
         }
 
 
-        public SyntaxTrivia ReplaceTriviaNodes(SyntaxTrivia arg1, SyntaxTrivia arg2)
-        {
-            if (_options.CommentsRemoving || _options.RegionsRemoving)
+        public SyntaxTrivia ReplaceSpaces(SyntaxTrivia arg1, SyntaxTrivia arg2)
+        {            
+            if (_options.SpacesRemoving)
             {
-                if (arg1.IsKind(SyntaxKind.SingleLineCommentTrivia) || arg1.IsKind(SyntaxKind.MultiLineCommentTrivia)
-                || arg1.IsKind(SyntaxKind.RegionDirectiveTrivia) || arg1.IsKind(SyntaxKind.EndRegionDirectiveTrivia))
+                if (arg1.IsKind(SyntaxKind.WhitespaceTrivia) || arg1.IsKind(SyntaxKind.EndOfLineTrivia))
                 {
                     arg2 = CarriageReturn;
                 }
@@ -151,10 +151,17 @@ public SyntaxTrivia ReplaceTriviaNodes(SyntaxTrivia arg1, SyntaxTrivia arg2)
                 {
                     arg2 = arg1;
                 }
+                
             }
-            if (_options.SpacesRemoving)
+            return arg2;
+        }
+        
+        public SyntaxTrivia ReplaceCommentsAndRegions(SyntaxTrivia arg1, SyntaxTrivia arg2)
+        {
+            if (_options.CommentsRemoving || _options.RegionsRemoving)
             {
-                if (arg1.IsKind(SyntaxKind.WhitespaceTrivia) || arg1.IsKind(SyntaxKind.EndOfLineTrivia))
+                if (arg1.IsKind(SyntaxKind.SingleLineCommentTrivia) || arg1.IsKind(SyntaxKind.MultiLineCommentTrivia)
+                || arg1.IsKind(SyntaxKind.RegionDirectiveTrivia) || arg1.IsKind(SyntaxKind.EndRegionDirectiveTrivia))
                 {
                     arg2 = CarriageReturn;
                 }
@@ -162,7 +169,6 @@ public SyntaxTrivia ReplaceTriviaNodes(SyntaxTrivia arg1, SyntaxTrivia arg2)
                 {
                     arg2 = arg1;
                 }
-                
             }
             return arg2;
         }
diff --git a/CSharpMinifier/Substitutor.cs b/CSharpMinifier/Substitutor.cs
deleted file mode 100644
index 8f9a475..0000000
--- a/CSharpMinifier/Substitutor.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace CSharpMinifier
-{
-	public class Substitutor
-	{
-		public NamesGenerator Generator
-		{
-			get;
-			set;
-		}
-
-		public Substitutor(NamesGenerator generator)
-		{
-			Generator = generator;
-		}
-
-		public Dictionary<string, Dictionary<string, string>> Generate(Dictionary<string, List<NameNode>> idNameNodes, IEnumerable<string> excludedNames)
-		{
-			var result = new Dictionary<string, Dictionary<string, string>>();
-
-			foreach (var vars in idNameNodes)
-				result.Add(vars.Key, Generate(vars.Value, excludedNames));
-
-			return result;
-		}
-
-		public Dictionary<string, string> Generate(List<NameNode> idNameNodes, IEnumerable<string> excludedNames)
-		{
-			Generator.Reset();
-
-			int varCount = idNameNodes.Count;
-			string[] newNames = new string[varCount];
-			var newSubstitution = new Dictionary<string, string>();
-
-			for (int i = 0; i < varCount; i++)
-			{
-				string newName;
-				do
-				{
-					newName = Generator.Next();
-				}
-				while (excludedNames.Contains(newName) || NamesGenerator.CSharpKeywords.Contains(newName));
-				newNames[i] = newName;
-			}
-
-			int ind = 0;
-			foreach (NameNode v in idNameNodes)
-				if (!newSubstitution.ContainsKey(v.Name))
-					newSubstitution.Add(v.Name, newNames[ind++]);
-
-			return newSubstitution;
-		}
-	}
-}
diff --git a/CSharpMinifier/packages.config b/CSharpMinifier/packages.config
index c138d71..6183af2 100644
--- a/CSharpMinifier/packages.config
+++ b/CSharpMinifier/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ICSharpCode.NRefactory" version="5.5.1" targetFramework="net40" />
   <package id="ManagedEsent" version="1.9.4" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis" version="2.6.1" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />

From ae03a91502de7381b258b6004dc0af9d0507cef6 Mon Sep 17 00:00:00 2001
From: Ivan Kochurkin <kvanttt@gmail.com>
Date: Sun, 18 Mar 2018 16:14:49 +0300
Subject: [PATCH 11/12] Fixed missed packages errors: added packages to
 CSharpMinifier.Tests.

---
 .../CSharpMinifier.Tests.csproj               | 72 +++++++++++++++++++
 CSharpMinifier.Tests/app.config               |  8 +++
 CSharpMinifier.Tests/packages.config          | 43 +++++++++++
 CSharpMinifier/CSharpMinifier.csproj          | 31 ++++----
 CSharpMinifier/packages.config                | 15 ++--
 5 files changed, 144 insertions(+), 25 deletions(-)

diff --git a/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj b/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
index d21f61c..ac7170f 100644
--- a/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
+++ b/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
@@ -34,11 +34,83 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CodeAnalysis, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Diagnostics.FileVersionInfo, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.StackTrace, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net46\System.Security.Cryptography.Algorithms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net46\System.Security.Cryptography.X509Certificates.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encoding.CodePages, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Thread, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XPath, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XPath.XDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MinifierTests.cs" />
diff --git a/CSharpMinifier.Tests/app.config b/CSharpMinifier.Tests/app.config
index 49196a3..b4aac43 100644
--- a/CSharpMinifier.Tests/app.config
+++ b/CSharpMinifier.Tests/app.config
@@ -30,6 +30,14 @@
         <assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/CSharpMinifier.Tests/packages.config b/CSharpMinifier.Tests/packages.config
index 967502d..f3898af 100644
--- a/CSharpMinifier.Tests/packages.config
+++ b/CSharpMinifier.Tests/packages.config
@@ -1,4 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />
+  <package id="Microsoft.CodeAnalysis.Common" version="2.7.0" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="2.7.0" targetFramework="net46" />
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net46" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net46" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net46" />
+  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net46" />
+  <package id="System.Console" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net46" />
+  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net46" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net46" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net46" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net46" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net46" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net46" />
+  <package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net46" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net46" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net46" />
+  <package id="System.Text.Encoding.CodePages" version="4.3.0" targetFramework="net46" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading.Thread" version="4.3.0" targetFramework="net46" />
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XPath" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/CSharpMinifier/CSharpMinifier.csproj b/CSharpMinifier/CSharpMinifier.csproj
index 0463d6b..3f06b24 100644
--- a/CSharpMinifier/CSharpMinifier.csproj
+++ b/CSharpMinifier/CSharpMinifier.csproj
@@ -34,29 +34,26 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Esent.Interop, Version=1.9.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\ManagedEsent.1.9.4\lib\net40\Esent.Interop.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.7.0\lib\net46\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.6.1\lib\net46\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.6.1\lib\net46\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.7.0\lib\net46\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Cecil, Version=0.9.5.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/CSharpMinifier/packages.config b/CSharpMinifier/packages.config
index 6183af2..d1da915 100644
--- a/CSharpMinifier/packages.config
+++ b/CSharpMinifier/packages.config
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ManagedEsent" version="1.9.4" targetFramework="net46" />
-  <package id="Microsoft.CodeAnalysis" version="2.6.1" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis" version="2.7.0" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />
-  <package id="Microsoft.CodeAnalysis.Common" version="2.6.1" targetFramework="net46" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="2.6.1" targetFramework="net46" />
-  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="2.6.1" targetFramework="net46" />
-  <package id="Microsoft.CodeAnalysis.VisualBasic" version="2.6.1" targetFramework="net46" />
-  <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="2.6.1" targetFramework="net46" />
-  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="2.6.1" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.Common" version="2.7.0" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="2.7.0" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="2.7.0" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.VisualBasic" version="2.7.0" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="2.7.0" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="2.7.0" targetFramework="net46" />
   <package id="Mono.Cecil" version="0.9.5.4" targetFramework="net40" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections" version="4.3.0" targetFramework="net46" />

From d128dd65323cd4230688651bcd49ac14bf94a509 Mon Sep 17 00:00:00 2001
From: codeFather2 <Dmitry.Litovchenko1@yandex.ru>
Date: Sun, 3 Jun 2018 18:26:59 +0300
Subject: [PATCH 12/12] WIP (Fix renaming)

---
 .../CSharpMinifier.Tests.csproj               | 13 ++++-
 CSharpMinifier.Tests/MinifierTests.cs         |  4 +-
 CSharpMinifier.Tests/packages.config          |  2 +-
 CSharpMinifier/IdentifierGenerator.cs         | 24 +++-----
 CSharpMinifier/Rewriters/TokensMinifier.cs    | 57 +++++++++++--------
 CSharpMinifier/RoslynMinifier.cs              | 27 ++++++---
 6 files changed, 74 insertions(+), 53 deletions(-)

diff --git a/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj b/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
index ac7170f..5732e46 100644
--- a/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
+++ b/CSharpMinifier.Tests/CSharpMinifier.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,6 +14,8 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,8 +43,8 @@
     <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -137,6 +140,12 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/CSharpMinifier.Tests/MinifierTests.cs b/CSharpMinifier.Tests/MinifierTests.cs
index 3f95f4d..070fc7e 100644
--- a/CSharpMinifier.Tests/MinifierTests.cs
+++ b/CSharpMinifier.Tests/MinifierTests.cs
@@ -14,7 +14,7 @@ public class MinifierTests
 		public void Init()
 		{
 			Samples = new Dictionary<string, string>();
-			var sampleFiles = Directory.GetFiles(@"..\..\Samples");
+			var sampleFiles = Directory.GetFiles($"{System.AppDomain.CurrentDomain.BaseDirectory}..\\..\\Samples");
 			foreach (var file in sampleFiles)
 			{
 				var code = File.ReadAllText(file);
@@ -46,7 +46,7 @@ public void LineLengthConstraint()
 		{
 			var minifierOptions = new MinifierOptions
 			{
-				SpacesRemoving = true,
+				SpacesRemoving = false,
 				CommentsRemoving = true,
 				LineLength = 80,
 				RegionsRemoving = true
diff --git a/CSharpMinifier.Tests/packages.config b/CSharpMinifier.Tests/packages.config
index f3898af..2f17a5b 100644
--- a/CSharpMinifier.Tests/packages.config
+++ b/CSharpMinifier.Tests/packages.config
@@ -3,7 +3,7 @@
   <package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />
   <package id="Microsoft.CodeAnalysis.Common" version="2.7.0" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis.CSharp" version="2.7.0" targetFramework="net46" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.10.1" targetFramework="net46" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net46" />
diff --git a/CSharpMinifier/IdentifierGenerator.cs b/CSharpMinifier/IdentifierGenerator.cs
index 1bd082d..02c7422 100644
--- a/CSharpMinifier/IdentifierGenerator.cs
+++ b/CSharpMinifier/IdentifierGenerator.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -11,15 +9,15 @@ namespace CSharpMinifier
 {
     public class IdentifierGenerator
     {
-        public Dictionary<VariableDeclaratorSyntax, string> RenamedVariables { get; private set; }
+        public Dictionary<VariableDeclaratorSyntax, string> RenamedVariables { get; }
 
-        public Dictionary<MethodDeclarationSyntax, string> RenamedMethods { get; private set; }
+        public Dictionary<MethodDeclarationSyntax, string> RenamedMethods { get; }
 
-        public Dictionary<ClassDeclarationSyntax, string> RenamedTypes { get; private set; }
+        public Dictionary<ClassDeclarationSyntax, string> RenamedTypes { get; }
 
         public Dictionary<PropertyDeclarationSyntax, string> RenamedProperties { get; set; }
 
-        private List<string> _existingNames = new List<string>();
+        private List<string> _existingNames = new List<string> { FirstSymbolCode.ToString() };
 
         private const char FirstSymbolCode = 'a';
         private const char LastSymbolCode = 'z';
@@ -54,7 +52,7 @@ public string GetNextName(SyntaxNode node)
                 _existingNames.Add(nextName);
                 AddToDictionary(node);
                 return nextName;
-            }            
+            }
             _existingNames.Add(FirstSymbolCode.ToString());
             AddToDictionary(node);
             return FirstSymbolCode.ToString();
@@ -65,26 +63,22 @@ private void AddToDictionary(SyntaxNode node)
             switch (node.Kind())
             {
                 case SyntaxKind.MethodDeclaration:
-                    RenamedMethods.Add((MethodDeclarationSyntax)node, LastName);
+                    RenamedMethods.Add((MethodDeclarationSyntax)node, String.Empty);
                     break;
                 case SyntaxKind.VariableDeclarator:
-                    RenamedVariables.Add((VariableDeclaratorSyntax)node, LastName);
+                    RenamedVariables.Add((VariableDeclaratorSyntax)node, String.Empty);
                     break;
                 case SyntaxKind.ClassDeclaration:
-                    RenamedTypes.Add((ClassDeclarationSyntax)node, LastName);
+                    RenamedTypes.Add((ClassDeclarationSyntax)node, String.Empty);
                     break;
                 case SyntaxKind.PropertyDeclaration:
-                    RenamedProperties.Add((PropertyDeclarationSyntax)node, LastName);
+                    RenamedProperties.Add((PropertyDeclarationSyntax)node, String.Empty);
                     break;
             }
         }
 
-        private string LastName => _existingNames.LastOrDefault();
-
         private string IncrementName(string lastName)
         {
-            if (lastName.Length <= 0)
-                lastName = "a";
             char lastChar = lastName[lastName.Length - 1];
             string fragment = lastName.Substring(0, lastName.Length - 1);
             while (lastChar < LastSymbolCode)
diff --git a/CSharpMinifier/Rewriters/TokensMinifier.cs b/CSharpMinifier/Rewriters/TokensMinifier.cs
index 014a1ac..ec8ae98 100644
--- a/CSharpMinifier/Rewriters/TokensMinifier.cs
+++ b/CSharpMinifier/Rewriters/TokensMinifier.cs
@@ -11,9 +11,11 @@ namespace CSharpMinifier.Rewriters
     class TokensMinifier : CSharpSyntaxRewriter
     {
         private SemanticModel _semanticModel;
-        private AdhocWorkspace _workspace;
-        private MinifierOptions _options;
-        private IdentifierGenerator _identifierGenerator; 
+        private readonly AdhocWorkspace _workspace;
+        private readonly MinifierOptions _options;
+        private readonly IdentifierGenerator _identifierGenerator;
+        readonly string PublicModifier = "public";
+        readonly string PrivateModifier = "private";
 
         public TokensMinifier(AdhocWorkspace workspace, MinifierOptions options = null, bool visitIntoStructuredTrivia = true) : base(visitIntoStructuredTrivia)
         {
@@ -26,9 +28,9 @@ public TokensMinifier(AdhocWorkspace workspace, MinifierOptions options = null,
 
         public AdhocWorkspace MinifyIdentifiers()
         {
-            foreach(var project in _workspace.CurrentSolution.Projects)
+            foreach (var project in _workspace.CurrentSolution.Projects)
             {
-                foreach(var document in project.Documents)
+                foreach (var document in project.Documents)
                 {
                     _semanticModel = document.GetSemanticModelAsync().Result;
                     var node = _semanticModel.SyntaxTree.GetRoot();
@@ -43,36 +45,43 @@ public AdhocWorkspace MinifyIdentifiers()
         }
 
         private void RenameAll(Document document)
-        {           
+        {
             _semanticModel = document.GetSemanticModelAsync().Result;
             var newNode = _semanticModel.SyntaxTree.GetRoot();
 
             foreach (KeyValuePair<VariableDeclaratorSyntax, string> variable in _identifierGenerator.RenamedVariables)
             {
                 var nodeToSearch = newNode.DescendantNodes()
-                    .OfType<VariableDeclaratorSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(variable.Key.Identifier.ValueText));
+                    .OfType<VariableDeclaratorSyntax>()
+                    .FirstOrDefault(x =>
+                        x.Identifier.ValueText.Equals(variable.Key.Identifier.ValueText));
                 (newNode, document) = Rename(nodeToSearch, document, variable.Value);
             }
 
-            foreach(var method in _identifierGenerator.RenamedMethods)
+            foreach (var method in _identifierGenerator.RenamedMethods)
             {
                 var nodeToSearch = newNode.DescendantNodes()
-                    .OfType<MethodDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(method.Key.Identifier.ValueText));
+                    .OfType<MethodDeclarationSyntax>()
+                    .FirstOrDefault(x =>
+                        x.Identifier.ValueText.Equals(method.Key.Identifier.ValueText));
                 (newNode, document) = Rename(nodeToSearch, document, method.Value);
             }
 
             foreach (var classToRename in _identifierGenerator.RenamedTypes)
             {
                 var nodeToSearch = newNode.DescendantNodes()
-                    .OfType<ClassDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText.Equals(classToRename.Key.Identifier.ValueText));
+                    .OfType<ClassDeclarationSyntax>()
+                    .FirstOrDefault(x =>
+                        x.Identifier.ValueText.Equals(classToRename.Key.Identifier.ValueText));
                 (newNode, document) = Rename(nodeToSearch, document, classToRename.Value);
             }
-            
+
         }
 
         private (SyntaxNode node, Document document) Rename(SyntaxNode nodeToRename, Document document, string newName)
         {
-            var symbolInfo = _semanticModel.GetSymbolInfo(nodeToRename).Symbol ?? _semanticModel.GetDeclaredSymbol(nodeToRename);
+            var symbolInfo = _semanticModel.GetSymbolInfo(nodeToRename).Symbol ??
+                _semanticModel.GetDeclaredSymbol(nodeToRename);
             var solution = Renamer.RenameSymbolAsync(document.Project.Solution, symbolInfo, newName,
                 _workspace.Options).Result;
             _workspace.TryApplyChanges(solution);
@@ -101,11 +110,11 @@ public override SyntaxNode VisitClassDeclaration(ClassDeclarationSyntax node)
 
         public override SyntaxNode VisitFieldDeclaration(FieldDeclarationSyntax node)
         {
-            if (_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals("private")))
+            if (_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals(PrivateModifier)))
             {
                 _identifierGenerator.GetNextName(node.Declaration.Variables.First());
             }
-            else if (_options.PublicCompressing && node.Modifiers.Any(m => m.Value.Equals("public")))
+            else if (_options.PublicCompressing && node.Modifiers.Any(m => m.Value.Equals(PublicModifier)))
             {
                 _identifierGenerator.GetNextName(node.Declaration.Variables.First());
             }
@@ -114,11 +123,11 @@ public override SyntaxNode VisitFieldDeclaration(FieldDeclarationSyntax node)
 
         public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node)
         {
-            if (_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals("private")))
+            if (_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals(PrivateModifier)))
             {
                 _identifierGenerator.GetNextName(node);
             }
-            else if (_options.PublicCompressing && node.Modifiers.Any(m => m.Value.Equals("public")))
+            else if (_options.PublicCompressing && node.Modifiers.Any(m => m.Value.Equals(PublicModifier)))
             {
                 _identifierGenerator.GetNextName(node);
             }
@@ -127,11 +136,11 @@ public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node)
 
         public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax node)
         {
-            if (_options.PublicCompressing && node.Modifiers.Any(m => m.Value.Equals("public")))
+            if (_options.PublicCompressing && node.Modifiers.Any(m => m.Value.Equals(PublicModifier)))
             {
                 _identifierGenerator.GetNextName(node);
             }
-            else if (_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals("private")))
+            else if (_options.LocalVarsCompressing && node.Modifiers.Any(m => m.Value.Equals(PublicModifier)))
             {
                 _identifierGenerator.GetNextName(node);
             }
@@ -140,22 +149,22 @@ public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax no
 
 
         public SyntaxTrivia ReplaceSpaces(SyntaxTrivia arg1, SyntaxTrivia arg2)
-        {            
+        {
             if (_options.SpacesRemoving)
             {
-                if (arg1.IsKind(SyntaxKind.WhitespaceTrivia) || arg1.IsKind(SyntaxKind.EndOfLineTrivia))
+                if (arg1.IsKind(SyntaxKind.WhitespaceTrivia) || (arg1.IsKind(SyntaxKind.EndOfLineTrivia)
+                    && arg1.Span.Length > 1))
                 {
-                    arg2 = CarriageReturn;
+                    arg2 = Space;
                 }
                 else
                 {
                     arg2 = arg1;
                 }
-                
             }
             return arg2;
         }
-        
+
         public SyntaxTrivia ReplaceCommentsAndRegions(SyntaxTrivia arg1, SyntaxTrivia arg2)
         {
             if (_options.CommentsRemoving || _options.RegionsRemoving)
@@ -163,7 +172,7 @@ public SyntaxTrivia ReplaceCommentsAndRegions(SyntaxTrivia arg1, SyntaxTrivia ar
                 if (arg1.IsKind(SyntaxKind.SingleLineCommentTrivia) || arg1.IsKind(SyntaxKind.MultiLineCommentTrivia)
                 || arg1.IsKind(SyntaxKind.RegionDirectiveTrivia) || arg1.IsKind(SyntaxKind.EndRegionDirectiveTrivia))
                 {
-                    arg2 = CarriageReturn;
+                    arg2 = Space;
                 }
                 else
                 {
diff --git a/CSharpMinifier/RoslynMinifier.cs b/CSharpMinifier/RoslynMinifier.cs
index c057367..7fe8448 100644
--- a/CSharpMinifier/RoslynMinifier.cs
+++ b/CSharpMinifier/RoslynMinifier.cs
@@ -34,9 +34,9 @@ public string MinifyFiles(string[] csFiles)
             _workspace.TryApplyChanges(project.Solution);
             var tempName = "tempFile";
 
-            for(int i = 0; i < csFiles.Length; i++)
+            for (int i = 0; i < csFiles.Length; i++)
             {
-                var syntaxTree = CSharpSyntaxTree.ParseText(csFiles[i]);                
+                var syntaxTree = CSharpSyntaxTree.ParseText(csFiles[i]);
                 _workspace.AddDocument(project.Id, tempName + i, syntaxTree.GetText());
             }
 
@@ -53,20 +53,29 @@ public string MinifyFiles(string[] csFiles)
         public string MinifyFromString(string csharpCode)
         {
             var syntaxTree = CSharpSyntaxTree.ParseText(csharpCode);
-            var project = _workspace.AddProject("MinifierProject", LanguageNames.CSharp);
-            project = project.AddMetadataReference(_mscorlib);
-            _workspace.TryApplyChanges(project.Solution);
+            Project project;
+            if (_workspace.CurrentSolution.Projects.Any())
+            {
+                project = _workspace.AddProject("MinifierProject", LanguageNames.CSharp);
+                project = project.AddMetadataReference(_mscorlib);
+                _workspace.TryApplyChanges(project.Solution);
+            }
+            else
+            {
+                project = _workspace.CurrentSolution.Projects.First();
+            }
             var document = _workspace.AddDocument(project.Id, "Doc", syntaxTree.GetText());
             _workspace = Minify(_workspace);
-
-            return _workspace.CurrentSolution.Projects.First()
-                .Documents.First().GetTextAsync().Result.ToString();
+            var resultCode = _workspace.CurrentSolution.Projects.First().Documents.First().GetTextAsync().Result.ToString();
+            project = _workspace.CurrentSolution.Projects.First().RemoveDocument(document.Id);
+            _workspace.TryApplyChanges(project.Solution);
+            return resultCode;
         }
 
         private AdhocWorkspace Minify(AdhocWorkspace workspace)
         {
             var rewriter = new TokensMinifier(workspace, Options);
             return rewriter.MinifyIdentifiers();
-        }        
+        }
     }
 }
\ No newline at end of file