1034 files changed, 63555 insertions, 45234 deletions

diff --git a/.gitmodules b/.gitmodules
index 5452060b8c..51dab65971 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,7 +32,7 @@
 	url = git://github.com/mono/guiunit.git
 [submodule "main/external/fsharpbinding"]
 	path = main/external/fsharpbinding
-	url = git://github.com/xamarin/fsharpbinding.git
+	url = git://github.com/fsharp/fsharpmdxs.git
 	branch = master
 [submodule "main/external/nuget-binary"]
 	path = main/external/nuget-binary
@@ -41,6 +41,10 @@
 	path = main/external/xwt
 	url = git://github.com/mono/xwt
 	branch = master
+[submodule "main/external/NRefactory6"]
+	path = main/external/NRefactory6
+	url = git://github.com/icsharpcode/NRefactory.git
+	branch = roslyn
 [submodule "main/external/monomac"]
 	path = main/external/monomac
 	url = git://github.com/mono/monomac.git
diff --git a/README.md b/README.md
index ef3ec2b649..4e34f555bb 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@ See http://www.monodevelop.com for more info.
 
 [![Build Status](http://jenkins.mono-project.com/job/test-monodevelop-mainline/badge/icon)](http://jenkins.mono-project.com/job/test-monodevelop-mainline/)
 
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mono/monodevelop?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Directory organization
 ----------------------
 
diff --git a/main/.nuget/NuGet.Config b/main/.nuget/NuGet.Config
new file mode 100644
index 0000000000..6a318ad9b7
--- /dev/null
+++ b/main/.nuget/NuGet.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>

+<configuration>

+  <solution>

+    <add key="disableSourceControlIntegration" value="true" />

+  </solution>

+</configuration>
\ No newline at end of file
diff --git a/main/.nuget/NuGet.exe b/main/.nuget/NuGet.exe
new file mode 100644
index 0000000000..8dd7e45ae7
--- /dev/null
+++ b/main/.nuget/NuGet.exe
diff --git a/main/.nuget/NuGet.targets b/main/.nuget/NuGet.targets
new file mode 100644
index 0000000000..428c8dad96
--- /dev/null
+++ b/main/.nuget/NuGet.targets
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+    <PropertyGroup>

+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>

+

+        <!-- Enable the restore command to run before builds -->

+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>

+

+        <!-- Property that enables building a package from a project -->

+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>

+

+        <!-- Determines if package restore consent is required to restore packages -->

+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>

+

+        <!-- Download NuGet.exe if it does not already exist -->

+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>

+    </PropertyGroup>

+

+    <ItemGroup Condition=" '$(PackageSources)' == '' ">

+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->

+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->

+        <!--

+            <PackageSource Include="https://www.nuget.org/api/v2/" />

+            <PackageSource Include="https://my-nuget-source/nuget/" />

+        -->

+    </ItemGroup>

+

+    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">

+        <!-- Windows specific commands -->

+        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>

+    </PropertyGroup>

+

+    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">

+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->

+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>

+    </PropertyGroup>

+

+    <PropertyGroup>

+        <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>

+        <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>

+    </PropertyGroup>

+

+    <PropertyGroup>

+      <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>

+      <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>

+    </PropertyGroup>

+    

+    <PropertyGroup>

+        <!-- NuGet command -->

+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>

+        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>

+

+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>

+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(NuGetExePath)"</NuGetCommand>

+

+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>

+

+        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>

+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>

+

+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>

+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>

+

+        <!-- Commands -->

+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>

+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>

+

+        <!-- We need to ensure packages are restored prior to assembly resolve -->

+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">

+            RestorePackages;

+            $(BuildDependsOn);

+        </BuildDependsOn>

+

+        <!-- Make the build depend on restore packages -->

+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">

+            $(BuildDependsOn);

+            BuildPackage;

+        </BuildDependsOn>

+    </PropertyGroup>

+

+    <Target Name="CheckPrerequisites">

+        <!-- Raise an error if we're unable to locate nuget.exe  -->

+        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />

+        <!--

+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.

+        This effectively acts as a lock that makes sure that the download operation will only happen once and all

+        parallel builds will have to wait for it to complete.

+        -->

+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />

+    </Target>

+

+    <Target Name="_DownloadNuGet">

+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />

+    </Target>

+

+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">        

+        <Exec Command="$(RestoreCommand)"

+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />

+

+        <Exec Command="$(RestoreCommand)"

+              LogStandardErrorAsError="true"

+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />

+    </Target>

+

+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">

+        <Exec Command="$(BuildCommand)"

+              Condition=" '$(OS)' != 'Windows_NT' " />

+

+        <Exec Command="$(BuildCommand)"

+              LogStandardErrorAsError="true"

+              Condition=" '$(OS)' == 'Windows_NT' " />

+    </Target>

+

+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">

+        <ParameterGroup>

+            <OutputFilename ParameterType="System.String" Required="true" />

+        </ParameterGroup>

+        <Task>

+            <Reference Include="System.Core" />

+            <Using Namespace="System" />

+            <Using Namespace="System.IO" />

+            <Using Namespace="System.Net" />

+            <Using Namespace="Microsoft.Build.Framework" />

+            <Using Namespace="Microsoft.Build.Utilities" />

+            <Code Type="Fragment" Language="cs">

+                <![CDATA[

+                try {

+                    OutputFilename = Path.GetFullPath(OutputFilename);

+

+                    Log.LogMessage("Downloading latest version of NuGet.exe...");

+                    WebClient webClient = new WebClient();

+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);

+

+                    return true;

+                }

+                catch (Exception ex) {

+                    Log.LogErrorFromException(ex);

+                    return false;

+                }

+            ]]>

+            </Code>

+        </Task>

+    </UsingTask>

+</Project>

diff --git a/main/.nuget/packages.config b/main/.nuget/packages.config
new file mode 100644
index 0000000000..b5272b3e87
--- /dev/null
+++ b/main/.nuget/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="NuGet.CommandLine" version="2.8.2" />

+</packages>
\ No newline at end of file
diff --git a/main/Main.sln b/main/Main.sln
index 8ebed6100d..d1b05518e1 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -1,2102 +1,2163 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9D360D43-0C05-49D6-84DB-4E7AB2F38F82}"
-	ProjectSection(MonoDevelopProperties) = preProject
-		BaseDirectory = src\core
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Core", "src\core\MonoDevelop.Core\MonoDevelop.Core.csproj", "{7525BB88-6142-4A26-93B9-A30C6983390A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Ide", "src\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj", "{27096E7F-C91C-4AC6-B289-6897A701DF21}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Startup", "src\core\MonoDevelop.Startup\MonoDevelop.Startup.csproj", "{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugging", "external\debugger-libs\Mono.Debugging\Mono.Debugging.csproj", "{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.TextEditor", "src\core\Mono.Texteditor\Mono.TextEditor.csproj", "{A2329308-3751-4DBD-9A75-5F7B8B024625}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.Projects.Format.MSBuild", "MonoDevelop.Projects.Format.MSBuild", "{8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Projects.Formats.MSBuild", "src\core\MonoDevelop.Projects.Formats.MSBuild\MonoDevelop.Projects.Formats.MSBuild.csproj", "{A437F1A3-78DF-4F00-8053-D32A8B1EB679}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0", "src\core\MonoDevelop.Projects.Formats.MSBuild\MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.csproj", "{DB96F55E-41C5-4330-A427-15A4EC028BBE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Projects.Formats.MSBuild.v4.0", "src\core\MonoDevelop.Projects.Formats.MSBuild\MonoDevelop.Projects.Formats.MSBuild.v4.0.csproj", "{B257A1A3-78DF-4F00-8053-D32A8B1EB679}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0", "src\core\MonoDevelop.Projects.Formats.MSBuild\MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0.csproj", "{C4B0275C-37D3-43F2-927D-ABF556600804}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Addins", "Addins", "{D417E929-2B3A-46AC-BBE8-027ADB63A790}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "src\addins\ILAsmBinding\ILAsmBinding.csproj", "{961B9266-C44A-42B6-BA3D-3FB229C9C417}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VersionControl", "VersionControl", "{DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl", "src\addins\VersionControl\MonoDevelop.VersionControl\MonoDevelop.VersionControl.csproj", "{19DE0F35-D204-4FD8-A553-A19ECE05E24D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl.Subversion", "src\addins\VersionControl\MonoDevelop.VersionControl.Subversion\MonoDevelop.VersionControl.Subversion.csproj", "{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl.Git", "src\addins\VersionControl\MonoDevelop.VersionControl.Git\MonoDevelop.VersionControl.Git.csproj", "{0413DB7D-8B35-423F-9752-D75C9225E7DE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl.Subversion.Unix", "src\addins\VersionControl\MonoDevelop.VersionControl.Subversion.Unix\MonoDevelop.VersionControl.Subversion.Unix.csproj", "{E2CAB397-D00C-4D11-8F5F-E3A052092969}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl.Subversion.Tests", "src\addins\VersionControl\MonoDevelop.VersionControl.Subversion.Tests\MonoDevelop.VersionControl.Subversion.Tests.csproj", "{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl.Git.Tests", "src\addins\VersionControl\MonoDevelop.VersionControl.Git.Tests\MonoDevelop.VersionControl.Git.Tests.csproj", "{F3AC14B0-3D1F-4B9B-95E8-384056060F33}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionControl.Subversion.Win32", "src\addins\VersionControl\Subversion.Win32\VersionControl.Subversion.Win32.csproj", "{1038FBD8-750E-4081-BC65-D89FFED3C881}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionControl.Subversion.Win32.Tests", "src\addins\VersionControl\Subversion.Win32.Tests\VersionControl.Subversion.Win32.Tests.csproj", "{E17829B5-8EAC-4714-8798-EB8ED3540191}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.GtkCore", "MonoDevelop.GtkCore", "{02280E65-C507-4931-AE68-AA2E89E15EEF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.GtkCore", "src\addins\MonoDevelop.GtkCore\MonoDevelop.GtkCore.csproj", "{7FCDB0D9-AA7D-44E4-BE74-55312B432389}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libstetic", "src\addins\MonoDevelop.GtkCore\libstetic\libstetic.csproj", "{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsteticui", "src\addins\MonoDevelop.GtkCore\libsteticui\libsteticui.csproj", "{7926DB5B-96A7-47A7-9870-DB42FA5C3548}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBNetBinding", "VBNetBinding", "{481E1487-E0F1-4C6D-BD71-E572D9A19683}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\addins\VBNetBinding\VBNetBinding.csproj", "{EF91D0B8-53F6-4622-9F26-3ED27815878A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChangeLogAddIn", "src\addins\ChangeLogAddIn\ChangeLogAddIn.csproj", "{75B9F2DF-4DEA-4007-965D-339563735EBE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDeveloperExtensions", "MonoDeveloperExtensions", "{7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDeveloperExtensions", "src\addins\MonoDeveloperExtensions\MonoDeveloperExtensions.csproj", "{9A415695-CF80-4845-AA80-0DA26CF1E256}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnit", "src\addins\MonoDeveloperExtensions\NUnit\NUnit.csproj", "{376889B5-6504-46A1-9D18-A9E4B4A50F49}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DesignerSupport", "src\addins\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj", "{2C24D515-4A2C-445C-8419-C09231913CFA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Autotools", "src\addins\MonoDevelop.Autotools\MonoDevelop.Autotools.csproj", "{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.WebReferences", "src\addins\MonoDevelop.WebReferences\MonoDevelop.WebReferences.csproj", "{2A00A871-C641-4116-ADFD-29B7799952B4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharpBinding", "CSharpBinding", "{B480BF1B-1DCD-4288-9212-F5BEDF763797}"
-	ProjectSection(MonoDevelopProperties) = preProject
-		BaseDirectory = src\addins\CSharpBinding
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\addins\CSharpBinding\CSharpBinding.csproj", "{07CC7654-27D6-421D-A64C-0FFA40456FA2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autotools", "src\addins\CSharpBinding\Autotools\Autotools.csproj", "{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding.AspNet", "src\addins\CSharpBinding\AspNet\CSharpBinding.AspNet.csproj", "{F426CBB2-77FC-4E14-9E28-E667C2D1299A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DocFood", "src\addins\MonoDevelop.DocFood\MonoDevelop.DocFood.csproj", "{875D389F-48D1-4D46-BFC6-998837DD6AE0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Gettext", "src\addins\MonoDevelop.Gettext\MonoDevelop.Gettext.csproj", "{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.RegexToolkit", "src\addins\MonoDevelop.RegexToolkit\MonoDevelop.RegexToolkit.csproj", "{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CBinding", "CBinding", "{49157389-0F4C-4000-88A1-D37B2AEBA941}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CBinding", "src\addins\CBinding\CBinding.csproj", "{7B57882B-AD46-469B-84E7-06DF98D11468}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CBinding.Autotools", "src\addins\CBinding\CBinding.Autotools\CBinding.Autotools.csproj", "{B841F25D-4F6D-4E0D-885F-212B54381F28}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GnomePlatform", "src\addins\GnomePlatform\GnomePlatform.csproj", "{AE84B4A7-E6B1-4565-8904-16284DCE41B6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.SourceEditor", "src\addins\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj", "{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.AssemblyBrowser", "src\addins\MonoDevelop.AssemblyBrowser\MonoDevelop.AssemblyBrowser.csproj", "{0EA3AD14-404A-4D3F-979B-F087E2E70C82}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deployment", "Deployment", "{CC556C33-DB2D-4141-AFBF-A641EF9A1FA9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Deployment", "src\addins\Deployment\MonoDevelop.Deployment\MonoDevelop.Deployment.csproj", "{9BC670A8-1851-40EC-9685-279F4C98433D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Deployment.Linux", "src\addins\Deployment\MonoDevelop.Deployment.Linux\MonoDevelop.Deployment.Linux.csproj", "{BA9020AD-A2D1-47C8-9A7C-756162C38296}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xml", "Xml", "{2A39DAE0-09B8-481E-950D-DF9DE0E87208}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Xml.Tests", "src\addins\Xml\Tests\MonoDevelop.Xml.Tests.csproj", "{8E47B77A-A649-494C-9BF2-B845E39CADE9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Xml", "src\addins\Xml\MonoDevelop.Xml.csproj", "{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.NUnit", "MonoDevelop.NUnit", "{DE462010-393D-4655-A42C-2C78BB14D2FA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.NUnit", "src\addins\NUnit\MonoDevelop.NUnit.csproj", "{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitRunner", "src\addins\NUnit\NUnitRunner\NUnitRunner.csproj", "{0AF16AF1-0876-413E-9803-08BD33C19E00}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacPlatform", "src\addins\MacPlatform\MacPlatform.csproj", "{50D6768C-C072-4E79-AFC5-C1C40767EF45}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Refactoring", "src\addins\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj", "{100568FC-F4E8-439B-94AD-41D11724E45B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNet", "AspNet", "{0ADCD824-2506-4A61-9B88-ABF1D5267CE8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.AspNet", "src\addins\AspNet\MonoDevelop.AspNet.csproj", "{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.AspNet.Tests", "src\addins\AspNet\Tests\MonoDevelop.AspNet.Tests.csproj", "{BEFADF93-EE92-4806-9C0B-937B25311C95}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TextTemplating", "TextTemplating", "{68F63ACB-A9B2-468F-B365-0F41F0D5F1DA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.TextTemplating", "src\addins\TextTemplating\Mono.TextTemplating\Mono.TextTemplating.csproj", "{A2364D6A-00EF-417C-80A6-815726C70032}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTransform", "src\addins\TextTemplating\TextTransform\TextTransform.csproj", "{D1D35409-C814-47F6-B038-B9B5BF0FE490}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.TextTemplating", "src\addins\TextTemplating\MonoDevelop.TextTemplating\MonoDevelop.TextTemplating.csproj", "{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.TextTemplating.Tests", "src\addins\TextTemplating\Mono.TextTemplating.Tests\Mono.TextTemplating.Tests.csproj", "{CB590106-8331-4CBE-8131-B154E7BF79E1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.Debugger.Soft", "MonoDevelop.Debugger.Soft", "{33248236-FF84-4336-A73B-65E6B1090D15}"
-	ProjectSection(MonoDevelopProperties) = preProject
-		BaseDirectory = src\addins\MonoDevelop.Debugger.Soft
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Soft", "src\addins\MonoDevelop.Debugger.Soft\MonoDevelop.Debugger.Soft\MonoDevelop.Debugger.Soft.csproj", "{3D363F0C-5731-42AA-9022-B7F4657F298A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Soft.AspNet", "src\addins\MonoDevelop.Debugger.Soft\MonoDevelop.Debugger.Soft.AspNet\MonoDevelop.Debugger.Soft.AspNet.csproj", "{F5390DA4-08B7-47E3-B6F3-D50683316AB4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugging.Soft", "external\debugger-libs\Mono.Debugging.Soft\Mono.Debugging.Soft.csproj", "{DE40756E-57F6-4AF2-B155-55E3A88CCED8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.HexEditor", "src\addins\MonoDevelop.HexEditor\MonoDevelop.HexEditor.csproj", "{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.Debugger", "MonoDevelop.Debugger", "{776872D9-76FA-407B-BA69-08E25A24E5CE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger", "src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj", "{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Tests", "src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.Tests\MonoDevelop.Debugger.Tests.csproj", "{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Tests.TestApp", "src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.Tests.TestApp\MonoDevelop.Debugger.Tests.TestApp.csproj", "{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Gdb", "src\addins\MonoDevelop.Debugger.Gdb\MonoDevelop.Debugger.Gdb.csproj", "{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.Debugger.Win32", "MonoDevelop.Debugger.Win32", "{8F47F5EC-2F57-4030-B658-7B1002DA90C2}"
-	ProjectSection(SolutionItems) = preProject
-		src\addins\MonoDevelop.Debugger.Win32\eula.rtf = src\addins\MonoDevelop.Debugger.Win32\eula.rtf
-		src\addins\MonoDevelop.Debugger.Win32\README.txt = src\addins\MonoDevelop.Debugger.Win32\README.txt
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CorApi", "src\addins\MonoDevelop.Debugger.Win32\CorApi\CorApi.csproj", "{9FBCC262-10DC-4E84-A5C4-17230BBF8862}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CorApi2", "src\addins\MonoDevelop.Debugger.Win32\CorApi2\CorApi2.csproj", "{69136056-BFD3-4CEC-BB41-D9991C79593C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Win32", "src\addins\MonoDevelop.Debugger.Win32\MonoDevelop.Debugger.Win32\MonoDevelop.Debugger.Win32.csproj", "{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.PackageManagement", "MonoDevelop.PackageManagement", "{98F4461F-84D0-4C57-A11F-47E871BD04A0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.PackageManagement.Tests", "src\addins\MonoDevelop.PackageManagement\MonoDevelop.PackageManagement.Tests\MonoDevelop.PackageManagement.Tests.csproj", "{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.PackageManagement", "src\addins\MonoDevelop.PackageManagement\MonoDevelop.PackageManagement.csproj", "{F218643D-2E74-4309-820E-206A54B7133F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsPlatform", "WindowsPlatform", "{4AE0B284-72F2-49C7-9B42-812EBE379FFB}"
-	ProjectSection(MonoDevelopProperties) = preProject
-		BaseDirectory = src\addins\WindowsPlatform
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsAPICodePack", "WindowsAPICodePack", "{DA5A3BAC-74C9-4EF9-B2FF-BFA4BF38F80F}"
-	ProjectSection(MonoDevelopProperties) = preProject
-		BaseDirectory = src\addins\WindowsPlatform\WindowsAPICodePack
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\addins\WindowsPlatform\WindowsAPICodePack\Core\Core.csproj", "{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shell", "src\addins\WindowsPlatform\WindowsAPICodePack\Shell\Shell.csproj", "{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPlatform", "src\addins\WindowsPlatform\WindowsPlatform\WindowsPlatform.csproj", "{459868D2-54DC-415B-B1AB-BE39BDBD352F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}"
-	ProjectSection(MonoDevelopProperties) = preProject
-		BaseDirectory = external
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugger.Soft", "external\debugger-libs\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj", "{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "contrib\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json", "external\Newtonsoft.Json\Src\Newtonsoft.Json\Newtonsoft.Json.csproj", "{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Reflection", "external\ikvm\reflect\IKVM.Reflection.csproj", "{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xwt", "Xwt", "{67A32B53-F719-4ECB-B5E1-FD0B04FEE258}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt", "external\xwt\Xwt\Xwt.csproj", "{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk", "external\xwt\Xwt.Gtk\Xwt.Gtk.csproj", "{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.WPF", "external\xwt\Xwt.WPF\Xwt.WPF.csproj", "{C93D746E-1586-4D4F-B411-BF5A966E6A08}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk.Mac", "external\xwt\Xwt.Gtk.Mac\Xwt.Gtk.Mac.csproj", "{E95833C9-90AA-4366-9262-0A1BED148249}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk.Windows", "external\xwt\Xwt.Gtk.Windows\Xwt.Gtk.Windows.csproj", "{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.XamMac", "external\xwt\Xwt.XamMac\Xwt.XamMac.csproj", "{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NGit", "NGit", "{08AC1C52-707A-46D1-AD72-36D747991592}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGit", "external\ngit\NGit\NGit.csproj", "{E3BFF8B4-189C-496A-A817-7E8B31E22B91}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharpen.Unix", "external\ngit\Sharpen.Unix\Sharpen.Unix.csproj", "{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharpen", "external\ngit\Sharpen\Sharpen.csproj", "{72944A6C-45FF-4EF8-B349-8C9CABF519D4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSch", "external\ngit\NSch\NSch.csproj", "{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mono.Cecil", "Mono.Cecil", "{D07C8309-996F-484E-BDA1-26BBAF69D29B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "external\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Mdb", "external\cecil\symbols\mdb\Mono.Cecil.Mdb.csproj", "{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Pdb", "external\cecil\symbols\pdb\Mono.Cecil.Pdb.csproj", "{63E6915C-7EA4-4D76-AB28-0D7191EEA626}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mono.Addins", "Mono.Addins", "{B8897B76-1A12-4DFA-8B60-7944CC4C9654}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins", "external\mono-addins\Mono.Addins\Mono.Addins.csproj", "{91DD5A2D-9FE3-4C3C-9253-876141874DAD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.CecilReflector", "external\mono-addins\Mono.Addins.CecilReflector\Mono.Addins.CecilReflector.csproj", "{42D1CE65-A14B-4218-B787-58AD7AA68513}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.Gui", "external\mono-addins\Mono.Addins.Gui\Mono.Addins.Gui.csproj", "{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.Setup", "external\mono-addins\Mono.Addins.Setup\Mono.Addins.Setup.csproj", "{A85C9721-C054-4BD8-A1F3-0227615F0A36}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{2D711139-8765-4929-BC7A-AA2DEE6F615D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp", "external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{53DCA265-3C3C-42F9-B647-F72BA678122B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.IKVM", "external\nrefactory\ICSharpCode.NRefactory.IKVM\ICSharpCode.NRefactory.IKVM.csproj", "{A727169F-D94F-443F-B305-B057D7F3B420}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Cecil", "external\nrefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj", "{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "external\nrefactory\ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Xml", "external\nrefactory\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj", "{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp.Refactoring", "external\nrefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj", "{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiUnit_NET_4_5", "external\guiunit\src\framework\GuiUnit_NET_4_5.csproj", "{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}"
-EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "po", "po\po.mdproj", "{AC7D119C-980B-4712-8811-5368C14412D7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{5D3F7E65-E55B-45CA-A83B-D1E10040281E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdhost", "src\tools\mdhost\mdhost.csproj", "{BFE8691A-D323-4622-9021-7B8B27F81599}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdtool", "src\tools\mdtool\mdtool.csproj", "{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdmonitor", "src\tools\mdmonitor\mdmonitor.csproj", "{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}"
-	ProjectSection(MonoDevelopProperties) = preProject
-		BaseDirectory = tests
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "tests\UnitTests\UnitTests.csproj", "{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserInterfaceTests", "tests\UserInterfaceTests\UserInterfaceTests.csproj", "{07F55155-51A8-4072-9F80-FA473666F086}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacPlatform.Tests", "tests\MacPlatform.Tests\MacPlatform.Tests.csproj", "{C05AAB7A-523F-4109-966B-6675BE0975BA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestRunner", "tests\TestRunner\TestRunner.csproj", "{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.TextEditor.Tests", "src\core\MonoDevelop.TextEditor.Tests\MonoDevelop.TextEditor.Tests.csproj", "{9E4BA410-8338-42EC-AF9C-422C35ECED81}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ide.Tests", "tests\Ide.Tests\Ide.Tests.csproj", "{73D4CC8B-BAB9-4A29-841B-F25C6311F067}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		DebugMac|Any CPU = DebugMac|Any CPU
-		DebugWin32|Any CPU = DebugWin32|Any CPU
-		Release|Any CPU = Release|Any CPU
-		DebugGnome|Any CPU = DebugGnome|Any CPU
-		ReleaseMac|Any CPU = ReleaseMac|Any CPU
-		ReleaseGnome|Any CPU = ReleaseGnome|Any CPU
-		ReleaseWin32|Any CPU = ReleaseWin32|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.Build.0 = Debug|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugGnome|Any CPU.ActiveCfg = Debug|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugGnome|Any CPU.Build.0 = Debug|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.ActiveCfg = Debug|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.Build.0 = Debug|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugWin32|Any CPU.Build.0 = Debug|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Release|Any CPU.ActiveCfg = Release|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Release|Any CPU.Build.0 = Release|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseGnome|Any CPU.Build.0 = Release|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseMac|Any CPU.ActiveCfg = Release|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseMac|Any CPU.Build.0 = Release|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseWin32|Any CPU.Build.0 = Release|x86
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{1038FBD8-750E-4081-BC65-D89FFED3C881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{1038FBD8-750E-4081-BC65-D89FFED3C881}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Release|Any CPU.Build.0 = Release|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugWin32|Any CPU.Build.0 = Debug|x86
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugGnome|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugGnome|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugMac|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugMac|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugWin32|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugWin32|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseGnome|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseGnome|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseMac|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseMac|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseWin32|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseWin32|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{69136056-BFD3-4CEC-BB41-D9991C79593C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{69136056-BFD3-4CEC-BB41-D9991C79593C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.Release|Any CPU.Build.0 = Release|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugGnome|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugGnome|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugMac|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugMac|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugWin32|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugWin32|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseGnome|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseGnome|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseMac|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseMac|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseWin32|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseWin32|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.Build.0 = Debug|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugGnome|Any CPU.ActiveCfg = Debug|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugGnome|Any CPU.Build.0 = Debug|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|Any CPU.ActiveCfg = Debug|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|Any CPU.Build.0 = Debug|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|Any CPU.Build.0 = Debug|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Release|Any CPU.ActiveCfg = Release|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Release|Any CPU.Build.0 = Release|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseGnome|Any CPU.Build.0 = Release|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseMac|Any CPU.ActiveCfg = Release|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseMac|Any CPU.Build.0 = Release|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseWin32|Any CPU.Build.0 = Release|x86
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Release|Any CPU.Build.0 = Release|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{AC7D119C-980B-4712-8811-5368C14412D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
-		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{AC7D119C-980B-4712-8811-5368C14412D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU
-		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.Debug|Any CPU.Build.0 = Debug|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugGnome|Any CPU.ActiveCfg = Debug|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugGnome|Any CPU.Build.0 = Debug|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugMac|Any CPU.ActiveCfg = Debug|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugMac|Any CPU.Build.0 = Debug|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugWin32|Any CPU.Build.0 = Debug|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.Release|Any CPU.ActiveCfg = Release|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.Release|Any CPU.Build.0 = Release|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseGnome|Any CPU.Build.0 = Release|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseMac|Any CPU.ActiveCfg = Release|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseMac|Any CPU.Build.0 = Release|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseWin32|Any CPU.Build.0 = Release|x86
-		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{B841F25D-4F6D-4E0D-885F-212B54381F28}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.Debug|Any CPU.Build.0 = Debug|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugGnome|Any CPU.ActiveCfg = Debug|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugGnome|Any CPU.Build.0 = Debug|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugMac|Any CPU.ActiveCfg = Debug|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugMac|Any CPU.Build.0 = Debug|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugWin32|Any CPU.Build.0 = Debug|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.Release|Any CPU.ActiveCfg = Release|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.Release|Any CPU.Build.0 = Release|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseGnome|Any CPU.Build.0 = Release|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseMac|Any CPU.ActiveCfg = Release|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseMac|Any CPU.Build.0 = Release|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86
-		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseWin32|Any CPU.Build.0 = Release|x86
-		{C05AAB7A-523F-4109-966B-6675BE0975BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{C05AAB7A-523F-4109-966B-6675BE0975BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{C4B0275C-37D3-43F2-927D-ABF556600804}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{C4B0275C-37D3-43F2-927D-ABF556600804}.DebugGnome|Any CPU.ActiveCfg = Debug|x86
-		{C4B0275C-37D3-43F2-927D-ABF556600804}.DebugMac|Any CPU.ActiveCfg = Debug|x86
-		{C4B0275C-37D3-43F2-927D-ABF556600804}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
-		{C4B0275C-37D3-43F2-927D-ABF556600804}.DebugWin32|Any CPU.Build.0 = Debug|x86
-		{C4B0275C-37D3-43F2-927D-ABF556600804}.Release|Any CPU.ActiveCfg = Release|x86
-		{C4B0275C-37D3-43F2-927D-ABF556600804}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86
-		{C4B0275C-37D3-43F2-927D-ABF556600804}.ReleaseMac|Any CPU.ActiveCfg = Release|x86
-		{C4B0275C-37D3-43F2-927D-ABF556600804}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86
-		{C4B0275C-37D3-43F2-927D-ABF556600804}.ReleaseWin32|Any CPU.Build.0 = Release|x86
-		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugGnome|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugGnome|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugMac|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugMac|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugWin32|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugWin32|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseGnome|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseGnome|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseMac|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseMac|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseWin32|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseWin32|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugGnome|Any CPU.ActiveCfg = Debug|x86
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugGnome|Any CPU.Build.0 = Debug|x86
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugWin32|Any CPU.Build.0 = Debug|x86
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseGnome|Any CPU.Build.0 = Release|x86
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|Any CPU.ActiveCfg = Release|x86
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|Any CPU.Build.0 = Release|x86
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseWin32|Any CPU.Build.0 = Release|x86
-		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.DebugGnome|Any CPU.ActiveCfg = Debug|x86
-		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.DebugMac|Any CPU.ActiveCfg = Debug|x86
-		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
-		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.DebugWin32|Any CPU.Build.0 = Debug|x86
-		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.Release|Any CPU.ActiveCfg = Release|x86
-		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86
-		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.ReleaseMac|Any CPU.ActiveCfg = Release|x86
-		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86
-		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.ReleaseWin32|Any CPU.Build.0 = Release|x86
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{E95833C9-90AA-4366-9262-0A1BED148249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{E95833C9-90AA-4366-9262-0A1BED148249}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7525BB88-6142-4A26-93B9-A30C6983390A} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}
-		{27096E7F-C91C-4AC6-B289-6897A701DF21} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}
-		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}
-		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}
-		{A2329308-3751-4DBD-9A75-5F7B8B024625} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}
-		{8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}
-		{A437F1A3-78DF-4F00-8053-D32A8B1EB679} = {8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF}
-		{DB96F55E-41C5-4330-A427-15A4EC028BBE} = {8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF}
-		{B257A1A3-78DF-4F00-8053-D32A8B1EB679} = {8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF}
-		{C4B0275C-37D3-43F2-927D-ABF556600804} = {8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF}
-		{961B9266-C44A-42B6-BA3D-3FB229C9C417} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{02280E65-C507-4931-AE68-AA2E89E15EEF} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{481E1487-E0F1-4C6D-BD71-E572D9A19683} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{75B9F2DF-4DEA-4007-965D-339563735EBE} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{2C24D515-4A2C-445C-8419-C09231913CFA} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{2A00A871-C641-4116-ADFD-29B7799952B4} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{B480BF1B-1DCD-4288-9212-F5BEDF763797} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{49157389-0F4C-4000-88A1-D37B2AEBA941} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{AE84B4A7-E6B1-4565-8904-16284DCE41B6} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{0EA3AD14-404A-4D3F-979B-F087E2E70C82} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{CC556C33-DB2D-4141-AFBF-A641EF9A1FA9} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{2A39DAE0-09B8-481E-950D-DF9DE0E87208} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{DE462010-393D-4655-A42C-2C78BB14D2FA} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{50D6768C-C072-4E79-AFC5-C1C40767EF45} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{100568FC-F4E8-439B-94AD-41D11724E45B} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{0ADCD824-2506-4A61-9B88-ABF1D5267CE8} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{68F63ACB-A9B2-468F-B365-0F41F0D5F1DA} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{33248236-FF84-4336-A73B-65E6B1090D15} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{776872D9-76FA-407B-BA69-08E25A24E5CE} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{8F47F5EC-2F57-4030-B658-7B1002DA90C2} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{98F4461F-84D0-4C57-A11F-47E871BD04A0} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{4AE0B284-72F2-49C7-9B42-812EBE379FFB} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
-		{19DE0F35-D204-4FD8-A553-A19ECE05E24D} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
-		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
-		{E2CAB397-D00C-4D11-8F5F-E3A052092969} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
-		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
-		{1038FBD8-750E-4081-BC65-D89FFED3C881} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
-		{E17829B5-8EAC-4714-8798-EB8ED3540191} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389} = {02280E65-C507-4931-AE68-AA2E89E15EEF}
-		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9} = {02280E65-C507-4931-AE68-AA2E89E15EEF}
-		{7926DB5B-96A7-47A7-9870-DB42FA5C3548} = {02280E65-C507-4931-AE68-AA2E89E15EEF}
-		{EF91D0B8-53F6-4622-9F26-3ED27815878A} = {481E1487-E0F1-4C6D-BD71-E572D9A19683}
-		{9A415695-CF80-4845-AA80-0DA26CF1E256} = {7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2}
-		{376889B5-6504-46A1-9D18-A9E4B4A50F49} = {7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2}
-		{07CC7654-27D6-421D-A64C-0FFA40456FA2} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}
-		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}
-		{F426CBB2-77FC-4E14-9E28-E667C2D1299A} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}
-		{875D389F-48D1-4D46-BFC6-998837DD6AE0} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}
-		{7B57882B-AD46-469B-84E7-06DF98D11468} = {49157389-0F4C-4000-88A1-D37B2AEBA941}
-		{B841F25D-4F6D-4E0D-885F-212B54381F28} = {49157389-0F4C-4000-88A1-D37B2AEBA941}
-		{9BC670A8-1851-40EC-9685-279F4C98433D} = {CC556C33-DB2D-4141-AFBF-A641EF9A1FA9}
-		{BA9020AD-A2D1-47C8-9A7C-756162C38296} = {CC556C33-DB2D-4141-AFBF-A641EF9A1FA9}
-		{8E47B77A-A649-494C-9BF2-B845E39CADE9} = {2A39DAE0-09B8-481E-950D-DF9DE0E87208}
-		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1} = {2A39DAE0-09B8-481E-950D-DF9DE0E87208}
-		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC} = {DE462010-393D-4655-A42C-2C78BB14D2FA}
-		{0AF16AF1-0876-413E-9803-08BD33C19E00} = {DE462010-393D-4655-A42C-2C78BB14D2FA}
-		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E} = {0ADCD824-2506-4A61-9B88-ABF1D5267CE8}
-		{BEFADF93-EE92-4806-9C0B-937B25311C95} = {0ADCD824-2506-4A61-9B88-ABF1D5267CE8}
-		{A2364D6A-00EF-417C-80A6-815726C70032} = {68F63ACB-A9B2-468F-B365-0F41F0D5F1DA}
-		{D1D35409-C814-47F6-B038-B9B5BF0FE490} = {68F63ACB-A9B2-468F-B365-0F41F0D5F1DA}
-		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC} = {68F63ACB-A9B2-468F-B365-0F41F0D5F1DA}
-		{CB590106-8331-4CBE-8131-B154E7BF79E1} = {68F63ACB-A9B2-468F-B365-0F41F0D5F1DA}
-		{3D363F0C-5731-42AA-9022-B7F4657F298A} = {33248236-FF84-4336-A73B-65E6B1090D15}
-		{F5390DA4-08B7-47E3-B6F3-D50683316AB4} = {33248236-FF84-4336-A73B-65E6B1090D15}
-		{DE40756E-57F6-4AF2-B155-55E3A88CCED8} = {33248236-FF84-4336-A73B-65E6B1090D15}
-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0} = {776872D9-76FA-407B-BA69-08E25A24E5CE}
-		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F} = {776872D9-76FA-407B-BA69-08E25A24E5CE}
-		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2} = {776872D9-76FA-407B-BA69-08E25A24E5CE}
-		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33} = {776872D9-76FA-407B-BA69-08E25A24E5CE}
-		{9FBCC262-10DC-4E84-A5C4-17230BBF8862} = {8F47F5EC-2F57-4030-B658-7B1002DA90C2}
-		{69136056-BFD3-4CEC-BB41-D9991C79593C} = {8F47F5EC-2F57-4030-B658-7B1002DA90C2}
-		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD} = {8F47F5EC-2F57-4030-B658-7B1002DA90C2}
-		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B} = {98F4461F-84D0-4C57-A11F-47E871BD04A0}
-		{F218643D-2E74-4309-820E-206A54B7133F} = {98F4461F-84D0-4C57-A11F-47E871BD04A0}
-		{DA5A3BAC-74C9-4EF9-B2FF-BFA4BF38F80F} = {4AE0B284-72F2-49C7-9B42-812EBE379FFB}
-		{459868D2-54DC-415B-B1AB-BE39BDBD352F} = {4AE0B284-72F2-49C7-9B42-812EBE379FFB}
-		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57} = {DA5A3BAC-74C9-4EF9-B2FF-BFA4BF38F80F}
-		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D} = {DA5A3BAC-74C9-4EF9-B2FF-BFA4BF38F80F}
-		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
-		{984CC812-9470-4A13-AFF9-CC44068D666C} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
-		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
-		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
-		{67A32B53-F719-4ECB-B5E1-FD0B04FEE258} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
-		{08AC1C52-707A-46D1-AD72-36D747991592} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
-		{D07C8309-996F-484E-BDA1-26BBAF69D29B} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
-		{B8897B76-1A12-4DFA-8B60-7944CC4C9654} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
-		{2D711139-8765-4929-BC7A-AA2DEE6F615D} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
-		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
-		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
-		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
-		{C93D746E-1586-4D4F-B411-BF5A966E6A08} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
-		{E95833C9-90AA-4366-9262-0A1BED148249} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
-		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
-		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
-		{E3BFF8B4-189C-496A-A817-7E8B31E22B91} = {08AC1C52-707A-46D1-AD72-36D747991592}
-		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52} = {08AC1C52-707A-46D1-AD72-36D747991592}
-		{72944A6C-45FF-4EF8-B349-8C9CABF519D4} = {08AC1C52-707A-46D1-AD72-36D747991592}
-		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D} = {08AC1C52-707A-46D1-AD72-36D747991592}
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {D07C8309-996F-484E-BDA1-26BBAF69D29B}
-		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD} = {D07C8309-996F-484E-BDA1-26BBAF69D29B}
-		{63E6915C-7EA4-4D76-AB28-0D7191EEA626} = {D07C8309-996F-484E-BDA1-26BBAF69D29B}
-		{91DD5A2D-9FE3-4C3C-9253-876141874DAD} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
-		{42D1CE65-A14B-4218-B787-58AD7AA68513} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
-		{A85C9721-C054-4BD8-A1F3-0227615F0A36} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}
-		{53DCA265-3C3C-42F9-B647-F72BA678122B} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}
-		{A727169F-D94F-443F-B305-B057D7F3B420} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}
-		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}
-		{63D3B27A-D966-4902-90B3-30290E1692F1} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}
-		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}
-		{BFE8691A-D323-4622-9021-7B8B27F81599} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
-		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
-		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
-		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
-		{07F55155-51A8-4072-9F80-FA473666F086} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
-		{C05AAB7A-523F-4109-966B-6675BE0975BA} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
-		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
-		{9E4BA410-8338-42EC-AF9C-422C35ECED81} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
-		{73D4CC8B-BAB9-4A29-841B-F25C6311F067} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		Policies = $0
-		$0.StandardHeader = $1
-		$1.Text = @\n${FileName}\n \nAuthor:\n      ${AuthorName} <${AuthorEmail}>\n\nCopyright (c) ${Year} ${CopyrightHolder}\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.
-		$1.IncludeInNewFiles = True
-		$0.TextStylePolicy = $2
-		$2.FileWidth = 120
-		$2.TabsToSpaces = False
-		$2.inheritsSet = VisualStudio
-		$2.inheritsScope = text/plain
-		$0.DotNetNamingPolicy = $3
-		$3.DirectoryNamespaceAssociation = Flat
-		$3.ResourceNamePolicy = FileName
-		$0.VersionControlPolicy = $4
-		$4.inheritsSet = Mono
-		$0.ChangeLogPolicy = $5
-		$5.UpdateMode = None
-		$5.VcsIntegration = None
-		$5.inheritsSet = Mono
-		$0.TextStylePolicy = $6
-		$6.FileWidth = 120
-		$6.TabsToSpaces = False
-		$6.inheritsSet = VisualStudio
-		$6.inheritsScope = text/plain
-		$6.scope = text/x-csharp
-		$0.CSharpFormattingPolicy = $7
-		$7.inheritsSet = Mono
-		$7.inheritsScope = text/x-csharp
-		$7.scope = text/x-csharp
-		$0.TextStylePolicy = $8
-		$8.inheritsSet = null
-		$8.scope = text/x-makefile
-		$0.TextStylePolicy = $9
-		$9.inheritsSet = null
-		$9.scope = application/x-addin+xml
-		$0.TextStylePolicy = $10
-		$10.inheritsSet = null
-		$10.scope = text/x-changelog
-		$0.TextStylePolicy = $11
-		$11.inheritsSet = null
-		$11.scope = text/html
-		$0.TextStylePolicy = $12
-		$12.inheritsSet = null
-		$12.scope = image/svg+xml
-		$0.XmlFormattingPolicy = $13
-		$13.inheritsSet = null
-		$13.scope = image/svgxml
-		outputpath = build\bin\
-		MakePkgConfig = False
-		MakeLibPC = True
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+

+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9D360D43-0C05-49D6-84DB-4E7AB2F38F82}"

+	ProjectSection(MonoDevelopProperties) = preProject

+		BaseDirectory = src\core

+	EndProjectSection

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Core", "src\core\MonoDevelop.Core\MonoDevelop.Core.csproj", "{7525BB88-6142-4A26-93B9-A30C6983390A}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Ide", "src\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj", "{27096E7F-C91C-4AC6-B289-6897A701DF21}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Startup", "src\core\MonoDevelop.Startup\MonoDevelop.Startup.csproj", "{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugging", "external\debugger-libs\Mono.Debugging\Mono.Debugging.csproj", "{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.TextEditor", "src\core\Mono.Texteditor\Mono.TextEditor.csproj", "{A2329308-3751-4DBD-9A75-5F7B8B024625}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.Projects.Format.MSBuild", "MonoDevelop.Projects.Format.MSBuild", "{8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Projects.Formats.MSBuild", "src\core\MonoDevelop.Projects.Formats.MSBuild\MonoDevelop.Projects.Formats.MSBuild.csproj", "{A437F1A3-78DF-4F00-8053-D32A8B1EB679}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0", "src\core\MonoDevelop.Projects.Formats.MSBuild\MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.csproj", "{DB96F55E-41C5-4330-A427-15A4EC028BBE}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Projects.Formats.MSBuild.v4.0", "src\core\MonoDevelop.Projects.Formats.MSBuild\MonoDevelop.Projects.Formats.MSBuild.v4.0.csproj", "{B257A1A3-78DF-4F00-8053-D32A8B1EB679}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0", "src\core\MonoDevelop.Projects.Formats.MSBuild\MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0.csproj", "{C4B0275C-37D3-43F2-927D-ABF556600804}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Addins", "Addins", "{D417E929-2B3A-46AC-BBE8-027ADB63A790}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "src\addins\ILAsmBinding\ILAsmBinding.csproj", "{961B9266-C44A-42B6-BA3D-3FB229C9C417}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VersionControl", "VersionControl", "{DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl", "src\addins\VersionControl\MonoDevelop.VersionControl\MonoDevelop.VersionControl.csproj", "{19DE0F35-D204-4FD8-A553-A19ECE05E24D}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl.Subversion", "src\addins\VersionControl\MonoDevelop.VersionControl.Subversion\MonoDevelop.VersionControl.Subversion.csproj", "{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl.Git", "src\addins\VersionControl\MonoDevelop.VersionControl.Git\MonoDevelop.VersionControl.Git.csproj", "{0413DB7D-8B35-423F-9752-D75C9225E7DE}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl.Subversion.Unix", "src\addins\VersionControl\MonoDevelop.VersionControl.Subversion.Unix\MonoDevelop.VersionControl.Subversion.Unix.csproj", "{E2CAB397-D00C-4D11-8F5F-E3A052092969}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl.Subversion.Tests", "src\addins\VersionControl\MonoDevelop.VersionControl.Subversion.Tests\MonoDevelop.VersionControl.Subversion.Tests.csproj", "{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl.Git.Tests", "src\addins\VersionControl\MonoDevelop.VersionControl.Git.Tests\MonoDevelop.VersionControl.Git.Tests.csproj", "{F3AC14B0-3D1F-4B9B-95E8-384056060F33}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionControl.Subversion.Win32", "src\addins\VersionControl\Subversion.Win32\VersionControl.Subversion.Win32.csproj", "{1038FBD8-750E-4081-BC65-D89FFED3C881}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionControl.Subversion.Win32.Tests", "src\addins\VersionControl\Subversion.Win32.Tests\VersionControl.Subversion.Win32.Tests.csproj", "{E17829B5-8EAC-4714-8798-EB8ED3540191}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.GtkCore", "MonoDevelop.GtkCore", "{02280E65-C507-4931-AE68-AA2E89E15EEF}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.GtkCore", "src\addins\MonoDevelop.GtkCore\MonoDevelop.GtkCore.csproj", "{7FCDB0D9-AA7D-44E4-BE74-55312B432389}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libstetic", "src\addins\MonoDevelop.GtkCore\libstetic\libstetic.csproj", "{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsteticui", "src\addins\MonoDevelop.GtkCore\libsteticui\libsteticui.csproj", "{7926DB5B-96A7-47A7-9870-DB42FA5C3548}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBNetBinding", "VBNetBinding", "{481E1487-E0F1-4C6D-BD71-E572D9A19683}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\addins\VBNetBinding\VBNetBinding.csproj", "{EF91D0B8-53F6-4622-9F26-3ED27815878A}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChangeLogAddIn", "src\addins\ChangeLogAddIn\ChangeLogAddIn.csproj", "{75B9F2DF-4DEA-4007-965D-339563735EBE}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDeveloperExtensions", "MonoDeveloperExtensions", "{7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDeveloperExtensions", "src\addins\MonoDeveloperExtensions\MonoDeveloperExtensions.csproj", "{9A415695-CF80-4845-AA80-0DA26CF1E256}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnit", "src\addins\MonoDeveloperExtensions\NUnit\NUnit.csproj", "{376889B5-6504-46A1-9D18-A9E4B4A50F49}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DesignerSupport", "src\addins\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj", "{2C24D515-4A2C-445C-8419-C09231913CFA}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Autotools", "src\addins\MonoDevelop.Autotools\MonoDevelop.Autotools.csproj", "{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.WebReferences", "src\addins\MonoDevelop.WebReferences\MonoDevelop.WebReferences.csproj", "{2A00A871-C641-4116-ADFD-29B7799952B4}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharpBinding", "CSharpBinding", "{B480BF1B-1DCD-4288-9212-F5BEDF763797}"

+	ProjectSection(MonoDevelopProperties) = preProject

+		BaseDirectory = src\addins\CSharpBinding

+	EndProjectSection

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\addins\CSharpBinding\CSharpBinding.csproj", "{07CC7654-27D6-421D-A64C-0FFA40456FA2}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autotools", "src\addins\CSharpBinding\Autotools\Autotools.csproj", "{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding.AspNet", "src\addins\CSharpBinding\AspNet\CSharpBinding.AspNet.csproj", "{F426CBB2-77FC-4E14-9E28-E667C2D1299A}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DocFood", "src\addins\MonoDevelop.DocFood\MonoDevelop.DocFood.csproj", "{875D389F-48D1-4D46-BFC6-998837DD6AE0}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Gettext", "src\addins\MonoDevelop.Gettext\MonoDevelop.Gettext.csproj", "{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.RegexToolkit", "src\addins\MonoDevelop.RegexToolkit\MonoDevelop.RegexToolkit.csproj", "{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CBinding", "CBinding", "{49157389-0F4C-4000-88A1-D37B2AEBA941}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CBinding", "src\addins\CBinding\CBinding.csproj", "{7B57882B-AD46-469B-84E7-06DF98D11468}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CBinding.Autotools", "src\addins\CBinding\CBinding.Autotools\CBinding.Autotools.csproj", "{B841F25D-4F6D-4E0D-885F-212B54381F28}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GnomePlatform", "src\addins\GnomePlatform\GnomePlatform.csproj", "{AE84B4A7-E6B1-4565-8904-16284DCE41B6}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.SourceEditor", "src\addins\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj", "{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.AssemblyBrowser", "src\addins\MonoDevelop.AssemblyBrowser\MonoDevelop.AssemblyBrowser.csproj", "{0EA3AD14-404A-4D3F-979B-F087E2E70C82}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deployment", "Deployment", "{CC556C33-DB2D-4141-AFBF-A641EF9A1FA9}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Deployment", "src\addins\Deployment\MonoDevelop.Deployment\MonoDevelop.Deployment.csproj", "{9BC670A8-1851-40EC-9685-279F4C98433D}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Deployment.Linux", "src\addins\Deployment\MonoDevelop.Deployment.Linux\MonoDevelop.Deployment.Linux.csproj", "{BA9020AD-A2D1-47C8-9A7C-756162C38296}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xml", "Xml", "{2A39DAE0-09B8-481E-950D-DF9DE0E87208}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Xml.Tests", "src\addins\Xml\Tests\MonoDevelop.Xml.Tests.csproj", "{8E47B77A-A649-494C-9BF2-B845E39CADE9}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Xml", "src\addins\Xml\MonoDevelop.Xml.csproj", "{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.NUnit", "MonoDevelop.NUnit", "{DE462010-393D-4655-A42C-2C78BB14D2FA}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.NUnit", "src\addins\NUnit\MonoDevelop.NUnit.csproj", "{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitRunner", "src\addins\NUnit\NUnitRunner\NUnitRunner.csproj", "{0AF16AF1-0876-413E-9803-08BD33C19E00}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacPlatform", "src\addins\MacPlatform\MacPlatform.csproj", "{50D6768C-C072-4E79-AFC5-C1C40767EF45}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Refactoring", "src\addins\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj", "{100568FC-F4E8-439B-94AD-41D11724E45B}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNet", "AspNet", "{0ADCD824-2506-4A61-9B88-ABF1D5267CE8}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.AspNet", "src\addins\AspNet\MonoDevelop.AspNet.csproj", "{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.AspNet.Tests", "src\addins\AspNet\Tests\MonoDevelop.AspNet.Tests.csproj", "{BEFADF93-EE92-4806-9C0B-937B25311C95}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TextTemplating", "TextTemplating", "{68F63ACB-A9B2-468F-B365-0F41F0D5F1DA}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.TextTemplating", "src\addins\TextTemplating\Mono.TextTemplating\Mono.TextTemplating.csproj", "{A2364D6A-00EF-417C-80A6-815726C70032}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTransform", "src\addins\TextTemplating\TextTransform\TextTransform.csproj", "{D1D35409-C814-47F6-B038-B9B5BF0FE490}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.TextTemplating", "src\addins\TextTemplating\MonoDevelop.TextTemplating\MonoDevelop.TextTemplating.csproj", "{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.TextTemplating.Tests", "src\addins\TextTemplating\Mono.TextTemplating.Tests\Mono.TextTemplating.Tests.csproj", "{CB590106-8331-4CBE-8131-B154E7BF79E1}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.Debugger.Soft", "MonoDevelop.Debugger.Soft", "{33248236-FF84-4336-A73B-65E6B1090D15}"

+	ProjectSection(MonoDevelopProperties) = preProject

+		BaseDirectory = src\addins\MonoDevelop.Debugger.Soft

+	EndProjectSection

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Soft", "src\addins\MonoDevelop.Debugger.Soft\MonoDevelop.Debugger.Soft\MonoDevelop.Debugger.Soft.csproj", "{3D363F0C-5731-42AA-9022-B7F4657F298A}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Soft.AspNet", "src\addins\MonoDevelop.Debugger.Soft\MonoDevelop.Debugger.Soft.AspNet\MonoDevelop.Debugger.Soft.AspNet.csproj", "{F5390DA4-08B7-47E3-B6F3-D50683316AB4}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugging.Soft", "external\debugger-libs\Mono.Debugging.Soft\Mono.Debugging.Soft.csproj", "{DE40756E-57F6-4AF2-B155-55E3A88CCED8}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.HexEditor", "src\addins\MonoDevelop.HexEditor\MonoDevelop.HexEditor.csproj", "{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.Debugger", "MonoDevelop.Debugger", "{776872D9-76FA-407B-BA69-08E25A24E5CE}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger", "src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj", "{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Tests", "src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.Tests\MonoDevelop.Debugger.Tests.csproj", "{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Tests.TestApp", "src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.Tests.TestApp\MonoDevelop.Debugger.Tests.TestApp.csproj", "{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Gdb", "src\addins\MonoDevelop.Debugger.Gdb\MonoDevelop.Debugger.Gdb.csproj", "{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.Debugger.Win32", "MonoDevelop.Debugger.Win32", "{8F47F5EC-2F57-4030-B658-7B1002DA90C2}"

+	ProjectSection(SolutionItems) = preProject

+		src\addins\MonoDevelop.Debugger.Win32\eula.rtf = src\addins\MonoDevelop.Debugger.Win32\eula.rtf

+		src\addins\MonoDevelop.Debugger.Win32\README.txt = src\addins\MonoDevelop.Debugger.Win32\README.txt

+	EndProjectSection

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CorApi", "src\addins\MonoDevelop.Debugger.Win32\CorApi\CorApi.csproj", "{9FBCC262-10DC-4E84-A5C4-17230BBF8862}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CorApi2", "src\addins\MonoDevelop.Debugger.Win32\CorApi2\CorApi2.csproj", "{69136056-BFD3-4CEC-BB41-D9991C79593C}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Win32", "src\addins\MonoDevelop.Debugger.Win32\MonoDevelop.Debugger.Win32\MonoDevelop.Debugger.Win32.csproj", "{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.PackageManagement", "MonoDevelop.PackageManagement", "{98F4461F-84D0-4C57-A11F-47E871BD04A0}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.PackageManagement.Tests", "src\addins\MonoDevelop.PackageManagement\MonoDevelop.PackageManagement.Tests\MonoDevelop.PackageManagement.Tests.csproj", "{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.PackageManagement", "src\addins\MonoDevelop.PackageManagement\MonoDevelop.PackageManagement.csproj", "{F218643D-2E74-4309-820E-206A54B7133F}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsPlatform", "WindowsPlatform", "{4AE0B284-72F2-49C7-9B42-812EBE379FFB}"

+	ProjectSection(MonoDevelopProperties) = preProject

+		BaseDirectory = src\addins\WindowsPlatform

+	EndProjectSection

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsAPICodePack", "WindowsAPICodePack", "{DA5A3BAC-74C9-4EF9-B2FF-BFA4BF38F80F}"

+	ProjectSection(MonoDevelopProperties) = preProject

+		BaseDirectory = src\addins\WindowsPlatform\WindowsAPICodePack

+	EndProjectSection

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\addins\WindowsPlatform\WindowsAPICodePack\Core\Core.csproj", "{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shell", "src\addins\WindowsPlatform\WindowsAPICodePack\Shell\Shell.csproj", "{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPlatform", "src\addins\WindowsPlatform\WindowsPlatform\WindowsPlatform.csproj", "{459868D2-54DC-415B-B1AB-BE39BDBD352F}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}"

+	ProjectSection(MonoDevelopProperties) = preProject

+		BaseDirectory = external

+	EndProjectSection

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugger.Soft", "external\debugger-libs\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj", "{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "contrib\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json", "external\Newtonsoft.Json\Src\Newtonsoft.Json\Newtonsoft.Json.csproj", "{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Reflection", "external\ikvm\reflect\IKVM.Reflection.csproj", "{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xwt", "Xwt", "{67A32B53-F719-4ECB-B5E1-FD0B04FEE258}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt", "external\xwt\Xwt\Xwt.csproj", "{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk", "external\xwt\Xwt.Gtk\Xwt.Gtk.csproj", "{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.WPF", "external\xwt\Xwt.WPF\Xwt.WPF.csproj", "{C93D746E-1586-4D4F-B411-BF5A966E6A08}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk.Mac", "external\xwt\Xwt.Gtk.Mac\Xwt.Gtk.Mac.csproj", "{E95833C9-90AA-4366-9262-0A1BED148249}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk.Windows", "external\xwt\Xwt.Gtk.Windows\Xwt.Gtk.Windows.csproj", "{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.XamMac", "external\xwt\Xwt.XamMac\Xwt.XamMac.csproj", "{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NGit", "NGit", "{08AC1C52-707A-46D1-AD72-36D747991592}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGit", "external\ngit\NGit\NGit.csproj", "{E3BFF8B4-189C-496A-A817-7E8B31E22B91}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharpen.Unix", "external\ngit\Sharpen.Unix\Sharpen.Unix.csproj", "{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharpen", "external\ngit\Sharpen\Sharpen.csproj", "{72944A6C-45FF-4EF8-B349-8C9CABF519D4}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSch", "external\ngit\NSch\NSch.csproj", "{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mono.Cecil", "Mono.Cecil", "{D07C8309-996F-484E-BDA1-26BBAF69D29B}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "external\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Mdb", "external\cecil\symbols\mdb\Mono.Cecil.Mdb.csproj", "{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Pdb", "external\cecil\symbols\pdb\Mono.Cecil.Pdb.csproj", "{63E6915C-7EA4-4D76-AB28-0D7191EEA626}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mono.Addins", "Mono.Addins", "{B8897B76-1A12-4DFA-8B60-7944CC4C9654}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins", "external\mono-addins\Mono.Addins\Mono.Addins.csproj", "{91DD5A2D-9FE3-4C3C-9253-876141874DAD}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.CecilReflector", "external\mono-addins\Mono.Addins.CecilReflector\Mono.Addins.CecilReflector.csproj", "{42D1CE65-A14B-4218-B787-58AD7AA68513}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.Gui", "external\mono-addins\Mono.Addins.Gui\Mono.Addins.Gui.csproj", "{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.Setup", "external\mono-addins\Mono.Addins.Setup\Mono.Addins.Setup.csproj", "{A85C9721-C054-4BD8-A1F3-0227615F0A36}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{2D711139-8765-4929-BC7A-AA2DEE6F615D}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp", "external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{53DCA265-3C3C-42F9-B647-F72BA678122B}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.IKVM", "external\nrefactory\ICSharpCode.NRefactory.IKVM\ICSharpCode.NRefactory.IKVM.csproj", "{A727169F-D94F-443F-B305-B057D7F3B420}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Cecil", "external\nrefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj", "{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "external\nrefactory\ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Xml", "external\nrefactory\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj", "{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp.Refactoring", "external\nrefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj", "{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory6", "NRefactory6", "{840E8B8D-929C-4CB2-9D23-2702FF01269A}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory6.CSharp", "external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj", "{7E891659-45F3-42B5-B940-A728780CCAE9}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory6.CSharp.Refactoring", "external\NRefactory6\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory6.CSharp.Refactoring.csproj", "{C465A5DC-AD28-49A2-89C0-F81838814A7E}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiUnit_NET_4_5", "external\guiunit\src\framework\GuiUnit_NET_4_5.csproj", "{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}"

+EndProject

+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "po", "po\po.mdproj", "{AC7D119C-980B-4712-8811-5368C14412D7}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{5D3F7E65-E55B-45CA-A83B-D1E10040281E}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdhost", "src\tools\mdhost\mdhost.csproj", "{BFE8691A-D323-4622-9021-7B8B27F81599}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdtool", "src\tools\mdtool\mdtool.csproj", "{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdmonitor", "src\tools\mdmonitor\mdmonitor.csproj", "{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}"

+	ProjectSection(MonoDevelopProperties) = preProject

+		BaseDirectory = tests

+	EndProjectSection

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "tests\UnitTests\UnitTests.csproj", "{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserInterfaceTests", "tests\UserInterfaceTests\UserInterfaceTests.csproj", "{07F55155-51A8-4072-9F80-FA473666F086}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacPlatform.Tests", "tests\MacPlatform.Tests\MacPlatform.Tests.csproj", "{C05AAB7A-523F-4109-966B-6675BE0975BA}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestRunner", "tests\TestRunner\TestRunner.csproj", "{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.TextEditor.Tests", "src\core\MonoDevelop.TextEditor.Tests\MonoDevelop.TextEditor.Tests.csproj", "{9E4BA410-8338-42EC-AF9C-422C35ECED81}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ide.Tests", "tests\Ide.Tests\Ide.Tests.csproj", "{73D4CC8B-BAB9-4A29-841B-F25C6311F067}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Any CPU = Debug|Any CPU

+		DebugMac|Any CPU = DebugMac|Any CPU

+		DebugWin32|Any CPU = DebugWin32|Any CPU

+		Release|Any CPU = Release|Any CPU

+		DebugGnome|Any CPU = DebugGnome|Any CPU

+		ReleaseMac|Any CPU = ReleaseMac|Any CPU

+		ReleaseWin32|Any CPU = ReleaseWin32|Any CPU

+		ReleaseGnome|Any CPU = ReleaseGnome|Any CPU

+		Debug|x86 = Debug|x86

+		Release|x86 = Release|x86

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.Build.0 = Release|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.ActiveCfg = Debug|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.Build.0 = Debug|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugGnome|Any CPU.ActiveCfg = Debug|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugGnome|Any CPU.Build.0 = Debug|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.ActiveCfg = Debug|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.Build.0 = Debug|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugWin32|Any CPU.ActiveCfg = Debug|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugWin32|Any CPU.Build.0 = Debug|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Release|Any CPU.ActiveCfg = Release|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Release|Any CPU.Build.0 = Release|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseGnome|Any CPU.Build.0 = Release|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseMac|Any CPU.ActiveCfg = Release|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseMac|Any CPU.Build.0 = Release|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.ReleaseWin32|Any CPU.Build.0 = Release|x86

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|Any CPU.Build.0 = Release|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.Release|Any CPU.Build.0 = Release|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Release|Any CPU.Build.0 = Release|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|Any CPU.Build.0 = Release|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.Release|Any CPU.Build.0 = Release|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Release|Any CPU.Build.0 = Release|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Release|Any CPU.Build.0 = Release|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Release|Any CPU.Build.0 = Release|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Release|Any CPU.Build.0 = Release|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Release|Any CPU.Build.0 = Release|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Release|Any CPU.Build.0 = Release|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Release|Any CPU.Build.0 = Release|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Release|Any CPU.Build.0 = Release|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Release|Any CPU.Build.0 = Release|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.Release|Any CPU.Build.0 = Release|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.Build.0 = Release|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.Build.0 = Release|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.Build.0 = Release|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.Build.0 = Release|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Release|Any CPU.Build.0 = Release|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.Build.0 = Release|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Release|Any CPU.Build.0 = Release|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.Build.0 = Release|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Release|Any CPU.Build.0 = Release|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.Build.0 = Release|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugWin32|Any CPU.ActiveCfg = Debug|x86

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.DebugWin32|Any CPU.Build.0 = Debug|x86

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.Build.0 = Release|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{63D3B27A-D966-4902-90B3-30290E1692F1}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugGnome|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugGnome|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugMac|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugMac|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugWin32|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.DebugWin32|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseGnome|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseGnome|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseMac|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseMac|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseWin32|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.ReleaseWin32|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.Release|Any CPU.Build.0 = Release|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Release|Any CPU.Build.0 = Release|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.Release|Any CPU.Build.0 = Release|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Release|Any CPU.Build.0 = Release|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Release|Any CPU.Build.0 = Release|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.Release|Any CPU.Build.0 = Release|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{7B57882B-AD46-469B-84E7-06DF98D11468}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.Debug|x86.Build.0 = Debug|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.Release|Any CPU.Build.0 = Release|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.Release|x86.ActiveCfg = Release|Any CPU

+		{7E891659-45F3-42B5-B940-A728780CCAE9}.Release|x86.Build.0 = Release|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|Any CPU.Build.0 = Release|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.Release|Any CPU.Build.0 = Release|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugGnome|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugGnome|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugMac|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugMac|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugWin32|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.DebugWin32|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseGnome|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseGnome|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseMac|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseMac|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseWin32|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}.ReleaseWin32|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Release|Any CPU.Build.0 = Release|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.Build.0 = Release|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.ActiveCfg = Debug|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.Build.0 = Debug|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugGnome|Any CPU.ActiveCfg = Debug|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugGnome|Any CPU.Build.0 = Debug|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|Any CPU.ActiveCfg = Debug|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|Any CPU.Build.0 = Debug|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|Any CPU.ActiveCfg = Debug|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|Any CPU.Build.0 = Debug|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Release|Any CPU.ActiveCfg = Release|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Release|Any CPU.Build.0 = Release|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseGnome|Any CPU.Build.0 = Release|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseMac|Any CPU.ActiveCfg = Release|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseMac|Any CPU.Build.0 = Release|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseWin32|Any CPU.Build.0 = Release|x86

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Release|Any CPU.Build.0 = Release|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Release|Any CPU.Build.0 = Release|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Release|Any CPU.Build.0 = Release|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.Build.0 = Release|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|Any CPU.Build.0 = Release|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Release|Any CPU.Build.0 = Release|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Release|Any CPU.Build.0 = Release|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.Build.0 = Release|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{984CC812-9470-4A13-AFF9-CC44068D666C}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.Release|Any CPU.Build.0 = Release|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Release|Any CPU.Build.0 = Release|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.Release|Any CPU.Build.0 = Release|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.Release|Any CPU.Build.0 = Release|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{A2329308-3751-4DBD-9A75-5F7B8B024625}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.Release|Any CPU.Build.0 = Release|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{A2364D6A-00EF-417C-80A6-815726C70032}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.Release|Any CPU.Build.0 = Release|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.Release|Any CPU.Build.0 = Release|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{A727169F-D94F-443F-B305-B057D7F3B420}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|Any CPU.Build.0 = Release|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|Any CPU.Build.0 = Release|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Release|Any CPU.Build.0 = Release|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Release|Any CPU.Build.0 = Release|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{AC7D119C-980B-4712-8811-5368C14412D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU

+		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{AC7D119C-980B-4712-8811-5368C14412D7}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU

+		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Release|Any CPU.Build.0 = Release|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.Debug|Any CPU.ActiveCfg = Debug|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.Debug|Any CPU.Build.0 = Debug|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugGnome|Any CPU.ActiveCfg = Debug|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugGnome|Any CPU.Build.0 = Debug|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugMac|Any CPU.ActiveCfg = Debug|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugMac|Any CPU.Build.0 = Debug|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugWin32|Any CPU.ActiveCfg = Debug|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.DebugWin32|Any CPU.Build.0 = Debug|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.Release|Any CPU.ActiveCfg = Release|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.Release|Any CPU.Build.0 = Release|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseGnome|Any CPU.Build.0 = Release|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseMac|Any CPU.ActiveCfg = Release|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseMac|Any CPU.Build.0 = Release|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679}.ReleaseWin32|Any CPU.Build.0 = Release|x86

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.Release|Any CPU.Build.0 = Release|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{B841F25D-4F6D-4E0D-885F-212B54381F28}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Release|Any CPU.Build.0 = Release|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Release|Any CPU.Build.0 = Release|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.Debug|Any CPU.ActiveCfg = Debug|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.Debug|Any CPU.Build.0 = Debug|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugGnome|Any CPU.ActiveCfg = Debug|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugGnome|Any CPU.Build.0 = Debug|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugMac|Any CPU.ActiveCfg = Debug|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugMac|Any CPU.Build.0 = Debug|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugWin32|Any CPU.ActiveCfg = Debug|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugWin32|Any CPU.Build.0 = Debug|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.Release|Any CPU.ActiveCfg = Release|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.Release|Any CPU.Build.0 = Release|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseGnome|Any CPU.Build.0 = Release|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseMac|Any CPU.ActiveCfg = Release|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseMac|Any CPU.Build.0 = Release|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86

+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseWin32|Any CPU.Build.0 = Release|x86

+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.Build.0 = Release|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Debug|x86.Build.0 = Debug|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Release|Any CPU.Build.0 = Release|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Release|x86.ActiveCfg = Release|Any CPU

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Release|x86.Build.0 = Release|Any CPU

+		{C4B0275C-37D3-43F2-927D-ABF556600804}.Debug|Any CPU.ActiveCfg = Debug|x86

+		{C4B0275C-37D3-43F2-927D-ABF556600804}.DebugGnome|Any CPU.ActiveCfg = Debug|x86

+		{C4B0275C-37D3-43F2-927D-ABF556600804}.DebugMac|Any CPU.ActiveCfg = Debug|x86

+		{C4B0275C-37D3-43F2-927D-ABF556600804}.DebugWin32|Any CPU.ActiveCfg = Debug|x86

+		{C4B0275C-37D3-43F2-927D-ABF556600804}.DebugWin32|Any CPU.Build.0 = Debug|x86

+		{C4B0275C-37D3-43F2-927D-ABF556600804}.Release|Any CPU.ActiveCfg = Release|x86

+		{C4B0275C-37D3-43F2-927D-ABF556600804}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86

+		{C4B0275C-37D3-43F2-927D-ABF556600804}.ReleaseMac|Any CPU.ActiveCfg = Release|x86

+		{C4B0275C-37D3-43F2-927D-ABF556600804}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86

+		{C4B0275C-37D3-43F2-927D-ABF556600804}.ReleaseWin32|Any CPU.Build.0 = Release|x86

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.Release|Any CPU.Build.0 = Release|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{CB590106-8331-4CBE-8131-B154E7BF79E1}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Release|Any CPU.Build.0 = Release|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Release|Any CPU.Build.0 = Release|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Release|Any CPU.Build.0 = Release|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.Release|Any CPU.Build.0 = Release|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugGnome|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugGnome|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugMac|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugMac|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugWin32|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugWin32|Any CPU.Build.0 = net_4_0_Debug|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseGnome|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseGnome|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseMac|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseMac|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseWin32|Any CPU.ActiveCfg = net_4_0_Release|Any CPU

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.ReleaseWin32|Any CPU.Build.0 = net_4_0_Release|Any CPU

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugGnome|Any CPU.ActiveCfg = Debug|x86

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugGnome|Any CPU.Build.0 = Debug|x86

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugWin32|Any CPU.ActiveCfg = Debug|x86

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugWin32|Any CPU.Build.0 = Debug|x86

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|Any CPU.Build.0 = Release|Any CPU

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseGnome|Any CPU.Build.0 = Release|x86

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|Any CPU.ActiveCfg = Release|x86

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|Any CPU.Build.0 = Release|x86

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseWin32|Any CPU.Build.0 = Release|x86

+		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.Debug|Any CPU.ActiveCfg = Debug|x86

+		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.DebugGnome|Any CPU.ActiveCfg = Debug|x86

+		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.DebugMac|Any CPU.ActiveCfg = Debug|x86

+		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.DebugWin32|Any CPU.ActiveCfg = Debug|x86

+		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.DebugWin32|Any CPU.Build.0 = Debug|x86

+		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.Release|Any CPU.ActiveCfg = Release|x86

+		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86

+		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.ReleaseMac|Any CPU.ActiveCfg = Release|x86

+		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86

+		{DB96F55E-41C5-4330-A427-15A4EC028BBE}.ReleaseWin32|Any CPU.Build.0 = Release|x86

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.Build.0 = Release|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.Build.0 = Release|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{E17829B5-8EAC-4714-8798-EB8ED3540191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{E17829B5-8EAC-4714-8798-EB8ED3540191}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{E17829B5-8EAC-4714-8798-EB8ED3540191}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{E17829B5-8EAC-4714-8798-EB8ED3540191}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{E17829B5-8EAC-4714-8798-EB8ED3540191}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{E17829B5-8EAC-4714-8798-EB8ED3540191}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.Build.0 = Release|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Release|Any CPU.Build.0 = Release|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{E95833C9-90AA-4366-9262-0A1BED148249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{E95833C9-90AA-4366-9262-0A1BED148249}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Release|Any CPU.Build.0 = Release|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Release|Any CPU.Build.0 = Release|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.Release|Any CPU.Build.0 = Release|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|Any CPU.Build.0 = Release|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Release|Any CPU.Build.0 = Release|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Release|Any CPU.Build.0 = Release|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Release|Any CPU.Build.0 = Release|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Release|Any CPU.Build.0 = Release|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|Any CPU.Build.0 = Release|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Release|Any CPU.Build.0 = Release|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.Build.0 = Release|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+	EndGlobalSection

+	GlobalSection(NestedProjects) = preSolution

+		{7525BB88-6142-4A26-93B9-A30C6983390A} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}

+		{27096E7F-C91C-4AC6-B289-6897A701DF21} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}

+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}

+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}

+		{A2329308-3751-4DBD-9A75-5F7B8B024625} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}

+		{8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}

+		{A437F1A3-78DF-4F00-8053-D32A8B1EB679} = {8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF}

+		{DB96F55E-41C5-4330-A427-15A4EC028BBE} = {8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF}

+		{B257A1A3-78DF-4F00-8053-D32A8B1EB679} = {8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF}

+		{C4B0275C-37D3-43F2-927D-ABF556600804} = {8F48ECA6-CFFF-4EBF-BC92-817199EDE9AF}

+		{961B9266-C44A-42B6-BA3D-3FB229C9C417} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{02280E65-C507-4931-AE68-AA2E89E15EEF} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{481E1487-E0F1-4C6D-BD71-E572D9A19683} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{75B9F2DF-4DEA-4007-965D-339563735EBE} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{2C24D515-4A2C-445C-8419-C09231913CFA} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{2A00A871-C641-4116-ADFD-29B7799952B4} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{B480BF1B-1DCD-4288-9212-F5BEDF763797} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{49157389-0F4C-4000-88A1-D37B2AEBA941} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{CC556C33-DB2D-4141-AFBF-A641EF9A1FA9} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{2A39DAE0-09B8-481E-950D-DF9DE0E87208} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{DE462010-393D-4655-A42C-2C78BB14D2FA} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{50D6768C-C072-4E79-AFC5-C1C40767EF45} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{100568FC-F4E8-439B-94AD-41D11724E45B} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{0ADCD824-2506-4A61-9B88-ABF1D5267CE8} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{68F63ACB-A9B2-468F-B365-0F41F0D5F1DA} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{33248236-FF84-4336-A73B-65E6B1090D15} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{776872D9-76FA-407B-BA69-08E25A24E5CE} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{8F47F5EC-2F57-4030-B658-7B1002DA90C2} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{98F4461F-84D0-4C57-A11F-47E871BD04A0} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{4AE0B284-72F2-49C7-9B42-812EBE379FFB} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}

+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}

+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}

+		{1038FBD8-750E-4081-BC65-D89FFED3C881} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}

+		{E17829B5-8EAC-4714-8798-EB8ED3540191} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389} = {02280E65-C507-4931-AE68-AA2E89E15EEF}

+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9} = {02280E65-C507-4931-AE68-AA2E89E15EEF}

+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548} = {02280E65-C507-4931-AE68-AA2E89E15EEF}

+		{EF91D0B8-53F6-4622-9F26-3ED27815878A} = {481E1487-E0F1-4C6D-BD71-E572D9A19683}

+		{9A415695-CF80-4845-AA80-0DA26CF1E256} = {7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2}

+		{376889B5-6504-46A1-9D18-A9E4B4A50F49} = {7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2}

+		{07CC7654-27D6-421D-A64C-0FFA40456FA2} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}

+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}

+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}

+		{875D389F-48D1-4D46-BFC6-998837DD6AE0} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}

+		{7B57882B-AD46-469B-84E7-06DF98D11468} = {49157389-0F4C-4000-88A1-D37B2AEBA941}

+		{B841F25D-4F6D-4E0D-885F-212B54381F28} = {49157389-0F4C-4000-88A1-D37B2AEBA941}

+		{9BC670A8-1851-40EC-9685-279F4C98433D} = {CC556C33-DB2D-4141-AFBF-A641EF9A1FA9}

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296} = {CC556C33-DB2D-4141-AFBF-A641EF9A1FA9}

+		{8E47B77A-A649-494C-9BF2-B845E39CADE9} = {2A39DAE0-09B8-481E-950D-DF9DE0E87208}

+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1} = {2A39DAE0-09B8-481E-950D-DF9DE0E87208}

+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC} = {DE462010-393D-4655-A42C-2C78BB14D2FA}

+		{0AF16AF1-0876-413E-9803-08BD33C19E00} = {DE462010-393D-4655-A42C-2C78BB14D2FA}

+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E} = {0ADCD824-2506-4A61-9B88-ABF1D5267CE8}

+		{BEFADF93-EE92-4806-9C0B-937B25311C95} = {0ADCD824-2506-4A61-9B88-ABF1D5267CE8}

+		{A2364D6A-00EF-417C-80A6-815726C70032} = {68F63ACB-A9B2-468F-B365-0F41F0D5F1DA}

+		{D1D35409-C814-47F6-B038-B9B5BF0FE490} = {68F63ACB-A9B2-468F-B365-0F41F0D5F1DA}

+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC} = {68F63ACB-A9B2-468F-B365-0F41F0D5F1DA}

+		{CB590106-8331-4CBE-8131-B154E7BF79E1} = {68F63ACB-A9B2-468F-B365-0F41F0D5F1DA}

+		{3D363F0C-5731-42AA-9022-B7F4657F298A} = {33248236-FF84-4336-A73B-65E6B1090D15}

+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4} = {33248236-FF84-4336-A73B-65E6B1090D15}

+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8} = {33248236-FF84-4336-A73B-65E6B1090D15}

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0} = {776872D9-76FA-407B-BA69-08E25A24E5CE}

+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F} = {776872D9-76FA-407B-BA69-08E25A24E5CE}

+		{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2} = {776872D9-76FA-407B-BA69-08E25A24E5CE}

+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33} = {776872D9-76FA-407B-BA69-08E25A24E5CE}

+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862} = {8F47F5EC-2F57-4030-B658-7B1002DA90C2}

+		{69136056-BFD3-4CEC-BB41-D9991C79593C} = {8F47F5EC-2F57-4030-B658-7B1002DA90C2}

+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD} = {8F47F5EC-2F57-4030-B658-7B1002DA90C2}

+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B} = {98F4461F-84D0-4C57-A11F-47E871BD04A0}

+		{F218643D-2E74-4309-820E-206A54B7133F} = {98F4461F-84D0-4C57-A11F-47E871BD04A0}

+		{DA5A3BAC-74C9-4EF9-B2FF-BFA4BF38F80F} = {4AE0B284-72F2-49C7-9B42-812EBE379FFB}

+		{459868D2-54DC-415B-B1AB-BE39BDBD352F} = {4AE0B284-72F2-49C7-9B42-812EBE379FFB}

+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57} = {DA5A3BAC-74C9-4EF9-B2FF-BFA4BF38F80F}

+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D} = {DA5A3BAC-74C9-4EF9-B2FF-BFA4BF38F80F}

+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

+		{984CC812-9470-4A13-AFF9-CC44068D666C} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

+		{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

+		{67A32B53-F719-4ECB-B5E1-FD0B04FEE258} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

+		{08AC1C52-707A-46D1-AD72-36D747991592} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

+		{D07C8309-996F-484E-BDA1-26BBAF69D29B} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

+		{B8897B76-1A12-4DFA-8B60-7944CC4C9654} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

+		{2D711139-8765-4929-BC7A-AA2DEE6F615D} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

+		{840E8B8D-929C-4CB2-9D23-2702FF01269A} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}

+		{E95833C9-90AA-4366-9262-0A1BED148249} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}

+		{E3BFF8B4-189C-496A-A817-7E8B31E22B91} = {08AC1C52-707A-46D1-AD72-36D747991592}

+		{849AE05D-0058-4A8C-A0E8-77DC6BB12E52} = {08AC1C52-707A-46D1-AD72-36D747991592}

+		{72944A6C-45FF-4EF8-B349-8C9CABF519D4} = {08AC1C52-707A-46D1-AD72-36D747991592}

+		{A19E6F3F-A25B-4B01-8922-CF0CC35C781D} = {08AC1C52-707A-46D1-AD72-36D747991592}

+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {D07C8309-996F-484E-BDA1-26BBAF69D29B}

+		{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD} = {D07C8309-996F-484E-BDA1-26BBAF69D29B}

+		{63E6915C-7EA4-4D76-AB28-0D7191EEA626} = {D07C8309-996F-484E-BDA1-26BBAF69D29B}

+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}

+		{42D1CE65-A14B-4218-B787-58AD7AA68513} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}

+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}

+		{A85C9721-C054-4BD8-A1F3-0227615F0A36} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}

+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}

+		{53DCA265-3C3C-42F9-B647-F72BA678122B} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}

+		{A727169F-D94F-443F-B305-B057D7F3B420} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}

+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}

+		{63D3B27A-D966-4902-90B3-30290E1692F1} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}

+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}

+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}

+		{7E891659-45F3-42B5-B940-A728780CCAE9} = {840E8B8D-929C-4CB2-9D23-2702FF01269A}

+		{C465A5DC-AD28-49A2-89C0-F81838814A7E} = {840E8B8D-929C-4CB2-9D23-2702FF01269A}

+		{BFE8691A-D323-4622-9021-7B8B27F81599} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}

+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}

+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}

+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}

+		{07F55155-51A8-4072-9F80-FA473666F086} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}

+		{C05AAB7A-523F-4109-966B-6675BE0975BA} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}

+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}

+		{9E4BA410-8338-42EC-AF9C-422C35ECED81} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}

+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}

+	EndGlobalSection

+	GlobalSection(MonoDevelopProperties) = preSolution

+		StartupItem = src\core\MonoDevelop.Startup\MonoDevelop.Startup.csproj

+		Policies = $0

+		$0.StandardHeader = $1

+		$1.Text = @\n${FileName}\n \nAuthor:\n      ${AuthorName} <${AuthorEmail}>\n\nCopyright (c) ${Year} ${CopyrightHolder}\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.

+		$1.IncludeInNewFiles = True

+		$0.TextStylePolicy = $2

+		$2.FileWidth = 120

+		$2.TabsToSpaces = False

+		$2.inheritsSet = VisualStudio

+		$2.inheritsScope = text/plain

+		$0.DotNetNamingPolicy = $3

+		$3.DirectoryNamespaceAssociation = Flat

+		$3.ResourceNamePolicy = FileName

+		$0.VersionControlPolicy = $4

+		$4.inheritsSet = Mono

+		$0.ChangeLogPolicy = $5

+		$5.UpdateMode = None

+		$5.VcsIntegration = None

+		$5.inheritsSet = Mono

+		$0.TextStylePolicy = $6

+		$6.FileWidth = 120

+		$6.TabsToSpaces = False

+		$6.inheritsSet = VisualStudio

+		$6.inheritsScope = text/plain

+		$6.scope = text/x-csharp

+		$0.CSharpFormattingPolicy = $7

+		$7.inheritsSet = Mono

+		$7.inheritsScope = text/x-csharp

+		$7.scope = text/x-csharp

+		$0.TextStylePolicy = $8

+		$8.inheritsSet = null

+		$8.scope = text/x-makefile

+		$0.TextStylePolicy = $9

+		$9.inheritsSet = null

+		$9.scope = application/x-addin+xml

+		$0.TextStylePolicy = $10

+		$10.inheritsSet = null

+		$10.scope = text/x-changelog

+		$0.TextStylePolicy = $11

+		$11.inheritsSet = null

+		$11.scope = text/html

+		$0.TextStylePolicy = $12

+		$12.inheritsSet = null

+		$12.scope = image/svg+xml

+		$0.XmlFormattingPolicy = $13

+		$13.inheritsSet = null

+		$13.scope = image/svgxml

+		$0.TextStylePolicy = $14

+		$14.TabsToSpaces = False

+		$14.inheritsSet = VisualStudio

+		$14.inheritsScope = text/plain

+		$14.scope = text/plain

+		$0.TextStylePolicy = $15

+		$15.inheritsSet = null

+		$15.scope = application/xml

+		$0.XmlFormattingPolicy = $16

+		$16.inheritsSet = Mono

+		$16.inheritsScope = application/xml

+		$16.scope = application/xml

+		$0.TextStylePolicy = $17

+		$17.inheritsSet = null

+		$17.scope = application/config+xml

+		$0.XmlFormattingPolicy = $18

+		$18.inheritsSet = null

+		$18.scope = application/config+xml

+		$0.TextStylePolicy = $19

+		$19.inheritsSet = null

+		$19.scope = application/json

+		$0.TextStylePolicy = $20

+		$20.inheritsSet = null

+		$20.scope = application/glade+xml

+		$0.XmlFormattingPolicy = $21

+		$21.inheritsSet = null

+		$21.scope = application/glade+xml

+		outputpath = build\bin\

+		MakePkgConfig = False

+		MakeLibPC = True

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am
index e0a97da23d..6622e13799 100644
--- a/main/build/MacOSX/Makefile.am
+++ b/main/build/MacOSX/Makefile.am
@@ -53,7 +53,7 @@ app: monostub
 	@echo "Copying MonoDevelop into app bundle"
 	@echo ""
 	cp -pR ../AddIns $(MAC_APP_LIB_DIR)
-	cp -pR ../../external/fsharpbinding/monodevelop/bin/mac-linux/Debug $(MAC_APP_LIB_DIR)/AddIns/fsharpbinding
+	cp -pR ../../external/fsharpbinding/bin/mac-linux/Debug $(MAC_APP_LIB_DIR)/AddIns/fsharpbinding
 	cp -pR ../data $(MAC_APP_LIB_DIR)
 	cp -pR ../bin $(MAC_APP_LIB_DIR)
 	cp -pR ../locale $(MAC_APP_DIR)/Contents/MacOS/share
diff --git a/main/configure.in b/main/configure.in
index bfef42f8c8..9836404435 100644
--- a/main/configure.in
+++ b/main/configure.in
@@ -33,7 +33,7 @@ if test "x$PKG_CONFIG" = "xno"; then
         AC_MSG_ERROR([You need to install pkg-config])
 fi
 
-MONO_REQUIRED_VERSION=3.0.4
+MONO_REQUIRED_VERSION=4.0
 
 if ! $PKG_CONFIG --atleast-version=$MONO_REQUIRED_VERSION mono; then
 	AC_MSG_ERROR([You need mono $MONO_REQUIRED_VERSION or newer])
diff --git a/main/external/NRefactory6 b/main/external/NRefactory6
new file mode 160000
+Subproject 832934f2cb1c8dbeeb4e8a8c1b0cb4d61e44983
diff --git a/main/external/debugger-libs b/main/external/debugger-libs
-Subproject 1671f19e9cc1afc7872c5c91df46c857a00928e
+Subproject 0643ac92574b84e90ef439b0c1c054e4d9bdcc8
diff --git a/main/po/pt_BR.po b/main/po/pt_BR.po
index 54346770a1..26645ec82a 100644
--- a/main/po/pt_BR.po
+++ b/main/po/pt_BR.po
@@ -5,6 +5,7 @@
 # Copyright (C) 2007, Renato Felipe Atilio <renatoat@gmail.com>
 # Copyright (C) 2012, Edison Henrique Andreassy <ehasis@hotmail.com>
 # Copyright (C) 2013, Felipe Bernardo Zorzo <felipe.b.zorzo@gmail.com>
+# Copyright (C) 2014, Felipe Mendonça Marques Silva <fmmsilva@gmail.com>
 #
 # This file is distributed under the same license as the MonoDevelop package.
 # Edison Henrique Andreassy <ehasis@hotmail.com>, 2012.
@@ -15,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-12 11:17:35-0500\n"
 "PO-Revision-Date: 2013-02-23 16:37-0300\n"
-"Last-Translator: Felipe Bernardo Zorzo <felipe.b.zorzo@gmail.com>\n"
+"Last-Translator: Felipe Mendonça Marques Silva <fmmsilva@gmail.com>\n"
 "Language-Team: Português <>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -3028,7 +3029,7 @@ msgstr "Compilador"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml:1
 msgid "Assembly Signing"
-msgstr "Assinatura da Montaem"
+msgstr "Assinatura da Montagem"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml:1
 #: ../src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml:1
@@ -3144,12 +3145,12 @@ msgstr "Reportar um Defeito"
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml:2
 #, fuzzy
 msgid ".NET binary resource"
-msgstr "Recurso .NET"
+msgstr "Recurso Binário .NET"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml:2
 #, fuzzy
 msgid ".NET XML resource"
-msgstr "Recurso .NET"
+msgstr "Recurso XML .NET"
 
 #: ../src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml:2
 msgid "Add-in manifest"
@@ -3472,7 +3473,7 @@ msgstr ""
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs:20
 msgid "An application is already running. Do you want to stop it?"
-msgstr "Uma aplicação já está em execução. Deseja encerra-la?"
+msgstr "Uma aplicação já está em execução. Deseja encerrá-la?"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs:31
 msgid "C_lean {0}"
@@ -3875,7 +3876,7 @@ msgstr "Adicionar arquivos"
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs:34
 #, fuzzy
 msgid "Import From Folder"
-msgstr "Importar de Arquivo"
+msgstr "Importar da Pasta"
 
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs:35
 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs:43
diff --git a/main/src/addins/AspNet/Commands/AddViewDialog.cs b/main/src/addins/AspNet/Commands/AddViewDialog.cs
index 752fc51522..8525483503 100644
--- a/main/src/addins/AspNet/Commands/AddViewDialog.cs
+++ b/main/src/addins/AspNet/Commands/AddViewDialog.cs
@@ -29,15 +29,17 @@ using System.IO;
 using System.Collections.Generic;
 using PP = System.IO.Path;
 
-using MonoDevelop.Ide;
+using Gtk;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.AspNet.Projects;
-using MonoDevelop.AspNet.WebForms.Dom;
 using MonoDevelop.AspNet.WebForms;
 using Gtk;
 using MonoDevelop.Projects;
+using MonoDevelop.AspNet.WebForms.Dom;
 
 namespace MonoDevelop.AspNet.Commands
 {
@@ -366,7 +368,7 @@ namespace MonoDevelop.AspNet.Commands
 			if (!File.Exists (realPath))
 				return;
 			
-			var pd = TypeSystemService.ParseFile (project, realPath) as WebFormsParsedDocument;
+			var pd = TypeSystemService.ParseFile (project, realPath).Result as WebFormsParsedDocument;
 			
 			if (pd != null) {
 				try {
@@ -470,22 +472,18 @@ namespace MonoDevelop.AspNet.Commands
 

 		class TypeDataProvider

 		{

-			public List<ITypeDefinition> TypesList { get; private set; }

+			public List<INamedTypeSymbol> TypesList { get; private set; }

 			public List<string> TypeNamesList { get; private set; }

-			Ambience ambience;

 

 			public TypeDataProvider (MonoDevelop.Projects.DotNetProject project)

 			{

-				TypeNamesList = new List<string> ();

-				var ctx = TypeSystemService.GetCompilation (project);

-				TypesList = new List<ITypeDefinition> (ctx.MainAssembly.GetAllTypeDefinitions ());

-				this.ambience = AmbienceService.GetAmbience (project.LanguageName);

+				TypeNamesList = new List<string> ();
+				var ctx = TypeSystemService.GetCompilationAsync (project).Result;
+				TypesList = new List<INamedTypeSymbol> (ctx.GetAllTypesInMainAssembly ());

 				foreach (var typeDef in TypesList) {

-					TypeNamesList.Add (ambience.GetString ((IEntity)typeDef, OutputFlags.IncludeGenerics | OutputFlags.UseFullName | OutputFlags.IncludeMarkup));

+					TypeNamesList.Add (Ambience.EscapeText (typeDef.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat)));
 				}

 			}

 		}
 	}
 }
-
-		
diff --git a/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs b/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs
index 0d732c6f54..ed0bd44867 100644
--- a/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs
+++ b/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs
@@ -43,16 +43,12 @@ namespace MonoDevelop.AspNet.Commands
 		{

 			var doc = IdeApp.Workbench.ActiveDocument;

 			var project = (DotNetProject)doc.Project;

-			var currentLocation = doc.Editor.Caret.Location;

 

-			string controllerName = doc.ParsedDocument.GetTopLevelTypeDefinition (currentLocation).Name;

-			int pos = controllerName.LastIndexOf ("Controller", StringComparison.Ordinal);

-			if (pos > 0)

-				controllerName = controllerName.Remove (pos);

+			var method = MethodDeclarationAtCaret.Create (doc);

+			string controllerName = method.GetParentMvcControllerName ();

+			string path = doc.FileName.ParentDirectory.ParentDirectory.Combine ("Views", controllerName);

 

-			string path = doc.FileName.ParentDirectory.ParentDirectory.Combine ("Views", controllerName);
-			string actionName = doc.ParsedDocument.GetMember (currentLocation).Name;

-			AddView (project, path, actionName);

+			AddView (project, path, method.Name);

 		}

 

 		public static void AddView (DotNetProject project, string path, string name)

diff --git a/main/src/addins/AspNet/Commands/GoToControllerCommandHandler.cs b/main/src/addins/AspNet/Commands/GoToControllerCommandHandler.cs
index 67c80ed920..fb944f910e 100644
--- a/main/src/addins/AspNet/Commands/GoToControllerCommandHandler.cs
+++ b/main/src/addins/AspNet/Commands/GoToControllerCommandHandler.cs
@@ -26,15 +26,16 @@
 

 using System;

 using System.Linq;

-using ICSharpCode.NRefactory.TypeSystem;

+using ICSharpCode.NRefactory6.CSharp;

+using Microsoft.CodeAnalysis;

+using MonoDevelop.AspNet.Projects;

 using MonoDevelop.Components.Commands;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

-using MonoDevelop.AspNet.Projects;

+using MonoDevelop.Ide.TypeSystem;

 

 namespace MonoDevelop.AspNet.Commands

 {

-

 	class GoToControllerCommandHandler : CommandHandler

 	{

 		protected override void Update (CommandInfo info)

@@ -58,13 +59,22 @@ namespace MonoDevelop.AspNet.Commands
 		{

 			var doc = IdeApp.Workbench.ActiveDocument;

 			var name = doc.FileName.ParentDirectory.FileName;

-			var controller = doc.ProjectContent.GetAllTypeDefinitions ().FirstOrDefault (t => t.Name == name + "Controller");

+			var controller = FindController (doc.Project, name);

 

 			if (controller != null)

-				IdeApp.Workbench.OpenDocument (controller.UnresolvedFile.FileName, doc.Project);

+				IdeApp.ProjectOperations.JumpToDeclaration (controller, doc.Project);

 			else

 				MessageService.ShowError ("Matching controller cannot be found.");

 		}

+

+		INamedTypeSymbol FindController (MonoDevelop.Projects.Project project, string name)

+		{

+			var compilation = TypeSystemService.GetCompilationAsync (project).Result;

+			if (compilation == null)

+				return null;

+

+			return compilation.GetAllTypesInMainAssembly ()

+				.FirstOrDefault (symbol => symbol.Name == name + "Controller");

+		}

 	}

-	

 }

diff --git a/main/src/addins/AspNet/Commands/GoToViewCommandHandler.cs b/main/src/addins/AspNet/Commands/GoToViewCommandHandler.cs
index cbdfed0257..f84173bdca 100644
--- a/main/src/addins/AspNet/Commands/GoToViewCommandHandler.cs
+++ b/main/src/addins/AspNet/Commands/GoToViewCommandHandler.cs
@@ -26,7 +26,6 @@
 

 using System;

 using System.IO;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Components.Commands;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

@@ -43,17 +42,12 @@ namespace MonoDevelop.AspNet.Commands
 		protected override void Run ()

 		{

 			var doc = IdeApp.Workbench.ActiveDocument;

-			var currentLocation = doc.Editor.Caret.Location;

+			var method = MethodDeclarationAtCaret.Create (doc);

+			string controllerName = method.GetParentMvcControllerName ();

 

-			var controller = doc.ParsedDocument.GetTopLevelTypeDefinition (currentLocation);
-			string controllerName = controller.Name;
-			int pos = controllerName.LastIndexOf ("Controller", StringComparison.Ordinal);

-			if (pos > 0)

-				controllerName = controllerName.Remove (pos);

-
 			var baseDirectory = doc.FileName.ParentDirectory.ParentDirectory;
 

-			string actionName = doc.ParsedDocument.GetMember (currentLocation).Name;

+			string actionName = method.Name;

 			var viewFoldersPaths = new [] {

 				baseDirectory.Combine ("Views", controllerName),
 				baseDirectory.Combine ("Views", "Shared")
diff --git a/main/src/addins/AspNet/Commands/MethodDeclarationAtCaret.cs b/main/src/addins/AspNet/Commands/MethodDeclarationAtCaret.cs
new file mode 100644
index 0000000000..83ba6b4db2
--- /dev/null
+++ b/main/src/addins/AspNet/Commands/MethodDeclarationAtCaret.cs
@@ -0,0 +1,118 @@
+//
+// MethodAtCaret.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using MonoDevelop.Ide.Gui;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace MonoDevelop.AspNet.Commands
+{
+	class MethodDeclarationAtCaret
+	{
+		MethodDeclarationAtCaret ()
+		{
+		}
+
+		public static readonly MethodDeclarationAtCaret NullMethodDeclaration = new MethodDeclarationAtCaret ();
+
+		public bool IsMethodFound {
+			get {
+				return TypeDeclaration != null && MethodDeclaration != null;
+			}
+		}
+
+		public TypeDeclarationSyntax TypeDeclaration { get; private set; }
+		public MethodDeclarationSyntax MethodDeclaration { get; private set; }
+
+		public string Name {
+			get {
+				if (MethodDeclaration != null)
+					return MethodDeclaration.Identifier.ValueText;
+				return String.Empty;
+			}
+		}
+
+		public static MethodDeclarationAtCaret Create (MonoDevelop.Ide.Gui.Document doc)
+		{
+			var parsedDocument = doc.AnalysisDocument;
+			if (parsedDocument == null)
+				return NullMethodDeclaration;
+
+			SyntaxNode root = null;
+			if (!parsedDocument.TryGetSyntaxRoot (out root))
+				return NullMethodDeclaration;
+
+			SyntaxNode currentNode;
+			try {
+				int caretOffset = doc.Editor.CaretOffset;
+				currentNode = root.FindNode (TextSpan.FromBounds (caretOffset, caretOffset));
+			} catch (Exception) {
+				return NullMethodDeclaration;
+			}
+
+			var currentType = currentNode.AncestorsAndSelf ().OfType<TypeDeclarationSyntax> ().FirstOrDefault ();
+			var currentMethod = currentNode.AncestorsAndSelf ().OfType<MethodDeclarationSyntax> ().FirstOrDefault ();
+
+			return new MethodDeclarationAtCaret {
+				TypeDeclaration = currentType,
+				MethodDeclaration = currentMethod
+			};
+		}
+
+		public bool IsParentMvcController ()
+		{
+			return TypeDeclaration.Identifier.ValueText.EndsWith ("Controller", StringComparison.OrdinalIgnoreCase);
+		}
+
+		public bool IsMvcViewMethod ()
+		{
+			var correctReturnTypes = new [] { "ActionResult", "ViewResultBase", "ViewResult", "PartialViewResult" };
+
+			string returnTypeName = MethodDeclaration.ReturnType.ToString ();
+
+			return MethodDeclaration.Modifiers.Any (t => t.Kind () == SyntaxKind.PublicKeyword) &&
+				correctReturnTypes.Any (t => t == returnTypeName);
+		}
+
+		public string GetParentMvcControllerName ()
+		{
+			if (TypeDeclaration == null)
+				return String.Empty;
+
+			string controllerName = TypeDeclaration.Identifier.ValueText;
+			int pos = controllerName.LastIndexOf ("Controller", StringComparison.Ordinal);
+			if (pos > 0)
+				controllerName = controllerName.Remove (pos);
+
+			return controllerName;
+		}
+	}
+}
+
diff --git a/main/src/addins/AspNet/Commands/MvcCommandsCommonHandler.cs b/main/src/addins/AspNet/Commands/MvcCommandsCommonHandler.cs
index efa6c6493c..8f8acfc539 100644
--- a/main/src/addins/AspNet/Commands/MvcCommandsCommonHandler.cs
+++ b/main/src/addins/AspNet/Commands/MvcCommandsCommonHandler.cs
@@ -26,7 +26,6 @@
 

 using System;

 using System.Linq;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Components.Commands;

 using MonoDevelop.Ide;

 using MonoDevelop.AspNet.Projects;

@@ -48,17 +47,11 @@ namespace MonoDevelop.AspNet.Commands
 				return;

 			}

 

-			var currentLocation = doc.Editor.Caret.Location;

-			var topLevelType = doc.ParsedDocument.GetTopLevelTypeDefinition (currentLocation);

-			if (topLevelType == null || !topLevelType.Name.EndsWith ("Controller", StringComparison.Ordinal)) {
-				info.Enabled = info.Visible = false;

+			var method = MethodDeclarationAtCaret.Create (doc);

+			if (method.IsMethodFound && method.IsParentMvcController () && method.IsMvcViewMethod ())

 				return;

-			}

 

-			var correctReturnTypes = new [] { "ActionResult", "ViewResultBase", "ViewResult", "PartialViewResult" };

-			var member = doc.ParsedDocument.GetMember (currentLocation) as IUnresolvedMethod;

-			if (member == null || !member.IsPublic || correctReturnTypes.All (t => t != member.ReturnType.ToString ()))

-				info.Enabled = info.Visible = false;

+			info.Enabled = info.Visible = false;

 		}

 	}

 }

diff --git a/main/src/addins/AspNet/Html/BaseHtmlEditorExtension.cs b/main/src/addins/AspNet/Html/BaseHtmlEditorExtension.cs
index b20a67c689..6d6f039cd0 100644
--- a/main/src/addins/AspNet/Html/BaseHtmlEditorExtension.cs
+++ b/main/src/addins/AspNet/Html/BaseHtmlEditorExtension.cs
@@ -84,7 +84,7 @@ namespace MonoDevelop.AspNet.Html
 			return new XmlRootState (new HtmlTagState (), new HtmlClosingTagState (true));
 		}
 		
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 			
diff --git a/main/src/addins/AspNet/Html/DocTypeCompletionData.cs b/main/src/addins/AspNet/Html/DocTypeCompletionData.cs
index 583293ab43..571f8e0125 100644
--- a/main/src/addins/AspNet/Html/DocTypeCompletionData.cs
+++ b/main/src/addins/AspNet/Html/DocTypeCompletionData.cs
@@ -29,6 +29,7 @@
 using System;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.AspNet.Html
 {
@@ -61,24 +62,21 @@ namespace MonoDevelop.AspNet.Html
 			get { return name; }
 		}
 		
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
-			MonoDevelop.Ide.Gui.Content.IEditableTextBuffer buf = window.CompletionWidget as MonoDevelop.Ide.Gui.Content.IEditableTextBuffer;
+			var buf = window.CompletionWidget;
 			if (buf != null) {

-				using (var undo = buf.OpenUndoGroup ()) {
-					int deleteStartOffset = window.CodeCompletionContext.TriggerOffset;
-					if (text.StartsWith (docTypeStart)) {
-						int start = window.CodeCompletionContext.TriggerOffset - docTypeStart.Length;
-						if (start >= 0) {
-							string readback = buf.GetText (start, window.CodeCompletionContext.TriggerOffset);
-							if (string.Compare (readback, docTypeStart, StringComparison.OrdinalIgnoreCase) == 0)
-								deleteStartOffset -= docTypeStart.Length;
-						}
+				int deleteStartOffset = window.CodeCompletionContext.TriggerOffset;
+				if (text.StartsWith (docTypeStart)) {
+					int start = window.CodeCompletionContext.TriggerOffset - docTypeStart.Length;
+					if (start >= 0) {
+						string readback = buf.GetText (start, window.CodeCompletionContext.TriggerOffset);
+						if (string.Compare (readback, docTypeStart, StringComparison.OrdinalIgnoreCase) == 0)
+							deleteStartOffset -= docTypeStart.Length;
 					}
-					

-					buf.DeleteText (deleteStartOffset, buf.CursorPosition - deleteStartOffset);
-					buf.InsertText (buf.CursorPosition, text);
-				}

+				}
+				

+				buf.Replace (deleteStartOffset, buf.CaretOffset - deleteStartOffset, text);
 			}
 		}
 	}
diff --git a/main/src/addins/AspNet/Html/HtmlEditorExtension.cs b/main/src/addins/AspNet/Html/HtmlEditorExtension.cs
index c287c6f7f0..b8913eadcd 100644
--- a/main/src/addins/AspNet/Html/HtmlEditorExtension.cs
+++ b/main/src/addins/AspNet/Html/HtmlEditorExtension.cs
@@ -26,9 +26,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AspNet.Html
 {
@@ -86,11 +86,11 @@ namespace MonoDevelop.AspNet.Html
 			
 			XElement el = n as XElement;
 			if (el != null && el.IsClosed && el.ClosingTag.Region.End > region.End) {
-				region = new DomRegion (region.Begin, el.ClosingTag.Region.End);
+				region = new DocumentRegion (region.Begin, el.ClosingTag.Region.End);
 			}
 			
-			int s = Editor.Document.LocationToOffset (region.BeginLine, region.BeginColumn );
-			int e = Editor.Document.LocationToOffset (region.EndLine, region.EndColumn);
+			int s = Editor.LocationToOffset (region.BeginLine, region.BeginColumn );
+			int e = Editor.LocationToOffset (region.EndLine, region.EndColumn);
 			if (e > s && s > -1)
 				Editor.SetSelection (s, e);
 		}
diff --git a/main/src/addins/AspNet/Html/HtmlParser.cs b/main/src/addins/AspNet/Html/HtmlParser.cs
index 6938328c0c..05f80ff6b3 100644
--- a/main/src/addins/AspNet/Html/HtmlParser.cs
+++ b/main/src/addins/AspNet/Html/HtmlParser.cs
@@ -30,21 +30,20 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-using ICSharpCode.NRefactory.TypeSystem;
-
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Projects;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
 using MonoDevelop.AspNet.Html.Parser;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.AspNet.Html
 {
 	public class HtmlParser : TypeSystemParser
 	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader tr, Project project = null)
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions parseOptions, System.Threading.CancellationToken cancellationToken)
 		{
-			var doc = new MonoDevelop.Xml.Editor.XmlParsedDocument (fileName);
+			var doc = new MonoDevelop.Xml.Editor.XmlParsedDocument (parseOptions.FileName);
 			doc.Flags = ParsedDocumentFlags.NonSerializable;
 			
 			try {
@@ -52,16 +51,16 @@ namespace MonoDevelop.AspNet.Html
 					new XmlRootState (new HtmlTagState (), new HtmlClosingTagState (true)),
 					true);
 				
-				xmlParser.Parse (tr);
+				xmlParser.Parse (parseOptions.Content.CreateReader ());
 				doc.XDocument = xmlParser.Nodes.GetRoot ();
-				doc.Add (xmlParser.Errors);
+				doc.AddRange (xmlParser.Errors);
 				if (doc.XDocument != null)
-					doc.Add (Validate (doc.XDocument));
+					doc.AddRange (Validate (doc.XDocument));
 			}
 			catch (Exception ex) {
 				MonoDevelop.Core.LoggingService.LogError ("Unhandled error parsing HTML document", ex);
 			}
-			return doc;
+			return System.Threading.Tasks.Task.FromResult((ParsedDocument)doc);
 		}
 		
 		IEnumerable<Error> Validate (XDocument doc)
diff --git a/main/src/addins/AspNet/Html/HtmlPathCompletion.cs b/main/src/addins/AspNet/Html/HtmlPathCompletion.cs
index b5b5596a70..4bbd0a0d64 100644
--- a/main/src/addins/AspNet/Html/HtmlPathCompletion.cs
+++ b/main/src/addins/AspNet/Html/HtmlPathCompletion.cs
@@ -30,6 +30,7 @@ using MonoDevelop.Projects;
 using MonoDevelop.Core;
 using System.Text.RegularExpressions;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.AspNet.Html
 {
@@ -116,7 +117,7 @@ namespace MonoDevelop.AspNet.Html
 				get { throw new InvalidOperationException (); }
 			}
 			
-			public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+			public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 			{
 				string text;
 				var dialog = new MonoDevelop.Ide.Projects.ProjectFileSelectorDialog (proj, "", pattern);
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
index 8ace3d10f8..1a401a0b93 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
@@ -71,16 +71,6 @@
       <Name>MonoDevelop.SourceEditor</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
@@ -137,6 +127,17 @@
     <Reference Include="System.Web.Mvc">
       <HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
     </Reference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <Reference Include="System.Web.Mvc" Condition="!Exists('$(SolutionDir)\..\.git')" />
+    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -166,6 +167,46 @@
     <Reference Include="Mono.Posix" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\MonoDevelop.AspNet.addin.xml">
@@ -293,10 +334,13 @@
     <Compile Include="WebForms\WebFormsTypeContext.cs" />
     <Compile Include="Projects\AspMvcProjectFlavor.cs" />
     <Compile Include="Projects\AspNetAppProjectFlavor.cs" />
+    <Compile Include="WebForms\CSharp\CSharpProjector.cs" />
     <Compile Include="Projects\AspNetProjectTemplateWizard.cs" />
     <Compile Include="Projects\AspNetProjectTemplateWizardPageWidget.cs" />
     <Compile Include="Projects\AspNetProjectTemplateWizardPage.cs" />
     <Compile Include="Projects\AspNetStringTagProvider.cs" />
+    <Compile Include="Commands\MethodDeclarationAtCaret.cs" />
+    <Compile Include="Razor\Dom\RazorWorkbenchService.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
@@ -522,6 +566,7 @@
     <Folder Include="Commands\" />
     <Folder Include="ProjectPad\" />
     <Folder Include="Templates\Projects\" />
+    <Folder Include="WebForms\CSharp\" />
   </ItemGroup>
   <Target Name="BeforeBuild">
     <PropertyGroup>
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/ASPNetCodeTranslator.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/ASPNetCodeTranslator.cs
new file mode 100644
index 0000000000..2cac45c952
--- /dev/null
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/ASPNetCodeTranslator.cs
@@ -0,0 +1,44 @@
+//
+// ASPNetCodeTranslator.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis.Text;
+
+namespace MonoDevelop.AspNet.Gui
+{
+	class ASPNetCodeTranslator : CodeTranslator
+	{
+		public override bool CanTranslate (string fromMimeType, string toMimeType)
+		{
+			return false;
+		}
+
+		public override CodeMapping GetMapping (string fromMimeType, string toMimeType, SourceText textSource)
+		{
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs b/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs
index bc33cb1320..75a7277a95 100644
--- a/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs
+++ b/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs
@@ -36,9 +36,8 @@ using System.Linq;
 using System.Reflection;
 using System.Xml;
 
-using ICSharpCode.NRefactory.TypeSystem;
-
 using MonoDevelop.Core;
+using MonoDevelop.Core.Text;
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Core.Execution;
 using MonoDevelop.Core.ProgressMonitoring;
@@ -400,12 +399,10 @@ namespace MonoDevelop.AspNet.Projects
 			var webConfig = GetWebConfig ();
 			if (webConfig == null || !File.Exists (webConfig.FilePath))
 				return;
-
-			var textFile = TextFileProvider.Instance.GetEditableTextFile (webConfig.FilePath);
+			
 			//use textfile API because it's write safe (writes out to another file then moves)
-			if (textFile == null)
-				textFile = MonoDevelop.Projects.Text.TextFile.ReadFile (webConfig.FilePath);
-
+			var textFile = MonoDevelop.Ide.TextFileProvider.Instance.GetEditableTextFile (webConfig.FilePath);
+				
 			//can't use System.Web.Configuration.WebConfigurationManager, as it can only access virtual paths within an app
 			//so need full manual handling
 			try {
@@ -465,10 +462,7 @@ namespace MonoDevelop.AspNet.Projects
 				doc.WriteTo (tw);
 				tw.Flush ();
 				textFile.Text = sw.ToString ();
-
-				MonoDevelop.Projects.Text.TextFile tf = textFile as MonoDevelop.Projects.Text.TextFile;
-				if (tf != null)
-					tf.Save ();
+				textFile.WriteTextTo (textFile.FileName); 
 			} catch (Exception e) {
 				LoggingService.LogWarning ("Could not modify application web.config in project " + Project.Name, e);
 			}
diff --git a/main/src/addins/AspNet/Properties/AddinInfo.cs b/main/src/addins/AspNet/Properties/AddinInfo.cs
index aa431c1eb8..e7986424ec 100644
--- a/main/src/addins/AspNet/Properties/AddinInfo.cs
+++ b/main/src/addins/AspNet/Properties/AddinInfo.cs
@@ -14,3 +14,4 @@ using Mono.Addins;
 [assembly:AddinDependency ("DesignerSupport", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("Xml", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("SourceEditor2", MonoDevelop.BuildInfo.Version)]
+[assembly:AddinDependency ("TextTemplating", MonoDevelop.BuildInfo.Version)]
diff --git a/main/src/addins/AspNet/Properties/AssemblyInfo.cs b/main/src/addins/AspNet/Properties/AssemblyInfo.cs
index 6508a7210d..cc2f7ae245 100644
--- a/main/src/addins/AspNet/Properties/AssemblyInfo.cs
+++ b/main/src/addins/AspNet/Properties/AssemblyInfo.cs
@@ -1,9 +1,11 @@
 // Autogenerated from MonoDevelop.AspNet.addin.xml
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 [assembly: AssemblyProduct ("MonoDevelop")]
 [assembly: AssemblyTitle ("ASP.NET Project Support")]
 [assembly: AssemblyDescription ("Support for ASP.NET projects, including editing, compiling, previewing and deploying to remote servers.")]
 [assembly: AssemblyVersion ("2.6")]
 [assembly: AssemblyCopyright ("MIT X11")]
+[assembly: InternalsVisibleTo("MonoDevelop.AspNet.Tests")]
diff --git a/main/src/addins/AspNet/Razor/Dom/RazorCodeBlock.cs b/main/src/addins/AspNet/Razor/Dom/RazorCodeBlock.cs
index c6928acbfd..b8386bec5d 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorCodeBlock.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorCodeBlock.cs
@@ -25,14 +25,14 @@
 // THE SOFTWARE.

 

 using MonoDevelop.Xml.Parser;

-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public class RazorCodeBlock : RazorCodeFragment

 	{

-		public RazorCodeBlock (TextLocation start) : base (start)

+		public RazorCodeBlock (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorCodeFragment.cs b/main/src/addins/AspNet/Razor/Dom/RazorCodeFragment.cs
index 19ff98708b..c4327c1364 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorCodeFragment.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorCodeFragment.cs
@@ -25,16 +25,16 @@
 // THE SOFTWARE.

 

 using System.Linq;

-using ICSharpCode.NRefactory;

-using Mono.TextEditor;

 using MonoDevelop.Ide;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

+using MonoDevelop.Ide.Editor.Util;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public abstract class RazorCodeFragment : XContainer

 	{

-		protected RazorCodeFragment (TextLocation start) : base (start)

+		protected RazorCodeFragment (DocumentLocation start) : base (start)

 		{

 		}

 

@@ -44,34 +44,32 @@ namespace MonoDevelop.AspNet.Razor.Dom
 

 		public string Name { get; set; }

 

-		public TextLocation? FirstBracket { get; set; }

+		public DocumentLocation? FirstBracket { get; set; }

 

-		public TextDocument Document {

+		public ITextDocument Document {

 			get {

-				if (IdeApp.Workbench.ActiveDocument != null && IdeApp.Workbench.ActiveDocument.Editor != null)

-					return IdeApp.Workbench.ActiveDocument.Editor.Document;

-				return null;

+				return RazorWorkbenchService.ActiveDocument;

 			}

 		}

 

-		public bool IsEndingBracket (TextLocation bracketLocation)

+		public bool IsEndingBracket (DocumentLocation bracketLocation)

 		{

 			// If document isn't entirely loaded

-			if (Document == null || Document.Lines.Count () < Region.BeginLine)

+			if (Document == null || Document.LineCount < Region.BeginLine)

 				return false;

 

 			if (!FirstBracket.HasValue && !FindFirstBracket (bracketLocation))

 				return false;

 

-			int firstBracketOffset = Document.GetOffset (FirstBracket.Value);

-			int currentBracketOffset = Document.GetOffset (bracketLocation);

+			int firstBracketOffset = Document.LocationToOffset (FirstBracket.Value);

+			int currentBracketOffset = Document.LocationToOffset (bracketLocation);

 

-			return Document.GetMatchingBracketOffset (firstBracketOffset) == currentBracketOffset;

+			return SimpleBracketMatcher.GetMatchingBracketOffset (Document, firstBracketOffset) == currentBracketOffset;

 		}

 

-		public bool FindFirstBracket (TextLocation currentLocation)

+		public bool FindFirstBracket (DocumentLocation currentLocation)

 		{

-			if (Document.Lines.Count () < Region.BeginLine)

+			if (Document.LineCount < Region.BeginLine)

 				return false;

 

 			int firstBracketPosition = Document.GetTextBetween (Region.Begin, currentLocation).IndexOf ('{');

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorComment.cs b/main/src/addins/AspNet/Razor/Dom/RazorComment.cs
index 1cb572a9d6..a9a11503bb 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorComment.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorComment.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public class RazorComment : XNode

 	{

-		public RazorComment (DomRegion region) : base (region)

+		public RazorComment (DocumentRegion region) : base (region)

 		{

 		}

 

-		public RazorComment (TextLocation start) : base (start)

+		public RazorComment (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorDirective.cs b/main/src/addins/AspNet/Razor/Dom/RazorDirective.cs
index 7b1755d9a9..3eaebabb49 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorDirective.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorDirective.cs
@@ -24,14 +24,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public class RazorDirective : RazorCodeFragment

 	{

-		public RazorDirective (TextLocation start) : base (start)

+		public RazorDirective (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorExplicitExpression.cs b/main/src/addins/AspNet/Razor/Dom/RazorExplicitExpression.cs
index 15cbfc6637..80dcdae361 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorExplicitExpression.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorExplicitExpression.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public class RazorExplicitExpression : RazorExpression

 	{

-		public RazorExplicitExpression (DomRegion region) : base (region)

+		public RazorExplicitExpression (DocumentRegion region) : base (region)

 		{

 		}

 

-		public RazorExplicitExpression (TextLocation start) : base (start)

+		public RazorExplicitExpression (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorExpression.cs b/main/src/addins/AspNet/Razor/Dom/RazorExpression.cs
index ef1ef4af95..81119710db 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorExpression.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorExpression.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory.TypeSystem;

-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public abstract class RazorExpression : XNode

 	{

-		protected RazorExpression (DomRegion region) : base (region)

+		protected RazorExpression (DocumentRegion region) : base (region)

 		{

 		}

 

-		protected RazorExpression (TextLocation start) : base (start)

+		protected RazorExpression (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorImplicitExpression.cs b/main/src/addins/AspNet/Razor/Dom/RazorImplicitExpression.cs
index f87a500d74..9536a8b592 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorImplicitExpression.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorImplicitExpression.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public class RazorImplicitExpression : RazorExpression

 	{

-		public RazorImplicitExpression (DomRegion region) : base (region)

+		public RazorImplicitExpression (DocumentRegion region) : base (region)

 		{

 		}

 

-		public RazorImplicitExpression (TextLocation start) : base (start)

+		public RazorImplicitExpression (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorStatement.cs b/main/src/addins/AspNet/Razor/Dom/RazorStatement.cs
index 7af1bbfccf..83fa1d7444 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorStatement.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorStatement.cs
@@ -24,15 +24,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 

 	public class RazorStatement : RazorCodeFragment

 	{

-		public RazorStatement (TextLocation start) : base (start)

+		public RazorStatement (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorWorkbenchService.cs b/main/src/addins/AspNet/Razor/Dom/RazorWorkbenchService.cs
new file mode 100644
index 0000000000..97280a15fd
--- /dev/null
+++ b/main/src/addins/AspNet/Razor/Dom/RazorWorkbenchService.cs
@@ -0,0 +1,48 @@
+//
+// RazorWorkbenchService.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.AspNet.Razor.Dom
+{
+	internal static class RazorWorkbenchService
+	{
+		public static ITextDocument ActiveDocument {
+			get { 
+				return GetActiveDocument ();
+			}
+		}
+
+		internal static Func<ITextDocument> GetActiveDocument = () => {
+			if (IdeApp.Workbench.ActiveDocument != null && IdeApp.Workbench.ActiveDocument.Editor != null)
+				return IdeApp.Workbench.ActiveDocument.Editor;
+			return null;
+		};
+	}
+}
+
diff --git a/main/src/addins/AspNet/Razor/IRazorCompletionBuilder.cs b/main/src/addins/AspNet/Razor/IRazorCompletionBuilder.cs
index 242408e9bc..efdad81491 100644
--- a/main/src/addins/AspNet/Razor/IRazorCompletionBuilder.cs
+++ b/main/src/addins/AspNet/Razor/IRazorCompletionBuilder.cs
@@ -28,38 +28,34 @@ using System.Collections.Generic;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Ide.TypeSystem;

 using MonoDevelop.Ide.Gui;

-using ICSharpCode.NRefactory.TypeSystem;

+using ICSharpCode.NRefactory6.CSharp.Completion;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor

 {

 	// Based on MonoDevelop.AspNet.Gui.ILanguageCompletionBuilder

 

-	public interface IRazorCompletionBuilder

+	interface IRazorCompletionBuilder

 	{

 		bool SupportsLanguage (string language);

-		ICompletionWidget CreateCompletionWidget (Document document, UnderlyingDocumentInfo docInfo);

-		ICompletionDataList HandlePopupCompletion (Document realDocument, UnderlyingDocumentInfo docInfo);

-		ICompletionDataList HandleCompletion (Document realDocument, CodeCompletionContext completionContext,

+		ICompletionWidget CreateCompletionWidget (TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo);

+		ICompletionDataList HandlePopupCompletion (TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo);

+		ICompletionDataList HandleCompletion (TextEditor editor, DocumentContext context, CodeCompletionContext completionContext,

 			UnderlyingDocumentInfo docInfo, char currentChar, ref int triggerWordLength);

-		ParameterDataProvider HandleParameterCompletion (Document realDocument, CodeCompletionContext completionContext,

+		MonoDevelop.Ide.CodeCompletion.ParameterHintingResult HandleParameterCompletion (TextEditor editor, DocumentContext context, CodeCompletionContext completionContext,

 			UnderlyingDocumentInfo docInfo, char completionChar);

-		bool GetParameterCompletionCommandOffset (Document realDocument, UnderlyingDocumentInfo docInfo, out int cpos);

-		int GetCurrentParameterIndex (Document realDocument, UnderlyingDocumentInfo docInfo, int startOffset);

+		bool GetParameterCompletionCommandOffset (TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo, out int cpos);

+		int GetCurrentParameterIndex (TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo, int startOffset);

 	}

 

 	public class UnderlyingDocument : Document

 	{

 		internal ParsedDocument HiddenParsedDocument;

-		internal ICompilation HiddenCompilation;

 

 		public override ParsedDocument ParsedDocument {

 			get	{ return HiddenParsedDocument; }

 		}

 

-		public override ICompilation Compilation {

-			get { return HiddenCompilation; }

-		}

-

 		public UnderlyingDocument (IWorkbenchWindow window)

 			: base (window)

 		{

@@ -73,7 +69,7 @@ namespace MonoDevelop.AspNet.Razor
 		public UnderlyingDocument UnderlyingDocument { get; set; }

 	}

 

-	public static class RazorCompletionBuilderService

+	static class RazorCompletionBuilderService

 	{

 		static List<IRazorCompletionBuilder> builder = new List<IRazorCompletionBuilder> ();

 

diff --git a/main/src/addins/AspNet/Razor/Parser/RazorOutlineNode.cs b/main/src/addins/AspNet/Razor/Parser/RazorOutlineNode.cs
index 2028da9383..7d58ea9a93 100644
--- a/main/src/addins/AspNet/Razor/Parser/RazorOutlineNode.cs
+++ b/main/src/addins/AspNet/Razor/Parser/RazorOutlineNode.cs
@@ -25,16 +25,16 @@
 // THE SOFTWARE.

 

 using System.Web.Razor.Parser.SyntaxTree;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;

 using MonoDevelop.AspNet.WebForms.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Parser

 {

 	class RazorOutlineNode

 	{

 		public string Name { get; set; }

-		public DomRegion Location { get; set; }

+		public DocumentRegion Location { get; set; }

 

 		public RazorOutlineNode (XElement el)

 		{

diff --git a/main/src/addins/AspNet/Razor/Parser/StateEngineService.cs b/main/src/addins/AspNet/Razor/Parser/StateEngineService.cs
index 92f0e8f315..be9a3a58a2 100644
--- a/main/src/addins/AspNet/Razor/Parser/StateEngineService.cs
+++ b/main/src/addins/AspNet/Razor/Parser/StateEngineService.cs
@@ -25,10 +25,10 @@
 // THE SOFTWARE.

 

 using System.Diagnostics;

-using ICSharpCode.NRefactory;

 using MonoDevelop.Core;

 using MonoDevelop.Xml.Dom;

 using MonoDevelop.Xml.Parser;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Parser

 {

@@ -39,7 +39,7 @@ namespace MonoDevelop.AspNet.Razor.Parser
 			EndCodeFragment<T> (context, context.LocationMinus (minus));

 		}

 

-		public static void EndCodeFragment<T> (IXmlParserContext context, TextLocation loc) where T : XNode

+		public static void EndCodeFragment<T> (IXmlParserContext context, DocumentLocation loc) where T : XNode

 		{

 			var top = context.Nodes.Pop ();

 			var node = top as T;

diff --git a/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs b/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs
index 99bde2109f..e88d34589d 100644
--- a/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs
+++ b/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs
@@ -1,641 +1,659 @@
-//

-// RazorCSharpEditorExtension.cs

-//

-// Author:

-//		Piotr Dowgiallo <sparekd@gmail.com>

-//

-// Copyright (c) 2012 Piotr Dowgiallo

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text.RegularExpressions;

-using System.Web.Razor.Generator;

-using System.Web.Razor.Parser.SyntaxTree;

-using ICSharpCode.NRefactory;

-using ICSharpCode.NRefactory.Completion;

-using ICSharpCode.NRefactory.TypeSystem;

-using Mono.TextEditor;

-using MonoDevelop.Core;

-using MonoDevelop.Ide.CodeCompletion;

-using MonoDevelop.Ide.Gui;

-using MonoDevelop.Ide.TypeSystem;

-using MonoDevelop.Xml.Dom;

-using MonoDevelop.Xml.Parser;

-using MonoDevelop.AspNet.Html;

-using MonoDevelop.AspNet.Razor.Dom;

-using MonoDevelop.AspNet.Razor.Parser;

-

-namespace MonoDevelop.AspNet.Razor

-{

-	public class RazorCSharpEditorExtension : BaseHtmlEditorExtension

-	{

-		protected RazorCSharpParsedDocument razorDocument;

-		protected UnderlyingDocumentInfo hiddenInfo;

-		IRazorCompletionBuilder completionBuilder;

-

-		bool isInCSharpContext;

-		static readonly Regex DocTypeRegex = new Regex (@"(?:PUBLIC|public)\s+""(?<fpi>[^""]*)""\s+""(?<uri>[^""]*)""");

-

-		ICompletionWidget defaultCompletionWidget;

-		Document defaultDocument;

-

-		RazorSyntaxMode syntaxMode;

-

-		UnderlyingDocument HiddenDoc {

-			get { return hiddenInfo.UnderlyingDocument; }

-		}

-

-		RazorPageInfo PageInfo {

-			get { return razorDocument.PageInfo; }

-		}

-

-		protected override XmlRootState CreateRootState ()

-		{

-			return new RazorRootState ();

-		}

-

-		public override string CompletionLanguage {

-			get {

-				return "Razor";

-			}

-		}

-		public override void Initialize ()

-		{

-			base.Initialize ();

-

-			defaultCompletionWidget = CompletionWidget;

-			defaultDocument = Document;

-			completionBuilder = RazorCompletionBuilderService.GetBuilder ("C#");

-

-			defaultDocument.Editor.Document.TextReplacing += UnderlyingDocument_TextReplacing;

-			defaultDocument.Editor.Caret.PositionChanged += delegate

-			{

-				OnCompletionContextChanged (CompletionWidget, EventArgs.Empty);

-			};

-			syntaxMode = new RazorSyntaxMode (Document);

-			defaultDocument.Editor.Document.SyntaxMode = syntaxMode;

-

-		}

-

-		public override void Dispose ()

-		{

-			if (syntaxMode != null) {

-				defaultDocument.Editor.Document.SyntaxMode = null;

-				syntaxMode.Dispose ();

-				syntaxMode = null;

-			}

-			defaultDocument.Editor.Document.TextReplacing -= UnderlyingDocument_TextReplacing;

-			base.Dispose ();

-		}

-

-		// Handles text modifications in hidden document

-		void UnderlyingDocument_TextReplacing (object sender, DocumentChangeEventArgs e)

-		{

-			if (razorDocument == null)

-				return;

-

-			EnsureUnderlyingDocumentSet ();

-			int off = CalculateCaretPosition (e.Offset);

-

-			if (e.RemovalLength > 0) {

-				int removalLength = e.RemovalLength;

-				if (off + removalLength > HiddenDoc.Editor.Length)

-					removalLength = HiddenDoc.Editor.Length - off;

-				HiddenDoc.Editor.Remove (new TextSegment (off, removalLength));

-			}

-			if (e.InsertionLength > 0) {

-				if (isInCSharpContext)

-					HiddenDoc.Editor.Insert (off, e.InsertedText.Text);

-				else // Insert spaces to correctly calculate offsets until next reparse

-					HiddenDoc.Editor.Insert (off, new String (' ', e.InsertionLength));

-			}

-			if (codeFragment != null)

-				codeFragment.EndOffset += (e.InsertionLength - e.RemovalLength);

-		}

-

-		protected override void OnParsedDocumentUpdated ()

-		{

-			base.OnParsedDocumentUpdated ();

-			try {

-				razorDocument = CU as RazorCSharpParsedDocument;

-				if (razorDocument == null || razorDocument.PageInfo.CSharpParsedFile == null)

-					return;

-

-				CreateDocType ();

-

-				// Don't update C# code in hiddenInfo when:

-				// 1) We are in a RazorState, and the completion window is visible,

-				// it'll freeze (or disappear if we call OnCompletionContextChanged).

-				// 2) We're in the middle of writing a Razor expression - if we're in an incorrect state,

-				// the generated code migh be behind what we've been already written.

-

-				var state = Tracker.Engine.CurrentState;

-				if (state is RazorState && CompletionWindowManager.IsVisible || 

-				    (!updateNeeded && (state is RazorSpeculativeState || state is RazorExpressionState)))

-					UpdateHiddenDocument (false);

-				else {

-					UpdateHiddenDocument ();

-					updateNeeded = false;

-				}

-			} catch (Exception e) {

-				LoggingService.LogError ("Error while updating razor completion.", e); 

-			}

-		}

-

-		void CreateDocType ()

-		{

-			DocType = new XDocType (TextLocation.Empty);

-			var matches = DocTypeRegex.Match (razorDocument.PageInfo.DocType);

-			if (matches.Success) {

-				DocType.PublicFpi = matches.Groups ["fpi"].Value;

-				DocType.Uri = matches.Groups ["uri"].Value;

-			}

-		}

-

-		void EnsureUnderlyingDocumentSet ()

-		{

-			if (hiddenInfo == null)

-				UpdateHiddenDocument ();

-		}

-

-		void UpdateHiddenDocument (bool updateSourceCode = true)

-		{

-			if (!updateSourceCode && hiddenInfo != null) {

-				hiddenInfo.UnderlyingDocument.HiddenParsedDocument = razorDocument.PageInfo.CSharpParsedFile;

-				hiddenInfo.UnderlyingDocument.HiddenCompilation = razorDocument.PageInfo.Compilation;

-				return;

-			}

-

-			hiddenInfo = new UnderlyingDocumentInfo ();

-

-			var viewContent = new HiddenTextEditorViewContent ();

-			viewContent.Project = Document.Project;

-			viewContent.ContentName = "Generated.cs"; // Use a name with .cs extension to get csharp ambience

-			viewContent.Text = razorDocument.PageInfo.CSharpCode;

-

-			var workbenchWindow = new HiddenWorkbenchWindow ();

-			workbenchWindow.ViewContent = viewContent;

-			hiddenInfo.UnderlyingDocument = new UnderlyingDocument (workbenchWindow) {

-				HiddenParsedDocument = razorDocument.PageInfo.CSharpParsedFile,

-				HiddenCompilation = razorDocument.PageInfo.Compilation

-			};

-

-			// completion window needs this

-			hiddenInfo.UnderlyingDocument.Editor.Parent = Editor.Parent;

-

-			currentMappings = razorDocument.PageInfo.GeneratorResults.DesignTimeLineMappings;

-			codeFragment = null;

-		}

-

-		#region Code completion

-

-		XObject prevNode;

-		bool updateNeeded;

-

-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)

-		{

-			Tracker.UpdateEngine ();

-			if (razorDocument == null)

-				return NonCSharpCompletion (key, keyChar, modifier);

-

-			var n = Tracker.Engine.Nodes.Peek ();

-			if (prevNode is RazorExpression && !(n is RazorExpression))

-				updateNeeded = true;

-			prevNode = n;

-

-			var state = Tracker.Engine.CurrentState;

-			int off = document.Editor.Caret.Offset;

-

-			char previousChar = off > 0 ? document.Editor.GetCharAt (off - 1) : ' ';

-			char beforePrevious = off > 1 ? document.Editor.GetCharAt (off - 2) : ' ';

-

-			// Determine completion context here, before calling base method to set the context correctly

-

-			// Rule out Razor comments, html, transition sign (@) and e-mail addresses

-			if (state is RazorCommentState || (previousChar != '@' && !(state is RazorState))  || keyChar == '@'

-				|| (previousChar == '@' && Char.IsLetterOrDigit (beforePrevious)))

-				return NonCSharpCompletion (key, keyChar, modifier);

-

-			// Determine if we are inside generics

-			if (previousChar == '<') {

-				var codeState = state as RazorCodeFragmentState;

-				if (codeState == null || !codeState.IsInsideGenerics)

-					return NonCSharpCompletion (key, keyChar, modifier);

-			}

-			// Determine whether we begin an html tag or generics

-			else if (keyChar == '<' && (n is XElement || !Char.IsLetterOrDigit (previousChar)))

-				return NonCSharpCompletion (key, keyChar, modifier);

-			// Determine whether we are inside html text or in code

-			else if (previousChar != '@' && n is XElement && !(state is RazorSpeculativeState) && !(state is RazorExpressionState))

-			    return NonCSharpCompletion (key, keyChar, modifier);

-

-			// We're in C# context

-			InitializeCodeCompletion ();

-			SwitchToHidden ();

-

-			bool result;

-			try {

-				result = base.KeyPress (key, keyChar, modifier);

-				if (/*EnableParameterInsight &&*/ (keyChar == ',' || keyChar == ')') && CanRunParameterCompletionCommand ())

-				    base.RunParameterCompletionCommand ();

-			} finally {

-				SwitchToReal ();

-			}

-

-			return result;

-		}

-

-		protected void SwitchToHidden ()

-		{

-			isInCSharpContext = true;

-			document = HiddenDoc;

-			CompletionWidget = completionBuilder.CreateCompletionWidget (defaultDocument, hiddenInfo);

-		}

-

-		protected void SwitchToReal ()

-		{

-			isInCSharpContext = false;

-			document = defaultDocument;

-			CompletionWidget = defaultCompletionWidget;

-		}

-

-		bool NonCSharpCompletion (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)

-		{

-			isInCSharpContext = false;

-			return base.KeyPress (key, keyChar, modifier);

-		}

-

-		protected void InitializeCodeCompletion ()

-		{

-			EnsureUnderlyingDocumentSet ();

-			hiddenInfo.OriginalCaretPosition = defaultDocument.Editor.Caret.Offset;

-			hiddenInfo.CaretPosition = CalculateCaretPosition ();

-			HiddenDoc.Editor.Caret.Offset = hiddenInfo.CaretPosition;

-		}

-

-		class CodeFragment

-		{

-			public int StartOffset { get; set; }

-			public int StartRealOffset { get; set; }

-			public int EndOffset { get; set; }

-

-			public CodeFragment ()

-			{}

-

-			public CodeFragment (int startOff, int startRealOff, int endOffset)

-			{

-				StartOffset = startOff;

-				StartRealOffset = startRealOff;

-				EndOffset = endOffset;

-			}

-		}

-

-		int GetDefaultPosition ()

-		{

-			var type = razorDocument.PageInfo.CSharpParsedFile.TopLevelTypeDefinitions.FirstOrDefault ();

-			if (type == null) {

-				return -1;

-			}

-			var method = type.Members.FirstOrDefault (m => m.Name == "Execute");

-			if (method == null) {

-				return -1;

-			}

-			return HiddenDoc.Editor.LocationToOffset (method.BodyRegion.Begin) + 1;

-		}

-

-		IDictionary<int, GeneratedCodeMapping> currentMappings;

-		CodeFragment codeFragment;

-

-		int CalculateCaretPosition ()

-		{

-			return CalculateCaretPosition (defaultDocument.Editor.Caret.Offset);

-		}

-

-		int CalculateCaretPosition (int currentOffset)

-		{

-			if (codeFragment != null) {

-				int diff = currentOffset - codeFragment.StartRealOffset;

-				int off = codeFragment.StartOffset + diff;

-				if (diff >= 0 && off <= codeFragment.EndOffset)

-					return off;

-			}

-

-			KeyValuePair<int, GeneratedCodeMapping> map;

-

-			var defaultPosition = GetDefaultPosition ();

-			if (defaultPosition < 0) {

-				defaultPosition = 0;

-			}

-

-			// If it's first line of code, create a default temp mapping, and use it until next reparse

-			if (currentMappings.Count == 0) {

-				string newLine = "\r\n#line 0 \r\n ";

-				HiddenDoc.Editor.Insert (defaultPosition, newLine);

-				map = new KeyValuePair<int, GeneratedCodeMapping> (0, new GeneratedCodeMapping (currentOffset - 1, 0, 0, 0, 0));

-				currentMappings.Add (map);

-			} else {

-				var result = currentMappings.Where (m => m.Value.StartOffset <= currentOffset);

-				if (!result.Any ())

-					return defaultPosition;

-				map = result.Last ();

-			}

-

-			string pattern = "#line " + map.Key + " ";

-			int pos = HiddenDoc.Editor.Document.IndexOf (pattern, 0, HiddenDoc.Editor.Document.TextLength, StringComparison.Ordinal);

-			if (pos == -1 || !map.Value.StartOffset.HasValue)

-				return defaultPosition;

-

-			int startRealOff = map.Value.StartOffset.Value;

-			int offDifference = currentOffset - (startRealOff + map.Value.CodeLength);

-			var line = HiddenDoc.Editor.Document.GetLineByOffset (pos);

-			int endHiddenOff = line.NextLine.Offset + map.Value.StartGeneratedColumn + map.Value.CodeLength;

-

-			int hiddenOff;

-

-			// If off is inside the map

-			if (offDifference <= 0) {

-				int delta = currentOffset - startRealOff;

-				hiddenOff = line.NextLine.Offset + map.Value.StartGeneratedColumn + delta - 1;

-				codeFragment = new CodeFragment (hiddenOff, currentOffset, endHiddenOff);

-			} else {

-				// It's a new code fragment - create a temp mapping, and use it until next reparse

-				int key = currentMappings.Last ().Key + 1;

-				string newLine = "\r\n#line " + key + " \r\n ";

-				int newOff = endHiddenOff;

-

-				if (HiddenDoc.Editor.GetCharAt (newOff) == '\n')

-					newOff++;

-

-				// We start a new mapping right after the preceding one, but need to include the difference

-				// between mapping's start and the current offset

-				HiddenDoc.Editor.Insert (newOff, newLine);

-				HiddenDoc.Editor.Insert (newOff + newLine.Length, new String (' ', offDifference) + " \r\n");

-

-				var newMap = new KeyValuePair<int, GeneratedCodeMapping> (key, new GeneratedCodeMapping (

-					startRealOff + map.Value.CodeLength, 0, 0, 0, offDifference));

-				currentMappings.Add (newMap);

-				hiddenOff = newOff + newLine.Length + offDifference;

-				codeFragment = new CodeFragment (newOff + newLine.Length, newMap.Value.StartOffset.Value,

-					newOff + newLine.Length + offDifference);

-			}

-

-			return hiddenOff;

-		}

-

-		public override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext,

-			char completionChar, ref int triggerWordLength)

-		{

-//			if (!EnableCodeCompletion)

-//				return null;

-

-			char previousChar = defaultDocument.Editor.Caret.Offset > 1 ? defaultDocument.Editor.GetCharAt (

-				defaultDocument.Editor.Caret.Offset - 2) : ' ';

-

-			// Don't show completion window when directive's name is being typed

-			var directive = Tracker.Engine.Nodes.Peek () as RazorDirective;

-			if (directive != null && !directive.FirstBracket.HasValue)

-				return null;

-

-			if (hiddenInfo != null && isInCSharpContext) {

-				var list = (CompletionDataList) completionBuilder.HandleCompletion (defaultDocument, completionContext,

-					hiddenInfo, completionChar, ref triggerWordLength);

-

-				if (list != null) {

-					//filter out the C# templates, many of them are not valid

-					int oldCount = list.Count;

-					list = FilterCSharpTemplates (list);

-					int templates = list.Count - oldCount;

-

-					if (previousChar == '@') {

-						RazorCompletion.AddAllRazorSymbols (list, razorDocument.PageInfo.HostKind);

-					}

-					if (templates > 0) {

-						AddFilteredRazorTemplates (list, previousChar == '@', true);

-					}

-				}

-				return list;

-			}

-

-			return base.HandleCodeCompletion (completionContext, completionChar, ref triggerWordLength);

-		}

-

-		//recreating the list is over 2x as fast as using remove operations, saves typically 10ms

-		static CompletionDataList FilterCSharpTemplates (CompletionDataList list)

-		{

-			var newList = new CompletionDataList () {

-				AutoCompleteEmptyMatch = list.AutoCompleteEmptyMatch,

-				AutoCompleteUniqueMatch = list.AutoCompleteUniqueMatch,

-				AutoSelect = list.AutoSelect,

-				CloseOnSquareBrackets = list.CloseOnSquareBrackets,

-				CompletionSelectionMode = list.CompletionSelectionMode,

-				DefaultCompletionString = list.DefaultCompletionString,

-				IsSorted = list.IsSorted,

-			};

-			foreach (var l in list) {

-				var c =  l as CompletionData;

-				if (c == null || (c.Icon.Name != "md-template" && c.Icon.Name != "md-template-surroundwith"))

-					newList.Add (c);

-			}

-			return newList;

-		}

-

-		static void AddFilteredRazorTemplates (CompletionDataList list, bool atTemplates, bool stripLeadingAt)

-		{

-			//add the razor templates then filter them based on whether we follow an @ char, so we don't have

-			//lots of duplicates

-			int count = list.Count;

-			MonoDevelop.Ide.CodeTemplates.CodeTemplateService.AddCompletionDataForMime ("text/x-cshtml", list);

-			for (int i = count; i < list.Count; i++) {

-				var d = (CompletionData) list[i];

-				if (atTemplates) {

-					if (d.CompletionText[0] != '@') {

-						list.RemoveAt (i);

-					} else if (stripLeadingAt) {

-						//avoid inserting a double-@, which would not expand correctly

-						d.CompletionText = d.CompletionText.Substring (1);

-					}

-				} else if (d.CompletionText[0] == '@') {

-					list.RemoveAt (i);

-				}

-			}

-		}

-

-		protected override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext,

-			bool forced, ref int triggerWordLength)

-		{

-//			if (!EnableCodeCompletion)

-//				return null;

-

-			var currentLocation = new TextLocation (completionContext.TriggerLine, completionContext.TriggerLineOffset);

-			char currentChar = completionContext.TriggerOffset < 1 ? ' ' : Buffer.GetCharAt (completionContext.TriggerOffset - 1);

-

-			var codeState = Tracker.Engine.CurrentState as RazorCodeFragmentState;

-			if (currentChar == '<' && codeState != null) {

-				if (!codeState.IsInsideParentheses && !codeState.IsInsideGenerics) {

-					var list = new CompletionDataList ();

-					GetElementCompletions (list);

-					return list;

-				}

-			} else if (currentChar == '>' && Tracker.Engine.CurrentState is RazorCodeFragmentState)

-				return ClosingTagCompletion (EditableBuffer, currentLocation);

-

-			return base.HandleCodeCompletion (completionContext, forced, ref triggerWordLength);

-		}

-

-		//we override to ensure we get parent element name even if there's a razor node in between

-		protected override void GetElementCompletions (CompletionDataList list)

-		{

-			var el = Tracker.Engine.Nodes.OfType<XElement> ().FirstOrDefault ();

-			var parentName = el == null ? new XName () : el.Name;

-

-			AddHtmlTagCompletionData (list, Schema, parentName);

-			AddMiscBeginTags (list);

-

-			//FIXME: don't show this after any elements

-			if (DocType == null)

-				list.Add ("!DOCTYPE", "md-literal", MonoDevelop.Core.GettextCatalog.GetString ("Document type"));

-		}

-

-		public override ICompletionDataList CodeCompletionCommand (CodeCompletionContext completionContext)

-		{

-			if (hiddenInfo != null && (isInCSharpContext || Tracker.Engine.CurrentState is RazorState)

-				&& !(Tracker.Engine.Nodes.Peek () is XElement)) {

-				InitializeCodeCompletion ();

-				return completionBuilder.HandlePopupCompletion (defaultDocument, hiddenInfo);

-			}

-

-			return base.CodeCompletionCommand (completionContext);

-		}

-

-		public override bool GetParameterCompletionCommandOffset (out int cpos)

-		{

-			if (hiddenInfo != null && isInCSharpContext)

-				return completionBuilder.GetParameterCompletionCommandOffset (defaultDocument, hiddenInfo, out cpos);

-

-			return base.GetParameterCompletionCommandOffset (out cpos);

-		}

-

-		public override int GetCurrentParameterIndex (int startOffset)

-		{

-			if (hiddenInfo != null && isInCSharpContext) {

-				return completionBuilder.GetCurrentParameterIndex (defaultDocument, hiddenInfo, startOffset);

-			}

-

-			return base.GetCurrentParameterIndex (startOffset);

-		}

-

-		public override ParameterDataProvider HandleParameterCompletion (CodeCompletionContext completionContext,

-			char completionChar)

-		{

-			if (hiddenInfo != null && isInCSharpContext) {

-				return completionBuilder.HandleParameterCompletion (defaultDocument, completionContext,

-					hiddenInfo, completionChar);

-			}

-

-			return base.HandleParameterCompletion (completionContext, completionChar);

-		}

-

-		#endregion

-

-		#region Document outline

-

-		protected override void RefillOutlineStore (ParsedDocument doc, Gtk.TreeStore store)

-		{

-			var htmlRoot = razorDocument.PageInfo.HtmlRoot;

-			var razorRoot = razorDocument.PageInfo.RazorRoot;

-			var blocks = new List<Block> ();

-			GetBlocks (razorRoot, blocks);

-			BuildTreeChildren (store, Gtk.TreeIter.Zero, htmlRoot, blocks);

-		}

-

-		void GetBlocks (Block root, IList<Block> blocks)

-		{

-			foreach (var block in root.Children.Where (n => n.IsBlock).Select (n => n as Block)) {

-				if (block.Type != BlockType.Markup)

-					blocks.Add (block);

-				if (block.Type != BlockType.Helper)

-					GetBlocks (block, blocks);

-			}

-		}

-

-		protected override void InitializeOutlineColumns (MonoDevelop.Ide.Gui.Components.PadTreeView outlineTree)

-		{

-			outlineTree.TextRenderer.Xpad = 0;

-			outlineTree.TextRenderer.Ypad = 0;

-			outlineTree.AppendColumn ("OutlineNode", outlineTree.TextRenderer, new Gtk.TreeCellDataFunc (OutlineTreeDataFunc));

-		}

-

-		protected override void OutlineSelectionChanged (object selection)

-		{

-			SelectNode ((RazorOutlineNode)selection);

-		}

-

-		void BuildTreeChildren (Gtk.TreeStore store, Gtk.TreeIter parent, XContainer p, IList<Block> blocks)

-		{

-			foreach (XNode node in p.Nodes) {

-				var el = node as XElement;

-				if (el == null) {

-					var startLoc = node.Region.Begin;

-					var endLoc = node.Region.End;

-					var doc = defaultDocument.Editor.Document;

-

-					var blocksBetween = blocks.Where (n => n.Start.AbsoluteIndex >= doc.GetOffset (startLoc)

-						&& n.Start.AbsoluteIndex <= doc.GetOffset (endLoc));

-

-					foreach (var block in blocksBetween) {

-						var outlineNode = new RazorOutlineNode (block) {

-							Location = new DomRegion (doc.OffsetToLocation (block.Start.AbsoluteIndex),

-								doc.OffsetToLocation (block.Start.AbsoluteIndex + block.Length))

-						};

-						if (!parent.Equals (Gtk.TreeIter.Zero))

-							store.AppendValues (parent, outlineNode);

-						else

-							store.AppendValues (outlineNode);

-					}

-					continue;

-				}

-

-				Gtk.TreeIter childIter;

-				if (!parent.Equals (Gtk.TreeIter.Zero))

-					childIter = store.AppendValues (parent, new RazorOutlineNode(el));

-				else

-					childIter = store.AppendValues (new RazorOutlineNode(el));

-

-				BuildTreeChildren (store, childIter, el, blocks);

-			}

-		}

-

-		void OutlineTreeDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)

-		{

-			Gtk.CellRendererText txtRenderer = (Gtk.CellRendererText)cell;

-			RazorOutlineNode n = (RazorOutlineNode)model.GetValue (iter, 0);

-			txtRenderer.Text = n.Name;

-		}

-

-		void SelectNode (RazorOutlineNode n)

-		{

-			EditorSelect (n.Location);

-		}

-

-		#endregion

-	}

-}

+//
+// RazorCSharpEditorExtension.cs
+//
+// Author:
+//		Piotr Dowgiallo <sparekd@gmail.com>
+//
+// Copyright (c) 2012 Piotr Dowgiallo
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Web.Razor.Generator;
+using System.Web.Razor.Parser.SyntaxTree;
+using Mono.TextEditor;
+using MonoDevelop.Core;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Xml.Dom;
+using MonoDevelop.Xml.Parser;
+using MonoDevelop.AspNet.Html;
+using MonoDevelop.AspNet.Razor.Dom;
+using MonoDevelop.AspNet.Razor.Parser;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.AspNet.Razor
+{
+	public class RazorCSharpEditorExtension : BaseHtmlEditorExtension
+	{
+		protected RazorCSharpParsedDocument razorDocument;
+		protected UnderlyingDocumentInfo hiddenInfo;
+		IRazorCompletionBuilder completionBuilder;
+
+		bool isInCSharpContext;
+		static readonly Regex DocTypeRegex = new Regex (@"(?:PUBLIC|public)\s+""(?<fpi>[^""]*)""\s+""(?<uri>[^""]*)""");
+
+		ICompletionWidget defaultCompletionWidget;
+		MonoDevelop.Ide.Editor.TextEditor defaultEditor;
+		DocumentContext defaultDocumentContext;
+
+		RazorSyntaxMode syntaxMode;
+
+		UnderlyingDocument HiddenDoc {
+			get { return hiddenInfo.UnderlyingDocument; }
+		}
+
+		RazorPageInfo PageInfo {
+			get { return razorDocument.PageInfo; }
+		}
+
+		protected override XmlRootState CreateRootState ()
+		{
+			return new RazorRootState ();
+		}
+
+		public override string CompletionLanguage {
+			get {
+				return "Razor";
+			}
+		}
+
+		protected override void Initialize ()
+		{
+			base.Initialize ();
+
+			defaultCompletionWidget = CompletionWidget;
+			defaultDocumentContext = DocumentContext;
+			defaultEditor = Editor;
+			completionBuilder = RazorCompletionBuilderService.GetBuilder ("C#");
+
+			defaultEditor.TextChanging += UnderlyingDocument_TextReplacing;
+			syntaxMode = new RazorSyntaxMode (DocumentContext);
+			var textEditorData = DocumentContext.GetContent<TextEditorData> ();
+			if (textEditorData != null)
+				textEditorData.Document.SyntaxMode = syntaxMode;
+		}
+
+		public override void Dispose ()
+		{
+			if (syntaxMode != null) {
+				var textEditorData = DocumentContext.GetContent<TextEditorData> ();
+				if (textEditorData != null)
+					textEditorData.Document.SyntaxMode = null;
+				syntaxMode.Dispose ();
+				syntaxMode = null;
+			}
+			defaultEditor.TextChanging -= UnderlyingDocument_TextReplacing;
+			base.Dispose ();
+		}
+
+		// Handles text modifications in hidden document
+		void UnderlyingDocument_TextReplacing (object sender, TextChangeEventArgs e)
+		{
+			if (razorDocument == null)
+				return;
+
+			// TODO Roslyn port.
+			return;
+
+			EnsureUnderlyingDocumentSet ();
+			int off = CalculateCaretPosition (e.Offset);
+
+			if (e.RemovalLength > 0) {
+				int removalLength = e.RemovalLength;
+				if (off + removalLength > HiddenDoc.Editor.Length)
+					removalLength = HiddenDoc.Editor.Length - off;
+				HiddenDoc.Editor.RemoveText (off, removalLength);
+			}
+			if (e.InsertionLength > 0) {
+				if (isInCSharpContext)
+					HiddenDoc.Editor.InsertText (off, e.InsertedText.Text);
+				else // Insert spaces to correctly calculate offsets until next reparse
+					HiddenDoc.Editor.InsertText (off, new String (' ', e.InsertionLength));
+			}
+			if (codeFragment != null)
+				codeFragment.EndOffset += (e.InsertionLength - e.RemovalLength);
+		}
+
+		protected override void OnParsedDocumentUpdated ()
+		{
+			base.OnParsedDocumentUpdated ();
+			try {
+				razorDocument = CU as RazorCSharpParsedDocument;
+				if (razorDocument == null || razorDocument.PageInfo.CSharpParsedFile == null)
+					return;
+
+				CreateDocType ();
+
+				// Don't update C# code in hiddenInfo when:
+				// 1) We are in a RazorState, and the completion window is visible,
+				// it'll freeze (or disappear if we call OnCompletionContextChanged).
+				// 2) We're in the middle of writing a Razor expression - if we're in an incorrect state,
+				// the generated code migh be behind what we've been already written.
+
+				var state = Tracker.Engine.CurrentState;
+				if (state is RazorState && CompletionWindowManager.IsVisible || 
+				    (!updateNeeded && (state is RazorSpeculativeState || state is RazorExpressionState)))
+					UpdateHiddenDocument (false);
+				else {
+					UpdateHiddenDocument ();
+					updateNeeded = false;
+				}
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while updating razor completion.", e); 
+			}
+		}
+
+		void CreateDocType ()
+		{
+			DocType = new XDocType (MonoDevelop.Ide.Editor.DocumentLocation.Empty);
+			var matches = DocTypeRegex.Match (razorDocument.PageInfo.DocType);
+			if (matches.Success) {
+				DocType.PublicFpi = matches.Groups ["fpi"].Value;
+				DocType.Uri = matches.Groups ["uri"].Value;
+			}
+		}
+
+		void EnsureUnderlyingDocumentSet ()
+		{
+			if (hiddenInfo == null)
+				UpdateHiddenDocument ();
+		}
+
+		void UpdateHiddenDocument (bool updateSourceCode = true)
+		{
+			if (!updateSourceCode && hiddenInfo != null) {
+				// TODO : Roslyn port
+				//hiddenInfo.UnderlyingDocument.HiddenParsedDocument = razorDocument.PageInfo.CSharpParsedFile;
+				//hiddenInfo.UnderlyingDocument.HiddenCompilation = razorDocument.PageInfo.Compilation;
+				return;
+			}
+
+			hiddenInfo = new UnderlyingDocumentInfo ();
+
+			var viewContent = new HiddenTextEditorViewContent ();
+			viewContent.Project = DocumentContext.Project;
+			viewContent.ContentName = "Generated.cs"; // Use a name with .cs extension to get csharp ambience
+			viewContent.Text = razorDocument.PageInfo.CSharpCode;
+
+			var workbenchWindow = new HiddenWorkbenchWindow ();
+			workbenchWindow.ViewContent = viewContent;
+			hiddenInfo.UnderlyingDocument = new UnderlyingDocument (workbenchWindow) {
+				// TODO: Roslyn port
+				// HiddenParsedDocument = razorDocument.PageInfo.CSharpParsedFile
+				/*,
+				HiddenCompilation = razorDocument.PageInfo.Compilation*/
+			};
+
+			// completion window needs this
+			Gtk.Widget editor = hiddenInfo.UnderlyingDocument.Editor;
+			editor.Parent = ((Gtk.Widget)Editor).Parent;
+
+			currentMappings = razorDocument.PageInfo.GeneratorResults.DesignTimeLineMappings;
+			codeFragment = null;
+		}
+
+		#region Code completion
+
+		XObject prevNode;
+		bool updateNeeded;
+
+		public override bool KeyPress (KeyDescriptor descriptor)
+		{
+			Tracker.UpdateEngine ();
+			if (razorDocument == null)
+				return NonCSharpCompletion (descriptor);
+
+			var n = Tracker.Engine.Nodes.Peek ();
+			if (prevNode is RazorExpression && !(n is RazorExpression))
+				updateNeeded = true;
+			prevNode = n;
+			var state = Tracker.Engine.CurrentState;
+			int off = Editor.CaretOffset;
+
+			char previousChar = off > 0 ? Editor.GetCharAt (off - 1) : ' ';
+			char beforePrevious = off > 1 ? Editor.GetCharAt (off - 2) : ' ';
+
+			// Determine completion context here, before calling base method to set the context correctly
+
+			// Rule out Razor comments, html, transition sign (@) and e-mail addresses
+			if (state is RazorCommentState || (previousChar != '@' && !(state is RazorState))  || descriptor.KeyChar == '@'
+				|| (previousChar == '@' && Char.IsLetterOrDigit (beforePrevious)))
+				return NonCSharpCompletion (descriptor);
+
+			// Determine if we are inside generics
+			if (previousChar == '<') {
+				var codeState = state as RazorCodeFragmentState;
+				if (codeState == null || !codeState.IsInsideGenerics)
+					return NonCSharpCompletion (descriptor);
+			}
+			// Determine whether we begin an html tag or generics
+			else if (descriptor.KeyChar == '<' && (n is XElement || !Char.IsLetterOrDigit (previousChar)))
+				return NonCSharpCompletion (descriptor);
+			// Determine whether we are inside html text or in code
+			else if (previousChar != '@' && n is XElement && !(state is RazorSpeculativeState) && !(state is RazorExpressionState))
+				return NonCSharpCompletion (descriptor);
+
+			// We're in C# context
+			InitializeCodeCompletion ();
+			SwitchToHidden ();
+
+			bool result;
+			try {
+				result = base.KeyPress (descriptor);
+				if (/*EnableParameterInsight &&*/ (descriptor.KeyChar == ',' || descriptor.KeyChar == ')') && CanRunParameterCompletionCommand ())
+				    base.RunParameterCompletionCommand ();
+			} finally {
+				SwitchToReal ();
+			}
+
+			return result;
+		}
+
+		protected void SwitchToHidden ()
+		{
+			isInCSharpContext = true;
+// TODO: Roslyn port.
+//			DocumentContext = HiddenDoc;
+//			Editor = HiddenDoc.Editor;
+//			CompletionWidget = completionBuilder.CreateCompletionWidget (defaultEditor, defaultDocumentContext, hiddenInfo);
+		}
+
+		protected void SwitchToReal ()
+		{
+			isInCSharpContext = false;
+// TODO: Roslyn port.
+//			DocumentContext = defaultDocumentContext;
+//			Editor = defaultEditor;
+//			CompletionWidget = defaultCompletionWidget;
+		}
+
+		bool NonCSharpCompletion (KeyDescriptor descriptor)
+		{
+			isInCSharpContext = false;
+			return base.KeyPress (descriptor);
+		}
+
+		protected void InitializeCodeCompletion ()
+		{
+			// TODO Roslyn port
+//			EnsureUnderlyingDocumentSet ();
+//			hiddenInfo.OriginalCaretPosition = defaultEditor.CaretOffset;
+//			hiddenInfo.CaretPosition = CalculateCaretPosition ();
+//			HiddenDoc.Editor.CaretOffset = hiddenInfo.CaretPosition;
+		}
+
+		class CodeFragment
+		{
+			public int StartOffset { get; set; }
+			public int StartRealOffset { get; set; }
+			public int EndOffset { get; set; }
+
+			public CodeFragment ()
+			{}
+
+			public CodeFragment (int startOff, int startRealOff, int endOffset)
+			{
+				StartOffset = startOff;
+				StartRealOffset = startRealOff;
+				EndOffset = endOffset;
+			}
+		}
+
+		int GetDefaultPosition ()
+		{
+			// TODO: Roslyn port
+			return -1;
+//			var type = razorDocument.PageInfo.CSharpParsedFile.TopLevelTypeDefinitions.FirstOrDefault ();
+//			if (type == null) {
+//				return -1;
+//			}
+//			var method = type.Members.FirstOrDefault (m => m.Name == "Execute");
+//			if (method == null) {
+//				return -1;
+//			}
+//			return HiddenDoc.Editor.LocationToOffset (method.BodyRegion.Begin) + 1;
+		}
+
+		IDictionary<int, GeneratedCodeMapping> currentMappings;
+		CodeFragment codeFragment;
+
+		int CalculateCaretPosition ()
+		{
+			return CalculateCaretPosition (defaultEditor.CaretOffset);
+		}
+
+		int CalculateCaretPosition (int currentOffset)
+		{
+			if (codeFragment != null) {
+				int diff = currentOffset - codeFragment.StartRealOffset;
+				int off = codeFragment.StartOffset + diff;
+				if (diff >= 0 && off <= codeFragment.EndOffset)
+					return off;
+			}
+
+			KeyValuePair<int, GeneratedCodeMapping> map;
+
+			var defaultPosition = GetDefaultPosition ();
+			if (defaultPosition < 0) {
+				defaultPosition = 0;
+			}
+
+			// If it's first line of code, create a default temp mapping, and use it until next reparse
+			if (currentMappings.Count == 0) {
+				string newLine = "\r\n#line 0 \r\n ";
+				HiddenDoc.Editor.InsertText (defaultPosition, newLine);
+				map = new KeyValuePair<int, GeneratedCodeMapping> (0, new GeneratedCodeMapping (currentOffset - 1, 0, 0, 0, 0));
+				currentMappings.Add (map);
+			} else {
+				var result = currentMappings.Where (m => m.Value.StartOffset <= currentOffset);
+				if (!result.Any ())
+					return defaultPosition;
+				map = result.Last ();
+			}
+
+			string pattern = "#line " + map.Key + " ";
+			int pos = HiddenDoc.Editor.Text.IndexOf (pattern, 0, HiddenDoc.Editor.Length, StringComparison.Ordinal);
+			if (pos == -1 || !map.Value.StartOffset.HasValue)
+				return defaultPosition;
+
+			int startRealOff = map.Value.StartOffset.Value;
+			int offDifference = currentOffset - (startRealOff + map.Value.CodeLength);
+			var line = HiddenDoc.Editor.GetLineByOffset (pos);
+			int endHiddenOff = line.NextLine.Offset + map.Value.StartGeneratedColumn + map.Value.CodeLength;
+
+			int hiddenOff;
+
+			// If off is inside the map
+			if (offDifference <= 0) {
+				int delta = currentOffset - startRealOff;
+				hiddenOff = line.NextLine.Offset + map.Value.StartGeneratedColumn + delta - 1;
+				codeFragment = new CodeFragment (hiddenOff, currentOffset, endHiddenOff);
+			} else {
+				// It's a new code fragment - create a temp mapping, and use it until next reparse
+				int key = currentMappings.Last ().Key + 1;
+				string newLine = "\r\n#line " + key + " \r\n ";
+				int newOff = endHiddenOff;
+
+				if (HiddenDoc.Editor.GetCharAt (newOff) == '\n')
+					newOff++;
+
+				// We start a new mapping right after the preceding one, but need to include the difference
+				// between mapping's start and the current offset
+				HiddenDoc.Editor.InsertText (newOff, newLine);
+				HiddenDoc.Editor.InsertText (newOff + newLine.Length, new String (' ', offDifference) + " \r\n");
+
+				var newMap = new KeyValuePair<int, GeneratedCodeMapping> (key, new GeneratedCodeMapping (
+					startRealOff + map.Value.CodeLength, 0, 0, 0, offDifference));
+				currentMappings.Add (newMap);
+				hiddenOff = newOff + newLine.Length + offDifference;
+				codeFragment = new CodeFragment (newOff + newLine.Length, newMap.Value.StartOffset.Value,
+					newOff + newLine.Length + offDifference);
+			}
+
+			return hiddenOff;
+		}
+
+// TODO: Roslyn port
+//		public override async System.Threading.Tasks.Task<ICompletionDataList> HandleCodeCompletionAsync (CodeCompletionContext completionContext, char completionChar, System.Threading.CancellationToken token)
+//		{
+////			if (!EnableCodeCompletion)
+////				return null;
+//
+//			char previousChar = defaultEditor.CaretOffset > 1 ? defaultEditor.GetCharAt (
+//				defaultEditor.CaretOffset - 2) : ' ';
+//
+//			// Don't show completion window when directive's name is being typed
+//			var directive = Tracker.Engine.Nodes.Peek () as RazorDirective;
+//			if (directive != null && !directive.FirstBracket.HasValue)
+//				return null;
+//
+//			if (hiddenInfo != null && isInCSharpContext) {
+//				var list = (CompletionDataList) await completionBuilder.HandleCompletion (defaultEditor, defaultDocumentContext, completionContext,
+//					hiddenInfo, completionChar);
+//
+//				if (list != null) {
+//					//filter out the C# templates, many of them are not valid
+//					int oldCount = list.Count;
+//					list = FilterCSharpTemplates (list);
+//					int templates = list.Count - oldCount;
+//
+//					if (previousChar == '@') {
+//						RazorCompletion.AddAllRazorSymbols (list, razorDocument.PageInfo.HostKind);
+//					}
+//					if (templates > 0) {
+//						AddFilteredRazorTemplates (list, previousChar == '@', true);
+//					}
+//				}
+//				return list;
+//			}
+//
+//			return base.HandleCodeCompletionAsync (completionContext, completionChar, token);
+//		}
+
+		//recreating the list is over 2x as fast as using remove operations, saves typically 10ms
+		static CompletionDataList FilterCSharpTemplates (CompletionDataList list)
+		{
+			var newList = new CompletionDataList () {
+				AutoCompleteEmptyMatch = list.AutoCompleteEmptyMatch,
+				AutoCompleteUniqueMatch = list.AutoCompleteUniqueMatch,
+				AutoSelect = list.AutoSelect,
+				CloseOnSquareBrackets = list.CloseOnSquareBrackets,
+				CompletionSelectionMode = list.CompletionSelectionMode,
+				DefaultCompletionString = list.DefaultCompletionString,
+				IsSorted = list.IsSorted,
+			};
+			foreach (var l in list) {
+				var c =  l as CompletionData;
+				if (c == null || (c.Icon.Name != "md-template" && c.Icon.Name != "md-template-surroundwith"))
+					newList.Add (c);
+			}
+			return newList;
+		}
+
+		static void AddFilteredRazorTemplates (CompletionDataList list, bool atTemplates, bool stripLeadingAt)
+		{
+			//add the razor templates then filter them based on whether we follow an @ char, so we don't have
+			//lots of duplicates
+			int count = list.Count;
+			MonoDevelop.Ide.CodeTemplates.CodeTemplateService.AddCompletionDataForMime ("text/x-cshtml", list);
+			for (int i = count; i < list.Count; i++) {
+				var d = (CompletionData) list[i];
+				if (atTemplates) {
+					if (d.CompletionText[0] != '@') {
+						list.RemoveAt (i);
+					} else if (stripLeadingAt) {
+						//avoid inserting a double-@, which would not expand correctly
+						d.CompletionText = d.CompletionText.Substring (1);
+					}
+				} else if (d.CompletionText[0] == '@') {
+					list.RemoveAt (i);
+				}
+			}
+		}
+
+		// TODO: Roslyn port
+//		protected override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext,
+//			bool forced, ref int triggerWordLength)
+//		{
+////			if (!EnableCodeCompletion)
+////				return null;
+//
+//			var currentLocation = new ICSharpCode.NRefactory.TextLocation (completionContext.TriggerLine, completionContext.TriggerLineOffset);
+//			char currentChar = completionContext.TriggerOffset < 1 ? ' ' : Editor.GetCharAt (completionContext.TriggerOffset - 1);
+//
+//			var codeState = Tracker.Engine.CurrentState as RazorCodeFragmentState;
+//			if (currentChar == '<' && codeState != null) {
+//				if (!codeState.IsInsideParentheses && !codeState.IsInsideGenerics) {
+//					var list = new CompletionDataList ();
+//					GetElementCompletions (list);
+//					return list;
+//				}
+//			} else if (currentChar == '>' && Tracker.Engine.CurrentState is RazorCodeFragmentState)
+//				return ClosingTagCompletion (Editor, currentLocation);
+//
+//			return base.HandleCodeCompletion (completionContext, forced, ref triggerWordLength);
+//		}
+
+		//we override to ensure we get parent element name even if there's a razor node in between
+		protected override void GetElementCompletions (CompletionDataList list)
+		{
+			var el = Tracker.Engine.Nodes.OfType<XElement> ().FirstOrDefault ();
+			var parentName = el == null ? new XName () : el.Name;
+
+			AddHtmlTagCompletionData (list, Schema, parentName);
+			AddMiscBeginTags (list);
+
+			//FIXME: don't show this after any elements
+			if (DocType == null)
+				list.Add ("!DOCTYPE", "md-literal", MonoDevelop.Core.GettextCatalog.GetString ("Document type"));
+		}
+
+		public override ICompletionDataList CodeCompletionCommand (CodeCompletionContext completionContext)
+		{
+			if (hiddenInfo != null && (isInCSharpContext || Tracker.Engine.CurrentState is RazorState)
+				&& !(Tracker.Engine.Nodes.Peek () is XElement)) {
+				InitializeCodeCompletion ();
+				return completionBuilder.HandlePopupCompletion (defaultEditor, defaultDocumentContext, hiddenInfo);
+			}
+
+			return base.CodeCompletionCommand (completionContext);
+		}
+		/*
+		public override bool GetParameterCompletionCommandOffset (out int cpos)
+		{
+			if (hiddenInfo != null && isInCSharpContext)
+				return completionBuilder.GetParameterCompletionCommandOffset (defaultEditor, defaultDocumentContext, hiddenInfo, out cpos);
+
+			return base.GetParameterCompletionCommandOffset (out cpos);
+		}*/
+
+		public override int GetCurrentParameterIndex (int startOffset)
+		{
+			if (hiddenInfo != null && isInCSharpContext) {
+				return completionBuilder.GetCurrentParameterIndex (defaultEditor, defaultDocumentContext, hiddenInfo, startOffset);
+			}
+
+			return base.GetCurrentParameterIndex (startOffset);
+		}
+
+// TODO: Roslyn port
+//		public override ParameterHintingResult HandleParameterCompletionAsync (CodeCompletionContext completionContext,
+//			char completionChar)
+//		{
+//			if (hiddenInfo != null && isInCSharpContext) {
+//				return completionBuilder.HandleParameterCompletion (defaultEditor, defaultDocumentContext, completionContext,
+//					hiddenInfo, completionChar);
+//			}
+//
+//			return base.HandleParameterCompletionAsync (completionContext, completionChar);
+//		}
+
+		#endregion
+
+		#region Document outline
+
+		protected override void RefillOutlineStore (ParsedDocument doc, Gtk.TreeStore store)
+		{
+			var htmlRoot = razorDocument.PageInfo.HtmlRoot;
+			var razorRoot = razorDocument.PageInfo.RazorRoot;
+			var blocks = new List<Block> ();
+			GetBlocks (razorRoot, blocks);
+			BuildTreeChildren (store, Gtk.TreeIter.Zero, htmlRoot, blocks);
+		}
+
+		void GetBlocks (Block root, IList<Block> blocks)
+		{
+			foreach (var block in root.Children.Where (n => n.IsBlock).Select (n => n as Block)) {
+				if (block.Type != BlockType.Markup)
+					blocks.Add (block);
+				if (block.Type != BlockType.Helper)
+					GetBlocks (block, blocks);
+			}
+		}
+
+		protected override void InitializeOutlineColumns (MonoDevelop.Ide.Gui.Components.PadTreeView outlineTree)
+		{
+			outlineTree.TextRenderer.Xpad = 0;
+			outlineTree.TextRenderer.Ypad = 0;
+			outlineTree.AppendColumn ("OutlineNode", outlineTree.TextRenderer, new Gtk.TreeCellDataFunc (OutlineTreeDataFunc));
+		}
+
+		protected override void OutlineSelectionChanged (object selection)
+		{
+			SelectNode ((RazorOutlineNode)selection);
+		}
+
+		void BuildTreeChildren (Gtk.TreeStore store, Gtk.TreeIter parent, XContainer p, IList<Block> blocks)
+		{
+			foreach (XNode node in p.Nodes) {
+				var el = node as XElement;
+				if (el == null) {
+					var startLoc = node.Region.Begin;
+					var endLoc = node.Region.End;
+					var doc = defaultEditor;
+
+					var blocksBetween = blocks.Where (n => n.Start.AbsoluteIndex >= doc.LocationToOffset (startLoc.Line, startLoc.Column)
+						&& n.Start.AbsoluteIndex <= doc.LocationToOffset (endLoc.Line, endLoc.Column));
+
+					foreach (var block in blocksBetween) {
+						var outlineNode = new RazorOutlineNode (block) {
+							Location = new MonoDevelop.Ide.Editor.DocumentRegion (doc.OffsetToLocation (block.Start.AbsoluteIndex),
+								doc.OffsetToLocation (block.Start.AbsoluteIndex + block.Length))
+						};
+						if (!parent.Equals (Gtk.TreeIter.Zero))
+							store.AppendValues (parent, outlineNode);
+						else
+							store.AppendValues (outlineNode);
+					}
+					continue;
+				}
+
+				Gtk.TreeIter childIter;
+				if (!parent.Equals (Gtk.TreeIter.Zero))
+					childIter = store.AppendValues (parent, new RazorOutlineNode(el));
+				else
+					childIter = store.AppendValues (new RazorOutlineNode(el));
+
+				BuildTreeChildren (store, childIter, el, blocks);
+			}
+		}
+
+		void OutlineTreeDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+		{
+			Gtk.CellRendererText txtRenderer = (Gtk.CellRendererText)cell;
+			RazorOutlineNode n = (RazorOutlineNode)model.GetValue (iter, 0);
+			txtRenderer.Text = n.Name;
+		}
+
+		void SelectNode (RazorOutlineNode n)
+		{
+			EditorSelect (n.Location);
+		}
+
+		#endregion
+	}
+}
diff --git a/main/src/addins/AspNet/Razor/RazorCSharpFormatter.cs b/main/src/addins/AspNet/Razor/RazorCSharpFormatter.cs
index 560408db69..795cdd670f 100644
--- a/main/src/addins/AspNet/Razor/RazorCSharpFormatter.cs
+++ b/main/src/addins/AspNet/Razor/RazorCSharpFormatter.cs
@@ -1,53 +1,54 @@
-//

-// RazorCSharpCodeFormatter.cs

-//

-// Author:

-//		Piotr Dowgiallo <sparekd@gmail.com>

-//

-// Copyright (c) 2012 Piotr Dowgiallo

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

-using System.Collections.Generic;

-using MonoDevelop.Ide.CodeFormatting;

-using MonoDevelop.Projects.Policies;

-

-namespace MonoDevelop.AspNet.Razor

-{

-	public class RazorCSharpFormatter : AbstractAdvancedFormatter

-	{

-		public override bool SupportsOnTheFlyFormatting { get { return true; } }

-		public override bool SupportsCorrectingIndent { get { return true; } }

-

-		public override void CorrectIndenting (PolicyContainer policyParent,

-			IEnumerable<string> mimeTypeChain, Mono.TextEditor.TextEditorData data, int line)

-		{

-		}

-

-		public override string FormatText (PolicyContainer policyParent,

-			IEnumerable<string> mimeTypeChain, string input, int startOffset, int endOffset)

-		{

-			return null;

-		}

-

-		public override void OnTheFlyFormat (Ide.Gui.Document doc, int startOffset, int endOffset)

-		{

-		}

-	}

-}

+//
+// RazorCSharpCodeFormatter.cs
+//
+// Author:
+//		Piotr Dowgiallo <sparekd@gmail.com>
+//
+// Copyright (c) 2012 Piotr Dowgiallo
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using MonoDevelop.Ide.CodeFormatting;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Projects.Policies;
+
+namespace MonoDevelop.AspNet.Razor
+{
+	public class RazorCSharpFormatter : AbstractAdvancedFormatter
+	{
+		public override bool SupportsOnTheFlyFormatting { get { return true; } }
+		public override bool SupportsCorrectingIndent { get { return true; } }
+
+		public override void CorrectIndenting (PolicyContainer policyParent,
+			IEnumerable<string> mimeTypeChain, TextEditor data, int line)
+		{
+		}
+
+		public override string FormatText (PolicyContainer policyParent,
+			IEnumerable<string> mimeTypeChain, string input, int startOffset, int endOffset)
+		{
+			return null;
+		}
+
+		public override void OnTheFlyFormat (TextEditor editor, DocumentContext context, int startOffset, int endOffset)
+		{
+		}
+	}
+}
diff --git a/main/src/addins/AspNet/Razor/RazorCSharpParsedDocument.cs b/main/src/addins/AspNet/Razor/RazorCSharpParsedDocument.cs
index 3cac236d41..28b287fed5 100644
--- a/main/src/addins/AspNet/Razor/RazorCSharpParsedDocument.cs
+++ b/main/src/addins/AspNet/Razor/RazorCSharpParsedDocument.cs
@@ -26,6 +26,7 @@
 

 using System.Collections.Generic;

 using MonoDevelop.Ide.TypeSystem;

+using System.Linq;

 

 namespace MonoDevelop.AspNet.Razor

 {

@@ -38,10 +39,15 @@ namespace MonoDevelop.AspNet.Razor
 			PageInfo = pageInfo;

 			Flags |= ParsedDocumentFlags.NonSerializable;

 			if (PageInfo.Errors != null)

-				Add (PageInfo.Errors);

+				AddRange (PageInfo.Errors);

 		}

 

-		public override IEnumerable<FoldingRegion> Foldings	{

+		public override System.Threading.Tasks.Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (System.Threading.CancellationToken cancellationToken)

+		{

+			return System.Threading.Tasks.Task.FromResult((IReadOnlyList<FoldingRegion>)Foldings.ToList ());

+		}

+

+		public IEnumerable<FoldingRegion> Foldings	{

 			get	{

 				if (PageInfo.FoldingRegions != null) {

 					foreach (var region in PageInfo.FoldingRegions) {

diff --git a/main/src/addins/AspNet/Razor/RazorCSharpParser.cs b/main/src/addins/AspNet/Razor/RazorCSharpParser.cs
index 1444a1a73e..f00e4f964c 100644
--- a/main/src/addins/AspNet/Razor/RazorCSharpParser.cs
+++ b/main/src/addins/AspNet/Razor/RazorCSharpParser.cs
@@ -40,10 +40,6 @@ using System.Web.Razor.Text;
 using System.Web.WebPages.Razor;
 using System.Web.WebPages.Razor.Configuration;
 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-
-using Mono.TextEditor;
 
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
@@ -53,6 +49,9 @@ using MonoDevelop.Projects;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Parser;
 using MonoDevelop.AspNet.Razor.Parser;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.AspNet.Razor
 {
@@ -63,16 +62,16 @@ namespace MonoDevelop.AspNet.Razor
 		AutoResetEvent parseComplete;
 		ChangeInfo lastChange;
 		string lastParsedFile;
-		TextDocument currentDocument;
+		MonoDevelop.Ide.Editor.ITextDocument currentDocument;
 		AspNetAppProjectFlavor aspProject;
 		DotNetProject project;
-		IList<TextDocument> openDocuments;
+		IList<MonoDevelop.Ide.Editor.ITextDocument> openDocuments;
 
-		public IList<TextDocument> OpenDocuments { get { return openDocuments; } }
+		public IList<MonoDevelop.Ide.Editor.ITextDocument> OpenDocuments { get { return openDocuments; } }
 
 		public RazorCSharpParser ()
 		{
-			openDocuments = new List<TextDocument> ();
+			openDocuments = new List<MonoDevelop.Ide.Editor.ITextDocument> ();
 
 			IdeApp.Exited += delegate {
 				//HACK: workaround for Mono's not shutting downs IsBackground threads in WaitAny calls
@@ -82,21 +81,21 @@ namespace MonoDevelop.AspNet.Razor
 			};
 		}
 
-		public override ParsedDocument Parse (bool storeAst, string fileName, System.IO.TextReader content, Project project = null)
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (MonoDevelop.Ide.TypeSystem.ParseOptions parseOptions, CancellationToken cancellationToken)
 		{
-			currentDocument = openDocuments.FirstOrDefault (d => d != null && d.FileName == fileName);
+			currentDocument = openDocuments.FirstOrDefault (d => d != null && d.FileName == parseOptions.FileName);
 			// We need document and project to be loaded to correctly initialize Razor Host.
 			this.project = project as DotNetProject;
-			if (currentDocument == null && !TryAddDocument (fileName))
-				return new RazorCSharpParsedDocument (fileName, new RazorCSharpPageInfo ());
+			if (currentDocument == null && !TryAddDocument (parseOptions.FileName))
+				return System.Threading.Tasks.Task.FromResult((ParsedDocument)new RazorCSharpParsedDocument (parseOptions.FileName, new RazorCSharpPageInfo ()));
 
 			this.aspProject = project.GetService<AspNetAppProjectFlavor> ();
 
-			EnsureParserInitializedFor (fileName);
+			EnsureParserInitializedFor (parseOptions.FileName);
 
 			var errors = new List<Error> ();
 
-			using (var source = new SeekableTextReader (content)) {
+			using (var source = new SeekableTextReader (parseOptions.Content.CreateReader ())) {
 				var textChange = CreateTextChange (source);
 				var parseResult = editorParser.CheckForStructureChanges (textChange);
 				if (parseResult == PartialParseResult.Rejected) {
@@ -107,7 +106,8 @@ namespace MonoDevelop.AspNet.Razor
 			}
 
 			ParseHtmlDocument (errors);
-			CreateCSharpParsedDocument ();
+			// TODO: Roslyn port
+			// CreateCSharpParsedDocument ();
 			ClearLastChange ();
 
 			RazorHostKind kind = RazorHostKind.WebPage;
@@ -130,7 +130,7 @@ namespace MonoDevelop.AspNet.Razor
 				HostKind = kind,
 			};
 
-			return new RazorCSharpParsedDocument (fileName, pageInfo);
+			return System.Threading.Tasks.Task.FromResult((ParsedDocument)new RazorCSharpParsedDocument (parseOptions.FileName, pageInfo));
 		}
 
 		bool TryAddDocument (string fileName)
@@ -140,19 +140,19 @@ namespace MonoDevelop.AspNet.Razor
 
 			var guiDoc = IdeApp.Workbench.GetDocument (fileName);
 			if (guiDoc != null && guiDoc.Editor != null) {
-				currentDocument = guiDoc.Editor.Document;
-				currentDocument.TextReplacing += OnTextReplacing;
+				currentDocument = guiDoc.Editor;
+				currentDocument.TextChanging += OnTextReplacing;
 				lock (this) {
-					var newDocs = new List<TextDocument> (openDocuments);
+					var newDocs = new List<MonoDevelop.Ide.Editor.ITextDocument> (openDocuments);
 					newDocs.Add (currentDocument);
 					openDocuments = newDocs;
 				}
 				guiDoc.Closed += (sender, args) =>
 				{
-					var doc = sender as Document;
-					if (doc.Editor != null && doc.Editor.Document != null) {
+					var doc = sender as MonoDevelop.Ide.Gui.Document;
+					if (doc.Editor != null && doc.Editor != null) {
 						lock (this) {
-							openDocuments = new List<TextDocument> (openDocuments.Where (d => d != doc.Editor.Document));
+							openDocuments = new List<MonoDevelop.Ide.Editor.ITextDocument> (openDocuments.Where (d => d.FileName != doc.Editor.FileName));
 						}
 					}
 
@@ -305,7 +305,7 @@ namespace MonoDevelop.AspNet.Razor
 							ClosingTag = "*@",
 							CommentType = CommentType.Block,
 						};
-						comment.Region = new DomRegion (
+						comment.Region = new MonoDevelop.Ide.Editor.DocumentRegion (
 							currentDocument.OffsetToLocation (span.Start.AbsoluteIndex - comment.OpenTag.Length),
 							currentDocument.OffsetToLocation (span.Start.AbsoluteIndex + span.Length + comment.ClosingTag.Length));
 						comments.Add (comment);
@@ -352,7 +352,7 @@ namespace MonoDevelop.AspNet.Razor
 				var endLine = currentDocument.GetLineByOffset (block.Start.AbsoluteIndex + block.Length);
 				if (beginLine != endLine)
 					foldingRegions.Add (new FoldingRegion (RazorUtils.GetShortName (block),
-						new DomRegion (currentDocument.OffsetToLocation (block.Start.AbsoluteIndex),
+						new DocumentRegion (currentDocument.OffsetToLocation (block.Start.AbsoluteIndex),
 							currentDocument.OffsetToLocation (block.Start.AbsoluteIndex + block.Length))));
 			}
 		}
@@ -367,22 +367,9 @@ namespace MonoDevelop.AspNet.Razor
 			}
 		}
 
-		ParsedDocumentDecorator parsedCodeFile;
+		SyntaxTree parsedCodeFile;
 		string csharpCode;
 
-		void CreateCSharpParsedDocument ()
-		{
-			var parser = new ICSharpCode.NRefactory.CSharp.CSharpParser ();
-			ICSharpCode.NRefactory.CSharp.SyntaxTree unit;
-			csharpCode = CreateCodeFile ();
-			using (var sr = new StringReader (csharpCode)) {
-				unit = parser.Parse (sr, "Generated.cs");
-			}
-			unit.Freeze ();
-			var parsedDoc = unit.ToTypeSystem ();
-			parsedCodeFile = new ParsedDocumentDecorator (parsedDoc) { Ast = unit };
-		}
-
 		string CreateCodeFile ()
 		{
 			var unit = capturedArgs.GeneratorResults.GeneratedCode;
@@ -401,35 +388,37 @@ namespace MonoDevelop.AspNet.Razor
 			}
 		}
 
-		// Creates compilation that includes underlying C# file for Razor view
-		ICompilation CreateCompilation ()
+// TODO Roslyn port
+//		// Creates compilation that includes underlying C# file for Razor view
+		Compilation CreateCompilation ()
 		{
-			if (project != null) {
-				return TypeSystemService.GetProjectContext (project).AddOrUpdateFiles (parsedCodeFile.ParsedFile).CreateCompilation ();
-			}
-			return new SimpleCompilation (
-				new DefaultUnresolvedAssembly (Path.ChangeExtension (parsedCodeFile.FileName, ".dll")),
-				GetDefaultAssemblies ()
-			);
+//			if (project != null) {
+//				return TypeSystemService.GetProjectContext (project).AddOrUpdateFiles (parsedCodeFile.ParsedFile).CreateCompilation ();
+//			}
+//			return new SimpleCompilation (
+//				new DefaultUnresolvedAssembly (Path.ChangeExtension (parsedCodeFile.FileName, ".dll")),
+//				GetDefaultAssemblies ()
+//			);
+			return null;
 		}
-
-		//FIXME: make this better reflect the real set of assemblies used by razor
-		static IEnumerable<IUnresolvedAssembly> GetDefaultAssemblies ()
-		{
-			var runtime = Runtime.SystemAssemblyService.DefaultRuntime;
-			var fx = Runtime.SystemAssemblyService.GetTargetFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_4_5);
-			if (!runtime.IsInstalled (fx))
-				fx = Runtime.SystemAssemblyService.GetTargetFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_4_0);
-			foreach (var assembly in new [] { "System", "System.Core", "System.Xml", "System.Web.Mvc,Version=3.0.0.0" }) {
-				var path = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyLocation (assembly, fx);
-				yield return TypeSystemService.LoadAssemblyContext (runtime, fx, path);
-			}
-		}
-
-		void OnTextReplacing (object sender, DocumentChangeEventArgs e)
+//
+//		//FIXME: make this better reflect the real set of assemblies used by razor
+//		static IEnumerable<IUnresolvedAssembly> GetDefaultAssemblies ()
+//		{
+//			var runtime = Runtime.SystemAssemblyService.DefaultRuntime;
+//			var fx = Runtime.SystemAssemblyService.GetTargetFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_4_5);
+//			if (!runtime.IsInstalled (fx))
+//				fx = Runtime.SystemAssemblyService.GetTargetFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_4_0);
+//			foreach (var assembly in new [] { "System", "System.Core", "System.Xml", "System.Web.Mvc,Version=3.0.0.0" }) {
+//				var path = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyLocation (assembly, fx);
+//				yield return TypeSystemService.LoadAssemblyContext (runtime, fx, path);
+//			}
+//		}
+
+		void OnTextReplacing (object sender, MonoDevelop.Core.Text.TextChangeEventArgs e)
 		{
 			if (lastChange == null)
-				lastChange = new ChangeInfo (e.Offset, new SeekableTextReader((sender as TextDocument).Text));
+				lastChange = new ChangeInfo (e.Offset, new SeekableTextReader((sender as MonoDevelop.Ide.Editor.ITextDocument).Text));
 			if (e.ChangeDelta > 0) {
 				lastChange.Length += e.InsertionLength;
 			} else {
diff --git a/main/src/addins/AspNet/Razor/RazorPageInfo.cs b/main/src/addins/AspNet/Razor/RazorPageInfo.cs
index 53f1c80d2e..d1a0927d4f 100644
--- a/main/src/addins/AspNet/Razor/RazorPageInfo.cs
+++ b/main/src/addins/AspNet/Razor/RazorPageInfo.cs
@@ -27,9 +27,9 @@
 using System.Collections.Generic;

 using System.Web.Razor;

 using System.Web.Razor.Parser.SyntaxTree;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Ide.TypeSystem;

 using MonoDevelop.Xml.Dom;

+using Microsoft.CodeAnalysis;

 

 namespace MonoDevelop.AspNet.Razor

 {

@@ -54,8 +54,8 @@ namespace MonoDevelop.AspNet.Razor
 

 	public class RazorCSharpPageInfo : RazorPageInfo

 	{

-		public ParsedDocumentDecorator CSharpParsedFile { get; set; }

-		public ICompilation Compilation { get; set; }

+		public SyntaxTree CSharpParsedFile { get; set; }

+		public Compilation Compilation { get; set; }

 		public string CSharpCode { get; set; }

 	}

 

diff --git a/main/src/addins/AspNet/Razor/RazorSyntaxMode.cs b/main/src/addins/AspNet/Razor/RazorSyntaxMode.cs
index 1a07191a9e..8c0cb7e854 100644
--- a/main/src/addins/AspNet/Razor/RazorSyntaxMode.cs
+++ b/main/src/addins/AspNet/Razor/RazorSyntaxMode.cs
@@ -40,12 +40,13 @@ using MonoDevelop.AspNet.Razor.Parser;
 using MonoDevelop.Ide;
 using RazorSpan = System.Web.Razor.Parser.SyntaxTree.Span;
 using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AspNet.Razor
 {
 	public class RazorSyntaxMode : SyntaxMode, IDisposable
 	{
-		public RazorSyntaxMode (Document doc)
+		public RazorSyntaxMode (DocumentContext doc)
 		{
 			this.guiDocument = doc;
 			guiDocument.DocumentParsed += HandleDocumentParsed; 
@@ -80,7 +81,7 @@ namespace MonoDevelop.AspNet.Razor
 		IList<RazorSpan> currentSpans;
 		State currentState;
 		IList<Chunk> chunks;
-		Document guiDocument;
+		DocumentContext guiDocument;
 
 		public override IEnumerable<Chunk> GetChunks (ColorScheme style, DocumentLine line, int offset, int length)
 		{
diff --git a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj
index cdde498cdf..ab4a23ff4f 100644
--- a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj
+++ b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj
@@ -55,6 +55,7 @@
     <Compile Include="Razor\RazorCompletionTests.cs" />
     <Compile Include="Html\HtmlParsingTests.cs" />
     <Compile Include="Html\HtmlImplicitClosingTests.cs" />
+    <Compile Include="Razor\Dom\RazorDocumentTrackerTests.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/main/src/addins/AspNet/Tests/Razor/Dom/RazorDocumentTrackerTests.cs b/main/src/addins/AspNet/Tests/Razor/Dom/RazorDocumentTrackerTests.cs
new file mode 100644
index 0000000000..f16fe1deb1
--- /dev/null
+++ b/main/src/addins/AspNet/Tests/Razor/Dom/RazorDocumentTrackerTests.cs
@@ -0,0 +1,79 @@
+//
+// RazorDocumentTrackerTests.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.AspNet.Razor.Dom;
+using MonoDevelop.AspNet.Razor.Parser;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Xml.Parser;
+using NUnit.Framework;
+using UnitTests;
+
+namespace MonoDevelop.AspNet.Tests.Razor.Dom
+{
+	[TestFixture]
+	public class RazorDocumentTrackerTests : TestBase
+	{
+		Func<ITextDocument> originalGetActiveDocument;
+		TextEditor editor;
+
+		[SetUp]
+		public void SetUp ()
+		{
+			originalGetActiveDocument = RazorWorkbenchService.GetActiveDocument;
+			editor = TextEditorFactory.CreateNewEditor ();
+			editor.MimeType = "text/x-cshtml";
+			RazorWorkbenchService.GetActiveDocument = () => {
+				return editor;
+			};
+		}
+
+		[TearDown]
+		public override void TearDown ()
+		{
+			RazorWorkbenchService.GetActiveDocument = originalGetActiveDocument;
+			base.TearDown ();
+		}
+
+		[Test]
+		public void StateShouldBeRazorRootStateAfterCodeBlock ()
+		{
+			editor.Text = 
+@"@{
+}
+
+";
+			var parser = new XmlParser (new RazorRootState (), false);
+			var tracker = new DocumentStateTracker<XmlParser> (parser, editor);
+			editor.CaretLine = 3;
+			tracker.UpdateEngine ();
+
+			Assert.IsInstanceOf<RazorRootState> (tracker.Engine.CurrentState);
+		}
+	}
+}
+
diff --git a/main/src/addins/AspNet/Tests/Razor/RazorCompletionTesting.cs b/main/src/addins/AspNet/Tests/Razor/RazorCompletionTesting.cs
index d35f5f9ca5..77740421c0 100644
--- a/main/src/addins/AspNet/Tests/Razor/RazorCompletionTesting.cs
+++ b/main/src/addins/AspNet/Tests/Razor/RazorCompletionTesting.cs
@@ -41,95 +41,96 @@ namespace MonoDevelop.AspNet.Tests.Razor
 	//largely copied from MonoDevelop.AspNet.Tests.AspNetTesting

 

 	static class RazorCompletionTesting

-	{

-		static readonly string extension = ".cshtml";

-

-		public static CompletionDataList CreateRazorCtrlSpaceProvider (string text, bool isInCSharpContext)

-		{

-			return CreateProvider (text, isInCSharpContext, true);

-		}

-

-		public static CompletionDataList CreateProvider (string text, bool isInCSharpContext = false, bool isCtrlSpace = false)

-		{

-			string editorText;

-			TestViewContent sev;

-

-			var textEditorCompletion = CreateEditor (text, isInCSharpContext, out editorText, out sev);

-			int cursorPosition = text.IndexOf ('$');

-

-			int triggerWordLength = 1;

-			var ctx = textEditorCompletion.GetCodeCompletionContext (isInCSharpContext, sev);

-

-			if (isCtrlSpace)

-				return textEditorCompletion.CodeCompletionCommand (ctx) as CompletionDataList;

-			else

-				return textEditorCompletion.HandleCodeCompletion (ctx, editorText[cursorPosition - 1], ref triggerWordLength) as CompletionDataList;

-		}

-

-		public static IParameterDataProvider CreateProvider (string text)

-		{

-			string editorText;

-			TestViewContent sev;

-

-			var textEditorCompletion = CreateEditor (text, true, out editorText, out sev);

-			int cursorPosition = text.IndexOf ('$');

-

-			var ctx = textEditorCompletion.GetCodeCompletionContext (true, sev);

-			return textEditorCompletion.HandleParameterCompletion (ctx, editorText[cursorPosition - 1]);

-		}

-

-		static RazorTestingEditorExtension CreateEditor (string text, bool isInCSharpContext, out string editorText,

-			out TestViewContent sev)

-		{

-			string parsedText;

-			int cursorPosition = text.IndexOf ('$');

-			int endPos = text.IndexOf ('$', cursorPosition + 1);

-			if (endPos == -1)

-				parsedText = editorText = text.Substring (0, cursorPosition) + text.Substring (cursorPosition + 1);

-			else {

-				parsedText = text.Substring (0, cursorPosition) + new string (' ', endPos - cursorPosition) + text.Substring (endPos + 1);

-				editorText = text.Substring (0, cursorPosition) + text.Substring (cursorPosition + 1, endPos - cursorPosition - 1) + text.Substring (endPos + 1);

-				cursorPosition = endPos - 1;

-			}

-

-			var project = Services.ProjectService.CreateDotNetProject ("C#");

-

-			project.FileName = UnitTests.TestBase.GetTempFile (".csproj");

-			string file = UnitTests.TestBase.GetTempFile (extension);

-			project.AddFile (file);

-

-			var pcw = TypeSystemService.LoadProject (project);

-			TypeSystemService.ForceUpdate (pcw);

-			pcw.ReconnectAssemblyReferences ();

-

-			sev = new TestViewContent ();

-			sev.Project = project;

-			sev.ContentName = file;

-			sev.Text = editorText;

-			sev.CursorPosition = cursorPosition;

-

-			var tww = new TestWorkbenchWindow ();

-			tww.ViewContent = sev;

-

-			var doc = new Document (tww);

-			var parser = new RazorTestingParser {

-				Doc = doc

-			};

-			var parsedDoc = parser.Parse (false, sev.ContentName, new StringReader (parsedText), project);

-

-			return new RazorTestingEditorExtension (doc, parsedDoc as RazorCSharpParsedDocument, isInCSharpContext);

-		}

+	{
+// TODO: Roslyn port

+//		static readonly string extension = ".cshtml";

+//

+//		public static CompletionDataList CreateRazorCtrlSpaceProvider (string text, bool isInCSharpContext)

+//		{

+//			return CreateProvider (text, isInCSharpContext, true);

+//		}

+//

+//		public static CompletionDataList CreateProvider (string text, bool isInCSharpContext = false, bool isCtrlSpace = false)

+//		{

+//			string editorText;

+//			TestViewContent sev;

+//

+//			var textEditorCompletion = CreateEditor (text, isInCSharpContext, out editorText, out sev);

+//			int cursorPosition = text.IndexOf ('$');

+//

+//			int triggerWordLength = 1;

+//			var ctx = textEditorCompletion.GetCodeCompletionContext (isInCSharpContext, sev);

+//

+//			if (isCtrlSpace)

+//				return textEditorCompletion.CodeCompletionCommand (ctx) as CompletionDataList;

+//			else

+//				return textEditorCompletion.HandleCodeCompletionAsync (ctx, editorText[cursorPosition - 1], ref triggerWordLength) as CompletionDataList;

+//		}

+//

+//		public static ParameterHintingResult CreateProvider (string text)

+//		{

+//			string editorText;

+//			TestViewContent sev;

+//

+//			var textEditorCompletion = CreateEditor (text, true, out editorText, out sev);

+//			int cursorPosition = text.IndexOf ('$');

+//

+//			var ctx = textEditorCompletion.GetCodeCompletionContext (true, sev);

+//			return textEditorCompletion.HandleParameterCompletionAsync (ctx, editorText[cursorPosition - 1]);

+//		}

+//

+//		static RazorTestingEditorExtension CreateEditor (string text, bool isInCSharpContext, out string editorText,

+//			out TestViewContent sev)

+//		{

+//			string parsedText;

+//			int cursorPosition = text.IndexOf ('$');

+//			int endPos = text.IndexOf ('$', cursorPosition + 1);

+//			if (endPos == -1)

+//				parsedText = editorText = text.Substring (0, cursorPosition) + text.Substring (cursorPosition + 1);

+//			else {

+//				parsedText = text.Substring (0, cursorPosition) + new string (' ', endPos - cursorPosition) + text.Substring (endPos + 1);

+//				editorText = text.Substring (0, cursorPosition) + text.Substring (cursorPosition + 1, endPos - cursorPosition - 1) + text.Substring (endPos + 1);

+//				cursorPosition = endPos - 1;

+//			}

+//

+//			var project = new AspNetAppProject ("C#");

+//

+//			project.FileName = UnitTests.TestBase.GetTempFile (".csproj");

+//			string file = UnitTests.TestBase.GetTempFile (extension);

+//			project.AddFile (file);

+//

+//			var pcw = TypeSystemService.LoadProject (project);

+//			TypeSystemService.ForceUpdate (pcw);

+//			pcw.ReconnectAssemblyReferences ();

+//

+//			sev = new TestViewContent ();

+//			sev.Project = project;

+//			sev.ContentName = file;

+//			sev.Text = editorText;

+//			sev.CursorPosition = cursorPosition;

+//

+//			var tww = new TestWorkbenchWindow ();

+//			tww.ViewContent = sev;

+//

+//			var doc = new Document (tww);

+//			var parser = new RazorTestingParser {

+//				Doc = doc

+//			};

+//			var parsedDoc = parser.Parse (false, sev.ContentName, new StringReader (parsedText), project);

+//

+//			return new RazorTestingEditorExtension (doc, parsedDoc as RazorCSharpParsedDocument, isInCSharpContext);

+//		}

 	}

 

 	public class RazorTestingParser : RazorCSharpParser

 	{

 		public Document	Doc { get; set; }

 

-		public override ParsedDocument Parse (bool storeAst, string fileName, System.IO.TextReader content, Project project = null)

+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions parseOptions, System.Threading.CancellationToken cancellationToken)

 		{

-			Doc.Editor.Document.FileName = fileName;

-			OpenDocuments.Add (Doc.Editor.Document);

-			return base.Parse (storeAst, fileName, content, project);

+			Doc.Editor.FileName = parseOptions.FileName;

+			OpenDocuments.Add (Doc.Editor);

+			return base.Parse (parseOptions, cancellationToken);

 		}

 	}

 

@@ -138,7 +139,7 @@ namespace MonoDevelop.AspNet.Tests.Razor
 		public RazorTestingEditorExtension (Document doc, RazorCSharpParsedDocument parsedDoc, bool cSharpContext)

 		{

 			razorDocument = parsedDoc;

-			Initialize (doc);

+			Initialize (doc.Editor, doc);

 			if (cSharpContext) {

 				InitializeCodeCompletion ();

 				SwitchToHidden ();

@@ -151,7 +152,7 @@ namespace MonoDevelop.AspNet.Tests.Razor
 			if (!cSharpContext)

 				ctx.TriggerOffset = sev.CursorPosition;

 			else

-				ctx.TriggerOffset = hiddenInfo.UnderlyingDocument.Editor.Caret.Offset;

+				ctx.TriggerOffset = hiddenInfo.UnderlyingDocument.Editor.CaretOffset;

 

 			int line, column;

 			sev.GetLineColumnFromPosition (ctx.TriggerOffset, out line, out column);

diff --git a/main/src/addins/AspNet/Tests/Razor/RazorCompletionTests.cs b/main/src/addins/AspNet/Tests/Razor/RazorCompletionTests.cs
index 98b36239c4..d32f818422 100644
--- a/main/src/addins/AspNet/Tests/Razor/RazorCompletionTests.cs
+++ b/main/src/addins/AspNet/Tests/Razor/RazorCompletionTests.cs
@@ -33,86 +33,88 @@ namespace MonoDevelop.AspNet.Tests.Razor
 	[TestFixture]
 	class RazorCompletionTests : TestBase
 	{
-		[Test]
-		public void HtmlTagsCompletion ()
-		{
-			var provider = RazorCompletionTesting.CreateProvider ("<$", false);
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("p"));
-			Assert.IsNotNull (provider.Find ("div"));
-		}
+		// TODO: Roslyn port
 
-		[Test]
-		public void NestedHtmlTagsCompletion ()
-		{
-			var provider = RazorCompletionTesting.CreateProvider ("<div><ul><$ </ul></div>", false);
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("li"));
-		}
-
-		[Test]
-		public void RazorDirectivesAndStatementsCompletion ()
-		{
-			var provider = RazorCompletionTesting.CreateProvider ("@m$", true);
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("model"));
-			Assert.IsNotNull (provider.Find ("sessionstate"));
-			Assert.IsNotNull (provider.Find ("using"));
-			Assert.IsNotNull (provider.Find ("layout"));
-			Assert.IsNotNull (provider.Find ("section"));
-			Assert.IsNotNull (provider.Find ("functions"));
-			Assert.IsNotNull (provider.Find ("helper"));
-			Assert.IsNotNull (provider.Find ("inherits"));
-			Assert.IsNotNull (provider.Find ("for"));
-			Assert.IsNotNull (provider.Find ("foreach"));
-			Assert.IsNotNull (provider.Find ("while"));
-			Assert.IsNotNull (provider.Find ("do"));
-			Assert.IsNotNull (provider.Find ("lock"));
-			Assert.IsNotNull (provider.Find ("switch"));
-			Assert.IsNotNull (provider.Find ("if"));
-			Assert.IsNotNull (provider.Find ("try"));
-		}
-
-		[Test]
-		public void CSharpIdentifiersCompletion ()
-		{
-			var provider = RazorCompletionTesting.CreateProvider ("@{ i$ }", true);
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("int"));
-			Assert.IsNotNull (provider.Find ("var"));
-		}
-
-		[Test]
-		public void CSharpIdentifiersCtrlSpaceCompletion ()
-		{
-			var provider = RazorCompletionTesting.CreateRazorCtrlSpaceProvider ("@{ $ }", true);
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("int"));
-			Assert.IsNotNull (provider.Find ("var"));
-		}
-
-		[Test]
-		public void CSharpMembersCompletion ()
-		{
-			var provider = RazorCompletionTesting.CreateProvider ("@{ Char.$ }", true);
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("IsLetter"));
-		}
-
-		[Test]
-		public void CSharpMembersCtrlSpaceCompletion ()
-		{
-			var provider = RazorCompletionTesting.CreateRazorCtrlSpaceProvider ("@{ Char.Is$ }", true);
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("IsLetter"));
-		}
-
-		[Test]
-		public void CSharpParametersCompletion ()
-		{
-			var provider = RazorCompletionTesting.CreateProvider ("@{ Char.IsLetter($ }");
-			Assert.IsNotNull (provider);
-			Assert.AreEqual (2, provider.Count);
-		}
+//		[Test]
+//		public void HtmlTagsCompletion ()
+//		{
+//			var provider = RazorCompletionTesting.CreateProvider ("<$", false);
+//			Assert.IsNotNull (provider);
+//			Assert.IsNotNull (provider.Find ("p"));
+//			Assert.IsNotNull (provider.Find ("div"));
+//		}
+//
+//		[Test]
+//		public void NestedHtmlTagsCompletion ()
+//		{
+//			var provider = RazorCompletionTesting.CreateProvider ("<div><ul><$ </ul></div>", false);
+//			Assert.IsNotNull (provider);
+//			Assert.IsNotNull (provider.Find ("li"));
+//		}
+//
+//		[Test]
+//		public void RazorDirectivesAndStatementsCompletion ()
+//		{
+//			var provider = RazorCompletionTesting.CreateProvider ("@m$", true);
+//			Assert.IsNotNull (provider);
+//			Assert.IsNotNull (provider.Find ("model"));
+//			Assert.IsNotNull (provider.Find ("sessionstate"));
+//			Assert.IsNotNull (provider.Find ("using"));
+//			Assert.IsNotNull (provider.Find ("layout"));
+//			Assert.IsNotNull (provider.Find ("section"));
+//			Assert.IsNotNull (provider.Find ("functions"));
+//			Assert.IsNotNull (provider.Find ("helper"));
+//			Assert.IsNotNull (provider.Find ("inherits"));
+//			Assert.IsNotNull (provider.Find ("for"));
+//			Assert.IsNotNull (provider.Find ("foreach"));
+//			Assert.IsNotNull (provider.Find ("while"));
+//			Assert.IsNotNull (provider.Find ("do"));
+//			Assert.IsNotNull (provider.Find ("lock"));
+//			Assert.IsNotNull (provider.Find ("switch"));
+//			Assert.IsNotNull (provider.Find ("if"));
+//			Assert.IsNotNull (provider.Find ("try"));
+//		}
+//
+//		[Test]
+//		public void CSharpIdentifiersCompletion ()
+//		{
+//			var provider = RazorCompletionTesting.CreateProvider ("@{ i$ }", true);
+//			Assert.IsNotNull (provider);
+//			Assert.IsNotNull (provider.Find ("int"));
+//			Assert.IsNotNull (provider.Find ("var"));
+//		}
+//
+//		[Test]
+//		public void CSharpIdentifiersCtrlSpaceCompletion ()
+//		{
+//			var provider = RazorCompletionTesting.CreateRazorCtrlSpaceProvider ("@{ $ }", true);
+//			Assert.IsNotNull (provider);
+//			Assert.IsNotNull (provider.Find ("int"));
+//			Assert.IsNotNull (provider.Find ("var"));
+//		}
+//
+//		[Test]
+//		public void CSharpMembersCompletion ()
+//		{
+//			var provider = RazorCompletionTesting.CreateProvider ("@{ Char.$ }", true);
+//			Assert.IsNotNull (provider);
+//			Assert.IsNotNull (provider.Find ("IsLetter"));
+//		}
+//
+//		[Test]
+//		public void CSharpMembersCtrlSpaceCompletion ()
+//		{
+//			var provider = RazorCompletionTesting.CreateRazorCtrlSpaceProvider ("@{ Char.Is$ }", true);
+//			Assert.IsNotNull (provider);
+//			Assert.IsNotNull (provider.Find ("IsLetter"));
+//		}
+//
+//		[Test]
+//		public void CSharpParametersCompletion ()
+//		{
+//			var provider = RazorCompletionTesting.CreateProvider ("@{ Char.IsLetter($ }");
+//			Assert.IsNotNull (provider);
+//			Assert.AreEqual (2, provider.Count);
+//		}
 	}
 }
diff --git a/main/src/addins/AspNet/Tests/WebForms/WebFormsTesting.cs b/main/src/addins/AspNet/Tests/WebForms/WebFormsTesting.cs
index 74f486803c..393106bfbe 100644
--- a/main/src/addins/AspNet/Tests/WebForms/WebFormsTesting.cs
+++ b/main/src/addins/AspNet/Tests/WebForms/WebFormsTesting.cs
@@ -25,8 +25,10 @@
 // THE SOFTWARE.
 
 using System.IO;
+using System.Threading;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms;
+using MonoDevelop.Core.Text;
 using MonoDevelop.CSharpBinding;
 using MonoDevelop.CSharpBinding.Tests;
 using MonoDevelop.Ide.CodeCompletion;
@@ -47,13 +49,17 @@ namespace MonoDevelop.AspNet.Tests.WebForms
 			var textEditorCompletion = CreateEditor (text, extension, out editorText, out sev);
 			int cursorPosition = text.IndexOf ('$');
 
-			int triggerWordLength = 1;
 			var ctx = textEditorCompletion.GetCodeCompletionContext (sev);
 
 			if (isCtrlSpace)
 				return textEditorCompletion.CodeCompletionCommand (ctx) as CompletionDataList;
-			else
-				return textEditorCompletion.HandleCodeCompletion (ctx, editorText[cursorPosition - 1], ref triggerWordLength) as CompletionDataList;
+			else {
+				var task = textEditorCompletion.HandleCodeCompletionAsync (ctx, editorText [cursorPosition - 1]);
+				if (task != null) {
+					return task.Result as CompletionDataList;
+				}
+				return null;
+			}
 		}
 
 		static WebFormsTestingEditorExtension CreateEditor (string text, string extension, out string editorText, out TestViewContent sev)
@@ -76,10 +82,6 @@ namespace MonoDevelop.AspNet.Tests.WebForms
 			string file = UnitTests.TestBase.GetTempFile (extension);
 			project.AddFile (file);
 
-			var pcw = TypeSystemService.LoadProject (project);
-			TypeSystemService.ForceUpdate (pcw);
-			pcw.ReconnectAssemblyReferences ();
-
 			sev = new TestViewContent ();
 			sev.Project = project;
 			sev.ContentName = file;
@@ -90,9 +92,14 @@ namespace MonoDevelop.AspNet.Tests.WebForms
 			tww.ViewContent = sev;
 
 			var doc = new TestDocument (tww);
-			doc.Editor.Document.FileName = sev.ContentName;
+			doc.Editor.FileName = sev.ContentName;
 			var parser = new WebFormsParser ();
-			var parsedDoc = (WebFormsParsedDocument) parser.Parse (false, sev.ContentName, new StringReader (parsedText), project);
+			var options = new ParseOptions {
+				Project = project,
+				FileName = sev.ContentName,
+				Content = new StringTextSource (parsedText)
+			};
+			var parsedDoc = (WebFormsParsedDocument)parser.Parse (options, default(CancellationToken)).Result;
 			doc.HiddenParsedDocument = parsedDoc;
 
 			return new WebFormsTestingEditorExtension (doc);
@@ -102,7 +109,7 @@ namespace MonoDevelop.AspNet.Tests.WebForms
 		{
 			public WebFormsTestingEditorExtension (Document doc)
 			{
-				Initialize (doc);
+				Initialize (doc.Editor, doc);
 			}
 
 			public CodeCompletionContext GetCodeCompletionContext (TestViewContent sev)
diff --git a/main/src/addins/AspNet/WebForms/CSharp/CSharpProjector.cs b/main/src/addins/AspNet/WebForms/CSharp/CSharpProjector.cs
new file mode 100644
index 0000000000..3bf093be49
--- /dev/null
+++ b/main/src/addins/AspNet/WebForms/CSharp/CSharpProjector.cs
@@ -0,0 +1,109 @@
+//
+// CSharpProjector.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Text;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.AspNet.WebForms.Dom;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor.Projection;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.AspNet.WebForms.CSharp
+{
+	public class CSharpProjector
+	{
+		public Task<Projection> CreateProjection (DocumentInfo info, IReadonlyTextDocument data, bool buildExpressions)
+		{
+			if (info == null)
+				throw new ArgumentNullException ("info");
+			if (data == null)
+				throw new ArgumentNullException ("data");
+			var document = new StringBuilder ();
+
+			WriteUsings (info.Imports, document);
+			var segBuilder = System.Collections.Immutable.ImmutableList<ProjectedSegment>.Empty.ToBuilder ();
+
+			foreach (var node in info.XScriptBlocks) {
+				var start = data.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
+				var end = data.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
+
+				segBuilder.Add (new ProjectedSegment (start, document.Length, end - start));
+
+				document.AppendLine (data.GetTextBetween (start, end));
+			}
+			if (buildExpressions) {
+				WriteClassDeclaration (info, document);
+				document.AppendLine ("{");
+				document.AppendLine ("void Generated ()");
+				document.AppendLine ("{");
+				//Console.WriteLine ("start:" + location.BeginLine  +"/" +location.BeginColumn);
+
+				foreach (var node in info.XExpressions) {
+					bool isBlock = node is WebFormsRenderBlock;
+
+					var start = data.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
+					var end = data.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
+
+					if (!isBlock) {
+						document.Append ("WriteLine (");
+						start += 1;
+					}
+
+					string expr = data.GetTextBetween (start, end);
+					segBuilder.Add (new ProjectedSegment (start, document.Length, expr.Length));
+					document.Append (expr);
+					if (!isBlock)
+						document.Append (");");
+				}
+				document.AppendLine ("}");
+				document.AppendLine ("}");
+			}
+			return Task.FromResult(new Projection (
+				TextEditorFactory.CreateNewDocument (new StringTextSource (document.ToString ()), info.AspNetDocument.FileName + ".g.cs", "text/x-csharp"),
+				segBuilder.ToImmutable ()
+			));
+		}
+
+		static void WriteUsings (IEnumerable<string> usings, StringBuilder builder)
+		{
+			foreach (var u in usings) {
+				builder.Append ("using ");
+				builder.Append (u);
+				builder.AppendLine (";");
+			}
+		}
+
+		static void WriteClassDeclaration (DocumentInfo info, StringBuilder builder)
+		{
+			builder.Append ("partial class ");
+			builder.Append (info.ClassName);
+			builder.Append (" : ");
+			builder.AppendLine (info.BaseType);
+		}
+	}
+}
+
diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsBindingExpression.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsBindingExpression.cs
index 37c5893f40..c9b2a02fa7 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsBindingExpression.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsBindingExpression.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
 	public class WebFormsBindingExpression : WebFormsExpression

 	{
-		public WebFormsBindingExpression (DomRegion region) : base (region)

+		public WebFormsBindingExpression (DocumentRegion region) : base (region)

 		{

 		}
 

-		public WebFormsBindingExpression (TextLocation start) : base (start)

+		public WebFormsBindingExpression (DocumentLocation start) : base (start)

 		{

 		}
 

diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsDirective.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsDirective.cs
index 744e6480e6..e17e59e022 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsDirective.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsDirective.cs
@@ -26,8 +26,8 @@
 
 using System.Diagnostics;
 using System.Text;
-using ICSharpCode.NRefactory;
-using MonoDevelop.Xml.Dom;
+using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
@@ -36,12 +36,12 @@ namespace MonoDevelop.AspNet.WebForms.Dom
 		XName name;
 		XAttributeCollection attributes;
 
-		public WebFormsDirective (TextLocation start) : base (start)

+		public WebFormsDirective (DocumentLocation start) : base (start)

 		{
 			attributes = new XAttributeCollection (this);
 		}
 
-		public WebFormsDirective (TextLocation start, XName name) : this (start)

+		public WebFormsDirective (DocumentLocation start, XName name) : this (start)

 		{
 			this.name = name;
 		}
diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsExpression.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsExpression.cs
index c67eff4f37..8013a9fe45 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsExpression.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsExpression.cs
@@ -25,19 +25,18 @@
 // THE SOFTWARE.

 
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
 	public abstract class WebFormsExpression : XNode

 	{
-		protected WebFormsExpression (DomRegion region) : base (region)

+		protected WebFormsExpression (DocumentRegion region) : base (region)

 		{

 		}
 

-		protected WebFormsExpression (TextLocation start) : base (start)

+		protected WebFormsExpression (DocumentLocation start) : base (start)

 		{

 		}
 

diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsHtmlEncodedExpression.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsHtmlEncodedExpression.cs
index f83c02287c..4d82c64543 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsHtmlEncodedExpression.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsHtmlEncodedExpression.cs
@@ -24,20 +24,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
 	
 	public class WebFormsHtmlEncodedExpression : WebFormsExpression

 	{
-		public WebFormsHtmlEncodedExpression (DomRegion region) : base (region)

+		public WebFormsHtmlEncodedExpression (DocumentRegion region) : base (region)

 		{

 		}
 

-		public WebFormsHtmlEncodedExpression (TextLocation start) : base (start)

+		public WebFormsHtmlEncodedExpression (DocumentLocation start) : base (start)

 		{

 		}
 

diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderBlock.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderBlock.cs
index 3c715302b6..adb357e1b3 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderBlock.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderBlock.cs
@@ -26,19 +26,18 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AspNet.WebForms.Dom
 {
 	public class WebFormsRenderBlock : XNode
 	{
-		public WebFormsRenderBlock (DomRegion region) : base (region)
+		public WebFormsRenderBlock (DocumentRegion region) : base (region)
 		{
 		}
 
-		public WebFormsRenderBlock (TextLocation start) : base (start)
+		public WebFormsRenderBlock (DocumentLocation start) : base (start)
 		{
 		}
 
diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderExpression.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderExpression.cs
index 479ec8ba31..d881836fc0 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderExpression.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderExpression.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
 	public class WebFormsRenderExpression : WebFormsExpression

 	{
-		public WebFormsRenderExpression (DomRegion region) : base (region)

+		public WebFormsRenderExpression (DocumentRegion region) : base (region)

 		{

 		}
 

-		public WebFormsRenderExpression (TextLocation start) : base (start)

+		public WebFormsRenderExpression (DocumentLocation start) : base (start)

 		{

 		}
 

diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsResourceExpression.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsResourceExpression.cs
index 26038b655c..4ffe73e8ed 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsResourceExpression.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsResourceExpression.cs
@@ -24,20 +24,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Parser;

 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
 	public class WebFormsResourceExpression : WebFormsExpression

 	{
-		public WebFormsResourceExpression (DomRegion region) : base (region)

+		public WebFormsResourceExpression (DocumentRegion region) : base (region)

 		{

 		}
 

-		public WebFormsResourceExpression (TextLocation start) : base (start)

+		public WebFormsResourceExpression (DocumentLocation start) : base (start)

 		{

 		}
 

diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsServerComment.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsServerComment.cs
index 675a854916..a35a720a36 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsServerComment.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsServerComment.cs
@@ -25,19 +25,18 @@
 // THE SOFTWARE.

 
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom
 {
 	public class WebFormsServerComment : XNode
 	{
-		public WebFormsServerComment (DomRegion region) : base (region)

+		public WebFormsServerComment (DocumentRegion region) : base (region)

 		{

 		}

 
-		public WebFormsServerComment (TextLocation start) : base (start)

+		public WebFormsServerComment (DocumentLocation start) : base (start)

 		{

 		}

 
diff --git a/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs b/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs
index bd559c56d5..fbb09a4638 100644
--- a/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs
+++ b/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs
@@ -26,13 +26,15 @@
 
 using System;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
 using Mono.TextEditor;
 using MonoDevelop.Ide.CodeCompletion;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Dom;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -86,20 +88,18 @@ namespace MonoDevelop.AspNet.WebForms
 	/// </summary>
 	public class DocumentInfo
 	{
-		public DocumentInfo (ICompilation dom, WebFormsParsedDocument aspNetParsedDocument, IEnumerable<string> imports)
+		public DocumentInfo (WebFormsParsedDocument aspNetParsedDocument, IEnumerable<string> imports)
 		{
-			this.Dom = dom;
 			this.AspNetDocument = aspNetParsedDocument;
 			this.Imports = imports;
 			BuildExpressionAndScriptsLists ();
 		}
 		
-		public ICompilation Dom { get; private set; }
 		public WebFormsParsedDocument AspNetDocument { get; private set; }
 		public ParsedDocument ParsedDocument { get; set; }
 		public IEnumerable<string> Imports { get; private set; }
 		
-		public IUnresolvedTypeDefinition CodeBesideClass { get; set; }
+		public INamedTypeSymbol CodeBesideClass { get; set; }
 		
 		public string BaseType {
 			get {
@@ -163,16 +163,16 @@ namespace MonoDevelop.AspNet.WebForms
 	{
 		bool SupportsLanguage (string language);
 		
-		ParsedDocument BuildDocument (DocumentInfo info, TextEditorData textEditorData);
+		ParsedDocument BuildDocument (DocumentInfo info, MonoDevelop.Ide.Editor.TextEditor textEditorData);
 		
-		ICompletionWidget CreateCompletionWidget (MonoDevelop.Ide.Gui.Document realDocument, LocalDocumentInfo localInfo);
-		
-		LocalDocumentInfo BuildLocalDocument (DocumentInfo info, TextEditorData textEditorData, string expressionText, string textAfterCaret, bool isExpression);
-		
-		ICompletionDataList HandlePopupCompletion (MonoDevelop.Ide.Gui.Document realDocument, DocumentInfo info, LocalDocumentInfo localInfo);
-		ICompletionDataList HandleCompletion (MonoDevelop.Ide.Gui.Document realDocument, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char currentChar, ref int triggerWordLength);
-		ParameterDataProvider HandleParameterCompletion (MonoDevelop.Ide.Gui.Document realDocument, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char completionChar);
-		bool GetParameterCompletionCommandOffset (MonoDevelop.Ide.Gui.Document realDocument, DocumentInfo info, LocalDocumentInfo localInfo, out int cpos);
+//		ICompletionWidget CreateCompletionWidget (MonoDevelop.Ide.Editor.TextEditor realEditor, DocumentContext realContext, LocalDocumentInfo localInfo);
+//		
+//		LocalDocumentInfo BuildLocalDocument (DocumentInfo info, MonoDevelop.Ide.Editor.TextEditor textEditorData, string expressionText, string textAfterCaret, bool isExpression);
+//		
+//		ICompletionDataList HandlePopupCompletion (MonoDevelop.Ide.Editor.TextEditor realEditor, DocumentContext realContext, DocumentInfo info, LocalDocumentInfo localInfo);
+//		ICompletionDataList HandleCompletion (MonoDevelop.Ide.Editor.TextEditor realEditor, DocumentContext realContext, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char currentChar, ref int triggerWordLength);
+//		ParameterHintingResult HandleParameterCompletion (MonoDevelop.Ide.Editor.TextEditor realEditor, DocumentContext realContext, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char completionChar);
+//		bool GetParameterCompletionCommandOffset (MonoDevelop.Ide.Editor.TextEditor realEditor, DocumentContext realContext, DocumentInfo info, LocalDocumentInfo localInfo, out int cpos);
 	}
 	
 	public static class LanguageCompletionBuilderService
diff --git a/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs b/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
index ab813176a2..bfddc3f43c 100644
--- a/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
+++ b/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
@@ -68,7 +68,7 @@ namespace MonoDevelop.AspNet.WebForms
 			tags ["AspNetMaster"] = aspProj.LocalToVirtualPath (masterPage);
 			
 			try {
-				var pd = TypeSystemService.ParseFile (project, masterPage.FilePath)
+				var pd = TypeSystemService.ParseFile (project, masterPage.FilePath).Result
 						as WebFormsParsedDocument;
 				if (pd == null)
 					return;
diff --git a/main/src/addins/AspNet/WebForms/SuggestedHandlerCompletionData.cs b/main/src/addins/AspNet/WebForms/SuggestedHandlerCompletionData.cs
index 1e7d7dca23..9c779f2a55 100644
--- a/main/src/addins/AspNet/WebForms/SuggestedHandlerCompletionData.cs
+++ b/main/src/addins/AspNet/WebForms/SuggestedHandlerCompletionData.cs
@@ -32,24 +32,25 @@ using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.DesignerSupport;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AspNet.WebForms
 {
 	class SuggestedHandlerCompletionData : CompletionData
 	{
-		readonly Project project;
+		readonly MonoDevelop.Projects.Project project;
 		readonly CodeMemberMethod methodInfo;
-		readonly IType codeBehindClass;
-		readonly IUnresolvedTypeDefinition codeBehindClassPart;
+		readonly INamedTypeSymbol codeBehindClass;
+		readonly Location codeBehindClassLocation;
 		
-		public SuggestedHandlerCompletionData (Project project, CodeMemberMethod methodInfo, IType codeBehindClass, IUnresolvedTypeDefinition codeBehindClassPart)
+		public SuggestedHandlerCompletionData (MonoDevelop.Projects.Project project, CodeMemberMethod methodInfo, INamedTypeSymbol codeBehindClass, Location codeBehindClassLocation)
 		{
 			this.project = project;
 			this.methodInfo = methodInfo;
 			this.codeBehindClass = codeBehindClass;
-			this.codeBehindClassPart = codeBehindClassPart;
+			this.codeBehindClassLocation = codeBehindClassLocation;
 		}
 		
 		public override IconId Icon {
@@ -74,22 +75,21 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 		}
 		
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
 			//insert the method name
-			MonoDevelop.Ide.Gui.Content.IEditableTextBuffer buf = window.CompletionWidget as MonoDevelop.Ide.Gui.Content.IEditableTextBuffer;
+			var buf = window.CompletionWidget;
 			if (buf != null) {
-				using (var undo = buf.OpenUndoGroup ()) {

-					buf.DeleteText (window.CodeCompletionContext.TriggerOffset, buf.CursorPosition - window.CodeCompletionContext.TriggerOffset);
-					buf.InsertText (buf.CursorPosition, methodInfo.Name);
-				}

+				buf.Replace (window.CodeCompletionContext.TriggerOffset, buf.CaretOffset - window.CodeCompletionContext.TriggerOffset, methodInfo.Name);
 			}
 			
 			//generate the codebehind method
-			if (codeBehindClassPart != null && project != null)
-				BindingService.AddMemberToClass (project, codeBehindClass.GetDefinition (), codeBehindClassPart, methodInfo, false);
-			else
-				BindingService.AddMemberToClass (project, codeBehindClass.GetDefinition (), codeBehindClass.GetDefinition ().Parts.First (), methodInfo, false);
+
+			// TODO: Roslyn port.
+//			if (codeBehindClassLocation != null && project != null)
+//				BindingService.AddMemberToClass (project, codeBehindClass, codeBehindClassLocation, methodInfo, false);
+//			else
+//				BindingService.AddMemberToClass (project, codeBehindClass, codeBehindClass.Locations.First (), methodInfo, false);
 		}
 	}
 }
diff --git a/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs b/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs
index 9a2df0e831..1eb82b8a97 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs
@@ -34,12 +34,12 @@ using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Core;
 using MonoDevelop.DesignerSupport;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Projects;
 using MonoDevelop.AspNet.Projects;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -74,7 +74,7 @@ namespace MonoDevelop.AspNet.WebForms
 			var result = new BuildResult ();
 
 			//parse the ASP.NET file
-			var parsedDocument = TypeSystemService.ParseFile (project, file.FilePath) as WebFormsParsedDocument;
+			var parsedDocument = TypeSystemService.ParseFile (project, file.FilePath).Result as WebFormsParsedDocument;
 			if (parsedDocument == null) {
 				result.AddError (string.Format ("Failed to parse file '{0}'", file.Name));
 				return result;
@@ -91,7 +91,7 @@ namespace MonoDevelop.AspNet.WebForms
 			return result;
 		}
 
-		static void AddErrorsToResult (BuildResult result, string filename, IList<Error> errors)
+		static void AddErrorsToResult (BuildResult result, string filename, IEnumerable<Error> errors)
 		{
 			foreach (var err in errors) {
 				if (err.ErrorType == ErrorType.Warning)
@@ -110,7 +110,7 @@ namespace MonoDevelop.AspNet.WebForms
 			ccu = null;
 			var result = new BuildResult ();
 			string className = document.Info.InheritedClass;
-			AddErrorsToResult (result, filename, document.Errors);
+			AddErrorsToResult (result, filename, document.GetErrorsAsync().Result);
 			if (result.ErrorCount > 0)
 				return result;
 			
@@ -153,7 +153,7 @@ namespace MonoDevelop.AspNet.WebForms
 					ProjectFile resolvedMaster = ext.ResolveVirtualPath (document.Info.MasterPageTypeVPath, document.FileName);
 					WebFormsParsedDocument masterParsedDocument = null;
 					if (resolvedMaster != null)
-						masterParsedDocument = TypeSystemService.ParseFile (project, resolvedMaster.FilePath) as WebFormsParsedDocument;
+						masterParsedDocument = TypeSystemService.ParseFile (project, resolvedMaster.FilePath).Result as WebFormsParsedDocument;
 					if (masterParsedDocument != null && !String.IsNullOrEmpty (masterParsedDocument.Info.InheritedClass))
 						masterTypeName = masterParsedDocument.Info.InheritedClass;
 				} catch (Exception ex) {
@@ -186,13 +186,13 @@ namespace MonoDevelop.AspNet.WebForms
 				return result;
 			
 			var dom = refman.Compilation;
-			var cls = ReflectionHelper.ParseReflectionName (className).Resolve (dom);
+			var cls = dom.GetTypeByMetadataName (className);
 			var members = GetDesignerMembers (memberList.Members.Values, cls, filename);
 			
 			//add fields for each control in the page
 			
 			foreach (var member in members) {
-				var type = new CodeTypeReference (member.Type.FullName);
+				var type = new CodeTypeReference (member.Type.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat));
 				typeDecl.Members.Add (new CodeMemberField (type, member.Name) { Attributes = MemberAttributes.Family });
 			}
 			return result;
@@ -205,22 +205,23 @@ namespace MonoDevelop.AspNet.WebForms
 		/// <returns>The filtered list of non-conflicting members.</returns>
 		// TODO: check compatibilty with existing members
 		public static IEnumerable<CodeBehindMember> GetDesignerMembers (
-			IEnumerable<CodeBehindMember> members, IType cls, string designerFile)
+			IEnumerable<CodeBehindMember> members, INamedTypeSymbol cls, string designerFile)
 		{
 			var existingMembers = new HashSet<string> ();
 			while (cls != null) {
-				if (cls.GetDefinition () == null)
-					break;
+//				if (cls.GetDefinition () == null)
+//					break;
 				foreach (var member in cls.GetMembers ()) {
-					if (member.Accessibility == Accessibility.Private || member.Accessibility == Accessibility.Internal)
+					if (member.DeclaredAccessibility == Accessibility.Private || member.DeclaredAccessibility == Accessibility.Internal)
 						continue;
-					if (member.Region.FileName == designerFile)
+					if (member.Locations.Any (loc => loc.IsInSource &&  loc.SourceTree.FilePath == designerFile))
 						continue;
 					existingMembers.Add (member.Name);
 				}
-				if (cls.DirectBaseTypes.All (t => t.Kind == TypeKind.Interface))
+				// TODO: check 
+				if (cls.Interfaces.Any ())
 					break;
-				cls = cls.DirectBaseTypes.First(t => t.Kind != TypeKind.Interface);
+				cls = cls.BaseType;
 			}
 			return members.Where (m => !existingMembers.Contains (m.Name));
 		}
diff --git a/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs b/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
index c5088a67b6..4e998fe458 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
@@ -33,6 +33,7 @@ using MonoDevelop.Ide;
 using MonoDevelop.AspNet.WebForms;

 using MonoDevelop.AspNet.Projects;

 using MonoDevelop.Projects;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -45,7 +46,7 @@ namespace MonoDevelop.AspNet.WebForms
 		protected override string GenerateInfo (string filename)
 		{
 			try {
-				var doc = TypeSystemService.ParseFile (filename, DesktopService.GetMimeTypeForUri (filename), File.ReadAllText (filename)) as WebFormsParsedDocument;
+				var doc = TypeSystemService.ParseFile (null, filename, DesktopService.GetMimeTypeForUri (filename), StringTextSource.ReadFrom (filename)).Result as WebFormsParsedDocument;
 				if (doc != null && !string.IsNullOrEmpty (doc.Info.InheritedClass))
 					return doc.Info.InheritedClass;
 			} catch (Exception ex) {
diff --git a/main/src/addins/AspNet/WebForms/WebFormsEditorExtension.cs b/main/src/addins/AspNet/WebForms/WebFormsEditorExtension.cs
index bc2cc3ef64..f138e644dd 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsEditorExtension.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsEditorExtension.cs
@@ -31,15 +31,17 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text.RegularExpressions;
-
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Threading.Tasks;
 
 using MonoDevelop.Core;
 using MonoDevelop.DesignerSupport; 
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory6.CSharp;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.AspNet.Html;
 using MonoDevelop.AspNet.Html.Parser;
 using MonoDevelop.AspNet.Projects;
@@ -49,23 +51,28 @@ using MonoDevelop.AspNet.WebForms.Dom;
 using MonoDevelop.Xml.Parser;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Projects;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor.Projection;
 
 namespace MonoDevelop.AspNet.WebForms
 {
 	public class WebFormsEditorExtension : BaseHtmlEditorExtension
 	{
-		static readonly Regex DocTypeRegex = new Regex (@"(?:PUBLIC|public)\s+""(?<fpi>[^""]*)""\s+""(?<uri>[^""]*)""");
+		static readonly System.Text.RegularExpressions.Regex DocTypeRegex = new System.Text.RegularExpressions.Regex (@"(?:PUBLIC|public)\s+""(?<fpi>[^""]*)""\s+""(?<uri>[^""]*)""");
 
 		WebFormsParsedDocument aspDoc;
 		DotNetProject project;
 		WebFormsTypeContext refman = new WebFormsTypeContext ();
 
 		ILanguageCompletionBuilder documentBuilder;
-		LocalDocumentInfo localDocumentInfo;
+		Projection localDocumentProjection;
 		DocumentInfo documentInfo;
 
 		ICompletionWidget defaultCompletionWidget;
-		MonoDevelop.Ide.Gui.Document defaultDocument;
+		DocumentContext defaultDocumentContext;
+		TextEditor defaultEditor;
+		TextEditor projectedEditor;
 		
 		bool HasDoc { get { return aspDoc != null; } }
 
@@ -90,54 +97,53 @@ namespace MonoDevelop.AspNet.WebForms
 			aspDoc = CU as WebFormsParsedDocument;
 			if (HasDoc)
 				refman.Doc = aspDoc;
-			
-			var newProj = Document.Project as DotNetProject;
+
+			var newProj = base.DocumentContext.Project as DotNetProject;
 			if (newProj != null) {
 				project = newProj;
 				refman.Project = newProj;
 			}
-			
-			documentBuilder = HasDoc ? LanguageCompletionBuilderService.GetBuilder (aspDoc.Info.Language) : null;
-			
-			if (documentBuilder != null) {
-				documentInfo = new DocumentInfo (refman.Compilation, aspDoc, refman.GetUsings ());
-				documentInfo.ParsedDocument = documentBuilder.BuildDocument (documentInfo, Editor);
-				documentInfo.CodeBesideClass = CreateCodeBesideClass (documentInfo, refman);
+
+			if (HasDoc) {
+				documentInfo = new DocumentInfo (aspDoc, refman.GetUsings ());
+//				localDocumentProjection = new MonoDevelop.AspNet.WebForms.CSharp.CSharpProjector ().CreateProjection (documentInfo, Editor, true).Result;
+//				projectedEditor = localDocumentProjection.CreateProjectedEditor (DocumentContext);
+//				Editor.SetOrUpdateProjections (DocumentContext, new [] { localDocumentProjection  });
 			}
 		}
 		
-		static IUnresolvedTypeDefinition CreateCodeBesideClass (DocumentInfo info, WebFormsTypeContext refman)
+		static INamedTypeSymbol CreateCodeBesideClass (DocumentInfo info, WebFormsTypeContext refman)
 		{
-			var memberList = new WebFormsMemberListBuilder (refman, info.AspNetDocument.XDocument);
-			memberList.Build ();
-			var t = new ICSharpCode.NRefactory.TypeSystem.Implementation.DefaultUnresolvedTypeDefinition (info.ClassName);
-			var dom = refman.Compilation;
-			var baseType = ReflectionHelper.ParseReflectionName (info.BaseType).Resolve (dom);
-			foreach (var m in WebFormsCodeBehind.GetDesignerMembers (memberList.Members.Values, baseType, null)) {
-				t.Members.Add (new ICSharpCode.NRefactory.TypeSystem.Implementation.DefaultUnresolvedField (t, m.Name) {
-					Accessibility = Accessibility.Protected,
-					ReturnType = m.Type.ToTypeReference ()
-				});
-			}
-			return t;
+			//TODO: Roslyn port
+//			var memberList = new WebFormsMemberListBuilder (refman, info.AspNetDocument.XDocument);
+//			memberList.Build ();
+//			var t = new ICSharpCode.NRefactory.TypeSystem.Implementation.DefaultUnresolvedTypeDefinition (info.ClassName);
+//			var dom = refman.Compilation;
+//			var baseType = ReflectionHelper.ParseReflectionName (info.BaseType).Resolve (dom);
+//			foreach (var m in WebFormsCodeBehind.GetDesignerMembers (memberList.Members.Values, baseType, null)) {
+//				t.Members.Add (new ICSharpCode.NRefactory.TypeSystem.Implementation.DefaultUnresolvedField (t, m.Name) {
+//					Accessibility = Accessibility.Protected,
+//					ReturnType = m.Type.ToTypeReference ()
+//				});
+//			}
+//			return t;
+			return null;
 		}
 
-		protected override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext,
-		                                                            bool forced, ref int triggerWordLength)
+		protected override Task<ICompletionDataList> HandleCodeCompletion (
+			CodeCompletionContext completionContext, bool forced, CancellationToken token)
 		{
-			ITextBuffer buf = Buffer;
 			// completionChar may be a space even if the current char isn't, when ctrl-space is fired t
-			char currentChar = completionContext.TriggerOffset < 1? ' ' : buf.GetCharAt (completionContext.TriggerOffset - 1);
+			char currentChar = completionContext.TriggerOffset < 1? ' ' : Editor.GetCharAt (completionContext.TriggerOffset - 1);
 			//char previousChar = completionContext.TriggerOffset < 2? ' ' : buf.GetCharAt (completionContext.TriggerOffset - 2);
-			
-			
+
 			//directive names
 			if (Tracker.Engine.CurrentState is WebFormsDirectiveState) {
 				var directive = Tracker.Engine.Nodes.Peek () as WebFormsDirective;
 				if (HasDoc && directive != null && directive.Region.BeginLine == completionContext.TriggerLine &&
 				    directive.Region.BeginColumn + 3 == completionContext.TriggerLineOffset)
 				{
-					return WebFormsDirectiveCompletion.GetDirectives (aspDoc.Type);
+					return Task.FromResult ((ICompletionDataList)WebFormsDirectiveCompletion.GetDirectives (aspDoc.Type));
 				}
 				return null;
 			}
@@ -146,8 +152,9 @@ namespace MonoDevelop.AspNet.WebForms
 				if (HasDoc && directive != null && directive.Region.BeginLine == completionContext.TriggerLine &&
 				    directive.Region.BeginColumn + 4 == completionContext.TriggerLineOffset && char.IsLetter (currentChar))
 				{
-					triggerWordLength = 1;
-					return WebFormsDirectiveCompletion.GetDirectives (aspDoc.Type);
+					completionContext.TriggerWordLength = 1;
+					completionContext.TriggerOffset -= 1;
+					return Task.FromResult ((ICompletionDataList)WebFormsDirectiveCompletion.GetDirectives (aspDoc.Type));
 				}
 				return null;
 			}
@@ -158,14 +165,14 @@ namespace MonoDevelop.AspNet.WebForms
 			if (currentChar == '<' && !(isAspExprState || Tracker.Engine.CurrentState is XmlRootState)) {
 				var list = new CompletionDataList ();
 				AddAspBeginExpressions (list);
-				return list;
+				return Task.FromResult ((ICompletionDataList)list);
 			}
 			
 			if (!HasDoc || aspDoc.Info.DocType == null) {
 				//FIXME: get doctype from master page
 				DocType = null;
 			} else {
-				DocType = new XDocType (TextLocation.Empty);
+				DocType = new XDocType (DocumentLocation.Empty);
 				var matches = DocTypeRegex.Match (aspDoc.Info.DocType);
 				DocType.PublicFpi = matches.Groups["fpi"].Value;
 				DocType.Uri = matches.Groups["uri"].Value;
@@ -193,7 +200,7 @@ namespace MonoDevelop.AspNet.WebForms
 				
 			}
 			
-			return base.HandleCodeCompletion (completionContext, forced, ref triggerWordLength);
+			return base.HandleCodeCompletion (completionContext, forced, token);
 		}
 		
 		//case insensitive, no prefix
@@ -204,56 +211,53 @@ namespace MonoDevelop.AspNet.WebForms
 		
 		public void InitializeCodeCompletion (char ch)
 		{
-			int caretOffset = Document.Editor.Caret.Offset;
+			int caretOffset = Editor.CaretOffset;
 			int start = caretOffset - Tracker.Engine.CurrentStateLength;
-			if (Document.Editor.GetCharAt (start) == '=') 
+			if (Editor.GetCharAt (start) == '=') 
 				start++;
-			string sourceText = Document.Editor.GetTextBetween (start, caretOffset);
+			string sourceText = Editor.GetTextBetween (start, caretOffset);
 			if (ch != '\0')
 				sourceText += ch;
-			string textAfterCaret = Document.Editor.GetTextBetween (caretOffset, Math.Min (Document.Editor.Length, Math.Max (caretOffset, Tracker.Engine.Position + Tracker.Engine.CurrentStateLength - 2)));
+			string textAfterCaret = Editor.GetTextBetween (caretOffset, Math.Min (Editor.Length, Math.Max (caretOffset, Tracker.Engine.Position + Tracker.Engine.CurrentStateLength - 2)));
 
-			if (documentBuilder == null){
-				localDocumentInfo = null;
+			if (documentBuilder == null) {
+				localDocumentProjection = null;
 				return;
 			}
-			localDocumentInfo = documentBuilder.BuildLocalDocument (documentInfo, Editor, sourceText, textAfterCaret, true);
-			
-			var viewContent = new MonoDevelop.Ide.Gui.HiddenTextEditorViewContent ();
-			viewContent.Project = Document.Project;
-			viewContent.ContentName = localDocumentInfo.ParsedLocalDocument.FileName;
-			
-			viewContent.Text = localDocumentInfo.LocalDocument;
-			viewContent.GetTextEditorData ().Caret.Offset = localDocumentInfo.CaretPosition;
-
-			var workbenchWindow = new MonoDevelop.Ide.Gui.HiddenWorkbenchWindow ();
-			workbenchWindow.ViewContent = viewContent;
-			localDocumentInfo.HiddenDocument = new HiddenDocument (workbenchWindow) {
-				HiddenParsedDocument = localDocumentInfo.ParsedLocalDocument
-			};
+
+//			var viewContent = new MonoDevelop.Ide.Gui.HiddenTextEditorViewContent ();
+//			viewContent.Project = DocumentContext.Project;
+//			viewContent.ContentName = localDocumentInfo.ParsedLocalDocument.FileName;
+//			
+//			viewContent.Text = localDocumentInfo.LocalDocument;
+//			viewContent.Editor.CaretOffset = localDocumentInfo.CaretPosition;
+//
+//			var workbenchWindow = new MonoDevelop.Ide.Gui.HiddenWorkbenchWindow ();
+//			workbenchWindow.ViewContent = viewContent;
+//			localDocumentInfo.HiddenDocument = new HiddenDocument (workbenchWindow) {
+//				HiddenParsedDocument = localDocumentInfo.ParsedLocalDocument
+//			};
 		}
 		
 		
 		public override ICompletionDataList CodeCompletionCommand (CodeCompletionContext completionContext)
 		{
-			//completion for ASP.NET expressions
+/*			//completion for ASP.NET expressions
 			// TODO: Detect <script> state here !!!
 			if (documentBuilder != null && Tracker.Engine.CurrentState is WebFormsExpressionState) {
 				InitializeCodeCompletion ('\0');
-				return documentBuilder.HandlePopupCompletion (defaultDocument, documentInfo, localDocumentInfo);
-			}
+				return documentBuilder.HandlePopupCompletion (defaultEditor, defaultDocumentContext, documentInfo, localDocumentInfo);
+			}*/
 			return base.CodeCompletionCommand (completionContext);
 		}
 
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 			defaultCompletionWidget = CompletionWidget;
-			defaultDocument = document;
-			defaultDocument.Editor.Caret.PositionChanged += delegate {
-				OnCompletionContextChanged (CompletionWidget, EventArgs.Empty);
-			};
-			defaultDocument.Saved += AsyncUpdateDesignerFile;
+			defaultDocumentContext = DocumentContext;
+			defaultEditor = Editor;
+			defaultDocumentContext.Saved += AsyncUpdateDesignerFile;
 			OnParsedDocumentUpdated ();
 		}
 
@@ -283,55 +287,51 @@ namespace MonoDevelop.AspNet.WebForms
 				}
 			});
 		}
-		
-		public override ICompletionDataList HandleCodeCompletion (
-		    CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
-		{
-			if (localDocumentInfo == null)
-				return base.HandleCodeCompletion (completionContext, completionChar, ref triggerWordLength);
-			localDocumentInfo.HiddenDocument.Editor.InsertAtCaret (completionChar.ToString ());
-			return documentBuilder.HandleCompletion (defaultDocument, completionContext, documentInfo, localDocumentInfo, completionChar, ref triggerWordLength);
-		}
 
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		// TODO: Roslyn port
+//		
+//		public override ICompletionDataList HandleCodeCompletionAsync (
+//		    CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
+//		{
+//			if (localDocumentInfo == null)
+//				return base.HandleCodeCompletionAsync (completionContext, completionChar, ref triggerWordLength);
+//			localDocumentInfo.HiddenDocument.Editor.InsertAtCaret (completionChar.ToString ());
+//			return documentBuilder.HandleCompletion (defaultEditor, defaultDocumentContext, completionContext, documentInfo, localDocumentInfo, completionChar, ref triggerWordLength);
+//		}
+
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
 			Tracker.UpdateEngine ();
 			bool isAspExprState = Tracker.Engine.CurrentState is WebFormsExpressionState;
 			if (documentBuilder == null || !isAspExprState)
-				return base.KeyPress (key, keyChar, modifier);
+				return base.KeyPress (descriptor);
 			InitializeCodeCompletion ('\0');
-			document = localDocumentInfo.HiddenDocument;
-			CompletionWidget = documentBuilder.CreateCompletionWidget (defaultDocument, localDocumentInfo);
+//			DocumentContext = localDocumentInfo.HiddenDocument;
+//			Editor = localDocumentInfo.HiddenDocument.Editor;
+//			CompletionWidget = documentBuilder.CreateCompletionWidget (localDocumentInfo.HiddenDocument.Editor, localDocumentInfo.HiddenDocument, localDocumentInfo);
 			bool result;
 			try {
-				result = base.KeyPress (key, keyChar, modifier);
-				if (PropertyService.Get ("EnableParameterInsight", true) && (keyChar == ',' || keyChar == ')') && CanRunParameterCompletionCommand ()) {
+				result = base.KeyPress (descriptor);
+				if (PropertyService.Get ("EnableParameterInsight", true) && (descriptor.KeyChar == ',' || descriptor.KeyChar == ')') && CanRunParameterCompletionCommand ()) {
 					RunParameterCompletionCommand ();
 				}
 			} finally {
-				document = defaultDocument;
+				DocumentContext = defaultDocumentContext;
+				Editor = defaultEditor;
 				CompletionWidget = defaultCompletionWidget;
 			}
 			return result;
 		}
-		
-		public override bool GetParameterCompletionCommandOffset (out int cpos)
-		{
-			/*if (Tracker.Engine.CurrentState is AspNetExpressionState && documentBuilder != null && localDocumentInfo != null) {
-				var result = documentBuilder.GetParameterCompletionCommandOffset (defaultDocument, documentInfo, localDocumentInfo, out cpos);
-				return result;
-			}*/
-			return base.GetParameterCompletionCommandOffset (out cpos);
-		}
-		
-		public override ParameterDataProvider HandleParameterCompletion (CodeCompletionContext completionContext, char completionChar)
-		{
-/*			if (Tracker.Engine.CurrentState is AspNetExpressionState && documentBuilder != null && localDocumentInfo != null) {
-				return documentBuilder.HandleParameterCompletion (defaultDocument, completionContext, documentInfo, localDocumentInfo, completionChar);
-			}*/
-			
-			return base.HandleParameterCompletion (completionContext, completionChar);
-		}
+
+// TODO: Roslyn port
+//		public override ParameterHintingResult HandleParameterCompletionAsync (CodeCompletionContext completionContext, char completionChar)
+//		{
+///*			if (Tracker.Engine.CurrentState is AspNetExpressionState && documentBuilder != null && localDocumentInfo != null) {
+//				return documentBuilder.HandleParameterCompletion (defaultDocument, completionContext, documentInfo, localDocumentInfo, completionChar);
+//			}*/
+//			
+//			return base.HandleParameterCompletionAsync (completionContext, completionChar);
+//		}
 
 		/*public override void RunParameterCompletionCommand ()
 		{
@@ -354,9 +354,9 @@ namespace MonoDevelop.AspNet.WebForms
 		protected override void GetElementCompletions (CompletionDataList list)
 		{
 			XName parentName = GetParentElementName (0);
-			
-			IType controlClass = null;
-			
+
+			INamedTypeSymbol controlClass = null;
+
 			if (parentName.HasPrefix) {
 				controlClass = refman.GetControlType (parentName.Prefix, parentName.Name);
 			} else {
@@ -364,7 +364,7 @@ namespace MonoDevelop.AspNet.WebForms
 				if (grandparentName.IsValid && grandparentName.HasPrefix)
 					controlClass = refman.GetControlType (grandparentName.Prefix, grandparentName.Name);
 			}
-			
+
 			//we're just in HTML
 			if (controlClass == null) {
 				//root element?
@@ -385,7 +385,7 @@ namespace MonoDevelop.AspNet.WebForms
 				}
 				return;
 			}
-			
+
 			string defaultProp;
 			bool childrenAsProperties = AreChildrenAsProperties (controlClass, out defaultProp);
 			if (defaultProp != null && defaultProp.Length == 0)
@@ -404,8 +404,8 @@ namespace MonoDevelop.AspNet.WebForms
 			//children of properties
 			if (childrenAsProperties && (!parentName.HasPrefix || defaultProp != null)) {
 				string propName = defaultProp ?? parentName.Name;
-				IProperty property =
-					controlClass.GetProperties ()
+				IPropertySymbol property =
+					controlClass.GetMembers ().OfType<IPropertySymbol> ()
 						.FirstOrDefault (x => string.Equals (propName, x.Name, StringComparison.OrdinalIgnoreCase));
 				
 				if (property == null)
@@ -429,31 +429,31 @@ namespace MonoDevelop.AspNet.WebForms
 				}
 				
 				//check if allows freeform ASP/HTML content
-				if (property.ReturnType.ToString () == "System.Web.UI.ITemplate") {
+				if (property.GetReturnType ().GetFullName () == "System.Web.UI.ITemplate") {
 					AddAspBeginExpressions (list);
 					AddMiscBeginTags (list);
 					AddHtmlTagCompletionData (list, Schema, new XName ("body"));
 					list.AddRange (refman.GetControlCompletionData ());
 					return;
 				}
-				
+
 				//FIXME:unfortunately ASP.NET doesn't seem to have enough type information / attributes
 				//to be able to resolve the correct child types here
 				//so we assume it's a list and have a quick hack to find arguments of strongly typed ILists
 				
-				IType collectionType = property.ReturnType;
+				ITypeSymbol collectionType = property.GetReturnType ();
 				if (collectionType == null) {
 					list.AddRange (refman.GetControlCompletionData ());
 					return;
 				}
-				
+
 				string addStr = "Add";
-				IMethod meth = collectionType.GetMethods ().FirstOrDefault (m => m.Parameters.Count == 1 && m.Name == addStr);
-				
+				IMethodSymbol meth = collectionType.GetMembers ().OfType<IMethodSymbol> ().FirstOrDefault (m => m.Parameters.Length == 1 && m.Name == addStr);
+
 				if (meth != null) {
-					IType argType = meth.Parameters [0].Type;
-					var type = ReflectionHelper.ParseReflectionName ("System.Web.UI.Control").Resolve (argType.GetDefinition ().Compilation);
-					if (argType != null && argType.IsBaseType (type)) {
+					var argType = meth.Parameters [0].Type as INamedTypeSymbol;
+					INamedTypeSymbol type = refman.Compilation.GetTypeByMetadataName ("System.Web.UI.Control");
+					if (argType != null && type != null && argType.IsDerivedFromClass (type)) {
 						list.AddRange (refman.GetControlCompletionData (argType));
 						return;
 					}
@@ -465,15 +465,16 @@ namespace MonoDevelop.AspNet.WebForms
 			
 			//properties as children of controls
 			if (parentName.HasPrefix && childrenAsProperties) {
-				foreach (IProperty prop in GetUniqueMembers<IProperty> (controlClass.GetProperties ()))
+				foreach (IPropertySymbol prop in GetUniqueMembers<IPropertySymbol> (controlClass.GetMembers ().OfType <IPropertySymbol> ()))
 					if (GetPersistenceMode (prop) != System.Web.UI.PersistenceMode.Attribute)
-						list.Add (prop.Name, prop.GetStockIcon (), AmbienceService.GetSummaryMarkup (prop));
+						list.Add (prop.Name, prop.GetStockIcon (), Ambience.GetSummaryMarkup (prop));
 				return;
 			}
 		}
 		
-		protected override CompletionDataList GetAttributeCompletions (IAttributedXObject attributedOb,
-		                                                 Dictionary<string, string> existingAtts)
+		protected override CompletionDataList GetAttributeCompletions (
+			IAttributedXObject attributedOb,
+			Dictionary<string, string> existingAtts)
 		{
 			var list = base.GetAttributeCompletions (attributedOb, existingAtts) ?? new CompletionDataList ();
 			if (attributedOb is XElement) {
@@ -515,7 +516,7 @@ namespace MonoDevelop.AspNet.WebForms
 					AddAspAttributeValueCompletionData (list, ob.Name, att.Name, id);
 				}
 			} else if (ob is WebFormsDirective) {
-				return WebFormsDirectiveCompletion.GetAttributeValues (project, Document.FileName, ob.Name.FullName, att.Name.FullName);
+				return WebFormsDirectiveCompletion.GetAttributeValues (project, DocumentContext.Name, ob.Name.FullName, att.Name.FullName);
 			}
 			return list.Count > 0? list : null;
 		}
@@ -529,26 +530,26 @@ namespace MonoDevelop.AspNet.WebForms
 			if (!(expr is WebFormsBindingExpression || expr is WebFormsRenderExpression))
 				return null;
 
-			IType codeBehindClass;
+			INamedTypeSymbol codeBehindClass;
 			if (!GetCodeBehind (out codeBehindClass))
 				return null;
 			
 			//list just the class's properties, not properties on base types
 			var list = new CompletionDataList ();
-			list.AddRange (from p in codeBehindClass.GetProperties ()
-				where p.IsPublic || p.IsPublic
+			list.AddRange (from p in codeBehindClass.GetMembers ().OfType<IPropertySymbol> ()
+				where p.DeclaredAccessibility == Accessibility.Public
 				select new AspAttributeCompletionData (p));
-			list.AddRange (from p in codeBehindClass.GetFields ()
-				where p.IsProtected || p.IsPublic
+			list.AddRange (from p in codeBehindClass.GetMembers ().OfType<IFieldSymbol> ()
+				where p.DeclaredAccessibility == Accessibility.Protected || p.DeclaredAccessibility == Accessibility.Public
 				select new AspAttributeCompletionData (p));
 			
 			return list.Count > 0? list : null;
 		}
 		
-		bool GetCodeBehind (out IType codeBehindClass)
+		bool GetCodeBehind (out INamedTypeSymbol codeBehindClass)
 		{
 			if (HasDoc && !string.IsNullOrEmpty (aspDoc.Info.InheritedClass)) {
-				codeBehindClass = ReflectionHelper.ParseReflectionName (aspDoc.Info.InheritedClass).Resolve (refman.Compilation);
+				codeBehindClass = refman.Compilation.GetTypeByMetadataName (aspDoc.Info.InheritedClass);
 				return codeBehindClass != null;
 			}
 
@@ -557,7 +558,6 @@ namespace MonoDevelop.AspNet.WebForms
 		}
 		
 		#region ASP.NET data
-		
 		void AddAspBeginExpressions (CompletionDataList list)
 		{
 			list.Add ("%",  "md-literal", GettextCatalog.GetString ("ASP.NET render block"));
@@ -565,12 +565,12 @@ namespace MonoDevelop.AspNet.WebForms
 			list.Add ("%@", "md-literal", GettextCatalog.GetString ("ASP.NET directive"));
 			list.Add ("%#", "md-literal", GettextCatalog.GetString ("ASP.NET databinding expression"));
 			list.Add ("%--", "md-literal", GettextCatalog.GetString ("ASP.NET server-side comment"));
-			
+
 			//valid on 2.0+ runtime only
 			if (ProjClrVersion != ClrVersion.Net_1_1) {
 				list.Add ("%$", "md-literal", GettextCatalog.GetString ("ASP.NET resource expression"));
 			}
-			
+
 			//valid on 4.0+ runtime only
 			if (ProjClrVersion != ClrVersion.Net_4_0) {
 				list.Add ("%:", "md-literal", GettextCatalog.GetString ("ASP.NET HTML encoded expression"));
@@ -581,52 +581,63 @@ namespace MonoDevelop.AspNet.WebForms
 		{
 			Debug.Assert (name.IsValid);
 			Debug.Assert (name.HasPrefix);
-			
-			IType controlClass = refman.GetControlType (name.Prefix, name.Name);
+
+			INamedTypeSymbol controlClass = refman.GetControlType (name.Prefix, name.Name);
 			if(controlClass != null)
 				AddControlMembers (list, controlClass, existingAtts);
 		}
-		
-		void AddControlMembers (CompletionDataList list, IType controlClass, Dictionary<string, string> existingAtts)
+
+		void AddControlMembers (CompletionDataList list, INamedTypeSymbol controlClass, Dictionary<string, string> existingAtts)
 		{
 			//add atts only if they're not already in the tag
-			foreach (var prop in GetUniqueMembers<IProperty> (controlClass.GetProperties ()))
-				if (prop.Accessibility == Accessibility.Public && (existingAtts == null || !existingAtts.ContainsKey (prop.Name)))
-				if (GetPersistenceMode (prop) == System.Web.UI.PersistenceMode.Attribute)
-					list.Add (new AspAttributeCompletionData (prop));
-			
+			foreach (var prop in GetUniqueMembers<IPropertySymbol> (GetAllMembers<IPropertySymbol> (controlClass)))
+				if (prop.DeclaredAccessibility == Accessibility.Public && (existingAtts == null || !existingAtts.ContainsKey (prop.Name)))
+					if (GetPersistenceMode (prop) == System.Web.UI.PersistenceMode.Attribute)
+						list.Add (new AspAttributeCompletionData (prop));
+
 			//similarly add events
-			foreach (var eve in GetUniqueMembers<IEvent> (controlClass.GetEvents ())) {
+			foreach (var eve in GetUniqueMembers<IEventSymbol> (GetAllMembers<IEventSymbol> (controlClass))) {
 				string eveName = "On" + eve.Name;
-				if (eve.Accessibility == Accessibility.Public && (existingAtts == null || !existingAtts.ContainsKey (eveName)))
+				if (eve.DeclaredAccessibility == Accessibility.Public && (existingAtts == null || !existingAtts.ContainsKey (eveName)))
 					list.Add (new AspAttributeCompletionData (eve, eveName));
 			}
 		}
-		
+
+		IEnumerable<T> GetAllMembers<T> (INamedTypeSymbol type)
+		{
+			INamedTypeSymbol currentType = type;
+			while (currentType != null) {
+				foreach (T member in currentType.GetMembers ().OfType<T> ())
+					yield return member;
+
+				currentType = currentType.BaseType;
+			}
+		}
+
 		void AddAspAttributeValueCompletionData (CompletionDataList list, XName tagName, XName attName, string id)
 		{
 			Debug.Assert (tagName.IsValid && tagName.HasPrefix);
 			Debug.Assert (attName.IsValid && !attName.HasPrefix);
-			
-			IType controlClass = refman.GetControlType (tagName.Prefix, tagName.Name);
+
+			INamedTypeSymbol controlClass = refman.GetControlType (tagName.Prefix, tagName.Name);
 			if (controlClass == null)
 				return;
 			
 			//find the codebehind class
-			IType codeBehindClass;
+			INamedTypeSymbol codeBehindClass;
 			GetCodeBehind (out codeBehindClass);
-			
+
 			//if it's an event, suggest compatible methods 
 			if (codeBehindClass != null && attName.Name.StartsWith ("On", StringComparison.Ordinal)) {
 				string eventName = attName.Name.Substring (2);
 				
-				foreach (IEvent ev in controlClass.GetEvents ()) {
+				foreach (IEventSymbol ev in controlClass.GetAccessibleMembersInThisAndBaseTypes<IEventSymbol> (controlClass)) {
 					if (ev.Name == eventName) {
 						var domMethod = BindingService.MDDomToCodeDomMethod (ev);
 						if (domMethod == null)
 							return;
 						
-						foreach (IMethod meth 
+						foreach (IMethodSymbol meth 
 						    in BindingService.GetCompatibleMethodsInClass (codeBehindClass, ev)) {
 							list.Add (meth.Name, "md-method",
 							    GettextCatalog.GetString ("A compatible method in the CodeBehind class"));
@@ -646,7 +657,7 @@ namespace MonoDevelop.AspNet.WebForms
 						
 						list.Add (
 						    new SuggestedHandlerCompletionData (project, domMethod, codeBehindClass,
-						        CodeBehind.GetNonDesignerClass (codeBehindClass))
+						        CodeBehind.GetNonDesignerClassLocation (codeBehindClass))
 						    );
 						return;
 					}
@@ -654,17 +665,17 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 			
 			//if it's a property and is an enum or bool, suggest valid values
-			foreach (IProperty prop in controlClass.GetProperties ()) {
+			foreach (IPropertySymbol prop in GetAllMembers<IPropertySymbol> (controlClass)) {
 				if (prop.Name != attName.Name)
 					continue;
 				
 				//boolean completion
-				if (prop.ReturnType.Equals (refman.Compilation.FindType (KnownTypeCode.Boolean))) {
+				if (prop.GetReturnType ().Equals (refman.Compilation.GetTypeByMetadataName ("System.Boolean"))) {
 					AddBooleanCompletionData (list);
 					return;
 				}
 				//color completion
-				if (prop.ReturnType.Equals (refman.Compilation.FindType (typeof(System.Drawing.Color)))) {
+				if (prop.GetReturnType ().Equals (refman.Compilation.GetTypeByMetadataName ("System.Drawing.Color"))) {
 					var conv = new System.Drawing.ColorConverter ();
 					foreach (System.Drawing.Color c in conv.GetStandardValues (null)) {
 						if (c.IsSystemColor)
@@ -676,17 +687,17 @@ namespace MonoDevelop.AspNet.WebForms
 				}
 				
 				//enum completion
-				IType retCls = prop.ReturnType;
-				if (retCls != null && retCls.Kind == TypeKind.Enum) {
-					foreach (var enumVal in retCls.GetFields ())
-						if (enumVal.IsPublic && enumVal.IsStatic)
-							list.Add (enumVal.Name, "md-literal", AmbienceService.GetSummaryMarkup (enumVal));
+				var retCls = prop.GetReturnType () as INamedTypeSymbol;
+				if (retCls != null && retCls.TypeKind == TypeKind.Enum) {
+					foreach (var enumVal in GetAllMembers<IFieldSymbol> (retCls))
+						if (enumVal.DeclaredAccessibility == Accessibility.Public && enumVal.IsStatic)
+							list.Add (enumVal.Name, "md-literal", Ambience.GetSummaryMarkup (enumVal));
 					return;
 				}
 			}
 		}
-		
-		static IEnumerable<T> GetUniqueMembers<T> (IEnumerable<T> members) where T : IMember
+
+		static IEnumerable<T> GetUniqueMembers<T> (IEnumerable<T> members) where T : ISymbol
 		{
 			var existingItems = new Dictionary<string,bool> ();
 			foreach (T item in members) {
@@ -702,53 +713,51 @@ namespace MonoDevelop.AspNet.WebForms
 			list.Add ("true", "md-literal");
 			list.Add ("false", "md-literal");
 		}
-		
 		#endregion
-		
+
 		#region Querying types' attributes
-		
-		static System.Web.UI.PersistenceMode GetPersistenceMode (IProperty prop)
+		static System.Web.UI.PersistenceMode GetPersistenceMode (IPropertySymbol prop)
 		{
-			foreach (var att in prop.Attributes) {
-				if (att.AttributeType.ReflectionName == "System.Web.UI.PersistenceModeAttribute") {
-					var expr = att.PositionalArguments.FirstOrDefault ();
-					if (expr == null) {
-						LoggingService.LogWarning ("Unknown expression type {0} in IAttribute parameter", expr);
+			foreach (var att in prop.GetAttributes ()) {
+				if (att.AttributeClass.GetFullName () == "System.Web.UI.PersistenceModeAttribute") {
+					var expr = att.ConstructorArguments.FirstOrDefault ();
+					if (expr.IsNull) {
+						LoggingService.LogWarning ("Unknown expression type {0} in Attribute parameter", expr);
 						return System.Web.UI.PersistenceMode.Attribute;
 					}
 					
-					return (System.Web.UI.PersistenceMode) expr.ConstantValue;
+					return (System.Web.UI.PersistenceMode) expr.Value;
 				}
-				if (att.AttributeType.ReflectionName == "System.Web.UI.TemplateContainerAttribute") {
+				if (att.AttributeClass.GetFullName () == "System.Web.UI.TemplateContainerAttribute") {
 					return System.Web.UI.PersistenceMode.InnerProperty;
 				}
 			}
 			return System.Web.UI.PersistenceMode.Attribute;
 		}
-		
-		static bool AreChildrenAsProperties (IType type, out string defaultProperty)
+
+		static bool AreChildrenAsProperties (INamedTypeSymbol type, out string defaultProperty)
 		{
 			bool childrenAsProperties = false;
 			defaultProperty = "";
 			
-			IAttribute att = GetAttributes (type, "System.Web.UI.ParseChildrenAttribute").FirstOrDefault ();
+			AttributeData att = GetAttributes (type, "System.Web.UI.ParseChildrenAttribute").FirstOrDefault ();
 
 			if (att == null)
 				return childrenAsProperties;
 
-			var posArgs = att.PositionalArguments;
-			if (posArgs.Count == 0)
+			var posArgs = att.ConstructorArguments;
+			if (posArgs.Length == 0)
 				return childrenAsProperties;
 			
-			if (posArgs.Count > 0) {
+			if (posArgs.Length > 0) {
 				var expr = posArgs [0];
-				if (expr == null) {
-					LoggingService.LogWarning ("Unknown expression type {0} in IAttribute parameter", expr);
+				if (expr.IsNull) {
+					LoggingService.LogWarning ("Unknown expression type {0} in Attribute parameter", expr);
 					return false;
 				}
 				
-				if (expr.ConstantValue is bool) {
-					childrenAsProperties = (bool)expr.ConstantValue;
+				if (expr.Value is bool) {
+					childrenAsProperties = (bool)expr.Value;
 				} else {
 					//TODO: implement this
 					LoggingService.LogWarning ("ASP.NET completion does not yet handle ParseChildrenAttribute (Type)");
@@ -756,34 +765,34 @@ namespace MonoDevelop.AspNet.WebForms
 				}
 			}
 			
-			if (posArgs.Count > 1) {
+			if (posArgs.Length > 1) {
 				var expr = posArgs [1];
-				if (expr == null || !(expr.ConstantValue is string)) {
+				if (expr.IsNull || !(expr.Value is string)) {
 					LoggingService.LogWarning ("Unknown expression '{0}' in IAttribute parameter", expr);
 					return false;
 				}
-				defaultProperty = (string)expr.ConstantValue;
+				defaultProperty = (string)expr.Value;
 			}
 			
 			var namedArgs = att.NamedArguments;
-			if (namedArgs.Count > 0) {
-				if (namedArgs.Any (p => p.Key.Name == "ChildrenAsProperties")) {
-					var expr = namedArgs.First (p => p.Key.Name == "ChildrenAsProperties").Value;
-					if (expr == null) {
+			if (namedArgs.Length > 0) {
+				if (namedArgs.Any (p => p.Key == "ChildrenAsProperties")) {
+					var expr = namedArgs.First (p => p.Key == "ChildrenAsProperties").Value;
+					if (expr.IsNull) {
 						LoggingService.LogWarning ("Unknown expression type {0} in IAttribute parameter", expr);
 						return false;
 					}
-					childrenAsProperties = (bool)expr.ConstantValue;
+					childrenAsProperties = (bool)expr.Value;
 				}
-				if (namedArgs.Any (p => p.Key.Name == "DefaultProperty")) {
-					var expr = namedArgs.First (p => p.Key.Name == "DefaultProperty").Value;
-					if (expr == null) {
+				if (namedArgs.Any (p => p.Key == "DefaultProperty")) {
+					var expr = namedArgs.First (p => p.Key == "DefaultProperty").Value;
+					if (expr.IsNull) {
 						LoggingService.LogWarning ("Unknown expression type {0} in IAttribute parameter", expr);
 						return false;
 					}
-					defaultProperty = (string)expr.ConstantValue;
+					defaultProperty = (string)expr.Value;
 				}
-				if (namedArgs.Any (p => p.Key.Name == "ChildControlType")) {
+				if (namedArgs.Any (p => p.Key == "ChildControlType")) {
 					//TODO: implement this
 					LoggingService.LogWarning ("ASP.NET completion does not yet handle ParseChildrenAttribute (Type)");
 					return false;
@@ -793,20 +802,19 @@ namespace MonoDevelop.AspNet.WebForms
 			return childrenAsProperties;
 		}
 		
-		static IEnumerable<IAttribute> GetAttributes (IType type, string attName)
+		static IEnumerable<AttributeData> GetAttributes (INamedTypeSymbol type, string attName)
 		{
-			foreach (var att in type.GetDefinition ().Attributes) {
-				if (att.AttributeType.ReflectionName == attName)
+			foreach (AttributeData att in type.GetAttributes()) {
+				if (att.AttributeClass.GetFullName () == attName)
 					yield return att;
 			}
 			
-			foreach (IType t2 in type.GetAllBaseTypes ()) {
-				foreach (IAttribute att in t2.GetDefinition ().Attributes)
-					if (att.AttributeType.ReflectionName == attName)
+			foreach (INamedTypeSymbol t2 in type.GetAllBaseClasses ()) {
+				foreach (AttributeData att in t2.GetAttributes ())
+					if (att.AttributeClass.GetFullName () == attName)
 						yield return att;
 			}
 		}
-		
 		#endregion
 	}
 }
diff --git a/main/src/addins/AspNet/WebForms/WebFormsMemberListBuilder.cs b/main/src/addins/AspNet/WebForms/WebFormsMemberListBuilder.cs
index 65783b3d8d..5ea9c7cba6 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsMemberListBuilder.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsMemberListBuilder.cs
@@ -34,13 +34,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
-
 using MonoDevelop.Core;
 using MonoDevelop.AspNet.WebForms;
 using MonoDevelop.AspNet.WebForms.Dom;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -86,7 +86,7 @@ namespace MonoDevelop.AspNet.WebForms
 					);
 				} else {
 					string controlType = element.Attributes.GetValue (new XName ("type"), true);
-					IType type = docRefMan.GetType (element.Name.Prefix, element.Name.Name, controlType);
+					var type = docRefMan.GetType (element.Name.Prefix, element.Name.Name, controlType);
 	
 					if (type == null) {
 						Errors.Add (
@@ -111,7 +111,7 @@ namespace MonoDevelop.AspNet.WebForms
 	
 	public class CodeBehindMember
 	{
-		public CodeBehindMember (string name, IType type, TextLocation location)
+		public CodeBehindMember (string name, INamedTypeSymbol type, DocumentLocation location)
 		{
 			this.Name = name;
 			this.Type = type;
@@ -119,7 +119,7 @@ namespace MonoDevelop.AspNet.WebForms
 		}		
 		
 		public string Name { get; private set; }
-		public IType Type { get; private set; }
-		public TextLocation Location { get; private set; }
+		public INamedTypeSymbol Type { get; private set; }
+		public DocumentLocation Location { get; private set; }
 	}
 }
diff --git a/main/src/addins/AspNet/WebForms/WebFormsPageInfo.cs b/main/src/addins/AspNet/WebForms/WebFormsPageInfo.cs
index 48fcf3138e..5220656f16 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsPageInfo.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsPageInfo.cs
@@ -28,11 +28,11 @@
 
 using System;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
 
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Dom;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.AspNet.WebForms
 {
diff --git a/main/src/addins/AspNet/WebForms/WebFormsParsedDocument.cs b/main/src/addins/AspNet/WebForms/WebFormsParsedDocument.cs
index 0089aea70e..c45a609628 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsParsedDocument.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsParsedDocument.cs
@@ -29,11 +29,12 @@
 using System;
 using System.Collections.Generic;
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Dom;
+using MonoDevelop.Ide.Editor;
+using System.Linq;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -51,8 +52,13 @@ namespace MonoDevelop.AspNet.WebForms
 		
 		public WebFormsPageInfo Info { get; private set; }
 		public WebSubtype Type { get; private set; }
-		
-		public override IEnumerable<FoldingRegion> Foldings {
+
+		public override System.Threading.Tasks.Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (System.Threading.CancellationToken cancellationToken)
+		{
+			return System.Threading.Tasks.Task.FromResult((IReadOnlyList<FoldingRegion>)Foldings.ToList ());
+		}
+
+		public IEnumerable<FoldingRegion> Foldings {
 			get {				
 				if (XDocument == null)
 					yield break;
@@ -70,7 +76,7 @@ namespace MonoDevelop.AspNet.WebForms
 							
 							yield return new FoldingRegion (
 								string.Format ("<{0}#{1}... >", el.Name.FullName, controlId),
-							    new DomRegion (el.Region.Begin, el.ClosingTag.Region.End));       
+							    new DocumentRegion (el.Region.Begin, el.ClosingTag.Region.End));       
 						}
 						continue;
 					}
diff --git a/main/src/addins/AspNet/WebForms/WebFormsParser.cs b/main/src/addins/AspNet/WebForms/WebFormsParser.cs
index af8a662e39..ba38dd44d7 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsParser.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsParser.cs
@@ -30,7 +30,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Projects;
@@ -38,12 +37,14 @@ using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Parser;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.AspNet.WebForms
 {
 	public class WebFormsParser : TypeSystemParser
 	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader tr, Project project = null)
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions parseOptions, System.Threading.CancellationToken cancellationToken)
 		{
 			var info = new WebFormsPageInfo ();
 			var errors = new List<Error> ();
@@ -54,9 +55,9 @@ namespace MonoDevelop.AspNet.WebForms
 			);
 			
 			try {
-				parser.Parse (tr);
+				parser.Parse (parseOptions.Content.CreateReader ());
 			} catch (Exception ex) {
-				LoggingService.LogError ("Unhandled error parsing ASP.NET document '" + (fileName ?? "") + "'", ex);
+				LoggingService.LogError ("Unhandled error parsing ASP.NET document '" + (parseOptions.FileName ?? "") + "'", ex);
 				errors.Add (new Error (ErrorType.Error, "Unhandled error parsing ASP.NET document: " + ex.Message));
 			}
 
@@ -67,20 +68,20 @@ namespace MonoDevelop.AspNet.WebForms
 			XDocument xDoc = parser.Nodes.GetRoot ();
 			info.Populate (xDoc, errors);
 			
-			var type = AspNetAppProjectFlavor.DetermineWebSubtype (fileName);
+			var type = AspNetAppProjectFlavor.DetermineWebSubtype (parseOptions.FileName);
 			if (type != info.Subtype) {
 				if (info.Subtype == WebSubtype.None) {
-					errors.Add (new Error (ErrorType.Error, "File directive is missing", 1, 1));
+					errors.Add (new Error (ErrorType.Error, "File directive is missing", new DocumentLocation (1, 1)));
 				} else {
 					type = info.Subtype;
-					errors.Add (new Error (ErrorType.Warning, "File directive does not match page extension", 1, 1));
+					errors.Add (new Error (ErrorType.Warning, "File directive does not match page extension", new DocumentLocation (1, 1)));
 				}
 			}
 			
-			var result = new WebFormsParsedDocument (fileName, type, info, xDoc);
-			result.Add (errors);
+			var result = new WebFormsParsedDocument (parseOptions.FileName, type, info, xDoc);
+			result.AddRange (errors);
 			
-			return result;
+			return System.Threading.Tasks.Task.FromResult((ParsedDocument)result);
 		}
 	}
 }
diff --git a/main/src/addins/AspNet/WebForms/WebFormsSyntaxMode.cs b/main/src/addins/AspNet/WebForms/WebFormsSyntaxMode.cs
index fb7261cf2a..6b68b77184 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsSyntaxMode.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsSyntaxMode.cs
@@ -24,6 +24,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Xml;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/main/src/addins/AspNet/WebForms/WebFormsToolboxNode.cs b/main/src/addins/AspNet/WebForms/WebFormsToolboxNode.cs
index 6cd128fa01..2d7c8c3a28 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsToolboxNode.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsToolboxNode.cs
@@ -30,7 +30,6 @@ using System;
 using System.ComponentModel;
 using System.Drawing.Design;
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Core.Serialization;
@@ -124,9 +123,9 @@ namespace MonoDevelop.AspNet.WebForms
 			//FIXME: only do this on the insert, not the preview - or remove it afterwards
 			RegisterReference (document.Project);
 			
-			var database = document.Compilation;
+			var database = document.GetCompilationAsync ().Result;
 			
-			var cls = database.FindType (Type.Load ());
+			var cls = database.GetTypeByMetadataName (Type.Load ().FullName);
 			if (cls == null)
 				return tag;
 
diff --git a/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs b/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs
index 103842f2de..b6c4f0a9d1 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs
@@ -34,9 +34,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using Mono.TextEditor;
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.TypeSystem;
@@ -45,12 +42,16 @@ using MonoDevelop.Xml.Dom;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Dom;
 using System.Reflection;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
 
 namespace MonoDevelop.AspNet.WebForms
 {
 	public class WebFormsTypeContext
 	{
-		ICompilation compilation;
+		Compilation compilation;
 		DotNetProject project;
 		WebFormsParsedDocument doc;
 		AspNetAppProjectFlavor aspFlavor;
@@ -80,7 +81,7 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 		}
 
-		public ICompilation Compilation {
+		public Compilation Compilation {
 			get {
 				if (compilation == null)
 					UpdateCompilation ();
@@ -105,11 +106,11 @@ namespace MonoDevelop.AspNet.WebForms
 		void UpdateCompilation ()
 		{
 			const string dummyAsmName = "CompiledAspNetPage";
-			IUnresolvedAssembly asm = new DefaultUnresolvedAssembly (dummyAsmName);
-			compilation = new SimpleCompilation (asm, GetReferencedAssemblies ());
+			compilation = CSharpCompilation.Create (dummyAsmName)
+				.AddReferences (GetReferencedAssemblies ());
 		}
 		
-		public IType GetType (string tagPrefix, string tagName, string htmlTypeAttribute)
+		public INamedTypeSymbol GetType (string tagPrefix, string tagName, string htmlTypeAttribute)
 		{
 			if (tagPrefix == null || tagPrefix.Length < 1)
 				return HtmlControlTypeLookup (tagName, htmlTypeAttribute);
@@ -142,7 +143,7 @@ namespace MonoDevelop.AspNet.WebForms
 			return GetControlCompletionData (AssemblyTypeLookup ("System.Web.UI", "Control"));
 		}
 		
-		public IEnumerable<CompletionData> GetControlCompletionData (IType baseType)
+		public IEnumerable<CompletionData> GetControlCompletionData (INamedTypeSymbol baseType)
 		{
 			var names = new HashSet<string> ();
 
@@ -150,7 +151,7 @@ namespace MonoDevelop.AspNet.WebForms
 				var ard = rd as WebFormsPageInfo.AssemblyRegisterDirective;
 				if (ard != null) {
 					string prefix = ard.TagPrefix + ":";
-					foreach (IType cls in ListControlClasses (baseType, ard.Namespace))
+					foreach (var cls in ListControlClasses (baseType, ard.Namespace, Compilation))
 						if (names.Add (prefix + cls.Name))
 							yield return new AspTagCompletionData (prefix, cls);
 					continue;
@@ -162,7 +163,7 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 		}
 		
-		public IType GetControlType (string tagPrefix, string tagName)
+		public INamedTypeSymbol GetControlType (string tagPrefix, string tagName)
 		{
 			if (String.IsNullOrEmpty (tagPrefix))
 				return null;
@@ -188,14 +189,14 @@ namespace MonoDevelop.AspNet.WebForms
 			return AssemblyTypeLookup ("System.Web.UI", "Control");
 		}
 		
-		public string GetTagPrefix (IType control)
+		public string GetTagPrefix (INamedTypeSymbol control)
 		{
-			if (control.Namespace == "System.Web.UI.HtmlControls")
+			if (control.ContainingNamespace.GetFullName () == "System.Web.UI.HtmlControls")
 				return string.Empty;
 			
 			foreach (var rd in GetControls ()) {
 				var ard = rd as WebFormsPageInfo.AssemblyRegisterDirective;
-				if (ard != null && ard.Namespace == control.Namespace)
+				if (ard != null && ard.Namespace == control.ContainingNamespace.GetFullName ())
 					return ard.TagPrefix;
 			}
 
@@ -210,7 +211,7 @@ namespace MonoDevelop.AspNet.WebForms
 		/// <summary>
 		/// Gets a tag prefix, also returning the directive that would have to be added if necessary.
 		/// </summary>
-		public string GetTagPrefixWithNewDirective (IType control, string assemblyName, string desiredPrefix, 
+		public string GetTagPrefixWithNewDirective (INamedTypeSymbol control, string assemblyName, string desiredPrefix, 
 			out WebFormsPageInfo.RegisterDirective directiveNeededToAdd)
 		{
 			directiveNeededToAdd = null;
@@ -225,14 +226,14 @@ namespace MonoDevelop.AspNet.WebForms
 			
 			var an = SystemAssemblyService.ParseAssemblyName (assemblyName);
 			
-			directiveNeededToAdd = new WebFormsPageInfo.AssemblyRegisterDirective (prefix, control.Namespace, an.Name);
+			directiveNeededToAdd = new WebFormsPageInfo.AssemblyRegisterDirective (prefix, control.ContainingNamespace.GetFullName (), an.Name);
 			
 			return prefix;
 		}
 		
 		#region "Refactoring" operations -- things that modify the file
 		
-		string GetPrefix (IType control)
+		string GetPrefix (INamedTypeSymbol control)
 		{
 			//FIXME: make this work 
 			/*
@@ -266,7 +267,7 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 			*/
 			//generate a new prefix base on initials of namespace
-			string[] namespaces = control.Namespace.Split ('.');
+			string[] namespaces = control.ContainingNamespace.GetFullName ().Split ('.');
 			char[] charr = new char[namespaces.Length];
 			for (int i = 0; i < charr.Length; i++)
 				charr[i] = char.ToLower (namespaces[i][0]);
@@ -290,7 +291,7 @@ namespace MonoDevelop.AspNet.WebForms
 			return p != null? p.Value as string : null;
 		}
 		
-		public void AddRegisterDirective (WebFormsPageInfo.RegisterDirective directive, TextEditorData editor, bool preserveCaretPosition)
+		public void AddRegisterDirective (WebFormsPageInfo.RegisterDirective directive, TextEditor editor, bool preserveCaretPosition)
 		{
 			if (doc == null)
 				return;
@@ -302,16 +303,17 @@ namespace MonoDevelop.AspNet.WebForms
 			doc.Info.RegisteredTags.Add (directive);
 			
 			var line = Math.Max (node.Region.EndLine, node.Region.BeginLine);
-			var pos = editor.Document.LocationToOffset (line, editor.Document.GetLine (line - 1).Length);
+			var pos = editor.LocationToOffset (line, editor.GetLine (line - 1).Length);
 			if (pos < 0)
 				return;
 			
 			using (var undo = editor.OpenUndoGroup ()) {
-				var oldCaret = editor.Caret.Offset;
-				
-				var inserted = editor.Insert (pos, editor.EolMarker + directive);
+				var oldCaret = editor.CaretOffset;
+				var text = editor.FormatString (pos, editor.EolMarker + directive);
+				var inserted = text.Length;
+				editor.InsertText (pos, text);
 				if (preserveCaretPosition) {
-					editor.Caret.Offset = (pos < oldCaret)? oldCaret + inserted : oldCaret;
+					editor.CaretOffset = (pos < oldCaret)? oldCaret + inserted : oldCaret;
 				}
 			}
 		}
@@ -375,13 +377,15 @@ namespace MonoDevelop.AspNet.WebForms
 			return usings;
 		}
 
-		IEnumerable<IAssemblyReference> GetReferencedAssemblies ()
+		IEnumerable<MetadataReference> GetReferencedAssemblies ()
 		{
-			var references = new HashSet<IAssemblyReference> ();
-
-			if (project != null)
-				references.Add (TypeSystemService.GetCompilation (project).MainAssembly.UnresolvedAssembly);
+			var references = new HashSet<MetadataReference> ();
 
+			if (project != null) {
+				var task = TypeSystemService.GetCompilationAsync (project);
+				if (task.Result != null)
+					references.Add (task.Result.ToMetadataReference ());
+			}
 			if (doc != null)
 				foreach (var asm in doc.Info.Assemblies.Select (a => a.Name).Select (name => GetReferencedAssembly (name)))
 					references.Add (asm);
@@ -392,9 +396,9 @@ namespace MonoDevelop.AspNet.WebForms
 			references.Remove (null);
 
 			return references;
- 		}
+		}
 
-		IAssemblyReference GetReferencedAssembly (string assemblyName)
+		MetadataReference GetReferencedAssembly (string assemblyName)
 		{
 			var parsed = SystemAssemblyService.ParseAssemblyName (assemblyName);
 			if (string.IsNullOrEmpty (parsed.Name))
@@ -406,12 +410,12 @@ namespace MonoDevelop.AspNet.WebForms
 
 			string path = GetAssemblyPath (assemblyName);
 			if (path != null)
-				return TypeSystemService.LoadAssemblyContext (TargetRuntime, TargetFramework, path);
+				return LoadMetadataReference (path);
 
 			return null;
 		}
 
-		IAssemblyReference GetProjectReference (AssemblyName parsed)
+		MetadataReference GetProjectReference (AssemblyName parsed)
 		{
 			if (project == null)
 				return null;
@@ -422,20 +426,29 @@ namespace MonoDevelop.AspNet.WebForms
 				if (reference.ReferenceType == ReferenceType.Package || reference.ReferenceType == ReferenceType.Assembly) {
 					foreach (string refPath in reference.GetReferencedFileNames (null))
 						if (Path.GetFileName (refPath) == dllName)
-							return TypeSystemService.LoadAssemblyContext (project.TargetRuntime, project.TargetFramework, refPath);
+							return LoadMetadataReference (refPath);
 				}
 				else
 					if (reference.ReferenceType == ReferenceType.Project && parsed.Name == reference.Reference) {
 						var p = project.ParentSolution.FindProjectByName (reference.Reference) as DotNetProject;
 						if (p == null)
 							continue;
-						return TypeSystemService.GetCompilation (p).MainAssembly.UnresolvedAssembly;
+						return TypeSystemService.GetCompilationAsync (p).Result.ToMetadataReference ();
 					}
 			}
 
 			return null;
 		}
 
+		MetadataReference LoadMetadataReference (string path)
+		{
+			var projectId = Microsoft.CodeAnalysis.ProjectId.CreateNewId ("WebFormsTypeContext");
+			var reference = MetadataReferenceCache.LoadReference (projectId, path);
+			MetadataReferenceCache.RemoveReferences (projectId);
+
+			return reference;
+		}
+
 		string GetAssemblyPath (string assemblyName)
 		{
 			var parsed = SystemAssemblyService.ParseAssemblyName (assemblyName);
@@ -545,7 +558,7 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 		}
 
-		IType HtmlControlTypeLookup (string tagName, string typeAttribute)
+		INamedTypeSymbol HtmlControlTypeLookup (string tagName, string typeAttribute)
 		{
 			var str = HtmlControlLookup (tagName, typeAttribute);
 			if (str != null)
@@ -553,41 +566,51 @@ namespace MonoDevelop.AspNet.WebForms
 			return null;
 		}
 
-		static IEnumerable<IType> ListControlClasses (IType baseType, string namespac)
+		static IEnumerable<INamedTypeSymbol> ListControlClasses (INamedTypeSymbol baseType, string namespac, Compilation compilation)
 		{
-			var baseTypeDefinition = baseType.GetDefinition ();
+			var baseTypeDefinition = baseType;
 			if (baseTypeDefinition == null)
 				yield break;
 
 			//return classes if they derive from system.web.ui.control
-			foreach (var type in baseTypeDefinition.GetSubTypeDefinitions ().Where (t => t.Namespace == namespac))
-				if (!type.IsAbstract && type.IsPublic)
+			foreach (var type in GetSubTypes (baseTypeDefinition, compilation).Where (t => TypeHasNamespace (t, namespac)))
+				if (!type.IsAbstract && type.DeclaredAccessibility == Accessibility.Public)
 					yield return type;
 
-			if (!baseTypeDefinition.IsAbstract && baseTypeDefinition.IsPublic && baseTypeDefinition.Namespace == namespac) {
+			if (!baseTypeDefinition.IsAbstract && baseTypeDefinition.DeclaredAccessibility == Accessibility.Public && TypeHasNamespace (baseTypeDefinition, namespac)) {
 				yield return baseType;
 			}
 		}
 
-		IType AssemblyTypeLookup (string namespac, string tagName)
+		static IEnumerable<INamedTypeSymbol> GetSubTypes (INamedTypeSymbol baseType, Compilation compilation)
+		{
+			return compilation.GlobalNamespace.GetAllTypes().Where (t => t.IsDerivedFromClass (baseType));
+		}
+
+		static bool TypeHasNamespace (INamedTypeSymbol type, string namespac)
+		{
+			return type.ContainingNamespace != null && type.ContainingNamespace.GetFullName () == namespac;
+		}
+
+		INamedTypeSymbol AssemblyTypeLookup (string namespac, string tagName)
 		{
 			var fullName = namespac + "." + tagName;
-			var type = ReflectionHelper.ParseReflectionName (fullName).Resolve (Compilation);
-			if (type.Kind == TypeKind.Unknown)
+			var type = Compilation.GetTypeByMetadataName (fullName);
+			if (type == null || type.Kind == SymbolKind.ErrorType)
 				return null;
 			return type;
 		}
 
-		public string GetControlPrefix (IType control)
+		public string GetControlPrefix (INamedTypeSymbol control)
 		{
-			if (control.Namespace == "System.Web.UI.WebControls")
+			if (control.ContainingNamespace.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat) == "System.Web.UI.WebControls")
 				return "asp";
-			if (control.Namespace == "System.Web.UI.HtmlControls")
+			if (control.ContainingNamespace.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat) == "System.Web.UI.HtmlControls")
 				return string.Empty;
 
 			//todo: handle user controls
 			foreach (var info in GetControls ().OfType<WebFormsPageInfo.AssemblyRegisterDirective> ()) {
-				if (info.Namespace == control.Namespace) {
+				if (info.Namespace == control.ContainingNamespace.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat)) {
 					if (AssemblyTypeLookup (info.Namespace, control.Name) != null)
 						return info.TagPrefix;
 				}
@@ -606,11 +629,11 @@ namespace MonoDevelop.AspNet.WebForms
 			return typeName ?? "System.Web.UI.UserControl";
 		}
 
-		IType GetUserControlType (string virtualPath)
+		INamedTypeSymbol GetUserControlType (string virtualPath)
 		{
 			var name = GetUserControlTypeName (virtualPath);
-			var type = ReflectionHelper.ParseReflectionName (name).Resolve (Compilation);
-			if (type.Kind == TypeKind.Unknown)
+			var type = Compilation.GetTypeByMetadataName (name);
+			if (type.Kind == SymbolKind.ErrorType)
 				return null;
 			return type;
 		}
@@ -618,9 +641,9 @@ namespace MonoDevelop.AspNet.WebForms
 
 	class AspTagCompletionData : CompletionData
 	{
-		readonly IType cls;
+		readonly INamedTypeSymbol cls;
 
-		public AspTagCompletionData (string prefix, IType cls)
+		public AspTagCompletionData (string prefix, INamedTypeSymbol cls)
 			: base (prefix + cls.Name, Gtk.Stock.GoForward)
 		{
 			this.cls = cls;
@@ -629,17 +652,17 @@ namespace MonoDevelop.AspNet.WebForms
 		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
 		{
 			var tt = base.CreateTooltipInformation (smartWrap);
-			tt.SignatureMarkup = cls.FullName;
-			tt.SummaryMarkup = AmbienceService.GetSummaryMarkup (cls.GetDefinition ());
+			tt.SignatureMarkup = cls.GetFullName ();
+			tt.SummaryMarkup = Ambience.GetSummaryMarkup (cls);
 			return tt;
 		}
 	}
 
 	class AspAttributeCompletionData : CompletionData
 	{
-		readonly IMember member;
+		readonly Microsoft.CodeAnalysis.ISymbol member;
 
-		public AspAttributeCompletionData (IMember member, string name = null)
+		public AspAttributeCompletionData (Microsoft.CodeAnalysis.ISymbol member, string name = null)
 			: base (name ?? member.Name, member.GetStockIcon ())
 		{
 			this.member = member;
@@ -649,7 +672,7 @@ namespace MonoDevelop.AspNet.WebForms
 		{
 			var tt = base.CreateTooltipInformation (smartWrap);
 			tt.SignatureMarkup = member.Name;
-			tt.SummaryMarkup = AmbienceService.GetSummaryMarkup (member);
+			tt.SummaryMarkup = Ambience.GetSummaryMarkup (member);
 			return tt;
 		}
 	}
diff --git a/main/src/addins/AspNet/packages.config b/main/src/addins/AspNet/packages.config
index ad0c448553..2f10116845 100644
--- a/main/src/addins/AspNet/packages.config
+++ b/main/src/addins/AspNet/packages.config
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

-  <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
+  <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />

+  <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />

+  <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />

+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>

diff --git a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj b/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj
index 9a1b28c5ed..bd02ec8375 100644
--- a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj
+++ b/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj
@@ -71,11 +71,6 @@
       <Name>MonoDevelop.DesignerSupport</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/main/src/addins/CBinding/CBinding.csproj b/main/src/addins/CBinding/CBinding.csproj
index 7962736351..617aa8a442 100644
--- a/main/src/addins/CBinding/CBinding.csproj
+++ b/main/src/addins/CBinding/CBinding.csproj
@@ -61,6 +61,22 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
@@ -83,21 +99,11 @@
       <Name>MonoDevelop.Deployment.Linux</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
       <Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
       <Name>MonoDevelop.DesignerSupport</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
       <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
       <Name>MonoDevelop.Refactoring</Name>
@@ -128,10 +134,16 @@
       <Name>Xwt</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
     <None Include="README" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="CBinding.addin.xml">
@@ -274,6 +286,7 @@
     <Compile Include="Parser\ExuberantCTagsManager.cs" />
     <Compile Include="Parser\BsdCTagsManager.cs" />
     <Compile Include="AddinInfo.cs" />
+    <Compile Include="Gui\DataWrapper.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
diff --git a/main/src/addins/CBinding/Gui/CTextEditorExtension.cs b/main/src/addins/CBinding/Gui/CTextEditorExtension.cs
index 690baf3ea6..d5e8ccf14e 100755..100644
--- a/main/src/addins/CBinding/Gui/CTextEditorExtension.cs
+++ b/main/src/addins/CBinding/Gui/CTextEditorExtension.cs
@@ -44,10 +44,15 @@ using MonoDevelop.Components;
 using MonoDevelop.Components.Commands;
 
 using CBinding.Parser;
-using Mono.TextEditor;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.Completion;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor.Extension;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace CBinding
 {
@@ -80,7 +85,6 @@ namespace CBinding
 			new KeyValuePair<string, GetMembersForExtension>(".", GetInstanceMembers)
 		};
 		
-		protected Mono.TextEditor.TextEditorData textEditorData{ get; set; }
 
 		public override string CompletionLanguage {
 			get {
@@ -101,7 +105,7 @@ namespace CBinding
 			return IsOpenBrace  (c) || IsCloseBrace (c);
 		}
 		
-		static int SearchMatchingBracket (TextEditorData editor, int offset, char openBracket, char closingBracket, int direction)
+		static int SearchMatchingBracket (IReadonlyTextDocument editor, int offset, char openBracket, char closingBracket, int direction)
 		{
 			bool isInString       = false;
 			bool isInChar         = false;	
@@ -142,7 +146,7 @@ namespace CBinding
 			return -1;
 		}
 		
-		static int GetClosingBraceForLine (TextEditorData editor, DocumentLine line, out int openingLine)
+		static int GetClosingBraceForLine (IReadonlyTextDocument editor, IDocumentLine line, out int openingLine)
 		{
 			int offset = SearchMatchingBracket (editor, line.Offset, '{', '}', -1);
 			if (offset == -1) {
@@ -150,46 +154,46 @@ namespace CBinding
 				return -1;
 			}
 				
-			openingLine = editor.Document.OffsetToLineNumber (offset);
+			openingLine = editor.OffsetToLineNumber (offset);
 			return offset;
 		}
 		
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			var line = Editor.Document.GetLine (Editor.Caret.Line);
-			string lineText = Editor.GetLineText (Editor.Caret.Line);
-			int lineCursorIndex = Math.Min (lineText.Length, Editor.Caret.Column);
+			var line = Editor.GetLine (Editor.CaretLine);
+			string lineText = Editor.GetLineText (Editor.CaretLine);
+			int lineCursorIndex = Math.Min (lineText.Length, Editor.CaretColumn);
 			
 			// Smart Indentation
-			if (Document.Editor.Options.IndentStyle == IndentStyle.Smart)
+			if (Editor.Options.IndentStyle == IndentStyle.Smart)
 			{
-				if (keyChar == '}') {
+				if (descriptor.KeyChar == '}') {
 					// Only indent if the brace is preceeded by whitespace.
 					if(AllWhiteSpace(lineText.Substring(0, lineCursorIndex))) {
 						int braceOpeningLine;
 						if(GetClosingBraceForLine(Editor, line, out braceOpeningLine) >= 0)
 						{
-							Editor.Replace (line.Offset, line.Length, GetIndent(Editor, braceOpeningLine, 0) + "}" + lineText.Substring(lineCursorIndex));
-							Editor.Document.CommitLineUpdate (line);
+							Editor.ReplaceText (line.Offset, line.Length, GetIndent(Editor, braceOpeningLine, 0) + "}" + lineText.Substring(lineCursorIndex));
 							return false;
 						}
 					}
 				} else {
-					switch(key)
+					switch(descriptor.SpecialKey)
 					{
-						case Gdk.Key.Return:
+						case SpecialKey.Return:
 							// Calculate additional indentation, if any.
 							char finalChar = '\0';
 							char nextChar = '\0';
 							string indent = String.Empty;
 							if (!String.IsNullOrEmpty (Editor.SelectedText)) {
 								int cursorPos = Editor.SelectionRange.Offset;
+
+								Editor.RemoveText (Editor.SelectionRange);
 							
-								Editor.DeleteSelectedText ();
-								Editor.Caret.Offset = cursorPos;
+								Editor.CaretOffset = cursorPos;
 								
-								lineText = Editor.GetLineText (Editor.Caret.Line);
-								lineCursorIndex = Editor.Caret.Column;
+								lineText = Editor.GetLineText (Editor.CaretLine);
+								lineCursorIndex = Editor.CaretColumn;
 	//							System.Console.WriteLine(TextEditorData.Caret.Offset);
 							}
 							if(lineText.Length > 0)
@@ -201,7 +205,7 @@ namespace CBinding
 									nextChar = lineText[lineCursorIndex];
 	
 								if(finalChar == '{')
-									indent = Document.Editor.Options.IndentationString;
+									indent = Editor.Options.GetIndentationString ();
 							}
 	
 							// If the next character is an closing brace, indent it appropriately.
@@ -216,7 +220,7 @@ namespace CBinding
 							}
 						
 							// Default indentation method
-							Editor.InsertAtCaret (Editor.EolMarker + indent + GetIndent(Editor, Editor.Document.OffsetToLineNumber (line.Offset), lineCursorIndex));
+							Editor.InsertAtCaret (Editor.EolMarker + indent + GetIndent(Editor, Editor.OffsetToLineNumber (line.Offset), lineCursorIndex));
 							
 							return false;
 						
@@ -224,10 +228,10 @@ namespace CBinding
 				}
 			}
 			
-			return base.KeyPress (key, keyChar, modifier);
+			return base.KeyPress (descriptor);
 		}
-		
-		public override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
+
+		public override Task<ICompletionDataList> HandleCodeCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
 			string lineText = Editor.GetLineText (completionContext.TriggerLine).TrimEnd();
 			
@@ -242,15 +246,15 @@ namespace CBinding
 					if (string.IsNullOrEmpty (itemName))
 						return null;
 					
-					return pair.Value (this, pair.Key, itemName);
+					return Task.FromResult ((ICompletionDataList)pair.Value (this, pair.Key, itemName));
 				}
 			}
 			
 			if (char.IsLetter (completionChar)) {
 				// Aggressive completion
-				ICompletionDataList list = GlobalComplete ();
-				triggerWordLength = ResetTriggerOffset (completionContext);
-				return list;
+				var list = GlobalComplete ();
+				list.TriggerWordLength = ResetTriggerOffset (completionContext);
+				return Task.FromResult ((ICompletionDataList)list);
 			}
 			
 			return null;
@@ -286,12 +290,11 @@ namespace CBinding
 		    CodeCompletionContext completionContext)
 		{
 			int pos = completionContext.TriggerOffset;
-			string lineText = Editor.GetLineText (Editor.Caret.Line).Trim();
+			string lineText = Editor.GetLineText (Editor.CaretLine).Trim();
 			
 			foreach (KeyValuePair<string, GetMembersForExtension> pair in completionExtensions) {
 				if(lineText.EndsWith(pair.Key)) {
-					int triggerWordLength = completionContext.TriggerWordLength;
-					return HandleCodeCompletion (completionContext, Editor.GetCharAt (pos), ref triggerWordLength);
+					return HandleCodeCompletionAsync (completionContext, Editor.GetCharAt (pos)).Result;
 				}
 			}
 
@@ -350,7 +353,7 @@ namespace CBinding
 		
 		private CompletionDataList GetMembersOfItem (string itemFullName)
 		{
-			CProject project = Document.Project as CProject;
+			CProject project = DocumentContext.Project as CProject;
 			
 			if (project == null)
 				return null;
@@ -361,7 +364,7 @@ namespace CBinding
 			
 			LanguageItem container = null;
 			
-			string currentFileName = Document.FileName;
+			string currentFileName = DocumentContext.Name;
 			bool in_project = false;
 				
 			foreach (LanguageItem li in info.Containers ()) {
@@ -433,7 +436,7 @@ namespace CBinding
 		/// </returns>
 		private CompletionDataList GetMembersOfInstance (string instanceName, bool isPointer)
 		{
-			CProject project = Document.Project as CProject;
+			CProject project = DocumentContext.Project as CProject;
 			
 			if (project == null)
 				return null;
@@ -444,7 +447,7 @@ namespace CBinding
 			
 			string container = null;
 			
-			string currentFileName = Document.FileName;
+			string currentFileName = DocumentContext.Name;
 			bool in_project = false;
 			
 			// Find the typename of the instance
@@ -518,9 +521,9 @@ namespace CBinding
 				}
 		}
 
-		private ICompletionDataList GlobalComplete ()
+		private CompletionDataList GlobalComplete ()
 		{
-			CProject project = Document.Project as CProject;
+			CProject project = DocumentContext.Project as CProject;
 			
 			if (project == null)
 				return null;
@@ -544,7 +547,7 @@ namespace CBinding
 			foreach (Macro m in info.Macros)
 				list.Add (new CompletionData (m));
 			
-			string currentFileName = Document.FileName;
+			string currentFileName = DocumentContext.Name;
 			
 			if (info.IncludedFiles.ContainsKey (currentFileName)) {
 				foreach (CBinding.Parser.FileInformation fi in info.IncludedFiles[currentFileName]) {
@@ -567,19 +570,18 @@ namespace CBinding
 			return list;
 		}
 		
-		public override  MonoDevelop.Ide.CodeCompletion.ParameterDataProvider HandleParameterCompletion (
-		    CodeCompletionContext completionContext, char completionChar)
+		public override Task<MonoDevelop.Ide.CodeCompletion.ParameterHintingResult> HandleParameterCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
 			if (completionChar != '(')
 				return null;
 			
-			CProject project = Document.Project as CProject;
+			CProject project = DocumentContext.Project as CProject;
 			
 			if (project == null)
 				return null;
 			
 			ProjectInformation info = ProjectInformationManager.Instance.Get (project);
-			string lineText = Editor.GetLineText (Editor.Caret.Line).TrimEnd ();
+			string lineText = Editor.GetLineText (Editor.CaretLine).TrimEnd ();
 			if (lineText.EndsWith (completionChar.ToString (), StringComparison.Ordinal))
 				lineText = lineText.Remove (lineText.Length-1).TrimEnd ();
 			
@@ -592,7 +594,7 @@ namespace CBinding
 			if (string.IsNullOrEmpty (functionName))
 				return null;
 			
-			return new ParameterDataProvider (nameStart, Document, info, functionName);
+			return Task.FromResult ((MonoDevelop.Ide.CodeCompletion.ParameterHintingResult)new ParameterDataProvider (nameStart, Editor, info, functionName));
 		}
 		
 		private bool AllWhiteSpace (string lineText)
@@ -606,7 +608,7 @@ namespace CBinding
 		}
 		
 		// Snatched from DefaultFormattingStrategy
-		private string GetIndent (TextEditorData d, int lineNumber, int terminateIndex)
+		private string GetIndent (IReadonlyTextDocument d, int lineNumber, int terminateIndex)
 		{
 			string lineText = d.GetLineText (lineNumber);
 			if(terminateIndex > 0)
@@ -626,9 +628,9 @@ namespace CBinding
 		[CommandHandler (MonoDevelop.DesignerSupport.Commands.SwitchBetweenRelatedFiles)]
 		protected void Run ()
 		{
-			var cp = this.Document.Project as CProject;
+			var cp = this.DocumentContext.Project as CProject;
 			if (cp != null) {
-				string match = cp.MatchingFile (this.Document.FileName);
+				string match = cp.MatchingFile (this.DocumentContext.Name);
 				if (match != null)
 					MonoDevelop.Ide.IdeApp.Workbench.OpenDocument (match, true);
 			}
@@ -637,8 +639,8 @@ namespace CBinding
 		[CommandUpdateHandler (MonoDevelop.DesignerSupport.Commands.SwitchBetweenRelatedFiles)]
 		protected void Update (CommandInfo info)
 		{
-			var cp = this.Document.Project as CProject;
-			info.Visible = info.Visible = cp != null && cp.MatchingFile (this.Document.FileName) != null;
+			var cp = this.DocumentContext.Project as CProject;
+			info.Visible = info.Visible = cp != null && cp.MatchingFile (this.DocumentContext.Name) != null;
 		}
 		
 		#region IPathedDocument implementation
@@ -655,9 +657,10 @@ namespace CBinding
 			object tag = path[index].Tag;
 			DropDownBoxListWindow.IListDataProvider provider = null;
 			if (tag is ParsedDocument) {
-				provider = new CompilationUnitDataProvider (Document);
+				provider = new CompilationUnitDataProvider (Editor, DocumentContext);
 			} else {
-				provider = new DataProvider (Document, tag, GetAmbience ());
+				// TODO: Roslyn port
+				//provider = new DataProvider (Editor, DocumentContext, tag, new NetAmbience ());
 			}
 			
 			DropDownBoxListWindow window = new DropDownBoxListWindow (provider);
@@ -679,7 +682,7 @@ namespace CBinding
 		#endregion
 		
 		// Yoinked from C# binding
-		void UpdatePath (object sender, Mono.TextEditor.DocumentLocationEventArgs e)
+		void UpdatePath (object sender, EventArgs e)
 		{
 	/*		var unit = Document.ParsedDocument;
 			if (unit == null)
@@ -718,13 +721,25 @@ namespace CBinding
 			OnPathChanged (new DocumentPathChangedEventArgs (prev));*/
 		}
 		
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
-			textEditorData = Document.Editor;
 			UpdatePath (null, null);
-			textEditorData.Caret.PositionChanged += UpdatePath;
-			Document.DocumentParsed += delegate { UpdatePath (null, null); };
+			Editor.CaretPositionChanged += UpdatePath;
+			DocumentContext.DocumentParsed += HandleDocumentParsed;
+		}
+
+		void HandleDocumentParsed (object sender, EventArgs e)
+		{
+			UpdatePath (null, null);
+		}
+
+		public override void Dispose ()
+		{
+			Editor.CaretPositionChanged -= UpdatePath;
+			DocumentContext.DocumentParsed -= HandleDocumentParsed;
+
+			base.Dispose ();
 		}
 		
 		/// <summary>
@@ -738,7 +753,7 @@ namespace CBinding
 			int accumulator = 0;
 			
 			for (;
-			     1 < i && char.IsLetterOrDigit (Editor.GetCharAt (i));
+				1 < i && char.IsLetterOrDigit (Editor.GetCharAt (i));
 			     --i, ++accumulator);
 			completionContext.TriggerOffset = i-1;
 			return accumulator+1;
@@ -747,7 +762,7 @@ namespace CBinding
 		[CommandHandler (MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration)]
 		public void GotoDeclaration ()
 		{
-			LanguageItem item = GetLanguageItemAt (Editor.Caret.Location);
+			LanguageItem item = GetLanguageItemAt (Editor.CaretLocation);
 			if (item != null)
 				IdeApp.Workbench.OpenDocument ((FilePath)item.File, (int)item.Line, 1);
 		}
@@ -755,13 +770,13 @@ namespace CBinding
 		[CommandUpdateHandler (MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration)]
 		public void CanGotoDeclaration (CommandInfo item)
 		{
-			item.Visible = (GetLanguageItemAt (Editor.Caret.Location) != null);
+			item.Visible = (GetLanguageItemAt (Editor.CaretLocation) != null);
 			item.Bypass = !item.Visible;
 		}
 		
 		private LanguageItem GetLanguageItemAt (DocumentLocation location)
 		{
-			CProject project = Document.Project as CProject;
+			CProject project = DocumentContext.Project as CProject;
 			string token = GetTokenAt (location);
 			if (project != null && !string.IsNullOrEmpty (token)) {
 				ProjectInformation info = ProjectInformationManager.Instance.Get (project);
diff --git a/main/src/addins/CBinding/Gui/DataProvider.cs b/main/src/addins/CBinding/Gui/DataProvider.cs
index 1027c44d44..38511c93ec 100644
--- a/main/src/addins/CBinding/Gui/DataProvider.cs
+++ b/main/src/addins/CBinding/Gui/DataProvider.cs
@@ -39,48 +39,44 @@ using MonoDevelop.Ide.CodeCompletion;
 
 using CBinding.Parser;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.Completion;
+using MonoDevelop.Ide.Editor;
 
 namespace CBinding
 {
-	public class ParameterDataProvider : MonoDevelop.Ide.CodeCompletion.ParameterDataProvider
+	public class ParameterDataProvider : MonoDevelop.Ide.CodeCompletion.ParameterHintingResult
 	{
-		private Mono.TextEditor.TextEditorData editor;
+		private TextEditor editor;
 		private List<Function> functions = new List<Function> ();
 
-		public ParameterDataProvider (int startOffset, Document document, ProjectInformation info, string functionName) :base (startOffset)
+		public ParameterDataProvider (int startOffset, TextEditor editor, ProjectInformation info, string functionName) :base (startOffset)
 		{
-			this.editor = document.Editor;
+			this.editor = editor;
 			
 			foreach (Function f in info.Functions) {
 				if (f.Name == functionName) {
-					functions.Add (f);
+					data.Add (new DataWrapper (f));
 				}
 			}
 			
-			string currentFile = document.FileName;
+			string currentFile = editor.FileName;
 			
 			if (info.IncludedFiles.ContainsKey (currentFile)) {
 				foreach (CBinding.Parser.FileInformation fi in info.IncludedFiles[currentFile]) {
 					foreach (Function f in fi.Functions) {
 						if (f.Name == functionName) {
-							functions.Add (f);
+							data.Add (new DataWrapper (f));
 						}
 					}
 				}
 			}
 		}
 		
-		// Returns the number of methods
-		public override int Count {
-			get { return functions.Count; }
-		}
 		
 		// Returns the index of the parameter where the cursor is currently positioned.
 		// -1 means the cursor is outside the method parameter list
 		// 0 means no parameter entered
 		// > 0 is the index of the parameter (1-based)
-		public int GetCurrentParameterIndex (ICompletionWidget widget, CodeCompletionContext ctx)
+		internal int GetCurrentParameterIndex (ICompletionWidget widget, CodeCompletionContext ctx)
 		{
 			int cursor = widget.CurrentCodeCompletionContext.TriggerOffset;
 			int i = ctx.TriggerOffset;
@@ -111,7 +107,7 @@ namespace CBinding
 		// in the parameter information window.
 		public string GetHeading (int overload, string[] parameterMarkup, int currentParameter)
 		{
-			Function function = functions[overload];
+			Function function = ((DataWrapper)this[overload]).Function;
 			string paramTxt = string.Join (", ", parameterMarkup);
 			
 			int len = function.FullName.LastIndexOf ("::");
@@ -136,24 +132,10 @@ namespace CBinding
 		// Returns the text to use to represent the specified parameter
 		public string GetParameterDescription (int overload, int paramIndex)
 		{
-			Function function = functions[overload];
+			Function function = ((DataWrapper)this[overload]).Function;
 			
 			return GLib.Markup.EscapeText (function.Parameters[paramIndex]);
 		}
-		
-		// Returns the number of parameters of the specified method
-		public override int GetParameterCount (int overload)
-		{
-			return functions[overload].Parameters.Length;
-		}
-		public override string GetParameterName (int overload, int paramIndex)
-		{
-			return "";
-		}
-		public override bool AllowParameterList (int overload)
-		{
-			return false;
-		}
 	}
 	
 	public class CompletionData : MonoDevelop.Ide.CodeCompletion.CompletionData
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IEditableTextBuffer.cs b/main/src/addins/CBinding/Gui/DataWrapper.cs
index c606819800..a318fe4740 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IEditableTextBuffer.cs
+++ b/main/src/addins/CBinding/Gui/DataWrapper.cs
@@ -1,10 +1,13 @@
 //
-// IEditableTextBuffer.cs
+// DataProvider.cs
 //
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
+// Authors:
+//   Marcos David Marin Amador <MarcosMarin@gmail.com>
 //
-// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2007 Marcos David Marin Amador
+//
+//
+// This source code is licenced under The MIT License:
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -27,44 +30,54 @@
 //
 
 using System;
-using MonoDevelop.Projects.Text;
+using System.Collections;
+using System.Collections.Generic;
 
-namespace MonoDevelop.Ide.Gui.Content
-{
-	public interface IEditableTextBuffer : ITextBuffer, IEditableTextFile, IUndoHandler
-	{	
-		int LineCount { get; }
-		void SetCaretTo (int line, int column);
-		void SetCaretTo (int line, int column, bool highlightLine);
-		void SetCaretTo (int line, int column, bool highlightLine, bool centerCaret);
-		bool HasInputFocus { get; }
+ 
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.CodeCompletion;
 
-		void RunWhenLoaded (System.Action action);
+using CBinding.Parser;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
 
-		event EventHandler CaretPositionSet;
-		event EventHandler<TextChangedEventArgs> TextChanged;
-	}
-	
-	public class TextChangedEventArgs : System.EventArgs
+namespace CBinding
+{
+	sealed class DataWrapper : ParameterHintingData
 	{
-		int startIndex;
-		public int StartIndex {
-			get { 
-				return startIndex; 
+		readonly Function f;
+
+		public Function Function {
+			get {
+				return f;
 			}
 		}
-		
-		int endIndex;
-		public int EndIndex {
-			get { 
-				return endIndex; 
+
+		public DataWrapper (Function f) : base(null)
+		{
+			this.f = f;
+		}
+
+		public override int ParameterCount {
+			get {
+				return f.ParameterCount;
+			}
+		}
+
+		public override bool IsParameterListAllowed {
+			get {
+				return f.IsParameterListAllowed;
 			}
 		}
-		
-		public TextChangedEventArgs (int startIndex, int endIndex)
+
+		public override string GetParameterName (int parameter)
+		{
+			return f.GetParameterName (parameter);
+		}
+
+		public override TooltipInformation CreateTooltipInformation (TextEditor editor, DocumentContext ctx, int currentParameter, bool smartWrap)
 		{
-			this.startIndex = startIndex;
-			this.endIndex   = endIndex;
+			return null;
 		}
 	}
 }
diff --git a/main/src/addins/CBinding/Navigation/LanguageItemCommandHandler.cs b/main/src/addins/CBinding/Navigation/LanguageItemCommandHandler.cs
index cddd0e13a7..7c25253644 100644
--- a/main/src/addins/CBinding/Navigation/LanguageItemCommandHandler.cs
+++ b/main/src/addins/CBinding/Navigation/LanguageItemCommandHandler.cs
@@ -33,6 +33,7 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Components;
 using CBinding.Parser;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor;
 
 namespace CBinding.Navigation
 {
@@ -44,7 +45,7 @@ namespace CBinding.Navigation
 			Document doc = IdeApp.Workbench.OpenDocument (item.File);
 			//bool isMacro = item is Macro;
 			
-			doc.Editor.SetCaretTo ((int)item.Line, 0); // TODO: get column?
+			doc.Editor.CaretLocation = new DocumentLocation ((int)item.Line, 1); // TODO: get column?
 		}
 	}
 }
diff --git a/main/src/addins/CBinding/Parser/CDocumentParser.cs b/main/src/addins/CBinding/Parser/CDocumentParser.cs
index 0d13cfbbe7..82cea2c6a8 100755
--- a/main/src/addins/CBinding/Parser/CDocumentParser.cs
+++ b/main/src/addins/CBinding/Parser/CDocumentParser.cs
@@ -35,6 +35,7 @@ using MonoDevelop.Ide;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using MonoDevelop.Core.Text;
 
 namespace CBinding.Parser
 {
@@ -43,13 +44,15 @@ namespace CBinding.Parser
 	/// </summary>
 	public class CDocumentParser:  TypeSystemParser
 	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader reader, Project project = null)
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions options, System.Threading.CancellationToken cancellationToken)
 		{
+			var fileName = options.FileName;
+			var project = options.Project;
 			var doc = new DefaultParsedDocument (fileName);
 			doc.Flags |= ParsedDocumentFlags.NonSerializable;
 			ProjectInformation pi = ProjectInformationManager.Instance.Get (project);
 			
-			string content = reader.ReadToEnd ();
+			string content = options.Content.Text;
 			string[] contentLines = content.Split (new string[]{Environment.NewLine}, StringSplitOptions.None);
 			
 			var globals = new DefaultUnresolvedTypeDefinition ("", GettextCatalog.GetString ("(Global Scope)"));
@@ -58,7 +61,7 @@ namespace CBinding.Parser
 				foreach (LanguageItem li in pi.Containers ()) {
 					if (null == li.Parent && FilePath.Equals (li.File, fileName)) {
 						var tmp = AddLanguageItem (pi, globals, li, contentLines) as IUnresolvedTypeDefinition;
-						if (null != tmp){ doc.TopLevelTypeDefinitions.Add (tmp); }
+						if (null != tmp){ /*doc.TopLevelTypeDefinitions.Add (tmp);*/ }
 					}
 				}
 				
@@ -70,8 +73,8 @@ namespace CBinding.Parser
 				}
 			}
 			
-			doc.TopLevelTypeDefinitions.Add (globals);
-			return doc;
+			//doc.TopLevelTypeDefinitions.Add (globals);
+			return System.Threading.Tasks.Task.FromResult((ParsedDocument)doc);
 		}
 		
 		/// <summary>
diff --git a/main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs b/main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs
index 70c59b68ec..fb9109f3bc 100644
--- a/main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs
+++ b/main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs
@@ -37,17 +37,21 @@ using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Components;
 
 using Gtk;
+using MonoDevelop.Ide.Editor;
 
 namespace CBinding.Parser
 {
 	// Yoinked from C# binding
 	public class CompilationUnitDataProvider : DropDownBoxListWindow.IListDataProvider
 	{
-		Document Document { get; set; }
+		TextEditor editor;
+
+		DocumentContext DocumentContext { get; set; }
 		
-		public CompilationUnitDataProvider (Document document)
+		public CompilationUnitDataProvider (TextEditor editor, DocumentContext documentContext)
 		{
-			this.Document = document;
+			this.editor = editor;
+			this.DocumentContext = documentContext;
 		}
 		
 		#region IListDataProvider implementation
@@ -55,7 +59,7 @@ namespace CBinding.Parser
 		
 		public string GetMarkup (int n)
 		{
-			return GLib.Markup.EscapeText (Document.ParsedDocument.UserRegions.ElementAt (n).Name);
+			return GLib.Markup.EscapeText (DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n).Name);
 		}
 		
 		internal static Xwt.Drawing.Image Pixbuf
@@ -70,24 +74,26 @@ namespace CBinding.Parser
 		
 		public object GetTag (int n)
 		{
-			return Document.ParsedDocument.UserRegions.ElementAt (n);
+			return DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n);
 		}
 		
 		
 		public void ActivateItem (int n)
 		{
-			var reg = Document.ParsedDocument.UserRegions.ElementAt (n);
-			MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor extEditor = Document.GetContent<MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor> ();
-			if (extEditor != null)
-				extEditor.SetCaretTo (Math.Max (1, reg.Region.BeginLine), reg.Region.BeginColumn);
+			var reg = DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n);
+			var extEditor = editor;
+			if (extEditor != null) {
+				extEditor.CaretLocation = new DocumentLocation (Math.Max (1, reg.Region.BeginLine), reg.Region.BeginColumn);
+				extEditor.StartCaretPulseAnimation ();
+			}
 		}
 		
 		public int IconCount
 		{
 			get {
-				if (Document.ParsedDocument == null)
+				if (DocumentContext.ParsedDocument == null)
 					return 0;
-				return Document.ParsedDocument.UserRegions.Count ();
+				return DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.Count ();
 			}
 		}
 		
diff --git a/main/src/addins/CBinding/Parser/DataProvider.cs b/main/src/addins/CBinding/Parser/DataProvider.cs
index 201f06ac4c..ce5e817c74 100755
--- a/main/src/addins/CBinding/Parser/DataProvider.cs
+++ b/main/src/addins/CBinding/Parser/DataProvider.cs
@@ -39,91 +39,97 @@ using MonoDevelop.Components;
 using Gtk;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
 
 namespace CBinding.Parser
 {
-	// Yoinked from C# binding
-	public class DataProvider : DropDownBoxListWindow.IListDataProvider
-	{
-		object tag;
-		Ambience amb;
-		List<IUnresolvedEntity> memberList = new List<IUnresolvedEntity> ();
-		
-		Document Document {
-			get;
-			set;
-		}
-		
-		public DataProvider (Document doc, object tag, Ambience amb)
-		{
-			this.Document = doc;
-			this.tag = tag;
-			this.amb = amb;
-			Reset ();
-		}
-		
-		#region IListDataProvider implementation
-		public void Reset ()
-		{
-			memberList.Clear ();
-			if (tag is IUnresolvedFile) {
-				var types = new Stack<IUnresolvedTypeDefinition> (((IUnresolvedFile)tag).TopLevelTypeDefinitions);
-				while (types.Count > 0) {
-					var type = types.Pop ();
-					memberList.Add (type);
-					foreach (var innerType in type.NestedTypes)
-						types.Push (innerType);
-				}
-			} else if (tag is IUnresolvedTypeDefinition) {
-				memberList.AddRange (((IUnresolvedTypeDefinition)tag).Members);
-			}
-			memberList.Sort ((x, y) => String.Compare (GetString (amb, x), GetString (amb, y), StringComparison.OrdinalIgnoreCase));
-		}
-		
-		string GetString (Ambience amb, IUnresolvedEntity x)
-		{
-			var ctx = new SimpleTypeResolveContext (Document.Compilation.MainAssembly);
-			IEntity rx = null;
-			if (x is IUnresolvedMember)
-				rx = ((IUnresolvedMember)x).CreateResolved (ctx);
-			
-			if (tag is IUnresolvedFile)
-				return amb.GetString (rx, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.UseFullInnerTypeName | OutputFlags.ReformatDelegates);
-			return amb.GetString (rx, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.ReformatDelegates);
-		}
-		
-		public string GetMarkup (int n)
-		{
-			var m = memberList[n];
-//			if (m.IsObsolete ())
-//				return "<s>" + GLib.Markup.EscapeText (GetString (amb, m)) + "</s>";
-			return GLib.Markup.EscapeText (GetString (amb, m));
-		}
-		
-		public Xwt.Drawing.Image GetIcon (int n)
-		{
-			return ImageService.GetIcon (memberList[n].GetStockIcon (), Gtk.IconSize.Menu);
-		}
-		
-		public object GetTag (int n)
-		{
-			return memberList[n];
-		}
-		
-		public void ActivateItem (int n)
-		{
-			var member = memberList[n];
-			MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor extEditor = Document.GetContent<MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor> ();
-			if (extEditor != null)
-				extEditor.SetCaretTo (Math.Max (1, member.Region.BeginLine), Math.Max (1, member.Region.BeginColumn));
-		}
-		
-		public int IconCount {
-			get {
-				return memberList.Count;
-			}
-		}
-		#endregion
-	}
+	// TODO: Roslyn port.
+//	// Yoinked from C# binding
+//	public class DataProvider : DropDownBoxListWindow.IListDataProvider
+//	{
+//		object tag;
+//		Ambience amb;
+//		List<IUnresolvedEntity> memberList = new List<IUnresolvedEntity> ();
+//
+//		TextEditor editor;
+//		
+//		DocumentContext DocumentContext {
+//			get;
+//			set;
+//		}
+//		
+//		public DataProvider (TextEditor editor, DocumentContext documentContext, object tag, Ambience amb)
+//		{
+//			this.editor = editor;
+//			this.DocumentContext = documentContext;
+//			this.tag = tag;
+//			this.amb = amb;
+//			Reset ();
+//		}
+//		
+//		#region IListDataProvider implementation
+//		public void Reset ()
+//		{
+//			memberList.Clear ();
+//			if (tag is IUnresolvedFile) {
+//				var types = new Stack<IUnresolvedTypeDefinition> (((IUnresolvedFile)tag).TopLevelTypeDefinitions);
+//				while (types.Count > 0) {
+//					var type = types.Pop ();
+//					memberList.Add (type);
+//					foreach (var innerType in type.NestedTypes)
+//						types.Push (innerType);
+//				}
+//			} else if (tag is IUnresolvedTypeDefinition) {
+//				memberList.AddRange (((IUnresolvedTypeDefinition)tag).Members);
+//			}
+//			memberList.Sort ((x, y) => String.Compare (GetString (amb, x), GetString (amb, y), StringComparison.OrdinalIgnoreCase));
+//		}
+//		
+//		string GetString (Ambience amb, IUnresolvedEntity x)
+//		{
+//			var ctx = new SimpleTypeResolveContext (DocumentContext.Compilation.MainAssembly);
+//			IEntity rx = null;
+//			if (x is IUnresolvedMember)
+//				rx = ((IUnresolvedMember)x).CreateResolved (ctx);
+//			
+//			if (tag is IUnresolvedFile)
+//				return amb.GetString (rx, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.UseFullInnerTypeName | OutputFlags.ReformatDelegates);
+//			return amb.GetString (rx, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.ReformatDelegates);
+//		}
+//		
+//		public string GetMarkup (int n)
+//		{
+//			var m = memberList[n];
+////			if (m.IsObsolete ())
+////				return "<s>" + GLib.Markup.EscapeText (GetString (amb, m)) + "</s>";
+//			return GLib.Markup.EscapeText (GetString (amb, m));
+//		}
+//		
+//		public Xwt.Drawing.Image GetIcon (int n)
+//		{
+//			return ImageService.GetIcon (memberList[n].GetStockIcon (), Gtk.IconSize.Menu);
+//		}
+//		
+//		public object GetTag (int n)
+//		{
+//			return memberList[n];
+//		}
+//		
+//		public void ActivateItem (int n)
+//		{
+//			var member = memberList[n];
+//			var extEditor = editor;
+//			if (extEditor != null) {
+//				extEditor.SetCaretLocation (Math.Max (1, member.Region.BeginLine), Math.Max (1, member.Region.BeginColumn), true);
+//			}
+//		}
+//		
+//		public int IconCount {
+//			get {
+//				return memberList.Count;
+//			}
+//		}
+//		#endregion
+//	}
 }
 
diff --git a/main/src/addins/CBinding/Parser/Function.cs b/main/src/addins/CBinding/Parser/Function.cs
index 09d12dbd21..bae2d94577 100644
--- a/main/src/addins/CBinding/Parser/Function.cs
+++ b/main/src/addins/CBinding/Parser/Function.cs
@@ -32,11 +32,39 @@
 using System;
 
 using MonoDevelop.Projects;
+using ICSharpCode.NRefactory6.CSharp.Completion;
 
 namespace CBinding.Parser
 {
-	public class Function : LanguageItem
+	public class Function : LanguageItem, IParameterHintingData
 	{
+		#region IParameterHintingData implementation
+
+		public string GetParameterName (int currentParameter)
+		{
+			return parameters [currentParameter];
+		}
+
+		public Microsoft.CodeAnalysis.ISymbol Symbol {
+			get {
+				return null;
+			}
+		}
+
+		public int ParameterCount {
+			get {
+				return parameters.Length;
+			}
+		}
+
+		public bool IsParameterListAllowed {
+			get {
+				return false;
+			}
+		}
+
+		#endregion
+
 		private string[] parameters;
 		private string signature;
 		private bool is_const = false;
diff --git a/main/src/addins/CBinding/packages.config b/main/src/addins/CBinding/packages.config
new file mode 100644
index 0000000000..d3fca62c00
--- /dev/null
+++ b/main/src/addins/CBinding/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/AddinInfo.cs b/main/src/addins/CSharpBinding/AddinInfo.cs
index 2b9deee4f4..6def556cee 100644
--- a/main/src/addins/CSharpBinding/AddinInfo.cs
+++ b/main/src/addins/CSharpBinding/AddinInfo.cs
@@ -18,4 +18,3 @@ using Mono.Addins.Description;
 
 // Submodules
 [assembly:AddinModule ("MonoDevelop.CSharpBinding.Autotools.dll")]
-[assembly:AddinModule ("MonoDevelop.CSharpBinding.AspNet.dll")]
diff --git a/main/src/addins/CSharpBinding/AspNet/ASPNetReferenceFinder.cs b/main/src/addins/CSharpBinding/AspNet/ASPNetReferenceFinder.cs
index ec6553f68a..72e11efbc1 100644
--- a/main/src/addins/CSharpBinding/AspNet/ASPNetReferenceFinder.cs
+++ b/main/src/addins/CSharpBinding/AspNet/ASPNetReferenceFinder.cs
@@ -23,12 +23,14 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+/*
 using System.Collections.Generic;
 
 using MonoDevelop.Core;
 using MonoDevelop.Ide.FindInFiles;
 using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.AspNet.WebForms;
 
 namespace MonoDevelop.CSharp.Refactoring
@@ -40,7 +42,7 @@ namespace MonoDevelop.CSharp.Refactoring
 			IncludeDocumentation = true;
 		}
 		
-		IEnumerable<DomRegion> SearchMember (IEntity member, ITypeResolveContext dom, FilePath fileName, Mono.TextEditor.TextEditorData editor, Mono.TextEditor.TextDocument buildDocument, List<LocalDocumentInfo.OffsetInfo> offsetInfos, ParsedDocument parsedDocument)
+		IEnumerable<DomRegion> SearchMember (IEntity member, ITypeResolveContext dom, FilePath fileName, TextEditor editor, ITextDocument buildDocument, List<LocalDocumentInfo.OffsetInfo> offsetInfos, ParsedDocument parsedDocument)
 		{ // TODO: Type system conversion.
 			yield break;
 //			var resolver = new NRefactoryResolver (dom, parsedDocument.CompilationUnit, ICSharpCode.OldNRefactory.SupportedLanguage.CSharp, editor, fileName);
@@ -93,3 +95,4 @@ namespace MonoDevelop.CSharp.Refactoring
 	}
 }
 
+*/
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/AspNet/AspLanguageBuilder.cs b/main/src/addins/CSharpBinding/AspNet/AspLanguageBuilder.cs
index 4e1fc93617..e6e4eaf509 100644
--- a/main/src/addins/CSharpBinding/AspNet/AspLanguageBuilder.cs
+++ b/main/src/addins/CSharpBinding/AspNet/AspLanguageBuilder.cs
@@ -23,17 +23,25 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
+/*
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using Mono.TextEditor;
 using MonoDevelop.AspNet.WebForms;
 using MonoDevelop.AspNet.WebForms.Dom;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.CSharp.Parser;
+using System.IO;
+using ICSharpCode.NRefactory.Completion;
+using MonoDevelop.AspNet.StateEngine;
+using MonoDevelop.Xml.StateEngine;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.CSharp.Completion
 {
@@ -67,9 +75,8 @@ namespace MonoDevelop.CSharp.Completion
 			builder.Append (" : ");
 			builder.AppendLine (info.BaseType);
 		}
-		
-		public LocalDocumentInfo BuildLocalDocument (DocumentInfo info, TextEditorData data,
-		                                             string expressionText, string textAfterCaret, bool isExpression)
+
+		LocalDocumentInfo ILanguageCompletionBuilder.BuildLocalDocument (DocumentInfo info, MonoDevelop.Ide.Editor.TextEditor data, string expressionText, string textAfterCaret, bool isExpression)
 		{
 			var sb = new StringBuilder ();
 			
@@ -84,12 +91,12 @@ namespace MonoDevelop.CSharp.Completion
 				foreach (var node in info.XExpressions) {
 					bool isBlock = node is WebFormsRenderBlock;
 
-					if (node.Region.Begin.Line > data.Caret.Line || node.Region.Begin.Line == data.Caret.Line && node.Region.Begin.Column > data.Caret.Column - 5) 
+					if (node.Region.Begin.Line > data.CaretLine || node.Region.Begin.Line == data.CaretLine && node.Region.Begin.Column > data.CaretColumn - 5) 
 						continue;
 					//Console.WriteLine ("take xprt:" + expressions.Key.BeginLine  +"/" +expressions.Key.BeginColumn);
 
-					var start = data.Document.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
-					var end = data.Document.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
+					var start = data.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
+					var end = data.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
 
 					if (!isBlock) {
 						sb.Append ("WriteLine (");
@@ -114,53 +121,52 @@ namespace MonoDevelop.CSharp.Completion
 			
 			result.LocalDocument = sb.ToString ();
 			result.CaretPosition = caretPosition;
-			result.OriginalCaretPosition = data.Caret.Offset;
+			result.OriginalCaretPosition = data.CaretOffset;
 			result.ParsedLocalDocument = Parse (info.AspNetDocument.FileName, sb.ToString ());
 			return result;
 		}
 		
-		public ICompletionDataList HandlePopupCompletion (Document realDocument, DocumentInfo info, LocalDocumentInfo localInfo)
+		public ICompletionDataList HandlePopupCompletion (TextEditor realEditor, DocumentContext realContext, DocumentInfo info, LocalDocumentInfo localInfo)
 		{
 			CodeCompletionContext codeCompletionContext;
-			using (var completion = CreateCompletion (realDocument, info, localInfo, out codeCompletionContext)) {
+			using (var completion = CreateCompletion (realEditor, realContext, info, localInfo, out codeCompletionContext)) {
 				return completion.CodeCompletionCommand (codeCompletionContext);
 			}
 		}
 		
-		public ICompletionDataList HandleCompletion (Document realDocument, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char currentChar, ref int triggerWordLength)
+		public ICompletionDataList HandleCompletion (TextEditor realEditor, DocumentContext realContext, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char currentChar, ref int triggerWordLength)
 		{
 			CodeCompletionContext ccc;
-			using (var completion = CreateCompletion (realDocument, info, localInfo, out ccc)) {
-				return completion.HandleCodeCompletion (completionContext, currentChar, ref triggerWordLength);
+			using (var completion = CreateCompletion (realEditor, realContext, info, localInfo, out ccc)) {
+				return completion.HandleCodeCompletionAsync (completionContext, currentChar, ref triggerWordLength);
 			}
 		}
 		
-		public ParameterDataProvider HandleParameterCompletion (Document realDocument, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char completionChar)
+		public ParameterHintingResult HandleParameterCompletion (TextEditor realEditor, DocumentContext realContext, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char completionChar)
 		{
 			CodeCompletionContext ccc;
-			using (var completion = CreateCompletion (realDocument, info, localInfo, out ccc)) {
-				return completion.HandleParameterCompletion (completionContext, completionChar);
+			using (var completion = CreateCompletion (realEditor, realContext, info, localInfo, out ccc)) {
+				return completion.HandleParameterCompletionAsync (completionContext, completionChar);
 			}
 		}
 		
-		public bool GetParameterCompletionCommandOffset (Document realDocument, DocumentInfo info, LocalDocumentInfo localInfo, out int cpos)
+		public bool GetParameterCompletionCommandOffset (TextEditor realEditor, DocumentContext realContext, DocumentInfo info, LocalDocumentInfo localInfo, out int cpos)
 		{
 			CodeCompletionContext codeCompletionContext;
-			using (var completion = CreateCompletion (realDocument, info, localInfo, out codeCompletionContext)) {
-				return completion.GetParameterCompletionCommandOffset (out cpos);
+			using (var completion = CreateCompletion (realEditor, realContext, info, localInfo, out codeCompletionContext)) {
+				int wlen;
+				return completion.GetCompletionCommandOffset (out cpos, out wlen);
 			}
 		}
 
-		public ICompletionWidget CreateCompletionWidget (Document realDocument, LocalDocumentInfo localInfo)
+		public ICompletionWidget CreateCompletionWidget (TextEditor realEditor, DocumentContext realContext, LocalDocumentInfo localInfo)
 		{
-			return new AspCompletionWidget (realDocument, localInfo);
+			return new AspCompletionWidget (realEditor, localInfo);
 		}
 		
-		CSharpCompletionTextEditorExtension CreateCompletion (Document realDocument, DocumentInfo info, LocalDocumentInfo localInfo, out CodeCompletionContext codeCompletionContext)
+		CSharpCompletionTextEditorExtension CreateCompletion (TextEditor realEditor, DocumentContext realContext, DocumentInfo info, LocalDocumentInfo localInfo, out CodeCompletionContext codeCompletionContext)
 		{
-			var doc = new TextDocument () {
-				Text = localInfo.LocalDocument,
-			};
+			var doc = TextEditorFactory.CreateNewDocument (new StringTextSource (localInfo.LocalDocument), realEditor.FileName + ".cs"); 
 			var documentLocation = doc.OffsetToLocation (localInfo.CaretPosition);
 			
 			codeCompletionContext = new CodeCompletionContext () {
@@ -170,16 +176,16 @@ namespace MonoDevelop.CSharp.Completion
 			};
 			
 			return new CSharpCompletionTextEditorExtension (localInfo.HiddenDocument) {
-				CompletionWidget = CreateCompletionWidget (realDocument, localInfo)
+				CompletionWidget = CreateCompletionWidget (realEditor, realContext, localInfo)
 			};
 		}
 		
 		class AspCompletionWidget : ICompletionWidget
 		{
-			Document realDocument;
+			TextEditor realDocument;
 			LocalDocumentInfo localInfo;
 			
-			public AspCompletionWidget (Document realDocument, LocalDocumentInfo localInfo)
+			public AspCompletionWidget (TextEditor realDocument, LocalDocumentInfo localInfo)
 			{
 				this.realDocument = realDocument;
 				this.localInfo = localInfo;
@@ -188,7 +194,7 @@ namespace MonoDevelop.CSharp.Completion
 			#region ICompletionWidget implementation
 			public CodeCompletionContext CurrentCodeCompletionContext {
 				get {
-					int delta = realDocument.Editor.Caret.Offset - localInfo.OriginalCaretPosition;
+					int delta = realDocument.CaretOffset - localInfo.OriginalCaretPosition;
 					return CreateCodeCompletionContext (localInfo.CaretPosition + delta);
 				}
 			}
@@ -217,10 +223,10 @@ namespace MonoDevelop.CSharp.Completion
 
 			public CodeCompletionContext CreateCodeCompletionContext (int triggerOffset)
 			{
-				var savedCtx = realDocument.GetContent<ICompletionWidget> ().CreateCodeCompletionContext (realDocument.Editor.Caret.Offset + triggerOffset - localInfo.CaretPosition);
+				var savedCtx = realDocument.GetContent<ICompletionWidget> ().CreateCodeCompletionContext (realDocument.CaretOffset + triggerOffset - localInfo.CaretPosition);
 				CodeCompletionContext result = new CodeCompletionContext ();
 				result.TriggerOffset = triggerOffset;
-				DocumentLocation loc = localInfo.HiddenDocument.Editor.Document.OffsetToLocation (triggerOffset);
+				var loc = localInfo.HiddenDocument.Editor.OffsetToLocation (triggerOffset);
 				result.TriggerLine   = loc.Line;
 				result.TriggerLineOffset = loc.Column - 1;
 				
@@ -234,9 +240,9 @@ namespace MonoDevelop.CSharp.Completion
 			{
 				if (ctx == null)
 					return null;
-				int min = Math.Min (ctx.TriggerOffset, localInfo.HiddenDocument.Editor.Caret.Offset);
-				int max = Math.Max (ctx.TriggerOffset, localInfo.HiddenDocument.Editor.Caret.Offset);
-				return localInfo.HiddenDocument.Editor.Document.GetTextBetween (min, max);
+				int min = Math.Min (ctx.TriggerOffset, localInfo.HiddenDocument.Editor.CaretOffset);
+				int max = Math.Max (ctx.TriggerOffset, localInfo.HiddenDocument.Editor.CaretOffset);
+				return localInfo.HiddenDocument.Editor.GetTextBetween (min, max);
 			}
 			
 			public void SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word)
@@ -249,7 +255,7 @@ namespace MonoDevelop.CSharp.Completion
 				CodeCompletionContext translatedCtx = new CodeCompletionContext ();
 				int offset = localInfo.OriginalCaretPosition + ctx.TriggerOffset - localInfo.CaretPosition;
 				translatedCtx.TriggerOffset = offset;
-				DocumentLocation loc = localInfo.HiddenDocument.Editor.Document.OffsetToLocation (offset);
+				var loc = localInfo.HiddenDocument.Editor.OffsetToLocation (offset);
 				translatedCtx.TriggerLine   = loc.Line;
 				translatedCtx.TriggerLineOffset = loc.Column - 1;
 				translatedCtx.TriggerWordLength = ctx.TriggerWordLength;
@@ -258,13 +264,16 @@ namespace MonoDevelop.CSharp.Completion
 			
 			public int CaretOffset {
 				get {
-					return localInfo.HiddenDocument.Editor.Caret.Offset;
+					return localInfo.HiddenDocument.Editor.CaretOffset;
+				}
+				set {
+					localInfo.HiddenDocument.Editor.CaretOffset = value;
 				}
 			}
 			
 			public int TextLength {
 				get {
-					return localInfo.HiddenDocument.Editor.Document.TextLength;
+					return localInfo.HiddenDocument.Editor.Length;
 				}
 			}
 
@@ -279,28 +288,33 @@ namespace MonoDevelop.CSharp.Completion
 					return Gtk.Widget.DefaultStyle;
 				}
 			}
+
+			void ICompletionWidget.AddSkipChar (int cursorPosition, char c)
+			{
+				// ignore
+			}
 			#endregion
 		}
-		
-		public ParsedDocument BuildDocument (DocumentInfo info, TextEditorData data)
+
+		ParsedDocument ILanguageCompletionBuilder.BuildDocument (DocumentInfo info, MonoDevelop.Ide.Editor.TextEditor data)
 		{
 			var docStr = BuildDocumentString (info, data);
 			return Parse (info.AspNetDocument.FileName, docStr);
 		}
 		 
-		public string BuildDocumentString (DocumentInfo info, TextEditorData data, List<LocalDocumentInfo.OffsetInfo> offsetInfos = null, bool buildExpressions = false)
+		public string BuildDocumentString (DocumentInfo info, MonoDevelop.Ide.Editor.TextEditor data, List<LocalDocumentInfo.OffsetInfo> offsetInfos = null, bool buildExpressions = false)
 		{
 			var document = new StringBuilder ();
 			
 			WriteUsings (info.Imports, document);
 
 			foreach (var node in info.XScriptBlocks) {
-				var start = data.Document.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
-				var end = data.Document.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
+				var start = data.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
+				var end = data.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
 				if (offsetInfos != null)
 					offsetInfos.Add (new LocalDocumentInfo.OffsetInfo (start, document.Length, end - start));
 				
-				document.AppendLine (data.Document.GetTextBetween (start, end));
+				document.AppendLine (data.GetTextBetween (start, end));
 			}
 			if (buildExpressions) {
 				WriteClassDeclaration (info, document);
@@ -312,8 +326,8 @@ namespace MonoDevelop.CSharp.Completion
 				foreach (var node in info.XExpressions) {
 					bool isBlock = node is WebFormsRenderBlock;
 
-					var start = data.Document.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
-					var end = data.Document.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
+					var start = data.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
+					var end = data.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
 					
 					if (!isBlock) {
 						document.Append ("WriteLine (");
@@ -335,3 +349,4 @@ namespace MonoDevelop.CSharp.Completion
 		}
 	}
 }
+*/
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj b/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj
index 5c7536b6d6..8813be65c6 100644
--- a/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj
+++ b/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj
@@ -70,11 +70,6 @@
       <Name>MonoDevelop.DesignerSupport</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
       <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
       <Name>MonoDevelop.Refactoring</Name>
@@ -95,11 +90,6 @@
       <Name>MonoDevelop.Deployment</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
diff --git a/main/src/addins/CSharpBinding/AspNet/RazorCSharpCompletionBuilder.cs b/main/src/addins/CSharpBinding/AspNet/RazorCSharpCompletionBuilder.cs
index 974f8ba511..d3f1159dd7 100644
--- a/main/src/addins/CSharpBinding/AspNet/RazorCSharpCompletionBuilder.cs
+++ b/main/src/addins/CSharpBinding/AspNet/RazorCSharpCompletionBuilder.cs
@@ -23,13 +23,14 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

-

+/*

 using System;

 using MonoDevelop.CSharp.Completion;

 using MonoDevelop.Ide.CodeCompletion;

-using Mono.TextEditor;

 using MonoDevelop.Ide.Gui;

+using ICSharpCode.NRefactory6.CSharp.Completion;

 using MonoDevelop.AspNet.Razor;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.CSharp.Completion

 {

@@ -42,7 +43,7 @@ namespace MonoDevelop.CSharp.Completion
 			return language == "C#";

 		}

 

-		CSharpCompletionTextEditorExtension CreateCompletion (Document realDocument, UnderlyingDocumentInfo docInfo,

+		CSharpCompletionTextEditorExtension CreateCompletion (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo,

 			out CodeCompletionContext codeCompletionContext)

 		{

 			var documentLocation = docInfo.UnderlyingDocument.Editor.OffsetToLocation (docInfo.CaretPosition);

@@ -54,69 +55,73 @@ namespace MonoDevelop.CSharp.Completion
 			};

 

 			return new CSharpCompletionTextEditorExtension (docInfo.UnderlyingDocument) {

-				CompletionWidget = CreateCompletionWidget (realDocument, docInfo)

+				CompletionWidget = CreateCompletionWidget (editor, context, docInfo)

 			};

 		}

 

-		CSharpCompletionTextEditorExtension CreateCompletionAndUpdate (Document realDocument, UnderlyingDocumentInfo docInfo,

+		CSharpCompletionTextEditorExtension CreateCompletionAndUpdate (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo,

 			out CodeCompletionContext codeCompletionContext)

 		{

-			var completion = CreateCompletion (realDocument, docInfo, out codeCompletionContext);

+			var completion = CreateCompletion (editor, context, docInfo, out codeCompletionContext);

 			completion.UpdateParsedDocument ();

 			return completion;

 		}

 

-		public ICompletionWidget CreateCompletionWidget (Document realDocument,	UnderlyingDocumentInfo docInfo)

+		public ICompletionWidget CreateCompletionWidget (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context,	UnderlyingDocumentInfo docInfo)

 		{

-			return new RazorCompletionWidget (realDocument, docInfo);

+			return new RazorCompletionWidget (editor, context, docInfo);

 		}

 

-		public ICompletionDataList HandlePopupCompletion (Document realDocument, UnderlyingDocumentInfo docInfo)

+		public ICompletionDataList HandlePopupCompletion (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo)

 		{

 			CodeCompletionContext ccc;

-			var completion = CreateCompletionAndUpdate (realDocument, docInfo, out ccc);

+			var completion = CreateCompletionAndUpdate (editor, context, docInfo, out ccc);

 			return completion.CodeCompletionCommand (ccc);

 		}

 

-		public ICompletionDataList HandleCompletion (Document realDocument,	CodeCompletionContext completionContext,

+		public ICompletionDataList HandleCompletion (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context,	CodeCompletionContext completionContext,

 			UnderlyingDocumentInfo docInfo, char currentChar, ref int triggerWordLength)

 		{

 			CodeCompletionContext ccc;

-			var completion = CreateCompletionAndUpdate (realDocument, docInfo, out ccc);

-			return completion.HandleCodeCompletion (completionContext, currentChar, ref triggerWordLength);

+			var completion = CreateCompletionAndUpdate (editor, context, docInfo, out ccc);

+			return completion.HandleCodeCompletionAsync (completionContext, currentChar, ref triggerWordLength);

 		}

 

-		public ParameterDataProvider HandleParameterCompletion (Document realDocument,	CodeCompletionContext completionContext,

+		public ParameterDataProvider HandleParameterCompletion (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context,	CodeCompletionContext completionContext,

 			UnderlyingDocumentInfo docInfo, char completionChar)

 		{

 			CodeCompletionContext ccc;

-			var completion = CreateCompletionAndUpdate (realDocument, docInfo, out ccc);

-			return completion.HandleParameterCompletion (completionContext, completionChar);

+			var completion = CreateCompletionAndUpdate (editor, context, docInfo, out ccc);

+			return completion.HandleParameterCompletionAsync (completionContext, completionChar);

 		}

 

-		public bool GetParameterCompletionCommandOffset (Document realDocument,	UnderlyingDocumentInfo docInfo, out int cpos)

+		public bool GetParameterCompletionCommandOffset (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context,	UnderlyingDocumentInfo docInfo, out int cpos)

 		{

 			CodeCompletionContext ccc;

-			var completion = CreateCompletionAndUpdate (realDocument, docInfo, out ccc);

+			var completion = CreateCompletionAndUpdate (editor, context, docInfo, out ccc);

 			return completion.GetParameterCompletionCommandOffset (out cpos);

 		}

 

-		public int GetCurrentParameterIndex (Document realDocument, UnderlyingDocumentInfo docInfo, int startOffset)

+		public int GetCurrentParameterIndex (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo, int startOffset)

 		{

 			CodeCompletionContext ccc;

-			var completion = CreateCompletionAndUpdate (realDocument, docInfo, out ccc);

+			var completion = CreateCompletionAndUpdate (editor, context, docInfo, out ccc);

 			return completion.GetCurrentParameterIndex (startOffset);

 		}

 	}

 

 	class RazorCompletionWidget : ICompletionWidget

 	{

-		Document realDocument;

+		DocumentContext realDocumentContext;

+

+		MonoDevelop.Ide.Editor.TextEditor realEditor;

+

 		UnderlyingDocumentInfo docInfo;

 

-		public RazorCompletionWidget (Document realDocument, UnderlyingDocumentInfo docInfo)

+		public RazorCompletionWidget (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo)

 		{

-			this.realDocument = realDocument;

+			this.realEditor = editor;

+			this.realDocumentContext = context;

 			this.docInfo = docInfo;

 		}

 

@@ -156,11 +161,11 @@ namespace MonoDevelop.CSharp.Completion
 

 		public CodeCompletionContext CreateCodeCompletionContext (int triggerOffset)

 		{

-			var savedCtx = realDocument.GetContent<ICompletionWidget> ().CreateCodeCompletionContext (

-				realDocument.Editor.Caret.Offset + triggerOffset - docInfo.CaretPosition);

+			var savedCtx = realDocumentContext.GetContent<ICompletionWidget> ().CreateCodeCompletionContext (

+				realEditor.CaretOffset + triggerOffset - docInfo.CaretPosition);

 			var result = new CodeCompletionContext ();

 			result.TriggerOffset = triggerOffset;

-			var loc = docInfo.UnderlyingDocument.Editor.Document.OffsetToLocation (triggerOffset);

+			var loc = docInfo.UnderlyingDocument.Editor.OffsetToLocation (triggerOffset);

 			result.TriggerLine = loc.Line;

 			result.TriggerLineOffset = loc.Column - 1;

 

@@ -177,7 +182,7 @@ namespace MonoDevelop.CSharp.Completion
 				return null;

 			int min = Math.Min (ctx.TriggerOffset, CaretOffset);

 			int max = Math.Max (ctx.TriggerOffset, CaretOffset);

-			return docInfo.UnderlyingDocument.Editor.Document.GetTextBetween (min, max);

+			return docInfo.UnderlyingDocument.Editor.GetTextBetween (min, max);

 		}

 

 		public void SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word)

@@ -193,25 +198,28 @@ namespace MonoDevelop.CSharp.Completion
 

 			var translatedCtx = new CodeCompletionContext ();

 			translatedCtx.TriggerOffset = offset;

-			var loc = docInfo.UnderlyingDocument.Editor.Document.OffsetToLocation (offset);

+			var loc = docInfo.UnderlyingDocument.Editor.OffsetToLocation (offset);

 			translatedCtx.TriggerLine = loc.Line;

 			translatedCtx.TriggerLineOffset = loc.Column - 1;

 			translatedCtx.TriggerWordLength = ctx.TriggerWordLength;

-				realDocument.GetContent<ICompletionWidget> ().SetCompletionText (

+				realDocumentContext.GetContent<ICompletionWidget> ().SetCompletionText (

 				translatedCtx, partial_word, complete_word, wordOffset);

 		}

 

 		public int CaretOffset

 		{

 			get	{

-				return docInfo.UnderlyingDocument.Editor.Caret.Offset;

+				return docInfo.UnderlyingDocument.Editor.CaretOffset;

+			}

+			set {

+				docInfo.UnderlyingDocument.Editor.CaretOffset = value;

 			}

 		}

 

 		public int TextLength

 		{

 			get	{

-				return docInfo.UnderlyingDocument.Editor.Document.TextLength;

+				return docInfo.UnderlyingDocument.Editor.Length;

 			}

 		}

 

@@ -229,6 +237,11 @@ namespace MonoDevelop.CSharp.Completion
 			}

 		}

 

+		void ICompletionWidget.AddSkipChar (int cursorPosition, char c)

+		{

+			// ignore

+		}

 		#endregion

 	}

 }

+*/
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/Autotools/Autotools.csproj b/main/src/addins/CSharpBinding/Autotools/Autotools.csproj
index 5bcda79d90..5bb5d88633 100644
--- a/main/src/addins/CSharpBinding/Autotools/Autotools.csproj
+++ b/main/src/addins/CSharpBinding/Autotools/Autotools.csproj
@@ -61,11 +61,6 @@
       <Name>CSharpBinding</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
       <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
       <Name>MonoDevelop.Refactoring</Name>
diff --git a/main/src/addins/CSharpBinding/Autotools/CSharpAutotoolsSetup.cs b/main/src/addins/CSharpBinding/Autotools/CSharpAutotoolsSetup.cs
index 55fc064e18..ecd02e7598 100644
--- a/main/src/addins/CSharpBinding/Autotools/CSharpAutotoolsSetup.cs
+++ b/main/src/addins/CSharpBinding/Autotools/CSharpAutotoolsSetup.cs
@@ -9,7 +9,7 @@ using MonoDevelop.CSharp.Project;
 
 namespace CSharpBinding.Autotools
 {
-	public class CSharpAutotoolsSetup : ISimpleAutotoolsSetup
+	class CSharpAutotoolsSetup : ISimpleAutotoolsSetup
 	{
 		public string GetCompilerCommand ( Project project, string configuration )
 		{
diff --git a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
index fae3c99312..5595065954 100644
--- a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
+++ b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
@@ -8,7 +8,31 @@
 				shortcut = "Alt|Insert"
 				macShortcut = "Meta|I" />
 	</Extension>
-
+	
+	<Extension path = "/MonoDevelop/Ide/Commands/Refactoring">
+<!--		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.Resolve"
+				defaultHandler = "MonoDevelop.CSharp.Refactoring.ResolveCommandHandler"
+				type="array"
+				_label = "Resolve"/> -->
+		<Command id = "MonoDevelop.CSharp.Refactoring.ExtractMethodCommand"
+			defaultHandler = "MonoDevelop.CSharp.Refactoring.ExtractMethodCommandHandler"
+			_label = "Extract Method" 
+			_description = "Extracts a method"
+		/>
+		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.CurrentRefactoryOperations"
+			defaultHandler = "MonoDevelop.CSharp.Refactoring.CurrentRefactoryOperationsHandler"
+			type="array"
+			_label = "Refactory Operations" /> 
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Ide/Commands/CodeNavigation">
+		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration"
+						_label = "_Go to Declaration" 
+						shortcut = "F12"
+						macShortcut = "Meta|D"/>
+	</Extension>
+		
+	
 	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
 		<DotNetProjectType
 			language="C#"
@@ -94,6 +118,9 @@
 		<Class fileExtensions = ".cs" class = "MonoDevelop.CSharp.Highlighting.HighlightUsagesExtension" />
 		<Class fileExtensions = ".cs" class = "MonoDevelop.CSharp.PathedDocumentTextEditorExtension" />
 		<Class fileExtensions = ".cs" class = "MonoDevelop.CSharp.UnitTestTextEditorExtension" />
+		<Class fileExtensions = ".cs" class = "MonoDevelop.CSharp.ClassOutline.CSharpOutlineTextEditorExtension" />
+		<Class fileExtensions = ".json" class = "MonoDevelop.JSon.JSonTextEditorExtension" />
+		<Class class = "MonoDevelop.CSharp.Refactoring.CSharpFeaturesTextEditorExtension" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Core/StockIcons">
@@ -114,8 +141,8 @@
 		<Formatter mimeType="text/x-csharp" class="MonoDevelop.CSharp.Formatting.CSharpFormatter" />
 	</Extension>
 
-	<Extension path = "/MonoDevelop/TypeSystem/Ambiences">
-		<Ambience mimeType="text/x-csharp" class = "MonoDevelop.CSharp.CSharpAmbience" />
+	<Extension path = "/MonoDevelop/TypeSystem/AmbienceTooltipProviders">
+		<Provider mimeType="text/x-csharp" class = "MonoDevelop.CSharp.CSharpAmbience" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/TypeSystem/Parser">
@@ -144,7 +171,7 @@
 
 	<Extension path = "/MonoDevelop/ProjectModel/PolicySets" >
 		<PolicySet id="1TBS" _name="SharpDevelop style (1TBS)" allowDiffSerialize="false">
-			<Policies resource="SharpDevelopCSharpPolicy.xml" />
+			<Policies resource="KRCSharpPolicy.xml" />
 			<Policies resource="InvariantTextStylePolicy.xml" />
 		</PolicySet>
 	</Extension>
@@ -153,24 +180,11 @@
 		<Policies resource="AllmanCSharpPolicy.xml" />
 	</Extension>
 
-	<Extension path = "/MonoDevelop/ProjectModel/PolicySets" >
-		<PolicySet id="Whitesmiths" _name="Whitesmiths style" allowDiffSerialize="false">
-			<Policies resource="WhitesmithsCSharpPolicy.xml" />
-			<Policies resource="InvariantTextStylePolicy.xml" />
-		</PolicySet>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ProjectModel/PolicySets" >
-		<PolicySet id="GNU" _name="GNU style" allowDiffSerialize="false">
-			<Policies resource="GNUCSharpPolicy.xml" />
-			<Policies resource="GNUTextStylePolicy.xml" />
-		</PolicySet>
-	</Extension>
-
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/MimeTypePolicyPanels">
 		<Panel id = "CSharpFormatting" _label = "C# Format" mimeType="text/x-csharp" class = "MonoDevelop.CSharp.Formatting.CSharpFormattingPolicyPanel" />
 	</Extension>
 
+<!--	
 	<Extension path = "/MonoDevelop/Refactoring/CodeActions">
 		<Action mimeType="text/x-csharp"
 			_title = "Move type to another file"
@@ -181,10 +195,10 @@
 			_description = "Converts constant fields to enumeration"
 			class = "MonoDevelop.CSharp.Refactoring.CodeActions.ConvertToEnumAction" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Refactoring/CodeIssues">
 		<CodeIssue mimeType="text/x-csharp" severity = "Error" class="MonoDevelop.CSharp.Refactoring.CodeIssues.MonoTODOIssue"/>
-	</Extension>
+	</Extension> -->
 	
 	<Extension path = "/MonoDevelop/Ide/TextEditorResolver">
 		<Resolver class = "MonoDevelop.CSharp.Resolver.TextEditorResolverProvider" mimeType="text/x-csharp" />
@@ -216,36 +230,29 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Refactoring/CodeGenerators">
+
 		<Class class = "MonoDevelop.CodeGeneration.CreateConstructorGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.ReadonlyPropertyGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.PropertyGenerator" />
-		<Class class = "MonoDevelop.CodeGeneration.ImplementInterfaceMembersGenerator" />
+<!--	<Class class = "MonoDevelop.CodeGeneration.ImplementInterfaceMembersGenerator" /> -->
 		<Class class = "MonoDevelop.CodeGeneration.RequiredProtocolMemberGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.OptionalProtocolMemberGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.PartialGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.OverrideMembersGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.ToStringGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.RaiseEventMethodGenerator" />
-		<Class class = "MonoDevelop.CodeGeneration.EqualityMembersGenerator" />
+<!--		<Class class = "MonoDevelop.CodeGeneration.EqualityMembersGenerator" /> -->
 		<Class class = "MonoDevelop.CodeGeneration.WriteLineGenerator" />
 	</Extension>
 
-	<Extension path = "/MonoDevelop/Refactoring/CodeActionSource">
-		<Source class ="MonoDevelop.CSharp.Refactoring.CodeActions.NRefactoryCodeActionSource"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Refactoring/CodeIssueSource">
-		<Source class ="MonoDevelop.CSharp.Refactoring.CodeIssues.NRefactoryCodeIssueSource"/>
-	</Extension>
-
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/DefaultPolicyPanels/SourceCode">
-		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanel" icon="md-prefs-name-conventions" />
+		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanel" icon="md-prefs-name-conventions" />
 	</Extension>
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/SourceCode">
-		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanel" icon="md-prefs-name-conventions" />
+		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanel" icon="md-prefs-name-conventions" />
 	</Extension>
 	<Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/SourceCode">
-		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanel" icon="md-prefs-name-conventions" />
+		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanel" icon="md-prefs-name-conventions" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/SourceEditor2/TooltipProviders">
@@ -255,4 +262,10 @@
 	<Extension path = "/MonoDevelop/Ide/CompletionCharacters">
 		<Complete language="C#" commitOnSpace="True" commitChars="{}[]().,:;+-*/%&amp;|^!~=&lt;&gt;?@#'&quot;\"/>
 	</Extension>
-</ExtensionModel>
+
+	<Extension path = "/MonoDevelop/SourceEditor2/ContextMenu/Editor">
+		<CommandItem id = "MonoDevelop.Refactoring.RefactoryCommands.CurrentRefactoryOperations" insertafter="MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations" insertbefore="MonoDevelop.Debugger.DebugCommands.ExpressionEvaluator"/>
+<!--		<CommandItem id = "MonoDevelop.Refactoring.RefactoryCommands.Resolve" insertbefore="MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations"/>-->
+	</Extension>
+
+</ExtensionModel>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/CSharpBinding.csproj b/main/src/addins/CSharpBinding/CSharpBinding.csproj
index 5c449f40fb..2ac8e4a197 100644
--- a/main/src/addins/CSharpBinding/CSharpBinding.csproj
+++ b/main/src/addins/CSharpBinding/CSharpBinding.csproj
@@ -3,13 +3,13 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{07CC7654-27D6-421D-A64C-0FFA40456FA2}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>MonoDevelop.CSharpBinding</AssemblyName>
     <RootNamespace>CSharpBinding</RootNamespace>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -52,11 +52,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
@@ -67,11 +62,6 @@
       <Name>MonoDevelop.DesignerSupport</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
       <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
       <Name>MonoDevelop.Refactoring</Name>
@@ -125,11 +115,22 @@
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj">
       <Project>{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}</Project>
       <Name>ICSharpCode.NRefactory.CSharp.Refactoring</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj">
       <Project>{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}</Project>
       <Name>ICSharpCode.NRefactory.Xml</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory6.CSharp.Refactoring.csproj">
+      <Project>{C465A5DC-AD28-49A2-89C0-F81838814A7E}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp.Refactoring</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -153,6 +154,50 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Composition.AttributedModel">
+      <HintPath>..\..\..\external\NRefactory6\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="templates\ConsoleProject.xpt.xml">
@@ -191,27 +236,15 @@
     <EmbeddedResource Include="MonoDevelop.CSharp.Formatting\policies\MonoCSharpPolicy.xml">
       <LogicalName>MonoCSharpPolicy.xml</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.CSharp.Formatting\policies\SharpDevelopCSharpPolicy.xml">
-      <LogicalName>SharpDevelopCSharpPolicy.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.CSharp.Formatting\policies\WhitesmithsCSharpPolicy.xml">
-      <LogicalName>WhitesmithsCSharpPolicy.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.CSharp.Formatting\policies\GNUCSharpPolicy.xml">
-      <LogicalName>GNUCSharpPolicy.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.CSharp.Formatting\policies\GNUTextStylePolicy.xml">
-      <LogicalName>GNUTextStylePolicy.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\MonoNameConventionPolicy.xml">
-      <LogicalName>MonoNameConventionPolicy.xml</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="templates\PortableLibrary.xpt.xml">
       <LogicalName>PortableLibrary.xpt.xml</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="templates\SharedAssetsProject.xpt.xml">
       <LogicalName>SharedAssetsProject.xpt.xml</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\MonoNameConventionPolicy.xml">
+      <LogicalName>MonoNameConventionPolicy.xml</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="gtk-gui\generated.cs" />
@@ -230,7 +263,6 @@
     <Compile Include="MonoDevelop.CSharp\CSharpBindingCompilerManager.cs" />
     <Compile Include="MonoDevelop.CSharp\CSharpEnhancedCodeProvider.cs" />
     <Compile Include="MonoDevelop.CSharp\CSharpLanguageBinding.cs" />
-    <Compile Include="MonoDevelop.CSharp.Resolver\TextEditorResolverProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.Formatting\Indent.cs" />
     <Compile Include="MonoDevelop.CSharp.Formatting\OnTheFlyFormatter.cs" />
     <Compile Include="MonoDevelop.CSharp.Highlighting\HighlightUsagesExtension.cs" />
@@ -247,18 +279,8 @@
     <Compile Include="MonoDevelop.CSharp\CSharpAmbience.cs" />
     <Compile Include="MonoDevelop.CSharp\PathedDocumentTextEditorExtension.cs" />
     <Compile Include="MonoDevelop.CSharp.Completion\CSharpCompletionTextEditorExtension.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\MemberCompletionData.cs">
-      <DependentUpon>IndexerParameterDataProvider.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MonoDevelop.CSharp.Completion\DelegateDataProvider.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring\CSharpReferenceFinder.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\ConstructorParameterDataProvider.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\MethodParameterDataProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.Refactoring\CSharpCodeGenerator.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\NewOverrideCompletionData.cs" />
     <Compile Include="MonoDevelop.CSharp.Completion\EventCreationCompletionData.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\VariableCompletionData.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\IndexerParameterDataProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.Refactoring\HelperMethods.cs" />
     <Compile Include="MonoDevelop.CSharp.Parser\CSharpFoldingParser.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\AbstractGenerateAction.cs" />
@@ -276,47 +298,112 @@
     <Compile Include="MonoDevelop.CSharp.Formatting\CSharpIndentVirtualSpaceManager.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\ReadonlyPropertyGenerator.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\RaiseEventMethodGenerator.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\ContextActionExtensions.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\MDRefactoringContext.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\Actions\MoveTypeToFile.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\MDRefactoringScript.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NRefactoryCodeIssueSource.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\NRefactoryCodeActionSource.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\NameConventionRule.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\NameConventionEditRuleDialog.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\NameConventionPanel.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\NameConventionPanelWidget.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\NameConventionPolicy.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\NRefactoryCodeActionProvider.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NRefactoryIssueProvider.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\NRefactoryCodeAction.cs" />
     <Compile Include="MonoDevelop.CSharp.Tooltips\LanguageItemTooltipProvider.cs" />
     <Compile Include="MonoDevelop.CSharp\AstAmbience.cs" />
     <Compile Include="MonoDevelop.CSharp\AstStockIcons.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\AbstractParameterDataProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.Highlighting\CSharpSelectionSurroundingProvider.cs" />
     <Compile Include="MonoDevelop.CSharp\SignatureMarkupCreator.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\ArrayTypeParameterDataProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\ImplementInterfaceMembersGenerator.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\TypeParameterDataProvider.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\Actions\ConvertToEnumAction.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\Actions\ConvertToEnumDialog.cs" />
     <Compile Include="MonoDevelop.CSharp.UnitTests\UnitTestTextEditorExtension.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\BaseNRefactoryIssueProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\PartialGenerator.cs" />
     <Compile Include="AddinInfo.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\Issues\MonoTODOIssue.cs" />
     <Compile Include="MonoDevelop.CSharp.Refactoring\CSharpCodeGenerationService.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\ExportCodeGenerator.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\MonoCSharpCompletionEngine.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\ProtocolCompletionData.cs" />
     <Compile Include="MonoDevelop.CSharp.Project\CSharpProjectExtension.cs" />
     <Compile Include="MonoDevelop.CSharp.Project\PortableCSharpProjectFlavor.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\RoslynSymbolCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\RoslynCodeCompletionFactory.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\RoslynParameterHintingFactory.cs" />
+    <Compile Include="MonoDevelop.CSharp.ClassOutline\CSharpOutlineTextEditorExtension.cs" />
+    <Compile Include="MonoDevelop.CSharp.ClassOutline\OutlineSortingPreferencesDialog.cs" />
+    <Compile Include="gtk-gui\MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.cs" />
+    <Compile Include="MonoDevelop.CSharp.ClassOutline\OutlineSettings.cs" />
+    <Compile Include="MonoDevelop.CSharp.ClassOutline\OutlineNodeComparer.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\ProtocolCompletionData.cs">
+      <DependentUpon>ProtocolMemberContextHandler.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MonoDevelop.CSharp.Formatting\CSharpTextPasteHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\CreateOverrideCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\CreatePartialCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Resolver\TextEditorResolverProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Parser\CSharpParsedDocument.cs" />
+    <Compile Include="MonoDevelop.CSharp.Resolver\DebuggerExpressionResolver.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\ImportSymbolCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\ProtocolMemberContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\AnonymousMethodCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\ObjectCreationCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\CastCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\RoslynCompletionData.cs" />
+    <Compile Include="MonoDevelop.JSon\JSonIndentationTracker.cs" />
+    <Compile Include="MonoDevelop.JSon\JSonIndentEngine.cs" />
+    <Compile Include="MonoDevelop.JSon\JSonTextEditorExtension.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\ExtractMethodCommandHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\RefactoryCommands.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\AddImport\CSharpAddImportCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\AddImport\AbstractAddImportCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\FullyQualify\CSharpFullyQualifyCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\PredefinedCodeFixProviderNames.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\Async\CSharpConvertToAsyncMethodCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\Async\CSharpAddAwaitCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\Async\CSharpAddAsyncCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\Async\AbstractAsyncCodeFix.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\MoveTypeToFile\MoveTypeToFile.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\GotoDeclarationHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateConstructor\GenerateConstructorCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateConstructor\AbstractGenerateMemberCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateEnumMember\GenerateEnumMemberCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateMethod\GenerateConversionCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateMethod\GenerateMethodCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateVariable\GenerateVariableCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\ImplementAbstractClass\ImplementAbstractClassCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\ImplementInterface\ImplementInterfaceCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\RoslynCompletionCategory.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\IntroduceVariable\IntroduceVariableCodeRefactoringProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\PredefinedCodeRefactoringProviderNames.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\InlineTemporary\InlineTemporaryCodeRefactoringProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\InlineTemporary\InlineTemporaryCodeRefactoringProvider.InitializerRewriter.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\InlineTemporary\InlineTemporaryCodeRefactoringProvider.ReferenceRewriter.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\ExtractMethod\ExtractMethodCodeRefactoringProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateType\GenerateTypeCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\DiagnosticCustomTags.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\IDEDiagnosticIds.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\SimplifyTypeNames\SimplifyTypeNamesCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\SimplifyTypeNames\SimplifyTypeNamesCodeFixProvider.SimplifyTypeNamesFixAllProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\RemoveUnnecessaryUsings\RemoveUnnecessaryUsingsCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryCast\RemoveUnnecessaryCastDiagnosticAnalyzerBase.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryCast\CSharpRemoveUnnecessaryCastDiagnosticAnalyzer.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryImports\RemoveUnnecessaryImportsDiagnosticAnalyzerBase.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryImports\CSharpRemoveUnnecessaryImportsDiagnosticAnalyzer.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\SimplifyTypeNames\SimplifyTypeNamesDiagnosticAnalyzerBase.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\SimplifyTypeNames\CSharpSimplifyTypeNamesDiagnosticAnalyzer.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\RemoveUnnecessaryCast\RemoveUnnecessaryCastCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\RemoveUnnecessaryCast\RemoveUnnecessaryCastCodeFixProvider.RemoveUnnecessaryCastFixAllProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\MonoTODO\MonoTODODiagnosticAnalyzer.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\ConvertToEnum\ConvertToEnumDialog.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\NameConventionEditRuleDialog.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\NameConventionPanel.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\NameConventionPanelWidget.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\NameConventionPolicy.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\NameConventionRule.cs" />
+    <Compile Include="gtk-gui\MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget.cs" />
+    <Compile Include="gtk-gui\MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\CSharpFeaturesTextEditorExtension.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\RenameHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\FindReferencesHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\FindDerivedSymbolsHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\FindExtensionMethodHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\FindMemberOverloadsHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\GotoBaseDeclarationHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\CodeGenerationService.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
+    <None Include="MonoDevelop.CSharp.Completion\MethodParameterDataProvider.cs" />
+    <None Include="MonoDevelop.CSharp.Completion\ConstructorParameterDataProvider.cs" />
+    <None Include="MonoDevelop.CSharp.Completion\ArrayTypeParameterDataProvider.cs" />
+    <None Include="MonoDevelop.CSharp.Completion\AbstractParameterDataProvider.cs" />
+    <None Include="packages.config" />
+    <None Include="MonoDevelop.CSharp.CodeRefactorings\ConvertToEnum\ConvertToEnumCodeRefactoringProvider.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -330,13 +417,36 @@
     <Folder Include="MonoDevelop.CSharp.Completion\" />
     <Folder Include="MonoDevelop.CSharp.CodeGeneration\" />
     <Folder Include="MonoDevelop.CSharp.Formatting\policies\" />
-    <Folder Include="MonoDevelop.CSharp.Refactoring.CodeActions\" />
-    <Folder Include="MonoDevelop.CSharp.Refactoring.CodeActions\Actions\" />
-    <Folder Include="MonoDevelop.CSharp.Refactoring.CodeIssues\" />
-    <Folder Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\" />
     <Folder Include="MonoDevelop.CSharp.Tooltips\" />
     <Folder Include="MonoDevelop.CSharp.UnitTests\" />
-    <Folder Include="MonoDevelop.CSharp.Refactoring.CodeIssues\Issues\" />
     <Folder Include="icons\" />
+    <Folder Include="MonoDevelop.CSharp.ClassOutline\" />
+    <Folder Include="MonoDevelop.CSharp.NRefactoryWrapper\" />
+    <Folder Include="MonoDevelop.JSon\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\AddImport\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\FullyQualify\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\Async\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\MoveTypeToFile\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\GenerateConstructor\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\GenerateEnumMember\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\GenerateMethod\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\GenerateVariable\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\ImplementAbstractClass\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\ImplementInterface\" />
+    <Folder Include="MonoDevelop.CSharp.CodeRefactorings\" />
+    <Folder Include="MonoDevelop.CSharp.CodeRefactorings\IntroduceVariable\" />
+    <Folder Include="MonoDevelop.CSharp.CodeRefactorings\InlineTemporary\" />
+    <Folder Include="MonoDevelop.CSharp.CodeRefactorings\ExtractMethod\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\GenerateType\" />
+    <Folder Include="MonoDevelop.CSharp.Diagnostics\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\SimplifyTypeNames\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\RemoveUnnecessaryUsings\" />
+    <Folder Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryCast\" />
+    <Folder Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryImports\" />
+    <Folder Include="MonoDevelop.CSharp.Diagnostics\SimplifyTypeNames\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\RemoveUnnecessaryCast\" />
+    <Folder Include="MonoDevelop.CSharp.Diagnostics\MonoTODO\" />
+    <Folder Include="MonoDevelop.CSharp.CodeRefactorings\ConvertToEnum\" />
   </ItemGroup>
 </Project>
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
index 340c5137e4..b77c19e772 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
@@ -31,16 +31,21 @@ using System.Collections.Generic;
 using Gtk;
 
 using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide;
 using MonoDevelop.Components;
 using MonoDevelop.Components.Docking;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.DesignerSupport;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp;
 using MonoDevelop.Projects;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
 
-namespace MonoDevelop.DesignerSupport
+namespace MonoDevelop.CSharp.ClassOutline
 {
 	/// <summary>
 	/// Displays a types and members outline of the current document.
@@ -53,35 +58,39 @@ namespace MonoDevelop.DesignerSupport
 	/// Nodes with equal sortKey will be sorted by string comparison of the name of the nodes.
 	/// The string comparison ignores symbols (e.g. sort 'Foo()' next to '~Foo()').
 	/// </remarks>
-	/// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineNodeComparer"/>
-	/// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineSettings"/>
-	public class ClassOutlineTextEditorExtension : TextEditorExtension, IOutlinedDocument
+	/// <seealso cref="MonoDevelop.CSharp.ClassOutline.OutlineNodeComparer"/>
+	/// <seealso cref="MonoDevelop.CSharp.ClassOutline.OutlineSettings"/>
+	class CSharpOutlineTextEditorExtension : TextEditorExtension, IOutlinedDocument
 	{
-		ParsedDocument lastCU = null;
+		SemanticModel lastCU = null;
 
 		MonoDevelop.Ide.Gui.Components.PadTreeView outlineTreeView;
 		TreeStore outlineTreeStore;
 		TreeModelSort outlineTreeModelSort;
 		Widget[] toolbarWidgets;
+		AstAmbience astAmbience;
 
-		ClassOutlineNodeComparer comparer;
-		ClassOutlineSettings settings;
+		OutlineNodeComparer comparer;
+		OutlineSettings settings;
 
 		bool refreshingOutline;
 		bool disposed;
 		bool outlineReady;
 
-		public override bool ExtendsEditor (Document doc, IEditableTextBuffer editor)
+
+		public override bool IsValidInContext (DocumentContext context)
 		{
-			var binding = LanguageBindingService.GetBindingPerFileName (doc.Name);
+			var binding = LanguageBindingService.GetBindingPerFileName (context.Name);
 			return binding != null && binding is IDotNetLanguageBinding;
 		}
 
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
-			if (Document != null)
-				Document.DocumentParsed += UpdateDocumentOutline;
+
+			if (DocumentContext != null)
+				DocumentContext.DocumentParsed += UpdateDocumentOutline;
+			astAmbience = new AstAmbience (TypeSystemService.Workspace.Options);
 		}
 
 		public override void Dispose ()
@@ -89,8 +98,8 @@ namespace MonoDevelop.DesignerSupport
 			if (disposed)
 				return;
 			disposed = true;
-			if (Document != null)
-				Document.DocumentParsed -= UpdateDocumentOutline;
+			if (DocumentContext != null)
+				DocumentContext.DocumentParsed -= UpdateDocumentOutline;
 			RemoveRefillOutlineStoreTimeout ();
 			lastCU = null;
 			settings = null;
@@ -98,7 +107,7 @@ namespace MonoDevelop.DesignerSupport
 			base.Dispose ();
 		}
 
-		Widget MonoDevelop.DesignerSupport.IOutlinedDocument.GetOutlineWidget ()
+		Widget IOutlinedDocument.GetOutlineWidget ()
 		{
 			if (outlineTreeView != null)
 				return outlineTreeView;
@@ -106,8 +115,8 @@ namespace MonoDevelop.DesignerSupport
 			outlineTreeStore = new TreeStore (typeof(object));
 			outlineTreeModelSort = new TreeModelSort (outlineTreeStore);
 			
-			settings = ClassOutlineSettings.Load ();
-			comparer = new ClassOutlineNodeComparer (GetAmbience (), settings, outlineTreeModelSort);
+			settings = OutlineSettings.Load ();
+			comparer = new OutlineNodeComparer (new AstAmbience (TypeSystemService.Workspace.Options), settings, outlineTreeModelSort);
 
 			outlineTreeModelSort.SetSortFunc (0, comparer.CompareNodes);
 			outlineTreeModelSort.SetSortColumnId (0, SortType.Ascending);
@@ -140,7 +149,9 @@ namespace MonoDevelop.DesignerSupport
 				JumpToDeclaration (true);
 			};
 
-			this.lastCU = Document.ParsedDocument;
+			var analysisDocument = DocumentContext.ParsedDocument;
+			if (analysisDocument != null)
+				lastCU = analysisDocument.GetAst<SemanticModel> ();
 
 			outlineTreeView.Realized += delegate { RefillOutlineStore (); };
 			UpdateSorting ();
@@ -151,12 +162,12 @@ namespace MonoDevelop.DesignerSupport
 			return sw;
 		}
 		
-		IEnumerable<Widget> MonoDevelop.DesignerSupport.IOutlinedDocument.GetToolbarWidgets ()
+		IEnumerable<Widget> IOutlinedDocument.GetToolbarWidgets ()
 		{
 			if (toolbarWidgets != null)
 				return toolbarWidgets;
 			
-			var groupToggleButton = new ToggleButton () {
+			var groupToggleButton = new ToggleButton {
 				Image = new Image (Ide.Gui.Stock.GroupByCategory, IconSize.Menu),
 				TooltipText = GettextCatalog.GetString ("Group entries by type"),
 				Active = settings.IsGrouped,
@@ -168,7 +179,7 @@ namespace MonoDevelop.DesignerSupport
 				UpdateSorting ();
 			};
 
-			var sortAlphabeticallyToggleButton = new ToggleButton () {
+			var sortAlphabeticallyToggleButton = new ToggleButton {
 				Image = new Image (Ide.Gui.Stock.SortAlphabetically, IconSize.Menu),
 				TooltipText = GettextCatalog.GetString ("Sort entries alphabetically"),
 				Active = settings.IsSorted,
@@ -184,11 +195,11 @@ namespace MonoDevelop.DesignerSupport
 				TooltipText = GettextCatalog.GetString ("Open preferences dialog"),
 			};
 			preferencesButton.Clicked += delegate {
-				var dialog = new ClassOutlineSortingPreferencesDialog (settings);
+				var dialog = new OutlineSortingPreferencesDialog (settings);
 				try {
-					if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog) == (int)Gtk.ResponseType.Ok) {
+					if (MessageService.ShowCustomDialog (dialog) == (int)ResponseType.Ok) {
 						dialog.SaveSettings ();
-						comparer = new ClassOutlineNodeComparer (GetAmbience (), settings, outlineTreeModelSort);
+						comparer = new OutlineNodeComparer (new AstAmbience (TypeSystemService.Workspace.Options), settings, outlineTreeModelSort);
 						UpdateSorting ();
 					}
 				} finally {
@@ -212,47 +223,43 @@ namespace MonoDevelop.DesignerSupport
 			if (!outlineTreeView.Selection.GetSelected (out iter))
 				return;
 
-			object o;
+			var o = outlineTreeStore.GetValue (IsSorting () ? outlineTreeModelSort.ConvertIterToChildIter (iter) : iter, 0);
 
-			if (IsSorting ()) {
-				o = outlineTreeStore.GetValue (outlineTreeModelSort.ConvertIterToChildIter (iter), 0);
-			}
-			else {
-				o = outlineTreeStore.GetValue (iter, 0);
+			var syntaxNode = o as SyntaxNode;
+			if (syntaxNode != null) {
+				Editor.CaretOffset = syntaxNode.SpanStart;
+			} else {
+				Editor.CaretOffset = ((SyntaxTrivia)o).SpanStart;
 			}
-				
-			IdeApp.ProjectOperations.JumpToDeclaration (o as IEntity);
+
 			if (focusEditor)
-				IdeApp.Workbench.ActiveDocument.Select ();
+				Editor.GrabFocus ();
 		}
 
-		void OutlineTreeIconFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+		static void OutlineTreeIconFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
 		{
 			var pixRenderer = (CellRendererImage)cell;
 			object o = model.GetValue (iter, 0);
-			if (o is IEntity) {
-				pixRenderer.Image = ImageService.GetIcon (((IEntity)o).GetStockIcon (), IconSize.Menu);
-			} else if (o is FoldingRegion) {
+			if (o is SyntaxNode) {
+				pixRenderer.Image = ImageService.GetIcon (((SyntaxNode)o).GetStockIcon (), IconSize.Menu);
+			} else if (o is SyntaxTrivia) {
 				pixRenderer.Image = ImageService.GetIcon (Ide.Gui.Stock.Add, IconSize.Menu);
 			}
 		}
 
 		void OutlineTreeTextFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
 		{
-			CellRendererText txtRenderer = (CellRendererText)cell;
+			var txtRenderer = (CellRendererText)cell;
 			object o = model.GetValue (iter, 0);
-			Ambience am = GetAmbience ();
-			if (o is IEntity) {
-				txtRenderer.Text = am.GetString ((IEntity)o, OutputFlags.ClassBrowserEntries);
-			} else if (o is FoldingRegion) {
-				string name = ((FoldingRegion)o).Name.Trim ();
-				if (string.IsNullOrEmpty (name))
-					name = "#region";
-				txtRenderer.Text = name;
+			var syntaxNode = o as SyntaxNode;
+			if (syntaxNode != null) {
+				txtRenderer.Text = astAmbience.GetEntityMarkup (syntaxNode);
+			} else if (o is SyntaxTrivia) {
+				txtRenderer.Text = ((SyntaxTrivia)o).ToString ();
 			}
 		}
 
-		void MonoDevelop.DesignerSupport.IOutlinedDocument.ReleaseOutlineWidget ()
+		void IOutlinedDocument.ReleaseOutlineWidget ()
 		{
 			if (outlineTreeView == null)
 				return;
@@ -285,7 +292,10 @@ namespace MonoDevelop.DesignerSupport
 		uint refillOutlineStoreId;
 		void UpdateDocumentOutline (object sender, EventArgs args)
 		{
-			lastCU = Document.ParsedDocument;
+			var analysisDocument = DocumentContext.ParsedDocument;
+			if (analysisDocument == null)
+				return;
+			lastCU = analysisDocument.GetAst<SemanticModel> ();
 			//limit update rate to 3s
 			if (!refreshingOutline) {
 				refreshingOutline = true;
@@ -327,99 +337,167 @@ namespace MonoDevelop.DesignerSupport
 			return false;
 		}
 
-		void BuildTreeChildren (TreeStore store, TreeIter parent, ParsedDocument parsedDocument)
+		class TreeVisitor : CSharpSyntaxWalker
 		{
-			if (parsedDocument == null)
-				return;
-			
-			foreach (var unresolvedCls in parsedDocument.TopLevelTypeDefinitions) {
-				var cls = document.Compilation.MainAssembly.GetTypeDefinition (unresolvedCls.FullTypeName);
-				if (cls == null)
-					continue;
-				TreeIter childIter;
-				if (!parent.Equals (TreeIter.Zero))
-					childIter = store.AppendValues (parent, cls);
-				else
-					childIter = store.AppendValues (cls);
-
-				AddTreeClassContents (store, childIter, parsedDocument, cls, unresolvedCls);
+			TreeStore store;
+			TreeIter curIter;
+
+			public TreeVisitor (TreeStore store, TreeIter curIter) : base (SyntaxWalkerDepth.Trivia)
+			{
+				this.store = store;
+				this.curIter = curIter;
 			}
-		}
 
-		static void AddTreeClassContents (TreeStore store, TreeIter parent, ParsedDocument parsedDocument, ITypeDefinition cls, IUnresolvedTypeDefinition part)
-		{
-			List<object> items = new List<object> ();
-			if (cls.Kind != TypeKind.Delegate) {
-				foreach (var o in cls.GetMembers (m => part.Region.FileName == m.Region.FileName && part.Region.IsInside (m.Region.Begin))) {
-					items.Add (o);
-				}
-				foreach (var o in cls.GetNestedTypes (m => part.Region.FileName == m.Region.FileName && part.Region.IsInside (m.Region.Begin))) {
-					if (o.DeclaringType == cls)
-						items.Add (o);
-				}
-				foreach (var o in cls.GetConstructors (m => part.Region.FileName == m.Region.FileName && part.Region.IsInside (m.Region.Begin))) {
-					if (o.IsSynthetic)
-						continue;
-					items.Add (o);
+			TreeIter Append (object node) 
+			{
+				if (!curIter.Equals (TreeIter.Zero))
+					return store.AppendValues (curIter, node);
+				return store.AppendValues (node);
+			}
+
+			public override void VisitTrivia (SyntaxTrivia trivia)
+			{
+				switch (trivia.Kind ()) {
+				case SyntaxKind.RegionDirectiveTrivia:
+					curIter = Append (trivia);
+					break;
+				case SyntaxKind.EndRegionDirectiveTrivia:
+					TreeIter parent;
+					if (store.IterParent (out parent, curIter))
+						curIter = parent;
+					break;
 				}
+				base.VisitTrivia (trivia);
 			}
-			items.Sort (ClassOutlineNodeComparer.CompareRegion);
-			List<FoldingRegion> regions = new List<FoldingRegion> ();
-			foreach (FoldingRegion fr in parsedDocument.UserRegions)
-				//check regions inside class
-				if (cls.BodyRegion.IsInside (fr.Region.Begin) && cls.BodyRegion.IsInside (fr.Region.End))
-					regions.Add (fr);
-			regions.Sort (delegate(FoldingRegion x, FoldingRegion y) { return x.Region.Begin.CompareTo (y.Region.Begin); });
-			 
-			IEnumerator<FoldingRegion> regionEnumerator = regions.GetEnumerator ();
-			if (!regionEnumerator.MoveNext ())
-				regionEnumerator = null;
-			
-			FoldingRegion currentRegion = null;
-			TreeIter currentParent = parent;
-			foreach (object item in items) {
-
-				//no regions left; quick exit
-				if (regionEnumerator != null) {
-					DomRegion itemRegion = ClassOutlineNodeComparer.GetRegion (item);
-
-					//advance to a region that could potentially contain this member
-					while (regionEnumerator != null && !OuterEndsAfterInner (regionEnumerator.Current.Region, itemRegion))
-						if (!regionEnumerator.MoveNext ())
-							regionEnumerator = null;
-
-					//if member is within region, make sure it's the current parent.
-					//If not, move target iter back to class parent
-					if (regionEnumerator != null && regionEnumerator.Current.Region.IsInside (itemRegion.Begin)) {
-						if (currentRegion != regionEnumerator.Current) {
-							currentParent = store.AppendValues (parent, regionEnumerator.Current);
-							currentRegion = regionEnumerator.Current;
-						}
+
+			void VisitBody (SyntaxNode node)
+			{
+				var oldIter = curIter;
+
+				foreach (var syntaxNodeOrToken in node.ChildNodesAndTokens ()) {
+					var syntaxNode = syntaxNodeOrToken.AsNode ();
+					if (syntaxNode != null) {
+						Visit (syntaxNode);
 					} else {
-						currentParent = parent;
+						var syntaxToken = syntaxNodeOrToken.AsToken ();
+						if (syntaxToken.Kind () == SyntaxKind.OpenBraceToken)
+							curIter = Append (node);
+						VisitToken (syntaxToken);
 					}
 				}
-				
-				TreeIter childIter = store.AppendValues (currentParent, item);
-				if (item is ITypeDefinition)
-					AddTreeClassContents (store, childIter, parsedDocument, (ITypeDefinition)item, part);
-					
-			} 
-		}
+				curIter = oldIter;
 
-		static DomRegion GetRegion (object o)
-		{
-			if (o is IEntity) {
-				var m = (IEntity)o;
-				return m.Region; //m.BodyRegion.IsEmpty ? new DomRegion (m.Location, m.Location) : m.BodyRegion;
 			}
-			throw new InvalidOperationException (o.GetType ().ToString ());
+
+			public override void VisitNamespaceDeclaration (NamespaceDeclarationSyntax node)
+			{
+				VisitBody (node);
+			}
+
+			public override void VisitClassDeclaration (ClassDeclarationSyntax node)
+			{
+				VisitBody (node);
+			}
+
+			public override void VisitStructDeclaration (StructDeclarationSyntax node)
+			{
+				VisitBody (node);
+			}
+
+			public override void VisitEnumDeclaration (EnumDeclarationSyntax node)
+			{
+				VisitBody (node);
+			}
+
+			public override void VisitInterfaceDeclaration (InterfaceDeclarationSyntax node)
+			{
+				VisitBody (node);
+			}
+
+			public override void VisitDelegateDeclaration (DelegateDeclarationSyntax node)
+			{
+				base.VisitDelegateDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitFieldDeclaration (FieldDeclarationSyntax node)
+			{
+				base.VisitFieldDeclaration (node);
+				foreach (var v in node.Declaration.Variables)
+					Append (v);
+			}
+
+			public override void VisitPropertyDeclaration (PropertyDeclarationSyntax node)
+			{
+				base.VisitPropertyDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitIndexerDeclaration (IndexerDeclarationSyntax node)
+			{
+				base.VisitIndexerDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitMethodDeclaration (MethodDeclarationSyntax node)
+			{
+				base.VisitMethodDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitOperatorDeclaration (OperatorDeclarationSyntax node)
+			{
+				base.VisitOperatorDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitConstructorDeclaration (ConstructorDeclarationSyntax node)
+			{
+				base.VisitConstructorDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitDestructorDeclaration (DestructorDeclarationSyntax node)
+			{
+				base.VisitDestructorDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitEventDeclaration (EventDeclarationSyntax node)
+			{
+				base.VisitEventDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitEventFieldDeclaration (EventFieldDeclarationSyntax node)
+			{
+				base.VisitEventFieldDeclaration (node);
+				foreach (var v in node.Declaration.Variables)
+					Append (v);
+			}
+
+			public override void VisitEnumMemberDeclaration (EnumMemberDeclarationSyntax node)
+			{
+				base.VisitEnumMemberDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitBlock (BlockSyntax node)
+			{
+				// skip
+			}
 		}
 
-		static bool OuterEndsAfterInner (DomRegion outer, DomRegion inner)
+
+		static void BuildTreeChildren (TreeStore store, TreeIter parent, SemanticModel parsedDocument)
 		{
-			return ((outer.End.Line > 1 && outer.End.Line > inner.End.Line)
-				|| (outer.End.Line == inner.End.Line && outer.End.Column > inner.End.Column));
+			if (parsedDocument == null)
+				return;
+
+			var root = parsedDocument.SyntaxTree.GetRoot ();
+
+			var visitor = new TreeVisitor (store, parent);
+			visitor.Visit (root); 
 		}
 
 		void UpdateSorting ()
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineNodeComparer.cs
index c6bc863697..ea844666b0 100755
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineNodeComparer.cs
@@ -33,22 +33,23 @@ using Gtk;
 
 using MonoDevelop.Core;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
 
-namespace MonoDevelop.DesignerSupport
+namespace MonoDevelop.CSharp.ClassOutline
 {
 	/// <remarks>
 	/// This implementation uses a primary sort key (int based on node's group) and
 	/// a secondary sort key (string based on node's name) for comparison.
 	/// </remarks>
-	/// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineSettings"/>
-	class ClassOutlineNodeComparer : IComparer<TreeIter>
+	/// <seealso cref="MonoDevelop.CSharp.ClassOutline.OutlineSettings"/>
+	class OutlineNodeComparer : IComparer<TreeIter>
 	{
 		const string DEFAULT_REGION_NAME = "region";
 		
-		Ambience ambience;
+		AstAmbience ambience;
 		TreeModel model;
-		ClassOutlineSettings settings;
+		OutlineSettings settings;
 		int[] groupTable;
 
 		/// <param name="ambience">
@@ -60,7 +61,7 @@ namespace MonoDevelop.DesignerSupport
 		/// <param name="model">
 		/// The model containing the nodes to compare.
 		/// </param>
-		public ClassOutlineNodeComparer (Ambience ambience, ClassOutlineSettings settings, TreeModel model)
+		public OutlineNodeComparer (AstAmbience ambience, OutlineSettings settings, TreeModel model)
 		{
 			this.ambience = ambience;
 			this.settings = settings;
@@ -109,9 +110,9 @@ namespace MonoDevelop.DesignerSupport
 				if (groupOrder != 0)
 					return groupOrder;
 				
-				IMethod m1 = o1 as IMethod;
+				var m1 = o1 as BaseMethodDeclarationSyntax;
 				if (m1 != null)
-					return CompareMethods (m1, (IMethod)o2, settings.IsSorted);
+					return CompareMethods (m1, (BaseMethodDeclarationSyntax)o2, settings.IsSorted);
 			}
 			
 			if (settings.IsSorted)
@@ -132,15 +133,15 @@ namespace MonoDevelop.DesignerSupport
 			return sort;
 		}
 
-		int CompareMethods (IMethod m1, IMethod m2, bool isSortingAlphabetically)
+		int CompareMethods (BaseMethodDeclarationSyntax m1, BaseMethodDeclarationSyntax m2, bool isSortingAlphabetically)
 		{
 			// Here we sort constructors before finalizers before other methods.
 			// Remember that two constructors have the same name.
 
 			// Sort constructors at top.
 			
-			bool isCtor1 = m1.IsConstructor;
-			bool isCtor2 = m2.IsConstructor;
+			bool isCtor1 = m1 is ConstructorDeclarationSyntax;
+			bool isCtor2 = m2 is ConstructorDeclarationSyntax;
 
 			if (isCtor1) {
 				if (isCtor2)
@@ -176,20 +177,12 @@ namespace MonoDevelop.DesignerSupport
 
 		bool IsConstructor (object node)
 		{
-			if (node is IMethod) {
-				return ((IMethod) node).IsConstructor;
-			}
-
-			return false;
+			return node is ConstructorDeclarationSyntax;
 		}
 
 		bool IsFinalizer (object node)
 		{
-			if (node is IMethod) {
-				return ((IMethod) node).IsDestructor;
-			}
-
-			return false;
+			return node is DestructorDeclarationSyntax;
 		}
 		
 		const int GROUP_INDEX_REGIONS = 0;
@@ -206,25 +199,25 @@ namespace MonoDevelop.DesignerSupport
 			int i = -10;
 			foreach (var g in settings.GroupOrder) {
 				switch (g) {
-				case ClassOutlineSettings.GroupRegions:
+				case OutlineSettings.GroupRegions:
 					groupTable[GROUP_INDEX_REGIONS] = i++;
 					break;
-				case ClassOutlineSettings.GroupNamespaces:
+				case OutlineSettings.GroupNamespaces:
 					groupTable[GROUP_INDEX_NAMESPACES] = i++;
 					break;
-				case ClassOutlineSettings.GroupTypes:
+				case OutlineSettings.GroupTypes:
 					groupTable[GROUP_INDEX_TYPES] = i++;
 					break;
-				case ClassOutlineSettings.GroupFields:
+				case OutlineSettings.GroupFields:
 					groupTable[GROUP_INDEX_FIELDS] = i++;
 					break;
-				case ClassOutlineSettings.GroupProperties:
+				case OutlineSettings.GroupProperties:
 					groupTable[GROUP_INDEX_PROPERTIES] = i++;
 					break;
-				case ClassOutlineSettings.GroupEvents:
+				case OutlineSettings.GroupEvents:
 					groupTable[GROUP_INDEX_EVENTS] = i++;
 					break;
-				case ClassOutlineSettings.GroupMethods:
+				case OutlineSettings.GroupMethods:
 					groupTable[GROUP_INDEX_METHODS] = i++;
 					break;
 				}
@@ -233,19 +226,19 @@ namespace MonoDevelop.DesignerSupport
 
 		int GetGroupPriority (object node)
 		{
-			if (node is FoldingRegion)
+			if (node is SyntaxTrivia)
 				return groupTable[GROUP_INDEX_REGIONS];
 			if (node is string)
 				return groupTable[GROUP_INDEX_NAMESPACES];
-			if (node is IType)
+			if (node is BaseTypeDeclarationSyntax)
 				return groupTable[GROUP_INDEX_TYPES];
-			if (node is IField)
+			if (node is FieldDeclarationSyntax)
 				return groupTable[GROUP_INDEX_FIELDS];
-			if (node is IProperty)
+			if (node is PropertyDeclarationSyntax)
 				return groupTable[GROUP_INDEX_PROPERTIES];
-			if (node is IEvent)
+			if (node is EventDeclarationSyntax || node is EventFieldDeclarationSyntax)
 				return groupTable[GROUP_INDEX_EVENTS];
-			if (node is IMethod)
+			if (node is BaseMethodDeclarationSyntax)
 				return groupTable[GROUP_INDEX_METHODS];
 			return 0;
 		}
@@ -262,14 +255,14 @@ namespace MonoDevelop.DesignerSupport
 		/// </returns>
 		string GetSortName (object node)
 		{
-			if (node is IEntity) {
+			if (node is SyntaxNode) {
 				// Return the name without type or parameters
-				return ambience.GetString ((IEntity)node, 0);
+				return ambience.GetEntityMarkup ((SyntaxNode)node);
 			}
 		
-			if (node is FoldingRegion) {
+			if (node is SyntaxTrivia) {
 				// Return trimmed region name or fallback
-				string name = ((FoldingRegion)node).Name.Trim ();
+				string name = ((SyntaxTrivia)node).ToString ().Trim ();
 				
 				// ClassOutlineTextEditorExtension uses a fallback name for regions
 				// so we do the same here with a slighty different name.
@@ -282,22 +275,19 @@ namespace MonoDevelop.DesignerSupport
 			return string.Empty;
 		}
 		
-		internal static DomRegion GetRegion (object o)
+		internal static int GetOffset (object o)
 		{
-			var m = o as IEntity;
+			var m = o as SyntaxNode;
 			if (m != null)
-				return m.BodyRegion.IsEmpty ? m.Region : m.BodyRegion;
-			var m2 = o as IUnresolvedEntity;
-			if (m2 != null)
-				return m2.BodyRegion.IsEmpty ? m2.Region : m2.BodyRegion;
-			if (o is FoldingRegion)
-				return ((FoldingRegion)o).Region;
-			return DomRegion.Empty;
+				return m.SpanStart;
+			//			if (o is FoldingRegion)
+			//	return ((FoldingRegion)o).Region;
+			return 0;
 		}
 		
 		internal static int CompareRegion (object o1, object o2)
 		{
-			return GetRegion (o1).Begin.CompareTo (GetRegion (o2).Begin);
+			return GetOffset (o1).CompareTo (GetOffset (o2));
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineSettings.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineSettings.cs
index f928255b7e..8f6a63a96d 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineSettings.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineSettings.cs
@@ -33,7 +33,7 @@ using System.Linq;
 
 using MonoDevelop.Core;
 
-namespace MonoDevelop.DesignerSupport
+namespace MonoDevelop.CSharp.ClassOutline
 {
 	/// <summary>
 	/// Stores sorting status and is serialized to configuration properties.
@@ -43,8 +43,8 @@ namespace MonoDevelop.DesignerSupport
 	/// or what primary sort key values the individual node groups have. This class is
 	/// serialized to the configuration file MonoDevelopProperties.xml.
 	/// </remarks>
-	/// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineTextEditorExtension"/>
-	class ClassOutlineSettings
+	/// <seealso cref="MonoDevelop.CSharp.ClassOutline.CSharpOutlineTextEditorExtension"/>
+	class OutlineSettings
 	{
 		const string KEY_GROUP_ORDER = "MonoDevelop.DesignerSupport.ClassOutline.GroupOrder";
 		const string KEY_IS_GROUPED = "MonoDevelop.DesignerSupport.ClassOutline.IsGrouped";
@@ -68,13 +68,13 @@ namespace MonoDevelop.DesignerSupport
 			{ GroupMethods,    GettextCatalog.GetString ("Methods") },
 		};
 		
-		ClassOutlineSettings ()
+		OutlineSettings ()
 		{
 		}
 		
-		public static ClassOutlineSettings Load ()
+		public static OutlineSettings Load ()
 		{
-			var cs = new ClassOutlineSettings ();
+			var cs = new OutlineSettings ();
 			cs.IsGrouped = PropertyService.Get (KEY_IS_GROUPED, false);
 			cs.IsSorted = PropertyService.Get (KEY_IS_SORTED, false);
 			
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineSortingPreferencesDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineSortingPreferencesDialog.cs
index 170e1d7929..713bca748e 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineSortingPreferencesDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineSortingPreferencesDialog.cs
@@ -33,7 +33,7 @@ using Gtk;
 using MonoDevelop.Core;
 
 
-namespace MonoDevelop.DesignerSupport
+namespace MonoDevelop.CSharp.ClassOutline
 {
 	/// <summary>
 	/// Provides a priority list of the groups that items in the class outline can be grouped in.
@@ -42,11 +42,11 @@ namespace MonoDevelop.DesignerSupport
 	/// The user can sort the list with button presses and thereby change the order of groups
 	/// in the outline, while grouping is active.
 	/// </remarks>
-	partial class ClassOutlineSortingPreferencesDialog : Dialog
+	partial class OutlineSortingPreferencesDialog : Dialog
 	{
-		ClassOutlineSettings settings;
+		OutlineSettings settings;
 		
-		public ClassOutlineSortingPreferencesDialog (ClassOutlineSettings settings)
+		public OutlineSortingPreferencesDialog (OutlineSettings settings)
 		{
 			this.Build ();
 
@@ -55,7 +55,7 @@ namespace MonoDevelop.DesignerSupport
 			
 			priorityList.Model.Clear ();
 			foreach (string g in settings.GroupOrder) {
-				priorityList.Model.AppendValues (g, ClassOutlineSettings.GetGroupName (g));
+				priorityList.Model.AppendValues (g, OutlineSettings.GetGroupName (g));
 			}
 			
 			this.settings = settings;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs
new file mode 100644
index 0000000000..ca6de1af18
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs
@@ -0,0 +1,523 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using ICSharpCode.NRefactory6.CSharp;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	internal abstract partial class AbstractAddImportCodeFixProvider : CodeFixProvider
+	{
+		protected abstract bool IgnoreCase { get; }
+
+		protected abstract bool CanAddImport(SyntaxNode node, CancellationToken cancellationToken);
+		protected abstract bool CanAddImportForMethod(Diagnostic diagnostic, ref SyntaxNode node);
+		protected abstract bool CanAddImportForNamespace(Diagnostic diagnostic, ref SyntaxNode node);
+		protected abstract bool CanAddImportForQuery(Diagnostic diagnostic, ref SyntaxNode node);
+		protected abstract bool CanAddImportForType(Diagnostic diagnostic, ref SyntaxNode node);
+
+		protected abstract ISet<INamespaceSymbol> GetNamespacesInScope(SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken);
+		protected abstract ITypeSymbol GetQueryClauseInfo(SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken);
+		protected abstract string GetDescription(INamespaceOrTypeSymbol symbol, SemanticModel semanticModel, SyntaxNode root);
+		protected abstract Task<Document> AddImportAsync(SyntaxNode contextNode, INamespaceOrTypeSymbol symbol, Document documemt, bool specialCaseSystem, CancellationToken cancellationToken);
+		protected abstract bool IsViableExtensionMethod(IMethodSymbol method, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken);
+		protected abstract IEnumerable<ITypeSymbol> GetProposedTypes(string name, List<ITypeSymbol> accessibleTypeSymbols, SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope);
+		internal abstract bool IsViableField(IFieldSymbol field, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken);
+		internal abstract bool IsViableProperty(IPropertySymbol property, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken);
+		internal abstract bool IsAddMethodContext(SyntaxNode node, SemanticModel semanticModel);
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var diagnostics = context.Diagnostics;
+			var cancellationToken = context.CancellationToken;
+
+			var project = document.Project;
+			var diagnostic = diagnostics.First();
+			var model = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var ancestors = root.FindToken(span.Start, findInsideTrivia: true).GetAncestors<SyntaxNode>();
+			if (!ancestors.Any())
+			{
+				return;
+			}
+
+			var node = ancestors.FirstOrDefault(n => n.Span.Contains(span) && n != root);
+			if (node == null)
+			{
+				return;
+			}
+
+			var placeSystemNamespaceFirst = true; //document.Project.Solution.Workspace.Options.GetOption(Microsoft.CodeAnalysis.Shared.Options.OrganizerOptions.PlaceSystemNamespaceFirst, document.Project.Language);
+
+			if (!cancellationToken.IsCancellationRequested)
+			{
+				if (this.CanAddImport(node, cancellationToken))
+				{
+					var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+					var containingType = semanticModel.GetEnclosingNamedType(node.SpanStart, cancellationToken);
+					var containingTypeOrAssembly = containingType ?? (ISymbol)semanticModel.Compilation.Assembly;
+					var namespacesInScope = this.GetNamespacesInScope(semanticModel, node, cancellationToken);
+
+					var matchingTypesNamespaces = await this.GetNamespacesForMatchingTypesAsync(project, diagnostic, node, semanticModel, namespacesInScope,  cancellationToken).ConfigureAwait(false);
+					var matchingTypes = await this.GetMatchingTypesAsync(project, diagnostic, node, semanticModel, namespacesInScope,  cancellationToken).ConfigureAwait(false);
+					var matchingNamespaces = await this.GetNamespacesForMatchingNamespacesAsync(project, diagnostic, node, semanticModel, namespacesInScope,  cancellationToken).ConfigureAwait(false);
+					var matchingExtensionMethodsNamespaces = await this.GetNamespacesForMatchingExtensionMethodsAsync(project, diagnostic, node, semanticModel, namespacesInScope,  cancellationToken).ConfigureAwait(false);
+					var matchingFieldsAndPropertiesAsync = await this.GetNamespacesForMatchingFieldsAndPropertiesAsync(project, diagnostic, node, semanticModel, namespacesInScope,  cancellationToken).ConfigureAwait(false);
+					var queryPatternsNamespaces = await this.GetNamespacesForQueryPatternsAsync(project, diagnostic, node, semanticModel, namespacesInScope, cancellationToken).ConfigureAwait(false);
+
+					if (matchingTypesNamespaces != null || matchingNamespaces != null || matchingExtensionMethodsNamespaces != null || matchingFieldsAndPropertiesAsync != null || queryPatternsNamespaces != null || matchingTypes != null)
+					{
+						matchingTypesNamespaces = matchingTypesNamespaces ?? SpecializedCollections.EmptyList<INamespaceSymbol>();
+						matchingNamespaces = matchingNamespaces ?? SpecializedCollections.EmptyList<INamespaceSymbol>();
+						matchingExtensionMethodsNamespaces = matchingExtensionMethodsNamespaces ?? SpecializedCollections.EmptyList<INamespaceSymbol>();
+						matchingFieldsAndPropertiesAsync = matchingFieldsAndPropertiesAsync ?? SpecializedCollections.EmptyList<INamespaceSymbol>();
+						queryPatternsNamespaces = queryPatternsNamespaces ?? SpecializedCollections.EmptyList<INamespaceSymbol>();
+						matchingTypes = matchingTypes ?? SpecializedCollections.EmptyList<ITypeSymbol>();
+
+						var proposedImports =
+							matchingTypesNamespaces.Cast<INamespaceOrTypeSymbol> ()
+								.Concat (matchingNamespaces.Cast<INamespaceOrTypeSymbol> ())
+								.Concat (matchingExtensionMethodsNamespaces.Cast<INamespaceOrTypeSymbol> ())
+								.Concat (matchingFieldsAndPropertiesAsync.Cast<INamespaceOrTypeSymbol> ())
+								.Concat (queryPatternsNamespaces.Cast<INamespaceOrTypeSymbol> ())
+								.Concat (matchingTypes.Cast<INamespaceOrTypeSymbol> ())
+								.Distinct ()
+								.Where (NotNull)
+								.Where (NotGlobalNamespace)
+								.ToList ();
+						proposedImports.Sort (INamespaceOrTypeSymbolExtensions.CompareNamespaceOrTypeSymbols);
+						proposedImports = proposedImports.Take (8).ToList ();
+							
+						if (proposedImports.Count > 0)
+						{
+							cancellationToken.ThrowIfCancellationRequested();
+
+							foreach (var import in proposedImports)
+							{
+								var action = new DocumentChangeAction(
+									node.Span, 
+									DiagnosticSeverity.Error, 
+									this.GetDescription(import, semanticModel, node), 
+									(c) => this.AddImportAsync(node, import, document, placeSystemNamespaceFirst, cancellationToken)
+								);
+
+								context.RegisterCodeFix(action, diagnostic);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		private async Task<IEnumerable<INamespaceSymbol>> GetNamespacesForMatchingTypesAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForType(diagnostic, ref node))
+			{
+				return null;
+			}
+
+			string name;
+			int arity;
+			bool inAttributeContext, hasIncompleteParentMember;
+			CalculateContext(node,  out name, out arity, out inAttributeContext, out hasIncompleteParentMember);
+
+			var symbols = await GetTypeSymbols(project, node, semanticModel, name, inAttributeContext, cancellationToken).ConfigureAwait(false);
+			if (symbols == null)
+			{
+				return null;
+			}
+
+			return GetNamespacesForMatchingTypesAsync(semanticModel, namespacesInScope, arity, inAttributeContext, hasIncompleteParentMember, symbols);
+		}
+
+		private IEnumerable<INamespaceSymbol> GetNamespacesForMatchingTypesAsync(SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope, int arity, bool inAttributeContext, bool hasIncompleteParentMember, IEnumerable<ITypeSymbol> symbols)
+		{
+			var accessibleTypeSymbols = symbols
+				.Where(s => s.ContainingSymbol is INamespaceSymbol
+					&& ArityAccessibilityAndAttributeContextAreCorrect(
+						semanticModel, s, arity,
+						inAttributeContext, hasIncompleteParentMember))
+				.ToList();
+
+			return GetProposedNamespaces(
+				accessibleTypeSymbols.Select(s => s.ContainingNamespace),
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private async Task<IEnumerable<ITypeSymbol>> GetMatchingTypesAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForType(diagnostic, ref node))
+			{
+				return null;
+			}
+
+			string name;
+			int arity;
+			bool inAttributeContext, hasIncompleteParentMember;
+			CalculateContext(node,  out name, out arity, out inAttributeContext, out hasIncompleteParentMember);
+
+			var symbols = await GetTypeSymbols(project, node, semanticModel, name, inAttributeContext, cancellationToken).ConfigureAwait(false);
+			if (symbols == null)
+			{
+				return null;
+			}
+
+			return GetMatchingTypes(semanticModel, namespacesInScope, name, arity, inAttributeContext, symbols, hasIncompleteParentMember);
+		}
+
+		private async Task<IEnumerable<INamespaceSymbol>> GetNamespacesForMatchingNamespacesAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForNamespace(diagnostic, ref node))
+			{
+				return null;
+			}
+
+			string name;
+			int arity;
+			node.GetNameAndArityOfSimpleName(out name, out arity);
+
+			if (ExpressionBinds(node, semanticModel, cancellationToken))
+			{
+				return null;
+			}
+
+			var symbols = await SymbolFinder.FindDeclarationsAsync(
+				project, name, this.IgnoreCase, SymbolFilter.Namespace, cancellationToken).ConfigureAwait(false);
+
+			return GetProposedNamespaces(
+				symbols.OfType<INamespaceSymbol>().Select(n => n.ContainingNamespace),
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private async Task<IEnumerable<INamespaceSymbol>> GetNamespacesForMatchingExtensionMethodsAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForMethod(diagnostic,  ref node))
+			{
+				return null;
+			}
+
+			var expression = node.Parent;
+
+			var extensionMethods = SpecializedCollections.EmptyEnumerable<INamespaceSymbol>();
+			var symbols = await GetSymbolsAsync(project, node, semanticModel,  cancellationToken).ConfigureAwait(false);
+			if (symbols != null)
+			{
+				extensionMethods = FilterForExtensionMethods(semanticModel, namespacesInScope,  expression, symbols, cancellationToken);
+			}
+
+			var addMethods = SpecializedCollections.EmptyEnumerable<INamespaceSymbol>();
+			var methodSymbols = await GetAddMethodsAsync(project, diagnostic, node, semanticModel, namespacesInScope,  expression, cancellationToken).ConfigureAwait(false);
+			if (methodSymbols != null)
+			{
+				addMethods = GetProposedNamespaces(
+					methodSymbols.Select(s => s.ContainingNamespace),
+					semanticModel,
+					namespacesInScope);
+			}
+
+			return extensionMethods.Concat(addMethods);
+		}
+
+		private async Task<IEnumerable<INamespaceSymbol>> GetNamespacesForMatchingFieldsAndPropertiesAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForMethod(diagnostic,  ref node))
+			{
+				return null;
+			}
+
+			var expression = node.Parent;
+
+			var symbols = await GetSymbolsAsync(project, node, semanticModel,  cancellationToken).ConfigureAwait(false);
+
+			if (symbols != null)
+			{
+				return FilterForFieldsAndProperties(semanticModel, namespacesInScope,  expression, symbols, cancellationToken);
+			}
+
+			return null;
+		}
+
+		private IEnumerable<INamespaceSymbol> FilterForFieldsAndProperties(SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope, SyntaxNode expression, IEnumerable<ISymbol> symbols, CancellationToken cancellationToken)
+		{
+			var propertySymbols = symbols
+				.OfType<IPropertySymbol>()
+				.Where(property => property.ContainingType?.IsAccessibleWithin(semanticModel.Compilation.Assembly) == true &&
+					IsViableProperty(property, expression, semanticModel,  cancellationToken))
+				.ToList();
+
+			var fieldSymbols = symbols
+				.OfType<IFieldSymbol>()
+				.Where(field => field.ContainingType?.IsAccessibleWithin(semanticModel.Compilation.Assembly) == true &&
+					IsViableField(field, expression, semanticModel,  cancellationToken))
+				.ToList();
+
+			return GetProposedNamespaces(
+				propertySymbols.Select(s => s.ContainingNamespace).Concat(fieldSymbols.Select(s => s.ContainingNamespace)),
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private Task<IEnumerable<ISymbol>> GetSymbolsAsync(
+			Microsoft.CodeAnalysis.Project project,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+
+			// See if the name binds.  If it does, there's nothing further we need to do.
+			if (ExpressionBinds(node, semanticModel, cancellationToken, checkForExtensionMethods: true))
+			{
+				return Task.FromResult (Enumerable.Empty<ISymbol>());
+			}
+
+			string name;
+			int arity;
+			node.GetNameAndArityOfSimpleName(out name, out arity);
+			if (name == null)
+			{
+				return Task.FromResult (Enumerable.Empty<ISymbol>());
+			}
+
+			return SymbolFinder.FindDeclarationsAsync(project, name, this.IgnoreCase, SymbolFilter.Member, cancellationToken);
+		}
+
+		private async Task<IEnumerable<IMethodSymbol>> GetAddMethodsAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			SyntaxNode expression,
+			CancellationToken cancellationToken)
+		{
+			string name;
+			int arity;
+			node.GetNameAndArityOfSimpleName(out name, out arity);
+			if (name != null)
+			{
+				return SpecializedCollections.EmptyEnumerable<IMethodSymbol>();
+			}
+
+			if (IsAddMethodContext(node, semanticModel))
+			{
+				var symbols = await SymbolFinder.FindDeclarationsAsync(project, "Add", this.IgnoreCase, SymbolFilter.Member, cancellationToken).ConfigureAwait(false);
+				return symbols
+					.OfType<IMethodSymbol>()
+					.Where(method => method.IsExtensionMethod &&
+						method.ContainingType?.IsAccessibleWithin(semanticModel.Compilation.Assembly) == true &&
+						IsViableExtensionMethod(method, expression, semanticModel,  cancellationToken));
+			}
+
+			return SpecializedCollections.EmptyEnumerable<IMethodSymbol>();
+		}
+
+		private IEnumerable<INamespaceSymbol> FilterForExtensionMethods(SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope,  SyntaxNode expression, IEnumerable<ISymbol> symbols, CancellationToken cancellationToken)
+		{
+			var extensionMethodSymbols = symbols
+				.OfType<IMethodSymbol>()
+				.Where(method => method.IsExtensionMethod &&
+					method.ContainingType?.IsAccessibleWithin(semanticModel.Compilation.Assembly) == true &&
+					IsViableExtensionMethod(method, expression, semanticModel,  cancellationToken))
+				.ToList();
+
+			return GetProposedNamespaces(
+				extensionMethodSymbols.Select(s => s.ContainingNamespace),
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private async Task<IEnumerable<INamespaceSymbol>> GetNamespacesForQueryPatternsAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForQuery(diagnostic, ref node))
+			{
+				return null;
+			}
+
+			ITypeSymbol type = this.GetQueryClauseInfo(semanticModel, node, cancellationToken);
+			if (type == null)
+			{
+				return null;
+			}
+
+			// find extension methods named "Select"
+			var symbols = await SymbolFinder.FindDeclarationsAsync(project, "Select", this.IgnoreCase, SymbolFilter.Member, cancellationToken).ConfigureAwait(false);
+
+			var extensionMethodSymbols = symbols
+				.OfType<IMethodSymbol>()
+				.Where(s => s.IsExtensionMethod && IsViableExtensionMethod(type, s))
+				.ToList();
+
+			return GetProposedNamespaces(
+				extensionMethodSymbols.Select(s => s.ContainingNamespace),
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private bool IsViableExtensionMethod(
+			ITypeSymbol typeSymbol,
+			IMethodSymbol method)
+		{
+			return typeSymbol != null && method.ReduceExtensionMethod(typeSymbol) != null;
+		}
+
+		private static bool ArityAccessibilityAndAttributeContextAreCorrect(
+			SemanticModel semanticModel,
+			ITypeSymbol symbol,
+			int arity,
+			bool inAttributeContext,
+			bool hasIncompleteParentMember)
+		{
+			return (arity == 0 || symbol.GetArity() == arity || hasIncompleteParentMember)
+				&& symbol.IsAccessibleWithin(semanticModel.Compilation.Assembly)
+				&& (!inAttributeContext || symbol.IsAttribute());
+		}
+
+		private async Task<IEnumerable<ITypeSymbol>> GetTypeSymbols(
+			Microsoft.CodeAnalysis.Project project,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			string name,
+			bool inAttributeContext,
+			CancellationToken cancellationToken)
+		{
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return null;
+			}
+
+			if (ExpressionBinds(node, semanticModel, cancellationToken))
+			{
+				return null;
+			}
+
+			var symbols = await SymbolFinder.FindDeclarationsAsync(project, name, this.IgnoreCase, SymbolFilter.Type, cancellationToken).ConfigureAwait(false);
+
+			// also lookup type symbols with the "Attribute" suffix.
+			if (inAttributeContext)
+			{
+				symbols = symbols.Concat(
+					await SymbolFinder.FindDeclarationsAsync(project, name + "Attribute", this.IgnoreCase, SymbolFilter.Type, cancellationToken).ConfigureAwait(false));
+			}
+
+			return symbols.OfType<ITypeSymbol>();
+		}
+
+		private IEnumerable<ITypeSymbol> GetMatchingTypes(SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope, string name, int arity, bool inAttributeContext, IEnumerable<ITypeSymbol> symbols, bool hasIncompleteParentMember)
+		{
+			var accessibleTypeSymbols = symbols
+				.Where(s => ArityAccessibilityAndAttributeContextAreCorrect(
+					semanticModel, s, arity,
+					inAttributeContext, hasIncompleteParentMember))
+				.ToList();
+
+			return GetProposedTypes(
+				name,
+				accessibleTypeSymbols,
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private static void CalculateContext(SyntaxNode node, out string name, out int arity, out bool inAttributeContext, out bool hasIncompleteParentMember)
+		{
+			// Has to be a simple identifier or generic name.
+			node.GetNameAndArityOfSimpleName(out name, out arity);
+
+			inAttributeContext = node.IsAttributeName();
+			hasIncompleteParentMember = node.HasIncompleteParentMember();
+		}
+
+		protected bool ExpressionBinds(SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken, bool checkForExtensionMethods = false)
+		{
+			// See if the name binds to something other then the error type. If it does, there's nothing further we need to do.
+			// For extension methods, however, we will continue to search if there exists any better matched method.
+			cancellationToken.ThrowIfCancellationRequested();
+			var symbolInfo = semanticModel.GetSymbolInfo(expression, cancellationToken);
+			if (symbolInfo.CandidateReason == CandidateReason.OverloadResolutionFailure && !checkForExtensionMethods)
+			{
+				return true;
+			}
+
+			return symbolInfo.Symbol != null;
+		}
+
+		protected IEnumerable<INamespaceSymbol> GetProposedNamespaces(
+			IEnumerable<INamespaceSymbol> namespaces,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope)
+		{
+			// We only want to offer to add a using if we don't already have one.
+			return
+				namespaces.Where(n => !n.IsGlobalNamespace)
+					.Select(n => semanticModel.Compilation.GetCompilationNamespace(n) ?? n)
+					.Where(n => n != null && !namespacesInScope.Contains(n));
+		}
+
+		private static bool NotGlobalNamespace(INamespaceOrTypeSymbol symbol)
+		{
+			return symbol.IsNamespace ? !((INamespaceSymbol)symbol).IsGlobalNamespace : true;
+		}
+
+		private static bool NotNull(INamespaceOrTypeSymbol symbol)
+		{
+			return symbol != null;
+		}
+
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/CSharpAddImportCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/CSharpAddImportCodeFixProvider.cs
new file mode 100644
index 0000000000..994bd39571
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/CSharpAddImportCodeFixProvider.cs
@@ -0,0 +1,642 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Roslyn.Utilities;
+using MonoDevelop.CSharp.CodeFixes;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.AddUsingOrImport), Shared]
+	class CSharpAddImportCodeFixProvider : AbstractAddImportCodeFixProvider
+	{
+		/// <summary>
+		/// name does not exist in context
+		/// </summary>
+		private const string CS0103 = "CS0103";
+
+		/// <summary>
+		/// type or namespace could not be found
+		/// </summary>
+		private const string CS0246 = "CS0246";
+
+		/// <summary>
+		/// wrong number of type args
+		/// </summary>
+		private const string CS0305 = "CS0305";
+
+		/// <summary>
+		/// type does not contain a definition of method or extension method
+		/// </summary>
+		private const string CS1061 = "CS1061";
+
+		/// <summary>
+		/// cannot find implementation of query pattern
+		/// </summary>
+		private const string CS1935 = "CS1935";
+
+		/// <summary>
+		/// The non-generic type 'A' cannot be used with type arguments
+		/// </summary>
+		private const string CS0308 = "CS0308";
+
+		/// <summary>
+		/// 'A' is inaccessible due to its protection level
+		/// </summary>
+		private const string CS0122 = "CS0122";
+
+		/// <summary>
+		/// The using alias 'A' cannot be used with type arguments
+		/// </summary>
+		private const string CS0307 = "CS0307";
+
+		/// <summary>
+		/// 'A' is not an attribute class
+		/// </summary>
+		private const string CS0616 = "CS0616";
+
+		/// <summary>
+		/// ; expected.
+		/// </summary>
+		private const string CS1002 = "CS1002";
+
+		/// <summary>
+		/// Syntax error, 'A' expected
+		/// </summary>
+		private const string CS1003 = "CS1003";
+
+		/// <summary>
+		/// cannot convert from 'int' to 'string'
+		/// </summary>
+		private const string CS1503 = "CS1503";
+
+		/// <summary>
+		/// XML comment on 'construct' has syntactically incorrect cref attribute 'name'
+		/// </summary>
+		private const string CS1574 = "CS1574";
+
+		/// <summary>
+		/// Invalid type for parameter 'parameter number' in XML comment cref attribute
+		/// </summary>
+		private const string CS1580 = "CS1580";
+
+		/// <summary>
+		/// Invalid return type in XML comment cref attribute
+		/// </summary>
+		private const string CS1581 = "CS1581";
+
+		/// <summary>
+		/// XML comment has syntactically incorrect cref attribute
+		/// </summary>
+		private const string CS1584 = "CS1584";
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get
+			{
+				return ImmutableArray.Create(
+					CS0103,
+					CS0246,
+					CS0305,
+					CS1061,
+					CS1935,
+					CS0308,
+					CS0122,
+					CS0307,
+					CS0616,
+					CS1002,
+					CS1003,
+					CS1503,
+					CS1574,
+					CS1580,
+					CS1581,
+					CS1584);
+			}
+		}
+
+		protected override bool IgnoreCase
+		{
+			get { return false; }
+		}
+
+		protected override bool CanAddImport(SyntaxNode node, CancellationToken cancellationToken)
+		{
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return false;
+			}
+
+			return node.CanAddUsingDirectives(cancellationToken);
+		}
+
+		protected override bool CanAddImportForMethod(Diagnostic diagnostic, ref SyntaxNode node)
+		{
+			switch (diagnostic.Id)
+			{
+			case CS1061:
+				if (node.IsKind(SyntaxKind.ConditionalAccessExpression))
+				{
+					node = (node as ConditionalAccessExpressionSyntax).WhenNotNull;
+				}
+				else if (node.IsKind(SyntaxKind.MemberBindingExpression))
+				{
+					node = (node as MemberBindingExpressionSyntax).Name;
+				}
+				else if (node.Parent.IsKind(SyntaxKind.CollectionInitializerExpression))
+				{
+					return true;
+				}
+
+				break;
+			case CS0122:
+				break;
+
+			case CS1503:
+				//// look up its corresponding method name
+				var parent = node.GetAncestor<InvocationExpressionSyntax>();
+				if (parent == null)
+				{
+					return false;
+				}
+
+				var method = parent.Expression as MemberAccessExpressionSyntax;
+				if (method != null)
+				{
+					node = method.Name;
+				}
+
+				break;
+
+			default:
+				return false;
+			}
+
+			var simpleName = node as SimpleNameSyntax;
+			if (!simpleName.IsParentKind(SyntaxKind.SimpleMemberAccessExpression) &&
+				!simpleName.IsParentKind(SyntaxKind.MemberBindingExpression))
+			{
+				return false;
+			}
+
+			var memberAccess = simpleName.Parent as MemberAccessExpressionSyntax;
+			var memberBinding = simpleName.Parent as MemberBindingExpressionSyntax;
+			if (memberAccess.IsParentKind(SyntaxKind.SimpleMemberAccessExpression) ||
+				memberAccess.IsParentKind(SyntaxKind.ElementAccessExpression) ||
+				memberBinding.IsParentKind(SyntaxKind.SimpleMemberAccessExpression) ||
+				memberBinding.IsParentKind(SyntaxKind.ElementAccessExpression))
+			{
+				return false;
+			}
+
+			if (!node.IsMemberAccessExpressionName())
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		protected override bool CanAddImportForNamespace(Diagnostic diagnostic, ref SyntaxNode node)
+		{
+			return false;
+		}
+
+		protected override bool CanAddImportForQuery(Diagnostic diagnostic, ref SyntaxNode node)
+		{
+			if (diagnostic.Id != CS1935)
+			{
+				return false;
+			}
+
+			return node.AncestorsAndSelf().Any(n => n is QueryExpressionSyntax && !(n.Parent is QueryContinuationSyntax));
+		}
+
+		protected override bool CanAddImportForType(Diagnostic diagnostic, ref SyntaxNode node)
+		{
+			switch (diagnostic.Id)
+			{
+			case CS0103:
+			case CS0246:
+			case CS0305:
+			case CS0308:
+			case CS0122:
+			case CS0307:
+			case CS0616:
+			case CS1003:
+			case CS1580:
+			case CS1581:
+				break;
+
+			case CS1002:
+				//// only lookup errors inside ParenthesizedLambdaExpression e.g., () => { ... }
+				if (node.Ancestors().OfType<ParenthesizedLambdaExpressionSyntax>().Any())
+				{
+					if (node is SimpleNameSyntax)
+					{
+						break;
+					}
+					else if (node is BlockSyntax || node is MemberAccessExpressionSyntax || node is BinaryExpressionSyntax)
+					{
+						var last = node.DescendantNodes().OfType<SimpleNameSyntax>().LastOrDefault();
+						if (!TryFindStandaloneType(ref node))
+						{
+							node = node.DescendantNodes().OfType<SimpleNameSyntax>().FirstOrDefault();
+						}
+						else
+						{
+							node = last;
+						}
+					}
+				}
+				else
+				{
+					return false;
+				}
+
+				break;
+
+			case CS1574:
+			case CS1584:
+				var cref = node as QualifiedCrefSyntax;
+				if (cref != null)
+				{
+					node = cref.Container;
+				}
+
+				break;
+
+			default:
+				return false;
+			}
+
+			return TryFindStandaloneType(ref node);
+		}
+
+		private static bool TryFindStandaloneType(ref SyntaxNode node)
+		{
+			var qn = node as QualifiedNameSyntax;
+			if (qn != null)
+			{
+				node = GetLeftMostSimpleName(qn);
+			}
+
+			var simpleName = node as SimpleNameSyntax;
+			return simpleName.LooksLikeStandaloneTypeName();
+		}
+
+		private static SimpleNameSyntax GetLeftMostSimpleName(QualifiedNameSyntax qn)
+		{
+			while (qn != null)
+			{
+				var left = qn.Left;
+				var simpleName = left as SimpleNameSyntax;
+				if (simpleName != null)
+				{
+					return simpleName;
+				}
+
+				qn = left as QualifiedNameSyntax;
+			}
+
+			return null;
+		}
+
+		protected override ISet<INamespaceSymbol> GetNamespacesInScope(
+			SemanticModel semanticModel,
+			SyntaxNode node,
+			CancellationToken cancellationToken)
+		{
+			return semanticModel.GetUsingNamespacesInScope(node);
+		}
+
+		protected override ITypeSymbol GetQueryClauseInfo(
+			SemanticModel semanticModel,
+			SyntaxNode node,
+			CancellationToken cancellationToken)
+		{
+			var query = node.AncestorsAndSelf().OfType<QueryExpressionSyntax>().First();
+
+			if (InfoBoundSuccessfully(semanticModel.GetQueryClauseInfo(query.FromClause, cancellationToken)))
+			{
+				return null;
+			}
+
+			foreach (var clause in query.Body.Clauses)
+			{
+				if (InfoBoundSuccessfully(semanticModel.GetQueryClauseInfo(clause, cancellationToken)))
+				{
+					return null;
+				}
+			}
+
+			if (InfoBoundSuccessfully(semanticModel.GetSymbolInfo(query.Body.SelectOrGroup, cancellationToken)))
+			{
+				return null;
+			}
+
+			var fromClause = query.FromClause;
+			return semanticModel.GetTypeInfo(fromClause.Expression, cancellationToken).Type;
+		}
+
+		private bool InfoBoundSuccessfully(SymbolInfo symbolInfo)
+		{
+			return InfoBoundSuccessfully(symbolInfo.Symbol);
+		}
+
+		private bool InfoBoundSuccessfully(QueryClauseInfo semanticInfo)
+		{
+			return InfoBoundSuccessfully(semanticInfo.OperationInfo);
+		}
+
+		private static bool InfoBoundSuccessfully(ISymbol operation)
+		{
+			operation = operation.GetOriginalUnreducedDefinition();
+			return operation != null;
+		}
+
+		protected override string GetDescription(INamespaceOrTypeSymbol namespaceSymbol, SemanticModel semanticModel, SyntaxNode contextNode)
+		{
+			var root = GetCompilationUnitSyntaxNode(contextNode);
+
+			// No localization necessary
+			string externAliasString;
+			if (TryGetExternAliasString(namespaceSymbol, semanticModel, root, out externAliasString))
+			{
+				return string.Format ("extern alias {0};", externAliasString);
+			}
+
+			string namespaceString;
+			if (TryGetNamespaceString(namespaceSymbol, root, false, null, out namespaceString))
+			{
+				return string.Format ("using {0};", namespaceString);
+			}
+
+			// If we get here then neither a namespace or a an extern alias can be added.
+			// There is no valid string to show to the user and there is 
+			// likely a bug in that we should know about.
+			throw new InvalidOperationException ();
+		}
+
+		protected override async Task<Document> AddImportAsync(
+			SyntaxNode contextNode,
+			INamespaceOrTypeSymbol namespaceSymbol,
+			Document document,
+			bool placeSystemNamespaceFirst,
+			CancellationToken cancellationToken)
+		{
+			var root = GetCompilationUnitSyntaxNode(contextNode, cancellationToken);
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var simpleUsingDirective = GetUsingDirective(root, namespaceSymbol, semanticModel, fullyQualify: false);
+			var externAliasUsingDirective = GetExternAliasUsingDirective(root, namespaceSymbol, semanticModel);
+			if (externAliasUsingDirective != null)
+			{
+				root = root.AddExterns(
+					externAliasUsingDirective
+					.WithAdditionalAnnotations(Formatter.Annotation));
+			}
+
+			if (simpleUsingDirective != null)
+			{
+				// Because of the way usings can be nested inside of namespace declarations,
+				// we need to check if the usings must be fully qualified so as not to be
+				// ambiguous with the containing namespace. 
+				if (UsingsAreContainedInNamespace(contextNode))
+				{
+					// When we add usings we try and place them, as best we can, where the user
+					// wants them according to their settings.  This means we can't just add the fully-
+					// qualified usings and expect the simplifier to take care of it, the usings have to be
+					// simplified before we attempt to add them to the document.
+					// You might be tempted to think that we could call 
+					//   AddUsings -> Simplifier -> SortUsings
+					// But this will clobber the users using settings without asking.  Instead we create a new
+					// Document and check if our using can be simplified.  Worst case we need to back out the 
+					// fully qualified change and reapply with the simple name.
+					var fullyQualifiedUsingDirective = GetUsingDirective(root, namespaceSymbol, semanticModel, fullyQualify: true);
+					SyntaxNode newRoot = root.AddUsingDirective(
+						fullyQualifiedUsingDirective, contextNode, placeSystemNamespaceFirst,
+						Formatter.Annotation);
+					var newDocument = document.WithSyntaxRoot(newRoot);
+					var newSemanticModel = await newDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+					newRoot = await newDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+					var newUsing = newRoot
+						.DescendantNodes().OfType<UsingDirectiveSyntax>().Where(uds => uds.IsEquivalentTo(fullyQualifiedUsingDirective, topLevel: true)).Single();
+					var speculationAnalyzer = new SpeculationAnalyzer(newUsing.Name, simpleUsingDirective.Name, newSemanticModel, cancellationToken);
+					if (speculationAnalyzer.ReplacementChangesSemantics())
+					{
+						// Not fully qualifying the using causes to refer to a different namespace so we need to keep it as is.
+						return newDocument;
+					}
+					else
+					{
+						// It does not matter if it is fully qualified or simple so lets return the simple name.
+						return document.WithSyntaxRoot(root.AddUsingDirective(
+							simpleUsingDirective, contextNode, placeSystemNamespaceFirst,
+							Formatter.Annotation));
+					}
+				}
+				else
+				{
+					// simple form
+					return document.WithSyntaxRoot(root.AddUsingDirective(
+						simpleUsingDirective, contextNode, placeSystemNamespaceFirst,
+						Formatter.Annotation));
+				}
+			}
+
+			return document.WithSyntaxRoot(root);
+		}
+
+		private static ExternAliasDirectiveSyntax GetExternAliasUsingDirective(CompilationUnitSyntax root, INamespaceOrTypeSymbol namespaceSymbol, SemanticModel semanticModel)
+		{
+			string externAliasString;
+			if (TryGetExternAliasString(namespaceSymbol, semanticModel, root, out externAliasString))
+			{
+				return SyntaxFactory.ExternAliasDirective(SyntaxFactory.Identifier(externAliasString));
+			}
+
+			return null;
+		}
+
+		private UsingDirectiveSyntax GetUsingDirective(CompilationUnitSyntax root, INamespaceOrTypeSymbol namespaceSymbol, SemanticModel semanticModel, bool fullyQualify)
+		{
+			string namespaceString;
+			string externAliasString;
+			TryGetExternAliasString(namespaceSymbol, semanticModel, root, out externAliasString);
+			if (externAliasString != null)
+			{
+				if (TryGetNamespaceString(namespaceSymbol, root, false, externAliasString, out namespaceString))
+				{
+					return SyntaxFactory.UsingDirective(SyntaxFactory.ParseName(namespaceString));
+				}
+
+				return null;
+			}
+
+			if (TryGetNamespaceString(namespaceSymbol, root, fullyQualify, null, out namespaceString))
+			{
+				return SyntaxFactory.UsingDirective(SyntaxFactory.ParseName(namespaceString));
+			}
+
+			return null;
+		}
+
+		private bool UsingsAreContainedInNamespace(SyntaxNode contextNode)
+		{
+			return contextNode.GetAncestor<NamespaceDeclarationSyntax>()?.DescendantNodes().OfType<UsingDirectiveSyntax>().FirstOrDefault() != null;
+		}
+
+		private static bool TryGetExternAliasString(INamespaceOrTypeSymbol namespaceSymbol, SemanticModel semanticModel, CompilationUnitSyntax root, out string externAliasString)
+		{
+			externAliasString = null;
+			var metadataReference = semanticModel.Compilation.GetMetadataReference(namespaceSymbol.ContainingAssembly);
+			if (metadataReference == null)
+			{
+				return false;
+			}
+
+			var properties = metadataReference.Properties;
+			var aliases = properties.Aliases;
+			if (aliases.IsDefaultOrEmpty)
+			{
+				return false;
+			}
+
+			aliases = properties.Aliases.Where(a => a != MetadataReferenceProperties.GlobalAlias).ToImmutableArray();
+			if (!aliases.Any())
+			{
+				return false;
+			}
+
+			externAliasString = aliases.First();
+			return ShouldAddExternAlias(aliases, root);
+		}
+
+		private static bool TryGetNamespaceString(INamespaceOrTypeSymbol namespaceSymbol, CompilationUnitSyntax root, bool fullyQualify, string alias, out string namespaceString)
+		{
+			namespaceString = fullyQualify
+				? namespaceSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)
+				: namespaceSymbol.ToDisplayString();
+
+			if (alias != null)
+			{
+				namespaceString = alias + "::" + namespaceString;
+			}
+
+			return ShouldAddUsing(namespaceString, root);
+		}
+
+		private static bool ShouldAddExternAlias(ImmutableArray<string> aliases, CompilationUnitSyntax root)
+		{
+			var identifiers = root.DescendantNodes().OfType<ExternAliasDirectiveSyntax>().Select(e => e.Identifier.ToString());
+			var externAliases = aliases.Where(a => identifiers.Contains(a));
+			return !externAliases.Any();
+		}
+
+		private static bool ShouldAddUsing(string usingDirective, CompilationUnitSyntax root)
+		{
+			return !root.Usings.Select(u => u.Name.ToString()).Contains(usingDirective);
+		}
+
+		private static CompilationUnitSyntax GetCompilationUnitSyntaxNode(SyntaxNode contextNode, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return (CompilationUnitSyntax)contextNode.SyntaxTree.GetRoot(cancellationToken);
+		}
+
+		protected override bool IsViableExtensionMethod(IMethodSymbol method, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			var leftExpression = expression.GetExpressionOfMemberAccessExpression() ?? expression.GetExpressionOfConditionalMemberAccessExpression();
+			if (leftExpression == null)
+			{
+				if (expression.IsKind(SyntaxKind.CollectionInitializerExpression))
+				{
+					leftExpression = expression.GetAncestor<ObjectCreationExpressionSyntax>();
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			var semanticInfo = semanticModel.GetTypeInfo(leftExpression, cancellationToken);
+			var leftExpressionType = semanticInfo.Type;
+
+			return leftExpressionType != null && method.ReduceExtensionMethod(leftExpressionType) != null;
+		}
+
+		protected override IEnumerable<ITypeSymbol> GetProposedTypes(string name, List<ITypeSymbol> accessibleTypeSymbols, SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope)
+		{
+			if (accessibleTypeSymbols == null)
+			{
+				yield break;
+			}
+
+			foreach (var typeSymbol in accessibleTypeSymbols)
+			{
+				if ((typeSymbol != null) && (typeSymbol.ContainingType != null) && typeSymbol.ContainingType.IsStatic)
+				{
+					yield return typeSymbol.ContainingType;
+				}
+			}
+		}
+
+		internal override bool IsViableField(IFieldSymbol field, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			return IsViablePropertyOrField(field, expression, semanticModel, cancellationToken);
+		}
+
+		internal override bool IsViableProperty(IPropertySymbol property, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			return IsViablePropertyOrField(property, expression, semanticModel, cancellationToken);
+		}
+
+		private bool IsViablePropertyOrField(ISymbol propertyOrField, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			if (!propertyOrField.IsStatic)
+			{
+				return false;
+			}
+
+			var leftName = (expression as MemberAccessExpressionSyntax)?.Expression as SimpleNameSyntax;
+			if (leftName == null)
+			{
+				return false;
+			}
+
+			return string.Compare(propertyOrField.ContainingType.Name, leftName.Identifier.Text, this.IgnoreCase) == 0;
+		}
+
+		internal override bool IsAddMethodContext(SyntaxNode node, SemanticModel semanticModel)
+		{
+			if (node.Parent.IsKind(SyntaxKind.CollectionInitializerExpression))
+			{
+				var objectCreationExpressionSyntax = node.GetAncestor<ObjectCreationExpressionSyntax>();
+				if (objectCreationExpressionSyntax == null)
+				{
+					return false;
+				}
+
+				return true;
+			}
+
+			return false;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/AbstractAsyncCodeFix.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/AbstractAsyncCodeFix.cs
new file mode 100644
index 0000000000..2c62341b62
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/AbstractAsyncCodeFix.cs
@@ -0,0 +1,87 @@
+//
+// AbstractAsyncCodeFix.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Immutable;
+using System.Linq;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.CodeActions;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharp.CodeFixes;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+
+	internal abstract partial class AbstractAsyncCodeFix : CodeFixProvider
+	{
+		protected abstract Task<CodeAction> GetCodeFix(SyntaxNode root, SyntaxNode node, Document document, Diagnostic diagnostic, CancellationToken cancellationToken);
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var model = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+			var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
+
+			SyntaxNode node;
+			if (!TryGetNode(root, context.Span, out node))
+			{
+				return;
+			}
+
+			var diagnostic = context.Diagnostics.FirstOrDefault();
+
+			var codeAction = await GetCodeFix(root, node, context.Document, diagnostic, context.CancellationToken).ConfigureAwait(false);
+
+			if (codeAction != null)
+			{
+				context.RegisterCodeFix(codeAction, diagnostic);
+			}
+		}
+
+		private bool TryGetNode(SyntaxNode root, Microsoft.CodeAnalysis.Text.TextSpan span, out SyntaxNode node)
+		{
+			node = null;
+			var ancestors = root.FindToken(span.Start).GetAncestors<SyntaxNode>();
+			if (!ancestors.Any())
+			{
+				return false;
+			}
+
+			node = ancestors.FirstOrDefault(n => n.Span.Contains(span) && n != root);
+			return node != null;
+		}
+	}
+	
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAsyncCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAsyncCodeFixProvider.cs
new file mode 100644
index 0000000000..11e5cf2d72
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAsyncCodeFixProvider.cs
@@ -0,0 +1,229 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.CodeActions;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using MonoDevelop.CSharp.CodeFixes;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	internal abstract partial class AbstractAddAsyncAwaitCodeFixProvider : AbstractAsyncCodeFix
+	{
+		protected abstract string GetDescription(Diagnostic diagnostic, SyntaxNode node, SemanticModel semanticModel, CancellationToken cancellationToken);
+		protected abstract Task<SyntaxNode> GetNewRoot(SyntaxNode root, SyntaxNode oldNode, SemanticModel semanticModel, Diagnostic diagnostic, Document document, CancellationToken cancellationToken);
+
+		protected override async Task<CodeAction> GetCodeFix(SyntaxNode root, SyntaxNode node, Document document, Diagnostic diagnostic, CancellationToken cancellationToken)
+		{
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+			var newRoot = await this.GetNewRoot(root, node, semanticModel, diagnostic, document, cancellationToken).ConfigureAwait(false);
+			if (newRoot != null)
+			{
+				return new DocumentChangeAction(node.Span, DiagnosticSeverity.Error,
+					this.GetDescription(diagnostic, node, semanticModel, cancellationToken),
+					token => Task.FromResult(document.WithSyntaxRoot(newRoot)));
+			}
+
+			return null;
+		}
+
+		protected bool TryGetTypes(
+			SyntaxNode expression,
+			SemanticModel semanticModel,
+			out INamedTypeSymbol source,
+			out INamedTypeSymbol destination)
+		{
+			source = null;
+			destination = null;
+
+			var info = semanticModel.GetSymbolInfo(expression);
+			var methodSymbol = info.Symbol as IMethodSymbol;
+			if (methodSymbol == null)
+			{
+				return false;
+			}
+
+			var compilation = semanticModel.Compilation;
+			var taskType = compilation.GetTypeByMetadataName("System.Threading.Tasks.Task");
+			if (taskType == null)
+			{
+				return false;
+			}
+
+			var returnType = methodSymbol.ReturnType as INamedTypeSymbol;
+			if (returnType == null)
+			{
+				return false;
+			}
+
+			source = taskType;
+			destination = returnType;
+			return true;
+		}
+
+	}
+
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.AddAsync), Shared]
+	internal class CSharpAddAsyncCodeFixProvider : AbstractAddAsyncCodeFixProvider
+	{
+		/// <summary>
+		/// The 'await' operator can only be used within an async method. Consider marking this method with the 'async' modifier and changing its return type to 'Task'.
+		/// </summary>
+		private const string CS4032 = "CS4032";
+
+		/// <summary>
+		/// The 'await' operator can only be used within an async method. Consider marking this method with the 'async' modifier and changing its return type to 'Task'.
+		/// </summary>
+		private const string CS4033 = "CS4033";
+
+		/// <summary>
+		/// The 'await' operator can only be used within an async lambda expression. Consider marking this method with the 'async' modifier.
+		/// </summary>
+		private const string CS4034 = "CS4034";
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS4032, CS4033, CS4034); }
+		}
+
+		protected override string GetDescription(Diagnostic diagnostic, SyntaxNode node, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			return GettextCatalog.GetString ("Make async");
+		}
+
+		protected override async Task<SyntaxNode> GetNewRoot(SyntaxNode root, SyntaxNode oldNode, SemanticModel semanticModel, Diagnostic diagnostic, Document document, CancellationToken cancellationToken)
+		{
+			var methodNode = GetContainingMember(oldNode);
+			if (methodNode == null)
+			{
+				return null;
+			}
+
+			var newMethodNode = await ConvertToAsync(methodNode, semanticModel, document, cancellationToken).ConfigureAwait(false);
+			if (newMethodNode != null)
+			{
+				return root.ReplaceNode(methodNode, newMethodNode);
+			}
+
+			return null;
+		}
+
+		private static SyntaxNode GetContainingMember(SyntaxNode oldNode)
+		{
+			var parenthesizedLambda = oldNode
+				.Ancestors()
+				.FirstOrDefault(n =>
+				                n.IsKind(SyntaxKind.ParenthesizedLambdaExpression));
+
+			if (parenthesizedLambda != null)
+			{
+				return parenthesizedLambda;
+			}
+
+			var simpleLambda = oldNode
+				.Ancestors()
+				.FirstOrDefault(n =>
+				                n.IsKind(SyntaxKind.SimpleLambdaExpression));
+
+			if (simpleLambda != null)
+			{
+				return simpleLambda;
+			}
+
+			return oldNode
+				.Ancestors()
+				.FirstOrDefault(n =>
+				                n.IsKind(SyntaxKind.MethodDeclaration));
+		}
+
+		private async Task<SyntaxNode> ConvertToAsync(SyntaxNode node, SemanticModel semanticModel, Document document, CancellationToken cancellationToken)
+		{
+			var methodNode = node as MethodDeclarationSyntax;
+			if (methodNode != null)
+			{
+				return await ConvertMethodToAsync(document, semanticModel, methodNode, cancellationToken).ConfigureAwait(false);
+			}
+
+			var parenthesizedLambda = node as ParenthesizedLambdaExpressionSyntax;
+			if (parenthesizedLambda != null)
+			{
+				return ConvertParenthesizedLambdaToAsync(parenthesizedLambda);
+			}
+
+			var simpleLambda = node as SimpleLambdaExpressionSyntax;
+			if (simpleLambda != null)
+			{
+				return ConvertSimpleLambdaToAsync(simpleLambda);
+			}
+
+			return null;
+		}
+
+		private static SyntaxNode ConvertParenthesizedLambdaToAsync(ParenthesizedLambdaExpressionSyntax parenthesizedLambda)
+		{
+			return SyntaxFactory.ParenthesizedLambdaExpression(
+				SyntaxFactory.Token(SyntaxKind.AsyncKeyword),
+				parenthesizedLambda.ParameterList,
+				parenthesizedLambda.ArrowToken,
+				parenthesizedLambda.Body)
+				                .WithAdditionalAnnotations(Formatter.Annotation);
+		}
+
+		private static SyntaxNode ConvertSimpleLambdaToAsync(SimpleLambdaExpressionSyntax simpleLambda)
+		{
+			return SyntaxFactory.SimpleLambdaExpression(
+				SyntaxFactory.Token(SyntaxKind.AsyncKeyword),
+				simpleLambda.Parameter,
+				simpleLambda.ArrowToken,
+				simpleLambda.Body)
+				                .WithAdditionalAnnotations(Formatter.Annotation);
+		}
+
+		protected override SyntaxNode AddAsyncKeyword(SyntaxNode node)
+		{
+			var methodNode = node as MethodDeclarationSyntax;
+			if (methodNode == null)
+			{
+				return null;
+			}
+
+			return methodNode
+				.AddModifiers(SyntaxFactory.Token(SyntaxKind.AsyncKeyword))
+				.WithAdditionalAnnotations(Formatter.Annotation);
+		}
+
+		protected override SyntaxNode AddAsyncKeywordAndTaskReturnType(SyntaxNode node, ITypeSymbol existingReturnType, INamedTypeSymbol taskTypeSymbol)
+		{
+			var methodNode = node as MethodDeclarationSyntax;
+			if (methodNode == null)
+			{
+				return null;
+			}
+
+			if (taskTypeSymbol == null)
+			{
+				return null;
+			}
+
+			var returnType = taskTypeSymbol.Construct(existingReturnType).GenerateTypeSyntax();
+			return AddAsyncKeyword(methodNode.WithReturnType(returnType));
+		}
+
+		protected override bool DoesConversionExist(Compilation compilation, ITypeSymbol source, ITypeSymbol destination)
+		{
+			return compilation.ClassifyConversion(source, destination).Exists;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAwaitCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAwaitCodeFixProvider.cs
new file mode 100644
index 0000000000..9bcb3033d1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAwaitCodeFixProvider.cs
@@ -0,0 +1,147 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Immutable;
+using System.Linq;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.CodeActions;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharp.CodeFixes;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	internal abstract partial class AbstractAddAsyncCodeFixProvider : AbstractAddAsyncAwaitCodeFixProvider
+	{
+		protected const string SystemThreadingTasksTask = "System.Threading.Tasks.Task";
+		protected const string SystemThreadingTasksTaskT = "System.Threading.Tasks.Task`1";
+		protected abstract SyntaxNode AddAsyncKeyword(SyntaxNode methodNode);
+		protected abstract SyntaxNode AddAsyncKeywordAndTaskReturnType(SyntaxNode methodNode, ITypeSymbol existingReturnType, INamedTypeSymbol taskTypeSymbol);
+		protected abstract bool DoesConversionExist(Compilation compilation, ITypeSymbol source, ITypeSymbol destination);
+
+		protected async Task<SyntaxNode> ConvertMethodToAsync(Document document, SemanticModel semanticModel, SyntaxNode methodNode, CancellationToken cancellationToken)
+		{
+			var methodSymbol = semanticModel.GetDeclaredSymbol(methodNode, cancellationToken) as IMethodSymbol;
+
+			if (methodSymbol.ReturnsVoid)
+			{
+				return AddAsyncKeyword(methodNode);
+			}
+
+			var returnType = methodSymbol.ReturnType;
+			var compilation = semanticModel.Compilation;
+
+			var taskSymbol = compilation.GetTypeByMetadataName(SystemThreadingTasksTask);
+			var genericTaskSymbol = compilation.GetTypeByMetadataName(SystemThreadingTasksTaskT);
+			if (taskSymbol == null)
+			{
+				return null;
+			}
+
+			if (returnType is IErrorTypeSymbol)
+			{
+				// The return type of the method will not bind.  This could happen for a lot of reasons.
+				// The type may not actually exist or the user could just be missing a using/import statement.
+				// We're going to try and see if there are any known types that have the same name as 
+				// our return type, and then check if those are convertible to Task.  If they are then
+				// we assume the user just has a missing using.  If they are not, we wrap the return
+				// type in a generic Task.
+				var typeName = returnType.Name;
+
+				var results = await SymbolFinder.FindDeclarationsAsync(
+					document.Project, typeName, ignoreCase: false, filter: SymbolFilter.Type, cancellationToken: cancellationToken).ConfigureAwait(false);
+
+				if (results.OfType<ITypeSymbol>().Any(s => DoesConversionExist(compilation, s, taskSymbol)))
+				{
+					return AddAsyncKeyword(methodNode);
+				}
+
+				return AddAsyncKeywordAndTaskReturnType(methodNode, returnType, genericTaskSymbol);
+			}
+
+			if (DoesConversionExist(compilation, returnType, taskSymbol))
+			{
+				return AddAsyncKeyword(methodNode);
+			}
+
+			return AddAsyncKeywordAndTaskReturnType(methodNode, returnType, genericTaskSymbol);
+		}
+	}
+
+
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.AddAwait), Shared]
+	internal class CSharpAddAwaitCodeFixProvider : AbstractAddAsyncAwaitCodeFixProvider
+	{
+		/// <summary>
+		/// Since this is an async method, the return expression must be of type 'blah' rather than 'baz'
+		/// </summary>
+		private const string CS4014 = "CS4014";
+
+		/// <summary>
+		/// Because this call is not awaited, execution of the current method continues before the call is completed.
+		/// </summary>
+		private const string CS4016 = "CS4016";
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS4014, CS4016); }
+		}
+
+		protected override string GetDescription(Diagnostic diagnostic, SyntaxNode node, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			return GettextCatalog.GetString ("Insert 'await'");
+		}
+
+		protected override Task<SyntaxNode> GetNewRoot(SyntaxNode root, SyntaxNode oldNode, SemanticModel semanticModel, Diagnostic diagnostic, Document document, CancellationToken cancellationToken)
+		{
+			var expression = oldNode as ExpressionSyntax;
+
+			switch (diagnostic.Id)
+			{
+				case CS4014:
+					if (expression == null)
+					{
+						return Task.FromResult<SyntaxNode>(null);
+					}
+
+				return Task.FromResult(root.ReplaceNode(oldNode, ConvertToAwaitExpression(expression)));
+				case CS4016:
+					if (expression == null)
+					{
+					return Task.FromResult (default (SyntaxNode));
+					}
+
+					if (!IsCorrectReturnType(expression, semanticModel))
+					{
+					return Task.FromResult (default (SyntaxNode));
+					}
+
+				return Task.FromResult(root.ReplaceNode(oldNode, ConvertToAwaitExpression(expression)));
+				default:
+				return Task.FromResult (default (SyntaxNode));
+			}
+		}
+
+		private bool IsCorrectReturnType(ExpressionSyntax expression, SemanticModel semanticModel)
+		{
+			INamedTypeSymbol taskType = null;
+			INamedTypeSymbol returnType = null;
+			return TryGetTypes(expression, semanticModel, out taskType, out returnType) &&
+				semanticModel.Compilation.ClassifyConversion(taskType, returnType).Exists;
+		}
+
+		private static ExpressionSyntax ConvertToAwaitExpression(ExpressionSyntax expression)
+		{
+			return SyntaxFactory.AwaitExpression(expression)
+				                .WithAdditionalAnnotations(Formatter.Annotation);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpConvertToAsyncMethodCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpConvertToAsyncMethodCodeFixProvider.cs
new file mode 100644
index 0000000000..5bd232f594
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpConvertToAsyncMethodCodeFixProvider.cs
@@ -0,0 +1,124 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CodeActions;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using MonoDevelop.CSharp.CodeFixes;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	internal abstract partial class AbstractChangeToAsyncCodeFixProvider : AbstractAsyncCodeFix
+	{
+		protected abstract Task<string> GetDescription(Diagnostic diagnostic, SyntaxNode node, SemanticModel semanticModel, CancellationToken cancellationToken);
+		protected abstract Task<Tuple<SyntaxTree, SyntaxNode>> GetRootInOtherSyntaxTree(SyntaxNode node, SemanticModel semanticModel, Diagnostic diagnostic, CancellationToken cancellationToken);
+
+		protected override async Task<CodeAction> GetCodeFix(SyntaxNode root, SyntaxNode node, Document document, Diagnostic diagnostic, CancellationToken cancellationToken)
+		{
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+			var result = await GetRootInOtherSyntaxTree(node, semanticModel, diagnostic, cancellationToken).ConfigureAwait(false);
+			if (result != null)
+			{
+				var syntaxTree = result.Item1;
+				var newRoot = result.Item2;
+				var otherDocument = document.Project.Solution.GetDocument(syntaxTree);
+				return new DocumentChangeAction(node.Span, DiagnosticSeverity.Error,
+					await this.GetDescription(diagnostic, node, semanticModel, cancellationToken).ConfigureAwait(false),
+					token => Task.FromResult(otherDocument.WithSyntaxRoot(newRoot)));
+			}
+
+			return null;
+		}
+	}
+
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.ConvertToAsync), Shared]
+	internal class CSharpConvertToAsyncMethodCodeFixProvider : AbstractChangeToAsyncCodeFixProvider
+	{
+		/// <summary>
+		/// Cannot await void.
+		/// </summary>
+		private const string CS4008 = "CS4008";
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS4008); }
+		}
+
+		protected override async Task<string> GetDescription(
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			var methodNode = await GetMethodDeclaration(node, semanticModel, cancellationToken).ConfigureAwait(false);
+			return string.Format(GettextCatalog.GetString ("Make {0} return Task instead of void"), methodNode.WithBody(null));
+		}
+
+		protected override async Task<Tuple<SyntaxTree, SyntaxNode>> GetRootInOtherSyntaxTree(
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			Diagnostic diagnostic,
+			CancellationToken cancellationToken)
+		{
+			var methodDeclaration = await GetMethodDeclaration(node, semanticModel, cancellationToken).ConfigureAwait(false);
+			if (methodDeclaration == null)
+			{
+				return null;
+			}
+
+			var oldRoot = await methodDeclaration.SyntaxTree.GetRootAsync(cancellationToken).ConfigureAwait(false);
+			var newRoot = oldRoot.ReplaceNode(methodDeclaration, ConvertToAsyncFunction(methodDeclaration));
+			return Tuple.Create(oldRoot.SyntaxTree, newRoot);
+		}
+
+		private async Task<MethodDeclarationSyntax> GetMethodDeclaration(
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			var invocationExpression = node.ChildNodes().FirstOrDefault(n => n.IsKind(SyntaxKind.InvocationExpression));
+			var methodSymbol = semanticModel.GetSymbolInfo(invocationExpression, cancellationToken).Symbol as IMethodSymbol;
+			if (methodSymbol == null)
+			{
+				return null;
+			}
+
+			var methodReference = methodSymbol.DeclaringSyntaxReferences.FirstOrDefault();
+			if (methodReference == null)
+			{
+				return null;
+			}
+
+			var methodDeclaration = (await methodReference.GetSyntaxAsync(cancellationToken).ConfigureAwait(false)) as MethodDeclarationSyntax;
+			if (methodDeclaration == null)
+			{
+				return null;
+			}
+
+			if (!methodDeclaration.Modifiers.Any(m => m.IsKind(SyntaxKind.AsyncKeyword)))
+			{
+				return null;
+			}
+
+			return methodDeclaration;
+		}
+
+		private MethodDeclarationSyntax ConvertToAsyncFunction(MethodDeclarationSyntax methodDeclaration)
+		{
+			return methodDeclaration.WithReturnType(
+				SyntaxFactory.ParseTypeName("Task")
+				.WithLeadingTrivia(methodDeclaration.ReturnType.GetLeadingTrivia())
+				.WithTrailingTrivia(methodDeclaration.ReturnType.GetTrailingTrivia()));
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/FullyQualify/CSharpFullyQualifyCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/FullyQualify/CSharpFullyQualifyCodeFixProvider.cs
new file mode 100644
index 0000000000..01fb9b6052
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/FullyQualify/CSharpFullyQualifyCodeFixProvider.cs
@@ -0,0 +1,331 @@
+//
+// CSharpFullyQualifyCodeFixProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Immutable;
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeFixes;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using System.Threading.Tasks;
+using System.Linq;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.FindSymbols;
+using System.Runtime.CompilerServices;
+using Microsoft.CodeAnalysis.CodeActions;
+using System;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.CodeFixes.FullyQualify
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = "Fully Qualify")]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.AddUsingOrImport)]
+	class CSharpFullyQualifyCodeFixProvider : CodeFixProvider
+	{
+		/// <summary>
+		/// name does not exist in context
+		/// </summary>
+		private const string CS0103 = "CS0103";
+
+		/// <summary>
+		/// 'reference' is an ambiguous reference between 'identifier' and 'identifier'
+		/// </summary>
+		private const string CS0104 = "CS0104";
+
+		/// <summary>
+		/// type or namespace could not be found
+		/// </summary>
+		private const string CS0246 = "CS0246";
+
+		/// <summary>
+		/// wrong number of type args
+		/// </summary>
+		private const string CS0305 = "CS0305";
+
+		/// <summary>
+		/// The non-generic type 'A' cannot be used with type arguments
+		/// </summary>
+		private const string CS0308 = "CS0308";
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0103, CS0104, CS0246, CS0305, CS0308); }
+		}
+
+		protected bool IgnoreCase
+		{
+			get { return false; }
+		}
+
+		protected bool CanFullyQualify(Diagnostic diagnostic, ref SyntaxNode node)
+		{
+			var simpleName = node as SimpleNameSyntax;
+			if (simpleName == null)
+			{
+				return false;
+			}
+
+			if (!simpleName.LooksLikeStandaloneTypeName())
+			{
+				return false;
+			}
+
+			if (!simpleName.CanBeReplacedWithAnyName())
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		protected SyntaxNode ReplaceNode(SyntaxNode node, string containerName, CancellationToken cancellationToken)
+		{
+			var simpleName = (SimpleNameSyntax)node;
+
+			var leadingTrivia = simpleName.GetLeadingTrivia();
+			var newName = simpleName.WithLeadingTrivia(SyntaxTriviaList.Empty);
+
+			var qualifiedName = SyntaxFactory.QualifiedName(
+				SyntaxFactory.ParseName(containerName), newName);
+
+			qualifiedName = qualifiedName.WithLeadingTrivia(leadingTrivia);
+			qualifiedName = qualifiedName.WithAdditionalAnnotations(Formatter.Annotation);
+
+			var syntaxTree = simpleName.SyntaxTree;
+			return syntaxTree.GetRoot(cancellationToken).ReplaceNode((NameSyntax)simpleName, qualifiedName);
+		}
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var diagnostics = context.Diagnostics;
+			var cancellationToken = context.CancellationToken;
+
+			var project = document.Project;
+			var diagnostic = diagnostics.First();
+			var model = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+			
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var node = root.FindToken(span.Start).GetAncestors<SyntaxNode>().First(n => n.Span.Contains(span));
+
+			// Has to be a simple identifier or generic name.
+			if (node != null && CanFullyQualify(diagnostic, ref node))
+			{
+				var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+				var matchingTypes = await this.GetMatchingTypesAsync(project, semanticModel, node, cancellationToken).ConfigureAwait(false);
+				var matchingNamespaces = await this.GetMatchingNamespacesAsync(project, semanticModel, node, cancellationToken).ConfigureAwait(false);
+
+				if (matchingTypes != null || matchingNamespaces != null)
+				{
+					matchingTypes = matchingTypes ?? SpecializedCollections.EmptyEnumerable<ISymbol>();
+					matchingNamespaces = matchingNamespaces ?? SpecializedCollections.EmptyEnumerable<ISymbol>();
+
+					var matchingTypeContainers = FilterAndSort(GetContainers(matchingTypes, semanticModel.Compilation));
+					var matchingNamespaceContainers = FilterAndSort(GetContainers(matchingNamespaces, semanticModel.Compilation));
+
+					var proposedContainers =
+						matchingTypeContainers.Concat(matchingNamespaceContainers)
+							.Distinct()
+							.Take(8);
+
+					foreach (var container in proposedContainers)
+					{
+						var containerName = container.ToMinimalDisplayString(semanticModel, node.SpanStart);
+
+						string name;
+						int arity;
+						node.GetNameAndArityOfSimpleName(out name, out arity);
+
+						// Actual member name might differ by case.
+						string memberName;
+						if (this.IgnoreCase)
+						{
+							var member = container.GetMembers(name).FirstOrDefault();
+							memberName = member != null ? member.Name : name;
+						}
+						else
+						{
+							memberName = name;
+						}
+
+						var codeAction = new DocumentChangeAction(
+							node.Span,
+							DiagnosticSeverity.Info,
+							string.Format(GettextCatalog.GetString ("Change '{0}' to '{1}.{2}'"), name, containerName, memberName),
+							(c) =>
+							{
+								var newRoot = this.ReplaceNode(node, containerName, c);
+								return Task.FromResult(document.WithSyntaxRoot(newRoot));
+							});
+
+						context.RegisterCodeFix(codeAction, diagnostic);
+					}
+				}
+			}
+		}
+
+		internal async Task<IEnumerable<ISymbol>> GetMatchingTypesAsync(
+			Microsoft.CodeAnalysis.Project project, SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			// Can't be on the right hand side of binary expression (like 'dot').
+			cancellationToken.ThrowIfCancellationRequested();
+			string name;
+			int arity;
+			node.GetNameAndArityOfSimpleName(out name, out arity);
+
+			var symbols = await SymbolFinder.FindDeclarationsAsync(project, name, this.IgnoreCase, SymbolFilter.Type, cancellationToken).ConfigureAwait(false);
+
+			// also lookup type symbols with the "Attribute" suffix.
+			var inAttributeContext = node.IsAttributeName();
+			if (inAttributeContext)
+			{
+				symbols = symbols.Concat(
+					await SymbolFinder.FindDeclarationsAsync(project, name + "Attribute", this.IgnoreCase, SymbolFilter.Type, cancellationToken).ConfigureAwait(false));
+			}
+
+			var accessibleTypeSymbols = symbols
+				.OfType<INamedTypeSymbol>()
+				.Where(s => (arity == 0 || s.GetArity() == arity)
+					&& s.IsAccessibleWithin(semanticModel.Compilation.Assembly)
+					&& (!inAttributeContext || s.IsAttribute())
+					&& HasValidContainer(s))
+				.ToList();
+
+			return accessibleTypeSymbols;
+		}
+
+		private static bool HasValidContainer(ISymbol symbol)
+		{
+			var container = symbol.ContainingSymbol;
+			return container is INamespaceSymbol ||
+				(container is INamedTypeSymbol && !((INamedTypeSymbol)container).IsGenericType);
+		}
+
+		internal async Task<IEnumerable<ISymbol>> GetMatchingNamespacesAsync(
+			Microsoft.CodeAnalysis.Project project,
+			SemanticModel semanticModel,
+			SyntaxNode simpleName,
+			CancellationToken cancellationToken)
+		{
+			if (simpleName.IsAttributeName())
+			{
+				return null;
+			}
+
+			string name;
+			int arity;
+			simpleName.GetNameAndArityOfSimpleName(out name, out arity);
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return null;
+			}
+
+			var symbols = await SymbolFinder.FindDeclarationsAsync(project, name, this.IgnoreCase, SymbolFilter.Namespace, cancellationToken).ConfigureAwait(false);
+
+			var namespaces = symbols
+				.OfType<INamespaceSymbol>()
+				.Where(n => !n.IsGlobalNamespace &&
+					HasAccessibleTypes(n, semanticModel, cancellationToken));
+
+			return namespaces;
+		}
+
+		private bool HasAccessibleTypes(INamespaceSymbol @namespace, SemanticModel model, CancellationToken cancellationToken)
+		{
+			return Enumerable.Any(@namespace.GetAllTypes(cancellationToken), t => t.IsAccessibleWithin(model.Compilation.Assembly));
+		}
+
+		private static IEnumerable<INamespaceOrTypeSymbol> GetContainers(IEnumerable<ISymbol> symbols, Compilation compilation)
+		{
+			foreach (var symbol in symbols)
+			{
+				var containingSymbol = symbol.ContainingSymbol as INamespaceOrTypeSymbol;
+				if (containingSymbol is INamespaceSymbol)
+				{
+					containingSymbol = compilation.GetCompilationNamespace((INamespaceSymbol)containingSymbol);
+				}
+
+				if (containingSymbol != null)
+				{
+					yield return containingSymbol;
+				}
+			}
+		}
+
+		private IEnumerable<INamespaceOrTypeSymbol> FilterAndSort(IEnumerable<INamespaceOrTypeSymbol> symbols)
+		{
+			symbols = symbols ?? SpecializedCollections.EmptyList<INamespaceOrTypeSymbol>();
+			var list = symbols.Distinct ().Where<INamespaceOrTypeSymbol> (n => n is INamedTypeSymbol || !((INamespaceSymbol)n).IsGlobalNamespace).ToList ();
+			list.Sort (this.Compare);
+			return list;
+		}
+
+		private static readonly ConditionalWeakTable<INamespaceOrTypeSymbol, IList<string>> s_symbolToNameMap =
+			new ConditionalWeakTable<INamespaceOrTypeSymbol, IList<string>>();
+		private static readonly ConditionalWeakTable<INamespaceOrTypeSymbol, IList<string>>.CreateValueCallback s_getNameParts = GetNameParts;
+
+		private static IList<string> GetNameParts(INamespaceOrTypeSymbol symbol)
+		{
+			return symbol.ToDisplayString(Ambience.NameFormat).Split('.');
+		}
+
+		private int Compare(INamespaceOrTypeSymbol n1, INamespaceOrTypeSymbol n2)
+		{
+			if (n1 is INamedTypeSymbol && n2 is INamespaceSymbol)
+			{
+				return -1;
+			}
+			else if (n1 is INamespaceSymbol && n2 is INamedTypeSymbol)
+			{
+				return 1;
+			}
+
+			var names1 = s_symbolToNameMap.GetValue(n1, GetNameParts);
+			var names2 = s_symbolToNameMap.GetValue(n2, GetNameParts);
+
+			for (var i = 0; i < Math.Min(names1.Count, names2.Count); i++)
+			{
+				var comp = names1[i].CompareTo(names2[i]);
+				if (comp != 0)
+				{
+					return comp;
+				}
+			}
+
+			return names1.Count - names2.Count;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/AbstractGenerateMemberCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/AbstractGenerateMemberCodeFixProvider.cs
new file mode 100644
index 0000000000..a6ced93451
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/AbstractGenerateMemberCodeFixProvider.cs
@@ -0,0 +1,105 @@
+//
+// AbstractGenerateMemberCodeFixProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateConstructor
+{
+	internal abstract class AbstractGenerateMemberCodeFixProvider : CodeFixProvider
+	{
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			// NOTE(DustinCa): Not supported in REPL for now.
+			if (context.Document.SourceCodeKind == SourceCodeKind.Interactive)
+			{
+				return;
+			}
+			var model = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+
+			var root = await model.SyntaxTree.GetRootAsync (context.CancellationToken).ConfigureAwait (false);
+			var names = GetTargetNodes(root, context.Span);
+			foreach (var name in names)
+			{
+				var codeActions = await GetCodeActionsAsync(context.Document, name, context.CancellationToken).ConfigureAwait(false);
+				if (codeActions == null)
+				{
+					continue;
+				}
+				foreach (var act in codeActions)
+					context.RegisterCodeFix (act, context.Diagnostics);
+				return;
+			}
+		}
+
+		protected abstract Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken);
+
+		protected virtual SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			return node;
+		}
+
+		protected virtual bool IsCandidate(SyntaxNode node)
+		{
+			return false;
+		}
+
+		protected virtual IEnumerable<SyntaxNode> GetTargetNodes(SyntaxNode root, TextSpan span)
+		{
+			var token = root.FindToken(span.Start);
+			if (!token.Span.IntersectsWith(span))
+			{
+				yield break;
+			}
+
+			var nodes = token.GetAncestors<SyntaxNode>().Where(IsCandidate);
+			foreach (var node in nodes)
+			{
+				var name = GetTargetNode(node);
+
+				if (name != null)
+				{
+					yield return name;
+				}
+			}
+		}
+	}
+	
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/GenerateConstructorCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/GenerateConstructorCodeFixProvider.cs
new file mode 100644
index 0000000000..42853f44da
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/GenerateConstructorCodeFixProvider.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateConstructor;
+using System;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateConstructor
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateConstructor), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.FullyQualify)]
+	internal class GenerateConstructorCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS0122 = "CS0122"; // CS0122: 'C' is inaccessible due to its protection level
+		private const string CS1729 = "CS1729"; // CS1729: 'C' does not contain a constructor that takes n arguments
+		private const string CS1739 = "CS1739"; // CS1739: The best overload for 'Program' does not have a parameter named 'v'
+		private const string CS1503 = "CS1503"; // CS1503: Argument 1: cannot convert from 'T1' to 'T2'
+		private const string CS7036 = "CS7036"; // CS7036: There is no argument given that corresponds to the required formal parameter 'v' of 'C.C(int)'
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0122, CS1729, CS1739, CS1503, CS7036); }
+		}
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return new CSharpGenerateConstructorService ().GenerateConstructorAsync (document, node, cancellationToken);
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			return node is SimpleNameSyntax || node is ObjectCreationExpressionSyntax || node is ConstructorInitializerSyntax || node is AttributeSyntax;
+		}
+
+		protected override SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			var objectCreationNode = node as ObjectCreationExpressionSyntax;
+			if (objectCreationNode != null)
+			{
+				return objectCreationNode.Type.GetRightmostName();
+			}
+
+			var attributeNode = node as AttributeSyntax;
+			if (attributeNode != null)
+			{
+				return attributeNode.Name;
+			}
+
+			return node;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateEnumMember/GenerateEnumMemberCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateEnumMember/GenerateEnumMemberCodeFixProvider.cs
new file mode 100644
index 0000000000..29823cc623
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateEnumMember/GenerateEnumMemberCodeFixProvider.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.CodeFixes.GenerateConstructor;
+using ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateEnumMember;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateEnumMember
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateEnumMember), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateConstructor)]
+	internal class GenerateEnumMemberCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS0117 = "CS0117"; // error CS0117: 'Color' does not contain a definition for 'Red'
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0117); }
+		}
+		static CSharpGenerateEnumMemberService service = new CSharpGenerateEnumMemberService();
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return service.GenerateEnumMemberAsync(document, node, cancellationToken);
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			return node is IdentifierNameSyntax;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateConversionCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateConversionCodeFixProvider.cs
new file mode 100644
index 0000000000..4db9c211a7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateConversionCodeFixProvider.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.CodeFixes.GenerateConstructor;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+using ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateMethod
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateConversion), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateEnumMember)]
+	internal class GenerateConversionCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS0029 = "CS0029"; // error CS0029: Cannot implicitly convert type 'type' to 'type'
+		private const string CS0030 = "CS0030"; // error CS0030: Cannot convert type 'type' to 'type'
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0029, CS0030); }
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			return node.IsKind(SyntaxKind.IdentifierName) ||
+				node.IsKind(SyntaxKind.MethodDeclaration) ||
+				node.IsKind(SyntaxKind.InvocationExpression) ||
+				node.IsKind(SyntaxKind.CastExpression) ||
+				node is LiteralExpressionSyntax ||
+				node is SimpleNameSyntax ||
+				node is ExpressionSyntax;
+		}
+
+		protected override SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			var invocation = node as InvocationExpressionSyntax;
+			if (invocation != null)
+			{
+				return invocation.Expression.GetRightmostName();
+			}
+
+			var memberBindingExpression = node as MemberBindingExpressionSyntax;
+			if (memberBindingExpression != null)
+			{
+				return memberBindingExpression.Name;
+			}
+
+			return node;
+		}
+		static CSharpGenerateConversionService service = new CSharpGenerateConversionService ();
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return service.GenerateConversionAsync(document, node, cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateMethodCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateMethodCodeFixProvider.cs
new file mode 100644
index 0000000000..c1c8396fa3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateMethodCodeFixProvider.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.CodeFixes.GenerateConstructor;
+using ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateMethod
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateMethod), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateEnumMember)]
+	internal class GenerateMethodCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS0103 = "CS0103"; // error CS0103: Error The name 'Foo' does not exist in the current context
+		private const string CS1061 = "CS1061"; // error CS1061: Error 'Class' does not contain a definition for 'Foo' and no extension method 'Foo' 
+		private const string CS0117 = "CS0117"; // error CS0117: 'Class' does not contain a definition for 'Foo'
+		private const string CS0122 = "CS0122"; // error CS0122: 'Class' is inaccessible due to its protection level.
+		private const string CS0539 = "CS0539"; // error CS0539: 'A.Foo<T>()' in explicit interface declaration is not a member of interface
+		private const string CS1501 = "CS1501"; // error CS1501: No overload for method 'M' takes 1 arguments
+		private const string CS1503 = "CS1503"; // error CS1503: Argument 1: cannot convert from 'double' to 'int'
+		private const string CS0305 = "CS0305"; // error CS0305: Using the generic method 'CA.M<V>()' requires 1 type arguments
+		private const string CS0308 = "CS0308"; // error CS0308: The non-generic method 'Program.Foo()' cannot be used with type arguments
+		private const string CS1660 = "CS1660"; // error CS1660: Cannot convert lambda expression to type 'string[]' because it is not a delegate type
+		private const string CS1739 = "CS1739"; // error CS1739: The best overload for 'M' does not have a parameter named 'x'
+		private const string CS7036 = "CS7036"; // error CS7036: There is no argument given that corresponds to the required formal parameter 'x' of 'C.M(int)'
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0103, CS1061, CS0117, CS0122, CS0539, CS1501, CS1503, CS0305, CS0308, CS1660, CS1739, CS7036); }
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			return node.IsKind(SyntaxKind.IdentifierName) ||
+				node.IsKind(SyntaxKind.MethodDeclaration) ||
+				node.IsKind(SyntaxKind.InvocationExpression) ||
+				node.IsKind(SyntaxKind.CastExpression) ||
+				node is LiteralExpressionSyntax ||
+				node is SimpleNameSyntax ||
+				node is ExpressionSyntax;
+		}
+
+		protected override SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			var invocation = node as InvocationExpressionSyntax;
+			if (invocation != null)
+			{
+				return invocation.Expression.GetRightmostName();
+			}
+
+			var memberBindingExpression = node as MemberBindingExpressionSyntax;
+			if (memberBindingExpression != null)
+			{
+				return memberBindingExpression.Name;
+			}
+
+			return node;
+		}
+		static CSharpGenerateMethodService service = new CSharpGenerateMethodService ();
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return service.GenerateMethodAsync(document, node, cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateType/GenerateTypeCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateType/GenerateTypeCodeFixProvider.cs
new file mode 100644
index 0000000000..6039a17dc7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateType/GenerateTypeCodeFixProvider.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.CodeFixes.GenerateConstructor;
+using ICSharpCode.NRefactory6.CSharp.GenerateType;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateType
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateType), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateVariable)]
+	internal class GenerateTypeCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS0103 = "CS0103"; // error CS0103: The name 'Foo' does not exist in the current context
+		private const string CS0117 = "CS0117"; // error CS0117: 'x' does not contain a definition for 'y'
+		private const string CS0234 = "CS0234"; // error CS0234: The type or namespace name 'C' does not exist in the namespace 'N' (are you missing an assembly reference?)
+		private const string CS0246 = "CS0246"; // error CS0246: The type or namespace name 'T' could not be found (are you missing a using directive or an assembly reference?)
+		private const string CS0305 = "CS0305"; // error CS0305: Using the generic type 'C<T1>' requires 1 type arguments
+		private const string CS0308 = "CS0308"; // error CS0308: The non-generic type 'A' cannot be used with type arguments
+		private const string CS0426 = "CS0426"; // error CS0426: The type name 'S' does not exist in the type 'Program'
+		private const string CS0616 = "CS0616"; // error CS0616: 'x' is not an attribute class
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0103, CS0117, CS0234, CS0246, CS0305, CS0308, CS0426, CS0616); }
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			var qualified = node as QualifiedNameSyntax;
+			if (qualified != null)
+			{
+				return true;
+			}
+
+			var simple = node as SimpleNameSyntax;
+			if (simple != null)
+			{
+				return !simple.IsParentKind(SyntaxKind.QualifiedName);
+			}
+
+			var memberAccess = node as MemberAccessExpressionSyntax;
+			if (memberAccess != null)
+			{
+				return true;
+			}
+			if (node.IsKind (SyntaxKind.ObjectCreationExpression))
+				return true;
+			return false;
+		}
+
+		protected override SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			if (node.IsKind (SyntaxKind.ObjectCreationExpression))
+				node = ((ObjectCreationExpressionSyntax)node).Type;
+			return ((ExpressionSyntax)node).GetRightmostName();
+		}
+
+		static readonly CSharpGenerateTypeService service = new CSharpGenerateTypeService ();
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return service.GenerateTypeAsync(document, node, cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateVariable/GenerateVariableCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateVariable/GenerateVariableCodeFixProvider.cs
new file mode 100644
index 0000000000..11e589fc05
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateVariable/GenerateVariableCodeFixProvider.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.GenerateMember.GenerateVariable;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.CodeFixes.GenerateConstructor;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateVariable
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateVariable), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateMethod)]
+	internal class GenerateVariableCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS1061 = "CS1061"; // error CS1061: 'C' does not contain a definition for 'Foo' and no extension method 'Foo' accepting a first argument of type 'C' could be found
+		private const string CS0103 = "CS0103"; // error CS0103: The name 'Foo' does not exist in the current context
+		private const string CS0117 = "CS0117"; // error CS0117: 'TestNs.Program' does not contain a definition for 'blah'
+		private const string CS0539 = "CS0539"; // error CS0539: 'Class.SomeProp' in explicit interface declaration is not a member of interface
+		private const string CS0246 = "CS0246"; // error CS0246: The type or namespace name 'Version' could not be found
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS1061, CS0103, CS0117, CS0539, CS0246); }
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			return node is SimpleNameSyntax || node is PropertyDeclarationSyntax || node is MemberBindingExpressionSyntax;
+		}
+
+		protected override SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			if (node.IsKind(SyntaxKind.MemberBindingExpression))
+			{
+				var nameNode = node.ChildNodes().FirstOrDefault(n => n.IsKind(SyntaxKind.IdentifierName));
+				if (nameNode != null)
+				{
+					return nameNode;
+				}
+			}
+
+			return base.GetTargetNode(node);
+		}
+		static readonly CSharpGenerateVariableService service = new CSharpGenerateVariableService ();
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return service.GenerateVariableAsync(document, node, cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementAbstractClass/ImplementAbstractClassCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementAbstractClass/ImplementAbstractClassCodeFixProvider.cs
new file mode 100644
index 0000000000..f821d0d4a6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementAbstractClass/ImplementAbstractClassCodeFixProvider.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.ImplementAbstractClass;
+using MonoDevelop.Core;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.ImplementAbstractClass
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.ImplementAbstractClass), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateType)]
+	internal class ImplementAbstractClassCodeFixProvider : CodeFixProvider
+	{
+		private const string CS0534 = "CS0534"; // 'Program' does not implement inherited abstract member 'Foo.bar()'
+
+		public sealed override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0534); }
+		}
+
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
+
+			var token = root.FindToken(context.Span.Start);
+			if (!token.Span.IntersectsWith(context.Span))
+			{
+				return;
+			}
+
+			var classNode = token.Parent as ClassDeclarationSyntax;
+			if (classNode == null)
+			{
+				return;
+			}
+
+			var model = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+			
+			foreach (var baseTypeSyntax in classNode.BaseList.Types)
+			{
+				var node = baseTypeSyntax.Type;
+
+				if (service.CanImplementAbstractClass(
+					context.Document,
+					model,
+					node,
+					context.CancellationToken))
+				{
+					var title = GettextCatalog.GetString ("Implement Abstract Class");
+					var abstractType = model.GetTypeInfo(node, context.CancellationToken).Type;
+					var id = GetCodeActionId(abstractType.ContainingAssembly.Name, abstractType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
+					context.RegisterCodeFix(
+						new DocumentChangeAction(node.Span, DiagnosticSeverity.Error, title,
+							(c) => ImplementAbstractClassAsync(context.Document, node, c)),
+						context.Diagnostics);
+					return;
+				}
+			}
+		}
+
+		// internal for testing purposes.
+		internal static string GetCodeActionId(string assemblyName, string abstractTypeFullyQualifiedName)
+		{
+			return "ImplementAbstractClass;" +
+				assemblyName + ";" +
+				abstractTypeFullyQualifiedName;
+		}
+		static CSharpImplementAbstractClassService service = new CSharpImplementAbstractClassService ();
+
+		private async Task<Document> ImplementAbstractClassAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return await service.ImplementAbstractClassAsync(
+				document,
+				await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false),
+				node,
+				cancellationToken).ConfigureAwait(false);
+		}
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementInterface/ImplementInterfaceCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementInterface/ImplementInterfaceCodeFixProvider.cs
new file mode 100644
index 0000000000..a9eb6c8d2f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementInterface/ImplementInterfaceCodeFixProvider.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.ImplementInterface;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.ImplementInterface
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.ImplementInterface), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.ImplementAbstractClass)]
+	internal class ImplementInterfaceCodeFixProvider : CodeFixProvider
+	{
+		private readonly Func<TypeSyntax, bool> _interfaceName = n => n.Parent is BaseTypeSyntax && n.Parent.Parent is BaseListSyntax && ((BaseTypeSyntax)n.Parent).Type == n;
+		private readonly Func<IEnumerable<CodeAction>, bool> _codeActionAvailable = actions => actions != null && actions.Any();
+
+		internal const string CS0535 = "CS0535"; // 'Program' does not implement interface member 'System.Collections.IEnumerable.GetEnumerator()'
+		internal const string CS0737 = "CS0737"; // 'Class' does not implement interface member 'IInterface.M()'. 'Class.M()' cannot implement an interface member because it is not public.
+		internal const string CS0738 = "CS0738"; // 'C' does not implement interface member 'I.Method1()'. 'B.Method1()' cannot implement 'I.Method1()' because it does not have the matching return type of 'void'.
+
+		public sealed override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0535, CS0737, CS0738); }
+		}
+		static CSharpImplementInterfaceService service = new CSharpImplementInterfaceService();
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+
+			var token = root.FindToken(span.Start);
+			if (!token.Span.IntersectsWith(span))
+			{
+				return;
+			}
+
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return;
+
+			var actions = token.Parent.GetAncestorsOrThis<TypeSyntax>()
+				.Where(_interfaceName)
+				.Select(n => service.GetCodeActions(document, model, n, cancellationToken))
+				.FirstOrDefault(_codeActionAvailable);
+
+			if (_codeActionAvailable(actions))
+			{
+				context.RegisterFixes(actions, context.Diagnostics);
+			}
+		}
+
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/MoveTypeToFile/MoveTypeToFile.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/MoveTypeToFile/MoveTypeToFile.cs
new file mode 100644
index 0000000000..c1b756a566
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/MoveTypeToFile/MoveTypeToFile.cs
@@ -0,0 +1,213 @@
+// 
+// MoveTypeToFile.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide;
+using System.Collections.Generic;
+using MonoDevelop.Ide.StandardHeader;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.MoveTypeToFile
+{
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = "Move type to file")]
+	class MoveTypeToFile : CodeRefactoringProvider
+	{
+		public async override Task ComputeRefactoringsAsync (CodeRefactoringContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return;
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait (false);
+			var token = root.FindToken(span.Start);
+
+			var type = token.Parent as BaseTypeDeclarationSyntax;
+			if (type == null)
+				return;
+			
+			if (Path.GetFileNameWithoutExtension (document.FilePath) == type.Identifier.ToString ())
+				return;
+					
+			string title;
+			if (IsSingleType (root)) {
+				title = String.Format (GettextCatalog.GetString ("Rename file to '{0}'"), Path.GetFileName (GetCorrectFileName (document, type)));
+			} else {
+				title = String.Format (GettextCatalog.GetString ("Move type to file '{0}'"), Path.GetFileName (GetCorrectFileName (document, type)));
+			}
+			context.RegisterRefactoring (new MyCodeAction (document, title, root, type));
+		}
+
+		class MyCodeAction : CodeAction
+		{
+			readonly Document document;
+			readonly BaseTypeDeclarationSyntax type;
+			readonly SyntaxNode root;
+
+			public MyCodeAction (Document document, string title, SyntaxNode root, BaseTypeDeclarationSyntax type)
+			{
+				this.root = root;
+				this.title = title;
+				this.type = type;
+				this.document = document;
+
+			}
+
+			string title;
+			public override string Title {
+				get {
+					return this.title;
+				}
+			}
+
+			protected override Task<Document> GetChangedDocumentAsync (System.Threading.CancellationToken cancellationToken)
+			{
+				var correctFileName = GetCorrectFileName (document, type);
+				if (IsSingleType (root)) {
+					FileService.RenameFile (document.FilePath, correctFileName);
+					var doc = IdeApp.Workbench.ActiveDocument;
+					if (doc.HasProject) {
+						IdeApp.ProjectOperations.Save (doc.Project);
+					}
+					return Task.FromResult (document);
+				} 
+				return Task.FromResult (CreateNewFile (type, correctFileName));
+			}
+
+			Document CreateNewFile (BaseTypeDeclarationSyntax type, string correctFileName)
+			{
+				var doc = IdeApp.Workbench.ActiveDocument;
+				var content = doc.Editor.Text;
+
+				var types = new List<BaseTypeDeclarationSyntax> (
+					root
+					.DescendantNodesAndSelf (n => !(n is BaseTypeDeclarationSyntax))
+					.OfType<BaseTypeDeclarationSyntax> ()
+					.Where (t => t.SpanStart != type.SpanStart)
+				);
+				types.Sort ((x, y) => y.SpanStart.CompareTo (x.SpanStart));
+
+				foreach (var removeType in types) {
+					var bounds = CalcTypeBounds (removeType);
+					content = content.Remove (bounds.Offset, bounds.Length);
+				}
+
+				if (doc.HasProject) {
+					string header = StandardHeaderService.GetHeader (doc.Project, correctFileName, true);
+					if (!string.IsNullOrEmpty (header))
+						content = header + doc.Editor.GetEolMarker () + StripHeader (content);
+				}
+				content = StripDoubleBlankLines (content);
+
+				File.WriteAllText (correctFileName, content);
+				if (doc.HasProject) {
+					doc.Project.AddFile (correctFileName);
+					IdeApp.ProjectOperations.Save (doc.Project);
+				}
+
+				doc.Editor.RemoveText (CalcTypeBounds (type));
+
+				return document;
+			}
+
+			ISegment CalcTypeBounds (BaseTypeDeclarationSyntax type)
+			{
+				int start = type.Span.Start;
+				int end = type.Span.End;
+				foreach (var trivia in type.GetLeadingTrivia ()) {
+					if (trivia.Kind () == SyntaxKind.SingleLineDocumentationCommentTrivia) {
+						start = trivia.FullSpan.Start;
+					}
+				}
+
+				return TextSegment.FromBounds (start, end);
+			}
+		}
+
+		static bool IsBlankLine (IReadonlyTextDocument doc, int i)
+		{
+			var line = doc.GetLine (i);
+			return line.Length == line.GetIndentation (doc).Length;
+		}
+
+		static string StripDoubleBlankLines (string content)
+		{
+			var doc = TextEditorFactory.CreateNewDocument (new StringTextSource (content), "a.cs");
+			for (int i = 1; i + 1 <= doc.LineCount; i++) {
+				if (IsBlankLine (doc, i) && IsBlankLine (doc, i + 1)) {
+					doc.RemoveText (doc.GetLine (i).SegmentIncludingDelimiter);
+					i--;
+					continue;
+				}
+			}
+			return doc.Text;
+		}
+
+		static string StripHeader (string content)
+		{
+			var doc = TextEditorFactory.CreateNewDocument (new StringTextSource (content), "");
+			while (true) {
+				string lineText = doc.GetLineText (1);
+				if (lineText == null)
+					break;
+				if (lineText.StartsWith ("//", StringComparison.Ordinal)) {
+					doc.RemoveText (doc.GetLine (1).SegmentIncludingDelimiter);
+					continue;
+				}
+				break;
+			}
+			return doc.Text;
+		}
+		
+		static bool IsSingleType (SyntaxNode root)
+		{
+			return root.DescendantNodesAndSelf (c => !(c is BaseTypeDeclarationSyntax)).OfType<BaseTypeDeclarationSyntax> ().Count () == 1;
+		}
+
+		internal static string GetCorrectFileName (Document document, BaseTypeDeclarationSyntax type)
+		{
+			if (type == null)
+				return document.FilePath;
+			return Path.Combine (Path.GetDirectoryName (document.FilePath), type.Identifier + Path.GetExtension (document.FilePath));
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/PredefinedCodeFixProviderNames.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/PredefinedCodeFixProviderNames.cs
new file mode 100644
index 0000000000..71e0e7e62e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/PredefinedCodeFixProviderNames.cs
@@ -0,0 +1,64 @@
+//
+// PredefinedCodeFixProviderNames.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	static class PredefinedCodeFixProviderNames
+	{
+		public const string AddAwait = "Add Await For Expression";
+		public const string AddAsync = "Add Async To Member";
+		public const string ChangeReturnType = "Change Return Type";
+		public const string ChangeToYield = "Change To Yield";
+		public const string ConvertToAsync = "Convert To Async";
+		public const string ConvertToIterator = "Convert To Iterator";
+		public const string CorrectNextControlVariable = "Correct Next Control Variable";
+		public const string AddMissingReference = "Add Missing Reference";
+		public const string AddUsingOrImport = "Add Using or Import";
+		public const string FullyQualify = "Fully Qualify";
+		public const string FixIncorrectFunctionReturnType = "Fix Incorrect Function Return Type";
+		public const string FixIncorrectExitContinue = "Fix Incorrect Exit Continue";
+		public const string GenerateConstructor = "Generate Constructor";
+		public const string GenerateEndConstruct = "Generate End Construct";
+		public const string GenerateEnumMember = "Generate Enum Member";
+		public const string GenerateEvent = "Generate Event";
+		public const string GenerateVariable = "Generate Variable";
+		public const string GenerateMethod = "Generate Method";
+		public const string GenerateConversion = "Generate Conversion";
+		public const string GenerateType = "Generate Type";
+		public const string ImplementAbstractClass = "Implement Abstract Class";
+		public const string ImplementInterface = "Implement Interface";
+		public const string InsertMissingCast = "InsertMissingCast";
+		public const string MoveToTopOfFile = "Move To Top Of File";
+		public const string RemoveUnnecessaryCast = "Remove Unnecessary Casts";
+		public const string RemoveUnnecessaryImports = "Remove Unnecessary Usings or Imports";
+		public const string RenameTracking = "Rename Tracking";
+		public const string SimplifyNames = "Simplify Names";
+		public const string SpellCheck = "Spell Check";
+		public const string Suppression = "Suppression";
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.RemoveUnnecessaryCastFixAllProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.RemoveUnnecessaryCastFixAllProvider.cs
new file mode 100644
index 0000000000..ec7d818390
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.RemoveUnnecessaryCastFixAllProvider.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace MonoDevelop.CSharp.CodeFixes.RemoveUnnecessaryCast
+{
+	internal partial class RemoveUnnecessaryCastCodeFixProvider : CodeFixProvider
+	{
+//		private class RemoveUnnecessaryCastFixAllProvider : BatchSimplificationFixAllProvider
+//		{
+//			internal static new readonly RemoveUnnecessaryCastFixAllProvider Instance = new RemoveUnnecessaryCastFixAllProvider();
+//
+//			protected override SyntaxNode GetNodeToSimplify(SyntaxNode root, SemanticModel model, Diagnostic diagnostic, Workspace workspace, out string codeActionId, CancellationToken cancellationToken)
+//			{
+//				codeActionId = null;
+//				return GetCastNode(root, model, diagnostic.Location.SourceSpan, cancellationToken);
+//			}
+//
+//			protected override bool NeedsParentFixup
+//			{
+//				get
+//				{
+//					return true;
+//				}
+//			}
+//
+//			protected override async Task<Document> AddSimplifyAnnotationsAsync(Document document, SyntaxNode nodeToSimplify, CancellationToken cancellationToken)
+//			{
+//				var cast = nodeToSimplify as CastExpressionSyntax;
+//				if (cast == null)
+//				{
+//					return null;
+//				}
+//
+//				return await RemoveUnnecessaryCastAsync(document, cast, cancellationToken).ConfigureAwait(false);
+//			}
+//		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.cs
new file mode 100644
index 0000000000..63770abbdf
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.cs
@@ -0,0 +1,122 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Diagnostics;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Core;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.RemoveUnnecessaryCast
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.RemoveUnnecessaryCast), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.ImplementInterface)]
+	internal partial class RemoveUnnecessaryCastCodeFixProvider : CodeFixProvider
+	{
+		public sealed override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(IDEDiagnosticIds.RemoveUnnecessaryCastDiagnosticId); }
+		}
+
+//		public sealed override FixAllProvider GetFixAllProvider()
+//		{
+//			return RemoveUnnecessaryCastFixAllProvider.Instance;
+//		}
+//
+		private static CastExpressionSyntax GetCastNode(SyntaxNode root, SemanticModel model, TextSpan span, CancellationToken cancellationToken)
+		{
+			var token = root.FindToken(span.Start);
+			if (!token.Span.IntersectsWith(span))
+			{
+				return null;
+			}
+
+			return token.GetAncestors<CastExpressionSyntax>()
+				.FirstOrDefault(c => c.Span.IntersectsWith(span) && c.IsUnnecessaryCast(model, cancellationToken));
+		}
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var node = GetCastNode(root, model, span, cancellationToken);
+			if (node == null)
+			{
+				return;
+			}
+
+			context.RegisterCodeFix(
+				new DocumentChangeAction(node.Span, DiagnosticSeverity.Warning,
+					GettextCatalog.GetString ("Remove Unnecessary Cast"),
+					(c) => RemoveUnnecessaryCastAsync(document, node, c)),
+				context.Diagnostics);
+		}
+
+		private static async Task<Document> RemoveUnnecessaryCastAsync(Document document, CastExpressionSyntax cast, CancellationToken cancellationToken)
+		{
+			var annotatedCast = cast.WithAdditionalAnnotations(Simplifier.Annotation);
+
+			if (annotatedCast.Expression is ParenthesizedExpressionSyntax)
+			{
+				annotatedCast = annotatedCast.WithExpression(
+					annotatedCast.Expression.WithAdditionalAnnotations(Simplifier.Annotation));
+			}
+			else
+			{
+				annotatedCast = annotatedCast.WithExpression(
+					annotatedCast.Expression.Parenthesize());
+			}
+
+			ExpressionSyntax oldNode = cast;
+			ExpressionSyntax newNode = annotatedCast;
+
+			// Ensure that we simplify any parenting parenthesized expressions not just on the syntax tree level but also on Token based
+			// Case 1:
+			//  In the syntax, (((Task<Action>)x).Result)() 
+			//                 oldNode = (Task<Action>)x
+			//                 newNode = (Task<Action>)(x)
+			//                 Final newNode will be (((Task<Action>)(x)).Result)
+			while (oldNode.Parent.IsKind(SyntaxKind.ParenthesizedExpression) || oldNode.GetFirstToken().GetPreviousToken().Parent.IsKind(SyntaxKind.ParenthesizedExpression))
+			{
+				var parenthesizedExpression = (ParenthesizedExpressionSyntax)oldNode.GetFirstToken().GetPreviousToken().Parent;
+				newNode = parenthesizedExpression.ReplaceNode(oldNode, newNode)
+					.WithAdditionalAnnotations(Simplifier.Annotation);
+				oldNode = parenthesizedExpression;
+			}
+
+			newNode = newNode.WithAdditionalAnnotations(Formatter.Annotation);
+
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var newRoot = root.ReplaceNode(oldNode, newNode);
+
+			return document.WithSyntaxRoot(newRoot);
+		}
+//
+//		private class MyCodeAction : CodeAction.DocumentChangeAction
+//		{
+//			public MyCodeAction(string title, Func<CancellationToken, Task<Document>> createChangedDocument) :
+//			base(title, createChangedDocument)
+//			{
+//			}
+//		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryUsings/RemoveUnnecessaryUsingsCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryUsings/RemoveUnnecessaryUsingsCodeFixProvider.cs
new file mode 100644
index 0000000000..d7cb42e0d2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryUsings/RemoveUnnecessaryUsingsCodeFixProvider.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.RemoveUnnecessaryImports;
+using MonoDevelop.Core;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.CSharp.Diagnostics;
+
+namespace MonoDevelop.CSharp.CodeFixes.RemoveUnusedUsings
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.RemoveUnnecessaryImports), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.AddMissingReference)]
+	internal class RemoveUnnecessaryUsingsCodeFixProvider : CodeFixProvider
+	{
+		public sealed override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(IDEDiagnosticIds.RemoveUnnecessaryImportsDiagnosticId); }
+		}
+
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
+
+		static readonly CSharpRemoveUnnecessaryImportsService service = new CSharpRemoveUnnecessaryImportsService();
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var newDocument = service.RemoveUnnecessaryImports(document, model, root, cancellationToken);
+			if (newDocument == document || newDocument == null)
+			{
+				return;
+			}
+
+			context.RegisterCodeFix(
+				new DocumentChangeAction(context.Diagnostics[0].Location.SourceSpan, DiagnosticSeverity.Warning,
+					GettextCatalog.GetString ("Remove Unnecessary Usings"),
+					(c) => Task.FromResult(newDocument)),
+				context.Diagnostics);
+		}
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.SimplifyTypeNamesFixAllProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.SimplifyTypeNamesFixAllProvider.cs
new file mode 100644
index 0000000000..543c9b3b38
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.SimplifyTypeNamesFixAllProvider.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis;
+
+namespace MonoDevelop.CSharp.CodeFixes.SimplifyTypeNames
+{
+	internal partial class SimplifyTypeNamesCodeFixProvider : CodeFixProvider
+	{
+//		private class SimplifyTypeNamesFixAllProvider : BatchSimplificationFixAllProvider
+//		{
+//			internal static new readonly SimplifyTypeNamesFixAllProvider Instance = new SimplifyTypeNamesFixAllProvider();
+//
+//			protected override SyntaxNode GetNodeToSimplify(SyntaxNode root, SemanticModel model, Diagnostic diagnostic, Workspace workspace, out string codeActionId, CancellationToken cancellationToken)
+//			{
+//				codeActionId = null;
+//				string diagnosticId;
+//				var node = SimplifyTypeNamesCodeFixProvider.GetNodeToSimplify(root, model, diagnostic.Location.SourceSpan, workspace.Options, out diagnosticId, cancellationToken);
+//				if (node != null)
+//				{
+//					codeActionId = GetCodeActionId(diagnosticId, node.ToString());
+//				}
+//
+//				return node;
+//			}
+//		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.cs
new file mode 100644
index 0000000000..be3ccc4cd3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Diagnostics;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Core;
+using System;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using MonoDevelop.CSharp.Diagnostics.SimplifyTypeNames;
+
+namespace MonoDevelop.CSharp.CodeFixes.SimplifyTypeNames
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.SimplifyNames), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.RemoveUnnecessaryCast)]
+	internal partial class SimplifyTypeNamesCodeFixProvider : CodeFixProvider
+	{
+		public sealed override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get
+			{
+				return ImmutableArray.Create(
+					IDEDiagnosticIds.SimplifyNamesDiagnosticId,
+					IDEDiagnosticIds.SimplifyMemberAccessDiagnosticId,
+					IDEDiagnosticIds.SimplifyThisOrMeDiagnosticId);
+			}
+		}
+
+//		public sealed override FixAllProvider GetFixAllProvider()
+//		{
+//			return SimplifyTypeNamesFixAllProvider.Instance;
+//		}
+
+		internal static SyntaxNode GetNodeToSimplify(SyntaxNode root, SemanticModel model, TextSpan span, OptionSet optionSet, out string diagnosticId, CancellationToken cancellationToken)
+		{
+			diagnosticId = null;
+			var token = root.FindToken(span.Start, findInsideTrivia: true);
+			if (!token.Span.IntersectsWith(span))
+			{
+				return null;
+			}
+
+			foreach (var n in token.GetAncestors<SyntaxNode>())
+			{
+				if (n.Span.IntersectsWith(span) && CanSimplifyTypeNameExpression(model, n, optionSet, span, out diagnosticId, cancellationToken))
+				{
+					return n;
+				}
+			}
+
+			return null;
+		}
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var optionSet = document.Project.Solution.Workspace.Options;
+			string diagnosticId;
+			var node = GetNodeToSimplify(root, model, span, optionSet, out diagnosticId, cancellationToken);
+			if (node == null)
+			{
+				return;
+			}
+
+			var id = GetCodeActionId(diagnosticId, node.ToString());
+			var title = id;
+			var codeAction = new DocumentChangeAction(node.Span, DiagnosticSeverity.Warning, title,
+				(c) => SimplifyTypeNameAsync(document, node, c));
+
+			context.RegisterCodeFix(codeAction, context.Diagnostics);
+		}
+
+		// internal for testing purpose
+		internal static string GetCodeActionId(string diagnosticId, string nodeText)
+		{
+			switch (diagnosticId)
+			{
+			case IDEDiagnosticIds.SimplifyNamesDiagnosticId:
+				return string.Format(GettextCatalog.GetString ("Simplify name '{0}'"), nodeText);
+
+			case IDEDiagnosticIds.SimplifyMemberAccessDiagnosticId:
+				return string.Format(GettextCatalog.GetString ("Simplify member access '{0}'"), nodeText);
+
+			case IDEDiagnosticIds.SimplifyThisOrMeDiagnosticId:
+				return GettextCatalog.GetString ("Remove 'this' qualification");
+
+			default:
+				throw new InvalidOperationException();
+			}
+		}
+
+		private static bool CanSimplifyTypeNameExpression(SemanticModel model, SyntaxNode node, OptionSet optionSet, TextSpan span, out string diagnosticId, CancellationToken cancellationToken)
+		{
+			diagnosticId = null;
+			TextSpan issueSpan;
+			if (!CSharpSimplifyTypeNamesDiagnosticAnalyzer.IsCandidate(node) ||
+				!CSharpSimplifyTypeNamesDiagnosticAnalyzer.CanSimplifyTypeNameExpression(model, node, optionSet, out issueSpan, out diagnosticId, cancellationToken))
+			{
+				return false;
+			}
+
+			return issueSpan.Equals(span);
+		}
+
+		private async Task<Document> SimplifyTypeNameAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var expressionSyntax = node;
+			var annotatedexpressionSyntax = expressionSyntax.WithAdditionalAnnotations(Simplifier.Annotation, Formatter.Annotation);
+
+			if (annotatedexpressionSyntax.Kind() == SyntaxKind.IsExpression || annotatedexpressionSyntax.Kind() == SyntaxKind.AsExpression)
+			{
+				var right = ((BinaryExpressionSyntax)annotatedexpressionSyntax).Right;
+				annotatedexpressionSyntax = annotatedexpressionSyntax.ReplaceNode(right, right.WithAdditionalAnnotations(Simplifier.Annotation));
+			}
+
+			SyntaxNode oldNode = expressionSyntax;
+			SyntaxNode newNode = annotatedexpressionSyntax;
+
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var newRoot = root.ReplaceNode(oldNode, newNode);
+
+			return document.WithSyntaxRoot(newRoot);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/AbstractGenerateAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/AbstractGenerateAction.cs
index 12fcc3a87d..13234fff9e 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/AbstractGenerateAction.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/AbstractGenerateAction.cs
@@ -31,18 +31,22 @@ using Gtk;
 using System.Collections.Generic;
 using MonoDevelop.Refactoring;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Components;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.CSharp.Completion;
+using MonoDevelop.CSharp.Formatting;
 
 namespace MonoDevelop.CodeGeneration
 {
-	public abstract class AbstractGenerateAction : IGenerateAction
+	abstract class AbstractGenerateAction : IGenerateAction
 	{
 		readonly TreeStore store = new TreeStore (typeof(bool), typeof(Xwt.Drawing.Image), typeof(string), typeof(object));
 		readonly CodeGenerationOptions options;
 		
-		public CodeGenerationOptions Options {
+		internal CodeGenerationOptions Options {
 			get {
 				return options; 
 			}
@@ -76,23 +80,18 @@ namespace MonoDevelop.CodeGeneration
 			column.Expand = true;
 
 			treeView.AppendColumn (column);
-			Ambience ambience = AmbienceService.GetAmbienceForFile (options.Document.FileName);
 			foreach (object obj in GetValidMembers ()) {
-				var member = obj as IEntity;
+				var member = obj as ISymbol;
 				if (member != null) {
-					Store.AppendValues (false, ImageService.GetIcon (member.GetStockIcon (), IconSize.Menu), ambience.GetString (member, OutputFlags.ClassBrowserEntries), member);
+					Store.AppendValues (false, ImageService.GetIcon (member.GetStockIcon (), IconSize.Menu), member.ToDisplayString (Ambience.LabelFormat), member);
 					continue;
 				}
 
-				var tuple = obj as Tuple<IMember, bool>;
+				var tuple = obj as Tuple<ISymbol, bool>;
 				if (tuple != null) {
-					Store.AppendValues (false, ImageService.GetIcon (tuple.Item1.GetStockIcon (), IconSize.Menu), ambience.GetString (tuple.Item1, OutputFlags.ClassBrowserEntries), tuple);
+					Store.AppendValues (false, ImageService.GetIcon (tuple.Item1.GetStockIcon (), IconSize.Menu), tuple.Item1.ToDisplayString (Ambience.LabelFormat), tuple);
 					continue;
 				}
-
-				var variable = obj as IVariable;
-				if (variable != null)
-					Store.AppendValues (false, ImageService.GetIcon (variable.GetStockIcon (), IconSize.Menu), variable.Name, variable);
 			}
 			
 			treeView.Model = store;
@@ -118,10 +117,9 @@ namespace MonoDevelop.CodeGeneration
 		
 		static string AddIndent (string text, string indent)
 		{
-			var doc = new Mono.TextEditor.TextDocument ();
-			doc.Text = text;
+			var doc = TextEditorFactory.CreateNewReadonlyDocument (new StringTextSource (text), "");
 			var result = new StringBuilder ();
-			foreach (var line in doc.Lines) {
+			foreach (var line in doc.GetLines ()) {
 				result.Append (indent);
 				result.Append (doc.GetTextAt (line.SegmentIncludingDelimiter));
 			}
@@ -141,7 +139,7 @@ namespace MonoDevelop.CodeGeneration
 			} while (store.IterNext (ref iter));
 
 			var output = new StringBuilder ();
-			string indent = RefactoringOptions.GetIndent (options.Document, (IEntity)options.EnclosingMember ?? options.EnclosingType) + "\t";
+			string indent = options.Editor.GetVirtualIndentationString (options.Editor.CaretLine);
 			foreach (string nodeText in GenerateCode (includedMembers)) {
 				if (output.Length > 0) {
 					output.AppendLine ();
@@ -151,8 +149,14 @@ namespace MonoDevelop.CodeGeneration
 			}
 
 			if (output.Length > 0) {
-				var data = options.Document.Editor;
-				data.InsertAtCaret (output.ToString ().TrimStart ());
+				var data = options.Editor;
+				data.EnsureCaretIsNotVirtual ();
+				int offset = data.CaretOffset;
+				var text = output.ToString ().TrimStart ();
+				using (var undo = data.OpenUndoGroup ()) {
+					data.InsertAtCaret (text);
+					OnTheFlyFormatter.Format (data, options.DocumentContext, offset, offset + text.Length);
+				}
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs
index 3ec0f395d3..658891bb9b 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs
@@ -26,148 +26,154 @@
 using System.Linq;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp.Resolver;
 using System;
 using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.Simplification;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Options;
+using MonoDevelop.Ide.Gui.Content;
+using Microsoft.CodeAnalysis.Formatting;
+using System.Diagnostics;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.CodeGeneration
 {
-	public class CodeGenerationOptions
+	sealed class CodeGenerationOptions
 	{
-		public Document Document {
+		readonly int offset;
+
+		public TextEditor Editor
+		{
 			get;
 			private set;
 		}
-		
-		public ITypeDefinition EnclosingType {
+
+		public DocumentContext DocumentContext
+		{
 			get;
 			private set;
 		}
-		
-		public IUnresolvedTypeDefinition EnclosingPart {
+
+		public ITypeSymbol EnclosingType
+		{
 			get;
 			private set;
 		}
-		
-		public IMember EnclosingMember {
+
+		public SyntaxNode EnclosingMemberSyntax
+		{
 			get;
 			private set;
 		}
-		
-		public string MimeType {
-			get {
-				return DesktopService.GetMimeTypeForUri (Document.FileName);
-			}
+
+		public TypeDeclarationSyntax EnclosingPart
+		{
+			get;
+			private set;
 		}
-		
-		public CSharpFormattingOptions FormattingOptions {
-			get {
-				var doc = Document;
-				var policyParent = doc.Project != null ? doc.Project.Policies : null;
-				var types = DesktopService.GetMimeTypeInheritanceChain (doc.Editor.MimeType);
-				var codePolicy = policyParent != null ? policyParent.Get<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types) : MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
-				return codePolicy.CreateOptions ();
-			}
+
+		public ISymbol EnclosingMember
+		{
+			get;
+			private set;
 		}
-		
-		static AstNode FirstExpressionChild (AstNode parent)
+
+		public string MimeType
 		{
-			AstNode node = parent.FirstChild;
-			if (node == null)
-				return null;
-			while (node != null && !(node is Expression || node is Statement)) {
-				node = node.NextSibling;
+			get
+			{
+				return DesktopService.GetMimeTypeForUri (DocumentContext.Name);
 			}
-			return node;
 		}
-		
-		static AstNode NextExpression (AstNode parent)
+
+		public OptionSet FormattingOptions
 		{
-			AstNode node = parent.GetNextNode ();
-			if (node == null)
-				return null;
-			while (node != null && !(node is Expression || node is Statement)) {
-				node = node.GetNextNode ();
+			get
+			{
+				var doc = DocumentContext;
+				var policyParent = doc.Project != null ? doc.Project.Policies : null;
+				var types = DesktopService.GetMimeTypeInheritanceChain (Editor.MimeType);
+				var codePolicy = policyParent != null ? policyParent.Get<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types) : MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
+				var textPolicy = policyParent != null ? policyParent.Get<TextStylePolicy> (types) : MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> (types);
+				return codePolicy.CreateOptions (textPolicy);
 			}
-			return node;
 		}
-		
-		readonly Lazy<CSharpResolver> currentState;
-		public CSharpResolver CurrentState {
-			get {
-				return currentState.Value;
-			}
+
+		public SemanticModel CurrentState
+		{
+			get;
+			private set;
 		}
-		
-		public CodeGenerationOptions ()
+
+		internal CodeGenerationOptions (TextEditor editor, DocumentContext ctx)
 		{
-			currentState = new Lazy<CSharpResolver> (() => {
-				var parsedDocument = Document.ParsedDocument;
-				if (parsedDocument == null)
-					return null;
-				var unit = parsedDocument.GetAst<SyntaxTree> ().Clone ();
-				var file = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-				
-				var resolvedNode = unit.GetNodeAt<BlockStatement> (Document.Editor.Caret.Location);
-				if (resolvedNode == null)
-					return null;
-				
-				var expr = new IdentifierExpression ("foo");
-				resolvedNode.Add (expr);
-				
-				var ctx = file.GetTypeResolveContext (Document.Compilation, Document.Editor.Caret.Location);
-				
-				var resolver = new CSharpResolver (ctx);
-				
-				var astResolver = new CSharpAstResolver (resolver, unit, file);
-				astResolver.ApplyNavigator (new NodeListResolveVisitorNavigator (expr), CancellationToken.None);
-				astResolver.Resolve (expr);
-				return astResolver.GetResolverStateBefore (expr);
-			});
+			Editor = editor;
+			DocumentContext = ctx;
+			if (ctx.ParsedDocument != null)
+				CurrentState = ctx.ParsedDocument.GetAst<SemanticModel> ();
+			offset = editor.CaretOffset;
+			var tree = CurrentState.SyntaxTree;
+			EnclosingPart = tree.GetContainingTypeDeclaration (offset, default(CancellationToken));
+			if (EnclosingPart != null) {
+				EnclosingType = CurrentState.GetDeclaredSymbol (EnclosingPart) as ITypeSymbol;
+
+				foreach (var member in EnclosingPart.Members) {
+					if (member.Span.Contains (offset)) {
+						EnclosingMemberSyntax = member;
+						break;
+					}
+
+				}
+				if (EnclosingMemberSyntax != null)
+					EnclosingMember = CurrentState.GetDeclaredSymbol (EnclosingMemberSyntax);
+			}
 		}
-		
-		public AstType CreateShortType (IType fullType)
+
+		public string CreateShortType (ITypeSymbol fullType)
 		{
-			var parsedFile = Document.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			
-			var compilation = Document.Compilation;
-			fullType = compilation.Import (fullType);
-			var csResolver = parsedFile.GetResolver (compilation, Document.Editor.Caret.Location);
-			
-			var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver);
-			return builder.ConvertType (fullType);
+			return fullType.ToMinimalDisplayString (CurrentState, offset);
 		}
-		
-		public CodeGenerator CreateCodeGenerator ()
+
+		public static CodeGenerationOptions CreateCodeGenerationOptions (TextEditor document, DocumentContext ctx)
 		{
-			var result = CodeGenerator.CreateGenerator (Document);
-			if (result == null)
-				LoggingService.LogError ("Generator can't be generated for : " + Document.Editor.MimeType);
-			return result;
+			return new CodeGenerationOptions (document, ctx);
 		}
-		
-		public static CodeGenerationOptions CreateCodeGenerationOptions (Document document)
+
+		public async Task<string> OutputNode (SyntaxNode node, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			document.UpdateParseDocument ();
-			var options = new CodeGenerationOptions {
-				Document = document
-			};
-			if (document.ParsedDocument != null && document.ParsedDocument.ParsedFile != null) {
-				options.EnclosingPart = document.ParsedDocument.ParsedFile.GetInnermostTypeDefinition (document.Editor.Caret.Location);
-				var project = document.Project;
-				if (options.EnclosingPart != null && project != null)
-					options.EnclosingType = options.EnclosingPart.Resolve (project).GetDefinition ();
-				if (options.EnclosingType != null) {
-					options.EnclosingMember = options.EnclosingType.Members.FirstOrDefault (m => !m.IsSynthetic && m.Region.FileName == document.FileName && m.Region.IsInside (document.Editor.Caret.Location));
-				}
+			node = Formatter.Format (node, TypeSystemService.Workspace, FormattingOptions, cancellationToken);
+			node = node.WithAdditionalAnnotations (Formatter.Annotation, Simplifier.Annotation);
+
+			var text = Editor.Text;
+			string nodeText = node.ToString ();
+			text = text.Insert (offset, nodeText);
+
+
+			var backgroundDocument = DocumentContext.AnalysisDocument.WithText (SourceText.From (text));
+
+			var currentRoot = await backgroundDocument.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+
+			node = currentRoot.FindNode (TextSpan.FromBounds(offset, offset + nodeText.Length));
+
+			currentRoot = currentRoot.TrackNodes (node);
+			backgroundDocument = backgroundDocument.WithSyntaxRoot (currentRoot);
+			backgroundDocument = await Simplifier.ReduceAsync (backgroundDocument, TextSpan.FromBounds (offset, offset + nodeText.Length), FormattingOptions, cancellationToken).ConfigureAwait(false);
+			backgroundDocument = await Formatter.FormatAsync (backgroundDocument, Formatter.Annotation, FormattingOptions, cancellationToken).ConfigureAwait(false);
+
+			var newRoot = await backgroundDocument.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+
+			var formattedNode = newRoot.GetCurrentNode (node);
+			if (formattedNode == null) {
+				LoggingService.LogError ("Fatal error: Can't find current formatted node in code generator document.");
+				return nodeText;
 			}
-			return options;
+			return formattedNode.ToString ();
 		}
-		
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CreateConstructorGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CreateConstructorGenerator.cs
index d48bafe43d..17b56bcf0a 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CreateConstructorGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CreateConstructorGenerator.cs
@@ -1,166 +1,209 @@
-// 
-// CreateConstructorGenerator.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using Gtk;
+// 

+// CreateConstructorGenerator.cs

+//  

+// Author:

+//       Mike Krüger <mkrueger@novell.com>

+// 

+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)

+// 

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+// 

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

+using System;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
+using System.Text;

+using System.Linq;

 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Simplification;
+using ICSharpCode.NRefactory6.CSharp;

+using Gtk;

 
 namespace MonoDevelop.CodeGeneration
 {
 	class CreateConstructorGenerator : ICodeGenerator
 	{
-		public string Icon {
-			get {
+		public string Icon
+		{
+			get
+			{
 				return "md-newmethod";
 			}
 		}
-		
-		public string Text {
-			get {
+
+		public string Text
+		{
+			get
+			{
 				return GettextCatalog.GetString ("Constructor");
 			}
 		}
-		
-		public string GenerateDescription {
-			get {
+
+		public string GenerateDescription
+		{
+			get
+			{
 				return GettextCatalog.GetString ("Select members to be initialized by the constructor.");
 			}
 		}
-		
+
 		public bool IsValid (CodeGenerationOptions options)
 		{
 			var createConstructor = new CreateConstructor (options);
 			return createConstructor.IsValid ();
 		}
-		
+
 		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, TreeView treeView)
 		{
 			var createConstructor = new CreateConstructor (options);
 			createConstructor.Initialize (treeView);
 			return createConstructor;
 		}
-		
+

+		internal static TypeSyntax ConvertType (ITypeSymbol symbol)

+		{

+			// TODO: There needs to be a better way doing that.

+			return SyntaxFactory.ParseTypeName (symbol.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat));

+		}

+
 		class CreateConstructor : AbstractGenerateAction
 		{
 			public CreateConstructor (CodeGenerationOptions options) : base (options)
 			{
 			}
-			
+
 			protected override IEnumerable<object> GetValidMembers ()
 			{
 				if (Options.EnclosingType == null || Options.EnclosingMember != null)
 					yield break;
 
-				var bt = Options.EnclosingType.DirectBaseTypes.FirstOrDefault (t => t.Kind != TypeKind.Interface);
+				var bt = Options.EnclosingType.BaseType;
 
 				if (bt != null) {
-					var ctors = bt.GetConstructors (m => !m.IsSynthetic).ToList ();
-					foreach (var ctor in ctors) {
-						if (ctor.Parameters.Count > 0 || ctors.Count > 1) {
+					var ctors = bt.GetMembers ().OfType<IMethodSymbol> ().Where (m => m.MethodKind == MethodKind.Constructor && !m.IsImplicitlyDeclared).ToList ();
+					foreach (IMethodSymbol ctor in ctors) {
+						if (ctor.Parameters.Length > 0 || ctors.Count > 1) {
 							yield return ctor;
 						}
-					} 
+					}
 				}
 
-				foreach (IField field in Options.EnclosingType.Fields) {
-					if (field.IsSynthetic)
+				foreach (IFieldSymbol field in Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ()) {
+					if (field.IsImplicitlyDeclared)
 						continue;
 					yield return field;
 				}
 
-				foreach (IProperty property in Options.EnclosingType.Properties) {
-					if (property.IsSynthetic)
+				foreach (IPropertySymbol property in Options.EnclosingType.GetMembers ().OfType<IPropertySymbol> ()) {
+					if (property.IsImplicitlyDeclared)
 						continue;
-					if (!property.CanSet)
+					if (property.SetMethod == null)
 						continue;
 					yield return property;
 				}
 			}
-			
-			static string CreateParameterName (IMember member)
+
+			static string CreateParameterName (ISymbol member)
 			{
 				if (char.IsUpper (member.Name[0]))
 					return char.ToLower (member.Name[0]) + member.Name.Substring (1);
 				return member.Name;
 			}
-			
+
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
-			{
+			{

 				bool gotConstructorOverrides = false;
-				foreach (IMethod m in includedMembers.OfType<IMethod> ().Where (m => m.SymbolKind == SymbolKind.Constructor)) {
+				foreach (IMethodSymbol m in includedMembers.OfType<IMethodSymbol> ().Where (m => m.MethodKind == MethodKind.Constructor)) {
 					gotConstructorOverrides = true;
-					var init = new ConstructorInitializer {
-						ConstructorInitializerType = ConstructorInitializerType.Base
-					};
-
-					var overridenConstructor = new ConstructorDeclaration {
-						Name = Options.EnclosingType.Name,
-						Modifiers = Modifiers.Public,
-						Body = new BlockStatement (),
-					};
-
-					if (m.Parameters.Count > 0)
-						overridenConstructor.Initializer = init;
-
+					var parameters = new List<ParameterSyntax> ();

+					var initArgs = new List<ArgumentSyntax> ();

+					var statements = new List<StatementSyntax> ();

 					foreach (var par in m.Parameters) {
-						overridenConstructor.Parameters.Add (new ParameterDeclaration (Options.CreateShortType (par.Type), par.Name));
-						init.Arguments.Add (new IdentifierExpression(par.Name)); 
+						parameters.Add (SyntaxFactory.Parameter (SyntaxFactory.Identifier (par.Name)).WithType (ConvertType (par.Type)));

+						initArgs.Add (SyntaxFactory.Argument (SyntaxFactory.ParseExpression (par.Name)));
 					}
-					foreach (var member in includedMembers.OfType<IMember> ()) {
-						if (member.SymbolKind == SymbolKind.Constructor)
+
+					foreach (ISymbol member in includedMembers) {
+						if (member.Kind == SymbolKind.Method)
 							continue;
-						overridenConstructor.Parameters.Add (new ParameterDeclaration (Options.CreateShortType (member.ReturnType), CreateParameterName (member)));
+						var paramName = CreateParameterName (member);
+						parameters.Add (SyntaxFactory.Parameter (SyntaxFactory.Identifier (paramName)).WithType (ConvertType (member.GetReturnType ())));
 
-						var memberReference = new MemberReferenceExpression (new ThisReferenceExpression (), member.Name);
-						var assign = new AssignmentExpression (memberReference, AssignmentOperatorType.Assign, new IdentifierExpression (CreateParameterName (member)));
-						overridenConstructor.Body.Statements.Add (new ExpressionStatement (assign));
+						statements.Add (

+							SyntaxFactory.ExpressionStatement (

+								SyntaxFactory.AssignmentExpression (

+									SyntaxKind.SimpleAssignmentExpression,

+									SyntaxFactory.MemberAccessExpression (

+										SyntaxKind.SimpleMemberAccessExpression,

+										SyntaxFactory.ThisExpression (),

+										SyntaxFactory.IdentifierName (member.Name)

+									),

+									SyntaxFactory.IdentifierName (paramName)

+								)

+							)

+						);
 					}
 
-					yield return overridenConstructor.ToString (Options.FormattingOptions);
+					var node = SyntaxFactory.ConstructorDeclaration (
+					SyntaxFactory.List<AttributeListSyntax> (),
+					SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.PublicKeyword)),
+					SyntaxFactory.Identifier (Options.EnclosingType.Name),
+					SyntaxFactory.ParameterList (SyntaxFactory.SeparatedList<ParameterSyntax> (parameters)),
+						initArgs.Count > 0 ? SyntaxFactory.ConstructorInitializer (SyntaxKind.BaseConstructorInitializer, SyntaxFactory.ArgumentList (SyntaxFactory.SeparatedList<ArgumentSyntax> (initArgs))) : null,
+					SyntaxFactory.Block (statements.ToArray ())
+				);

+					yield return Options.OutputNode (node).Result;
 				}
 				if (gotConstructorOverrides)
-					yield break;
-				var constructorDeclaration = new ConstructorDeclaration {
-					Name = Options.EnclosingType.Name,
-					Modifiers = Modifiers.Public,
-					Body = new BlockStatement ()
-				};
-
-				foreach (IMember member in includedMembers) {
-					constructorDeclaration.Parameters.Add (new ParameterDeclaration (Options.CreateShortType (member.ReturnType), CreateParameterName (member)));
-
-					var memberReference = new MemberReferenceExpression (new ThisReferenceExpression (), member.Name);
-					var assign = new AssignmentExpression (memberReference, AssignmentOperatorType.Assign, new IdentifierExpression (CreateParameterName (member)));
-					constructorDeclaration.Body.Statements.Add (new ExpressionStatement (assign));
+					yield break;

+

+				var parameters2 = new List<ParameterSyntax> ();

+				var statements2 = new List<StatementSyntax> ();
+				foreach (ISymbol member in includedMembers) {
+					var paramName = CreateParameterName (member);

+					parameters2.Add (SyntaxFactory.Parameter (SyntaxFactory.Identifier (paramName)).WithType (ConvertType (member.GetReturnType ())));

+

+					statements2.Add (

+						SyntaxFactory.ExpressionStatement (

+							SyntaxFactory.AssignmentExpression (

+								SyntaxKind.SimpleAssignmentExpression,

+								SyntaxFactory.MemberAccessExpression (

+									SyntaxKind.SimpleMemberAccessExpression,

+									SyntaxFactory.ThisExpression (),

+									SyntaxFactory.IdentifierName (member.Name)

+								),

+								SyntaxFactory.IdentifierName (paramName)

+							)

+						)

+					);

 				}
 				
-				yield return constructorDeclaration.ToString (Options.FormattingOptions);
+				var node2 = SyntaxFactory.ConstructorDeclaration (

+					SyntaxFactory.List<AttributeListSyntax> (),

+					SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.PublicKeyword)),

+					SyntaxFactory.Identifier (Options.EnclosingType.Name),

+					SyntaxFactory.ParameterList (SyntaxFactory.SeparatedList<ParameterSyntax> (parameters2)),

+					null,

+					SyntaxFactory.Block (statements2.ToArray ())

+				);

+				yield return Options.OutputNode (node2).Result;
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/EqualityMembersGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/EqualityMembersGenerator.cs
index 49d89a70e6..d5849c638b 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/EqualityMembersGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/EqualityMembersGenerator.cs
@@ -1,159 +1,160 @@
-// 
-// EqualityMembersGenerator.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace MonoDevelop.CodeGeneration
-{
-	class EqualityMembersGenerator : ICodeGenerator
-	{
-		public string Icon {
-			get {
-				return "md-newmethod";
-			}
-		}
-		
-		public string Text {
-			get {
-				return GettextCatalog.GetString ("Equality members");
-			}
-		}
-		
-		public string GenerateDescription {
-			get {
-				return GettextCatalog.GetString ("Select members to include in equality.");
-			}
-		}
-		
-		public bool IsValid (CodeGenerationOptions options)
-		{
-			return new CreateEquality (options).IsValid ();
-		}
-		
-		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
-		{
-			var createEventMethod = new CreateEquality (options);
-			createEventMethod.Initialize (treeView);
-			return createEventMethod;
-		}
-		
-		class CreateEquality : AbstractGenerateAction
-		{
-			public CreateEquality (CodeGenerationOptions options) : base (options)
-			{
-			}
-			
-			protected override IEnumerable<object> GetValidMembers ()
-			{
-				if (Options.EnclosingType == null || Options.EnclosingMember != null)
-					yield break;
-				foreach (IField field in Options.EnclosingType.Fields) {
-					if (field.IsSynthetic)
-						continue;
-					yield return field;
-				}
-
-				foreach (IProperty property in Options.EnclosingType.Properties) {
-					if (property.IsSynthetic)
-						continue;
-					if (property.CanGet)
-						yield return property;
-				}
-			}
-			
-			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
-			{
-				// Genereate Equals
-				var methodDeclaration = new MethodDeclaration ();
-				methodDeclaration.Name = "Equals";
-
-				methodDeclaration.ReturnType = new PrimitiveType ("bool");
-				methodDeclaration.Modifiers = Modifiers.Public | Modifiers.Override;
-				methodDeclaration.Body = new BlockStatement ();
-				methodDeclaration.Parameters.Add (new ParameterDeclaration (new PrimitiveType ("object"), "obj"));
-				var paramId = new IdentifierExpression ("obj");
-				var ifStatement = new IfElseStatement ();
-				ifStatement.Condition = new BinaryOperatorExpression (paramId, BinaryOperatorType.Equality, new PrimitiveExpression (null));
-				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (false));
-				methodDeclaration.Body.Statements.Add (ifStatement);
-
-				ifStatement = new IfElseStatement ();
-				var arguments = new List<Expression> ();
-				arguments.Add (new ThisReferenceExpression ());
-				arguments.Add (paramId.Clone ());
-				ifStatement.Condition = new InvocationExpression (new IdentifierExpression ("ReferenceEquals"), arguments);
-				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (true));
-				methodDeclaration.Body.Statements.Add (ifStatement);
-
-				ifStatement = new IfElseStatement ();
-				ifStatement.Condition = new BinaryOperatorExpression (new InvocationExpression (new MemberReferenceExpression (paramId.Clone (), "GetType")), BinaryOperatorType.InEquality, new TypeOfExpression (new SimpleType (Options.EnclosingType.Name)));
-				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (false));
-				methodDeclaration.Body.Statements.Add (ifStatement);
-
-				var varType = new SimpleType (Options.EnclosingType.Name);
-				var varDecl = new VariableDeclarationStatement (varType, "other", new CastExpression (varType.Clone (), paramId.Clone ()));
-				methodDeclaration.Body.Statements.Add (varDecl);
-				
-				var otherId = new IdentifierExpression ("other");
-				Expression binOp = null;
-				foreach (IMember member in includedMembers) {
-					Expression right = new BinaryOperatorExpression (new IdentifierExpression (member.Name), BinaryOperatorType.Equality, new MemberReferenceExpression (otherId.Clone (), member.Name));
-					binOp = binOp == null ? right : new BinaryOperatorExpression (binOp, BinaryOperatorType.ConditionalAnd, right);
-				}
-
-				methodDeclaration.Body.Statements.Add (new ReturnStatement (binOp));
-				yield return methodDeclaration.ToString (Options.FormattingOptions);
-
-				methodDeclaration = new MethodDeclaration ();
-				methodDeclaration.Name = "GetHashCode";
-
-				methodDeclaration.ReturnType = new PrimitiveType ("int");
-				methodDeclaration.Modifiers = Modifiers.Public | Modifiers.Override;
-				methodDeclaration.Body = new BlockStatement ();
-
-				binOp = null;
-				foreach (IMember member in includedMembers) {
-					Expression right;
-					right = new InvocationExpression (new MemberReferenceExpression (new IdentifierExpression (member.Name), "GetHashCode"));
-
-					IType type = member.ReturnType;
-					if (type != null && type.Kind != TypeKind.Struct && type.Kind != TypeKind.Enum)
-						right = new ParenthesizedExpression (new ConditionalExpression (new BinaryOperatorExpression (new IdentifierExpression (member.Name), BinaryOperatorType.InEquality, new PrimitiveExpression (null)), right, new PrimitiveExpression (0)));
-
-					binOp = binOp == null ? right : new BinaryOperatorExpression (binOp, BinaryOperatorType.ExclusiveOr, right);
-				}
-				var uncheckedBlock = new BlockStatement ();
-				uncheckedBlock.Statements.Add (new ReturnStatement (binOp));
-
-				methodDeclaration.Body.Statements.Add (new UncheckedStatement (uncheckedBlock));
-				yield return methodDeclaration.ToString (Options.FormattingOptions);
-			}
-		}
-	}
-}
+//// 
+//// EqualityMembersGenerator.cs
+////  
+//// Author:
+////       Mike Krüger <mkrueger@novell.com>
+//// 
+//// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+//// 
+//// Permission is hereby granted, free of charge, to any person obtaining a copy
+//// of this software and associated documentation files (the "Software"), to deal
+//// in the Software without restriction, including without limitation the rights
+//// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//// copies of the Software, and to permit persons to whom the Software is
+//// furnished to do so, subject to the following conditions:
+//// 
+//// The above copyright notice and this permission notice shall be included in
+//// all copies or substantial portions of the Software.
+//// 
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//// THE SOFTWARE.
+//
+//using System.Collections.Generic;
+//using MonoDevelop.Core;
+//using Microsoft.CodeAnalysis;
+//using ICSharpCode.NRefactory.CSharp;
+//using ICSharpCode.NRefactory6.CSharp;
+//
+//namespace MonoDevelop.CodeGeneration
+//{
+//	class EqualityMembersGenerator : ICodeGenerator
+//	{
+//		public string Icon {
+//			get {
+//				return "md-newmethod";
+//			}
+//		}
+//		
+//		public string Text {
+//			get {
+//				return GettextCatalog.GetString ("Equality members");
+//			}
+//		}
+//		
+//		public string GenerateDescription {
+//			get {
+//				return GettextCatalog.GetString ("Select members to include in equality.");
+//			}
+//		}
+//		
+//		public bool IsValid (CodeGenerationOptions options)
+//		{
+//			return new CreateEquality (options).IsValid ();
+//		}
+//		
+//		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
+//		{
+//			var createEventMethod = new CreateEquality (options);
+//			createEventMethod.Initialize (treeView);
+//			return createEventMethod;
+//		}
+//		
+//		class CreateEquality : AbstractGenerateAction
+//		{
+//			public CreateEquality (CodeGenerationOptions options) : base (options)
+//			{
+//			}
+//			
+//			protected override IEnumerable<object> GetValidMembers ()
+//			{
+//				if (Options.EnclosingType == null || Options.EnclosingMember != null)
+//					yield break;
+//				foreach (IFieldSymbol field in Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ()) {
+//					if (field.IsImplicitlyDeclared)
+//						continue;
+//					yield return field;
+//				}
+//
+//				foreach (IPropertySymbol property in Options.EnclosingType.GetMembers ().OfType<IPropertySymbol> ()) {
+//					if (property.IsImplicitlyDeclared)
+//						continue;
+//					if (property.GetMethod != null)
+//						yield return property;
+//				}
+//			}
+//			
+//			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
+//			{
+//				// Genereate Equals
+//				var methodDeclaration = new MethodDeclaration ();
+//				methodDeclaration.Name = "Equals";
+//
+//				methodDeclaration.ReturnType = new PrimitiveType ("bool");
+//				methodDeclaration.Modifiers = Modifiers.Public | Modifiers.Override;
+//				methodDeclaration.Body = new BlockStatement ();
+//				methodDeclaration.Parameters.Add (new ParameterDeclaration (new PrimitiveType ("object"), "obj"));
+//				var paramId = new IdentifierExpression ("obj");
+//				var ifStatement = new IfElseStatement ();
+//				ifStatement.Condition = new BinaryOperatorExpression (paramId, BinaryOperatorType.Equality, new PrimitiveExpression (null));
+//				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (false));
+//				methodDeclaration.Body.Statements.Add (ifStatement);
+//
+//				ifStatement = new IfElseStatement ();
+//				var arguments = new List<Expression> ();
+//				arguments.Add (new ThisReferenceExpression ());
+//				arguments.Add (paramId.Clone ());
+//				ifStatement.Condition = new InvocationExpression (new IdentifierExpression ("ReferenceEquals"), arguments);
+//				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (true));
+//				methodDeclaration.Body.Statements.Add (ifStatement);
+//
+//				ifStatement = new IfElseStatement ();
+//				ifStatement.Condition = new BinaryOperatorExpression (new InvocationExpression (new MemberReferenceExpression (paramId.Clone (), "GetType")), BinaryOperatorType.InEquality, new TypeOfExpression (new SimpleType (Options.EnclosingType.Name)));
+//				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (false));
+//				methodDeclaration.Body.Statements.Add (ifStatement);
+//
+//				var varType = new SimpleType (Options.EnclosingType.Name);
+//				var varDecl = new VariableDeclarationStatement (varType, "other", new CastExpression (varType.Clone (), paramId.Clone ()));
+//				methodDeclaration.Body.Statements.Add (varDecl);
+//				
+//				var otherId = new IdentifierExpression ("other");
+//				Expression binOp = null;
+//				foreach (ISymbol member in includedMembers) {
+//					Expression right = new BinaryOperatorExpression (new IdentifierExpression (member.Name), BinaryOperatorType.Equality, new MemberReferenceExpression (otherId.Clone (), member.Name));
+//					binOp = binOp == null ? right : new BinaryOperatorExpression (binOp, BinaryOperatorType.ConditionalAnd, right);
+//				}
+//
+//				methodDeclaration.Body.Statements.Add (new ReturnStatement (binOp));
+//				yield return methodDeclaration.ToString ();
+//
+//				methodDeclaration = new MethodDeclaration ();
+//				methodDeclaration.Name = "GetHashCode";
+//
+//				methodDeclaration.ReturnType = new PrimitiveType ("int");
+//				methodDeclaration.Modifiers = Modifiers.Public | Modifiers.Override;
+//				methodDeclaration.Body = new BlockStatement ();
+//
+//				binOp = null;
+//				foreach (ISymbol member in includedMembers) {
+//					Expression right;
+//					right = new InvocationExpression (new MemberReferenceExpression (new IdentifierExpression (member.Name), "GetHashCode"));
+//
+//					var type = member.GetReturnType ();
+//					if (type != null && type.TypeKind != TypeKind.Struct && type.TypeKind != TypeKind.Enum)
+//						right = new ParenthesizedExpression (new ConditionalExpression (new BinaryOperatorExpression (new IdentifierExpression (member.Name), BinaryOperatorType.InEquality, new PrimitiveExpression (null)), right, new PrimitiveExpression (0)));
+//
+//					binOp = binOp == null ? right : new BinaryOperatorExpression (binOp, BinaryOperatorType.ExclusiveOr, right);
+//				}
+//				var uncheckedBlock = new BlockStatement ();
+//				uncheckedBlock.Statements.Add (new ReturnStatement (binOp));
+//
+//				methodDeclaration.Body.Statements.Add (new UncheckedStatement (uncheckedBlock));
+//				yield return methodDeclaration.ToString ();
+//			}
+//		}
+//	}
+//}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ExportCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ExportCodeGenerator.cs
index 4eb780329e..cf89feae3b 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ExportCodeGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ExportCodeGenerator.cs
@@ -25,20 +25,19 @@
 // THE SOFTWARE.
 using Gtk;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
 using MonoDevelop.CodeGeneration;
 using MonoDevelop.CSharp.Completion;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Refactoring;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.CodeGeneration
 {
 	abstract class BaseExportCodeGenerator : ICodeGenerator
 	{
-		public abstract bool IsValidMember (IMember member);
+		public abstract bool IsValidMember (ISymbol member);
 
 		#region ICodeGenerator implementation
 
@@ -70,106 +69,90 @@ namespace MonoDevelop.CodeGeneration
 
 		#endregion
 
-		public static bool HasProtocolAttribute (IType type, out string name)
-		{
-			foreach (var attrs in type.GetDefinition ().GetAttributes ()) {
-				if (attrs.AttributeType.Name == "ProtocolAttribute" && MonoCSharpCompletionEngine.IsFoundationNamespace (attrs.AttributeType.Namespace)) {
-					foreach (var na in attrs.NamedArguments) {
-						if (na.Key.Name != "Name")
-							continue;
-						name = na.Value.ConstantValue as string;
-						if (name != null)
-							return true;
-					}
-				}
-			}
-			name = null;
-			return false;
-		}
-
-		public static Attribute GenerateExportAttribute (RefactoringContext ctx, IMember member)
-		{
-			if (member == null)
-				return null;
-
-			bool useMonoTouchNamespace = false;
-			var exportAttribute = member.GetAttribute (new FullTypeName (new TopLevelTypeName ("Foundation", "ExportAttribute")));
-			if (exportAttribute == null) {
-				useMonoTouchNamespace = true;
-				exportAttribute = member.GetAttribute (new FullTypeName (new TopLevelTypeName ("MonoTouch.Foundation", "ExportAttribute")));
-			}
-
-			if (exportAttribute == null || exportAttribute.PositionalArguments.Count == 0)
-				return null;
 
-			var astType = useMonoTouchNamespace
-				? CreateMonoTouchExportAttributeAst (ctx)
-				: CreateUnifiedExportAttributeAst (ctx);
-
-			var attr = new Attribute {
-				Type = astType,
-			};
-
-			attr.Arguments.Add (new PrimitiveExpression (exportAttribute.PositionalArguments [0].ConstantValue)); 
-			return attr;
-		}
-
-		static AstType CreateUnifiedExportAttributeAst (RefactoringContext ctx)
-		{
-			var astType = ctx.CreateShortType ("Foundation", "ExportAttribute");
-			if (astType is SimpleType) {
-				astType = new SimpleType ("Export");
-			} else {
-				astType = new MemberType (new SimpleType ("Foundation"), "Export");
-			}
-			return astType;
-		}
-
-		static AstType CreateMonoTouchExportAttributeAst (RefactoringContext ctx)
-		{
-			var astType = ctx.CreateShortType ("MonoTouch.Foundation", "ExportAttribute");
-			if (astType is SimpleType) {
-				astType = new SimpleType ("Export");
-			} else {
-				astType = new MemberType (new MemberType (new SimpleType ("MonoTouch"), "Foundation"), "Export");
-			}
-			return astType;
-		}
-
-		static IMember GetProtocolMember (RefactoringContext ctx, IType protocolType, IMember member)
-		{
-			foreach (var m in protocolType.GetMembers (m => m.SymbolKind == member.SymbolKind && m.Name == member.Name)) {
-				if (!SignatureComparer.Ordinal.Equals (m, member))
-					return null;
-				var prop = m as IProperty;
-				if (prop != null) {
-					if (prop.CanGet && GenerateExportAttribute (ctx, prop.Getter) != null ||
-						prop.CanSet && GenerateExportAttribute (ctx, prop.Setter) != null)
-						return m;
-				} else {
-					if (GenerateExportAttribute (ctx, m) != null)
-						return m;
-				}
-			}
-			return null;
-		}
-
-		static string GetProtocol (IMember member)
+//		public static Attribute GenerateExportAttribute (RefactoringContext ctx, IMember member)
+//		{
+//			if (member == null)
+//				return null;
+//
+//			bool useMonoTouchNamespace = false;
+//			var exportAttribute = member.GetAttribute (new FullTypeName (new TopLevelTypeName ("Foundation", "ExportAttribute")));
+//			if (exportAttribute == null) {
+//				useMonoTouchNamespace = true;
+//				exportAttribute = member.GetAttribute (new FullTypeName (new TopLevelTypeName ("MonoTouch.Foundation", "ExportAttribute")));
+//			}
+//
+//			if (exportAttribute == null || exportAttribute.PositionalArguments.Count == 0)
+//				return null;
+//
+//			var astType = useMonoTouchNamespace
+//				? CreateMonoTouchExportAttributeAst (ctx)
+//				: CreateUnifiedExportAttributeAst (ctx);
+//
+//			var attr = new Attribute {
+//				Type = astType,
+//			};
+//
+//			attr.Arguments.Add (new PrimitiveExpression (exportAttribute.PositionalArguments [0].ConstantValue)); 
+//			return attr;
+//		}
+//
+//		static AstType CreateUnifiedExportAttributeAst (RefactoringContext ctx)
+//		{
+//			var astType = ctx.CreateShortType ("Foundation", "ExportAttribute");
+//			if (astType is SimpleType) {
+//				astType = new SimpleType ("Export");
+//			} else {
+//				astType = new MemberType (new SimpleType ("Foundation"), "Export");
+//			}
+//			return astType;
+//		}
+//
+//		static AstType CreateMonoTouchExportAttributeAst (RefactoringContext ctx)
+//		{
+//			var astType = ctx.CreateShortType ("MonoTouch.Foundation", "ExportAttribute");
+//			if (astType is SimpleType) {
+//				astType = new SimpleType ("Export");
+//			} else {
+//				astType = new MemberType (new MemberType (new SimpleType ("MonoTouch"), "Foundation"), "Export");
+//			}
+//			return astType;
+//		}
+//
+//		static IMember GetProtocolMember (RefactoringContext ctx, IType protocolType, IMember member)
+//		{
+//			foreach (var m in protocolType.GetMembers (m => m.SymbolKind == member.SymbolKind && m.Name == member.Name)) {
+//				if (!SignatureComparer.Ordinal.Equals (m, member))
+//					return null;
+//				var prop = m as IProperty;
+//				if (prop != null) {
+//					if (prop.CanGet && GenerateExportAttribute (ctx, prop.Getter) != null ||
+//						prop.CanSet && GenerateExportAttribute (ctx, prop.Setter) != null)
+//						return m;
+//				} else {
+//					if (GenerateExportAttribute (ctx, m) != null)
+//						return m;
+//				}
+//			}
+//			return null;
+//		}
+//
+		static string GetProtocol (ISymbol member)
 		{
-			var attr = member.Attributes.FirstOrDefault (a => a.AttributeType.Name == "ExportAttribute" && MonoCSharpCompletionEngine.IsFoundationNamespace (a.AttributeType.Namespace));
-			if (attr == null || attr.PositionalArguments.Count == 0)
+			var attr = member.GetAttributes ().FirstOrDefault (a => a.AttributeClass.Name == "ExportAttribute" && ProtocolMemberContextHandler.IsFoundationNamespace (a.AttributeClass.ContainingNamespace));
+			if (attr == null || attr.ConstructorArguments.Length == 0)
 				return null;
-			return attr.PositionalArguments.First ().ConstantValue.ToString ();
+			return attr.ConstructorArguments.First ().Value.ToString ();
 		}
 
-		public static bool IsImplemented (IType type, IMember protocolMember)
+		public static bool IsImplemented (ITypeSymbol type, ISymbol protocolMember)
 		{
-			foreach (var m in type.GetMembers (m => m.SymbolKind == protocolMember.SymbolKind && m.Name == protocolMember.Name)) {
-				var p = m as IProperty;
+			foreach (var m in type.GetMembers().Where (m => m.Kind == protocolMember.Kind && m.Name == protocolMember.Name)) {
+				var p = m as IPropertySymbol;
 				if (p != null) {
-					if (p.CanGet && ((IProperty)protocolMember).CanGet && GetProtocol (p.Getter) == GetProtocol (((IProperty)protocolMember).Getter))
+					if (p.GetMethod != null && ((IPropertySymbol)protocolMember).GetMethod != null && GetProtocol (p.GetMethod) == GetProtocol (((IPropertySymbol)protocolMember).GetMethod))
 						return true;
-					if (p.CanSet && ((IProperty)protocolMember).CanSet && GetProtocol (p.Setter) == GetProtocol (((IProperty)protocolMember).Setter))
+					if (p.SetMethod != null && ((IPropertySymbol)protocolMember).SetMethod != null && GetProtocol (p.SetMethod) == GetProtocol (((IPropertySymbol)protocolMember).SetMethod))
 						return true;
 					continue;
 				}
@@ -194,32 +177,32 @@ namespace MonoDevelop.CodeGeneration
 				var type = Options.EnclosingType;
 				if (type == null || Options.EnclosingMember != null)
 					yield break;
-				foreach (var t in type.DirectBaseTypes) {
+				foreach (var t in type.GetBaseTypes ()) {
 					string name;
-					if (!HasProtocolAttribute (t, out name))
+					if (!ProtocolMemberContextHandler.HasProtocolAttribute (t, out name))
 						continue;
-					var protocolType = Options.Document.Compilation.FindType (new FullTypeName (new TopLevelTypeName (t.Namespace, name)));
+					var protocolType = Options.CurrentState.Compilation.GetTypeByMetadataName (t.ContainingNamespace.GetFullName () + "." + name);
 					if (protocolType == null)
 						break;
-					foreach (var member in protocolType.GetMethods (null, GetMemberOptions.IgnoreInheritedMembers)) {
-						if (member.ImplementedInterfaceMembers.Any ())
+					foreach (var member in protocolType.GetMembers().OfType<IMethodSymbol>()) {
+						if (member.ExplicitInterfaceImplementations.Length > 0)
 							continue;
 						if (!cg.IsValidMember (member))
 							continue;
 						if (IsImplemented (type, member))
 							continue;
-						if (member.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" && MonoCSharpCompletionEngine.IsFoundationNamespace (a.AttributeType.Namespace)))
+						if (member.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && ProtocolMemberContextHandler.IsFoundationNamespace (a.AttributeClass.ContainingNamespace)))
 							yield return member;
 					}
-					foreach (var member in protocolType.GetProperties (null, GetMemberOptions.IgnoreInheritedMembers)) {
-						if (member.ImplementedInterfaceMembers.Any ())
+					foreach (var member in protocolType.GetMembers().OfType<IPropertySymbol>()) {
+						if (member.ExplicitInterfaceImplementations.Length > 0)
 							continue;
 						if (!cg.IsValidMember (member))
 							continue;
 						if (IsImplemented (type, member))
 							continue;
-						if (member.CanGet && member.Getter.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" &&  MonoCSharpCompletionEngine.IsFoundationNamespace (a.AttributeType.Namespace)) ||
-							member.CanSet && member.Setter.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" &&  MonoCSharpCompletionEngine.IsFoundationNamespace (a.AttributeType.Namespace)))
+						if (member.GetMethod != null && member.GetMethod.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && ProtocolMemberContextHandler.IsFoundationNamespace (a.AttributeClass.ContainingNamespace)) ||
+							member.SetMethod != null && member.SetMethod.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && ProtocolMemberContextHandler.IsFoundationNamespace (a.AttributeClass.ContainingNamespace)))
 							yield return member;
 					}
 				}
@@ -227,63 +210,11 @@ namespace MonoDevelop.CodeGeneration
 
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				var generator = Options.CreateCodeGenerator ();
-				generator.AutoIndent = false;
-				var ctx = MDRefactoringContext.Create (Options.Document, Options.Document.Editor.Caret.Location).Result;
-				if (ctx == null)
-					yield break;
-				var builder = ctx.CreateTypeSystemAstBuilder ();
-
-				foreach (IMember member in includedMembers) {
-					yield return GenerateMemberCode (ctx, builder, member);
+				foreach (ISymbol member in includedMembers) {
+					yield return CSharpCodeGenerator.CreateProtocolMemberImplementation (Options.DocumentContext, Options.Editor, Options.EnclosingType, Options.EnclosingPart.GetLocation (), member, false).Code;
 				}
 			}
 		}
-	
-		internal static string GenerateMemberCode (MDRefactoringContext ctx, TypeSystemAstBuilder builder, IMember member)
-		{
-			var method = builder.ConvertEntity (member) as MethodDeclaration;
-			if (method != null) {
-				method.Body = new BlockStatement {
-					new ThrowStatement (new ObjectCreateExpression (ctx.CreateShortType ("System", "NotImplementedException")))
-				};
-				method.Modifiers &= ~Modifiers.Virtual;
-				method.Modifiers &= ~Modifiers.Abstract;
-				method.Attributes.Add (new AttributeSection {
-					Attributes =  {
-						GenerateExportAttribute (ctx, member)
-					}
-				});
-				return method.ToString (ctx.FormattingOptions);
-			}
-			var property = builder.ConvertEntity (member) as PropertyDeclaration;
-			if (property == null)
-				return null;
-			var p = (IProperty)member;
-			property.Modifiers &= ~Modifiers.Virtual;
-			property.Modifiers &= ~Modifiers.Abstract;
-			if (p.CanGet) {
-				property.Getter.Body = new BlockStatement {
-					new ThrowStatement (new ObjectCreateExpression (ctx.CreateShortType ("System", "NotImplementedException")))
-				};
-				property.Getter.Attributes.Add (new AttributeSection {
-					Attributes =  {
-						GenerateExportAttribute (ctx, p.Getter)
-					}
-				});
-			}
-			if (p.CanSet) {
-				property.Setter.Body = new BlockStatement {
-					new ThrowStatement (new ObjectCreateExpression (ctx.CreateShortType ("System", "NotImplementedException")))
-				};
-				property.Setter.Attributes.Add (new AttributeSection {
-					Attributes =  {
-						GenerateExportAttribute (ctx, p.Setter)
-					}
-				});
-			}
-			return property.ToString (ctx.FormattingOptions);
-		}
 	}
 
 	class OptionalProtocolMemberGenerator : BaseExportCodeGenerator
@@ -300,7 +231,7 @@ namespace MonoDevelop.CodeGeneration
 			}
 		}
 
-		public override bool IsValidMember (IMember member)
+		public override bool IsValidMember (ISymbol member)
 		{
 			return !member.IsAbstract;
 		}
@@ -320,11 +251,9 @@ namespace MonoDevelop.CodeGeneration
 			}
 		}
 
-		public override bool IsValidMember (IMember member)
+		public override bool IsValidMember (ISymbol member)
 		{
 			return member.IsAbstract;
 		}
 	}
-
-}
-
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs
index a96cc7cc11..c6a67ccadc 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs
@@ -31,7 +31,7 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Refactoring;
 using System.Collections.Generic;
 using MonoDevelop.Ide;
-using Mono.TextEditor.PopupWindow;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CodeGeneration
 {
@@ -174,9 +174,9 @@ namespace MonoDevelop.CodeGeneration
 			}
 		}
 		
-		public static void ShowIfValid (Document document, MonoDevelop.Ide.CodeCompletion.CodeCompletionContext completionContext)
+		public static void ShowIfValid (TextEditor editor, DocumentContext context, MonoDevelop.Ide.CodeCompletion.CodeCompletionContext completionContext)
 		{
-			var options = CodeGenerationOptions.CreateCodeGenerationOptions (document);
+			var options = CodeGenerationOptions.CreateCodeGenerationOptions (editor, context);
 			
 			var validGenerators = new List<ICodeGenerator> ();
 			foreach (var generator in CodeGenerationService.CodeGenerators) {
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ICodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ICodeGenerator.cs
index b70422665b..f0d64d40ba 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ICodeGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ICodeGenerator.cs
@@ -31,7 +31,7 @@ using Mono.Addins;
 
 namespace MonoDevelop.CodeGeneration
 {
-	public interface ICodeGenerator
+	internal interface ICodeGenerator
 	{
 		string Icon {
 			get;
@@ -50,14 +50,14 @@ namespace MonoDevelop.CodeGeneration
 		IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView);
 	}
 	
-	public interface IGenerateAction 
+	interface IGenerateAction 
 	{
 		void GenerateCode ();
 	}
 	
 	static class CodeGenerationService
 	{
-		static List<ICodeGenerator> codeGenerators = new List<ICodeGenerator>();
+		static readonly List<ICodeGenerator> codeGenerators = new List<ICodeGenerator>();
 		
 		static CodeGenerationService ()
 		{
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ImplementInterfaceMembersGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ImplementInterfaceMembersGenerator.cs
index 7646b4002f..caf0bbe4e9 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ImplementInterfaceMembersGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ImplementInterfaceMembersGenerator.cs
@@ -1,101 +1,100 @@
+////
+//// ImplementInterfaceMembersGenerator.cs
+////
+//// Author:
+////       Mike Krüger <mkrueger@xamarin.com>
+////
+//// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+////
+//// Permission is hereby granted, free of charge, to any person obtaining a copy
+//// of this software and associated documentation files (the "Software"), to deal
+//// in the Software without restriction, including without limitation the rights
+//// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//// copies of the Software, and to permit persons to whom the Software is
+//// furnished to do so, subject to the following conditions:
+////
+//// The above copyright notice and this permission notice shall be included in
+//// all copies or substantial portions of the Software.
+////
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//// THE SOFTWARE.
+//using Gtk;
+//using System.Collections.Generic;
+//using MonoDevelop.Core;
+//using MonoDevelop.Refactoring;
+//using ICSharpCode.NRefactory.CSharp;
+//using ICSharpCode.NRefactory.TypeSystem;
+//using MonoDevelop.Ide.TypeSystem;
+//using System;
 //
-// ImplementInterfaceMembersGenerator.cs
+//namespace MonoDevelop.CodeGeneration
+//{
+//	class ImplementInterfaceMembersGenerator : ICodeGenerator
+//	{
+//		public string Icon {
+//			get {
+//				return "md-method";
+//			}
+//		}
+//		
+//		public string Text {
+//			get {
+//				return GettextCatalog.GetString ("Implement interface members");
+//			}
+//		}
+//		
+//		public string GenerateDescription {
+//			get {
+//				return GettextCatalog.GetString ("Select members to be implemented.");
+//			}
+//		}
+//		
+//		public bool IsValid (CodeGenerationOptions options)
+//		{
+//			return new OverrideMethods (options).IsValid ();
+//		}
+//		
+//		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
+//		{
+//			OverrideMethods overrideMethods = new OverrideMethods (options);
+//			overrideMethods.Initialize (treeView);
+//			return overrideMethods;
+//		}
+//		
+//		class OverrideMethods : AbstractGenerateAction
+//		{
+//			public OverrideMethods (CodeGenerationOptions options) : base (options)
+//			{
+//			}
+//			
+//			protected override IEnumerable<object> GetValidMembers ()
+//			{
+//				var type = Options.EnclosingType;
+//				if (type == null || Options.EnclosingMember != null)
+//					yield break;
 //
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
+//				foreach (var baseType in Options.EnclosingType.Interfaces) {
+//					bool ifm;
+////					foreach (var t in ICSharpCode.NRefactory.CSharp.Refactoring.ImplementInterfaceAction.CollectMembersToImplement (type, baseType, false, out ifm)) {
+////						yield return t;
+////					}
+//				}
+//			}
+//			
+//			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
+//			{
+//				var generator = Options.CreateCodeGenerator ();
+//				generator.AutoIndent = false;
+//				foreach (Tuple<IMember, bool> member in includedMembers)
+//					yield return "";
+//					//					yield return generator.CreateMemberImplementation (Options.EnclosingType, Options.EnclosingPart, member.Item1, member.Item2).Code;
+//			}
+//		}
+//	}
+//}
 //
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using Gtk;
-using System.Collections.Generic;
-using MonoDevelop.Core;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using System;
-
-namespace MonoDevelop.CodeGeneration
-{
-	class ImplementInterfaceMembersGenerator : ICodeGenerator
-	{
-		public string Icon {
-			get {
-				return "md-method";
-			}
-		}
-		
-		public string Text {
-			get {
-				return GettextCatalog.GetString ("Implement interface members");
-			}
-		}
-		
-		public string GenerateDescription {
-			get {
-				return GettextCatalog.GetString ("Select members to be implemented.");
-			}
-		}
-		
-		public bool IsValid (CodeGenerationOptions options)
-		{
-			return new OverrideMethods (options).IsValid ();
-		}
-		
-		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
-		{
-			OverrideMethods overrideMethods = new OverrideMethods (options);
-			overrideMethods.Initialize (treeView);
-			return overrideMethods;
-		}
-		
-		class OverrideMethods : AbstractGenerateAction
-		{
-			public OverrideMethods (CodeGenerationOptions options) : base (options)
-			{
-			}
-			
-			protected override IEnumerable<object> GetValidMembers ()
-			{
-				var type = Options.EnclosingType;
-				if (type == null || Options.EnclosingMember != null)
-					yield break;
-
-				foreach (var baseType in Options.EnclosingType.DirectBaseTypes) {
-					if (baseType.Kind != TypeKind.Interface)
-						continue;
-					bool ifm;
-					foreach (var t in ICSharpCode.NRefactory.CSharp.Refactoring.ImplementInterfaceAction.CollectMembersToImplement (type, baseType, false, out ifm)) {
-						yield return t;
-					}
-				}
-			}
-			
-			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
-			{
-				var generator = Options.CreateCodeGenerator ();
-				generator.AutoIndent = false;
-				foreach (Tuple<IMember, bool> member in includedMembers) 
-					yield return generator.CreateMemberImplementation (Options.EnclosingType, Options.EnclosingPart, member.Item1, member.Item2).Code;
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/OverrideMembersGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/OverrideMembersGenerator.cs
index 57b241976a..1999cf900f 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/OverrideMembersGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/OverrideMembersGenerator.cs
@@ -28,9 +28,12 @@ using Gtk;
 using System.Collections.Generic;
 using MonoDevelop.Core;
 using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Refactoring;
 
 namespace MonoDevelop.CodeGeneration
 {
@@ -41,62 +44,105 @@ namespace MonoDevelop.CodeGeneration
 				return "md-method";
 			}
 		}
-		
+
 		public string Text {
 			get {
 				return GettextCatalog.GetString ("Override members");
 			}
 		}
-		
+
 		public string GenerateDescription {
 			get {
 				return GettextCatalog.GetString ("Select members to be overridden.");
 			}
 		}
-		
+
 		public bool IsValid (CodeGenerationOptions options)
 		{
 			return new OverrideMethods (options).IsValid ();
 		}
-		
+
 		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
 		{
 			OverrideMethods overrideMethods = new OverrideMethods (options);
 			overrideMethods.Initialize (treeView);
 			return overrideMethods;
 		}
-		
+
 		class OverrideMethods : AbstractGenerateAction
 		{
 			public OverrideMethods (CodeGenerationOptions options) : base (options)
 			{
 			}
-			
+
 			protected override IEnumerable<object> GetValidMembers ()
 			{
-				var type = Options.EnclosingType;
-				if (type == null || Options.EnclosingMember != null)
-					yield break;
-				HashSet<string> memberName = new HashSet<string> ();
-				foreach (var member in Options.EnclosingType.GetMembers ()) {
-					if (member.IsSynthetic)
-						continue;
-					if (member.IsOverridable) {
-						string id = AmbienceService.DefaultAmbience.GetString (member, OutputFlags.ClassBrowserEntries);
-						if (memberName.Contains (id))
-							continue;
-						memberName.Add (id);
-						yield return member;
+				var encType = Options.EnclosingType as INamedTypeSymbol;
+				if (encType == null || Options.EnclosingMember != null)
+					return Enumerable.Empty<object> ();
+
+
+				var result = new HashSet<ISymbol> ();
+				var cancellationToken = default(CancellationToken);
+				var baseTypes = encType.GetBaseTypes ().Reverse ();
+				foreach (var type in baseTypes) {
+					RemoveOverriddenMembers (result, type, cancellationToken);
+
+					AddOverridableMembers (result, encType, type, cancellationToken);
+				}
+				RemoveOverriddenMembers (result, encType, cancellationToken);
+				return result;
+			}
+
+			static void AddOverridableMembers (HashSet<ISymbol> result, INamedTypeSymbol containingType, INamedTypeSymbol type, CancellationToken cancellationToken)
+			{
+				foreach (var member in type.GetMembers()) {
+					if (IsOverridable (member, containingType)) {
+						result.Add (member);
+					}
+				}
+			}
+
+			protected static void RemoveOverriddenMembers (HashSet<ISymbol> result, INamedTypeSymbol containingType, CancellationToken cancellationToken)
+			{
+				foreach (var member in containingType.GetMembers()) {
+					var overriddenMember = member.OverriddenMember ();
+					if (overriddenMember != null) {
+						result.Remove (overriddenMember);
 					}
 				}
 			}
-			
+
+			public static bool IsOverridable (ISymbol member, INamedTypeSymbol containingType)
+			{
+				if (member.IsAbstract || member.IsVirtual || member.IsOverride) {
+					if (member.IsSealed) {
+						return false;
+					}
+
+					if (!member.IsAccessibleWithin (containingType)) {
+						return false;
+					}
+
+					switch (member.Kind) {
+					case SymbolKind.Event:
+						return true;
+					case SymbolKind.Method:
+						return ((IMethodSymbol)member).MethodKind == MethodKind.Ordinary;
+					case SymbolKind.Property:
+						return !((IPropertySymbol)member).IsWithEvents;
+					}
+				}
+				return false;
+			}
+
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				var generator = Options.CreateCodeGenerator ();
-				generator.AutoIndent = false;
-				foreach (IMember member in includedMembers) 
-					yield return generator.CreateMemberImplementation (Options.EnclosingType, Options.EnclosingPart, member, false).Code;
+				var currentType = Options.EnclosingType as INamedTypeSymbol;
+
+				foreach (ISymbol member in includedMembers) {
+					yield return CSharpCodeGenerator.CreateOverridenMemberImplementation (Options.DocumentContext, Options.Editor, currentType, currentType.Locations.First (), member, false).Code;
+				}
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PartialGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PartialGenerator.cs
index fbde16fec2..03da34a8f6 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PartialGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PartialGenerator.cs
@@ -23,12 +23,14 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System;
+
+using System.Linq;
 using System.Collections.Generic;
 using Gtk;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Core;
-using MonoDevelop.Ide.TypeSystem;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharp.Refactoring;
 
 namespace MonoDevelop.CodeGeneration
 {
@@ -76,21 +78,37 @@ namespace MonoDevelop.CodeGeneration
 				if (type == null || Options.EnclosingMember != null)
 					yield break;
 
-				foreach (var method in Options.EnclosingType.Methods) {
-					if (method.IsPartial && method.BodyRegion.IsEmpty) {
+				foreach (var method in Options.EnclosingType.GetMembers ().OfType<Microsoft.CodeAnalysis.IMethodSymbol> ()) {
+					if (method.MethodKind != Microsoft.CodeAnalysis.MethodKind.Ordinary)
+						continue;
+					if (IsEmptyPartialMethod(method)) {
 						yield return method;
 					}
 				}	
 			}
 
+			static bool IsEmptyPartialMethod(Microsoft.CodeAnalysis.ISymbol member, CancellationToken cancellationToken = default(CancellationToken))
+			{
+				var method = member as Microsoft.CodeAnalysis.IMethodSymbol;
+				if (method == null || method.IsDefinedInMetadata ())
+					return false;
+				foreach (var r in method.DeclaringSyntaxReferences) {
+					var node = r.GetSyntax (cancellationToken) as Microsoft.CodeAnalysis.CSharp.Syntax.MethodDeclarationSyntax;
+					if (node == null)
+						continue;
+					if (node.Body != null || !node.Modifiers.Any(m => m.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.PartialKeyword)))
+						return false;
+				}
+
+				return true;
+			}
+
+
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				var generator = Options.CreateCodeGenerator ();
-				generator.AutoIndent = false;
-				foreach (IMethod member in includedMembers) 
-					yield return generator.CreateMemberImplementation (Options.EnclosingType, Options.EnclosingPart, member, false).Code;
+				foreach (Microsoft.CodeAnalysis.IMethodSymbol member in includedMembers)
+					yield return CSharpCodeGenerator.CreatePartialMemberImplementation (Options.DocumentContext, Options.Editor, Options.EnclosingType, Options.EnclosingPart.GetLocation (), member, false).Code;
 			}
 		}
 	}
 }
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PropertyGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PropertyGenerator.cs
index b8829e58e7..c658adc37b 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PropertyGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PropertyGenerator.cs
@@ -25,16 +25,15 @@
 // THE SOFTWARE.
 
 using System;
-
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using Gtk;
+using System.Linq;
 using System.Collections.Generic;
-using MonoDevelop.Refactoring;
 using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Simplification;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.CodeGeneration
 {
@@ -86,19 +85,19 @@ namespace MonoDevelop.CodeGeneration
 			{
 				if (Options.EnclosingType == null || Options.EnclosingMember != null)
 					yield break;
-				foreach (IField field in Options.EnclosingType.Fields) {
-					if (field.IsSynthetic)
+				foreach (var field in Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ()) {
+					if (field.IsImplicitlyDeclared)
 						continue;
-					var list = Options.EnclosingType.Fields.Where (f => f.Name == CreatePropertyName (field));;
+					var list = Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ().Where (f => f.Name == CreatePropertyName (field));
 					if (!list.Any ())
 						yield return field;
 				}
 			}
 			
-			static string CreatePropertyName (IMember member)
+			static string CreatePropertyName (ISymbol member)
 			{
 				int i = 0;
-				while (i + 1 < member.Name.Length && member.Name[i] == '_')
+				while (i + 1 < member.Name.Length && member.Name [i] == '_')
 					i++;
 				if (i + 1 >= member.Name.Length)
 					return char.ToUpper (member.Name [i]).ToString ();
@@ -107,10 +106,49 @@ namespace MonoDevelop.CodeGeneration
 			
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				var generator = Options.CreateCodeGenerator ();
-				generator.AutoIndent = false;
-				foreach (IField field in includedMembers)
-					yield return generator.CreateFieldEncapsulation (Options.EnclosingPart, field, CreatePropertyName (field), Accessibility.Public, ReadOnly);
+				foreach (IFieldSymbol field in includedMembers) {
+					var node = SyntaxFactory.PropertyDeclaration (
+						CreateConstructorGenerator.ConvertType (field.Type),
+						CreatePropertyName (field)
+					);
+
+					node = node.AddAccessorListAccessors (
+						SyntaxFactory.AccessorDeclaration (
+							SyntaxKind.GetAccessorDeclaration, 
+							SyntaxFactory.Block (
+								SyntaxFactory.ReturnStatement (
+									SyntaxFactory.MemberAccessExpression (
+										SyntaxKind.SimpleMemberAccessExpression,
+										SyntaxFactory.ThisExpression (),
+										SyntaxFactory.IdentifierName (field.Name)
+									)
+								)
+							)
+						)
+					);
+					if (!ReadOnly) {
+						node = node.AddAccessorListAccessors (
+							SyntaxFactory.AccessorDeclaration (
+								SyntaxKind.SetAccessorDeclaration, 
+								SyntaxFactory.Block (
+									SyntaxFactory.ExpressionStatement (
+										SyntaxFactory.AssignmentExpression (
+											SyntaxKind.SimpleAssignmentExpression,
+											SyntaxFactory.MemberAccessExpression (
+												SyntaxKind.SimpleMemberAccessExpression,
+												SyntaxFactory.ThisExpression (),
+												SyntaxFactory.IdentifierName (field.Name)
+											),
+											SyntaxFactory.IdentifierName ("value")
+										)
+									)
+								)
+							)
+						);
+					}
+					yield return Options.OutputNode (node).Result;
+				}
+
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/RaiseEventMethodGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/RaiseEventMethodGenerator.cs
index 76b0f7bd57..56db58f020 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/RaiseEventMethodGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/RaiseEventMethodGenerator.cs
@@ -25,15 +25,17 @@
 // THE SOFTWARE.
 using System;
 
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using Gtk;
 using System.Collections.Generic;
 using MonoDevelop.Refactoring;
 using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace MonoDevelop.CodeGeneration
 {
@@ -77,7 +79,7 @@ namespace MonoDevelop.CodeGeneration
 			{
 			}
 
-			static string GetEventMethodName (IMember member)
+			static string GetEventMethodName (ISymbol member)
 			{
 				return "On" + member.Name;
 			}
@@ -86,13 +88,13 @@ namespace MonoDevelop.CodeGeneration
 			{
 				if (Options.EnclosingType == null || Options.EnclosingMember != null)
 					yield break;
-				foreach (var e in Options.EnclosingType.Events) {
-					if (e.IsSynthetic)
+				foreach (IEventSymbol e in Options.EnclosingType.GetMembers ().OfType<IEventSymbol> ()) {
+					if (e.IsImplicitlyDeclared)
 						continue;
-					var invokeMethod = e.ReturnType.GetDelegateInvokeMethod ();
+					var invokeMethod = e.GetReturnType ().GetDelegateInvokeMethod ();
 					if (invokeMethod == null)
 						continue;
-					if (Options.EnclosingType.GetMethods (m => m.Name == GetEventMethodName (e)).Any ())
+					if (Options.EnclosingType.GetMembers ().OfType<IMethodSymbol> ().Any (m => m.Name == GetEventMethodName (e)))
 						continue;
 					yield return e;
 				}
@@ -100,40 +102,89 @@ namespace MonoDevelop.CodeGeneration
 
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				foreach (IMember member in includedMembers) {
-					var invokeMethod = member.ReturnType.GetDelegateInvokeMethod ();
+				foreach (IEventSymbol member in includedMembers) {
+					var invokeMethod = member.GetReturnType ().GetDelegateInvokeMethod ();
 					if (invokeMethod == null)
 						continue;
 
-					var methodDeclaration = new MethodDeclaration () {
-						Name = GetEventMethodName (member),
-						ReturnType = new PrimitiveType ("void"),
-						Modifiers = Modifiers.Protected | Modifiers.Virtual,
-						Parameters = {
-							new ParameterDeclaration (Options.CreateShortType (invokeMethod.Parameters [1].Type), invokeMethod.Parameters [1].Name)
-						},
-						Body = new BlockStatement () {
-							new VariableDeclarationStatement (
-								new SimpleType ("var"),//Options.CreateShortType (member.ReturnType), 
-								handlerName, 
-								new MemberReferenceExpression (new ThisReferenceExpression (), member.Name)
-							),
-							new IfElseStatement () {
-								Condition = new BinaryOperatorExpression (new IdentifierExpression (handlerName), BinaryOperatorType.InEquality, new PrimitiveExpression (null)),
-								TrueStatement = new ExpressionStatement (new InvocationExpression (new IdentifierExpression (handlerName)) {
-									Arguments = {
-										new ThisReferenceExpression (),
-										new IdentifierExpression (invokeMethod.Parameters [1].Name)
-									}
-								})
-							}
-						}
-					};
+					var node = SyntaxFactory.MethodDeclaration (
+						SyntaxFactory.PredefinedType (SyntaxFactory.Token (SyntaxKind.VoidKeyword)),
+						SyntaxFactory.Identifier (GetEventMethodName (member))
+					);
+
+					node = node.WithModifiers (SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.ProtectedKeyword), SyntaxFactory.Token (SyntaxKind.VirtualKeyword)));
+					node = node.WithParameterList (SyntaxFactory.ParameterList (SyntaxFactory.SeparatedList<ParameterSyntax> (new [] {
+						SyntaxFactory.Parameter (SyntaxFactory.Identifier (invokeMethod.Parameters [1].Name)).WithType (SyntaxFactory.ParseTypeName (Options.CreateShortType (invokeMethod.Parameters [1].Type)))
+					})));
 
-					yield return methodDeclaration.ToString (Options.FormattingOptions);
+					bool csharp6Style = true;
+					;
+					if (csharp6Style) {
+						var expressionSyntax = SyntaxFactory.ParseExpression ("foo?.bar") as ConditionalAccessExpressionSyntax;
+						Console.WriteLine (expressionSyntax.OperatorToken.Kind ());
+						Console.WriteLine (expressionSyntax.Expression.GetType ());
+						Console.WriteLine (expressionSyntax.WhenNotNull.GetType ());
+						node = node.WithBody (SyntaxFactory.Block (
+							SyntaxFactory.ExpressionStatement (
+								SyntaxFactory.InvocationExpression (
+									SyntaxFactory.ConditionalAccessExpression (
+										SyntaxFactory.MemberAccessExpression (
+											SyntaxKind.SimpleMemberAccessExpression,
+											SyntaxFactory.ThisExpression (),
+											SyntaxFactory.IdentifierName (member.Name)
+										),
+										SyntaxFactory.MemberBindingExpression (SyntaxFactory.IdentifierName ("Invoke"))
+									),
+									SyntaxFactory.ArgumentList (
+										SyntaxFactory.SeparatedList<ArgumentSyntax> (new [] {
+											SyntaxFactory.Argument (SyntaxFactory.ThisExpression ()),
+											SyntaxFactory.Argument (SyntaxFactory.IdentifierName (invokeMethod.Parameters [1].Name))
+										})
+									)
+								)
+							)
+						));
+					} else {
+						node = node.WithBody (SyntaxFactory.Block (
+							SyntaxFactory.LocalDeclarationStatement (
+								SyntaxFactory.VariableDeclaration (
+									SyntaxFactory.ParseTypeName ("var"),
+									SyntaxFactory.SeparatedList<VariableDeclaratorSyntax> (new [] {
+										SyntaxFactory.VariableDeclarator (SyntaxFactory.Identifier (handlerName)).WithInitializer (
+											SyntaxFactory.EqualsValueClause (
+												SyntaxFactory.MemberAccessExpression (
+													SyntaxKind.SimpleMemberAccessExpression,
+													SyntaxFactory.ThisExpression (),
+													SyntaxFactory.IdentifierName (member.Name)
+												)
+											)
+										)
+									})
+								)
+							),
+							SyntaxFactory.IfStatement (
+								SyntaxFactory.BinaryExpression (
+									SyntaxKind.NotEqualsExpression,
+									SyntaxFactory.IdentifierName (handlerName),
+									SyntaxFactory.ParseExpression ("null")
+								),
+								SyntaxFactory.ExpressionStatement (
+									SyntaxFactory.InvocationExpression (
+										SyntaxFactory.IdentifierName (handlerName), 
+										SyntaxFactory.ArgumentList (
+											SyntaxFactory.SeparatedList<ArgumentSyntax> (new [] {
+												SyntaxFactory.Argument (SyntaxFactory.ThisExpression ()),
+												SyntaxFactory.Argument (SyntaxFactory.IdentifierName (invokeMethod.Parameters [1].Name))
+											})
+										)
+									)
+								)
+							)
+						));
+					}
+					yield return Options.OutputNode (node).Result;
 				}
 			}
 		}
 	}
-}
-
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ReadonlyPropertyGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ReadonlyPropertyGenerator.cs
index 928ddb1fab..d6b71bcc5f 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ReadonlyPropertyGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ReadonlyPropertyGenerator.cs
@@ -25,14 +25,12 @@
 // THE SOFTWARE.
 using System;
 
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using Gtk;
 using System.Collections.Generic;
 using MonoDevelop.Refactoring;
 using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
 
 namespace MonoDevelop.CodeGeneration
@@ -70,4 +68,4 @@ namespace MonoDevelop.CodeGeneration
 			return createProperty;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ToStringGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ToStringGenerator.cs
index 9d7913d8ae..516a34c15c 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ToStringGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ToStringGenerator.cs
@@ -7,7 +7,7 @@
 // Copyright (c) 2009 Novell, Inc (http://www.novell.com)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
+// of this software and associated documentation files (the "Software" ), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
@@ -25,75 +25,79 @@
 // THE SOFTWARE.
 
 using System;
-using MonoDevelop.Components;
-using Gtk;
-using MonoDevelop.Ide.Gui;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
 using System.Text;
 using MonoDevelop.Core;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Simplification;
 
 namespace MonoDevelop.CodeGeneration
 {
 	class ToStringGenerator : ICodeGenerator
 	{
-		public string Icon {
-			get {
+		public string Icon
+		{
+			get
+			{
 				return "md-newmethod";
 			}
 		}
-		
-		public string Text {
-			get {
+
+		public string Text
+		{
+			get
+			{
 				return GettextCatalog.GetString ("ToString() implementation");
 			}
 		}
-		
-		public string GenerateDescription {
-			get {
+
+		public string GenerateDescription
+		{
+			get
+			{
 				return GettextCatalog.GetString ("Select members to be outputted.");
 			}
 		}
-		
+
 		public bool IsValid (CodeGenerationOptions options)
 		{
 			return new CreateToString (options).IsValid ();
 		}
-		
+
 		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
 		{
 			CreateToString createToString = new CreateToString (options);
 			createToString.Initialize (treeView);
 			return createToString;
 		}
-		
+
 		class CreateToString : AbstractGenerateAction
 		{
 			public CreateToString (CodeGenerationOptions options) : base (options)
 			{
 			}
-			
+
 			protected override IEnumerable<object> GetValidMembers ()
 			{
 				if (Options.EnclosingType == null || Options.EnclosingMember != null)
 					yield break;
-				foreach (IField field in Options.EnclosingType.Fields) {
-					if (field.IsSynthetic)
+
+				foreach (var field in Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ()) {
+					if (field.IsImplicitlyDeclared)
 						continue;
 					yield return field;
 				}
 
-				foreach (IProperty property in Options.EnclosingType.Properties) {
-					if (property.IsSynthetic)
+				foreach (var property in Options.EnclosingType.GetMembers ().OfType<IPropertySymbol> ()) {
+					if (property.IsImplicitlyDeclared)
 						continue;
-					if (property.CanGet)
+					if (property.GetMethod != null)
 						yield return property;
 				}
 			}
-			
+
 			string GetFormatString (IEnumerable<object> includedMembers)
 			{
 				var format = new StringBuilder ();
@@ -101,7 +105,7 @@ namespace MonoDevelop.CodeGeneration
 				format.Append (Options.EnclosingType.Name);
 				format.Append (": ");
 				int i = 0;
-				foreach (IEntity member in includedMembers) {
+				foreach (ISymbol member in includedMembers) {
 					if (i > 0)
 						format.Append (", ");
 					format.Append (member.Name);
@@ -112,22 +116,37 @@ namespace MonoDevelop.CodeGeneration
 				format.Append ("]");
 				return format.ToString ();
 			}
-			
+
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				yield return new MethodDeclaration () {
-					Name = "ToString",
-					ReturnType = new PrimitiveType ("string"),
-					Modifiers = Modifiers.Public | Modifiers.Override,
-					Body = new BlockStatement () {
-						new ReturnStatement (
-							new InvocationExpression (
-								new MemberReferenceExpression (new TypeReferenceExpression (new PrimitiveType ("string")), "Format"), 
-								new Expression [] { new PrimitiveExpression (GetFormatString (includedMembers)) }.Concat (includedMembers.Select (member => new IdentifierExpression (((IEntity)member).Name)))
+				List<ArgumentSyntax> arguments = new List<ArgumentSyntax> ();
+				arguments.Add (SyntaxFactory.Argument (SyntaxFactory.LiteralExpression (SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal (GetFormatString (includedMembers)))));
+				foreach (ISymbol member in includedMembers) {
+					arguments.Add (SyntaxFactory.Argument (SyntaxFactory.IdentifierName (member.Name)));
+				}
+				var node = SyntaxFactory.MethodDeclaration (
+					SyntaxFactory.List<AttributeListSyntax>(),
+					SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.PublicKeyword), SyntaxFactory.Token (SyntaxKind.OverrideKeyword)),
+					SyntaxFactory.ParseTypeName ("string"),
+					null,
+					SyntaxFactory.Identifier ("ToString"),
+					null,
+					SyntaxFactory.ParameterList (),
+					SyntaxFactory.List<TypeParameterConstraintClauseSyntax>(),
+					SyntaxFactory.Block (
+						SyntaxFactory.ReturnStatement (
+							SyntaxFactory.InvocationExpression (
+								SyntaxFactory.MemberAccessExpression (
+									SyntaxKind.SimpleMemberAccessExpression,
+									SyntaxFactory.ParseExpression ("string"),
+									SyntaxFactory.IdentifierName ("Format")
+								),
+								SyntaxFactory.ArgumentList (SyntaxFactory.SeparatedList<ArgumentSyntax> (arguments))
 							)
 						)
-					} 
-				}.ToString (Options.FormattingOptions);
+					),
+					null);
+				yield return Options.OutputNode (node).Result;
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/WriteLineGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/WriteLineGenerator.cs
index 3a47fe1d5e..f150e59a13 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/WriteLineGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/WriteLineGenerator.cs
@@ -25,15 +25,13 @@
 // THE SOFTWARE.
 
 using System;
-using MonoDevelop.Components;
-using Gtk;
-using MonoDevelop.Ide.Gui;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
 using System.Text;
 using MonoDevelop.Core;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Simplification;
 
 namespace MonoDevelop.CodeGeneration
 {
@@ -77,52 +75,56 @@ namespace MonoDevelop.CodeGeneration
 			
 			protected override IEnumerable<object> GetValidMembers ()
 			{
-				if (Options == null || Options.EnclosingType == null || Options.EnclosingMember == null || Options.Document == null)
+				if (Options == null || Options.EnclosingType == null)
 					yield break;
-				var editor = Options.Document.Editor;
+				if (Options.EnclosingMember == null)
+					yield break;
+				if (Options.DocumentContext == null)
+					yield break;
+				var editor = Options.Editor;
 				if (editor == null)
 					yield break;
 				
-				
 				// add local variables
 				var state = Options.CurrentState;
 				if (state != null) {
-					foreach (var v in state.LocalVariables) 
+					foreach (var v in state.LookupSymbols (editor.CaretOffset).OfType<ILocalSymbol> ())
 						yield return v;
 				}
-				
+
 				// add parameters
-				if (Options.EnclosingMember is IParameterizedMember) {
-					foreach (IParameter param in ((IParameterizedMember)Options.EnclosingMember).Parameters)
+				if (Options.EnclosingMember is IMethodSymbol) {
+					foreach (var param in ((IMethodSymbol)Options.EnclosingMember).Parameters)
 						yield return param;
 				}
-				
+				if (Options.EnclosingMember is IPropertySymbol) {
+					foreach (var param in ((IPropertySymbol)Options.EnclosingMember).Parameters)
+						yield return param;
+				}
+
 				// add type members
-				foreach (IField field in Options.EnclosingType.Fields) {
-					if (field.IsSynthetic)
+				foreach (IFieldSymbol field in Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ()) {
+					if (field.IsImplicitlyDeclared)
 						continue;
 					yield return field;
 				}
 
-				foreach (IProperty property in Options.EnclosingType.Properties) {
-					if (property.IsSynthetic)
+				foreach (IPropertySymbol property in Options.EnclosingType.GetMembers ().OfType<IPropertySymbol> ()) {
+					if (property.IsImplicitlyDeclared)
 						continue;
-					if (property.CanGet)
+					if (property.GetMethod != null)
 						yield return property;
 				}
 			}
 			
 			static string GetName (object m)
 			{
-				var e = m as IEntity;
-				if (e != null)
-					return e.Name;
-				return ((IVariable)m).Name;
+				return ((ISymbol)m).Name;
 			}
 			
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				StringBuilder format = new StringBuilder ();
+				var format = new StringBuilder ();
 				int i = 0;
 				foreach (var member in includedMembers) {
 					if (i > 0)
@@ -132,14 +134,26 @@ namespace MonoDevelop.CodeGeneration
 					format.Append (i++);
 					format.Append ("}");
 				}
-				
-				var consoleType = typeof (Console).ToTypeReference ().Resolve (Options.Document.Compilation.TypeResolveContext);
-				var invocationExpression = new InvocationExpression (new MemberReferenceExpression (new TypeReferenceExpression (Options.CreateShortType (consoleType)), "WriteLine"));
-				invocationExpression.Arguments.Add (new PrimitiveExpression (format.ToString ()));
-				foreach (var member in includedMembers) {
-					invocationExpression.Arguments.Add (new IdentifierExpression (GetName (member)));
-				}
-				yield return new ExpressionStatement (invocationExpression).ToString (Options.FormattingOptions);
+
+				var arguments = new List<ArgumentSyntax> ();
+				arguments.Add (SyntaxFactory.Argument (SyntaxFactory.LiteralExpression (SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal (format.ToString ()))));
+				var node = 
+					SyntaxFactory.ExpressionStatement (
+						SyntaxFactory.InvocationExpression (
+							SyntaxFactory.MemberAccessExpression (SyntaxKind.SimpleMemberAccessExpression,
+								SyntaxFactory.MemberAccessExpression (SyntaxKind.SimpleMemberAccessExpression, 
+									SyntaxFactory.IdentifierName ("System"), 
+									SyntaxFactory.IdentifierName ("Console")
+								),
+								SyntaxFactory.IdentifierName ("WriteLine")
+							),
+							SyntaxFactory.ArgumentList (
+								SyntaxFactory.SeparatedList<ArgumentSyntax> (arguments)
+							)
+						)
+					);
+
+				yield return Options.OutputNode (node).Result;
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/ConvertToEnumAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ConvertToEnum/ConvertToEnumCodeRefactoringProvider.cs
index 30a5296645..7338da42f4 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/ConvertToEnumAction.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ConvertToEnum/ConvertToEnumCodeRefactoringProvider.cs
@@ -35,6 +35,7 @@ using ICSharpCode.NRefactory.CSharp;
 using ICSharpCode.NRefactory.CSharp.Refactoring;
 using ICSharpCode.Decompiler.ILAst;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharp.Refactoring.CodeActions
 {
@@ -43,14 +44,14 @@ namespace MonoDevelop.CSharp.Refactoring.CodeActions
 	/// </summary>
 	class ConvertToEnumAction : MonoDevelop.CodeActions.CodeActionProvider
 	{
-		public override IEnumerable<MonoDevelop.CodeActions.CodeAction> GetActions(MonoDevelop.Ide.Gui.Document document, object refactoringContext, TextLocation loc, CancellationToken cancellationToken)
+		public override IEnumerable<MonoDevelop.CodeActions.CodeAction> GetActions (TextEditor editor, DocumentContext doc, object refactoringContext, MonoDevelop.Ide.Editor.DocumentLocation loc, CancellationToken cancellationToken)
 		{
-			var context = refactoringContext as MDRefactoringContext;
+			var mdCtx = refactoringContext as MDRefactoringContext;
 
-			if (context == null || context.IsInvalid)
+			if (mdCtx == null || mdCtx.IsInvalid)
 				yield break;
 
-			VariableInitializer currentVariable = context.GetNode<VariableInitializer>();
+			VariableInitializer currentVariable = mdCtx.GetNode<VariableInitializer>();
 			if (currentVariable == null) {
 				yield break;
 			}
@@ -64,7 +65,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeActions
 				yield break;
 			}
 
-			PrimitiveType baseType = TypeToIntegerPrimitive(context, currentField.ReturnType);
+			PrimitiveType baseType = TypeToIntegerPrimitive(mdCtx, currentField.ReturnType);
 			if (baseType == null) {
 				//Can't make enums of these types
 				yield break;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/ConvertToEnumDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ConvertToEnum/ConvertToEnumDialog.cs
index 26c3a299a2..26c3a299a2 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/ConvertToEnumDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ConvertToEnum/ConvertToEnumDialog.cs
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ExtractMethod/ExtractMethodCodeRefactoringProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ExtractMethod/ExtractMethodCodeRefactoringProvider.cs
new file mode 100644
index 0000000000..9ad0da4356
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ExtractMethod/ExtractMethodCodeRefactoringProvider.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using System;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Text;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp.ExtractMethod;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeRefactorings.ExtractMethod
+{
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.ExtractMethod), Shared]
+	internal class ExtractMethodCodeRefactoringProvider : CodeRefactoringProvider
+	{
+		public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+		{
+			// Don't bother if there isn't a selection
+			var textSpan = context.Span;
+			if (textSpan.IsEmpty)
+			{
+				return;
+			}
+			var document = context.Document;
+			var cancellationToken = context.CancellationToken;
+
+			var workspace = document.Project.Solution.Workspace;
+			if (workspace.Kind == WorkspaceKind.MiscellaneousFiles)
+			{
+				return;
+			}
+
+			var activeInlineRenameSession = IdeApp.Workbench.ActiveDocument.Editor.EditMode != MonoDevelop.Ide.Editor.EditMode.Edit;
+			if (activeInlineRenameSession)
+			{
+				return;
+			}
+			var model = await context.Document.GetSemanticModelAsync (context.CancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+			
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return;
+			}
+
+			var action = await GetCodeActionAsync(document, textSpan, cancellationToken: cancellationToken).ConfigureAwait(false);
+			if (action == null)
+			{
+				return;
+			}
+
+			context.RegisterRefactoring(action.Item1);
+		}
+
+		static CSharpExtractMethodService service = new CSharpExtractMethodService ();
+
+		private async Task<Tuple<CodeAction, string>> GetCodeActionAsync(
+			Document document,
+			TextSpan textSpan,
+			CancellationToken cancellationToken)
+		{
+			var options = document.Project.Solution.Workspace.Options;
+			try {
+				var result = await service.ExtractMethodAsync(
+					document,
+					textSpan,
+					options,
+					cancellationToken).ConfigureAwait(false);
+
+				if (result.Succeeded || result.SucceededWithSuggestion)
+				{
+					var description = options.GetOption(ExtractMethodOptions.AllowMovingDeclaration, document.Project.Language) ?
+						GettextCatalog.GetString ("Extract Method + Local") : GettextCatalog.GetString ("Extract Method");
+
+					var codeAction = new DocumentChangeAction(textSpan, DiagnosticSeverity.Info, description, (c) => AddRenameAnnotationAsync(result.Document, result.InvocationNameToken, c));
+					var methodBlock = result.MethodDeclarationNode;
+
+					return Tuple.Create<CodeAction, string>(codeAction, methodBlock.ToString());
+				}
+			} catch (Exception) {
+				// currently the extract method refactoring crashes often. Ignore the roslyn issues for now.
+			}
+			return null;
+		}
+
+		private async Task<Document> AddRenameAnnotationAsync(Document document, SyntaxToken invocationNameToken, CancellationToken cancellationToken)
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+
+			var finalRoot = root.ReplaceToken(
+				invocationNameToken,
+				invocationNameToken.WithAdditionalAnnotations(RenameAnnotation.Create()));
+
+			return document.WithSyntaxRoot(finalRoot);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.InitializerRewriter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.InitializerRewriter.cs
new file mode 100644
index 0000000000..e6866a9f25
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.InitializerRewriter.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeRefactorings.InlineTemporary
+{
+	internal partial class InlineTemporaryCodeRefactoringProvider
+	{
+		/// <summary>
+		/// This class handles rewriting initializer expressions that refer to the variable
+		/// being initialized into a simpler form.  For example, in "int x = x = 1", we want to
+		/// get just "1" back as the initializer.
+		/// </summary>
+		private class InitializerRewriter : CSharpSyntaxRewriter
+		{
+			private readonly SemanticModel _semanticModel;
+			private readonly ILocalSymbol _localSymbol;
+			private readonly ExpressionSyntax _initializer;
+
+			private InitializerRewriter(ExpressionSyntax initializer, ILocalSymbol localSymbol, SemanticModel semanticModel)
+			{
+				_semanticModel = semanticModel;
+				_localSymbol = localSymbol;
+				_initializer = initializer;
+			}
+
+			private bool IsReference(SimpleNameSyntax name)
+			{
+				if (name.Identifier.ValueText != _localSymbol.Name)
+				{
+					return false;
+				}
+
+				var symbol = _semanticModel.GetSymbolInfo(name).Symbol;
+				return symbol != null
+					&& symbol.Equals(_localSymbol);
+			}
+
+			public override SyntaxNode VisitAssignmentExpression(AssignmentExpressionSyntax node)
+			{
+				// Note - leave this as SyntaxNode for now, we might have already re-written it
+				var newNode = base.VisitAssignmentExpression(node);
+
+				if (newNode.Kind() == SyntaxKind.SimpleAssignmentExpression)
+				{
+					// It's okay to just look at the text, since we're explicitly looking for an
+					// identifier standing alone, and we know we're in a local's initializer.
+					// The text can only bind to the initializer.
+					var assignment = (AssignmentExpressionSyntax)newNode;
+					var name = assignment.Left.Kind() == SyntaxKind.IdentifierName
+						? (IdentifierNameSyntax)assignment.Left
+						: null;
+
+					if (name != null && IsReference(name))
+					{
+						return assignment.Right;
+					}
+				}
+
+				return newNode;
+			}
+
+			public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node)
+			{
+				if (IsReference(node))
+				{
+					var assignmentExpression = node.Parent as AssignmentExpressionSyntax;
+					if (assignmentExpression != null)
+					{
+						if (assignmentExpression.IsCompoundAssignExpression() &&
+							assignmentExpression.Left == node)
+						{
+							return node.Update(node.Identifier.WithAdditionalAnnotations(CreateConflictAnnotation()));
+						}
+					}
+				}
+
+				return base.VisitIdentifierName(node);
+			}
+
+			public override SyntaxNode VisitParenthesizedExpression(ParenthesizedExpressionSyntax node)
+			{
+				var newNode = base.VisitParenthesizedExpression(node);
+
+				if (node != newNode && newNode.Kind() == SyntaxKind.ParenthesizedExpression)
+				{
+					return newNode.WithAdditionalAnnotations(Simplifier.Annotation);
+				}
+
+				return newNode;
+			}
+
+			public static ExpressionSyntax Visit(ExpressionSyntax initializer, ILocalSymbol local, SemanticModel semanticModel)
+			{
+				var simplifier = new InitializerRewriter(initializer, local, semanticModel);
+				return (ExpressionSyntax)simplifier.Visit(initializer);
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.ReferenceRewriter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.ReferenceRewriter.cs
new file mode 100644
index 0000000000..16d712e672
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.ReferenceRewriter.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace MonoDevelop.CSharp.CodeRefactorings.InlineTemporary
+{
+	internal partial class InlineTemporaryCodeRefactoringProvider
+	{
+		private class ReferenceRewriter : CSharpSyntaxRewriter
+		{
+			private readonly SemanticModel _semanticModel;
+			private readonly ILocalSymbol _localSymbol;
+			private readonly VariableDeclaratorSyntax _variableDeclarator;
+			private readonly ExpressionSyntax _expressionToInline;
+			private readonly CancellationToken _cancellationToken;
+
+			private ReferenceRewriter(
+				SemanticModel semanticModel,
+				VariableDeclaratorSyntax variableDeclarator,
+				ExpressionSyntax expressionToInline,
+				CancellationToken cancellationToken)
+			{
+				_semanticModel = semanticModel;
+				_localSymbol = (ILocalSymbol)semanticModel.GetDeclaredSymbol(variableDeclarator, cancellationToken);
+				_variableDeclarator = variableDeclarator;
+				_expressionToInline = expressionToInline;
+				_cancellationToken = cancellationToken;
+			}
+
+			private bool IsReference(SimpleNameSyntax name)
+			{
+				if (name.Identifier.ValueText != _variableDeclarator.Identifier.ValueText)
+				{
+					return false;
+				}
+
+				var symbol = _semanticModel.GetSymbolInfo(name).Symbol;
+				return symbol != null
+					&& symbol.Equals(_localSymbol);
+			}
+
+			public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node)
+			{
+				_cancellationToken.ThrowIfCancellationRequested();
+
+				if (IsReference(node))
+				{
+					if (HasConflict(node, _variableDeclarator))
+					{
+						return node.Update(node.Identifier.WithAdditionalAnnotations(CreateConflictAnnotation()));
+					}
+
+					return _expressionToInline
+						.Parenthesize()
+						.WithAdditionalAnnotations(Formatter.Annotation, Simplifier.Annotation);
+				}
+
+				return base.VisitIdentifierName(node);
+			}
+
+			public override SyntaxNode VisitAnonymousObjectMemberDeclarator(AnonymousObjectMemberDeclaratorSyntax node)
+			{
+				var nameEquals = node.NameEquals;
+				var expression = node.Expression;
+				var identifier = expression as IdentifierNameSyntax;
+
+				if (nameEquals != null || identifier == null || !IsReference(identifier) || HasConflict(identifier, _variableDeclarator))
+				{
+					return base.VisitAnonymousObjectMemberDeclarator(node);
+				}
+
+				// Special case inlining into anonymous types to ensure that we keep property names:
+				//
+				// E.g.
+				//     int x = 42;
+				//     var a = new { x; };
+				//
+				// Should become:
+				//     var a = new { x = 42; };
+				nameEquals = SyntaxFactory.NameEquals(identifier);
+				expression = (ExpressionSyntax)this.Visit(expression);
+				return node.Update(nameEquals, expression).WithAdditionalAnnotations(Simplifier.Annotation, Formatter.Annotation);
+			}
+
+			public static SyntaxNode Visit(
+				SemanticModel semanticModel,
+				SyntaxNode scope,
+				VariableDeclaratorSyntax variableDeclarator,
+				ExpressionSyntax expressionToInline,
+				CancellationToken cancellationToken)
+			{
+				var rewriter = new ReferenceRewriter(semanticModel, variableDeclarator, expressionToInline, cancellationToken);
+				return rewriter.Visit(scope);
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.cs
new file mode 100644
index 0000000000..b5951ab7bf
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.cs
@@ -0,0 +1,574 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.CodeRefactorings.InlineTemporary
+{
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.InlineTemporary), Shared]
+	internal partial class InlineTemporaryCodeRefactoringProvider : CodeRefactoringProvider
+	{
+		internal static readonly SyntaxAnnotation DefinitionAnnotation = new SyntaxAnnotation();
+		internal static readonly SyntaxAnnotation ReferenceAnnotation = new SyntaxAnnotation();
+		internal static readonly SyntaxAnnotation InitializerAnnotation = new SyntaxAnnotation();
+		internal static readonly SyntaxAnnotation ExpressionToInlineAnnotation = new SyntaxAnnotation();
+
+		public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+		{
+			var document = context.Document;
+			var textSpan = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			if (document.Project.Solution.Workspace.Kind == WorkspaceKind.MiscellaneousFiles)
+			{
+				return;
+			}
+			var model = await document.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return;
+			var root = await document.GetCSharpSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var token = root.FindToken(textSpan.Start);
+
+			if (!token.Span.Contains(textSpan))
+			{
+				return;
+			}
+
+			var node = token.Parent;
+
+			if (!node.IsKind(SyntaxKind.VariableDeclarator) ||
+				!node.IsParentKind(SyntaxKind.VariableDeclaration) ||
+				!node.Parent.IsParentKind(SyntaxKind.LocalDeclarationStatement))
+			{
+				return;
+			}
+
+			var variableDeclarator = (VariableDeclaratorSyntax)node;
+			var variableDeclaration = (VariableDeclarationSyntax)variableDeclarator.Parent;
+			var localDeclarationStatement = (LocalDeclarationStatementSyntax)variableDeclaration.Parent;
+
+			if (variableDeclarator.Identifier != token ||
+				variableDeclarator.Initializer == null ||
+				variableDeclarator.Initializer.Value.IsMissing ||
+				variableDeclarator.Initializer.Value.IsKind(SyntaxKind.StackAllocArrayCreationExpression))
+			{
+				return;
+			}
+
+			if (localDeclarationStatement.ContainsDiagnostics)
+			{
+				return;
+			}
+
+			var references = await GetReferencesAsync(document, variableDeclarator, cancellationToken).ConfigureAwait(false);
+			if (!references.Any())
+			{
+				return;
+			}
+
+			context.RegisterRefactoring(
+				new DocumentChangeAction(node.Span, DiagnosticSeverity.Info,
+					GettextCatalog.GetString ("Inline temporary variable"),
+					(c) => this.InlineTemporaryAsync(document, variableDeclarator, c)));
+		}
+
+		private async Task<IEnumerable<ReferenceLocation>> GetReferencesAsync(
+			Document document,
+			VariableDeclaratorSyntax variableDeclarator,
+			CancellationToken cancellationToken)
+		{
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var local = semanticModel.GetDeclaredSymbol(variableDeclarator, cancellationToken);
+
+			if (local != null)
+			{
+				var findReferencesResult = await SymbolFinder.FindReferencesAsync(local, document.Project.Solution, cancellationToken).ConfigureAwait(false);
+				var locations = findReferencesResult.Single(r => r.Definition == local).Locations;
+				if (!locations.Any(loc => semanticModel.SyntaxTree.OverlapsHiddenPosition(loc.Location.SourceSpan, cancellationToken)))
+				{
+					return locations;
+				}
+			}
+
+			return SpecializedCollections.EmptyEnumerable<ReferenceLocation>();
+		}
+
+		private static bool HasConflict(IdentifierNameSyntax identifier, VariableDeclaratorSyntax variableDeclarator)
+		{
+			// TODO: Check for more conflict types.
+			if (identifier.SpanStart < variableDeclarator.SpanStart)
+			{
+				return true;
+			}
+
+			var identifierNode = identifier
+				.Ancestors()
+				.TakeWhile(n => n.Kind() == SyntaxKind.ParenthesizedExpression || n.Kind() == SyntaxKind.CastExpression)
+				.LastOrDefault();
+
+			if (identifierNode == null)
+			{
+				identifierNode = identifier;
+			}
+
+			if (identifierNode.IsParentKind(SyntaxKind.Argument))
+			{
+				var argument = (ArgumentSyntax)identifierNode.Parent;
+				if (argument.RefOrOutKeyword.Kind() != SyntaxKind.None)
+				{
+					return true;
+				}
+			}
+			else if (identifierNode.Parent.IsKind(
+				SyntaxKind.PreDecrementExpression,
+				SyntaxKind.PreIncrementExpression,
+				SyntaxKind.PostDecrementExpression,
+				SyntaxKind.PostIncrementExpression,
+				SyntaxKind.AddressOfExpression))
+			{
+				return true;
+			}
+			else if (identifierNode.Parent is AssignmentExpressionSyntax)
+			{
+				var binaryExpression = (AssignmentExpressionSyntax)identifierNode.Parent;
+				if (binaryExpression.Left == identifierNode)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		private static SyntaxAnnotation CreateConflictAnnotation()
+		{
+			return ConflictAnnotation.Create(GettextCatalog.GetString ("Conflict(s) detected."));
+		}
+
+		private async Task<Document> InlineTemporaryAsync(Document document, VariableDeclaratorSyntax declarator, CancellationToken cancellationToken)
+		{
+			var workspace = document.Project.Solution.Workspace;
+
+			// Annotate the variable declarator so that we can get back to it later.
+			var updatedDocument = await document.ReplaceNodeAsync(declarator, declarator.WithAdditionalAnnotations(DefinitionAnnotation), cancellationToken).ConfigureAwait(false);
+			var semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+			var variableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+
+			// Create the expression that we're actually going to inline.
+			var expressionToInline = await CreateExpressionToInlineAsync(variableDeclarator, updatedDocument, cancellationToken).ConfigureAwait(false);
+
+			// Collect the identifier names for each reference.
+			var local = (ILocalSymbol)semanticModel.GetDeclaredSymbol(variableDeclarator, cancellationToken);
+			var symbolRefs = await SymbolFinder.FindReferencesAsync(local, updatedDocument.Project.Solution, cancellationToken).ConfigureAwait(false);
+			var references = symbolRefs.Single(r => r.Definition == local).Locations;
+			var syntaxRoot = await updatedDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+
+			// Collect the topmost parenting expression for each reference.
+			var nonConflictingIdentifierNodes = references
+				.Select(loc => (IdentifierNameSyntax)syntaxRoot.FindToken(loc.Location.SourceSpan.Start).Parent)
+				.Where(ident => !HasConflict(ident, variableDeclarator));
+
+			// Add referenceAnnotions to identifier nodes being replaced.
+			updatedDocument = await updatedDocument.ReplaceNodesAsync(
+				nonConflictingIdentifierNodes,
+				(o, n) => n.WithAdditionalAnnotations(ReferenceAnnotation),
+				cancellationToken).ConfigureAwait(false);
+
+			semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			variableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+
+			// Get the annotated reference nodes.
+			nonConflictingIdentifierNodes = await FindReferenceAnnotatedNodesAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+
+			var topmostParentingExpressions = nonConflictingIdentifierNodes
+				.Select(ident => GetTopMostParentingExpression(ident))
+				.Distinct();
+
+			var originalInitializerSymbolInfo = semanticModel.GetSymbolInfo(variableDeclarator.Initializer.Value, cancellationToken);
+
+			// Make each topmost parenting statement or Equals Clause Expressions semantically explicit.
+			updatedDocument = await updatedDocument.ReplaceNodesAsync(topmostParentingExpressions, (o, n) => Simplifier.Expand(n, semanticModel, workspace, cancellationToken: cancellationToken), cancellationToken).ConfigureAwait(false);
+			semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var semanticModelBeforeInline = semanticModel;
+
+			variableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+			var scope = GetScope(variableDeclarator);
+
+			var newScope = ReferenceRewriter.Visit(semanticModel, scope, variableDeclarator, expressionToInline, cancellationToken);
+
+			updatedDocument = await updatedDocument.ReplaceNodeAsync(scope, newScope, cancellationToken).ConfigureAwait(false);
+			semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+			variableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+			newScope = GetScope(variableDeclarator);
+			var conflicts = newScope.GetAnnotatedNodesAndTokens(ConflictAnnotation.Kind);
+			var declaratorConflicts = variableDeclarator.GetAnnotatedNodesAndTokens(ConflictAnnotation.Kind);
+
+			// Note that we only remove the local declaration if there weren't any conflicts,
+			// unless those conflicts are inside the local declaration.
+			if (conflicts.Count() == declaratorConflicts.Count())
+			{
+				// Certain semantic conflicts can be detected only after the reference rewriter has inlined the expression
+				var newDocument = await DetectSemanticConflicts(updatedDocument,
+					semanticModel,
+					semanticModelBeforeInline,
+					originalInitializerSymbolInfo,
+					cancellationToken).ConfigureAwait(false);
+
+				if (updatedDocument == newDocument)
+				{
+					// No semantic conflicts, we can remove the definition.
+					updatedDocument = await updatedDocument.ReplaceNodeAsync(newScope, RemoveDeclaratorFromScope(variableDeclarator, newScope), cancellationToken).ConfigureAwait(false);
+				}
+				else
+				{
+					// There were some semantic conflicts, don't remove the definition.
+					updatedDocument = newDocument;
+				}
+			}
+
+			return updatedDocument;
+		}
+
+		private static async Task<VariableDeclaratorSyntax> FindDeclaratorAsync(Document document, CancellationToken cancellationToken)
+		{
+			return await FindNodeWithAnnotationAsync<VariableDeclaratorSyntax>(document, DefinitionAnnotation, cancellationToken).ConfigureAwait(false);
+		}
+
+		private static async Task<ExpressionSyntax> FindInitializerAsync(Document document, CancellationToken cancellationToken)
+		{
+			return await FindNodeWithAnnotationAsync<ExpressionSyntax>(document, InitializerAnnotation, cancellationToken).ConfigureAwait(false);
+		}
+
+		private static async Task<T> FindNodeWithAnnotationAsync<T>(Document document, SyntaxAnnotation annotation, CancellationToken cancellationToken)
+			where T : SyntaxNode
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			return root
+				.GetAnnotatedNodesAndTokens(annotation)
+				.Single()
+				.AsNode() as T;
+		}
+
+		private static async Task<IEnumerable<IdentifierNameSyntax>> FindReferenceAnnotatedNodesAsync(Document document, CancellationToken cancellationToken)
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			return FindReferenceAnnotatedNodes(root);
+		}
+
+		private static IEnumerable<IdentifierNameSyntax> FindReferenceAnnotatedNodes(SyntaxNode root)
+		{
+			var annotatedNodesAndTokens = root.GetAnnotatedNodesAndTokens(ReferenceAnnotation);
+			foreach (var nodeOrToken in annotatedNodesAndTokens)
+			{
+				if (nodeOrToken.IsNode && nodeOrToken.AsNode().IsKind(SyntaxKind.IdentifierName))
+				{
+					yield return (IdentifierNameSyntax)nodeOrToken.AsNode();
+				}
+			}
+		}
+
+		private SyntaxNode GetScope(VariableDeclaratorSyntax variableDeclarator)
+		{
+			var variableDeclaration = (VariableDeclarationSyntax)variableDeclarator.Parent;
+			var localDeclaration = (LocalDeclarationStatementSyntax)variableDeclaration.Parent;
+			var scope = localDeclaration.Parent;
+
+			while (scope.IsKind(SyntaxKind.LabeledStatement))
+			{
+				scope = scope.Parent;
+			}
+
+			var parentExpressions = scope.AncestorsAndSelf().OfType<ExpressionSyntax>();
+			if (parentExpressions.Any())
+			{
+				scope = parentExpressions.LastOrDefault().Parent;
+			}
+
+			return scope;
+		}
+
+		private VariableDeclaratorSyntax FindDeclarator(SyntaxNode node)
+		{
+			var annotatedNodesOrTokens = node.GetAnnotatedNodesAndTokens(DefinitionAnnotation).ToList();
+
+			return (VariableDeclaratorSyntax)annotatedNodesOrTokens.First().AsNode();
+		}
+
+		private SyntaxTriviaList GetTriviaToPreserve(SyntaxTriviaList syntaxTriviaList)
+		{
+			return ShouldPreserve(syntaxTriviaList) ? syntaxTriviaList : default(SyntaxTriviaList);
+		}
+
+		private static bool ShouldPreserve(SyntaxTriviaList trivia)
+		{
+			return trivia.Any(
+				t => t.Kind() == SyntaxKind.SingleLineCommentTrivia ||
+				t.Kind() == SyntaxKind.MultiLineCommentTrivia ||
+				t.IsDirective);
+		}
+
+		private SyntaxNode RemoveDeclaratorFromVariableList(VariableDeclaratorSyntax variableDeclarator, VariableDeclarationSyntax variableDeclaration)
+		{
+			Debug.Assert(variableDeclaration.Variables.Count > 1);
+			Debug.Assert(variableDeclaration.Variables.Contains(variableDeclarator));
+
+			var localDeclaration = (LocalDeclarationStatementSyntax)variableDeclaration.Parent;
+			var scope = GetScope(variableDeclarator);
+
+			var newLocalDeclaration = localDeclaration.RemoveNode(variableDeclarator, SyntaxRemoveOptions.KeepNoTrivia)
+				.WithAdditionalAnnotations(Formatter.Annotation);
+
+			return scope.ReplaceNode(localDeclaration, newLocalDeclaration);
+		}
+
+		private SyntaxNode RemoveDeclaratorFromScope(VariableDeclaratorSyntax variableDeclarator, SyntaxNode scope)
+		{
+			var variableDeclaration = (VariableDeclarationSyntax)variableDeclarator.Parent;
+
+			// If there is more than one variable declarator, remove this one from the variable declaration.
+			if (variableDeclaration.Variables.Count > 1)
+			{
+				return RemoveDeclaratorFromVariableList(variableDeclarator, variableDeclaration);
+			}
+
+			var localDeclaration = (LocalDeclarationStatementSyntax)variableDeclaration.Parent;
+
+			// There's only one variable declarator, so we'll remove the local declaration
+			// statement entirely. This means that we'll concatenate the leading and trailing
+			// trivia of this declaration and move it to the next statement.
+			var leadingTrivia = localDeclaration
+				.GetLeadingTrivia()
+				.Reverse()
+				.SkipWhile(t => t.MatchesKind(SyntaxKind.WhitespaceTrivia))
+				.Reverse()
+				.ToSyntaxTriviaList();
+
+			var trailingTrivia = localDeclaration
+				.GetTrailingTrivia()
+				.SkipWhile(t => t.MatchesKind(SyntaxKind.WhitespaceTrivia, SyntaxKind.EndOfLineTrivia))
+				.ToSyntaxTriviaList();
+
+			var newLeadingTrivia = leadingTrivia.Concat(trailingTrivia);
+
+			var nextToken = localDeclaration.GetLastToken().GetNextTokenOrEndOfFile();
+			var newNextToken = nextToken.WithPrependedLeadingTrivia(newLeadingTrivia)
+				.WithAdditionalAnnotations(Formatter.Annotation);
+
+			var newScope = scope.ReplaceToken(nextToken, newNextToken);
+
+			var newLocalDeclaration = (LocalDeclarationStatementSyntax)FindDeclarator(newScope).Parent.Parent;
+
+			// If the local is parented by a label statement, we can't remove this statement. Instead,
+			// we'll replace the local declaration with an empty expression statement.
+			if (newLocalDeclaration.IsParentKind(SyntaxKind.LabeledStatement))
+			{
+				var labeledStatement = (LabeledStatementSyntax)newLocalDeclaration.Parent;
+				var newLabeledStatement = labeledStatement.ReplaceNode(newLocalDeclaration, SyntaxFactory.ParseStatement(""));
+
+				return newScope.ReplaceNode(labeledStatement, newLabeledStatement);
+			}
+
+			return newScope.RemoveNode(newLocalDeclaration, SyntaxRemoveOptions.KeepNoTrivia);
+		}
+
+		private ExpressionSyntax SkipRedundantExteriorParentheses(ExpressionSyntax expression)
+		{
+			while (expression.IsKind(SyntaxKind.ParenthesizedExpression))
+			{
+				var parenthesized = (ParenthesizedExpressionSyntax)expression;
+				if (parenthesized.Expression == null ||
+					parenthesized.Expression.IsMissing)
+				{
+					break;
+				}
+
+				if (parenthesized.Expression.IsKind(SyntaxKind.ParenthesizedExpression) ||
+					parenthesized.Expression.IsKind(SyntaxKind.IdentifierName))
+				{
+					expression = parenthesized.Expression;
+				}
+				else
+				{
+					break;
+				}
+			}
+
+			return expression;
+		}
+
+		public static IEnumerable<SyntaxTrivia> SkipInitialWhitespace(SyntaxTriviaList triviaList)
+		{
+			return triviaList.SkipWhile(t => t.Kind() == SyntaxKind.WhitespaceTrivia);
+		}
+
+		private async Task<ExpressionSyntax> CreateExpressionToInlineAsync(
+			VariableDeclaratorSyntax variableDeclarator,
+			Document document,
+			CancellationToken cancellationToken)
+		{
+			var updatedDocument = document;
+
+			var expression = SkipRedundantExteriorParentheses(variableDeclarator.Initializer.Value);
+			var semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var localSymbol = (ILocalSymbol)semanticModel.GetDeclaredSymbol(variableDeclarator, cancellationToken);
+			var newExpression = InitializerRewriter.Visit(expression, localSymbol, semanticModel);
+
+			// If this is an array initializer, we need to transform it into an array creation
+			// expression for inlining.
+			if (newExpression.Kind() == SyntaxKind.ArrayInitializerExpression)
+			{
+				var arrayType = (ArrayTypeSyntax)localSymbol.Type.GenerateTypeSyntax();
+				var arrayInitializer = (InitializerExpressionSyntax)newExpression;
+
+				// Add any non-whitespace trailing trivia from the equals clause to the type.
+				var equalsToken = variableDeclarator.Initializer.EqualsToken;
+				if (equalsToken.HasTrailingTrivia)
+				{
+					var trailingTrivia = SkipInitialWhitespace(equalsToken.TrailingTrivia);
+					if (trailingTrivia.Any())
+					{
+						arrayType = arrayType.WithTrailingTrivia(trailingTrivia);
+					}
+				}
+
+				newExpression = SyntaxFactory.ArrayCreationExpression(arrayType, arrayInitializer);
+			}
+
+			newExpression = newExpression.WithAdditionalAnnotations(InitializerAnnotation);
+
+			updatedDocument = await updatedDocument.ReplaceNodeAsync(variableDeclarator.Initializer.Value, newExpression, cancellationToken).ConfigureAwait(false);
+			semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			newExpression = await FindInitializerAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+			var newVariableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+			localSymbol = (ILocalSymbol)semanticModel.GetDeclaredSymbol(newVariableDeclarator, cancellationToken);
+
+			bool wasCastAdded;
+			var explicitCastExpression = newExpression.CastIfPossible(localSymbol.Type, newVariableDeclarator.SpanStart, semanticModel, out wasCastAdded);
+
+			if (wasCastAdded)
+			{
+				updatedDocument = await updatedDocument.ReplaceNodeAsync(newExpression, explicitCastExpression, cancellationToken).ConfigureAwait(false);
+				semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+				newVariableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+			}
+
+			// Now that the variable declarator is normalized, make its initializer
+			// value semantically explicit.
+			newExpression = await Simplifier.ExpandAsync(newVariableDeclarator.Initializer.Value, updatedDocument, cancellationToken: cancellationToken).ConfigureAwait(false);
+			return newExpression.WithAdditionalAnnotations(ExpressionToInlineAnnotation);
+		}
+
+		private static SyntaxNode GetTopMostParentingExpression(ExpressionSyntax expression)
+		{
+			return expression.AncestorsAndSelf().OfType<ExpressionSyntax>().Last();
+		}
+
+		private static async Task<Document> DetectSemanticConflicts(
+			Document inlinedDocument,
+			SemanticModel newSemanticModelForInlinedDocument,
+			SemanticModel semanticModelBeforeInline,
+			SymbolInfo originalInitializerSymbolInfo,
+			CancellationToken cancellationToken)
+		{
+			// In this method we detect if inlining the expression introduced the following semantic change:
+			// The symbol info associated with any of the inlined expressions does not match the symbol info for original initializer expression prior to inline.
+
+			// If any semantic changes were introduced by inlining, we update the document with conflict annotations.
+			// Otherwise we return the given inlined document without any changes.
+
+			var syntaxRootBeforeInline = await semanticModelBeforeInline.SyntaxTree.GetRootAsync(cancellationToken).ConfigureAwait(false);
+
+			// Get all the identifier nodes which were replaced with inlined expression.
+			var originalIdentifierNodes = FindReferenceAnnotatedNodes(syntaxRootBeforeInline).ToList ();
+
+			if (!originalIdentifierNodes.Any())
+			{
+				// No conflicts
+				return inlinedDocument;
+			}
+
+			// Get all the inlined expression nodes.
+			var syntaxRootAfterInline = await inlinedDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var inlinedExprNodes = syntaxRootAfterInline.GetAnnotatedNodesAndTokens(ExpressionToInlineAnnotation).ToList ();
+			Debug.Assert(originalIdentifierNodes.Count() == inlinedExprNodes.Count());
+
+			Dictionary<SyntaxNode, SyntaxNode> replacementNodesWithChangedSemantics = null;
+			using (var originalNodesEnum = originalIdentifierNodes.GetEnumerator())
+			{
+				using (var inlinedNodesOrTokensEnum = inlinedExprNodes.GetEnumerator())
+				{
+					while (originalNodesEnum.MoveNext())
+					{
+						inlinedNodesOrTokensEnum.MoveNext();
+						var originalNode = originalNodesEnum.Current;
+
+						// expressionToInline is Parenthesized prior to replacement, so get the parenting parenthesized expression.
+						var inlinedNode = (ExpressionSyntax)inlinedNodesOrTokensEnum.Current.Parent;
+						Debug.Assert(inlinedNode.IsKind(SyntaxKind.ParenthesizedExpression));
+
+						// inlinedNode is the expanded form of the actual initializer expression in the original document.
+						// We have annotated the inner initializer with a special syntax annotation "InitializerAnnotation".
+						// Get this annotated node and compute the symbol info for this node in the inlined document.
+						var innerInitializerInInlineNodeorToken = inlinedNode.GetAnnotatedNodesAndTokens(InitializerAnnotation).First();
+
+						ExpressionSyntax innerInitializerInInlineNode = (ExpressionSyntax)(innerInitializerInInlineNodeorToken.IsNode ?
+							innerInitializerInInlineNodeorToken.AsNode() :
+							innerInitializerInInlineNodeorToken.AsToken().Parent);
+						var newInializerSymbolInfo = newSemanticModelForInlinedDocument.GetSymbolInfo(innerInitializerInInlineNode, cancellationToken);
+
+						// Verification: The symbol info associated with any of the inlined expressions does not match the symbol info for original initializer expression prior to inline.
+						if (!SpeculationAnalyzer.SymbolInfosAreCompatible(originalInitializerSymbolInfo, newInializerSymbolInfo, performEquivalenceCheck: true))
+						{
+							newInializerSymbolInfo = newSemanticModelForInlinedDocument.GetSymbolInfo(inlinedNode, cancellationToken);
+							if (!SpeculationAnalyzer.SymbolInfosAreCompatible(originalInitializerSymbolInfo, newInializerSymbolInfo, performEquivalenceCheck: true))
+							{
+								if (replacementNodesWithChangedSemantics == null)
+								{
+									replacementNodesWithChangedSemantics = new Dictionary<SyntaxNode, SyntaxNode>();
+								}
+
+								replacementNodesWithChangedSemantics.Add(inlinedNode, originalNode);
+							}
+						}
+					}
+				}
+			}
+
+			if (replacementNodesWithChangedSemantics == null)
+			{
+				// No conflicts.
+				return inlinedDocument;
+			}
+
+			// Replace the conflicting inlined nodes with the original nodes annotated with conflict annotation.
+			Func<SyntaxNode, SyntaxNode, SyntaxNode> conflictAnnotationAdder =
+				(SyntaxNode oldNode, SyntaxNode newNode) =>
+				newNode.WithAdditionalAnnotations(ConflictAnnotation.Create(GettextCatalog.GetString ("Conflict(s) detected.")));
+
+			return await inlinedDocument.ReplaceNodesAsync(replacementNodesWithChangedSemantics.Keys, conflictAnnotationAdder, cancellationToken).ConfigureAwait(false);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/IntroduceVariable/IntroduceVariableCodeRefactoringProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/IntroduceVariable/IntroduceVariableCodeRefactoringProvider.cs
new file mode 100644
index 0000000000..a7cf7247aa
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/IntroduceVariable/IntroduceVariableCodeRefactoringProvider.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeRefactorings.IntroduceVariable
+{
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.IntroduceVariable), Shared]
+	class IntroduceVariableCodeRefactoringProvider : CodeRefactoringProvider
+	{
+		static readonly CSharpIntroduceVariableService service = new CSharpIntroduceVariableService ();
+
+		public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+		{
+			var document = context.Document;
+			var textSpan = context.Span;
+			var cancellationToken = context.CancellationToken;
+			if (document.Project.Solution.Workspace.Kind == WorkspaceKind.MiscellaneousFiles)
+			{
+				return;
+			}
+			var model = await document.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return;
+			var result = await service.IntroduceVariableAsync(document, textSpan, cancellationToken).ConfigureAwait(false);
+
+			if (!result.ContainsChanges)
+			{
+				return;
+			}
+
+			var actions = result.GetCodeRefactoring(cancellationToken).Actions;
+			context.RegisterRefactorings(actions);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
new file mode 100644
index 0000000000..87228da8cf
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
@@ -0,0 +1,47 @@
+//
+// PredefinedCodeRefactoringProviderNames.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.CSharp.CodeRefactorings
+{
+	static class PredefinedCodeRefactoringProviderNames
+	{
+		public const string AddConstructorParametersFromMembers = "Add Parameters From Members Code Action Provider";
+		public const string ChangeSignature = "Change Signature Code Action Provider";
+		public const string EncapsulateField = "Encapsulate Field";
+		public const string ExtractInterface = "Extract Interface Code Action Provider";
+		public const string ExtractMethod = "Extract Method Code Action Provider";
+		public const string GenerateConstructorFromMembers = "Generate Constructor From Members Code Action Provider";
+		public const string GenerateDefaultConstructors = "Generate Default Constructors Code Action Provider";
+		public const string GenerateEqualsAndGetHashCode = "Generate Equals and GetHashCode Code Action Provider";
+		public const string InlineTemporary = "Inline Temporary Code Action Provider";
+		public const string IntroduceVariable = "Introduce Variable Code Action Provider";
+		public const string InvertIf = "Invert If Code Action Provider";
+		public const string MoveDeclarationNearReference = "Move Declaration Near Reference Code Action Provider";
+		public const string SimplifyLambda = "Simplify Lambda Code Action Provider";
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AbstractParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AbstractParameterDataProvider.cs
index d505a33737..8cde44cca3 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AbstractParameterDataProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AbstractParameterDataProvider.cs
@@ -35,7 +35,7 @@ using MonoDevelop.Ide.CodeCompletion;
 
 namespace MonoDevelop.CSharp.Completion
 {
-	abstract class AbstractParameterDataProvider : ParameterDataProvider
+	abstract class AbstractParameterDataProvider : ParameterHintingData
 	{
 		protected CSharpCompletionTextEditorExtension ext;
 
@@ -49,28 +49,29 @@ namespace MonoDevelop.CSharp.Completion
 		TypeSystemAstBuilder builder;
 		protected string GetShortType (IType type)
 		{
-			if (builder == null) {
-				var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.Document.Editor.Caret.Location);
-				var state = new CSharpResolver (ctx);
-				builder = new TypeSystemAstBuilder (state);
-				var dt = state.CurrentTypeDefinition;
-				var declaring = ctx.CurrentTypeDefinition != null ? ctx.CurrentTypeDefinition.DeclaringTypeDefinition : null;
-				if (declaring != null) {
-					while (dt != null) {
-						if (dt.Equals (declaring)) {
-							builder.AlwaysUseShortTypeNames = true;
-							break;
-						}
-						dt = dt.DeclaringTypeDefinition;
-					}
-				}
-			}
-			try {
-				return GLib.Markup.EscapeText (builder.ConvertType(type).ToString (ext.FormattingPolicy.CreateOptions ()));
-			} catch (Exception e) {
-				LoggingService.LogError ("Exception while getting short type.", e);
-				return "";
-			}
+			return type.Name;
+//			if (builder == null) {
+//				var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.Document.Editor.Caret.Location);
+//				var state = new CSharpResolver (ctx);
+//				builder = new TypeSystemAstBuilder (state);
+//				var dt = state.CurrentTypeDefinition;
+//				var declaring = ctx.CurrentTypeDefinition != null ? ctx.CurrentTypeDefinition.DeclaringTypeDefinition : null;
+//				if (declaring != null) {
+//					while (dt != null) {
+//						if (dt.Equals (declaring)) {
+//							builder.AlwaysUseShortTypeNames = true;
+//							break;
+//						}
+//						dt = dt.DeclaringTypeDefinition;
+//					}
+//				}
+//			}
+//			try {
+//				return GLib.Markup.EscapeText (builder.ConvertType(type).ToString (ext.FormattingPolicy.CreateOptions ()));
+//			} catch (Exception e) {
+//				LoggingService.LogError ("Exception while getting short type.", e);
+//				return "";
+//			}
 		}
 
 		protected string GetParameterString (IParameter parameter)
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AnonymousMethodCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AnonymousMethodCompletionData.cs
new file mode 100644
index 0000000000..ef913a932a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AnonymousMethodCompletionData.cs
@@ -0,0 +1,48 @@
+//
+// AnonymousMethodCompletionData.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class AnonymousMethodCompletionData : RoslynCompletionData
+	{
+		public AnonymousMethodCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler) : base (keyHandler)
+		{
+			this.Icon = "md-newmethod";
+		}
+
+		public override int CompareTo (object obj)
+		{
+			var anonymousMethodCompletionData = obj as AnonymousMethodCompletionData;
+			if (anonymousMethodCompletionData == null)
+				return -1;
+
+			return DisplayText.CompareTo(anonymousMethodCompletionData.DisplayText);
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ArrayTypeParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ArrayTypeParameterDataProvider.cs
index f909337cbf..e41ed579e5 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ArrayTypeParameterDataProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ArrayTypeParameterDataProvider.cs
@@ -29,7 +29,6 @@ using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.CSharp.Formatting;
 using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using Mono.TextEditor;
 
 namespace MonoDevelop.CSharp.Completion
 {
@@ -47,9 +46,9 @@ namespace MonoDevelop.CSharp.Completion
 			var tooltipInfo = new TooltipInformation ();
 			var file = ext.CSharpUnresolvedFile;
 			var compilation = ext.UnresolvedFileCompilation;
-			var textEditorData = ext.TextEditorData;
+			var textEditorData = ext.Editor;
 			var formattingPolicy = ext.FormattingPolicy;
-			var resolver = file.GetResolver (compilation, textEditorData.Caret.Location);
+			var resolver = file.GetResolver (compilation, textEditorData.CaretLocation);
 			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
 			sig.HighlightParameter = currentParameter;
 			tooltipInfo.SignatureMarkup = sig.GetArrayIndexerMarkup (arrayType);
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
index 6e1134678f..2374acb902 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
@@ -26,45 +26,39 @@
 
 using System;
 using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Collections.Generic;
 
-using Mono.TextEditor;
-
 using MonoDevelop.Core;
 using MonoDevelop.Debugger;
-using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.CodeGeneration;
-using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.CodeTemplates;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Components.Commands;
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Completion;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp.Completion;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-using MonoDevelop.CSharp.Project;
 using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using MonoDevelop.Refactoring;
+
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
 using System.Xml;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Refactoring;
+using System.Diagnostics;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace MonoDevelop.CSharp.Completion
 {
-	public class CSharpCompletionTextEditorExtension : CompletionTextEditorExtension, IParameterCompletionDataFactory, ITextEditorMemberPositionProvider, IDebuggerExpressionResolver
+	sealed class CSharpCompletionTextEditorExtension : CompletionTextEditorExtension, IDebuggerExpressionResolver
 	{
-		internal protected virtual Mono.TextEditor.TextEditorData TextEditorData {
+/*		internal protected virtual Mono.TextEditor.TextEditorData TextEditorData {
 			get {
 				var doc = Document;
 				if (doc == null)
@@ -76,9 +70,10 @@ namespace MonoDevelop.CSharp.Completion
 		protected virtual IProjectContent ProjectContent {
 			get { return Document.GetProjectContext (); }
 		}
-
+*/
 		SyntaxTree unit;
-		static readonly SyntaxTree emptyUnit = new SyntaxTree ();
+		static readonly SyntaxTree emptyUnit = CSharpSyntaxTree.ParseText ("");
+
 		SyntaxTree Unit {
 			get {
 				return unit ?? emptyUnit;
@@ -87,36 +82,16 @@ namespace MonoDevelop.CSharp.Completion
 				unit = value;
 			}
 		}
-		
-		public new MonoDevelop.Ide.Gui.Document Document {
-			get {
-				return base.document;
-			}
-		}
 
-		public ICompilation UnresolvedFileCompilation {
-			get;
-			set;
-		}
-		
-		public CSharpUnresolvedFile CSharpUnresolvedFile {
-			get;
-			set;
-		}
-		
 		public ParsedDocument ParsedDocument {
 			get {
-				return document.ParsedDocument;
+				return DocumentContext.ParsedDocument;
 			}
 		}
-		
-		public virtual ICompilation Compilation {
-			get { return Project != null ? TypeSystemService.GetCompilation (Project) : ProjectContent.CreateCompilation (); }
-		}
-		
+		 
 		public MonoDevelop.Projects.Project Project {
 			get {
-				return document.Project;
+				return DocumentContext.Project;
 			}
 		}
 		
@@ -125,8 +100,8 @@ namespace MonoDevelop.CSharp.Completion
 			get {
 				if (policy == null) {
 					IEnumerable<string> types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
-					if (Document.Project != null && Document.Project.Policies != null) {
-						policy = base.Document.Project.Policies.Get<CSharpFormattingPolicy> (types);
+					if (DocumentContext.Project != null && DocumentContext.Project.Policies != null) {
+						policy = base.DocumentContext.Project.Policies.Get<CSharpFormattingPolicy> (types);
 					} else {
 						policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types);
 					}
@@ -141,12 +116,38 @@ namespace MonoDevelop.CSharp.Completion
 			}
 		}
 
-		internal MDRefactoringContext MDRefactoringCtx {
-			get;
-			private set;
+		static Func<Microsoft.CodeAnalysis.Document, CancellationToken, Task<Microsoft.CodeAnalysis.Document>> WithFrozenPartialSemanticsAsync;
+		static List<ICompletionData> snippets;
+
+		static CSharpCompletionTextEditorExtension ()
+		{
+			var methodInfo = typeof(Microsoft.CodeAnalysis.Document).GetMethod ("WithFrozenPartialSemanticsAsync", System.Reflection.BindingFlags.Instance  | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.InvokeMethod);
+			if (methodInfo == null)
+				LoggingService.LogError ("Error in completion set up: Document.WithFrozenPartialSemanticsAsync not found!");
+			
+			WithFrozenPartialSemanticsAsync = (doc, token) => (Task<Microsoft.CodeAnalysis.Document>)methodInfo.Invoke (doc, new object[] { token });
+
+
+			CompletionEngine.SnippetCallback = delegate(CancellationToken arg) {
+				if (snippets != null)
+					return Task.FromResult ((IEnumerable<ICompletionData>)snippets);
+				var newSnippets = new List<ICompletionData> ();
+				foreach (var ct in MonoDevelop.Ide.CodeTemplates.CodeTemplateService.GetCodeTemplates ("text/x-csharp")) {
+					if (string.IsNullOrEmpty (ct.Shortcut) || ct.CodeTemplateContext != MonoDevelop.Ide.CodeTemplates.CodeTemplateContext.Standard)
+						continue;
+					newSnippets.Add (new RoslynCompletionData (null) {
+						CompletionText = ct.Shortcut,
+						DisplayText = ct.Shortcut,
+						Description = ct.Shortcut + Environment.NewLine + GettextCatalog.GetString (ct.Description),
+						Icon = ct.Icon
+					});
+				}
+				snippets = newSnippets;
+				return Task.FromResult ((IEnumerable<ICompletionData>)newSnippets);
+			};
+
 		}
 
-		
 		public CSharpCompletionTextEditorExtension ()
 		{
 		}
@@ -160,23 +161,27 @@ namespace MonoDevelop.CSharp.Completion
 		public CSharpCompletionTextEditorExtension (MonoDevelop.Ide.Gui.Document doc, bool addEventHandlersInInitialization = true) : this ()
 		{
 			this.addEventHandlersInInitialization = addEventHandlersInInitialization;
-			Initialize (doc);
+			Initialize (doc.Editor, doc);
 		}
 		
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
-			var parsedDocument = document.ParsedDocument;
+//			DocumentContext.DocumentParsed += HandleDocumentParsed;
+			additionalContextHandlers = new [] {
+				new ProtocolMemberContextHandler (this)
+			};
+
+			var parsedDocument = DocumentContext.ParsedDocument;
 			if (parsedDocument != null) {
-				this.Unit = parsedDocument.GetAst<SyntaxTree> ();
-				this.UnresolvedFileCompilation = Compilation;
-				this.CSharpUnresolvedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-				if (addEventHandlersInInitialization)
-					document.Editor.Caret.PositionChanged += HandlePositionChanged;
+//				this.Unit = parsedDocument.GetAst<SyntaxTree> ();
+//					this.UnresolvedFileCompilation = DocumentContext.Compilation;
+//					this.CSharpUnresolvedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
+//					Editor.CaretPositionChanged += HandlePositionChanged;
 			}
-
+			
 			if (addEventHandlersInInitialization)
-				Document.DocumentParsed += HandleDocumentParsed; 
+				DocumentContext.DocumentParsed += HandleDocumentParsed; 
 		}
 
 		CancellationTokenSource src = new CancellationTokenSource ();
@@ -186,46 +191,26 @@ namespace MonoDevelop.CSharp.Completion
 			src.Cancel ();
 			src = new CancellationTokenSource ();
 		}
-
-		void HandlePositionChanged (object sender, DocumentLocationEventArgs e)
-		{
-			StopPositionChangedTask ();
-			var doc = Document;
-			if (doc == null || doc.Editor == null)
-				return;
-			MDRefactoringContext.Create (doc, doc.Editor.Caret.Location, src.Token).ContinueWith (t => {
-				MDRefactoringCtx = t.Result;
-			}, TaskContinuationOptions.ExecuteSynchronously);
-		}
-		
+			
 		[CommandUpdateHandler (CodeGenerationCommands.ShowCodeGenerationWindow)]
 		public void CheckShowCodeGenerationWindow (CommandInfo info)
 		{
-			info.Enabled = TextEditorData != null && Document.GetContent<ICompletionWidget> () != null;
+			info.Enabled = Editor != null && DocumentContext.GetContent<ICompletionWidget> () != null;
 		}
 
 		[CommandHandler (CodeGenerationCommands.ShowCodeGenerationWindow)]
 		public void ShowCodeGenerationWindow ()
 		{
-			var completionWidget = Document.GetContent<ICompletionWidget> ();
+			var completionWidget = DocumentContext.GetContent<ICompletionWidget> ();
 			if (completionWidget == null)
 				return;
-			CodeCompletionContext completionContext = completionWidget.CreateCodeCompletionContext (TextEditorData.Caret.Offset);
-			GenerateCodeWindow.ShowIfValid (Document, completionContext);
+			CodeCompletionContext completionContext = completionWidget.CreateCodeCompletionContext (Editor.CaretOffset);
+			GenerateCodeWindow.ShowIfValid (Editor, DocumentContext, completionContext);
 		}
 
 		public override void Dispose ()
 		{
-			StopPositionChangedTask ();
-			unit = null;
-			CSharpUnresolvedFile = null;
-			UnresolvedFileCompilation = null;
-			Document.DocumentParsed -= HandleDocumentParsed;
-			if (unstableTypeSystemSegmentTree != null) {
-				unstableTypeSystemSegmentTree.RemoveListener ();
-				unstableTypeSystemSegmentTree = null;
-			}
-
+			DocumentContext.DocumentParsed -= HandleDocumentParsed;
 			if (validTypeSystemSegmentTree != null) {
 				validTypeSystemSegmentTree.RemoveListener ();
 				validTypeSystemSegmentTree = null;
@@ -236,30 +221,23 @@ namespace MonoDevelop.CSharp.Completion
 
 		void HandleDocumentParsed (object sender, EventArgs e)
 		{
-			var newDocument = Document.ParsedDocument;
-			if (newDocument == null) 
+			var parsedDocument = DocumentContext.ParsedDocument;
+			if (parsedDocument == null) 
 				return;
-			var newTree = TypeSystemSegmentTree.Create (newDocument, TextEditorData);
-
-			if (unstableTypeSystemSegmentTree != null)
-				unstableTypeSystemSegmentTree.RemoveListener ();
-
-			if (!newDocument.HasErrors) {
-				if (validTypeSystemSegmentTree != null)
-					validTypeSystemSegmentTree.RemoveListener ();
-				validTypeSystemSegmentTree = newTree;
-				unstableTypeSystemSegmentTree = null;
-			} else {
-				unstableTypeSystemSegmentTree = newTree;
-			}
-			newTree.InstallListener (document.Editor.Document);
+			var semanticModel = parsedDocument.GetAst<SemanticModel> ();
+			if (semanticModel == null) 
+				return;
+			var newTree = TypeSystemSegmentTree.Create (Editor, DocumentContext, semanticModel);
+
+			if (validTypeSystemSegmentTree != null)
+				validTypeSystemSegmentTree.RemoveListener ();
+			validTypeSystemSegmentTree = newTree;
+			newTree.InstallListener (Editor);
 
-			this.Unit = newDocument.GetAst<SyntaxTree> ();
-			this.CSharpUnresolvedFile = newDocument.ParsedFile as CSharpUnresolvedFile;
-			this.UnresolvedFileCompilation = Compilation;
 			if (TypeSegmentTreeUpdated != null)
 				TypeSegmentTreeUpdated (this, EventArgs.Empty);
 		}
+
 		public event EventHandler TypeSegmentTreeUpdated;
 
 		public void UpdateParsedDocument ()
@@ -267,11 +245,11 @@ namespace MonoDevelop.CSharp.Completion
 			HandleDocumentParsed (null, null);
 		}
 		
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			bool result = base.KeyPress (key, keyChar, modifier);
+			bool result = base.KeyPress (descriptor);
 			
-			if (/*EnableParameterInsight &&*/ (keyChar == ',' || keyChar == ')') && CanRunParameterCompletionCommand ())
+			if (/*EnableParameterInsight &&*/ (descriptor.KeyChar == ',' || descriptor.KeyChar == ')') && CanRunParameterCompletionCommand ())
 				base.RunParameterCompletionCommand ();
 			
 //			if (IsInsideComment ())
@@ -279,7 +257,7 @@ namespace MonoDevelop.CSharp.Completion
 			return result;
 		}
 		
-		public override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
+		public override Task<ICompletionDataList> HandleCodeCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
 //			if (!EnableCodeCompletion)
 //				return null;
@@ -288,17 +266,18 @@ namespace MonoDevelop.CSharp.Completion
 
 			//	var timer = Counters.ResolveTime.BeginTiming ();
 			try {
+				int triggerWordLength = 0;
 				if (char.IsLetterOrDigit (completionChar) || completionChar == '_') {
-					if (completionContext.TriggerOffset > 1 && char.IsLetterOrDigit (TextEditorData.GetCharAt (completionContext.TriggerOffset - 2)))
+					if (completionContext.TriggerOffset > 1 && char.IsLetterOrDigit (Editor.GetCharAt (completionContext.TriggerOffset - 2)))
 						return null;
 					triggerWordLength = 1;
 				}
-				return InternalHandleCodeCompletion (completionContext, completionChar, false, ref triggerWordLength);
+				return InternalHandleCodeCompletion (completionContext, completionChar, false, triggerWordLength, token);
 			} catch (Exception e) {
 				LoggingService.LogError ("Unexpected code completion exception." + Environment.NewLine + 
-					"FileName: " + Document.FileName + Environment.NewLine + 
+					"FileName: " + DocumentContext.Name + Environment.NewLine + 
 					"Position: line=" + completionContext.TriggerLine + " col=" + completionContext.TriggerLineOffset + Environment.NewLine + 
-					"Line text: " + TextEditorData.GetLineText (completionContext.TriggerLine), 
+					"Line text: " + Editor.GetLineText (completionContext.TriggerLine), 
 					e);
 				return null;
 			} finally {
@@ -309,10 +288,6 @@ namespace MonoDevelop.CSharp.Completion
 
 		class CSharpCompletionDataList : CompletionDataList
 		{
-			public CSharpResolver Resolver {
-				get;
-				set;
-			}
 		}
 
 		interface IListData
@@ -320,120 +295,147 @@ namespace MonoDevelop.CSharp.Completion
 			CSharpCompletionDataList List { get; set; }
 		}
 
-		ICompletionContextProvider CreateContextProvider ()
-		{
-			return new CompletionContextProvider (document.ParsedDocument, TextEditorData, validTypeSystemSegmentTree, unstableTypeSystemSegmentTree);
-		}
 
-		CSharpTypeResolveContext CreateTypeResolveContext ()
+		void AddImportCompletionData (CSharpCompletionDataList result, SemanticModel semanticModel, int position, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			var compilation = UnresolvedFileCompilation;
-			if (compilation == null)
-				return null;
-			var rctx = new CSharpTypeResolveContext (compilation.MainAssembly);
-			var loc = TextEditorData.Caret.Location;
-			rctx = rctx.WithUsingScope (CSharpUnresolvedFile.GetUsingScope (loc).Resolve (compilation));
-			int offset = TextEditorData.Caret.Offset;
-			var curDef = GetTypeAt (offset);
-			if (curDef != null) {
-				var resolvedDef = curDef.Resolve (rctx).GetDefinition ();
-				if (resolvedDef == null)
-					return rctx;
-				rctx = rctx.WithCurrentTypeDefinition (resolvedDef);
-				var foundMember = GetMemberAt (offset);
-				if (foundMember != null) {
-					var curMember = resolvedDef.Members.FirstOrDefault (m => m.Region.FileName == foundMember.Region.FileName && m.Region.Begin == foundMember.Region.Begin);
-					if (curMember != null)
-						rctx = rctx.WithCurrentMember (curMember);
+			if (result.Count == 0)
+				return;
+			var root = semanticModel.SyntaxTree.GetRoot ();
+			var node = root.FindNode (TextSpan.FromBounds (position, position));
+			var syntaxTree = root.SyntaxTree;
+
+			if (syntaxTree.IsInNonUserCode(position, cancellationToken) || 
+				syntaxTree.IsRightOfDotOrArrowOrColonColon(position, cancellationToken) || 
+				syntaxTree.GetContainingTypeOrEnumDeclaration(position, cancellationToken) is EnumDeclarationSyntax ||
+				syntaxTree.IsPreProcessorDirectiveContext(position, cancellationToken))
+				return;
+
+			var tokenLeftOfPosition = syntaxTree.FindTokenOnLeftOfPosition (position, cancellationToken);
+
+			if (syntaxTree.IsGlobalStatementContext (position, cancellationToken) ||
+			    syntaxTree.IsExpressionContext (position, tokenLeftOfPosition, true, cancellationToken) ||
+			    syntaxTree.IsStatementContext (position, tokenLeftOfPosition, cancellationToken) ||
+			    syntaxTree.IsTypeContext (position, cancellationToken) ||
+			    syntaxTree.IsTypeDeclarationContext (position, tokenLeftOfPosition, cancellationToken) ||
+			    syntaxTree.IsNamespaceContext (position, cancellationToken) ||
+			    syntaxTree.IsMemberDeclarationContext (position, tokenLeftOfPosition, cancellationToken) ||
+			    syntaxTree.IsLabelContext (position, cancellationToken)) {
+				var usedNamespaces = new HashSet<string> ();
+				foreach (var un in semanticModel.GetUsingNamespacesInScope (node)) {
+					usedNamespaces.Add (un.GetFullName ()); 
 				}
-			}
+				var enclosingNamespaceName = semanticModel.GetEnclosingNamespace (position, cancellationToken).GetFullName ();
 
-			return rctx;
+				var stack = new Stack<INamespaceOrTypeSymbol>();
+				foreach (var member in semanticModel.Compilation.GlobalNamespace.GetNamespaceMembers ())
+					stack.Push (member);
+
+				while (stack.Count > 0) {
+					if (cancellationToken.IsCancellationRequested)
+						break;
+					var current = stack.Pop();
+					var currentNs = current as INamespaceSymbol;
+					if (currentNs != null) {
+						var currentNsName = currentNs.GetFullName ();
+						if (usedNamespaces.Contains (currentNsName) ||
+							enclosingNamespaceName == currentNsName ||
+							(enclosingNamespaceName.StartsWith (currentNsName) &&
+							enclosingNamespaceName [currentNsName.Length] == '.')) {
+							foreach (var member in currentNs.GetNamespaceMembers ())
+								stack.Push (member);
+						} else {
+							foreach (var member in currentNs.GetMembers())
+								stack.Push (member);
+						}
+					} else {
+						var type = (INamedTypeSymbol)current;
+						if (type.IsImplicitClass || type.IsScriptClass)
+							continue;
+						if (type.DeclaredAccessibility != Accessibility.Public) {
+							if (type.DeclaredAccessibility != Accessibility.Internal)
+								continue;
+							if (!type.IsAccessibleWithin (semanticModel.Compilation.Assembly))
+								continue;
+						}
+						result.Add (new ImportSymbolCompletionData (this, type, false));
+					}
+				}
+			}
 		}
-		CompletionEngineCache cache = new CompletionEngineCache ();
-		ICompletionDataList InternalHandleCodeCompletion (CodeCompletionContext completionContext, char completionChar, bool ctrlSpace, ref int triggerWordLength)
+
+		IEnumerable<CompletionContextHandler> additionalContextHandlers;
+
+		Task<ICompletionDataList> InternalHandleCodeCompletion (CodeCompletionContext completionContext, char completionChar, bool ctrlSpace, int triggerWordLength, CancellationToken token)
 		{
-			var data = TextEditorData;
-			if (data.CurrentMode is TextLinkEditMode) {
-				if (((TextLinkEditMode)data.CurrentMode).TextLinkMode == TextLinkMode.EditIdentifier)
-					return null;
-			}
-			if (Unit == null || CSharpUnresolvedFile == null)
-				return null;
-			if(unstableTypeSystemSegmentTree == null && validTypeSystemSegmentTree == null)
+			if (Editor.EditMode != MonoDevelop.Ide.Editor.EditMode.Edit)
 				return null;
+//			var data = Editor;
+//			if (data.CurrentMode is TextLinkEditMode) {
+//				if (((TextLinkEditMode)data.CurrentMode).TextLinkMode == TextLinkMode.EditIdentifier)
+//					return null;
+//			}
+			var offset = Editor.CaretOffset;
 
 			var list = new CSharpCompletionDataList ();
-			list.Resolver = CSharpUnresolvedFile != null ? CSharpUnresolvedFile.GetResolver (UnresolvedFileCompilation, TextEditorData.Caret.Location) : new CSharpResolver (Compilation);
-			var ctx = CreateTypeResolveContext ();
-			if (ctx == null)
-				return null;
-			var completionDataFactory = new CompletionDataFactory (this, new CSharpResolver (ctx));
-			if (MDRefactoringCtx == null) {
-				src.Cancel ();
-				MDRefactoringCtx = MDRefactoringContext.Create (Document, TextEditorData.Caret.Location).Result;
-			}
+			list.TriggerWordLength = triggerWordLength;
+			try {
+				var analysisDocument = DocumentContext.AnalysisDocument;
+				if (analysisDocument == null)
+					return null;
+				
+				var partialDoc = WithFrozenPartialSemanticsAsync (analysisDocument, token).Result;
+				var semanticModel = partialDoc.GetSemanticModelAsync ().Result;
+
+				var engine = new CompletionEngine (TypeSystemService.Workspace, new RoslynCodeCompletionFactory (this, semanticModel));
+				var ctx = new ICSharpCode.NRefactory6.CSharp.CompletionContext (partialDoc, offset, semanticModel);
+				ctx.AdditionalContextHandlers = additionalContextHandlers;
+				var triggerInfo = new CompletionTriggerInfo (ctrlSpace ? CompletionTriggerReason.CompletionCommand : CompletionTriggerReason.CharTyped, completionChar);
+				var completionResult = engine.GetCompletionDataAsync (ctx, triggerInfo, token).Result;
+				if (completionResult == CompletionResult.Empty)
+					return null;
 
-			var engine = new MonoCSharpCompletionEngine (
-				this,
-				data.Document,
-				CreateContextProvider (),
-				completionDataFactory,
-				ProjectContent,
-				ctx
-			);
-			completionDataFactory.Engine = engine;
-			engine.AutomaticallyAddImports = AddImportedItemsToCompletionList.Value;
-			engine.IncludeKeywordsInCompletionList = EnableAutoCodeCompletion || IncludeKeywordsInCompletionList.Value;
-			engine.CompletionEngineCache = cache;
-			if (FilterCompletionListByEditorBrowsable) {
-				engine.EditorBrowsableBehavior = IncludeEditorBrowsableAdvancedMembers ? EditorBrowsableBehavior.IncludeAdvanced : EditorBrowsableBehavior.Normal;
-			} else {
-				engine.EditorBrowsableBehavior = EditorBrowsableBehavior.Ignore;
-			}
-			if (Document.HasProject && MonoDevelop.Ide.IdeApp.IsInitialized) {
-				var configuration = Document.Project.GetConfiguration (MonoDevelop.Ide.IdeApp.Workspace.ActiveConfiguration) as DotNetProjectConfiguration;
-				var par = configuration != null ? configuration.CompilationParameters as CSharpCompilerParameters : null;
-				if (par != null)
-					engine.LanguageVersion = MonoDevelop.CSharp.Parser.TypeSystemParser.ConvertLanguageVersion (par.LangVersion);
-			}
+				foreach (var symbol in completionResult) {
+					list.Add ((CompletionData)symbol); 
+				}
 
-			engine.FormattingPolicy = FormattingPolicy.CreateOptions ();
-			engine.EolMarker = data.EolMarker;
-			engine.IndentString = data.Options.IndentationString;
-			try {
-				foreach (var cd in engine.GetCompletionData (completionContext.TriggerOffset, ctrlSpace)) {
-					list.Add (cd);
-					if (cd is IListData)
-						((IListData)cd).List = list;
+				if (AddImportedItemsToCompletionList.Value && list.OfType<RoslynSymbolCompletionData> ().Any (cd => cd.Symbol is ITypeSymbol)) {
+					AddImportCompletionData (list, semanticModel, offset, token);
 				}
+
+				list.AutoCompleteEmptyMatch = completionResult.AutoCompleteEmptyMatch;
+				// list.AutoCompleteEmptyMatchOnCurlyBrace = completionResult.AutoCompleteEmptyMatchOnCurlyBracket;
+				list.AutoSelect = completionResult.AutoSelect;
+				list.DefaultCompletionString = completionResult.DefaultCompletionString;
+				// list.CloseOnSquareBrackets = completionResult.CloseOnSquareBrackets;
+				if (ctrlSpace)
+					list.AutoCompleteUniqueMatch = true;
+			} catch (OperationCanceledException) {
+				return null;
+			} catch (AggregateException e) {
+				foreach (var inner in e.Flatten ().InnerExceptions)
+					LoggingService.LogError ("Error while getting C# recommendations", inner); 
 			} catch (Exception e) {
-				LoggingService.LogError ("Error while getting completion data.", e);
+				LoggingService.LogError ("Error while getting C# recommendations", e); 
 			}
-			list.AutoCompleteEmptyMatch = engine.AutoCompleteEmptyMatch;
-			list.AutoCompleteEmptyMatchOnCurlyBrace = engine.AutoCompleteEmptyMatchOnCurlyBracket;
-			list.AutoSelect = engine.AutoSelect;
-			list.DefaultCompletionString = engine.DefaultCompletionString;
-			list.CloseOnSquareBrackets = engine.CloseOnSquareBrackets;
-			if (ctrlSpace)
-				list.AutoCompleteUniqueMatch = true;
-			return list.Count > 0 ? list : null;
+			return Task.FromResult ((ICompletionDataList)list);
 		}
 		
 		public override ICompletionDataList CodeCompletionCommand (CodeCompletionContext completionContext)
 		{
 			int triggerWordLength = 0;
-			char ch = completionContext.TriggerOffset > 0 ? TextEditorData.GetCharAt (completionContext.TriggerOffset - 1) : '\0';
-			return InternalHandleCodeCompletion (completionContext, ch, true, ref triggerWordLength);
+			char ch = completionContext.TriggerOffset > 0 ? Editor.GetCharAt (completionContext.TriggerOffset - 1) : '\0';
+			return InternalHandleCodeCompletion (completionContext, ch, true, triggerWordLength, default(CancellationToken)).Result;
 		}
 
-		static bool HasAllUsedParameters (IParameterDataProvider provider, List<string> list, int n)
+		static bool HasAllUsedParameters (MonoDevelop.Ide.CodeCompletion.ParameterHintingData provider, string[] list)
 		{
-			int pc = provider.GetParameterCount (n);
+			if (provider == null || list == null)
+				return true;
+			int pc = provider.ParameterCount;
 			foreach (var usedParam in list) {
 				bool found = false;
 				for (int m = 0; m < pc; m++) {
-					if (usedParam == provider.GetParameterName (n, m)){
+					if (usedParam == provider.GetParameterName (m)){
 						found = true;
 						break;
 					}
@@ -443,29 +445,24 @@ namespace MonoDevelop.CSharp.Completion
 			}
 			return true;
 		}
-		public override int GuessBestMethodOverload (IParameterDataProvider provider, int currentOverload)
+		
+		public override int GuessBestMethodOverload (MonoDevelop.Ide.CodeCompletion.ParameterHintingResult provider, int currentOverload)
 		{
-			var ctx = CreateTypeResolveContext ();
-			if (ctx == null)
+			var analysisDocument = DocumentContext.AnalysisDocument;
+			if (analysisDocument == null)
 				return -1;
-			var engine = new CSharpParameterCompletionEngine (
-				TextEditorData.Document,
-				CreateContextProvider (),
-				this,
-				ProjectContent,
-				ctx
-				);
-			List<string> list;
-			int cparam = engine.GetCurrentParameterIndex (provider.StartOffset, TextEditorData.Caret.Offset, out list);
-			if (cparam > provider.GetParameterCount (currentOverload) && !provider.AllowParameterList (currentOverload) || !HasAllUsedParameters (provider, list, currentOverload)) {
+			var result = ICSharpCode.NRefactory6.CSharp.ParameterUtil.GetCurrentParameterIndex (analysisDocument, provider.StartOffset, Editor.CaretOffset).Result;
+			var cparam = result.ParameterIndex;
+			var list = result.UsedNamespaceParameters;
+			if (cparam > provider[currentOverload].ParameterCount && !provider[currentOverload].IsParameterListAllowed || !HasAllUsedParameters (provider[currentOverload], list)) {
 				// Look for an overload which has more parameters
 				int bestOverload = -1;
 				int bestParamCount = int.MaxValue;
 				for (int n = 0; n < provider.Count; n++) {
-					int pc = provider.GetParameterCount (n);
+					int pc = provider[n].ParameterCount;
 					if (pc < bestParamCount && pc >= cparam) {
 
-						if (HasAllUsedParameters (provider, list, n)) {
+						if (HasAllUsedParameters (provider[n], list)) {
 							bestOverload = n;
 							bestParamCount = pc;
 						}
@@ -475,7 +472,7 @@ namespace MonoDevelop.CSharp.Completion
 				}
 				if (bestOverload == -1) {
 					for (int n=0; n<provider.Count; n++) {
-						if (provider.AllowParameterList (n) && HasAllUsedParameters (provider, list, n)) {
+						if (provider[n].IsParameterListAllowed && HasAllUsedParameters (provider[n], list)) {
 							bestOverload = n;
 							break;
 						}
@@ -487,12 +484,12 @@ namespace MonoDevelop.CSharp.Completion
 		}
 
 		
-		static bool ContainsPublicConstructors (ITypeDefinition t)
-		{
-			if (t.Methods.Count (m => m.IsConstructor) == 0)
-				return true;
-			return t.Methods.Any (m => m.IsConstructor && m.IsPublic);
-		}
+//		static bool ContainsPublicConstructors (ITypeDefinition t)
+//		{
+//			if (t.Methods.Count (m => m.IsConstructor) == 0)
+//				return true;
+//			return t.Methods.Any (m => m.IsConstructor && m.IsPublic);
+//		}
 
 
 //			CompletionDataList result = new ProjectDomCompletionDataList ();
@@ -600,140 +597,66 @@ namespace MonoDevelop.CSharp.Completion
 //			}
 //		}
 		
-		public override ParameterDataProvider HandleParameterCompletion (CodeCompletionContext completionContext, char completionChar)
+
+		public override Task<MonoDevelop.Ide.CodeCompletion.ParameterHintingResult> HandleParameterCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
-//			if (!EnableCodeCompletion)
-//				return null;
-			if (Unit == null || CSharpUnresolvedFile == null)
+			var data = Editor;
+			if (completionChar != '(' && completionChar != ',')
 				return null;
-			var ctx = CreateTypeResolveContext ();
-			if (ctx == null)
+			if (Editor.EditMode != MonoDevelop.Ide.Editor.EditMode.Edit)
 				return null;
+			var offset = Editor.CaretOffset;
 
 			if (completionChar != '(' && completionChar != ',')
 				return null;
-
 			try {
-				var engine = new CSharpParameterCompletionEngine (
-					TextEditorData.Document,
-					CreateContextProvider (),
-					this,
-					ProjectContent,
-					ctx
-				);
-				return engine.GetParameterDataProvider (completionContext.TriggerOffset, completionChar) as ParameterDataProvider;
+
+				var analysisDocument = DocumentContext.AnalysisDocument;
+				if (analysisDocument == null)
+					return null;
+				var partialDoc = WithFrozenPartialSemanticsAsync (analysisDocument, token).Result;
+				var semanticModel = partialDoc.GetSemanticModelAsync ().Result;
+					var engine = new ParameterHintingEngine (TypeSystemService.Workspace, new RoslynParameterHintingFactory ());
+				var result = engine.GetParameterDataProviderAsync (analysisDocument, semanticModel, offset, token).Result;
+				return Task.FromResult (new MonoDevelop.Ide.CodeCompletion.ParameterHintingResult (result.OfType<MonoDevelop.Ide.CodeCompletion.ParameterHintingData>().ToList (), result.StartOffset));
 			} catch (Exception e) {
 				LoggingService.LogError ("Unexpected parameter completion exception." + Environment.NewLine + 
-					"FileName: " + Document.FileName + Environment.NewLine + 
+					"FileName: " + DocumentContext.Name + Environment.NewLine + 
 					"Position: line=" + completionContext.TriggerLine + " col=" + completionContext.TriggerLineOffset + Environment.NewLine + 
-					"Line text: " + TextEditorData.GetLineText (completionContext.TriggerLine), 
+					"Line text: " + Editor.GetLineText (completionContext.TriggerLine), 
 					e);
-				return null;
-			} finally {
-				//			if (timer != null)
-				//				timer.Dispose ();
 			}
+			return null;
 		}
 		
-		List<string> GetUsedNamespaces ()
-		{
-			var scope = CSharpUnresolvedFile.GetUsingScope (TextEditorData.Caret.Location);
-			var result = new List<string> ();
-			while (scope != null) {
-				result.Add (scope.NamespaceName);
-				var ctx = CSharpUnresolvedFile.GetResolver (Compilation, scope.Region.Begin);
-				foreach (var u in scope.Usings) {
-					var ns = u.ResolveNamespace (ctx);
-					if (ns == null)
-						continue;
-					result.Add (ns.FullName);
-				}
-				scope = scope.Parent;
-			}
-			return result;
-		}
-
-		public override bool GetParameterCompletionCommandOffset (out int cpos)
-		{
-			var ctx = CreateTypeResolveContext ();
-			if (ctx == null) {
-				cpos = -1;
-				return false;
-			}
-
-			var engine = new CSharpParameterCompletionEngine (
-				TextEditorData.Document,
-				CreateContextProvider (),
-				this,
-				ProjectContent,
-				ctx
-			);
-			engine.SetOffset (TextEditorData.Caret.Offset);
-			return engine.GetParameterCompletionCommandOffset (out cpos);
-		}
+//		List<string> GetUsedNamespaces ()
+//		{
+//			var scope = CSharpUnresolvedFile.GetUsingScope (document.Editor.Caret.Location);
+//			var result = new List<string> ();
+//			while (scope != null) {
+//				result.Add (scope.NamespaceName);
+//				var ctx = CSharpUnresolvedFile.GetResolver (Document.Compilation, scope.Region.Begin);
+//				foreach (var u in scope.Usings) {
+//					var ns = u.ResolveNamespace (ctx);
+//					if (ns == null)
+//						continue;
+//					result.Add (ns.FullName);
+//				}
+//				scope = scope.Parent;
+//			}
+//			return result;
+//		}
 
 		public override int GetCurrentParameterIndex (int startOffset)
 		{
-			var ctx = CreateTypeResolveContext ();
-			if (ctx == null)
+			var analysisDocument = DocumentContext.AnalysisDocument;
+			if (analysisDocument == null)
 				return -1;
-
-			var engine = new CSharpParameterCompletionEngine (
-				TextEditorData.Document,
-				CreateContextProvider (),
-				this,
-				ProjectContent,
-				ctx
-			);
-			List<string> list;
-			return engine.GetCurrentParameterIndex (startOffset, TextEditorData.Caret.Offset, out list);
+ 			var result = ICSharpCode.NRefactory6.CSharp.ParameterUtil.GetCurrentParameterIndex (analysisDocument, startOffset, Editor.CaretOffset).Result;
+			return result.ParameterIndex;
 		}
-		/*
-		internal int GetCurrentParameterIndex (ICompletionWidget widget, int offset, int memberStart)
-		{
-			int cursor = widget.CurrentCodeCompletionContext.TriggerOffset;
-			int i = offset;
-			if (i > cursor)
-				return -1;
-			if (i == cursor) 
-				return 1; // parameters are 1 based
-			var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
-			var engine = new CSharpIndentEngine (MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types));
-			int index = memberStart + 1;
-			int parentheses = 0;
-			int bracket = 0;
-			do {
-				char c = widget.GetChar (i - 1);
-				engine.Push (c);
-				switch (c) {
-				case '{':
-					if (!engine.IsInsideOrdinaryCommentOrString)
-						bracket++;
-					break;
-				case '}':
-					if (!engine.IsInsideOrdinaryCommentOrString)
-						bracket--;
-					break;
-				case '(':
-					if (!engine.IsInsideOrdinaryCommentOrString)
-						parentheses++;
-					break;
-				case ')':
-					if (!engine.IsInsideOrdinaryCommentOrString)
-						parentheses--;
-					break;
-				case ',':
-					if (!engine.IsInsideOrdinaryCommentOrString && parentheses == 1 && bracket == 0)
-						index++;
-					break;
-				}
-				i++;
-			} while (i <= cursor && parentheses >= 0);
-			
-			return parentheses != 1 || bracket > 0 ? -1 : index;
-		}*/
-
 
+/*
 		#region ICompletionDataFactory implementation
 		internal class CompletionDataFactory : ICompletionDataFactory
 		{
@@ -801,12 +724,12 @@ namespace MonoDevelop.CSharp.Completion
 					return tooltipFunc != null ? tooltipFunc (List, smartWrap) : new TooltipInformation ();
 				}
 
-				protected List<ICompletionData> overloads;
+				protected List<ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData> overloads;
 				public override bool HasOverloads {
 					get { return overloads != null && overloads.Count > 0; }
 				}
 
-				public override IEnumerable<ICompletionData> OverloadedData {
+				public override IEnumerable<ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData> OverloadedData {
 					get {
 						return overloads;
 					}
@@ -821,10 +744,10 @@ namespace MonoDevelop.CSharp.Completion
 					overloads.Add (data);
 				}
 
-				public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+				public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 				{
 					var currentWord = GetCurrentWord (window);
-					if (CompletionText == "new()" && keyChar == '(') {
+					if (CompletionText == "new()" && descriptor.KeyChar == '(') {
 						window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, currentWord, "new");
 					} else {
 						window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, currentWord, CompletionText);
@@ -879,7 +802,7 @@ namespace MonoDevelop.CSharp.Completion
 				public override TooltipInformation CreateTooltipInformation (bool smartWrap)
 				{
 					var def = type.GetDefinition ();
-					var result = def != null ? MemberCompletionData.CreateTooltipInformation (compilation, file, List.Resolver, ext.TextEditorData, ext.FormattingPolicy, def, smartWrap)  : new TooltipInformation ();
+					var result = def != null ? MemberCompletionData.CreateTooltipInformation (compilation, file, List.Resolver, ext.Editor, ext.FormattingPolicy, def, smartWrap)  : new TooltipInformation ();
 					if (ConflictingTypes != null) {
 						var conflicts = new StringBuilder ();
 						var sig = new SignatureMarkupCreator (List.Resolver, ext.FormattingPolicy.CreateOptions ());
@@ -1024,11 +947,11 @@ namespace MonoDevelop.CSharp.Completion
 
 
 
-				public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+				public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 				{
 					var currentWord = GetCurrentWord (window);
 					var text = CompletionText;
-					if (keyChar != '>')
+					if (descriptor.KeyChar != '>')
 						text += ">";
 					window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, currentWord, text);
 				}
@@ -1065,7 +988,7 @@ namespace MonoDevelop.CSharp.Completion
 			}
 			ICompletionData ICompletionDataFactory.CreateNewPartialCompletionData (int declarationBegin, IUnresolvedTypeDefinition type, IUnresolvedMember m)
 			{
-				var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.TextEditorData.Caret.Location);
+				var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.Editor.CaretLocation);
 				return new NewOverrideCompletionData (ext, declarationBegin, type, m.CreateResolved (ctx));
 			}
 			IEnumerable<ICompletionData> ICompletionDataFactory.CreateCodeTemplateCompletionData ()
@@ -1079,7 +1002,7 @@ namespace MonoDevelop.CSharp.Completion
 			
 			IEnumerable<ICompletionData> ICompletionDataFactory.CreatePreProcessorDefinesCompletionData ()
 			{
-				var project = ext.document.Project;
+				var project = ext.DocumentContext.Project;
 				if (project == null)
 					yield break;
 				var configuration = project.GetConfiguration (MonoDevelop.Ide.IdeApp.Workspace.ActiveConfiguration) as DotNetProjectConfiguration;
@@ -1148,352 +1071,16 @@ namespace MonoDevelop.CSharp.Completion
 			}
 
 
-			class ImportSymbolCompletionData : CompletionData, IEntityCompletionData
-			{
-				readonly IType type;
-				readonly bool useFullName;
-				readonly CSharpCompletionTextEditorExtension ext;
-				public IType Type {
-					get { return this.type; }
-				}
-
-				public ImportSymbolCompletionData (CSharpCompletionTextEditorExtension ext, bool useFullName, IType type, bool addConstructors)
-				{
-					this.ext = ext;
-					this.useFullName = useFullName;
-					this.type = type;
-					this.DisplayFlags |= ICSharpCode.NRefactory.Completion.DisplayFlags.IsImportCompletion;
-				}
-
-				public override TooltipInformation CreateTooltipInformation (bool smartWrap)
-				{
-					return MemberCompletionData.CreateTooltipInformation (ext, null, type.GetDefinition (), smartWrap);
-				}
-
-				bool initialized = false;
-				bool generateUsing, insertNamespace;
-
-				void Initialize ()
-				{
-					if (initialized)
-						return;
-					initialized = true;
-					if (string.IsNullOrEmpty (type.Namespace)) 
-						return;
-					generateUsing = !useFullName;
-					insertNamespace = useFullName;
-				}
-
-				#region IActionCompletionData implementation
-				public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
-				{
-					Initialize ();
-					var doc = ext.document;
-					using (var undo = doc.Editor.OpenUndoGroup ()) {
-						string text = insertNamespace ? type.Namespace + "." + type.Name : type.Name;
-						if (text != GetCurrentWord (window)) {
-							if (window.WasShiftPressed && generateUsing) 
-								text = type.Namespace + "." + text;
-							window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, GetCurrentWord (window), text);
-						}
-					
-						if (!window.WasShiftPressed && generateUsing) {
-							var generator = CodeGenerator.CreateGenerator (doc);
-							if (generator != null) {
-								generator.AddGlobalNamespaceImport (doc, type.Namespace);
-								// reparse
-								doc.UpdateParseDocument ();
-							}
-						}
-					}
-					ka |= KeyActions.Ignore;
-				}
-				#endregion
-
-				#region ICompletionData implementation
-				public override IconId Icon {
-					get {
-						return type.GetStockIcon ();
-					}
-				}
-				
-				public override string DisplayText {
-					get {
-						return type.Name;
-					}
-				}
-
-				static string GetDefaultDisplaySelection (string description, bool isSelected)
-				{
-					if (!isSelected)
-						return "<span foreground=\"darkgray\">" + description + "</span>";
-					return description;
-				}
-
-				string displayDescription = null;
-				public override string GetDisplayDescription (bool isSelected)
-				{
-					if (displayDescription == null) {
-						Initialize ();
-						if (generateUsing || insertNamespace) {
-							displayDescription = string.Format (GettextCatalog.GetString ("(from '{0}')"), type.Namespace);
-						} else {
-							displayDescription = "";
-						}
-					}
-					return GetDefaultDisplaySelection (displayDescription, isSelected);
-				}
-
-				public override string Description {
-					get {
-						return type.Namespace;
-					}
-				}
-
-				public override string CompletionText {
-					get {
-						return type.Name;
-					}
-				}
-				#endregion
-
-
-				List<CompletionData> overloads;
-
-				public override IEnumerable<ICompletionData> OverloadedData {
-					get {
-						yield return this;
-						if (overloads == null)
-							yield break;
-						foreach (var overload in overloads)
-							yield return overload;
-					}
-				}
-
-				public override bool HasOverloads {
-					get { return overloads != null && overloads.Count > 0; }
-				}
-
-				public override void AddOverload (ICSharpCode.NRefactory.Completion.ICompletionData data)
-				{
-					AddOverload ((ImportSymbolCompletionData)data);
-				}
-
-				void AddOverload (ImportSymbolCompletionData overload)
-				{
-					if (overloads == null)
-						overloads = new List<CompletionData> ();
-					overloads.Add (overload);
-				}
-
-				IEntity IEntityCompletionData.Entity {
-					get {
-						return type.GetDefinition ();
-					}
-				}
-			}
-
-
-			ICompletionData ICompletionDataFactory.CreateImportCompletionData(IType type, bool useFullName, bool addConstructors)
-			{
-				return new ImportSymbolCompletionData (ext, useFullName, type, addConstructors);
-			}
-
-		}
+			
 		#endregion
-
-		#region IParameterCompletionDataFactory implementation
-		IParameterDataProvider IParameterCompletionDataFactory.CreateConstructorProvider (int startOffset, IType type)
-		{
-			return new ConstructorParameterDataProvider (startOffset, this, type);
-		}
-
-		IParameterDataProvider IParameterCompletionDataFactory.CreateConstructorProvider (int startOffset, IType type, AstNode initializer)
-		{
-			return new ConstructorParameterDataProvider (startOffset, this, type, initializer);
-		}
-
-		IParameterDataProvider IParameterCompletionDataFactory.CreateMethodDataProvider (int startOffset, IEnumerable<IMethod> methods)
-		{
-			return new MethodParameterDataProvider (startOffset, this, methods);
-		}
-		
-		IParameterDataProvider IParameterCompletionDataFactory.CreateDelegateDataProvider (int startOffset, IType type)
-		{
-			return new DelegateDataProvider (startOffset, this, type);
-		}
+*/
 		
-		IParameterDataProvider IParameterCompletionDataFactory.CreateIndexerParameterDataProvider (int startOffset, IType type, IEnumerable<IProperty> indexers, AstNode resolvedNode)
-		{
-			var arrayType = type as ArrayType;
-			if (arrayType != null)
-				return new ArrayTypeParameterDataProvider (startOffset, this, arrayType);
-			return new IndexerParameterDataProvider (startOffset, this, type, indexers, resolvedNode);
-		}
-		
-		IParameterDataProvider IParameterCompletionDataFactory.CreateTypeParameterDataProvider (int startOffset, IEnumerable<IType> types)
-		{
-			return new TypeParameterDataProvider (startOffset, this, types);
-		}
-
-		IParameterDataProvider IParameterCompletionDataFactory.CreateTypeParameterDataProvider (int startOffset, IEnumerable<IMethod> methods)
-		{
-			return new TypeParameterDataProvider (startOffset, this, methods);
-		}
-		#endregion
 
 		#region IDebuggerExpressionResolver implementation
 
-		static string GetIdentifierName (TextEditorData editor, Identifier id, out int startOffset)
-		{
-			startOffset = editor.LocationToOffset (id.StartLocation.Line, id.StartLocation.Column);
-
-			return editor.GetTextBetween (id.StartLocation, id.EndLocation);
-		}
-
-		internal static string ResolveExpression (TextEditorData editor, ResolveResult result, AstNode node, out int startOffset)
-		{
-			//Console.WriteLine ("result is a {0}", result.GetType ().Name);
-			startOffset = -1;
-
-			if (result is NamespaceResolveResult ||
-				result is ConversionResolveResult ||
-				result is ConstantResolveResult ||
-				result is ForEachResolveResult ||
-				result is TypeIsResolveResult ||
-				result is TypeOfResolveResult ||
-				result is ErrorResolveResult)
-				return null;
-
-			if (result.IsCompileTimeConstant)
-				return null;
-
-			startOffset = editor.LocationToOffset (node.StartLocation.Line, node.StartLocation.Column);
-
-			if (result is InvocationResolveResult) {
-				var ir = (InvocationResolveResult) result;
-				if (ir.Member.Name == ".ctor") {
-					// if the user is hovering over something like "new Abc (...)", we want to show them type information for Abc
-					return ir.Member.DeclaringType.FullName;
-				}
-
-				// do not support general method invocation for tooltips because it could cause side-effects
-				return null;
-			} else if (result is LocalResolveResult) {
-				if (node is ParameterDeclaration) {
-					// user is hovering over a method parameter, but we don't want to include the parameter type
-					var param = (ParameterDeclaration) node;
-
-					return GetIdentifierName (editor, param.NameToken, out startOffset);
-				}
-
-				if (node is VariableInitializer) {
-					// user is hovering over something like "int fubar = 5;", but we don't want the expression to include the " = 5"
-					var variable = (VariableInitializer) node;
-
-					return GetIdentifierName (editor, variable.NameToken, out startOffset);
-				}
-			} else if (result is MemberResolveResult) {
-				var mr = (MemberResolveResult) result;
-
-				if (node is PropertyDeclaration) {
-					var prop = (PropertyDeclaration) node;
-					var name = GetIdentifierName (editor, prop.NameToken, out startOffset);
-
-					// if the property is static, then we want to return "Full.TypeName.Property"
-					if (prop.Modifiers.HasFlag (Modifiers.Static))
-						return mr.Member.DeclaringType.FullName + "." + name;
-
-					// otherwise we want to return "this.Property" so that it won't conflict with anything else in the local scope
-					return "this." + name;
-				}
-
-				if (node is FieldDeclaration) {
-					var field = (FieldDeclaration) node;
-					var name = GetIdentifierName (editor, field.NameToken, out startOffset);
-
-					// if the field is static, then we want to return "Full.TypeName.Field"
-					if (field.Modifiers.HasFlag (Modifiers.Static))
-						return mr.Member.DeclaringType.FullName + "." + name;
-
-					// otherwise we want to return "this.Field" so that it won't conflict with anything else in the local scope
-					return "this." + name;
-				}
-
-				if (node is VariableInitializer) {
-					// user is hovering over a field declaration that includes initialization
-					var variable = (VariableInitializer) node;
-					var name = GetIdentifierName (editor, variable.NameToken, out startOffset);
-
-					// walk up the AST to find the FieldDeclaration so that we can determine if it is static or not
-					var field = variable.GetParent<FieldDeclaration> ();
-
-					// if the field is static, then we want to return "Full.TypeName.Field"
-					if (field.Modifiers.HasFlag (Modifiers.Static))
-						return mr.Member.DeclaringType.FullName + "." + name;
-
-					// otherwise we want to return "this.Field" so that it won't conflict with anything else in the local scope
-					return "this." + name;
-				}
-
-				if (node is NamedExpression) {
-					// user is hovering over 'Property' in an expression like: var fubar = new Fubar () { Property = baz };
-					var variable = node.GetParent<VariableInitializer> ();
-					if (variable != null) {
-						var variableName = GetIdentifierName (editor, variable.NameToken, out startOffset);
-						var name = GetIdentifierName (editor, ((NamedExpression) node).NameToken, out startOffset);
-
-						return variableName + "." + name;
-					}
-				}
-			} else if (result is TypeResolveResult) {
-				return ((TypeResolveResult) result).Type.FullName;
-			}
-
-			return editor.GetTextBetween (node.StartLocation, node.EndLocation);
-		}
-
-		static bool TryResolveAt (Document doc, DocumentLocation loc, out ResolveResult result, out AstNode node)
-		{
-			if (doc == null)
-				throw new ArgumentNullException ("doc");
-
-			result = null;
-			node = null;
-
-			var parsedDocument = doc.ParsedDocument;
-			if (parsedDocument == null)
-				return false;
-
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-
-			if (unit == null || parsedFile == null)
-				return false;
-
-			try {
-				result = ResolveAtLocation.Resolve (new Lazy<ICompilation> (() => doc.Compilation), parsedFile, unit, loc, out node);
-				if (result == null || node is Statement)
-					return false;
-			} catch {
-				return false;
-			}
-
-			return true;
-		}
-
-		string IDebuggerExpressionResolver.ResolveExpression (TextEditorData editor, Document doc, int offset, out int startOffset)
+		async Task<DebugDataTipInfo> IDebuggerExpressionResolver.ResolveExpressionAsync (IReadonlyTextDocument editor, DocumentContext doc, int offset, CancellationToken cancellationToken)
 		{
-			ResolveResult result;
-			AstNode node;
-
-			var loc = editor.OffsetToLocation (offset);
-			if (!TryResolveAt (doc, loc, out result, out node)) {
-				startOffset = -1;
-				return null;
-			}
-
-			return ResolveExpression (editor, result, node, out startOffset);
+			return await Resolver.DebuggerExpressionResolver.ResolveAsync (editor, doc, offset, cancellationToken);
 		}
 
 		#endregion
@@ -1501,16 +1088,15 @@ namespace MonoDevelop.CSharp.Completion
 		#region TypeSystemSegmentTree
 
 		TypeSystemSegmentTree validTypeSystemSegmentTree;
-		TypeSystemSegmentTree unstableTypeSystemSegmentTree;
 
 		internal class TypeSystemTreeSegment : TreeSegment
 		{
-			public IUnresolvedEntity Entity {
+			public SyntaxNode Entity {
 				get;
 				private set;
 			}
 			
-			public TypeSystemTreeSegment (int offset, int length, IUnresolvedEntity entity) : base (offset, length)
+			public TypeSystemTreeSegment (int offset, int length, SyntaxNode entity) : base (offset, length)
 			{
 				this.Entity = entity;
 			}
@@ -1519,8 +1105,6 @@ namespace MonoDevelop.CSharp.Completion
 		internal TypeSystemTreeSegment GetMemberSegmentAt (int offset)
 		{
 			TypeSystemTreeSegment result = null;
-			if (unstableTypeSystemSegmentTree != null)
-				result = unstableTypeSystemSegmentTree.GetMemberSegmentAt (offset);
 			if (result == null && validTypeSystemSegmentTree != null)
 				result = validTypeSystemSegmentTree.GetMemberSegmentAt (offset);
 			return result;
@@ -1528,174 +1112,147 @@ namespace MonoDevelop.CSharp.Completion
 		
 		internal class TypeSystemSegmentTree : SegmentTree<TypeSystemTreeSegment>
 		{
-			public IUnresolvedTypeDefinition GetTypeAt (int offset)
-			{
-				IUnresolvedTypeDefinition result = null;
-				foreach (var seg in GetSegmentsAt (offset).Where (s => s.Entity is IUnresolvedTypeDefinition)) {
-					if (result == null || result.Region.IsInside (seg.Entity.Region.Begin))
-						result = (IUnresolvedTypeDefinition)seg.Entity;
-				}
-				return result;
-			}
-			
-			public IUnresolvedMember GetMemberAt (int offset)
+			public SyntaxNode GetMemberAt (int offset)
 			{
 				// Members don't overlap
-				var seg = GetSegmentsAt (offset).FirstOrDefault (s => s.Entity is IUnresolvedMember);
+				var seg = GetSegmentsAt (offset).FirstOrDefault ();
 				if (seg == null)
 					return null;
-				return (IUnresolvedMember)seg.Entity;
+				return seg.Entity;
 			}
 			
 			public TypeSystemTreeSegment GetMemberSegmentAt (int offset)
 			{
-				// Members don't overlap
-				var seg = GetSegmentsAt (offset).FirstOrDefault (s => s.Entity is IUnresolvedMember);
-				if (seg == null)
-					return null;
-				return seg;
+				return GetSegmentsAt (offset).LastOrDefault ();
 			}
 
 			
-			internal static TypeSystemSegmentTree Create (ParsedDocument parsedDocument, TextEditorData textEditorData)
-			{
-				TypeSystemSegmentTree result = new TypeSystemSegmentTree ();
-				
-				foreach (var type in parsedDocument.TopLevelTypeDefinitions)
-					AddType (textEditorData, result, type);
-				
-				return result;
-			}
 			
-			static void AddType (TextEditorData textEditorData, TypeSystemSegmentTree result, IUnresolvedTypeDefinition type)
+			internal static TypeSystemSegmentTree Create (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext ctx, SemanticModel semanticModel)
 			{
-				int offset = textEditorData.LocationToOffset (type.Region.Begin);
-				int endOffset = type.Region.End.IsEmpty ? int.MaxValue : textEditorData.LocationToOffset (type.Region.End);
-				if (endOffset < 0)
-					endOffset = int.MaxValue;
-				result.Add (new TypeSystemTreeSegment (offset, endOffset - offset, type));
-				foreach (var entity in type.Members) {
-					if (entity.IsSynthetic)
-						continue;
-					offset = textEditorData.LocationToOffset (entity.Region.Begin);
-					endOffset = textEditorData.LocationToOffset (entity.Region.End);
-					if (endOffset < 0)
-						endOffset = int.MaxValue;
-					result.Add (new TypeSystemTreeSegment (offset, endOffset - offset, entity));
-				}
-				
-				foreach (var nested in type.NestedTypes)
-					AddType (textEditorData, result, nested);
+				var visitor = new TreeVisitor ();
+				visitor.Visit (semanticModel.SyntaxTree.GetRoot ()); 
+				return visitor.Result;
 			}
-		}
-		
-		public IUnresolvedTypeDefinition GetTypeAt (int offset)
-		{
-			if (unstableTypeSystemSegmentTree == null && validTypeSystemSegmentTree == null)
-				return null;
-			IUnresolvedTypeDefinition type = null;
-			if (unstableTypeSystemSegmentTree != null)
-				type = unstableTypeSystemSegmentTree.GetTypeAt (offset);
-			if (type == null && validTypeSystemSegmentTree != null)
-				type = validTypeSystemSegmentTree.GetTypeAt (offset);
-			return type;
-		}
-			
-		public IUnresolvedMember GetMemberAt (int offset)
-		{
-			if (unstableTypeSystemSegmentTree == null && validTypeSystemSegmentTree == null)
-				return null;
 
-			IUnresolvedMember member = null;
-			if (unstableTypeSystemSegmentTree != null)
-				member = unstableTypeSystemSegmentTree.GetMemberAt (offset);
-			if (member == null && validTypeSystemSegmentTree != null)
-				member = validTypeSystemSegmentTree.GetMemberAt (offset);
+			class TreeVisitor : CSharpSyntaxWalker
+			{
+				public TypeSystemSegmentTree Result = new TypeSystemSegmentTree ();
 
-			return member;
-		}
-		#endregion
+				public override void VisitClassDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.ClassDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+					base.VisitClassDeclaration (node);
+				}
+				public override void VisitStructDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.StructDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+					base.VisitStructDeclaration (node);
+				}
 
+				public override void VisitInterfaceDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.InterfaceDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+					base.VisitInterfaceDeclaration (node);
+				}
 
-		class CompletionContextProvider : ICompletionContextProvider
-		{
-			readonly ParsedDocument parsedDocument;
-			readonly TextEditorData textEditorData;
-			readonly TypeSystemSegmentTree validTypeSystemSegmentTree;
-			readonly TypeSystemSegmentTree unstableTypeSystemSegmentTree;
+				public override void VisitEnumDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.EnumDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-			public CompletionContextProvider (ParsedDocument parsedDocument, TextEditorData textEditorData,
-				TypeSystemSegmentTree validTypeSystemSegmentTree, TypeSystemSegmentTree unstableTypeSystemSegmentTree)
-			{
-				this.parsedDocument = parsedDocument;
-				this.textEditorData = textEditorData;
-				this.validTypeSystemSegmentTree = validTypeSystemSegmentTree;
-				this.unstableTypeSystemSegmentTree = unstableTypeSystemSegmentTree;
-			}
+				public override void VisitPropertyDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.PropertyDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-			IList<string> ICompletionContextProvider.ConditionalSymbols {
-				get {
-					return parsedDocument.GetAst<SyntaxTree> ().ConditionalSymbols;
+				public override void VisitMethodDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.MethodDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
 				}
-			}
 
-			void ICompletionContextProvider.GetCurrentMembers (int offset, out IUnresolvedTypeDefinition currentType, out IUnresolvedMember currentMember)
-			{
-				currentType = GetTypeAt (offset);
-				currentMember = GetMemberAt (offset);
-			}
+				public override void VisitConstructorDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.ConstructorDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-			public IUnresolvedTypeDefinition GetTypeAt (int offset)
-			{
-				if (unstableTypeSystemSegmentTree == null && validTypeSystemSegmentTree == null)
-					return null;
-				IUnresolvedTypeDefinition type = null;
-				if (unstableTypeSystemSegmentTree != null)
-					type = unstableTypeSystemSegmentTree.GetTypeAt (offset);
-				if (type == null && validTypeSystemSegmentTree != null)
-					type = validTypeSystemSegmentTree.GetTypeAt (offset);
-				return type;
-			}
+				public override void VisitDestructorDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.DestructorDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-			public IUnresolvedMember GetMemberAt (int offset)
-			{
-				if (unstableTypeSystemSegmentTree == null && validTypeSystemSegmentTree == null)
-					return null;
+				public override void VisitIndexerDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.IndexerDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-				IUnresolvedMember member = null;
-				if (unstableTypeSystemSegmentTree != null)
-					member = unstableTypeSystemSegmentTree.GetMemberAt (offset);
-				if (member == null && validTypeSystemSegmentTree != null)
-					member = validTypeSystemSegmentTree.GetMemberAt (offset);
-				return member;
-			}
+				public override void VisitDelegateDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.DelegateDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-			Tuple<string, TextLocation> ICompletionContextProvider.GetMemberTextToCaret (int caretOffset, IUnresolvedTypeDefinition currentType, IUnresolvedMember currentMember)
-			{
-				int startOffset;
-				if (currentMember != null && currentType != null && currentType.Kind != TypeKind.Enum) {
-					startOffset = textEditorData.LocationToOffset(currentMember.Region.Begin);
-				} else if (currentType != null) {
-					startOffset = textEditorData.LocationToOffset(currentType.Region.Begin);
-				} else {
-					startOffset = 0;
+				public override void VisitOperatorDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.OperatorDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
 				}
-				while (startOffset > 0) {
-					char ch = textEditorData.GetCharAt(startOffset - 1);
-					if (ch != ' ' && ch != '\t') {
-						break;
-					}
-					--startOffset;
+
+				public override void VisitEventDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.EventDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
+
+				public override void VisitBlock (Microsoft.CodeAnalysis.CSharp.Syntax.BlockSyntax node)
+				{
+					// nothing
 				}
-				return Tuple.Create (caretOffset > startOffset ? textEditorData.GetTextAt (startOffset, caretOffset - startOffset) : "", 
-				                     (TextLocation)textEditorData.OffsetToLocation (startOffset));
 			}
+			
+		}
+		
+		public SyntaxNode GetMemberAt (int offset)
+		{
+			SyntaxNode member = null;
+			if (member == null && validTypeSystemSegmentTree != null)
+				member = validTypeSystemSegmentTree.GetMemberAt (offset);
 
+			return member;
+		}
+		#endregion
+	
+	
 
-			CSharpAstResolver ICompletionContextProvider.GetResolver (CSharpResolver resolver, AstNode rootNode)
-			{
-				return new CSharpAstResolver (resolver, rootNode, parsedDocument.ParsedFile as CSharpUnresolvedFile);
+		[CommandHandler(RefactoryCommands.ImportSymbol)]
+		void ImportSymbolCommand ()
+		{
+			if (Editor.SelectionMode == SelectionMode.Block)
+				return;
+			var analysisDocument = DocumentContext.AnalysisDocument;
+			if (analysisDocument == null)
+				return;
+			var offset = Editor.CaretOffset;
+
+			ICompletionDataList completionList = null;
+			int cpos, wlen;
+			if (!GetCompletionCommandOffset (out cpos, out wlen)) {
+				cpos = Editor.CaretOffset;
+				wlen = 0;
 			}
+			currentCompletionContext = CompletionWidget.CreateCodeCompletionContext (cpos);
+			currentCompletionContext.TriggerWordLength = wlen;
+
+			var list = new CSharpCompletionDataList ();
+			list.TriggerWordLength = wlen;
+			var partialDoc = WithFrozenPartialSemanticsAsync (analysisDocument, default (CancellationToken)).Result;
+			var semanticModel = partialDoc.GetSemanticModelAsync ().Result;
+
+			AddImportCompletionData (list, semanticModel, offset);
+				
+			completionList = CodeCompletionCommand (currentCompletionContext);
+			if (completionList != null)
+				CompletionWindowManager.ShowWindow (this, (char)0, completionList, CompletionWidget, currentCompletionContext);
+			else
+				currentCompletionContext = null;
 		}
+
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CastCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CastCompletionData.cs
new file mode 100644
index 0000000000..33e486a9f8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CastCompletionData.cs
@@ -0,0 +1,76 @@
+// 
+// CSharpCompletionTextEditorExtension.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.CodeCompletion;
+using System.Collections.Generic;
+using System.Linq;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class CastCompletionData : RoslynCompletionData
+	{
+		readonly CSharpCompletionTextEditorExtension ext;
+		readonly SemanticModel semanticModel;
+		readonly ISymbol member;
+		readonly SyntaxNode nodeToCast;
+		readonly ITypeSymbol targetType;
+
+		public CastCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, CSharpCompletionTextEditorExtension ext, SemanticModel semanticModel, ISymbol member, SyntaxNode nodeToCast, ITypeSymbol targetType) : base(keyHandler)
+		{
+			this.targetType = targetType;
+			this.nodeToCast = nodeToCast;
+			this.member = member;
+			this.semanticModel = semanticModel;
+			this.ext = ext;
+			this.DisplayText = member.Name;
+		}
+
+		public override string GetDisplayDescription (bool isSelected)
+		{
+			var description = "<small>(cast to " + targetType.ToMinimalDisplayString (semanticModel, nodeToCast.SpanStart, Ambience.LabelFormat) + ")</small>";
+			if (isSelected)
+				return description;
+			return "<span foreground=\"darkgray\">" + description + "</span>";
+		}
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
+		{
+			var editor = ext.Editor;
+			var offset = window.CodeCompletionContext.TriggerOffset;
+			using (var undo = editor.OpenUndoGroup ()) {
+				editor.ReplaceText (offset, editor.CaretOffset - offset, member.Name);
+				var span = nodeToCast.Span;
+				var type = targetType.ToMinimalDisplayString (semanticModel, nodeToCast.SpanStart, Ambience.LabelFormat);
+				editor.ReplaceText (span.Start, span.Length, "((" + type + ")" + nodeToCast + ")");
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ConstructorParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ConstructorParameterDataProvider.cs
index c9d6a2855b..28196b83eb 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ConstructorParameterDataProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ConstructorParameterDataProvider.cs
@@ -43,7 +43,7 @@ namespace MonoDevelop.CSharp.Completion
 		{
 			this.type = type;
 			
-			var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.Document.Editor.Caret.Location) as CSharpTypeResolveContext;
+			var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.Editor.CaretLocation) as CSharpTypeResolveContext;
 
 			var lookup = new MemberLookup (ctx.CurrentTypeDefinition, ext.Compilation.MainAssembly);
 			bool isProtectedAllowed = false;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CreateOverrideCompletionData.cs
index 4d779caaca..6234f3cade 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CreateOverrideCompletionData.cs
@@ -1,4 +1,4 @@
-// NewOverrideCompletionData.cs
+// CreateOverrideCompletionData.cs
 //
 // Author:
 //   Mike Krüger <mkrueger@novell.com>
@@ -24,65 +24,86 @@
 // THE SOFTWARE.
 //
 
-using System;
 using System.Linq;
-using System.Text;
 using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.CSharp.Formatting;
 
 namespace MonoDevelop.CSharp.Completion
 {
-	class NewOverrideCompletionData : CompletionData
+	class CreateOverrideCompletionData : RoslynSymbolCompletionData
 	{
-		CSharpCompletionTextEditorExtension ext;
-		IMember member;
-		static Ambience ambience = new CSharpAmbience ();
-		int    declarationBegin;
-		IUnresolvedTypeDefinition  type;
-		
+		readonly int declarationBegin;
+		readonly ITypeSymbol currentType;
+
+		bool afterKeyword;
+
 		public bool GenerateBody { get; set; }
 
-		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
-		{
-			return MemberCompletionData.CreateTooltipInformation (ext, null, member, smartWrap);
+		string displayText;
+		public override string DisplayText {
+			get {
+				if (displayText == null) {
+					var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+					displayText = base.Symbol.ToMinimalDisplayString (model, ext.Editor.CaretOffset, Ambience.LabelFormat) + " {...}";
+					if (!afterKeyword)
+						displayText = "override " + displayText;
+				}
+
+				return displayText;
+			}
 		}
 
-		public NewOverrideCompletionData (CSharpCompletionTextEditorExtension ext, int declarationBegin, IUnresolvedTypeDefinition type, IMember member) : base (null)
+		public override string GetDisplayTextMarkup ()
 		{
-			this.ext = ext;
-			this.type   = type;
-			this.member = member;
+			var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+
+			var result = base.Symbol.ToMinimalDisplayString (model, ext.Editor.CaretOffset, Ambience.LabelFormat) + " {...}";
+			var idx = result.IndexOf (Symbol.Name);
+			if (idx >= 0) {
+				result = 
+					result.Substring(0, idx) +
+					"<b>" + Symbol.Name + "</b>"+
+					result.Substring(idx + Symbol.Name.Length);
+			}
+
+			if (!afterKeyword)
+				result = "override " + result;
 			
+			return ApplyDiplayFlagsFormatting (result);
+		}
+
+		public CreateOverrideCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, CSharpCompletionTextEditorExtension ext, int declarationBegin, ITypeSymbol currentType, Microsoft.CodeAnalysis.ISymbol member, bool afterKeyword) : base (keyHandler, ext, member, member.ToDisplayString ())
+		{
+			this.afterKeyword = afterKeyword;
+			this.currentType = currentType;
 			this.declarationBegin = declarationBegin;
 			this.GenerateBody = true;
-			this.Icon = member.GetStockIcon ();
-			this.DisplayText = ambience.GetString (member, OutputFlags.IncludeParameters | OutputFlags.IncludeParameterName | OutputFlags.IncludeGenerics | OutputFlags.HideExtensionsParameter| OutputFlags.IncludeAccessor);
-			this.CompletionText = member.SymbolKind == SymbolKind.Indexer ? "this" : member.Name;
 		}
-		
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
-			var editor = ext.TextEditorData;
-			var generator = CodeGenerator.CreateGenerator (ext.Document);
+			var editor = ext.Editor;
 			bool isExplicit = false;
-			if (member.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
-				foreach (var m in type.Members) {
-					if (m.Name == member.Name && !m.ReturnType.Equals (member.ReturnType)) {
-						isExplicit = true;
-						break;
-					}
-				}
-			}
-			var resolvedType = type.Resolve (ext.Project).GetDefinition ();
-			if (ext.Project != null)
-				generator.PolicyParent = ext.Project.Policies;
-			var result = generator.CreateMemberImplementation (resolvedType, type, member, isExplicit);
+//			if (member.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+//				foreach (var m in type.Members) {
+//					if (m.Name == member.Name && !m.ReturnType.Equals (member.ReturnType)) {
+//						isExplicit = true;
+//						break;
+//					}
+//				}
+//			}
+//			var resolvedType = type.Resolve (ext.Project).GetDefinition ();
+//			if (ext.Project != null)
+//				generator.PolicyParent = ext.Project.Policies;
+			
+			var result = CSharpCodeGenerator.CreateOverridenMemberImplementation (ext.DocumentContext, ext.Editor, currentType, currentType.Locations.First (), Symbol, isExplicit);
 			string sb = result.Code.TrimStart ();
 			int trimStart = result.Code.Length - sb.Length;
 			sb = sb.TrimEnd ();
@@ -107,13 +128,15 @@ namespace MonoDevelop.CSharp.Completion
 				targetCaretPosition = declarationBegin + sb.Length;
 			}
 			
-			editor.Replace (declarationBegin, editor.Caret.Offset - declarationBegin, sb);
+			editor.ReplaceText (declarationBegin, editor.CaretOffset - declarationBegin, sb);
 			if (selectionEndPosition > 0) {
-				editor.Caret.Offset = selectionEndPosition;
+				editor.CaretOffset = selectionEndPosition;
 				editor.SetSelection (targetCaretPosition, selectionEndPosition);
 			} else {
-				editor.Caret.Offset = targetCaretPosition;
+				editor.CaretOffset = targetCaretPosition;
 			}
+
+			OnTheFlyFormatter.Format (editor, ext.DocumentContext, declarationBegin, declarationBegin + sb.Length);
 		}
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CreatePartialCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CreatePartialCompletionData.cs
new file mode 100644
index 0000000000..c2527a03c9
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CreatePartialCompletionData.cs
@@ -0,0 +1,133 @@
+//
+// CreatePartialCompletionData.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Formatting;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class CreatePartialCompletionData : RoslynSymbolCompletionData
+	{
+		readonly ITypeSymbol currentType;
+		readonly int declarationBegin;
+
+		bool afterKeyword;
+
+		public bool GenerateBody { get; set; }
+
+		string displayText;
+		public override string DisplayText {
+			get {
+				if (displayText == null) {
+					var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+					displayText = base.Symbol.ToMinimalDisplayString (model, ext.Editor.CaretOffset, Ambience.LabelFormat) + " {...}";
+					if (!afterKeyword)
+						displayText = "partial " + displayText;
+				}
+				return displayText;
+			}
+		}
+
+
+		public override string GetDisplayTextMarkup ()
+		{
+			var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+
+			var result = base.Symbol.ToMinimalDisplayString (model, ext.Editor.CaretOffset, Ambience.LabelFormat) + " {...}";
+			var idx = result.IndexOf (Symbol.Name);
+			if (idx >= 0) {
+				result = 
+					result.Substring(0, idx) +
+					"<b>" + Symbol.Name + "</b>"+
+					result.Substring(idx + Symbol.Name.Length);
+			}
+
+			if (!afterKeyword)
+				result = "partial " + result;
+
+			return ApplyDiplayFlagsFormatting (result);
+		}
+
+		public CreatePartialCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, CSharpCompletionTextEditorExtension ext, int declarationBegin, ITypeSymbol currentType, ISymbol member, bool afterKeyword) : base (keyHandler, ext, member)
+		{
+			this.afterKeyword = afterKeyword;
+			this.currentType = currentType;
+			this.declarationBegin = declarationBegin;
+			this.GenerateBody = true;
+		}
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
+		{
+			var editor = ext.Editor;
+			bool isExplicit = false;
+			//			if (member.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+			//				foreach (var m in type.Members) {
+			//					if (m.Name == member.Name && !m.ReturnType.Equals (member.ReturnType)) {
+			//						isExplicit = true;
+			//						break;
+			//					}
+			//				}
+			//			}
+			//			var resolvedType = type.Resolve (ext.Project).GetDefinition ();
+			//			if (ext.Project != null)
+			//				generator.PolicyParent = ext.Project.Policies;
+
+			var result = CSharpCodeGenerator.CreatePartialMemberImplementation (ext.DocumentContext, ext.Editor, currentType, currentType.Locations.First (), Symbol, isExplicit);
+			string sb = result.Code.TrimStart ();
+			int trimStart = result.Code.Length - sb.Length;
+			sb = sb.TrimEnd ();
+
+			var lastRegion = result.BodyRegions.LastOrDefault ();
+			var region = lastRegion == null? null
+				: new CodeGeneratorBodyRegion (lastRegion.StartOffset - trimStart, lastRegion.EndOffset - trimStart);
+
+			int targetCaretPosition;
+			int selectionEndPosition = -1;
+			if (region != null && region.IsValid) {
+				targetCaretPosition = declarationBegin + region.EndOffset;
+
+			} else {
+				targetCaretPosition = declarationBegin + sb.Length;
+			}
+
+			editor.ReplaceText (declarationBegin, editor.CaretOffset - declarationBegin, sb);
+			if (selectionEndPosition > 0) {
+				editor.CaretOffset = selectionEndPosition;
+				editor.SetSelection (targetCaretPosition, selectionEndPosition);
+			} else {
+				editor.CaretOffset = targetCaretPosition;
+			}
+
+			OnTheFlyFormatter.Format (editor, ext.DocumentContext, declarationBegin, declarationBegin + sb.Length);
+			editor.CaretLine--;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/DelegateDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/DelegateDataProvider.cs
deleted file mode 100644
index 527a7aa8b8..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/DelegateDataProvider.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// 
-// DelegateDataProvider.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.CSharp.Parser;
-using System.Text.RegularExpressions;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.CSharp.Resolver;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.Completion;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class DelegateDataProvider : AbstractParameterDataProvider
-	{
-//		IType delegateType;
-		IMethod delegateMethod;
-
-		ICompilation compilation;
-		CSharpUnresolvedFile file;
-		
-		public DelegateDataProvider (int startOffset, CSharpCompletionTextEditorExtension ext, IType delegateType) : base (ext, startOffset)
-		{
-			compilation = ext.UnresolvedFileCompilation;
-			file = ext.CSharpUnresolvedFile;
-			//			this.delegateType = delegateType;
-			this.delegateMethod = delegateType.GetDelegateInvokeMethod ();
-		}
-
-		public override TooltipInformation CreateTooltipInformation (int overload, int currentParameter, bool smartWrap)
-		{
-			return MethodParameterDataProvider.CreateTooltipInformation (ext, compilation, file, delegateMethod, currentParameter, smartWrap);
-		}
-
-		#region IParameterDataProvider implementation
-		public override int GetParameterCount (int overload)
-		{
-			if (overload >= Count)
-				return -1;
-			return delegateMethod.Parameters != null ? delegateMethod.Parameters.Count : 0;
-		}
-		
-		public override bool AllowParameterList (int overload)
-		{
-			if (overload >= Count)
-				return false;
-			var lastParam = delegateMethod.Parameters.LastOrDefault ();
-			return lastParam != null && lastParam.IsParams;
-		}
-
-		public override string GetParameterName (int overload, int paramIndex)
-		{
-			return delegateMethod.Parameters[paramIndex].Name;
-		}
-		
-		public override int Count {
-			get {
-				return 1;
-			}
-		}
-		#endregion 
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs
index ed967df971..f009e5d91e 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs
@@ -32,109 +32,117 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.CSharp.Formatting;
 using MonoDevelop.CSharp.Parser;
-using Mono.TextEditor;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor.Util;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide;
+using MonoDevelop.Refactoring;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Threading;
+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.CSharp.Completion
 {
-	class EventCreationCompletionData : CompletionData
+	class EventCreationCompletionData : AnonymousMethodCompletionData
 	{
-		string parameterList;
-		IUnresolvedMember callingMember;
-//		CSharpCompletionTextEditorExtension ext;
-		int initialOffset;
-		public bool AddSemicolon = true;
-		TextEditorData editor;
-
+		readonly CSharpCompletionTextEditorExtension ext;
+		readonly ITypeSymbol delegateType;
+		readonly INamedTypeSymbol curType;
+		readonly string varName;
+		
 		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
 		{
 			var tooltipInfo = new TooltipInformation ();
 			return tooltipInfo;
 		}
 
-		public EventCreationCompletionData (CSharpCompletionTextEditorExtension ext, string methodName, IType delegateType, IEvent evt, string parameterList, IUnresolvedMember callingMember, IUnresolvedTypeDefinition declaringType) : base (null)
+		public EventCreationCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, CSharpCompletionTextEditorExtension ext, ITypeSymbol delegateType, string varName, INamedTypeSymbol curType) : base (keyHandler)
 		{
-			if (string.IsNullOrEmpty (methodName)) {
-				this.DisplayText   = (evt != null ? evt.Name : "");
-			} else {
-				this.DisplayText   = Char.ToUpper (methodName[0]) + methodName.Substring (1) + (evt != null ? evt.Name : "");
-			}
-			
-			if (declaringType != null && declaringType.Members.Any (m => m.Name == this.DisplayText)) {
-				for (int i = 1; i < 10000; i++) {
-					if (!declaringType.Members.Any (m => m.Name == this.DisplayText + i)) {
-						this.DisplayText = this.DisplayText + i.ToString ();
-						break;
-					}
-				}
-			}
-			this.editor        = ext.TextEditorData;
-			this.parameterList = parameterList;
-			this.callingMember = callingMember;
-			this.Icon          = "md-newmethod";
-			this.initialOffset = editor.Caret.Offset;
+			this.curType = curType;
+			this.varName = varName;
+			this.DisplayText = varName;
+			this.delegateType = delegateType;
+			this.ext = ext;
+			this.Icon = "md-newmethod";
 		}
-		
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
 			// insert add/remove event handler code after +=/-=
-			editor.Replace (initialOffset, editor.Caret.Offset - initialOffset, this.DisplayText + (AddSemicolon ? ";" : ""));
-			
-			// Search opening bracket of member
-			int pos = callingMember != null && !callingMember.BodyRegion.Begin.IsEmpty ? editor.Document.LocationToOffset (callingMember.BodyRegion.BeginLine, callingMember.BodyRegion.BeginColumn) : initialOffset;
-			while (pos < editor.Document.TextLength && editor.Document.GetCharAt (pos) != '{') {
-				pos++;
-			}
-			
-			// Search closing bracket of member
-			pos = editor.Document.GetMatchingBracketOffset (pos) + 1;
-			
-			pos = Math.Max (0, Math.Min (pos, editor.Document.TextLength - 1));
-			
-			// Insert new event handler after closing bracket
-			var line = callingMember != null ? editor.Document.GetLine (callingMember.Region.BeginLine) : editor.Document.GetLineByOffset (initialOffset);
-			string indent = line.GetIndentation (editor.Document);
-			
-			StringBuilder sb = new StringBuilder ();
-			sb.Append (editor.EolMarker);
-			sb.Append (editor.EolMarker);
-			sb.Append (indent);
-			if (callingMember != null && callingMember.IsStatic)
-				sb.Append ("static ");
-			sb.Append ("void ");
-			int pos2 = sb.Length;
-			sb.Append (this.DisplayText);
-			sb.Append (' ');
-			sb.Append (this.parameterList);
-			sb.Append (editor.EolMarker);
-			sb.Append (indent);
-			sb.Append ("{");
-			sb.Append (editor.EolMarker);
-			sb.Append (indent);
-			sb.Append (editor.Options.IndentationString);
-			int cursorPos = pos + sb.Length;
-			sb.Append (editor.EolMarker);
-			sb.Append (indent);
-			sb.Append ("}");
-			editor.Insert (pos, sb.ToString ());
-			editor.Caret.Offset = cursorPos;
-			
-			// start text link mode after insert
-			List<TextLink> links = new List<TextLink> ();
-			TextLink link = new TextLink ("name");
-			
-			link.AddLink (new TextSegment (0, this.DisplayText.Length));
-			link.AddLink (new TextSegment (pos - initialOffset + pos2, this.DisplayText.Length));
-			links.Add (link);
-			
-			var tle = new TextLinkEditMode (editor.Parent, initialOffset, links);
-			tle.TextLinkMode = TextLinkMode.EditIdentifier;
-			tle.SetCaretPosition = true;
-			tle.SelectPrimaryLink = true;
-			tle.OldMode = editor.CurrentMode;
-			tle.StartMode ();
-			editor.CurrentMode = tle;
+			var editor = ext.Editor;
+
+
+			bool AddSemicolon = true;
+			var position = window.CodeCompletionContext.TriggerOffset;
+			editor.ReplaceText (position, editor.CaretOffset - position, this.DisplayText + (AddSemicolon ? ";" : ""));
+
+
+			var document = IdeApp.Workbench.ActiveDocument;
+			var parsedDocument = document.UpdateParseDocument ();
+			var semanticModel = parsedDocument.GetAst<SemanticModel> ();
+
+			var declaringType = semanticModel.GetEnclosingSymbol<INamedTypeSymbol> (position, default(CancellationToken));
+			var enclosingSymbol = semanticModel.GetEnclosingSymbol<ISymbol> (position, default(CancellationToken));
+
+			var insertionPoints = InsertionPointService.GetInsertionPoints (
+				document.Editor,
+				parsedDocument,
+				declaringType,
+				declaringType.Locations.First()
+			);
+
+			var options = new InsertionModeOptions (
+				"Create new method",
+				insertionPoints,
+				async point => {
+					if (!point.Success) 
+						return;
+					var indent = "\t";
+					var sb = new StringBuilder ();
+					if (enclosingSymbol != null && enclosingSymbol.IsStatic)
+						sb.Append ("static ");
+					sb.Append ("void ");
+					int pos2 = sb.Length;
+					sb.Append (this.DisplayText);
+					sb.Append (' ');
+					sb.Append("(");
+
+					var delegateMethod = delegateType.GetDelegateInvokeMethod();
+					for (int k = 0; k < delegateMethod.Parameters.Length; k++) {
+						if (k > 0) {
+							sb.Append(", ");
+						}
+						sb.Append (delegateMethod.Parameters [k].ToMinimalDisplayString (semanticModel, position, Ambience.LabelFormat)); 
+					}
+					sb.Append(")");
+
+					sb.Append (editor.EolMarker);
+					sb.Append (indent);
+					sb.Append ("{");
+					sb.Append (editor.EolMarker);
+					sb.Append (indent);
+					sb.Append (editor.Options.GetIndentationString ());
+					//int cursorPos = pos + sb.Length;
+					sb.Append (editor.EolMarker);
+					sb.Append (indent);
+					sb.Append ("}");
+					point.InsertionPoint.Insert (document.Editor, document, sb.ToString ());
+					//			// start text link mode after insert
+					//			var links = new List<TextLink> ();
+					//			var link = new TextLink ("name");
+					//			
+					//			link.AddLink (new TextSegment (initialOffset, this.DisplayText.Length));
+					//			link.AddLink (new TextSegment (initialOffset + pos + pos2, this.DisplayText.Length));
+					//			links.Add (link);
+					//			editor.StartTextLinkMode (new TextLinkModeOptions (links));
+				}
+			);
+
+			editor.StartInsertionMode (options);
+
 		}
 	}
 	
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs
new file mode 100644
index 0000000000..83ae1d8660
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs
@@ -0,0 +1,161 @@
+//
+// ImportSymbolCompletionData.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+using GLib;
+using System.Collections.Generic;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Components.PropertyGrid.PropertyEditors;
+using MonoDevelop.Ide.Editor;
+using System.Text;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class ImportSymbolCompletionData : RoslynCompletionData
+	{
+		CSharpCompletionTextEditorExtension ext;
+		INamedTypeSymbol type;
+		bool useFullName;
+
+		public override IconId Icon {
+			get {
+				return type.GetStockIcon ();
+			}
+		}
+
+		public override int PriorityGroup { get { return int.MinValue; } }
+
+		public ImportSymbolCompletionData (CSharpCompletionTextEditorExtension ext, INamedTypeSymbol type, bool useFullName) : base (null, type.Name)
+		{
+			this.ext = ext;
+			this.useFullName = useFullName;
+			this.type = type;
+			this.DisplayFlags |= DisplayFlags.IsImportCompletion;
+		}
+
+		bool initialized = false;
+		bool generateUsing, insertNamespace;
+
+		void Initialize ()
+		{
+			if (initialized)
+				return;
+			initialized = true;
+			if (type.ContainingNamespace == null) 
+				return;
+			generateUsing = !useFullName;
+			insertNamespace = useFullName;
+		}
+
+		static string GetDefaultDisplaySelection (string description, bool isSelected)
+		{
+			if (!isSelected)
+				return "<span foreground=\"darkgray\">" + description + "</span>";
+			return description;
+		}
+
+		string displayDescription = null;
+		public override string GetDisplayDescription (bool isSelected)
+		{
+			if (displayDescription == null) {
+				Initialize ();
+				if (generateUsing || insertNamespace) {
+					displayDescription = string.Format (GettextCatalog.GetString ("(from '{0}')"), type.ContainingNamespace.Name);
+				} else {
+					displayDescription = "";
+				}
+			}
+			return GetDefaultDisplaySelection (displayDescription, isSelected);
+		}
+
+		#region IActionCompletionData implementation
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, MonoDevelop.Ide.Editor.Extension.KeyDescriptor descriptor)
+		{
+			Initialize ();
+			var doc = ext.DocumentContext;
+			using (var undo = ext.Editor.OpenUndoGroup ()) {
+				string text = insertNamespace ? type.ContainingNamespace.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat) + "." + type.Name : type.Name;
+				if (text != GetCurrentWord (window)) {
+					if (window.WasShiftPressed && generateUsing) 
+						text = type.ContainingNamespace.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat) + "." + text;
+					window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, GetCurrentWord (window), text);
+				}
+
+				if (!window.WasShiftPressed && generateUsing) {
+					AddGlobalNamespaceImport (ext.Editor, doc, type.ContainingNamespace.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat));
+				}
+			}
+			ka |= KeyActions.Ignore;
+		}
+
+		static void AddGlobalNamespaceImport (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, string nsName)
+		{
+			var parsedDocument = context.ParsedDocument;
+			var unit = parsedDocument.GetAst<SemanticModel> ();
+			if (unit == null)
+				return;
+
+			int offset = SearchUsingInsertionPoint (unit.SyntaxTree.GetRoot ());
+
+			var text = new StringBuilder ();
+			text.Append ("using ");
+			text.Append (nsName);
+			text.Append (";");
+			text.Append (editor.EolMarker);
+
+			editor.InsertText (offset, text.ToString ());
+		}
+
+		static int SearchUsingInsertionPoint (SyntaxNode parent)
+		{
+			var result = 0;
+			foreach (SyntaxNode node in parent.ChildNodes ()) {
+				if (node.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.UsingDirective)) {
+					result = node.FullSpan.End;
+					continue;
+				}
+				SyntaxTrivia last = new SyntaxTrivia ();
+
+				foreach (var trivia in node.GetLeadingTrivia ()) {
+					if (last.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.SingleLineCommentTrivia)||
+						last.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.DefineDirectiveTrivia) || 
+						last.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.MultiLineCommentTrivia) || 
+						last.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.SingleLineDocumentationCommentTrivia))
+						result = trivia.Span.End;
+					last = trivia;
+				}
+				break;
+			}
+			return result;
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/IndexerParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/IndexerParameterDataProvider.cs
deleted file mode 100644
index 38bb78ff5f..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/IndexerParameterDataProvider.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// 
-// NRefactoryIndexerParameterDataProvider.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.CSharp.Parser;
-
-using System.Text.RegularExpressions;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Completion;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class IndexerParameterDataProvider : AbstractParameterDataProvider
-	{
-//		AstNode resolvedExpression;
-		List<IProperty> indexers;
-
-		ICompilation compilation;
-		CSharpUnresolvedFile file;
-		
-		public IndexerParameterDataProvider (int startOffset, CSharpCompletionTextEditorExtension ext, IType type, IEnumerable<IProperty> indexers, AstNode resolvedExpression) : base (ext, startOffset)
-		{
-			compilation = ext.UnresolvedFileCompilation;
-			file = ext.CSharpUnresolvedFile;
-			//			this.resolvedExpression = resolvedExpression;
-			this.indexers = new List<IProperty> (indexers);
-		}
-
-		public override TooltipInformation CreateTooltipInformation (int overload, int currentParameter, bool smartWrap)
-		{
-			return MethodParameterDataProvider.CreateTooltipInformation (ext, compilation, file, indexers[overload], currentParameter, smartWrap);
-		}
-
-		#region IParameterDataProvider implementation
-		public override int GetParameterCount (int overload)
-		{
-			if (overload >= Count)
-				return -1;
-			var indexer = indexers[overload];
-			return indexer != null && indexer.Parameters != null ? indexer.Parameters.Count : 0;
-		}
-
-		public override bool AllowParameterList (int overload)
-		{
-			if (overload >= Count)
-				return false;
-			var lastParam = indexers[overload].Parameters.LastOrDefault ();
-			return lastParam != null && lastParam.IsParams;
-		}
-
-		public override string GetParameterName (int overload, int paramIndex)
-		{
-			var indexer = indexers[overload];
-			return indexer.Parameters[paramIndex].Name;
-		}
-
-		public override int Count {
-			get {
-				return indexers != null ? indexers.Count : 0;
-			}
-		}
-		#endregion
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
deleted file mode 100644
index ab85e91705..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
+++ /dev/null
@@ -1,864 +0,0 @@
-// MemberCompletionData.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.Completion;
-using ICSharpCode.NRefactory.Documentation;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using System.IO;
-using MonoDevelop.CSharp.Formatting;
-using Gtk;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class MemberCompletionData : CompletionData, IEntityCompletionData
-	{
-		CSharpCompletionTextEditorExtension editorCompletion;
-		OutputFlags flags;
-		bool hideExtensionParameter = true;
-		static CSharpAmbience ambience = new CSharpAmbience ();
-		string completionString;
-		string displayText;
-		Dictionary<string, CompletionData> overloads;
-
-		Mono.TextEditor.TextEditorData Editor {
-			get {
-				return editorCompletion.TextEditorData;
-			}
-		}
-
-		MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy Policy {
-			get {
-				return editorCompletion.FormattingPolicy;
-			}
-		}
-
-		public override string Description {
-			get {
-				return "";
-			}
-		}
-
-		public override string CompletionText {
-			get { return completionString; }
-			set { completionString = value; }
-		}
-
-		public override string DisplayText {
-			get {
-				if (displayText == null) {
-					displayText = ambience.GetString (Entity.SymbolKind == SymbolKind.Constructor ? Entity.DeclaringTypeDefinition : Entity, flags | OutputFlags.HideGenericParameterNames);
-				}
-				return displayText; 
-			}
-		}
-
-		public override IconId Icon {
-			get {
-				return (Entity.SymbolKind == SymbolKind.Constructor ? Entity.DeclaringTypeDefinition : Entity).GetStockIcon ();
-			}
-		}
-
-		public bool HideExtensionParameter {
-			get {
-				return hideExtensionParameter;
-			}
-			set {
-				hideExtensionParameter = value;
-			}
-		}
-
-		bool isDelegateExpected;
-		public bool IsDelegateExpected {
-			get {
-				return isDelegateExpected || factory != null && factory.Engine.PossibleDelegates.Count > 0;
-			} 
-			set {
-				isDelegateExpected = value;
-			}
-		}
-
-		ICompilation compilation;
-		CSharpUnresolvedFile file;
-		CSharpCompletionTextEditorExtension.CompletionDataFactory factory;
-
-		public MemberCompletionData (CSharpCompletionTextEditorExtension.CompletionDataFactory factory, IEntity entity, OutputFlags flags) : this(factory.ext, entity, flags)
-		{
-			this.factory = factory;
-		}
-
-		public MemberCompletionData (CSharpCompletionTextEditorExtension editorCompletion, IEntity entity, OutputFlags flags)
-		{
-			compilation = editorCompletion.UnresolvedFileCompilation;
-			file = editorCompletion.CSharpUnresolvedFile;
-
-			this.editorCompletion = editorCompletion;
-			this.flags = flags;
-			SetMember (entity);
-			DisplayFlags = DisplayFlags.DescriptionHasMarkup;
-			var m = Entity as IMember;
-			if (m != null && m.IsObsolete ())
-				DisplayFlags |= DisplayFlags.Obsolete;
-		}
-
-		public bool SearchBracket (int start, out int pos)
-		{
-			pos = -1;
-			
-			for (int i = start; i < Editor.Length; i++) {
-				char ch = Editor.GetCharAt (i);
-				if (ch == '(') {
-					pos = i + 1;
-					return true;
-				}
-				if (!char.IsWhiteSpace (ch))
-					return false;
-			}
-			return false;
-		}
-
-		static bool HasNonMethodMembersWithSameName (IMember member)
-		{
-			return member.DeclaringType.GetFields ().Cast<INamedElement> ()
-				.Concat (member.DeclaringType.GetProperties ().Cast<INamedElement> ())
-				.Concat (member.DeclaringType.GetEvents ().Cast<INamedElement> ())
-				.Concat (member.DeclaringType.GetNestedTypes ().Cast<INamedElement> ())
-				.Any (e => e.Name == member.Name);
-		}
-
-		static bool HasAnyOverloadWithParameters (IMethod method)
-		{
-			if (method.SymbolKind == SymbolKind.Constructor) 
-				return method.DeclaringType.GetConstructors ().Any (m => m.Parameters.Count > 0);
-			return method.DeclaringType.GetMethods ().Any (m => m.Name == method.Name && m.Parameters.Count > 0);
-		}
-
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
-		{
-			InsertCompletionText (window, ref ka, closeChar, keyChar, modifier, CompletionTextEditorExtension.AddParenthesesAfterCompletion, CompletionTextEditorExtension.AddOpeningOnly);
-		}
-
-		bool IsBracketAlreadyInserted (IMethod method)
-		{
-			int offset = Editor.Caret.Offset;
-			while (offset < Editor.Length) {
-				char ch = Editor.GetCharAt (offset);
-				if (!char.IsLetterOrDigit (ch))
-					break;
-				offset++;
-			}
-			while (offset < Editor.Length) {
-				char ch = Editor.GetCharAt (offset);
-				if (!char.IsWhiteSpace (ch))
-					return ch == '(' || ch == '<' && RequireGenerics (method);
-				offset++;
-			}
-			return false;
-		}
-
-		bool InsertSemicolon (int exprStart)
-		{
-			int offset = exprStart;
-			while (offset > 0) {
-				char ch = Editor.GetCharAt (offset);
-				if (!char.IsWhiteSpace (ch)) {
-					if (ch != '{' && ch != '}' && ch != ';')
-						return false;
-					break;
-				}
-				offset--;
-			}
-
-			offset = Editor.Caret.Offset;
-			while (offset < Editor.Length) {
-				char ch = Editor.GetCharAt (offset);
-				if (!char.IsLetterOrDigit (ch))
-					break;
-				offset++;
-			}
-			while (offset < Editor.Length) {
-				char ch = Editor.GetCharAt (offset);
-				if (!char.IsWhiteSpace (ch))
-					return char.IsLetter (ch) || ch == '}';
-				offset++;
-			}
-			return true;
-		}
-
-		public void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier, bool addParens, bool addOpeningOnly)
-		{
-			string text = CompletionText;
-			string partialWord = GetCurrentWord (window);
-			int skipChars = 0;
-			bool runParameterCompletionCommand = false;
-			bool runCompletionCompletionCommand = false;
-			var method = Entity as IMethod;
-			if (addParens && !IsDelegateExpected && method != null && !HasNonMethodMembersWithSameName ((IMember)Entity) && !IsBracketAlreadyInserted (method)) {
-				var line = Editor.GetLine (Editor.Caret.Line);
-				//var start = window.CodeCompletionContext.TriggerOffset + partialWord.Length + 2;
-				//var end = line.Offset + line.Length;
-				//string textToEnd = start < end ? Editor.GetTextBetween (start, end) : "";
-				bool addSpace = Policy.BeforeMethodCallParentheses && CSharpTextEditorIndentation.OnTheFlyFormatting;
-
-				int exprStart = window.CodeCompletionContext.TriggerOffset - 1;
-				while (exprStart > line.Offset) {
-					char ch = Editor.GetCharAt (exprStart);
-					if (ch != '.' && ch != '_' && /*ch != '<' && ch != '>' && */!char.IsLetterOrDigit (ch))
-						break;
-					exprStart--;
-				}
-				bool insertSemicolon = InsertSemicolon(exprStart);
-				if (Entity.SymbolKind == SymbolKind.Constructor)
-					insertSemicolon = false;
-				//int pos;
-
-				Gdk.Key[] keys = new [] { Gdk.Key.Return, Gdk.Key.Tab, Gdk.Key.space, Gdk.Key.KP_Enter, Gdk.Key.ISO_Enter };
-				if (keys.Contains (closeChar) || keyChar == '.') {
-					if (HasAnyOverloadWithParameters (method)) {
-						if (addOpeningOnly) {
-							text += RequireGenerics (method) ? "<|" : (addSpace ? " (|" : "(|");
-							skipChars = 0;
-						} else {
-							if (keyChar == '.') {
-								if (RequireGenerics (method)) {
-									text += addSpace ? "<> ()" : "<>()";
-								} else {
-									text += addSpace ? " ()" : "()";
-								}
-								skipChars = 0;
-							} else {
-								if (insertSemicolon) {
-									if (RequireGenerics (method)) {
-										text += addSpace ? "<|> ();" : "<|>();";
-										skipChars = addSpace ? 5 : 4;
-									} else {
-										text += addSpace ? " (|);" : "(|);";
-										skipChars = 2;
-									}
-								} else {
-									if (RequireGenerics (method)) {
-										text += addSpace ? "<|> ()" :  "<|>()";
-										skipChars = addSpace ? 4 : 3;
-									} else {
-										text += addSpace ? " (|)" : "(|)";
-										skipChars = 1;
-									}
-								}
-							}
-						}
-						runParameterCompletionCommand = true;
-					} else {
-						if (addOpeningOnly) {
-							text += RequireGenerics (method) ? "<|" : (addSpace ? " (|" : "(|");
-							skipChars = 0;
-						} else {
-							if (keyChar == '.') {
-								if (RequireGenerics (method)) {
-									text += addSpace ? "<> ().|" : "<>().|";
-								} else {
-									text += addSpace ? " ().|" : "().|";
-								}
-								skipChars = 0;
-							} else {
-								if (insertSemicolon) {
-									if (RequireGenerics (method)) {
-										text += addSpace ? "<|> ();" : "<|>();";
-									} else {
-										text += addSpace ? " ();|" : "();|";
-									}
-
-								} else {
-									if (RequireGenerics (method)) {
-										text += addSpace ? "<|> ()" : "<|>()";
-									} else {
-										text += addSpace ? " ()|" : "()|";
-									}
-
-								}
-							}
-						}
-					}
-					if (keyChar == '(') {
-						var skipChar = Editor.SkipChars.LastOrDefault ();
-						if (skipChar != null && skipChar.Offset == (window.CodeCompletionContext.TriggerOffset + partialWord.Length) && skipChar.Char == ')')
-							Editor.Remove (skipChar.Offset, 1);
-					}
-				}
-				ka |= KeyActions.Ignore;
-			}
-			if ((DisplayFlags & DisplayFlags.NamedArgument) == DisplayFlags.NamedArgument &&
-				CompletionTextEditorExtension.AddParenthesesAfterCompletion &&
-			    (closeChar == Gdk.Key.Tab ||
-				 closeChar == Gdk.Key.KP_Tab ||
-				 closeChar == Gdk.Key.ISO_Left_Tab ||
-				 closeChar == Gdk.Key.Return ||
-				 closeChar == Gdk.Key.KP_Enter ||
-				 closeChar == Gdk.Key.ISO_Enter ||
-				 closeChar == Gdk.Key.space ||
-				 closeChar == Gdk.Key.KP_Space)) {
-				if (Policy.AroundAssignmentParentheses)
-					text += " ";
-				text += "=";
-				if (Policy.AroundAssignmentParentheses && !(closeChar == Gdk.Key.space || closeChar == Gdk.Key.KP_Space))
-					text += " ";
-				runCompletionCompletionCommand = true;
-			}
-			window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, partialWord, text);
-			int offset = Editor.Caret.Offset;
-			for (int i = 0; i < skipChars; i++) {
-				Editor.SetSkipChar (offset, Editor.GetCharAt (offset));
-				offset++;
-			}
-			
-			if (runParameterCompletionCommand)
-				editorCompletion.RunParameterCompletionCommand ();
-			if (runCompletionCompletionCommand && IdeApp.Workbench != null) {
-				Application.Invoke (delegate {
-					editorCompletion.RunCompletionCommand ();
-				});
-			}
-		}
-
-		bool ContainsType (IType testType, IType searchType)
-		{
-			if (testType == searchType)
-				return true;
-			foreach (var arg in testType.TypeArguments)
-				if (ContainsType (arg, searchType))
-					return true;
-			return false;
-		}
-
-		bool RequireGenerics (IMethod method)
-		{
-			if (method.SymbolKind == SymbolKind.Constructor)
-				return method.DeclaringType.TypeParameterCount > 0;
-			var testMethod = method.ReducedFrom ?? method;
-			return testMethod.TypeArguments.Any (t => !testMethod.Parameters.Any (p => ContainsType(p.Type, t)));
-		}
-
-		void SetMember (IEntity entity)
-		{
-			this.Entity = entity;
-			this.completionString = displayText = (Entity.SymbolKind == SymbolKind.Constructor ? Entity.DeclaringTypeDefinition : Entity).Name;
-		}
-
-		TypeSystemAstBuilder GetBuilder (ICompilation compilation)
-		{
-			var ctx = editorCompletion.CSharpUnresolvedFile.GetTypeResolveContext (editorCompletion.UnresolvedFileCompilation, editorCompletion.Document.Editor.Caret.Location) as CSharpTypeResolveContext;
-			var state = new CSharpResolver (ctx);
-			var builder = new TypeSystemAstBuilder (state);
-			builder.AddAnnotations = true;
-			var dt = state.CurrentTypeDefinition;
-			var declaring = ctx.CurrentTypeDefinition != null ? ctx.CurrentTypeDefinition.DeclaringTypeDefinition : null;
-			if (declaring != null) {
-				while (dt != null) {
-					if (dt.Equals (declaring)) {
-						builder.AlwaysUseShortTypeNames = true;
-						break;
-					}
-					dt = dt.DeclaringTypeDefinition;
-				}
-			}
-			return builder;
-		}
-
-		internal class MyAmbience  : IAmbience
-		{
-			TypeSystemAstBuilder builder;
-
-			public MyAmbience (TypeSystemAstBuilder builder)
-			{
-				this.builder = builder;
-				ConversionFlags = ICSharpCode.NRefactory.TypeSystem.ConversionFlags.StandardConversionFlags;
-			}
-
-			public ConversionFlags ConversionFlags { get; set; }
-			#region ConvertEntity
-			public string ConvertSymbol(ISymbol symbol)
-			{
-				if (symbol is IEntity)
-					return ConvertEntity ((IEntity)symbol);
-				return symbol.ToString ();
-			}
-
-			public string ConvertEntity (IEntity entity)
-			{
-				if (entity == null)
-					throw new ArgumentNullException ("entity");
-				
-				StringWriter writer = new StringWriter ();
-				ConvertEntity (entity, new TextWriterTokenWriter (writer), FormattingOptionsFactory.CreateMono ());
-				return writer.ToString ();
-			}
-
-			public void ConvertEntity (IEntity entity, TextWriterTokenWriter formatter, CSharpFormattingOptions formattingPolicy)
-			{
-				if (entity == null)
-					throw new ArgumentNullException ("entity");
-				if (formatter == null)
-					throw new ArgumentNullException ("formatter");
-				if (formattingPolicy == null)
-					throw new ArgumentNullException ("options");
-				
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				EntityDeclaration node = astBuilder.ConvertEntity (entity);
-				PrintModifiers (node.Modifiers, formatter);
-				
-				if ((ConversionFlags & ConversionFlags.ShowDefinitionKeyword) == ConversionFlags.ShowDefinitionKeyword) {
-					if (node is TypeDeclaration) {
-						switch (((TypeDeclaration)node).ClassType) {
-						case ClassType.Class:
-							formatter.WriteKeyword (Roles.ClassKeyword, "class");
-							break;
-						case ClassType.Struct:
-							formatter.WriteKeyword (Roles.StructKeyword, "struct");
-							break;
-						case ClassType.Interface:
-							formatter.WriteKeyword (Roles.InterfaceKeyword, "interface");
-							break;
-						case ClassType.Enum:
-							formatter.WriteKeyword (Roles.EnumKeyword, "enum");
-							break;
-						default:
-							throw new Exception ("Invalid value for ClassType");
-						}
-						formatter.Space ();
-					} else if (node is DelegateDeclaration) {
-						formatter.WriteKeyword (Roles.DelegateKeyword, "delegate");
-						formatter.Space ();
-					} else if (node is EventDeclaration) {
-						formatter.WriteKeyword (EventDeclaration.EventKeywordRole, "event");
-						formatter.Space ();
-					}
-				}
-				
-				if ((ConversionFlags & ConversionFlags.ShowReturnType) == ConversionFlags.ShowReturnType) {
-					var rt = node.GetChildByRole (Roles.Type);
-					if (!rt.IsNull) {
-						rt.AcceptVisitor (new CSharpOutputVisitor (formatter, formattingPolicy));
-						formatter.Space ();
-					}
-				}
-				
-				if (entity is ITypeDefinition)
-					WriteTypeDeclarationName ((ITypeDefinition)entity, formatter, formattingPolicy);
-				else
-					WriteMemberDeclarationName ((IMember)entity, formatter, formattingPolicy);
-				
-				if ((ConversionFlags & ConversionFlags.ShowParameterList) == ConversionFlags.ShowParameterList && HasParameters (entity)) {
-					if (entity.SymbolKind == SymbolKind.Indexer)
-						formatter.WriteToken (Roles.LBracket, "[");
-					else 
-						formatter.WriteToken (Roles.LBrace, "(");
-					bool first = true;
-					foreach (var param in node.GetChildrenByRole(Roles.Parameter)) {
-						if (first) {
-							first = false;
-						} else {
-							formatter.WriteToken (Roles.Comma, ",");
-							formatter.Space ();
-						}
-						param.AcceptVisitor (new CSharpOutputVisitor (formatter, formattingPolicy));
-					}
-					if (entity.SymbolKind == SymbolKind.Indexer)
-						formatter.WriteToken (Roles.RBracket, "]");
-					else 
-						formatter.WriteToken (Roles.RBrace, ")");
-				}
-				
-				if ((ConversionFlags & ConversionFlags.ShowBody) == ConversionFlags.ShowBody && !(node is TypeDeclaration)) {
-					IProperty property = entity as IProperty;
-					if (property != null) {
-						formatter.Space ();
-						formatter.WriteToken (Roles.LBrace, "{");
-						formatter.Space ();
-						if (property.CanGet) {
-							formatter.WriteKeyword (PropertyDeclaration.GetKeywordRole, "get");
-							formatter.WriteToken (Roles.Semicolon, ";");
-							formatter.Space ();
-						}
-						if (property.CanSet) {
-							formatter.WriteKeyword (PropertyDeclaration.SetKeywordRole, "set");
-							formatter.WriteToken (Roles.Semicolon, ";");
-							formatter.Space ();
-						}
-						formatter.WriteToken (Roles.RBrace, "}");
-					} else {
-						formatter.WriteToken (Roles.Semicolon, ";");
-					}
-				}
-			}
-
-			bool HasParameters (IEntity e)
-			{
-				switch (e.SymbolKind) {
-				case SymbolKind.TypeDefinition:
-					return ((ITypeDefinition)e).Kind == TypeKind.Delegate;
-				case SymbolKind.Indexer:
-				case SymbolKind.Method:
-				case SymbolKind.Operator:
-				case SymbolKind.Constructor:
-				case SymbolKind.Destructor:
-					return true;
-				default:
-					return false;
-				}
-			}
-			public string ConvertConstantValue (object constantValue)
-			{
-				if (constantValue == null)
-					return "null";
-				return constantValue.ToString ();
-			}
-
-			TypeSystemAstBuilder CreateAstBuilder ()
-			{
-				return builder;
-			}
-
-			void WriteTypeDeclarationName (ITypeDefinition typeDef, TextWriterTokenWriter formatter, CSharpFormattingOptions formattingPolicy)
-			{
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				if (typeDef.DeclaringTypeDefinition != null) {
-					WriteTypeDeclarationName (typeDef.DeclaringTypeDefinition, formatter, formattingPolicy);
-					formatter.WriteToken (Roles.Dot, ".");
-				} else if ((ConversionFlags & ConversionFlags.UseFullyQualifiedTypeNames) == ConversionFlags.UseFullyQualifiedTypeNames) {
-					formatter.WriteIdentifier (Identifier.Create (typeDef.Namespace));
-					formatter.WriteToken (Roles.Dot, ".");
-				}
-				formatter.WriteIdentifier (Identifier.Create (typeDef.Name));
-				if ((ConversionFlags & ConversionFlags.ShowTypeParameterList) == ConversionFlags.ShowTypeParameterList) {
-					var outputVisitor = new CSharpOutputVisitor (formatter, formattingPolicy);
-					outputVisitor.WriteTypeParameters (astBuilder.ConvertEntity (typeDef).GetChildrenByRole (Roles.TypeParameter));
-				}
-			}
-
-			void WriteMemberDeclarationName (IMember member, TextWriterTokenWriter formatter, CSharpFormattingOptions formattingPolicy)
-			{
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				if ((ConversionFlags & ConversionFlags.ShowDeclaringType) == ConversionFlags.ShowDeclaringType) {
-					ConvertType (member.DeclaringType, formatter, formattingPolicy);
-					formatter.WriteToken (Roles.Dot, ".");
-				}
-				switch (member.SymbolKind) {
-				case SymbolKind.Indexer:
-					formatter.WriteKeyword (IndexerDeclaration.ThisKeywordRole, "this");
-					break;
-				case SymbolKind.Constructor:
-					formatter.WriteIdentifier (Identifier.Create (member.DeclaringType.Name));
-					break;
-				case SymbolKind.Destructor:
-					formatter.WriteToken (DestructorDeclaration.TildeRole, "~");
-					formatter.WriteIdentifier (Identifier.Create (member.DeclaringType.Name));
-					break;
-				case SymbolKind.Operator:
-					switch (member.Name) {
-					case "op_Implicit":
-						formatter.WriteKeyword (OperatorDeclaration.ImplicitRole, "implicit");
-						formatter.Space ();
-						formatter.WriteKeyword (OperatorDeclaration.OperatorKeywordRole, "operator");
-						formatter.Space ();
-						ConvertType (member.ReturnType, formatter, formattingPolicy);
-						break;
-					case "op_Explicit":
-						formatter.WriteKeyword (OperatorDeclaration.ExplicitRole, "explicit");
-						formatter.Space ();
-						formatter.WriteKeyword (OperatorDeclaration.OperatorKeywordRole, "operator");
-						formatter.Space ();
-						ConvertType (member.ReturnType, formatter, formattingPolicy);
-						break;
-					default:
-						formatter.WriteKeyword (OperatorDeclaration.OperatorKeywordRole, "operator");
-						formatter.Space ();
-						var operatorType = OperatorDeclaration.GetOperatorType (member.Name);
-						if (operatorType.HasValue) {
-							formatter.WriteToken (OperatorDeclaration.GetRole (operatorType.Value), OperatorDeclaration.GetToken (operatorType.Value));
-						}
-						else
-							formatter.WriteIdentifier (Identifier.Create (member.Name));
-						break;
-					}
-					break;
-				default:
-					formatter.WriteIdentifier (Identifier.Create (member.Name));
-					break;
-				}
-				if ((ConversionFlags & ConversionFlags.ShowTypeParameterList) == ConversionFlags.ShowTypeParameterList && member.SymbolKind == SymbolKind.Method) {
-					var outputVisitor = new CSharpOutputVisitor (formatter, formattingPolicy);
-					outputVisitor.WriteTypeParameters (astBuilder.ConvertEntity (member).GetChildrenByRole (Roles.TypeParameter));
-				}
-			}
-
-			void PrintModifiers (Modifiers modifiers, TextWriterTokenWriter formatter)
-			{
-				foreach (var m in CSharpModifierToken.AllModifiers) {
-					if ((modifiers & m) == m) {
-						formatter.WriteToken (TypeDeclaration.ModifierRole, CSharpModifierToken.GetModifierName (m));
-						formatter.Space ();
-					}
-				}
-			}
-
-
-#endregion
-			
-			public string ConvertVariable (IVariable v)
-			{
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				AstNode astNode = astBuilder.ConvertVariable (v);
-				return astNode.ToString ().TrimEnd (';', '\r', '\n');
-			}
-
-			public string ConvertType (IType type)
-			{
-				if (type == null)
-					throw new ArgumentNullException ("type");
-				
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				AstType astType = astBuilder.ConvertType (type);
-				return astType.ToString ();
-			}
-
-			public void ConvertType (IType type, TextWriterTokenWriter formatter, CSharpFormattingOptions formattingPolicy)
-			{
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				AstType astType = astBuilder.ConvertType (type);
-				astType.AcceptVisitor (new CSharpOutputVisitor (formatter, formattingPolicy));
-			}
-
-			public string WrapComment (string comment)
-			{
-				return "// " + comment;
-			}
-		}
-
-		public static TooltipInformation CreateTooltipInformation (CSharpCompletionTextEditorExtension editorCompletion, CSharpResolver resolver, IEntity entity, bool smartWrap)
-		{
-			return CreateTooltipInformation (editorCompletion.UnresolvedFileCompilation, editorCompletion.CSharpUnresolvedFile, resolver, editorCompletion.TextEditorData, editorCompletion.FormattingPolicy, entity, smartWrap);
-		}
-
-		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, TextEditorData textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IEntity entity, bool smartWrap, bool createFooter = false)
-		{
-			return CreateTooltipInformation (compilation, file, null, textEditorData, formattingPolicy, entity, smartWrap, createFooter);
-		}
-
-		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, CSharpResolver resolver, TextEditorData textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IEntity entity, bool smartWrap, bool createFooter = false)
-		{
-			var tooltipInfo = new TooltipInformation ();
-			if (resolver == null)
-				resolver = file != null ? file.GetResolver (compilation, textEditorData.Caret.Location) : new CSharpResolver (compilation);
-			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
-			sig.BreakLineAfterReturnType = smartWrap;
-			try {
-				tooltipInfo.SignatureMarkup = sig.GetMarkup (entity);
-			} catch (Exception e) {
-				LoggingService.LogError ("Got exception while creating markup for :" + entity, e);
-				return new TooltipInformation ();
-			}
-			tooltipInfo.SummaryMarkup = AmbienceService.GetSummaryMarkup (entity) ?? "";
-			
-			if (entity is IMember) {
-				var evt = (IMember)entity;
-				if (evt.ReturnType.Kind == TypeKind.Delegate) {
-					tooltipInfo.AddCategory (GettextCatalog.GetString ("Delegate Info"), sig.GetDelegateInfo (evt.ReturnType));
-				}
-			}
-			if (entity is IMethod) {
-				var method = (IMethod)entity;
-				if (method.IsExtensionMethod) {
-					tooltipInfo.AddCategory (GettextCatalog.GetString ("Extension Method from"), method.DeclaringTypeDefinition.FullName);
-				}
-			}
-			if (createFooter) {
-				tooltipInfo.FooterMarkup = sig.CreateFooter (entity);
-			}
-			return tooltipInfo;
-		}
-
-		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, TextEditorData textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IType type, bool smartWrap, bool createFooter = false)
-		{
-			var tooltipInfo = new TooltipInformation ();
-			if (type.Kind == TypeKind.Unknown)
-				return tooltipInfo;
-			var resolver = file != null ? file.GetResolver (compilation, textEditorData.Caret.Location) : new CSharpResolver (compilation);
-			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
-			sig.BreakLineAfterReturnType = smartWrap;
-			try {
-				tooltipInfo.SignatureMarkup = sig.GetMarkup (type.IsParameterized ? type.GetDefinition () : type);
-			} catch (Exception e) {
-				LoggingService.LogError ("Got exception while creating markup for :" + type, e);
-				return new TooltipInformation ();
-			}
-			if (type.IsParameterized) {
-				var typeInfo = new StringBuilder ();
-				for (int i = 0; i < type.TypeParameterCount; i++) {
-					typeInfo.AppendLine (type.GetDefinition ().TypeParameters [i].Name + " is " + sig.GetTypeReferenceString (type.TypeArguments [i]));
-				}
-				tooltipInfo.AddCategory ("Type Parameters", typeInfo.ToString ());
-			}
-
-			var def = type.GetDefinition ();
-			if (def != null) {
-				if (createFooter)
-					tooltipInfo.FooterMarkup = sig.CreateFooter (def);
-				tooltipInfo.SummaryMarkup = AmbienceService.GetSummaryMarkup (def) ?? "";
-			}
-			return tooltipInfo;
-		}
-
-		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
-		{
-			return CreateTooltipInformation (compilation, file, editorCompletion.TextEditorData, editorCompletion.FormattingPolicy, Entity, smartWrap);
-		}
-		#region IOverloadedCompletionData implementation 
-	
-		class OverloadSorter : IComparer<ICompletionData>
-		{
-			public OverloadSorter ()
-			{
-			}
-
-			public int Compare (ICompletionData x, ICompletionData y)
-			{
-				var mx = ((MemberCompletionData)x).Entity as IMember;
-				var my = ((MemberCompletionData)y).Entity as IMember;
-				int result;
-				
-				if (mx is ITypeDefinition && my is ITypeDefinition) {
-					result = ((((ITypeDefinition)mx).TypeParameters.Count).CompareTo (((ITypeDefinition)my).TypeParameters.Count));
-					if (result != 0)
-						return result;
-				}
-				
-				if (mx is IMethod && my is IMethod) {
-					return MethodParameterDataProvider.MethodComparer ((IMethod)mx, (IMethod)my);
-				}
-				string sx = mx.ReflectionName;// ambience.GetString (mx, flags);
-				string sy = my.ReflectionName;// ambience.GetString (my, flags);
-				result = sx.Length.CompareTo (sy.Length);
-				return result == 0 ? string.Compare (sx, sy) : result;
-			}
-		}
-
-		public override IEnumerable<ICompletionData> OverloadedData {
-			get {
-				if (overloads == null)
-					return new CompletionData[] { this };
-				
-				var sorted = new List<ICompletionData> (overloads.Values);
-				sorted.Add (this);
-				sorted.Sort (new OverloadSorter ());
-				return sorted;
-			}
-		}
-
-		public override bool HasOverloads {
-			get { return overloads != null && overloads.Count > 0; }
-		}
-
-		public override void AddOverload (ICSharpCode.NRefactory.Completion.ICompletionData data)
-		{
-			AddOverload ((MemberCompletionData)data);
-		}
-
-		public void AddOverload (MemberCompletionData overload)
-		{
-			if (overloads == null)
-				overloads = new Dictionary<string, CompletionData> ();
-			
-			if (overload.Entity is IMember && Entity is IMember) {
-				// filter overriden members that came from base classes
-				// note that the overload tree is traversed top down.
-				var member = Entity as IMember;
-				if (member.IsOverride)
-					return;
-
-				string MemberId = (overload.Entity as IMember).GetIdString ();
-				if (MemberId != (this.Entity as IMember).GetIdString () && !overloads.ContainsKey (MemberId)) {
-					overloads [MemberId] = overload;
-					
-					//if any of the overloads is obsolete, we should not mark the item obsolete
-					if (!(overload.Entity as IMember).IsObsolete ())
-						DisplayFlags &= ~DisplayFlags.Obsolete;
-				}
-			}
-		}
-		#endregion
-
-		#region IEntityCompletionData implementation
-		public IEntity Entity {
-			get;
-			set;
-		}
-		#endregion
-
-		public override int CompareTo (object obj)
-		{
-			int result = base.CompareTo (obj);
-			if (result == 0) {
-				var mcd = obj as MemberCompletionData;
-				if (mcd != null) {
-					var mc = mcd;
-					if (this.Entity.SymbolKind == SymbolKind.Method) {
-						var method = (IMethod)this.Entity;
-						if (method.IsExtensionMethod)
-							return 1;
-					}
-					if (mc.Entity.SymbolKind == SymbolKind.Method) {
-						var method = (IMethod)mc.Entity;
-						if (method.IsExtensionMethod)
-							return -1;
-					}
-				} else {
-					return -1;
-				}
-			}
-			return result;
-		}
-
-		public override string ToString ()
-		{
-			return string.Format ("[MemberCompletionData: Entity={0}]", Entity);
-		}
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs
index 01551b3b39..d9114e5050 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs
@@ -39,7 +39,7 @@ using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.CSharp.Refactoring;
 using ICSharpCode.NRefactory.CSharp.Completion;
 using MonoDevelop.Ide.CodeCompletion;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharp.Completion
 {
@@ -126,55 +126,55 @@ namespace MonoDevelop.CSharp.Completion
 
 		public static TooltipInformation CreateTooltipInformation (CSharpCompletionTextEditorExtension ext, ICompilation compilation, CSharpUnresolvedFile file, IParameterizedMember entity, int currentParameter, bool smartWrap)
 		{
-			return CreateTooltipInformation (compilation, file, ext.TextEditorData, ext.FormattingPolicy, entity, currentParameter, smartWrap);
+			return CreateTooltipInformation (compilation, file, ext.Editor, ext.FormattingPolicy, entity, currentParameter, smartWrap);
 		}
 
-		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, TextEditorData textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IParameterizedMember entity, int currentParameter, bool smartWrap)
+		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, TextEditor textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IParameterizedMember entity, int currentParameter, bool smartWrap)
 		{
 			var tooltipInfo = new TooltipInformation ();
-			var resolver = file.GetResolver (compilation, textEditorData.Caret.Location);
-			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
-			sig.HighlightParameter = currentParameter;
-			sig.BreakLineAfterReturnType = smartWrap;
-			try {
-				tooltipInfo.SignatureMarkup = sig.GetMarkup (entity);
-			} catch (Exception e) {
-				LoggingService.LogError ("Got exception while creating markup for :" + entity, e);
-				return new TooltipInformation ();
-			}
-			tooltipInfo.SummaryMarkup = AmbienceService.GetSummaryMarkup (entity) ?? "";
-			
-			if (entity is IMethod) {
-				var method = (IMethod)entity;
-				if (method.IsExtensionMethod) {
-					tooltipInfo.AddCategory (GettextCatalog.GetString ("Extension Method from"), method.DeclaringTypeDefinition.FullName);
-				}
-			}
-			int paramIndex = currentParameter;
-
-			if (entity is IMethod && ((IMethod)entity).IsExtensionMethod)
-				paramIndex++;
-			paramIndex = Math.Min (entity.Parameters.Count - 1, paramIndex);
-
-			var curParameter = paramIndex >= 0  && paramIndex < entity.Parameters.Count ? entity.Parameters [paramIndex] : null;
-			if (curParameter != null) {
-
-				string docText = AmbienceService.GetDocumentation (entity);
-				if (!string.IsNullOrEmpty (docText)) {
-					string text = docText;
-					Regex paramRegex = new Regex ("(\\<param\\s+name\\s*=\\s*\"" + curParameter.Name + "\"\\s*\\>.*?\\</param\\>)", RegexOptions.Compiled);
-					Match match = paramRegex.Match (docText);
-					
-					if (match.Success) {
-						text = AmbienceService.GetDocumentationMarkup (entity, match.Groups [1].Value);
-						if (!string.IsNullOrWhiteSpace (text))
-							tooltipInfo.AddCategory (GettextCatalog.GetString ("Parameter"), text);
-					}
-				}
-		
-				if (curParameter.Type.Kind == TypeKind.Delegate)
-					tooltipInfo.AddCategory (GettextCatalog.GetString ("Delegate Info"), sig.GetDelegateInfo (curParameter.Type));
-			}
+//			var resolver = file.GetResolver (compilation, textEditorData.Caret.Location);
+//			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
+//			sig.HighlightParameter = currentParameter;
+//			sig.BreakLineAfterReturnType = smartWrap;
+//			try {
+//				tooltipInfo.SignatureMarkup = sig.GetMarkup (entity);
+//			} catch (Exception e) {
+//				LoggingService.LogError ("Got exception while creating markup for :" + entity, e);
+//				return new TooltipInformation ();
+//			}
+//			tooltipInfo.SummaryMarkup = AmbienceService.GetSummaryMarkup (entity) ?? "";
+//			
+//			if (entity is IMethod) {
+//				var method = (IMethod)entity;
+//				if (method.IsExtensionMethod) {
+//					tooltipInfo.AddCategory (GettextCatalog.GetString ("Extension Method from"), method.DeclaringTypeDefinition.FullName);
+//				}
+//			}
+//			int paramIndex = currentParameter;
+//
+//			if (entity is IMethod && ((IMethod)entity).IsExtensionMethod)
+//				paramIndex++;
+//			paramIndex = Math.Min (entity.Parameters.Count - 1, paramIndex);
+//
+//			var curParameter = paramIndex >= 0  && paramIndex < entity.Parameters.Count ? entity.Parameters [paramIndex] : null;
+//			if (curParameter != null) {
+//
+//				string docText = AmbienceService.GetDocumentation (entity);
+//				if (!string.IsNullOrEmpty (docText)) {
+//					string text = docText;
+//					Regex paramRegex = new Regex ("(\\<param\\s+name\\s*=\\s*\"" + curParameter.Name + "\"\\s*\\>.*?\\</param\\>)", RegexOptions.Compiled);
+//					Match match = paramRegex.Match (docText);
+//					
+//					if (match.Success) {
+//						text = AmbienceService.GetDocumentationMarkup (entity, match.Groups [1].Value);
+//						if (!string.IsNullOrWhiteSpace (text))
+//							tooltipInfo.AddCategory (GettextCatalog.GetString ("Parameter"), text);
+//					}
+//				}
+//		
+//				if (curParameter.Type.Kind == TypeKind.Delegate)
+//					tooltipInfo.AddCategory (GettextCatalog.GetString ("Delegate Info"), sig.GetDelegateInfo (curParameter.Type));
+//			}
 			return tooltipInfo;
 		}
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MonoCSharpCompletionEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MonoCSharpCompletionEngine.cs
deleted file mode 100644
index 0046a7322d..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MonoCSharpCompletionEngine.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// MonoCSharpCompletionEngine.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp.Completion;
-using System.Collections.Generic;
-using MonoDevelop.CodeGeneration;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using ICSharpCode.NRefactory.Editor;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class MonoCSharpCompletionEngine : CSharpCompletionEngine
-	{
-		readonly CSharpCompletionTextEditorExtension ext;
-
-		public CSharpCompletionTextEditorExtension Ext {
-			get {
-				return ext;
-			}
-		}
-
-		public MDRefactoringContext MDRefactoringCtx {
-			get {
-				return ext.MDRefactoringCtx;
-			}
-		}
-
-		public MonoCSharpCompletionEngine (CSharpCompletionTextEditorExtension ext, ICSharpCode.NRefactory.Editor.IDocument document, ICompletionContextProvider completionContextProvider, ICompletionDataFactory factory, ICSharpCode.NRefactory.TypeSystem.IProjectContent content, ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpTypeResolveContext ctx) : base (document, completionContextProvider, factory, content, ctx)
-		{
-			this.ext = ext;
-		}
-
-		protected override void AddVirtuals (List<IMember> alreadyInserted, CompletionDataWrapper col, string modifiers, IType curType, int declarationBegin)
-		{
-			base.AddVirtuals (alreadyInserted, col, modifiers, curType, declarationBegin);
-			foreach (var member in GetProtocolMembers (curType)) {
-				if (alreadyInserted.Contains (member))
-					continue;
-				if (BaseExportCodeGenerator.IsImplemented (curType, member))
-					continue;
-				alreadyInserted.Add (member);
-				var data = new ProtocolCompletionData (this, declarationBegin, member);
-				col.Add (data);
-			}
-		}
-
-		internal static bool IsFoundationNamespace (string ns )
-		{
-			return (ns == "MonoTouch.Foundation" || ns == "Foundation");
-		}
-
-		IEnumerable<IMember> GetProtocolMembers (IType curType)
-		{
-			foreach (var t in curType.DirectBaseTypes) {
-				string name;
-				if (!BaseExportCodeGenerator.HasProtocolAttribute (t, out name))
-					continue;
-				var protocolType = Compilation.FindType (new FullTypeName (new TopLevelTypeName (t.Namespace, name)));
-				if (protocolType == null)
-					break;
-				foreach (var member in protocolType.GetMethods (null, GetMemberOptions.IgnoreInheritedMembers)) {
-					if (member.ImplementedInterfaceMembers.Any () || member.IsAbstract || !member.IsVirtual)
-						continue;
-					if (member.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" && IsFoundationNamespace (a.AttributeType.Namespace))) {
-						yield return member;
-					}
-				}
-				foreach (var member in protocolType.GetProperties (null, GetMemberOptions.IgnoreInheritedMembers)) {
-					if (member.ImplementedInterfaceMembers.Any () || member.IsAbstract || !member.IsVirtual)
-						continue;
-					if (member.CanGet && member.Getter.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" &&  IsFoundationNamespace (a.AttributeType.Namespace)) ||
-						member.CanSet && member.Setter.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" &&  IsFoundationNamespace (a.AttributeType.Namespace)))
-						yield return member;
-				}
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ObjectCreationCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ObjectCreationCompletionData.cs
new file mode 100644
index 0000000000..47a52cadc8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ObjectCreationCompletionData.cs
@@ -0,0 +1,150 @@
+// 
+// CSharpCompletionTextEditorExtension.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.CodeCompletion;
+using System.Text;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+using System.Linq;
+using Gtk;
+using MonoDevelop.Ide;
+using System.Collections.Generic;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class ObjectCreationCompletionData : RoslynSymbolCompletionData
+	{
+		public static readonly SymbolDisplayFormat HideParameters =
+			new SymbolDisplayFormat(
+				globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+				typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+				propertyStyle: SymbolDisplayPropertyStyle.NameOnly,
+				genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
+				memberOptions: SymbolDisplayMemberOptions.None,
+				parameterOptions:
+				SymbolDisplayParameterOptions.None,
+				miscellaneousOptions:
+				SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+				SymbolDisplayMiscellaneousOptions.UseSpecialTypes
+			);
+
+		readonly ITypeSymbol type;
+		readonly ISymbol symbol;
+		ISymbol insertSymbol;
+		readonly int declarationBegin;
+		readonly bool afterKeyword;
+		readonly SemanticModel semanticModel;
+
+		string displayText;
+
+
+		public override string DisplayText {
+			get {
+				if (displayText == null) {
+					displayText = CropGlobal(symbol.ToMinimalDisplayString (semanticModel, declarationBegin, Ambience.LabelFormat)) + "()";
+					if (!afterKeyword)
+						displayText = "new " + displayText;
+				}
+				return displayText;
+			}
+		}
+
+		public override string GetDisplayTextMarkup ()
+		{
+			var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+
+			var result = "<b>" + Ambience.EscapeText (CropGlobal(symbol.ToMinimalDisplayString (model, declarationBegin, HideParameters))) + "</b>()";
+			if (!afterKeyword)
+				result = "new " + result;
+			return ApplyDiplayFlagsFormatting (result);
+		}
+
+		static string CropGlobal (string str)
+		{
+			// shouldn't happen according to the display format - but happens. bug ?
+			if (str.StartsWith ("global::"))
+				return str.Substring ("global::".Length);
+			return str;
+		}
+
+		public override bool HasOverloads {
+			get {
+				return true;
+			}
+		}
+
+		List<CompletionData> overloads;
+		public override IReadOnlyList<CompletionData> OverloadedData {
+			get {
+				if (overloads == null) {
+					overloads = new List<CompletionData> ();
+					foreach (var constructor in type.GetMembers ().OfType<IMethodSymbol> ().Where (m => m.MethodKind == MethodKind.Constructor)) {
+						overloads.Add (new ObjectCreationCompletionData (keyHandler, ext, semanticModel, type, constructor, declarationBegin, afterKeyword) { insertSymbol = this.insertSymbol }); 
+					}
+				}
+				return overloads;
+			}
+		}
+
+		public ObjectCreationCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, CSharpCompletionTextEditorExtension ext, SemanticModel semanticModel, ITypeSymbol type, ISymbol symbol, int declarationBegin, bool afterKeyword) : base(keyHandler, ext, symbol)
+		{
+			this.type = type;
+			this.semanticModel = semanticModel;
+			this.afterKeyword = afterKeyword;
+			this.declarationBegin = declarationBegin;
+			this.symbol = insertSymbol = symbol;
+		}
+
+		protected override string GetInsertionText ()
+		{
+			var sb = new StringBuilder ();
+			if (!afterKeyword)
+				sb.Append ("new ");
+			sb.Append (CropGlobal (insertSymbol.ToMinimalDisplayString (semanticModel, declarationBegin, HideParameters)));
+			return sb.ToString () ;
+		}
+
+		public override int CompareTo (object obj)
+		{
+			var objCrCompData = obj as ObjectCreationCompletionData;
+			if (objCrCompData == null)
+				return -1;
+
+			return DisplayText.CompareTo(objCrCompData.DisplayText);
+		}
+
+		internal static bool HasAnyConstructorWithParameters (ITypeSymbol symbol)
+		{
+			return symbol.GetMembers()
+				.OfType<IMethodSymbol>()
+				.Where(m => m.MethodKind == MethodKind.Constructor)
+				.Any (m => m.Parameters.Length > 0);
+		}
+	}
+
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs
index edb8a32224..ee382e0f99 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs
@@ -28,60 +28,120 @@ using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.CodeGeneration;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Refactoring;
+using System.Linq;
+using MonoDevelop.CSharp.Formatting;
 
 namespace MonoDevelop.CSharp.Completion
 {
-	class ProtocolCompletionData : CompletionData
+	class ProtocolCompletionData : RoslynSymbolCompletionData
 	{
-		readonly MonoCSharpCompletionEngine engine;
-		readonly IMember member;
-		readonly static Ambience ambience = new CSharpAmbience ();
-		readonly int    declarationBegin;
+		readonly int declarationBegin;
+		readonly ITypeSymbol currentType;
 
 		public bool GenerateBody { get; set; }
 
-		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
-		{
-			return MemberCompletionData.CreateTooltipInformation (engine.Ext, null, member, smartWrap);
+		static readonly SymbolDisplayFormat NameFormat =
+			new SymbolDisplayFormat(
+				globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+				typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+				propertyStyle: SymbolDisplayPropertyStyle.NameOnly,
+				genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters | SymbolDisplayGenericsOptions.IncludeVariance,
+				memberOptions: SymbolDisplayMemberOptions.IncludeParameters | SymbolDisplayMemberOptions.IncludeExplicitInterface,
+				parameterOptions:
+				SymbolDisplayParameterOptions.IncludeParamsRefOut |
+				SymbolDisplayParameterOptions.IncludeExtensionThis |
+				SymbolDisplayParameterOptions.IncludeType |
+				SymbolDisplayParameterOptions.IncludeName,
+				miscellaneousOptions:
+				SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+				SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+
+		internal static readonly SymbolDisplayFormat overrideNameFormat = NameFormat.WithParameterOptions(
+			SymbolDisplayParameterOptions.IncludeDefaultValue |
+			SymbolDisplayParameterOptions.IncludeExtensionThis |
+			SymbolDisplayParameterOptions.IncludeType |
+			SymbolDisplayParameterOptions.IncludeName |
+			SymbolDisplayParameterOptions.IncludeParamsRefOut);
+
+		string displayText;
+
+		bool afterKeyword;
+
+		public override string DisplayText {
+			get {
+				if (displayText == null) {
+					var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+					displayText = base.Symbol.ToMinimalDisplayString (model, ext.Editor.CaretOffset, overrideNameFormat);
+					if (!afterKeyword)
+						displayText = "override " + displayText;
+				}
+
+				return displayText;
+			}
 		}
 
-		public ProtocolCompletionData (MonoCSharpCompletionEngine engine, int declarationBegin, IMember member) : base (null)
-		{
-			this.engine = engine;
-			this.member = member;
 
+		public ProtocolCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, CSharpCompletionTextEditorExtension ext, int declarationBegin, ITypeSymbol currentType, Microsoft.CodeAnalysis.ISymbol member, bool afterKeyword) : base (keyHandler, ext, member, member.ToDisplayString ())
+		{
+			this.afterKeyword = afterKeyword;
+			this.currentType = currentType;
 			this.declarationBegin = declarationBegin;
 			this.GenerateBody = true;
-			this.Icon = member.GetStockIcon ();
-			this.DisplayText = ambience.GetString (member, OutputFlags.IncludeParameters | OutputFlags.IncludeParameterName | OutputFlags.IncludeGenerics | OutputFlags.HideExtensionsParameter| OutputFlags.IncludeAccessor);
-			this.CompletionText = member.SymbolKind == SymbolKind.Indexer ? "this" : member.Name;
 		}
 
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
-			var ext = engine.Ext;
-			var editor = ext.TextEditorData;
-			var generator = CodeGenerator.CreateGenerator (ext.Document);
-			if (ext.Project != null)
-				generator.PolicyParent = ext.Project.Policies;
-			var builder = engine.MDRefactoringCtx.CreateTypeSystemAstBuilder ();
-
-			string sb = BaseExportCodeGenerator.GenerateMemberCode (engine.MDRefactoringCtx, builder, member);
+			var editor = ext.Editor;
+			bool isExplicit = false;
+			//			if (member.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+			//				foreach (var m in type.Members) {
+			//					if (m.Name == member.Name && !m.ReturnType.Equals (member.ReturnType)) {
+			//						isExplicit = true;
+			//						break;
+			//					}
+			//				}
+			//			}
+			//			var resolvedType = type.Resolve (ext.Project).GetDefinition ();
+			//			if (ext.Project != null)
+			//				generator.PolicyParent = ext.Project.Policies;
+
+			var result = CSharpCodeGenerator.CreateProtocolMemberImplementation (ext.DocumentContext, ext.Editor, currentType, currentType.Locations.First (), Symbol, isExplicit);
+			string sb = result.Code.TrimStart ();
+			int trimStart = result.Code.Length - sb.Length;
 			sb = sb.TrimEnd ();
 
-			string indent = editor.GetIndentationString (editor.Caret.Location); 
-			sb = sb.Replace (editor.EolMarker, editor.EolMarker + indent);
+			var lastRegion = result.BodyRegions.LastOrDefault ();
+			var region = lastRegion == null? null
+				: new CodeGeneratorBodyRegion (lastRegion.StartOffset - trimStart, lastRegion.EndOffset - trimStart);
 
-			int targetCaretPosition = sb.LastIndexOf ("throw", StringComparison.Ordinal);
-			int selectionEndPosition = sb.LastIndexOf (";", StringComparison.Ordinal);
+			int targetCaretPosition;
+			int selectionEndPosition = -1;
+			if (region != null && region.IsValid) {
+				targetCaretPosition = declarationBegin + region.StartOffset;
+				if (region.Length > 0) {
+					if (GenerateBody) {
+						selectionEndPosition = declarationBegin + region.EndOffset;
+					} else {
+						//FIXME: if there are multiple regions, remove all of them
+						sb = sb.Substring (0, region.StartOffset) + sb.Substring (region.EndOffset); 
+					}
+				}
+			} else {
+				targetCaretPosition = declarationBegin + sb.Length;
+			}
 
-			editor.Replace (declarationBegin, editor.Caret.Offset - declarationBegin, sb);
+			editor.ReplaceText (declarationBegin, editor.CaretOffset - declarationBegin, sb);
 			if (selectionEndPosition > 0) {
-				targetCaretPosition += declarationBegin;
-				selectionEndPosition += declarationBegin;
-				editor.Caret.Offset = selectionEndPosition;
+				editor.CaretOffset = selectionEndPosition;
 				editor.SetSelection (targetCaretPosition, selectionEndPosition);
+			} else {
+				editor.CaretOffset = targetCaretPosition;
 			}
+
+			OnTheFlyFormatter.Format (editor, ext.DocumentContext, declarationBegin, declarationBegin + sb.Length);
 		}
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolMemberContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolMemberContextHandler.cs
new file mode 100644
index 0000000000..5aa77d4301
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolMemberContextHandler.cs
@@ -0,0 +1,153 @@
+//
+// ProtocolMemberContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using System.Linq;
+using Mono.Addins.Description;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class ProtocolMemberContextHandler : OverrideContextHandler
+	{
+		CSharpCompletionTextEditorExtension extension;
+
+		public ProtocolMemberContextHandler (CSharpCompletionTextEditorExtension extension)
+		{
+			this.extension = extension;
+		}
+
+		protected override IEnumerable<ICompletionData> CreateCompletionData (CompletionEngine engine, SemanticModel semanticModel, int position, ITypeSymbol returnType, Accessibility seenAccessibility, SyntaxToken startToken, SyntaxToken tokenBeforeReturnType, bool afterKeyword, CancellationToken cancellationToken)
+		{
+			var result = new List<ICompletionData> ();
+			ISet<ISymbol> overridableMembers;
+			if (!TryDetermineOverridableMembers (semanticModel, tokenBeforeReturnType, seenAccessibility, out overridableMembers, cancellationToken)) {
+				return result;
+			}
+			if (returnType != null) {
+				overridableMembers = FilterOverrides (overridableMembers, returnType);
+			}
+			var curType = semanticModel.GetEnclosingSymbol<INamedTypeSymbol> (startToken.SpanStart, cancellationToken);
+			var declarationBegin = afterKeyword ? startToken.SpanStart : position;
+			foreach (var m in overridableMembers) {
+				var data = new ProtocolCompletionData (this, extension, declarationBegin, curType, m, afterKeyword);
+				result.Add (data);
+			}
+			return result;
+		}
+
+		static bool TryDetermineOverridableMembers(SemanticModel semanticModel, SyntaxToken startToken, Accessibility seenAccessibility, out ISet<ISymbol> overridableMembers, CancellationToken cancellationToken)
+		{
+			var result = new HashSet<ISymbol>();
+			var containingType = semanticModel.GetEnclosingSymbol<INamedTypeSymbol>(startToken.SpanStart, cancellationToken);
+			if (containingType != null && !containingType.IsScriptClass && !containingType.IsImplicitClass)
+			{
+				if (containingType.TypeKind == TypeKind.Class || containingType.TypeKind == TypeKind.Struct)
+				{
+					var baseTypes = containingType.GetBaseTypes().Reverse();
+					foreach (var type in baseTypes)
+					{
+						cancellationToken.ThrowIfCancellationRequested();
+
+						// Prefer overrides in derived classes
+						RemoveOverriddenMembers(result, type, cancellationToken);
+
+						// Retain overridable methods
+						AddProtocolMembers(semanticModel, result, containingType, type, cancellationToken);
+					}
+					// Don't suggest already overridden members
+					RemoveOverriddenMembers(result, containingType, cancellationToken);
+				}
+			}
+
+			// Filter based on accessibility
+			if (seenAccessibility != Accessibility.NotApplicable)
+			{
+				result.RemoveWhere(m => m.DeclaredAccessibility != seenAccessibility);
+			}
+
+			overridableMembers = result;
+			return overridableMembers.Count > 0;
+		}
+
+		static void AddProtocolMembers(SemanticModel semanticModel, HashSet<ISymbol> result, INamedTypeSymbol containingType, INamedTypeSymbol type, CancellationToken cancellationToken)
+		{
+			string name;
+			if (!HasProtocolAttribute (containingType, out name))
+				return;
+
+			var protocolType = semanticModel.Compilation.GetTypeByMetadataName (name);
+			if (protocolType == null)
+				return;
+			
+			foreach (var member in protocolType.GetMembers ().OfType<IMethodSymbol> ()) {
+				if (member.ExplicitInterfaceImplementations.Length > 0 || member.IsAbstract || !member.IsVirtual)
+					continue;
+				if (member.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && IsFoundationNamespace (a.AttributeClass.ContainingNamespace.GetFullName ()))) {
+					result.Add (member);
+				}
+
+			}
+			foreach (var member in protocolType.GetMembers ().OfType<IPropertySymbol> ()) {
+				if (member.ExplicitInterfaceImplementations.Length > 0 || member.IsAbstract || !member.IsVirtual)
+					continue;
+				if (member.GetMethod != null && member.GetMethod.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && IsFoundationNamespace (a.AttributeClass.ContainingNamespace.GetFullName ())) ||
+					member.SetMethod != null && member.SetMethod.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && IsFoundationNamespace (a.AttributeClass.ContainingNamespace.GetFullName ())))
+					result.Add (member);
+			}
+		}
+
+		internal static bool IsFoundationNamespace (string ns )
+		{
+			return (ns == "MonoTouch.Foundation" || ns == "Foundation");
+		}
+
+		internal static bool IsFoundationNamespace (INamespaceSymbol ns)
+		{
+			return IsFoundationNamespace (ns.GetFullName ());
+		}
+
+		internal static bool HasProtocolAttribute (INamedTypeSymbol type, out string name)
+		{
+			foreach (var attrs in type.GetAttributes ()) {
+				if (attrs.AttributeClass.Name == "ProtocolAttribute" && IsFoundationNamespace (attrs.AttributeClass.ContainingNamespace.GetFullName ())) {
+					foreach (var na in attrs.NamedArguments) {
+						if (na.Key != "Name")
+							continue;
+						name = na.Value.Value as string;
+						if (name != null)
+							return true;
+					}
+				}
+			}
+			name = null;
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCodeCompletionFactory.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCodeCompletionFactory.cs
new file mode 100644
index 0000000000..9dded644c7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCodeCompletionFactory.cs
@@ -0,0 +1,221 @@
+// 
+// CSharpCompletionTextEditorExtension.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.CodeCompletion;
+using System.Collections.Generic;
+using System.Linq;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class RoslynCodeCompletionFactory : ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory
+	{
+		readonly CSharpCompletionTextEditorExtension ext;
+		readonly SemanticModel semanticModel;
+
+		public RoslynCodeCompletionFactory (CSharpCompletionTextEditorExtension ext, SemanticModel semanticModel)
+		{
+			if (ext == null)
+				throw new ArgumentNullException ("ext");
+			if (semanticModel == null)
+				throw new ArgumentNullException ("semanticModel");
+			this.semanticModel = semanticModel;
+			this.ext = ext;
+		}
+
+		#region ICompletionDataFactory implementation
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateGenericData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, string data, ICSharpCode.NRefactory6.CSharp.Completion.GenericDataType genericDataType)
+		{
+			return new RoslynCompletionData (keyHandler) {
+				CompletionText = data,
+				DisplayText = data,
+				Icon = "md-keyword"
+			};
+		}
+		
+		ICSharpCode.NRefactory6.CSharp.Completion.ISymbolCompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateEnumMemberCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, ISymbol alias, IFieldSymbol field)
+		{
+			var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+			return new RoslynSymbolCompletionData (keyHandler, ext, field, (alias ?? field.Type).ToMinimalDisplayString (model, ext.Editor.CaretOffset, Ambience.NameFormat) + "." + field.Name);
+		}
+		
+		class FormatItemCompletionData : RoslynCompletionData
+		{
+			string format;
+			string description;
+			object example;
+
+			public FormatItemCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, string format, string description, object example) : base (keyHandler)
+			{
+				this.format = format;
+				this.description = description;
+				this.example = example;
+			}
+
+			public override string DisplayText {
+				get {
+					return format;
+				}
+			}
+
+			public override string GetDisplayDescription (bool isSelected)
+			{
+				return "- <span foreground=\"darkgray\" size='small'>" + description + "</span>";
+			}
+
+			string rightSideDescription = null;
+			public override string GetRightSideDescription (bool isSelected)
+			{
+				if (rightSideDescription == null) {
+					try {
+						rightSideDescription = "<span size='small'>" + string.Format ("{0:" +format +"}", example) +"</span>";
+					} catch (Exception e) {
+						rightSideDescription = "";
+						LoggingService.LogError ("Format error.", e);
+					}
+				}
+				return rightSideDescription;
+			}
+
+			public override string CompletionText {
+				get {
+					return format;
+				}
+			}
+
+			public override int CompareTo (object obj)
+			{
+				return 0;
+			}
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateFormatItemCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, string format, string description, object example)
+		{
+			return new FormatItemCompletionData (keyHandler, format, description, example);
+		}
+
+		class XmlDocCompletionData : RoslynCompletionData
+		{
+			//readonly CSharpCompletionTextEditorExtension ext;
+			readonly string title;
+			/*
+			#region IListData implementation
+
+			CSharpCompletionDataList list;
+			public CSharpCompletionDataList List {
+				get {
+					return list;
+				}
+				set {
+					list = value;
+				}
+			}
+
+			#endregion*/
+
+			public XmlDocCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, CSharpCompletionTextEditorExtension ext, string title, string description, string insertText) : base (keyHandler, title, "md-keyword", description, insertText ?? title)
+			{
+				// this.ext = ext;
+				this.title = title;
+			}
+//			public override TooltipInformation CreateTooltipInformation (bool smartWrap)
+//			{
+//				var sig = new SignatureMarkupCreator (ext.Editor, ext.DocumentContext, ext.Editor.CaretOffset);
+//				sig.BreakLineAfterReturnType = smartWrap;
+//				return sig.GetKeywordTooltip (title, null);
+//			}
+
+			public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, MonoDevelop.Ide.Editor.Extension.KeyDescriptor descriptor)
+			{
+				var currentWord = GetCurrentWord (window);
+				var text = CompletionText;
+				if (descriptor.KeyChar != '>')
+					text += ">";
+				window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, currentWord, text);
+			}
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateXmlDocCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, string title, string description, string insertText)
+		{
+			return new XmlDocCompletionData (keyHandler, ext, title, description, insertText);
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ISymbolCompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateSymbolCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, ISymbol symbol)
+		{
+			return new RoslynSymbolCompletionData (keyHandler, ext, symbol, symbol.Name);
+		}
+		
+		ICSharpCode.NRefactory6.CSharp.Completion.ISymbolCompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateSymbolCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, ISymbol symbol, string text)
+		{
+			return new RoslynSymbolCompletionData (keyHandler, ext, symbol, text);
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateNewOverrideCompletionData(ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, int declarationBegin, ITypeSymbol currentType, ISymbol m, bool afterKeyword)
+		{
+			return new CreateOverrideCompletionData (keyHandler, ext, declarationBegin, currentType, m, afterKeyword);
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreatePartialCompletionData(ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, int declarationBegin, ITypeSymbol currentType, IMethodSymbol method, bool afterKeyword)
+		{
+			return new CreatePartialCompletionData (keyHandler, ext, declarationBegin, currentType, method, afterKeyword);
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateAnonymousMethod(ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, string displayText, string description, string textBeforeCaret, string textAfterCaret)
+		{
+			return new AnonymousMethodCompletionData (keyHandler) {
+				CompletionText = textBeforeCaret + "|" + textAfterCaret,
+				DisplayText = displayText,
+				Description = description
+			};
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateNewMethodDelegate(ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, ITypeSymbol delegateType, string varName, INamedTypeSymbol curType)
+		{
+			return new EventCreationCompletionData (keyHandler, ext, delegateType, varName, curType);
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateObjectCreation (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, ITypeSymbol type, ISymbol symbol, int declarationBegin, bool afterKeyword)
+		{
+			return new ObjectCreationCompletionData (keyHandler, ext, semanticModel, type, symbol, declarationBegin, afterKeyword);
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateCastCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, ISymbol member, SyntaxNode nodeToCast, ITypeSymbol targetType)
+		{
+			return new CastCompletionData (keyHandler, ext, semanticModel, member, nodeToCast, targetType);
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionCategory ICSharpCode.NRefactory6.CSharp.Completion.ICompletionDataFactory.CreateCompletionDataCategory (ISymbol forSymbol)
+		{
+			return new RoslynCompletionCategory (forSymbol);
+		}
+
+		#endregion
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/VariableCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCompletionCategory.cs
index 34ae8a585a..b3edbdff03 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/VariableCompletionData.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCompletionCategory.cs
@@ -1,21 +1,21 @@
-// 
-// VariableCompletionData.cs
-//  
+//
+// RoslynCompletionCategory.cs
+//
 // Author:
 //       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2011 Xamarin Inc. (http://xamarin.com)
-// 
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -25,35 +25,38 @@
 // THE SOFTWARE.
 using System;
 using MonoDevelop.Ide.CodeCompletion;
-using ICSharpCode.NRefactory.Completion;
-using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis;
 using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Linq;
 
 namespace MonoDevelop.CSharp.Completion
 {
-	class VariableCompletionData : CompletionData, IVariableCompletionData
+	class RoslynCompletionCategory : CompletionCategory, ICSharpCode.NRefactory6.CSharp.Completion.ICompletionCategory
 	{
-		readonly CSharpCompletionTextEditorExtension ext;
+		readonly ISymbol symbol;
 
-		public IVariable Variable {
-			get;
-			private set;
-		}
-
-		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
+		public RoslynCompletionCategory (ISymbol symbol)
 		{
-			var tooltipInfo = new TooltipInformation ();
-			var resolver = ext.CSharpUnresolvedFile.GetResolver (ext.Compilation, ext.Document.Editor.Caret.Location);
-			var sig = new SignatureMarkupCreator (resolver, ext.FormattingPolicy.CreateOptions ());
-			sig.BreakLineAfterReturnType = smartWrap;
-			tooltipInfo.SignatureMarkup = sig.GetLocalVariableMarkup (Variable);
-			return tooltipInfo;
+			this.symbol = symbol;
+			this.DisplayText = symbol.ToDisplayString (Ambience.NameFormat);
+			this.Icon = symbol.GetStockIcon ();
 		}
 
-		public VariableCompletionData (CSharpCompletionTextEditorExtension ext, IVariable variable) : base (variable.Name, variable.GetStockIcon ())
+		public override int CompareTo (CompletionCategory other)
 		{
-			this.ext = ext;
-			this.Variable = variable;
+			if (other == null)
+				return 1;
+			var t1 = symbol as INamedTypeSymbol;
+			var t2 = ((RoslynCompletionCategory)other).symbol as INamedTypeSymbol;
+			if (t1 != null && t2 != null) {
+				if (t1.AllInterfaces.Contains (t2) || t1.GetBaseTypes().Contains (t2))
+					return -1;
+				if (t2.AllInterfaces.Contains (t1) || t2.GetBaseTypes().Contains (t1))
+					return 1;
+			}
+
+			return this.DisplayText.CompareTo (other.DisplayText);
 		}
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCompletionData.cs
new file mode 100644
index 0000000000..372e2e0ad7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCompletionData.cs
@@ -0,0 +1,162 @@
+//
+// RoslynCompletionData.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+using GLib;
+using System.Collections.Generic;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+using Xwt;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class RoslynCompletionData : CompletionData, ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData
+	{
+		List<CompletionData> overloads;
+		
+		public override bool HasOverloads {
+			get {
+				return overloads != null;
+			}
+		}
+		
+		void ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData.AddOverload (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData data)
+		{
+			if (overloads == null)
+				overloads = new List<CompletionData> ();
+			overloads.Add ((CompletionData)data);
+			sorted = null;
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionCategory ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData.CompletionCategory { 
+			get {
+				return (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionCategory)base.CompletionCategory;
+			} 
+			set {
+				base.CompletionCategory = (CompletionCategory)value;
+			} 
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.DisplayFlags ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData.DisplayFlags { 
+			get {
+				return (ICSharpCode.NRefactory6.CSharp.Completion.DisplayFlags)base.DisplayFlags;
+			}
+			set {
+				base.DisplayFlags = (DisplayFlags)value;
+			}
+		}
+
+		List<CompletionData> sorted;
+
+		IEnumerable<ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData> ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData.OverloadedData {
+			get {
+				return (IEnumerable<ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData>)OverloadedData;
+			}
+		}
+
+		public override IReadOnlyList<CompletionData> OverloadedData {
+			get {
+				if (overloads == null)
+					return new CompletionData[] { this };
+
+				if (sorted == null) {
+					sorted = new List<CompletionData> (overloads);
+					sorted.Add (this);
+					// sorted.Sort (new OverloadSorter ());
+				}
+				return sorted;
+			}
+		}
+
+		protected readonly ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler;
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData.KeyHandler {
+			get {
+				return keyHandler;
+			}
+		}
+
+		public RoslynCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler)
+		{
+			this.keyHandler = keyHandler;
+		}
+
+		public RoslynCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, string text) : base (text)
+		{
+			this.keyHandler = keyHandler;
+		}
+
+		public RoslynCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, string text, IconId icon) : base (text, icon)
+		{
+			this.keyHandler = keyHandler;
+		}
+
+		public RoslynCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, string text, IconId icon, string description) : base (text, icon, description)
+		{
+			this.keyHandler = keyHandler;
+		}
+		
+		public RoslynCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, string displayText, IconId icon, string description, string completionText) : base (displayText, icon, description, completionText)
+		{
+			this.keyHandler = keyHandler;
+		}
+		
+//		class OverloadSorter : IComparer<ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData>
+//		{
+//			public OverloadSorter ()
+//			{
+//			}
+//
+//			public int Compare (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData x, ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData y)
+//			{
+//				var mx = ((RoslynCompletionData)x).Entity as IMember;
+//				var my = ((RoslynCompletionData)y).Entity as IMember;
+//				int result;
+//				
+//				if (mx is ITypeDefinition && my is ITypeDefinition) {
+//					result = ((((ITypeDefinition)mx).TypeParameters.Count).CompareTo (((ITypeDefinition)my).TypeParameters.Count));
+//					if (result != 0)
+//						return result;
+//				}
+//				
+//				if (mx is IMethod && my is IMethod) {
+//					return MethodParameterDataProvider.MethodComparer ((IMethod)mx, (IMethod)my);
+//				}
+//				string sx = mx.ReflectionName;// ambience.GetString (mx, flags);
+//				string sy = my.ReflectionName;// ambience.GetString (my, flags);
+//				result = sx.Length.CompareTo (sy.Length);
+//				return result == 0 ? string.Compare (sx, sy) : result;
+//			}
+//		}
+
+	}
+
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynParameterHintingFactory.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynParameterHintingFactory.cs
new file mode 100644
index 0000000000..2982e02d66
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynParameterHintingFactory.cs
@@ -0,0 +1,296 @@
+//
+// RoslynParameterHintingFactory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using System.Text.RegularExpressions;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class RoslynParameterHintingFactory : IParameterHintingDataFactory
+	{
+		#region IParameterHintingDataFactory implementation
+
+		IParameterHintingData IParameterHintingDataFactory.CreateConstructorProvider (Microsoft.CodeAnalysis.IMethodSymbol constructor)
+		{
+			return new ParameterHintingData (constructor);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateMethodDataProvider (Microsoft.CodeAnalysis.IMethodSymbol method)
+		{
+			return new ParameterHintingData (method);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateDelegateDataProvider (Microsoft.CodeAnalysis.ITypeSymbol delegateType)
+		{
+			return new DelegateParameterHintingData (delegateType);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateIndexerParameterDataProvider (Microsoft.CodeAnalysis.IPropertySymbol indexer, Microsoft.CodeAnalysis.SyntaxNode resolvedNode)
+		{
+			return new ParameterHintingData (indexer);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateTypeParameterDataProvider (Microsoft.CodeAnalysis.INamedTypeSymbol type)
+		{
+			return new TypeParameterHintingData (type);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateTypeParameterDataProvider (Microsoft.CodeAnalysis.IMethodSymbol method)
+		{
+			return new TypeParameterHintingData (method);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateArrayDataProvider (Microsoft.CodeAnalysis.IArrayTypeSymbol arrayType)
+		{
+			return new ArrayParameterHintingData (arrayType);
+		}
+
+		#endregion
+
+		class ParameterHintingData : MonoDevelop.Ide.CodeCompletion.ParameterHintingData, IParameterHintingData
+		{
+			public ParameterHintingData (IMethodSymbol symbol) : base (symbol)
+			{
+			}
+
+			public ParameterHintingData (IPropertySymbol symbol) : base (symbol)
+			{
+			}
+			public override TooltipInformation CreateTooltipInformation (MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext ctx, int currentParameter, bool smartWrap)
+			{
+				return CreateTooltipInformation (editor, ctx, Symbol, currentParameter, smartWrap);
+			}
+			
+			internal static TooltipInformation CreateTooltipInformation (MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext ctx, ISymbol sym, int currentParameter, bool smartWrap)
+			{
+				var tooltipInfo = new TooltipInformation ();
+				var sig = new SignatureMarkupCreator (ctx, editor != null ? editor.CaretOffset : 0);
+				sig.HighlightParameter = currentParameter;
+				sig.BreakLineAfterReturnType = smartWrap;
+				try {
+					tooltipInfo.SignatureMarkup = sig.GetMarkup (sym);
+				} catch (Exception e) {
+					LoggingService.LogError ("Got exception while creating markup for :" + sym, e);
+					return new TooltipInformation ();
+				}
+				tooltipInfo.SummaryMarkup = Ambience.GetSummaryMarkup (sym) ?? "";
+
+				if (sym is IMethodSymbol) {
+					var method = (IMethodSymbol)sym;
+					if (method.IsExtensionMethod && method.ReducedFrom != null && method.ReducedFrom.ContainingType != null) {
+						tooltipInfo.AddCategory (GettextCatalog.GetString ("Extension Method from"), method.ReducedFrom.ContainingType.Name);
+					}
+				}
+				int paramIndex = currentParameter;
+
+//				if (Symbol is IMethodSymbol && ((IMethodSymbol)Symbol).IsExtensionMethod)
+//					paramIndex++;
+				var list = GetParameterList (sym);
+				paramIndex = Math.Min (list.Length - 1, paramIndex);
+				
+				var curParameter = paramIndex >= 0  && paramIndex < list.Length ? list [paramIndex] : null;
+				if (curParameter != null) {
+
+					string docText = Ambience.GetDocumentation (sym);
+					if (!string.IsNullOrEmpty (docText)) {
+						string text = docText;
+						Regex paramRegex = new Regex ("(\\<param\\s+name\\s*=\\s*\"" + curParameter.Name + "\"\\s*\\>.*?\\</param\\>)", RegexOptions.Compiled);
+						Match match = paramRegex.Match (docText);
+						
+						if (match.Success) {
+							text = Ambience.GetDocumentationMarkup (sym, match.Groups [1].Value);
+							if (!string.IsNullOrWhiteSpace (text))
+								tooltipInfo.AddCategory (GettextCatalog.GetString ("Parameter"), text);
+						}
+					}
+					if (curParameter.Type.TypeKind == TypeKind.Delegate)
+						tooltipInfo.AddCategory (GettextCatalog.GetString ("Delegate Info"), sig.GetDelegateInfo (curParameter.Type));
+				}
+				return tooltipInfo;
+			}
+
+			static ImmutableArray<IParameterSymbol> GetParameterList (ISymbol data)
+			{
+				var ms = data as IMethodSymbol;
+				if (ms != null)
+					return ms.Parameters;
+				
+				var ps = data as IPropertySymbol;
+				if (ps != null)
+					return ps.Parameters;
+
+				return ImmutableArray<IParameterSymbol>.Empty;
+			}
+
+			public override string GetParameterName (int currentParameter)
+			{
+				var list = GetParameterList (Symbol);
+				if (currentParameter < 0 || currentParameter >= list.Length)
+					throw new ArgumentOutOfRangeException ("currentParameter");
+				return list [currentParameter].Name;
+			}
+
+			public override int ParameterCount {
+				get {
+					return GetParameterList (Symbol).Length;
+				}
+			}
+
+			public override bool IsParameterListAllowed {
+				get {
+					var param = GetParameterList (Symbol).LastOrDefault ();
+					return param != null && param.IsParams;
+				}
+			}
+		}
+
+		class DelegateParameterHintingData : MonoDevelop.Ide.CodeCompletion.ParameterHintingData, IParameterHintingData
+		{
+			readonly IMethodSymbol invocationMethod;
+
+			public DelegateParameterHintingData (ITypeSymbol symbol) : base (symbol)
+			{
+				this.invocationMethod = symbol.GetDelegateInvokeMethod ();
+			}
+
+			public override string GetParameterName (int currentParameter)
+			{
+				var list = invocationMethod.Parameters;
+				if (currentParameter < 0 || currentParameter >= list.Length)
+					throw new ArgumentOutOfRangeException ("currentParameter");
+				return list [currentParameter].Name;
+			}
+
+			public override int ParameterCount {
+				get {
+					return invocationMethod.Parameters.Length;
+				}
+			}
+
+			public override bool IsParameterListAllowed {
+				get {
+					var param = invocationMethod.Parameters.LastOrDefault ();
+					return param != null && param.IsParams;
+				}
+			}
+			public override TooltipInformation CreateTooltipInformation (MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext ctx, int currentParameter, bool smartWrap)
+			{
+				return ParameterHintingData.CreateTooltipInformation (editor, ctx, invocationMethod, currentParameter, smartWrap);
+			}
+
+		}
+
+		class ArrayParameterHintingData : MonoDevelop.Ide.CodeCompletion.ParameterHintingData, IParameterHintingData
+		{
+			readonly IArrayTypeSymbol arrayType;
+
+			public ArrayParameterHintingData (IArrayTypeSymbol arrayType) : base (arrayType)
+			{
+				this.arrayType = arrayType;
+			}
+
+			public override string GetParameterName (int currentParameter)
+			{
+				return null;
+			}
+
+			public override int ParameterCount {
+				get {
+					return arrayType.Rank;
+				}
+			}
+
+			public override bool IsParameterListAllowed {
+				get {
+					return false;
+				}
+			}
+			
+			public override TooltipInformation CreateTooltipInformation (MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext ctx, int currentParameter, bool smartWrap)
+			{
+				var sig = new SignatureMarkupCreator (ctx, editor != null ? editor.CaretOffset : 0) {
+					HighlightParameter = currentParameter
+				};
+				return new TooltipInformation {
+					SignatureMarkup = sig.GetArrayIndexerMarkup (arrayType)
+				};
+			}
+			
+		}
+
+		class TypeParameterHintingData : MonoDevelop.Ide.CodeCompletion.ParameterHintingData, IParameterHintingData
+		{
+			public TypeParameterHintingData (IMethodSymbol symbol) : base (symbol)
+			{
+			}
+
+			public TypeParameterHintingData (INamedTypeSymbol symbol) : base (symbol)
+			{
+			}
+
+			static ImmutableArray<ITypeParameterSymbol> GetTypeParameterList (IParameterHintingData data)
+			{
+				var ms = data.Symbol as IMethodSymbol;
+				if (ms != null)
+					return ms.TypeParameters;
+				
+				var ps = data.Symbol as INamedTypeSymbol;
+				if (ps != null)
+					return ps.TypeParameters;
+
+				return ImmutableArray<ITypeParameterSymbol>.Empty;
+			}
+
+			public override string GetParameterName (int currentParameter)
+			{
+				var list = GetTypeParameterList (this);
+				if (currentParameter < 0 || currentParameter >= list.Length)
+					throw new ArgumentOutOfRangeException ("currentParameter");
+				return list [currentParameter].Name;
+			}
+
+			public override int ParameterCount {
+				get {
+					return GetTypeParameterList (this).Length;
+				}
+			}
+
+			public override bool IsParameterListAllowed {
+				get {
+					return false;
+				}
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynSymbolCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynSymbolCompletionData.cs
new file mode 100644
index 0000000000..6a0dee624b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynSymbolCompletionData.cs
@@ -0,0 +1,451 @@
+// 
+// CSharpCompletionTextEditorExtension.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+using GLib;
+using System.Collections.Generic;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+using Xwt;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class RoslynSymbolCompletionData : RoslynCompletionData, ICSharpCode.NRefactory6.CSharp.Completion.ISymbolCompletionData
+	{
+		readonly ISymbol symbol;
+
+		public ISymbol Symbol {
+			get {
+				return symbol;
+			}
+		}
+		
+		public override string DisplayText {
+			get {
+				return text ?? symbol.Name;
+			}
+			set {
+				text = value;
+			}
+		}
+
+		public override string CompletionText {
+			get {
+				return text ?? symbol.Name;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
+		}
+
+		public override MonoDevelop.Core.IconId Icon {
+			get {
+				return MonoDevelop.Ide.TypeSystem.Stock.GetStockIcon (symbol);
+			}
+			set {
+				throw new NotSupportedException ();
+			}
+		}
+
+		public bool IsDelegateExpected { get; set; }
+
+
+		string text;
+		protected readonly CSharpCompletionTextEditorExtension ext;
+
+
+		public RoslynSymbolCompletionData (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler, CSharpCompletionTextEditorExtension ext, ISymbol symbol, string text = null) : base (keyHandler)
+		{
+			this.ext = ext;
+			this.text = text;
+			this.symbol = symbol;
+		}
+
+		static readonly SymbolDisplayFormat nameOnlyFormat =
+			new SymbolDisplayFormat(
+				globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+				typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameOnly,
+				propertyStyle: SymbolDisplayPropertyStyle.NameOnly,
+				genericsOptions: SymbolDisplayGenericsOptions.None,
+				memberOptions: SymbolDisplayMemberOptions.None,
+				parameterOptions:
+				SymbolDisplayParameterOptions.None,
+				miscellaneousOptions:
+				SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+				SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+		
+		protected virtual string GetInsertionText ()
+		{
+			if (text != null)
+				return text;
+			return symbol.ToDisplayString (nameOnlyFormat);
+		}
+
+		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
+		{
+			return CreateTooltipInformation (ext.Editor, ext.DocumentContext, Symbol, smartWrap);
+		}
+		
+		public static TooltipInformation CreateTooltipInformation (MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext ctx, ISymbol entity, bool smartWrap, bool createFooter = false)
+		{
+			if (ctx != null) {
+				if (ctx.ParsedDocument == null || ctx.AnalysisDocument == null)
+					LoggingService.LogError ("Signature markup creator created with invalid context." + Environment.NewLine + Environment.StackTrace);
+			}
+
+			var tooltipInfo = new TooltipInformation ();
+//			if (resolver == null)
+//				resolver = file != null ? file.GetResolver (compilation, textEditorData.Caret.Location) : new CSharpResolver (compilation);
+			var sig = new SignatureMarkupCreator (ctx, editor != null ? editor.CaretOffset : 0);
+			sig.BreakLineAfterReturnType = smartWrap;
+			try {
+				tooltipInfo.SignatureMarkup = sig.GetMarkup (entity);
+			} catch (Exception e) {
+				LoggingService.LogError ("Got exception while creating markup for :" + entity, e);
+				return new TooltipInformation ();
+			}
+			tooltipInfo.SummaryMarkup = Ambience.GetSummaryMarkup (entity) ?? "";
+			
+//			if (entity is IMember) {
+//				var evt = (IMember)entity;
+//				if (evt.ReturnType.Kind == TypeKind.Delegate) {
+//					tooltipInfo.AddCategory (GettextCatalog.GetString ("Delegate Info"), sig.GetDelegateInfo (evt.ReturnType));
+//				}
+//			}
+			if (entity is IMethodSymbol) {
+				var method = (IMethodSymbol)entity;
+				if (method.IsExtensionMethod) {
+					tooltipInfo.AddCategory (GettextCatalog.GetString ("Extension Method from"), method.ContainingType.Name);
+				}
+			}
+			if (createFooter) {
+				tooltipInfo.FooterMarkup = sig.CreateFooter (entity);
+			}
+			return tooltipInfo;
+		}
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, MonoDevelop.Ide.Editor.Extension.KeyDescriptor descriptor)
+		{
+			string partialWord = GetCurrentWord (window);
+			int skipChars = 0;
+			bool runParameterCompletionCommand = false;
+			bool runCompletionCompletionCommand = false;
+			var method = Symbol as IMethodSymbol;
+
+			bool addParens = CompletionTextEditorExtension.AddParenthesesAfterCompletion;
+			bool addOpeningOnly = CompletionTextEditorExtension.AddOpeningOnly;
+			var Editor = ext.Editor;
+			var Policy = ext.FormattingPolicy;
+			string insertionText = this.GetInsertionText();
+
+			if (addParens && !IsDelegateExpected && method != null && !HasNonMethodMembersWithSameName (Symbol) && !IsBracketAlreadyInserted (ext, method)) {
+				var line = Editor.GetLine (Editor.CaretLine);
+				//var start = window.CodeCompletionContext.TriggerOffset + partialWord.Length + 2;
+				//var end = line.Offset + line.Length;
+				//string textToEnd = start < end ? Editor.GetTextBetween (start, end) : "";
+				bool addSpace = Policy.SpaceAfterMethodCallName && MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.OnTheFlyFormatting;
+
+				int exprStart = window.CodeCompletionContext.TriggerOffset - 1;
+				while (exprStart > line.Offset) {
+					char ch = Editor.GetCharAt (exprStart);
+					if (ch != '.' && ch != '_' && !char.IsLetterOrDigit (ch))
+						break;
+					exprStart--;
+				}
+				bool insertSemicolon = InsertSemicolon(ext, exprStart);
+				if (Symbol is IMethodSymbol && ((IMethodSymbol)Symbol).MethodKind == MethodKind.Constructor)
+					insertSemicolon = false;
+				//int pos;
+
+				var keys = new [] { SpecialKey.Return, SpecialKey.Tab, SpecialKey.Space };
+				if (keys.Contains (descriptor.SpecialKey) || descriptor.KeyChar == '.') {
+					if (HasAnyOverloadWithParameters (method)) {
+						if (addOpeningOnly) {
+							insertionText += RequireGenerics (method) ? "<|" : (addSpace ? " (|" : "(|");
+							skipChars = 0;
+						} else {
+							if (descriptor.KeyChar == '.') {
+								if (RequireGenerics (method)) {
+									insertionText += addSpace ? "<> ()" : "<>()";
+								} else {
+									insertionText += addSpace ? " ()" : "()";
+								}
+								skipChars = 0;
+							} else {
+								if (insertSemicolon) {
+									if (RequireGenerics (method)) {
+										insertionText += addSpace ? "<|> ();" : "<|>();";
+										skipChars = addSpace ? 5 : 4;
+									} else {
+										insertionText += addSpace ? " (|);" : "(|);";
+										skipChars = 2;
+									}
+								} else {
+									if (RequireGenerics (method)) {
+										insertionText += addSpace ? "<|> ()" :  "<|>()";
+										skipChars = addSpace ? 4 : 3;
+									} else {
+										insertionText += addSpace ? " (|)" : "(|)";
+										skipChars = 1;
+									}
+								}
+							}
+						}
+						runParameterCompletionCommand = true;
+					} else {
+						if (addOpeningOnly) {
+							insertionText += RequireGenerics (method) ? "<|" : (addSpace ? " (|" : "(|");
+							skipChars = 0;
+						} else {
+							if (descriptor.KeyChar == '.') {
+								if (RequireGenerics (method)) {
+									insertionText += addSpace ? "<> ().|" : "<>().|";
+								} else {
+									insertionText += addSpace ? " ().|" : "().|";
+								}
+								skipChars = 0;
+							} else {
+								if (insertSemicolon) {
+									if (RequireGenerics (method)) {
+										insertionText += addSpace ? "<|> ();" : "<|>();";
+									} else {
+										insertionText += addSpace ? " ();|" : "();|";
+									}
+
+								} else {
+									if (RequireGenerics (method)) {
+										insertionText += addSpace ? "<|> ()" : "<|>()";
+									} else {
+										insertionText += addSpace ? " ()|" : "()|";
+									}
+
+								}
+							}
+						}
+					}
+					if (descriptor.KeyChar == '(') {
+						var skipCharList = Editor.SkipChars;
+						if (skipCharList.Count > 0) {
+							var lastSkipChar = skipCharList[skipCharList.Count - 1];
+							if (lastSkipChar.Offset == (window.CodeCompletionContext.TriggerOffset + partialWord.Length) && lastSkipChar.Char == ')')
+								Editor.RemoveText (lastSkipChar.Offset, 1);
+						}
+					}
+				}
+				if (descriptor.KeyChar == ';') {
+					insertionText += addSpace ? " ()" : "()";
+
+				}
+				ka |= KeyActions.Ignore;
+			}
+			if ((DisplayFlags & DisplayFlags.NamedArgument) == DisplayFlags.NamedArgument &&
+				CompletionTextEditorExtension.AddParenthesesAfterCompletion &&
+				(descriptor.SpecialKey == SpecialKey.Tab ||
+					descriptor.SpecialKey == SpecialKey.Return ||
+					descriptor.SpecialKey == SpecialKey.Space)) {
+				if (true/*Policy.AroundAssignmentParentheses */)
+					insertionText += " ";
+				insertionText += "=";
+				if (/*Policy.AroundAssignmentParentheses && */descriptor.SpecialKey != SpecialKey.Space)
+					insertionText += " ";
+				runCompletionCompletionCommand = true;
+			}
+			window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, partialWord, insertionText);
+			int offset = Editor.CaretOffset;
+			for (int i = 0; i < skipChars; i++) {
+				Editor.AddSkipChar (offset, Editor.GetCharAt (offset));
+				offset++;
+			}
+
+			if (runParameterCompletionCommand && IdeApp.Workbench != null) {
+				Application.Invoke (delegate {
+					ext.RunParameterCompletionCommand ();
+				});
+			}
+
+			if (runCompletionCompletionCommand && IdeApp.Workbench != null) {
+				Application.Invoke (delegate {
+					ext.RunCompletionCommand ();
+				});
+			}
+		}
+
+		static bool IsBracketAlreadyInserted (CSharpCompletionTextEditorExtension ext, IMethodSymbol method)
+		{
+			var Editor = ext.Editor;
+			int offset = Editor.CaretOffset;
+			while (offset < Editor.Length) {
+				char ch = Editor.GetCharAt (offset);
+				if (!char.IsLetterOrDigit (ch))
+					break;
+				offset++;
+			}
+			while (offset < Editor.Length) {
+				char ch = Editor.GetCharAt (offset);
+				if (!char.IsWhiteSpace (ch))
+					return ch == '(' || ch == '<' && RequireGenerics (method);
+				offset++;
+			}
+			return false;
+		}
+
+
+
+		internal static bool InsertSemicolon (CSharpCompletionTextEditorExtension ext, int exprStart)
+		{
+			var Editor = ext.Editor;
+			int offset = exprStart;
+			while (offset > 0) {
+				char ch = Editor.GetCharAt (offset);
+				if (!char.IsWhiteSpace (ch)) {
+					if (ch != '{' && ch != '}' && ch != ';')
+						return false;
+					break;
+				}
+				offset--;
+			}
+
+			offset = Editor.CaretOffset;
+			while (offset < Editor.Length) {
+				char ch = Editor.GetCharAt (offset);
+				if (!char.IsLetterOrDigit (ch))
+					break;
+				offset++;
+			}
+			while (offset < Editor.Length) {
+				char ch = Editor.GetCharAt (offset);
+				if (!char.IsWhiteSpace (ch))
+					return char.IsLetter (ch) || ch == '}';
+				offset++;
+			}
+			return true;
+		}
+
+		internal static bool HasAnyOverloadWithParameters (IMethodSymbol method)
+		{
+			if (method.MethodKind == MethodKind.Constructor) 
+				return method.ContainingType.GetMembers()
+					.OfType<IMethodSymbol>()
+					.Where(m => m.MethodKind == MethodKind.Constructor)
+					.Any (m => m.Parameters.Length > 0);
+			return method.ContainingType
+				.GetMembers()
+				.OfType<IMethodSymbol>()
+				.Any (m => m.Name == method.Name && m.Parameters.Length > 0);
+		}
+
+		static bool HasNonMethodMembersWithSameName (ISymbol member)
+		{
+			var method = member as IMethodSymbol;
+			if (method != null && method.MethodKind == MethodKind.Constructor)
+				return false;
+			if (member.ContainingType == null)
+				return false;
+			return member.ContainingType
+				.GetMembers ()
+				.Any (e => e.Kind != SymbolKind.Method && e.Name == member.Name);
+		}
+
+		static bool RequireGenerics (IMethodSymbol method)
+		{
+			System.Collections.Immutable.ImmutableArray<ITypeSymbol> typeArgs;
+			if (method.MethodKind == MethodKind.Constructor) {
+				typeArgs = method.ContainingType.TypeArguments;
+			} else {
+				typeArgs = method.TypeArguments;
+			}
+			
+			if (!typeArgs.Any (ta => ta.TypeKind == TypeKind.TypeParameter))
+				return false;
+			var testMethod = method.ReducedFrom ?? method;
+			return typeArgs.Any (t => !testMethod.Parameters.Any (p => ContainsType(p.Type, t)));
+		}
+
+		static bool ContainsType (ITypeSymbol testType, ITypeSymbol searchType)
+		{
+			if (testType == null)
+				return false;
+			if (testType == searchType)
+				return true;
+			var namedTypeSymbol = testType as INamedTypeSymbol;
+			if (namedTypeSymbol != null) {
+				foreach (var arg in namedTypeSymbol.TypeParameters)
+					if (ContainsType (arg, searchType))
+						return true;
+			}
+			return false;
+		}
+
+		public override int CompareTo (object obj)
+		{
+			var anonymousMethodCompletionData = obj as AnonymousMethodCompletionData;
+			if (anonymousMethodCompletionData == null)
+				return 1;
+			var objectCreationData = obj as ObjectCreationCompletionData;
+			if (objectCreationData == null)
+				return 1;
+			
+
+			return base.CompareTo (obj);
+		}
+
+
+//		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, TextEditorData textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IType type, bool smartWrap, bool createFooter = false)
+//		{
+//			var tooltipInfo = new TooltipInformation ();
+//			var resolver = file != null ? file.GetResolver (compilation, textEditorData.Caret.Location) : new CSharpResolver (compilation);
+//			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
+//			sig.BreakLineAfterReturnType = smartWrap;
+//			try {
+//				tooltipInfo.SignatureMarkup = sig.GetMarkup (type.IsParameterized ? type.GetDefinition () : type);
+//			} catch (Exception e) {
+//				LoggingService.LogError ("Got exception while creating markup for :" + type, e);
+//				return new TooltipInformation ();
+//			}
+//			if (type.IsParameterized) {
+//				var typeInfo = new StringBuilder ();
+//				for (int i = 0; i < type.TypeParameterCount; i++) {
+//					typeInfo.AppendLine (type.GetDefinition ().TypeParameters [i].Name + " is " + sig.GetTypeReferenceString (type.TypeArguments [i]));
+//				}
+//				tooltipInfo.AddCategory ("Type Parameters", typeInfo.ToString ());
+//			}
+//
+//			var def = type.GetDefinition ();
+//			if (def != null) {
+//				if (createFooter)
+//					tooltipInfo.FooterMarkup = sig.CreateFooter (def);
+//				tooltipInfo.SummaryMarkup = AmbienceService.GetSummaryMarkup (def) ?? "";
+//			}
+//			return tooltipInfo;
+//		}
+	}
+
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/TypeParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/TypeParameterDataProvider.cs
deleted file mode 100644
index 0e5f2ce907..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/TypeParameterDataProvider.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// 
-// TemplateParameterDataProvider.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.CSharp.Parser;
-using System.Text.RegularExpressions;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.CSharp.Resolver;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.Completion;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class TypeParameterDataProvider: IParameterDataProvider
-	{
-		int startOffset;
-		//CSharpCompletionTextEditorExtension ext;
-		
-		List<IType> types;
-		List<IMethod> methods;
-		CSharpAmbience ambience = new CSharpAmbience ();
-
-		public int StartOffset {
-			get {
-				return startOffset;
-			}
-		}		
-		
-		public TypeParameterDataProvider (int startOffset, CSharpCompletionTextEditorExtension ext, IEnumerable<IType> types)
-		{
-			this.startOffset = startOffset;
-			//			this.ext = ext;
-			this.types = new List<IType> (types);
-		}
-
-		public TypeParameterDataProvider (int startOffset, CSharpCompletionTextEditorExtension ext, IEnumerable<IMethod> methods)
-		{
-			this.startOffset = startOffset;
-			//			this.ext = ext;
-			this.methods = new List<IMethod> (methods);
-		}
-
-		static int TypeComparer (IType left, IType right)
-		{
-			return left.TypeParameterCount - right.TypeParameterCount;
-		}
-		
-		#region IParameterDataProvider implementation
-		
-		protected virtual string GetPrefix (IMethod method)
-		{
-			var flags = OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.IncludeGenerics;
-			return ambience.GetString (method.ReturnType, flags) + " ";
-		}
-		
-		public string GetHeading (int overload, string[] parameterMarkup, int currentParameter)
-		{
-			var result = new StringBuilder ();
-			result.Append ("<b>");
-			if (methods != null) {
-				result.Append (ambience.GetString (methods [overload], OutputFlags.UseFullName | OutputFlags.IncludeMarkup));
-			} else {
-				result.Append (ambience.GetString (types [overload], OutputFlags.UseFullName | OutputFlags.IncludeMarkup));
-			}
-			result.Append ("</b>");
-			result.Append ("&lt;");
-			int parameterCount = 0;
-			foreach (string parameter in parameterMarkup) {
-				if (parameterCount > 0)
-					result.Append (", ");
-				result.Append (parameter);
-				parameterCount++;
-			}
-			result.Append ("&gt;");
-			
-			return result.ToString ();
-		}
-		
-		public string GetDescription (int overload, int currentParameter)
-		{
-			return "";
-		}
-		
-		public string GetParameterDescription (int overload, int paramIndex)
-		{
-			if (methods != null)
-				return ambience.GetString (methods[overload].TypeParameters [paramIndex], OutputFlags.AssemblyBrowserDescription | OutputFlags.HideExtensionsParameter | OutputFlags.IncludeGenerics | OutputFlags.IncludeModifiers | OutputFlags.HighlightName);
-
-			var type = types[overload];
-			
-			if (paramIndex < 0 || paramIndex >= type.TypeParameterCount)
-				return "";
-			
-			return ambience.GetString (type.GetDefinition ().TypeParameters [paramIndex], OutputFlags.AssemblyBrowserDescription | OutputFlags.HideExtensionsParameter | OutputFlags.IncludeGenerics | OutputFlags.IncludeModifiers | OutputFlags.HighlightName);
-		}
-		
-		public int GetParameterCount (int overload)
-		{
-			if (overload >= Count)
-				return -1;
-			
-			if (methods != null)
-				return methods[overload].TypeParameters.Count;
-			var type = types[overload];
-			return type != null ? type.TypeParameterCount : 0;
-		}
-
-		public string GetParameterName (int overload, int paramIndex)
-		{
-			// unused
-			return "T";
-		}
-
-
-		public bool AllowParameterList (int overload)
-		{
-			return false;
-		}
-
-		public int Count {
-			get {
-				if (methods != null)
-					return methods.Count;
-				return types != null ? types.Count : 0;
-			}
-		}
-		#endregion 
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/DiagnosticCustomTags.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/DiagnosticCustomTags.cs
new file mode 100644
index 0000000000..d05d91c55f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/DiagnosticCustomTags.cs
@@ -0,0 +1,35 @@
+//
+// DiagnosticCustomTags.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+
+namespace MonoDevelop.CSharp.Diagnostics
+{
+	static class DiagnosticCustomTags
+	{
+		public static readonly string[] Unnecessary = { WellKnownDiagnosticTags.Unnecessary, WellKnownDiagnosticTags.Telemetry };
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/IDEDiagnosticIds.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/IDEDiagnosticIds.cs
new file mode 100644
index 0000000000..7d067e38d2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/IDEDiagnosticIds.cs
@@ -0,0 +1,43 @@
+//
+// IDEDiagnosticIds.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.CSharp.Diagnostics
+{
+	static class IDEDiagnosticIds
+	{
+		public const string SimplifyNamesDiagnosticId = "IDE0001";
+		public const string SimplifyMemberAccessDiagnosticId = "IDE0002";
+		public const string SimplifyThisOrMeDiagnosticId = "IDE0003";
+		public const string RemoveUnnecessaryCastDiagnosticId = "IDE0004";
+		public const string RemoveUnnecessaryImportsDiagnosticId = "IDE0005";
+
+		public const string MonoTODODiagnosticDiagnosticId = "XS0001";
+
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/MonoNameConventionPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/MonoNameConventionPolicy.xml
index 4643473284..4643473284 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/MonoNameConventionPolicy.xml
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/MonoNameConventionPolicy.xml
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionEditRuleDialog.cs
index 574f10de7b..3c64d104fa 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionEditRuleDialog.cs
@@ -24,14 +24,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
 using System.Linq;
 using Gtk;
 using System.Collections.Generic;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory6.CSharp.Diagnostics;
 
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
 {
 	partial class NameConventionEditRuleDialog : Gtk.Dialog
 	{
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanel.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanel.cs
index a8c3f7c0b3..e91a6242ba 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanel.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanel.cs
@@ -27,8 +27,9 @@ using System;
 using MonoDevelop.Ide.Gui.Dialogs;
 using Gtk;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
 
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
 {
 	class NameConventionPanel : PolicyOptionsPanel<NameConventionPolicy>
 	{
@@ -37,7 +38,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 		static NameConventionPanel ()
 		{
 			// ensure that custom text editor shemes are loaded.
-			MonoDevelop.SourceEditor.SourceEditorDisplayBinding.InitSourceEditor ();
+			TextEditorDisplayBinding.InitSourceEditor ();
 		}
 		
 		protected override string PolicyTitleWithMnemonic {
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanelWidget.cs
index bcdc528d6d..f4da2ff9ba 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanelWidget.cs
@@ -25,12 +25,11 @@
 // THE SOFTWARE.
 using System;
 using Gtk;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using System.Collections.Generic;
 
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
 {
 	[System.ComponentModel.ToolboxItem(true)]
 	partial class NameConventionPanelWidget : Gtk.Bin
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPolicy.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPolicy.cs
index ac1fb31bde..c2b8500bd3 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPolicy.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPolicy.cs
@@ -28,10 +28,9 @@ using System.Linq;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Policies;
 using MonoDevelop.Core.Serialization;
-using ICS = ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory6.CSharp.Diagnostics;
 
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
 {
 	[PolicyType ("Naming Conventions Policy")]
 	class NameConventionPolicy : IEquatable<NameConventionPolicy>
@@ -56,11 +55,11 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			rules = new List<NameConventionRule> (DefaultRules.GetFdgRules ().Select (r => new NameConventionRule (r))).ToArray ();
 		}
 
-		class NamingConventionService : ICSharpCode.NRefactory.CSharp.Refactoring.NamingConventionService
+		class NamingConventionService : ICSharpCode.NRefactory6.CSharp.Diagnostics.NamingConventionService
 		{
 			NameConventionPolicy policy;
-			ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule[] rules = null;
-			public override IEnumerable<ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule> Rules {
+			NamingRule[] rules = null;
+			public override IEnumerable<ICSharpCode.NRefactory6.CSharp.Diagnostics.NamingRule> Rules {
 				get {
 					if (rules == null) {
 						this.rules = policy.Rules.Select (r => r.GetNRefactoryRule ()).ToArray ();
@@ -69,14 +68,14 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 				}
 			}
 
-			public NamingConventionService (MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPolicy policy)
+			public NamingConventionService (NameConventionPolicy policy)
 			{
 				this.policy = policy;
 			}
 			
 		}
 
-		public ICSharpCode.NRefactory.CSharp.Refactoring.NamingConventionService CreateNRefactoryService ()
+		public ICSharpCode.NRefactory6.CSharp.Diagnostics.NamingConventionService CreateNRefactoryService ()
 		{
 			return new NamingConventionService (this);
 		}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionRule.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionRule.cs
index 358b505fcd..2453efff88 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionRule.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionRule.cs
@@ -27,13 +27,14 @@ using System;
 using System.Text;
 using MonoDevelop.Projects.Policies;
 using MonoDevelop.Core.Serialization;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
 
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
 {
 	[DataItem ("NamingRule")]
-	public class NameConventionRule
+	sealed class NameConventionRule
 	{
-		ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule wrappedRule = new ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule (ICSharpCode.NRefactory.CSharp.Refactoring.AffectedEntity.None);
+		ICSharpCode.NRefactory6.CSharp.Diagnostics.NamingRule wrappedRule = new ICSharpCode.NRefactory6.CSharp.Diagnostics.NamingRule (ICSharpCode.NRefactory6.CSharp.Diagnostics.AffectedEntity.None);
 
 		[ItemProperty]
 		public string Name {
@@ -72,19 +73,19 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 		}
 
 		[ItemProperty]
-		public ICSharpCode.NRefactory.CSharp.Refactoring.AffectedEntity AffectedEntity {
+		public ICSharpCode.NRefactory6.CSharp.Diagnostics.AffectedEntity AffectedEntity {
 			get { return wrappedRule.AffectedEntity; } 
 			set { wrappedRule.AffectedEntity = value;} 
 		}
 
 		[ItemProperty]
-		public ICSharpCode.NRefactory.CSharp.Modifiers VisibilityMask {
+		public ICSharpCode.NRefactory6.CSharp.Diagnostics.Modifiers VisibilityMask {
 			get { return wrappedRule.VisibilityMask; } 
 			set { wrappedRule.VisibilityMask = value;} 
 		}
 
 		[ItemProperty]
-		public ICSharpCode.NRefactory.CSharp.Refactoring.NamingStyle NamingStyle {
+		public ICSharpCode.NRefactory6.CSharp.Diagnostics.NamingStyle NamingStyle {
 			get { return wrappedRule.NamingStyle; } 
 			set { wrappedRule.NamingStyle = value;} 
 		}
@@ -101,7 +102,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			set { wrappedRule.IncludeStaticEntities = value;} 
 		}
 
-		internal NameConventionRule (ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule wrappedRule)
+		internal NameConventionRule (ICSharpCode.NRefactory6.CSharp.Diagnostics.NamingRule wrappedRule)
 		{
 			this.wrappedRule = wrappedRule;
 		}
@@ -122,7 +123,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			return wrappedRule.GetPreview ();
 		}
 
-		internal ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule GetNRefactoryRule ()
+		internal ICSharpCode.NRefactory6.CSharp.Diagnostics.NamingRule GetNRefactoryRule ()
 		{
 			return wrappedRule;
 		}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/MonoTODO/MonoTODODiagnosticAnalyzer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/MonoTODO/MonoTODODiagnosticAnalyzer.cs
new file mode 100644
index 0000000000..b17d6fd0f5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/MonoTODO/MonoTODODiagnosticAnalyzer.cs
@@ -0,0 +1,103 @@
+//
+// MonoTODODiagnosticAnalyzer.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Threading;
+
+namespace MonoDevelop.CSharp.Diagnostics.MonoTODODiagnostic
+{
+	[DiagnosticAnalyzer(LanguageNames.CSharp)]
+	sealed class MonoTODODiagnosticAnalyzer : DiagnosticAnalyzer
+	{
+		static readonly ImmutableArray<SyntaxKind> syntaxKindsOfInterest = ImmutableArray.Create(
+			SyntaxKind.IdentifierName,                // foo
+			SyntaxKind.SimpleMemberAccessExpression,  // foo.bar
+			SyntaxKind.PointerMemberAccessExpression, // foo->bar
+			SyntaxKind.ConditionalAccessExpression    // foo?.bar
+		);
+
+		static readonly DiagnosticDescriptor descriptor = new DiagnosticDescriptor(
+			IDEDiagnosticIds.MonoTODODiagnosticDiagnosticId,
+			"Find usages of mono todo items",
+			"{0}",
+			DiagnosticAnalyzerCategories.Notifications,
+			DiagnosticSeverity.Warning,
+			isEnabledByDefault: true);
+
+		public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics {
+			get {
+				return ImmutableArray.Create(descriptor);
+			}
+		}
+
+		public override void Initialize(AnalysisContext context)
+		{
+			context.RegisterSyntaxNodeAction(
+				(nodeContext) => {
+					Diagnostic diagnostic;
+					if (TryFindMonoTODO(nodeContext.SemanticModel, nodeContext.Node, out diagnostic, nodeContext.CancellationToken))
+						nodeContext.ReportDiagnostic (diagnostic);
+				},
+				syntaxKindsOfInterest);
+		}
+
+		static readonly Dictionary<string, string> attributes = new Dictionary<string, string> {
+			{ "MonoTODOAttribute", "Mono TODO" },
+			{ "MonoNotSupportedAttribute", "Mono NOT SUPPORTED" },
+			{ "MonoLimitationAttribute", "Mono LIMITATION" }
+		};
+
+		bool TryFindMonoTODO (SemanticModel semanticModel, SyntaxNode node, out Diagnostic diagnostic, CancellationToken cancellationToken)
+		{
+			var info = semanticModel.GetSymbolInfo (node);
+			diagnostic = default(Diagnostic);
+			if (info.Symbol == null || semanticModel.IsFromGeneratedCode (cancellationToken))
+				return false;
+
+			foreach (var attr in info.Symbol.GetAttributes ()) {
+				if (attr.AttributeClass.ContainingNamespace.GetFullName () != "System")
+					continue;
+				string val;
+				if (attributes.TryGetValue (attr.AttributeClass.Name, out val)) {
+					string msg = null;
+					if (attr.ConstructorArguments.Length > 0) {
+						var arg = attr.ConstructorArguments [0];
+						msg = arg.Value != null ? arg.Value.ToString () : null;
+					}
+					var tree = semanticModel.SyntaxTree;
+					diagnostic = Diagnostic.Create(descriptor, tree.GetLocation(node.Span), string.IsNullOrEmpty (msg) ? val : val + ": " + msg);
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/CSharpRemoveUnnecessaryCastDiagnosticAnalyzer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/CSharpRemoveUnnecessaryCastDiagnosticAnalyzer.cs
new file mode 100644
index 0000000000..dcb06caf87
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/CSharpRemoveUnnecessaryCastDiagnosticAnalyzer.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Diagnostics.RemoveUnnecessaryCast
+{
+	[DiagnosticAnalyzer(LanguageNames.CSharp)]
+	internal sealed class CSharpRemoveUnnecessaryCastDiagnosticAnalyzer : RemoveUnnecessaryCastDiagnosticAnalyzerBase<SyntaxKind>
+	{
+		private static readonly ImmutableArray<SyntaxKind> s_kindsOfInterest = ImmutableArray.Create(SyntaxKind.CastExpression);
+
+		public override ImmutableArray<SyntaxKind> SyntaxKindsOfInterest
+		{
+			get
+			{
+				return s_kindsOfInterest;
+			}
+		}
+
+		protected override bool IsUnnecessaryCast(SemanticModel model, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var cast = (CastExpressionSyntax)node;
+			return cast.IsUnnecessaryCast(model, cancellationToken);
+		}
+
+		protected override TextSpan GetDiagnosticSpan(SyntaxNode node)
+		{
+			var cast = (CastExpressionSyntax)node;
+			return TextSpan.FromBounds(cast.OpenParenToken.SpanStart, cast.CloseParenToken.Span.End);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/RemoveUnnecessaryCastDiagnosticAnalyzerBase.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/RemoveUnnecessaryCastDiagnosticAnalyzerBase.cs
new file mode 100644
index 0000000000..615293f380
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/RemoveUnnecessaryCastDiagnosticAnalyzerBase.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Diagnostics.RemoveUnnecessaryCast
+{
+	internal abstract class RemoveUnnecessaryCastDiagnosticAnalyzerBase<TLanguageKindEnum> : DiagnosticAnalyzer where TLanguageKindEnum : struct
+	{
+		private static string s_localizableTitle = GettextCatalog.GetString ("Remove Unnecessary Cast");
+		private static string s_localizableMessage = GettextCatalog.GetString ("Cast is redundant.");
+
+		private static readonly DiagnosticDescriptor s_descriptor = new DiagnosticDescriptor(IDEDiagnosticIds.RemoveUnnecessaryCastDiagnosticId,
+			s_localizableTitle,
+			s_localizableMessage,
+			DiagnosticAnalyzerCategories.RedundanciesInCode,
+			DiagnosticSeverity.Warning,
+			isEnabledByDefault: true,
+			customTags: DiagnosticCustomTags.Unnecessary);
+
+		#region Interface methods
+
+		public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
+		{
+			get
+			{
+				return ImmutableArray.Create(s_descriptor);
+			}
+		}
+
+		public override void Initialize(AnalysisContext context)
+		{
+			context.RegisterSyntaxNodeAction(
+				(nodeContext) =>
+				{
+					Diagnostic diagnostic;
+					if (TryRemoveCastExpression(nodeContext.SemanticModel, nodeContext.Node, out diagnostic, nodeContext.CancellationToken))
+					{
+						nodeContext.ReportDiagnostic(diagnostic);
+					}
+				},
+				this.SyntaxKindsOfInterest.ToArray());
+		}
+
+		public abstract ImmutableArray<TLanguageKindEnum> SyntaxKindsOfInterest { get; }
+
+		#endregion
+
+		protected abstract bool IsUnnecessaryCast(SemanticModel model, SyntaxNode node, CancellationToken cancellationToken);
+		protected abstract TextSpan GetDiagnosticSpan(SyntaxNode node);
+
+		private bool TryRemoveCastExpression(
+			SemanticModel model, SyntaxNode node, out Diagnostic diagnostic, CancellationToken cancellationToken)
+		{
+			diagnostic = default(Diagnostic);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return false;
+			if (!IsUnnecessaryCast(model, node, cancellationToken))
+			{
+				return false;
+			}
+
+			var tree = model.SyntaxTree;
+			var span = GetDiagnosticSpan(node);
+			if (tree.OverlapsHiddenPosition(span, cancellationToken))
+			{
+				return false;
+			}
+
+			diagnostic = Diagnostic.Create(s_descriptor, tree.GetLocation(span));
+			return true;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsDiagnosticAnalyzer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsDiagnosticAnalyzer.cs
new file mode 100644
index 0000000000..4ae9b07748
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsDiagnosticAnalyzer.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.RemoveUnnecessaryImports;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.Diagnostics.RemoveUnnecessaryImports
+{
+	[DiagnosticAnalyzer(LanguageNames.CSharp)]
+	internal sealed class CSharpRemoveUnnecessaryImportsDiagnosticAnalyzer : RemoveUnnecessaryImportsDiagnosticAnalyzerBase
+	{
+		private static readonly string s_TitleAndMessageFormat = GettextCatalog.GetString ("Using directive is unnecessary.");
+
+		protected override LocalizableString GetTitleAndMessageFormatForClassificationIdDescriptor()
+		{
+			return s_TitleAndMessageFormat;
+		}
+
+		protected override IEnumerable<SyntaxNode> GetUnnecessaryImports(SemanticModel semanticModel, SyntaxNode root, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return CSharpRemoveUnnecessaryImportsService.GetUnnecessaryImports(semanticModel, root, cancellationToken);
+		}
+
+		protected override IEnumerable<TextSpan> GetFixableDiagnosticSpans(IEnumerable<SyntaxNode> nodes, SyntaxTree tree, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var nodesContainingUnnecessaryUsings = new HashSet<SyntaxNode>();
+			foreach (var node in nodes) {
+				yield return node.Span;
+//				var nodeContainingUnnecessaryUsings = node.GetAncestors().First(n => n is NamespaceDeclarationSyntax || n is CompilationUnitSyntax);
+//				if (!nodesContainingUnnecessaryUsings.Add(nodeContainingUnnecessaryUsings))
+//				{
+//					continue;
+//				}
+//
+//				yield return nodeContainingUnnecessaryUsings is NamespaceDeclarationSyntax ?
+//					((NamespaceDeclarationSyntax)nodeContainingUnnecessaryUsings).Usings.GetContainedSpan() :
+//					((CompilationUnitSyntax)nodeContainingUnnecessaryUsings).Usings.GetContainedSpan();
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/RemoveUnnecessaryImportsDiagnosticAnalyzerBase.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/RemoveUnnecessaryImportsDiagnosticAnalyzerBase.cs
new file mode 100644
index 0000000000..f04a068105
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/RemoveUnnecessaryImportsDiagnosticAnalyzerBase.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Diagnostics.RemoveUnnecessaryImports
+{
+	internal abstract class RemoveUnnecessaryImportsDiagnosticAnalyzerBase : DiagnosticAnalyzer
+	{
+		// NOTE: This is a trigger diagnostic, which doesn't show up in the ruleset editor and hence doesn't need a conventional IDE Diagnostic ID string.
+		internal const string DiagnosticFixableId = "RemoveUnnecessaryImportsFixable";
+
+		// The NotConfigurable custom tag ensures that user can't turn this diagnostic into a warning / error via
+		// ruleset editor or solution explorer. Setting messageFormat to empty string ensures that we won't display
+		// this diagnostic in the preview pane header.
+		private static readonly DiagnosticDescriptor s_fixableIdDescriptor =
+			new DiagnosticDescriptor(DiagnosticFixableId,
+				title: "", messageFormat: "", category: "",
+				defaultSeverity: DiagnosticSeverity.Hidden,
+				isEnabledByDefault: true,
+				customTags: WellKnownDiagnosticTags.NotConfigurable);
+
+		protected abstract LocalizableString GetTitleAndMessageFormatForClassificationIdDescriptor();
+
+		private DiagnosticDescriptor _classificationIdDescriptor;
+		private DiagnosticDescriptor GetClassificationIdDescriptor()
+		{
+			if (_classificationIdDescriptor == null)
+			{
+				var titleAndMessageFormat = GetTitleAndMessageFormatForClassificationIdDescriptor();
+				_classificationIdDescriptor =
+					new DiagnosticDescriptor(IDEDiagnosticIds.RemoveUnnecessaryImportsDiagnosticId,
+						titleAndMessageFormat,
+						titleAndMessageFormat,
+						DiagnosticAnalyzerCategories.RedundanciesInCode,
+						DiagnosticSeverity.Warning,
+						isEnabledByDefault: true,
+						customTags: DiagnosticCustomTags.Unnecessary);
+			}
+
+			return _classificationIdDescriptor;
+		}
+
+		private ImmutableArray<DiagnosticDescriptor> _descriptors;
+		public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
+		{
+			get
+			{
+				if (_descriptors == null)
+				{
+					_descriptors = ImmutableArray.Create(GetClassificationIdDescriptor());
+				}
+
+				return _descriptors;
+			}
+		}
+
+		public override void Initialize(AnalysisContext context)
+		{
+			context.RegisterSemanticModelAction(this.AnalyzeSemanticModel);
+		}
+
+		private void AnalyzeSemanticModel(SemanticModelAnalysisContext context)
+		{
+			if (context.IsFromGeneratedCode ())
+				return;
+			var tree = context.SemanticModel.SyntaxTree;
+			var root = tree.GetRoot();
+			var unncessaryImports = GetUnnecessaryImports(context.SemanticModel, root);
+			if (unncessaryImports != null && unncessaryImports.Any())
+			{
+				Func<SyntaxNode, SyntaxToken> getLastTokenFunc = GetLastTokenDelegateForContiguousSpans();
+				var contiguousSpans = unncessaryImports.GetContiguousSpans(getLastTokenFunc);
+				var diagnostics = CreateClassificationDiagnostics(contiguousSpans, tree).Concat(
+					CreateFixableDiagnostics(unncessaryImports, tree));
+				var spans = new List<TextSpan> ();
+				foreach (var diagnostic in diagnostics)
+				{
+					if (spans.Any (s => s.OverlapsWith (diagnostic.Location.SourceSpan)))
+						continue;
+					spans.Add (diagnostic.Location.SourceSpan);
+					context.ReportDiagnostic(diagnostic);
+				}
+			}
+		}
+
+		protected abstract IEnumerable<SyntaxNode> GetUnnecessaryImports(SemanticModel semanticModel, SyntaxNode root, CancellationToken cancellationToken = default(CancellationToken));
+		protected virtual Func<SyntaxNode, SyntaxToken> GetLastTokenDelegateForContiguousSpans()
+		{
+			return null;
+		}
+
+		// Create one diagnostic for each unnecessary span that will be classified as Unnecessary
+		private IEnumerable<Diagnostic> CreateClassificationDiagnostics(IEnumerable<TextSpan> contiguousSpans, SyntaxTree tree, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			foreach (var span in contiguousSpans)
+			{
+				if (tree.OverlapsHiddenPosition(span, cancellationToken))
+				{
+					continue;
+				}
+
+				yield return Diagnostic.Create(GetClassificationIdDescriptor(), tree.GetLocation(span));
+			}
+		}
+
+		protected abstract IEnumerable<TextSpan> GetFixableDiagnosticSpans(IEnumerable<SyntaxNode> nodes, SyntaxTree tree, CancellationToken cancellationToken = default(CancellationToken));
+
+		private IEnumerable<Diagnostic> CreateFixableDiagnostics(IEnumerable<SyntaxNode> nodes, SyntaxTree tree, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var spans = GetFixableDiagnosticSpans(nodes, tree, cancellationToken);
+			foreach (var span in spans) {
+				yield return Diagnostic.Create(GetClassificationIdDescriptor(), tree.GetLocation(span));
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/CSharpSimplifyTypeNamesDiagnosticAnalyzer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/CSharpSimplifyTypeNamesDiagnosticAnalyzer.cs
new file mode 100644
index 0000000000..8a8de8f79d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/CSharpSimplifyTypeNamesDiagnosticAnalyzer.cs
@@ -0,0 +1,152 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Diagnostics.SimplifyTypeNames
+{
+	[DiagnosticAnalyzer(LanguageNames.CSharp)]
+	internal sealed class CSharpSimplifyTypeNamesDiagnosticAnalyzer : SimplifyTypeNamesDiagnosticAnalyzerBase<SyntaxKind>
+	{
+		private static readonly ImmutableArray<SyntaxKind> s_kindsOfInterest = ImmutableArray.Create(SyntaxKind.QualifiedName,
+			SyntaxKind.AliasQualifiedName,
+			SyntaxKind.GenericName,
+			SyntaxKind.IdentifierName,
+			SyntaxKind.SimpleMemberAccessExpression,
+			SyntaxKind.QualifiedCref);
+
+		public override void Initialize(AnalysisContext analysisContext)
+		{
+			analysisContext.RegisterSyntaxNodeAction(AnalyzeNode, s_kindsOfInterest.ToArray());
+		}
+
+		protected override void AnalyzeNode(SyntaxNodeAnalysisContext context)
+		{
+			if (context.IsFromGeneratedCode ())
+				return;
+			if (context.Node.Ancestors(ascendOutOfTrivia: false).Any(n => s_kindsOfInterest.Contains(n.Kind())))
+			{
+				// Already simplified an ancestor of this node.
+				return;
+			}
+
+			Diagnostic diagnostic;
+			Func<SyntaxNode, bool> descendIntoChildren = n =>
+			{
+				if (!IsRegularCandidate(n) ||
+					!TrySimplifyTypeNameExpression(context.SemanticModel, n, context.Options, out diagnostic, context.CancellationToken))
+				{
+					return true;
+				}
+				context.ReportDiagnostic(diagnostic);
+				return false;
+			};
+
+			// find regular node first - search from top to down. once found one, don't get into its children
+			foreach (var candidate in context.Node.DescendantNodesAndSelf(descendIntoChildren))
+			{
+				context.CancellationToken.ThrowIfCancellationRequested();
+			}
+
+			// now search structure trivia
+			foreach (var candidate in context.Node.DescendantNodesAndSelf(descendIntoChildren: n => !IsCrefCandidate(n), descendIntoTrivia: true))
+			{
+				context.CancellationToken.ThrowIfCancellationRequested();
+
+				if (IsCrefCandidate(candidate) &&
+					TrySimplifyTypeNameExpression(context.SemanticModel, candidate, context.Options, out diagnostic, context.CancellationToken))
+				{
+					context.ReportDiagnostic(diagnostic);
+				}
+			}
+		}
+
+		internal static bool IsCandidate(SyntaxNode node)
+		{
+			return IsRegularCandidate(node) || IsCrefCandidate(node);
+		}
+
+		private static bool IsRegularCandidate(SyntaxNode node)
+		{
+			return node != null && s_kindsOfInterest.Contains(node.Kind());
+		}
+
+		private static bool IsCrefCandidate(SyntaxNode node)
+		{
+			return node is QualifiedCrefSyntax;
+		}
+
+		protected sealed override bool CanSimplifyTypeNameExpressionCore(SemanticModel model, SyntaxNode node, OptionSet optionSet, out TextSpan issueSpan, out string diagnosticId, CancellationToken cancellationToken)
+		{
+			return CanSimplifyTypeNameExpression(model, node, optionSet, out issueSpan, out diagnosticId, cancellationToken);
+		}
+
+		internal static bool CanSimplifyTypeNameExpression(SemanticModel model, SyntaxNode node, OptionSet optionSet, out TextSpan issueSpan, out string diagnosticId, CancellationToken cancellationToken)
+		{
+			issueSpan = default(TextSpan);
+			diagnosticId = IDEDiagnosticIds.SimplifyNamesDiagnosticId;
+
+			// For Crefs, currently only Qualified Crefs needs to be handled separately
+			if (node.Kind() == SyntaxKind.QualifiedCref)
+			{
+				if (node.ContainsDiagnostics)
+				{
+					return false;
+				}
+
+				var crefSyntax = (CrefSyntax)node;
+
+				CrefSyntax replacementNode;
+				if (!crefSyntax.TryReduceOrSimplifyExplicitName (model, out replacementNode, out issueSpan, optionSet, cancellationToken))
+				{
+					return false;
+				}
+			}
+			else
+			{
+				var expression = (ExpressionSyntax)node;
+				if (expression.ContainsDiagnostics)
+				{
+					return false;
+				}
+
+				// in case of an As or Is expression we need to handle the binary expression, because it might be 
+				// required to add parenthesis around the expression. Adding the parenthesis is done in the CSharpNameSimplifier.Rewriter
+				var expressionToCheck = expression.Kind() == SyntaxKind.AsExpression || expression.Kind() == SyntaxKind.IsExpression
+					? ((BinaryExpressionSyntax)expression).Right
+					: expression;
+
+				ExpressionSyntax replacementSyntax;
+				if (!expressionToCheck.TryReduceOrSimplifyExplicitName(model, out replacementSyntax, out issueSpan, optionSet, cancellationToken))
+				{
+					return false;
+				}
+
+				if (expression.Kind() == SyntaxKind.SimpleMemberAccessExpression)
+				{
+					var memberAccess = (MemberAccessExpressionSyntax)expression;
+					diagnosticId = memberAccess.Expression.Kind() == SyntaxKind.ThisExpression ?
+						IDEDiagnosticIds.SimplifyThisOrMeDiagnosticId :
+						IDEDiagnosticIds.SimplifyMemberAccessDiagnosticId;
+				}
+			}
+
+			return true;
+		}
+
+		protected override string GetLanguageName()
+		{
+			return LanguageNames.CSharp;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/SimplifyTypeNamesDiagnosticAnalyzerBase.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/SimplifyTypeNamesDiagnosticAnalyzerBase.cs
new file mode 100644
index 0000000000..f3d456a6eb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/SimplifyTypeNamesDiagnosticAnalyzerBase.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Immutable;
+using System.Threading;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using System;
+
+namespace MonoDevelop.CSharp.Diagnostics.SimplifyTypeNames
+{
+	internal abstract class SimplifyTypeNamesDiagnosticAnalyzerBase<TLanguageKindEnum> : DiagnosticAnalyzer where TLanguageKindEnum : struct
+	{
+		private static string s_localizableMessage = GettextCatalog.GetString ("Name can be simplified.");
+		private static string s_localizableTitleSimplifyNames = GettextCatalog.GetString ("Simplify Names");
+
+		private static readonly DiagnosticDescriptor s_descriptorSimplifyNames = new DiagnosticDescriptor(IDEDiagnosticIds.SimplifyNamesDiagnosticId,
+			s_localizableTitleSimplifyNames,
+			s_localizableMessage,
+			DiagnosticAnalyzerCategories.RedundanciesInCode,
+			DiagnosticSeverity.Warning,
+			isEnabledByDefault: true,
+			customTags: DiagnosticCustomTags.Unnecessary);
+
+		private static string s_localizableTitleSimplifyMemberAccess = GettextCatalog.GetString ("Simplify member access '{0}'");
+		private static readonly DiagnosticDescriptor s_descriptorSimplifyMemberAccess = new DiagnosticDescriptor(IDEDiagnosticIds.SimplifyMemberAccessDiagnosticId,
+			s_localizableTitleSimplifyMemberAccess,
+			s_localizableMessage,
+			DiagnosticAnalyzerCategories.RedundanciesInCode,
+			DiagnosticSeverity.Warning,
+			isEnabledByDefault: true,
+			customTags: DiagnosticCustomTags.Unnecessary);
+
+		private static string s_localizableTitleSimplifyThisOrMe = GettextCatalog.GetString ("Remove 'this'");
+		private static readonly DiagnosticDescriptor s_descriptorSimplifyThisOrMe = new DiagnosticDescriptor(IDEDiagnosticIds.SimplifyThisOrMeDiagnosticId,
+			s_localizableTitleSimplifyThisOrMe,
+			s_localizableMessage,
+			DiagnosticAnalyzerCategories.RedundanciesInCode,
+			DiagnosticSeverity.Warning,
+			isEnabledByDefault: true,
+			customTags: DiagnosticCustomTags.Unnecessary);
+
+		private OptionSet _lazyDefaultOptionSet;
+
+		public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
+		{
+			get
+			{
+				return ImmutableArray.Create(s_descriptorSimplifyNames, s_descriptorSimplifyMemberAccess, s_descriptorSimplifyThisOrMe);
+			}
+		}
+
+		protected abstract void AnalyzeNode(SyntaxNodeAnalysisContext context);
+
+		protected abstract bool CanSimplifyTypeNameExpressionCore(SemanticModel model, SyntaxNode node, OptionSet optionSet, out TextSpan issueSpan, out string diagnosticId, CancellationToken cancellationToken);
+
+		private OptionSet GetOptionSet(AnalyzerOptions analyzerOptions)
+		{
+			return TypeSystemService.Workspace.Options;
+		}
+
+		protected abstract string GetLanguageName();
+
+		protected bool TrySimplifyTypeNameExpression(SemanticModel model, SyntaxNode node, AnalyzerOptions analyzerOptions, out Diagnostic diagnostic, CancellationToken cancellationToken)
+		{
+			diagnostic = default(Diagnostic);
+
+			var optionSet = GetOptionSet(analyzerOptions);
+			string diagnosticId;
+
+			TextSpan issueSpan;
+			if (!CanSimplifyTypeNameExpressionCore(model, node, optionSet, out issueSpan, out diagnosticId, cancellationToken))
+			{
+				return false;
+			}
+
+			if (model.SyntaxTree.OverlapsHiddenPosition(issueSpan, cancellationToken))
+			{
+				return false;
+			}
+
+			DiagnosticDescriptor descriptor;
+			switch (diagnosticId)
+			{
+			case IDEDiagnosticIds.SimplifyNamesDiagnosticId:
+				descriptor = s_descriptorSimplifyNames;
+				break;
+
+			case IDEDiagnosticIds.SimplifyMemberAccessDiagnosticId:
+				descriptor = s_descriptorSimplifyMemberAccess;
+				break;
+
+			case IDEDiagnosticIds.SimplifyThisOrMeDiagnosticId:
+				descriptor = s_descriptorSimplifyThisOrMe;
+				break;
+
+			default:
+				throw new InvalidOperationException();
+			}
+
+			var tree = model.SyntaxTree;
+			diagnostic = Diagnostic.Create(descriptor, tree.GetLocation(issueSpan));
+			return true;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
index fd3d5506ed..65120bbf3b 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
@@ -27,15 +27,20 @@ using System;
 using System.Collections.Generic;
 
 
-using Mono.TextEditor;
 using MonoDevelop.CSharp.Formatting;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Projects.Policies;
 using System.Linq;
 using MonoDevelop.Ide.CodeFormatting;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Core;
 using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.Formatting;
+using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.CSharp.Formatting
 {
@@ -48,100 +53,53 @@ namespace MonoDevelop.CSharp.Formatting
 		public override bool SupportsCorrectingIndent { get { return true; } }
 
 		public override void CorrectIndenting (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, 
-			TextEditorData data, int line)
+			TextEditor data, int line)
 		{
-			DocumentLine lineSegment = data.Document.GetLine (line);
+			var lineSegment = data.GetLine (line);
 			if (lineSegment == null)
 				return;
 
 			try {
 				var policy = policyParent.Get<CSharpFormattingPolicy> (mimeTypeChain);
-				var tracker = new CSharpIndentEngine (data.Document, data.CreateNRefactoryTextEditorOptions (),  policy.CreateOptions ());
+				var textpolicy = policyParent.Get<TextStylePolicy> (mimeTypeChain);
+				var tracker = new CSharpIndentEngine (policy.CreateOptions (textpolicy));
 
-				tracker.Update (lineSegment.Offset);
+				tracker.Update (IdeApp.Workbench.ActiveDocument.Editor, lineSegment.Offset);
 				for (int i = lineSegment.Offset; i < lineSegment.Offset + lineSegment.Length; i++) {
-					tracker.Push (data.Document.GetCharAt (i));
+					tracker.Push (data.GetCharAt (i));
 				}
 
-				string curIndent = lineSegment.GetIndentation (data.Document);
+				string curIndent = lineSegment.GetIndentation (data);
 
 				int nlwsp = curIndent.Length;
-				if (!tracker.LineBeganInsideMultiLineComment || (nlwsp < lineSegment.LengthIncludingDelimiter && data.Document.GetCharAt (lineSegment.Offset + nlwsp) == '*')) {
+				if (!tracker.LineBeganInsideMultiLineComment || (nlwsp < lineSegment.LengthIncludingDelimiter && data.GetCharAt (lineSegment.Offset + nlwsp) == '*')) {
 					// Possibly replace the indent
 					string newIndent = tracker.ThisLineIndent;
 					if (newIndent != curIndent) 
-						data.Replace (lineSegment.Offset, nlwsp, newIndent);
+						data.ReplaceText (lineSegment.Offset, nlwsp, newIndent);
 				}
 			} catch (Exception e) {
 				LoggingService.LogError ("Error while indenting", e);
 			}
 		}
 
-		public override void OnTheFlyFormat (MonoDevelop.Ide.Gui.Document doc, int startOffset, int endOffset)
+		public override void OnTheFlyFormat (TextEditor editor, DocumentContext context, int startOffset, int endOffset)
 		{
-			OnTheFlyFormatter.Format (doc, startOffset, endOffset);
+			OnTheFlyFormatter.Format (editor, context, startOffset, endOffset);
 		}
 
 
 		public static string FormatText (CSharpFormattingPolicy policy, TextStylePolicy textPolicy, string mimeType, string input, int startOffset, int endOffset)
 		{
-			var data = new TextEditorData ();
-			data.Document.SuppressHighlightUpdate = true;
-			data.Document.MimeType = mimeType;
-			data.Document.FileName = "toformat.cs";
-			if (textPolicy != null) {
-				data.Options.TabsToSpaces = textPolicy.TabsToSpaces;
-				data.Options.TabSize = textPolicy.TabWidth;
-				data.Options.IndentationSize = textPolicy.IndentWidth;
-				data.Options.IndentStyle = textPolicy.RemoveTrailingWhitespace ? IndentStyle.Virtual : IndentStyle.Smart;
-			}
-			data.Text = input;
-
-			// System.Console.WriteLine ("-----");
-			// System.Console.WriteLine (data.Text.Replace (" ", ".").Replace ("\t", "->"));
-			// System.Console.WriteLine ("-----");
+			var inputTree = CSharpSyntaxTree.ParseText (SourceText.From (input));
 
-			var parser = new CSharpParser ();
-			var compilationUnit = parser.Parse (data);
-			bool hadErrors = parser.HasErrors;
+			var root = inputTree.GetRoot ();
+			var doc = Formatter.Format (root, new TextSpan (startOffset, endOffset - startOffset), TypeSystemService.Workspace, policy.CreateOptions (textPolicy));
+			var result = doc.ToFullString ();
+			if (textPolicy.GetEolMarker () != "\r\n")
+				result = result.Replace ("\r", "");
 			
-			if (hadErrors) {
-				//				foreach (var e in parser.ErrorReportPrinter.Errors)
-				//					Console.WriteLine (e.Message);
-				return input.Substring (startOffset, Math.Max (0, Math.Min (endOffset, input.Length) - startOffset));
-			}
-
-			var originalVersion = data.Document.Version;
-
-			var textEditorOptions = data.CreateNRefactoryTextEditorOptions ();
-			var formattingVisitor = new ICSharpCode.NRefactory.CSharp.CSharpFormatter (
-				policy.CreateOptions (),
-				textEditorOptions
-			) {
-				FormattingMode = FormattingMode.Intrusive
-			};
-
-			var changes = formattingVisitor.AnalyzeFormatting (data.Document, compilationUnit);
-			try {
-				changes.ApplyChanges (startOffset, endOffset - startOffset);
-			} catch (Exception e) {
-				LoggingService.LogError ("Error in code formatter", e);
-				return input.Substring (startOffset, Math.Max (0, Math.Min (endOffset, input.Length) - startOffset));
-			}
-
-			// check if the formatter has produced errors
-			parser = new CSharpParser ();
-			parser.Parse (data);
-			if (parser.HasErrors) {
-				LoggingService.LogError ("C# formatter produced source code errors. See console for output.");
-				return input.Substring (startOffset, Math.Max (0, Math.Min (endOffset, input.Length) - startOffset));
-			}
-
-			var currentVersion = data.Document.Version;
-
-			string result = data.GetTextBetween (startOffset, originalVersion.MoveOffsetTo (currentVersion, endOffset));
-			data.Dispose ();
-			return result;
+			return result.Substring (startOffset, endOffset + result.Length - input.Length - startOffset);
 		}
 
 		public override string FormatText (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, string input, int startOffset, int endOffset)
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs
index e6d7a466f3..9b84859194 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs
@@ -32,14 +32,19 @@ using System.Xml;
 using System.Text;
 using System.Linq;
 using MonoDevelop.Projects.Policies;
-using ICSharpCode.NRefactory.CSharp;
+using Microsoft.CodeAnalysis.Options;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Gui.Content;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharp.Formatting
 {
-	[PolicyType ("C# formatting")]
-	public class CSharpFormattingPolicy : IEquatable<CSharpFormattingPolicy>
+	[PolicyType ("C# formatting (roslyn)")]
+	public sealed class CSharpFormattingPolicy : IEquatable<CSharpFormattingPolicy>
 	{
-		readonly CSharpFormattingOptions options = FormattingOptionsFactory.CreateMono ();
+		OptionSet options;
 		
 		public string Name {
 			get;
@@ -53,1602 +58,507 @@ namespace MonoDevelop.CSharp.Formatting
 		
 		public CSharpFormattingPolicy Clone ()
 		{
-			return new CSharpFormattingPolicy (options.Clone ());
+			return new CSharpFormattingPolicy (options);
 		}
 
-		public CSharpFormattingOptions CreateOptions ()
+		public static OptionSet Apply (OptionSet options, TextStylePolicy policy)
 		{
-			return options;
+			var result = options;
+			if (policy != null) {
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentationSize, LanguageNames.CSharp, policy.IndentWidth);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.NewLine, LanguageNames.CSharp, policy.GetEolMarker ());
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.SmartIndent, LanguageNames.CSharp, FormattingOptions.IndentStyle.Smart);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.TabSize, LanguageNames.CSharp, policy.TabWidth);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.UseTabs, LanguageNames.CSharp, !policy.TabsToSpaces);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.UseTabOnlyForIndentation, LanguageNames.CSharp, !policy.TabsToSpaces);
+			}
+			return result;
 		}
-		
+
+		public static OptionSet Apply (OptionSet options, ITextEditorOptions policy)
+		{
+			var result = options;
+			if (policy != null) {
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentationSize, LanguageNames.CSharp, policy.IndentationSize);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.NewLine, LanguageNames.CSharp, policy.DefaultEolMarker);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.SmartIndent, LanguageNames.CSharp, FormattingOptions.IndentStyle.Smart);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.TabSize, LanguageNames.CSharp, policy.TabSize);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.UseTabs, LanguageNames.CSharp, !policy.TabsToSpaces);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.UseTabOnlyForIndentation, LanguageNames.CSharp, !policy.TabsToSpaces);
+			}
+			return result;
+		}
+
+		public OptionSet CreateOptions (TextStylePolicy policy)
+		{
+			return Apply (options, policy);
+		}
+
+		public OptionSet CreateOptions (ITextEditorOptions policy)
+		{
+			return Apply (options, policy);
+		}
+
 		static CSharpFormattingPolicy ()
 		{
 			if (!PolicyService.InvariantPolicies.ReadOnly)
 				 PolicyService.InvariantPolicies.Set<CSharpFormattingPolicy> (new CSharpFormattingPolicy (), "text/x-csharp");
 		}
 		
-		protected CSharpFormattingPolicy (CSharpFormattingOptions options)
+		public CSharpFormattingPolicy (OptionSet options)
 		{
+			if (options == null)
+				throw new ArgumentNullException ("options");
 			this.options = options;
 		}
-		
-		
-		#region Indentation
-		[ItemProperty]
-		public bool IndentNamespaceBody {
-			get {
-				return options.IndentNamespaceBody;
-			}
-			set {
-				options.IndentNamespaceBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentClassBody {
-			get {
-				return options.IndentClassBody;
-			}
-			set {
-				options.IndentClassBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentInterfaceBody {
-			get {
-				return options.IndentInterfaceBody;
-			}
-			set {
-				options.IndentInterfaceBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentStructBody {
-			get {
-				return options.IndentStructBody;
-			}
-			set {
-				options.IndentStructBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentEnumBody {
-			get {
-				return options.IndentEnumBody;
-			}
-			set {
-				options.IndentEnumBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentMethodBody {
-			get {
-				return options.IndentMethodBody;
-			}
-			set {
-				options.IndentMethodBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentPropertyBody {
-			get {
-				return options.IndentPropertyBody;
-			}
-			set {
-				options.IndentPropertyBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentEventBody {
-			get {
-				return options.IndentEventBody;
-			}
-			set {
-				options.IndentEventBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentBlocks {
-			get {
-				return options.IndentBlocks;
-			}
-			set {
-				options.IndentBlocks = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentSwitchBody {
-			get {
-				return options.IndentSwitchBody;
-			}
-			set {
-				options.IndentSwitchBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentCaseBody {
-			get {
-				return options.IndentCaseBody;
-			}
-			set {
-				options.IndentCaseBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentBreakStatements {
-			get {
-				return options.IndentBreakStatements;
-			}
-			set {
-				options.IndentBreakStatements = value;
-			}
-		}
 
+		#region Indent options
 		[ItemProperty]
-		public bool IndentBlocksInsideExpressions {
+		public bool IndentBlock {
 			get {
-				return options.IndentBlocksInsideExpressions;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentBlock);
 			}
 			set {
-				options.IndentBlocksInsideExpressions = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AlignEmbeddedStatements {
-			get {
-				return options.AlignEmbeddedStatements;
-			}
-			set {
-				options.AlignEmbeddedStatements = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentBlock, value);
 			}
 		}
 
 		[ItemProperty]
-		public PropertyFormatting SimplePropertyFormatting {
+		public bool IndentBraces {
 			get {
-				return options.SimplePropertyFormatting;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentBraces);
 			}
 			set {
-				options.SimplePropertyFormatting = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentBraces, value);
 			}
 		}
 
 		[ItemProperty]
-		public PropertyFormatting AutoPropertyFormatting {
+		public bool IndentSwitchSection {
 			get {
-				return options.AutoPropertyFormatting;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentSwitchSection);
 			}
 			set {
-				options.AutoPropertyFormatting = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentSwitchSection, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool IndentPreprocessorDirectives {
-			get {
-				return options.IndentPreprocessorDirectives;
-			}
-			set {
-				options.IndentPreprocessorDirectives = value;
-			}
-		}
-		#endregion
-		
-		#region Braces
-		[ItemProperty]
-		public BraceStyle NamespaceBraceStyle {
-			get {
-				return options.NamespaceBraceStyle;
-			}
-			set {
-				options.NamespaceBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle ClassBraceStyle {
-			get {
-				return options.ClassBraceStyle;
-			}
-			set {
-				options.ClassBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle InterfaceBraceStyle {
-			get {
-				return options.InterfaceBraceStyle;
-			}
-			set {
-				options.InterfaceBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle StructBraceStyle {
-			get {
-				return options.StructBraceStyle;
-			}
-			set {
-				options.StructBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle EnumBraceStyle {
+		public bool IndentSwitchCaseSection {
 			get {
-				return options.EnumBraceStyle;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentSwitchCaseSection);
 			}
 			set {
-				options.EnumBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle MethodBraceStyle {
-			get {
-				return options.MethodBraceStyle;
-			}
-			set {
-				options.MethodBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle AnonymousMethodBraceStyle {
-			get {
-				return options.AnonymousMethodBraceStyle;
-			}
-			set {
-				options.AnonymousMethodBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle ConstructorBraceStyle {
-			get {
-				return options.ConstructorBraceStyle;
-			}
-			set {
-				options.ConstructorBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle DestructorBraceStyle {
-			get {
-				return options.DestructorBraceStyle;
-			}
-			set {
-				options.DestructorBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle PropertyBraceStyle {
-			get {
-				return options.PropertyBraceStyle;
-			}
-			set {
-				options.PropertyBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle PropertyGetBraceStyle {
-			get {
-				return options.PropertyGetBraceStyle;
-			}
-			set {
-				options.PropertyGetBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle PropertySetBraceStyle {
-			get {
-				return options.PropertySetBraceStyle;
-			}
-			set {
-				options.PropertySetBraceStyle = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentSwitchCaseSection, value);
 			}
 		}
 
 		[ItemProperty]
-		public PropertyFormatting SimpleGetBlockFormatting {
+		public Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions LabelPositioning {
 			get {
-				return options.SimpleGetBlockFormatting;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.LabelPositioning);
 			}
 			set {
-				options.SimpleGetBlockFormatting = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.LabelPositioning, value);
 			}
 		}
+		#endregion
 
-		[ItemProperty]
-		public PropertyFormatting SimpleSetBlockFormatting {
-			get {
+		#region New line options
 
-				return options.SimpleSetBlockFormatting;
-			}
-			set {
-				options.SimpleSetBlockFormatting = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle EventBraceStyle {
-			get {
-				return options.EventBraceStyle;
-			}
-			set {
-				options.EventBraceStyle = value;
-			}
-		}
-		
 		[ItemProperty]
-		public BraceStyle EventAddBraceStyle {
+		public bool NewLinesForBracesInTypes {
 			get {
-				return options.EventAddBraceStyle;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInTypes);
 			}
 			set {
-				options.EventAddBraceStyle = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInTypes, value);
 			}
 		}
-		
-		[ItemProperty]
-		public BraceStyle EventRemoveBraceStyle {
-			get {
-				return options.EventRemoveBraceStyle;
-			}
-			set {
-				options.EventRemoveBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AllowEventAddBlockInline {
-			get {
-				return options.AllowEventAddBlockInline;
-			}
-			set {
-				options.AllowEventAddBlockInline = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AllowEventRemoveBlockInline {
-			get {
-				return options.AllowEventRemoveBlockInline;
-			}
-			set {
-				options.AllowEventRemoveBlockInline = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle StatementBraceStyle {
-			get {
-				return options.StatementBraceStyle;
-			}
-			set {
-				options.StatementBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AllowIfBlockInline {
-			get {
-				return options.AllowIfBlockInline;
-			}
-			set {
-				options.AllowIfBlockInline = value;
-			}
-		}
-		
-		#endregion
 
-		#region NewLines
-		[ItemProperty]
-		public NewLinePlacement ElseNewLinePlacement {
-			get {
-				return options.ElseNewLinePlacement;
-			}
-			set {
-				options.ElseNewLinePlacement = value;
-			}
-		}
-		
 		[ItemProperty]
-		public NewLinePlacement ElseIfNewLinePlacement {
+		public bool NewLinesForBracesInMethods {
 			get {
-				return options.ElseIfNewLinePlacement;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInMethods);
 			}
 			set {
-				options.ElseIfNewLinePlacement = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInMethods, value);
 			}
 		}
-		
-		[ItemProperty]
-		public NewLinePlacement CatchNewLinePlacement {
-			get {
-				return options.CatchNewLinePlacement;
-			}
-			set {
-				options.CatchNewLinePlacement = value;
-			}
-		}
-		
+
 		[ItemProperty]
-		public NewLinePlacement FinallyNewLinePlacement {
+		public bool NewLinesForBracesInAnonymousMethods {
 			get {
-				return options.FinallyNewLinePlacement;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAnonymousMethods);
 			}
 			set {
-				options.FinallyNewLinePlacement = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAnonymousMethods, value);
 			}
 		}
-		
+			
 		[ItemProperty]
-		public NewLinePlacement WhileNewLinePlacement {
+		public bool NewLinesForBracesInControlBlocks {
 			get {
-				return options.WhileNewLinePlacement;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInControlBlocks);
 			}
 			set {
-				options.WhileNewLinePlacement = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInControlBlocks, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement EmbeddedStatementPlacement {
+		public bool NewLinesForBracesInAnonymousTypes {
 			get {
-				return options.EmbeddedStatementPlacement;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAnonymousTypes);
 			}
 			set {
-				options.EmbeddedStatementPlacement = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAnonymousTypes, value);
 			}
 		}
 
-
-		
 		[ItemProperty]
-		public Wrapping ArrayInitializerWrapping {
+		public bool NewLinesForBracesInObjectInitializers {
 			get {
-				return options.ArrayInitializerWrapping;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInObjectInitializers);
 			}
 			set {
-				options.ArrayInitializerWrapping = value;
-			}
-		}
-
-	[ItemProperty]
-		public BraceStyle ArrayInitializerBraceStyle {
-			get {
-				return options.ArrayInitializerBraceStyle;
-			}
-			set {
-				options.ArrayInitializerBraceStyle = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInObjectInitializers, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool KeepCommentsAtFirstColumn {
+		public bool NewLinesForBracesInLambdaExpressionBody {
 			get {
-				return options.KeepCommentsAtFirstColumn;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInLambdaExpressionBody);
 			}
 			set {
-				options.KeepCommentsAtFirstColumn = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInLambdaExpressionBody, value);
 			}
 		}
 
-		#endregion
-		
-		#region Spaces
-		// Methods
-		[ItemProperty]
-		public bool BeforeMethodDeclarationParentheses {
-			get {
-				return options.SpaceBeforeMethodDeclarationParentheses;
-			}
-			set {
-				options.SpaceBeforeMethodDeclarationParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BetweenEmptyMethodDeclarationParentheses {
-			get {
-				return options.SpaceBetweenEmptyMethodDeclarationParentheses;
-			}
-			set {
-				options.SpaceBetweenEmptyMethodDeclarationParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeMethodDeclarationParameterComma {
-			get {
-				return options.SpaceBeforeMethodDeclarationParameterComma;
-			}
-			set {
-				options.SpaceBeforeMethodDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterMethodDeclarationParameterComma {
-			get {
-				return options.SpaceAfterMethodDeclarationParameterComma;
-			}
-			set {
-				options.SpaceAfterMethodDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinMethodDeclarationParentheses {
-			get {
-				return options.SpaceWithinMethodDeclarationParentheses;
-			}
-			set {
-				options.SpaceWithinMethodDeclarationParentheses = value;
-			}
-		}
-		
-		// Method calls
-		[ItemProperty]
-		public bool BeforeMethodCallParentheses {
-			get {
-				return options.SpaceBeforeMethodCallParentheses;
-			}
-			set {
-				options.SpaceBeforeMethodCallParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BetweenEmptyMethodCallParentheses {
-			get {
-				return options.SpaceBetweenEmptyMethodCallParentheses;
-			}
-			set {
-				options.SpaceBetweenEmptyMethodCallParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeMethodCallParameterComma {
-			get {
-				return options.SpaceBeforeMethodCallParameterComma;
-			}
-			set {
-				options.SpaceBeforeMethodCallParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterMethodCallParameterComma {
-			get {
-				return options.SpaceAfterMethodCallParameterComma;
-			}
-			set {
-				options.SpaceAfterMethodCallParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinMethodCallParentheses {
-			get {
-				return options.SpaceWithinMethodCallParentheses;
-			}
-			set {
-				options.SpaceWithinMethodCallParentheses = value;
-			}
-		}
-		
-		// fields
-		
-		[ItemProperty]
-		public bool BeforeFieldDeclarationComma {
-			get {
-				return options.SpaceBeforeFieldDeclarationComma;
-			}
-			set {
-				options.SpaceBeforeFieldDeclarationComma = value;
-			}
-		}
-		
 		[ItemProperty]
-		public bool AfterFieldDeclarationComma {
+		public bool NewLineForElse {
 			get {
-				return options.SpaceAfterFieldDeclarationComma;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForElse);
 			}
 			set {
-				options.SpaceAfterFieldDeclarationComma = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForElse, value);
 			}
 		}
-		
-		// local variables
-		
+			
 		[ItemProperty]
-		public bool BeforeLocalVariableDeclarationComma {
+		public bool NewLineForCatch {
 			get {
-				return options.SpaceBeforeLocalVariableDeclarationComma;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForCatch);
 			}
 			set {
-				options.SpaceBeforeLocalVariableDeclarationComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterLocalVariableDeclarationComma {
-			get {
-				return options.SpaceAfterLocalVariableDeclarationComma;
-			}
-			set {
-				options.SpaceAfterLocalVariableDeclarationComma = value;
-			}
-		}
-		
-		// constructors
-		
-		[ItemProperty]
-		public bool BeforeConstructorDeclarationParentheses {
-			get {
-				return options.SpaceBeforeConstructorDeclarationParentheses;
-			}
-			set {
-				options.SpaceBeforeConstructorDeclarationParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BetweenEmptyConstructorDeclarationParentheses {
-			get {
-				return options.SpaceBetweenEmptyConstructorDeclarationParentheses;
-			}
-			set {
-				options.SpaceBetweenEmptyConstructorDeclarationParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeConstructorDeclarationParameterComma {
-			get {
-				return options.SpaceBeforeConstructorDeclarationParameterComma;
-			}
-			set {
-				options.SpaceBeforeConstructorDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterConstructorDeclarationParameterComma {
-			get {
-				return options.SpaceAfterConstructorDeclarationParameterComma;
-			}
-			set {
-				options.SpaceAfterConstructorDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinConstructorDeclarationParentheses {
-			get {
-				return options.SpaceWithinConstructorDeclarationParentheses;
-			}
-			set {
-				options.SpaceWithinConstructorDeclarationParentheses = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForCatch, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement NewLineBeforeConstructorInitializerColon {
+		public bool NewLineForFinally {
 			get {
-				return options.NewLineBeforeConstructorInitializerColon;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForFinally);
 			}
 			set {
-				options.NewLineBeforeConstructorInitializerColon = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForFinally, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement NewLineAfterConstructorInitializerColon {
+		public bool NewLineForMembersInObjectInit {
 			get {
-				return options.NewLineAfterConstructorInitializerColon;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForMembersInObjectInit);
 			}
 			set {
-				options.NewLineAfterConstructorInitializerColon = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForMembersInObjectInit, value);
 			}
 		}
 
-		// indexer
-		[ItemProperty]
-		public bool BeforeIndexerDeclarationBracket {
-			get {
-				return options.SpaceBeforeIndexerDeclarationBracket;
-			}
-			set {
-				options.SpaceBeforeIndexerDeclarationBracket = value;
-			}
-		}
-		
 		[ItemProperty]
-		public bool WithinIndexerDeclarationBracket {
+		public bool NewLineForMembersInAnonymousTypes {
 			get {
-				return options.SpaceWithinIndexerDeclarationBracket;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForMembersInAnonymousTypes);
 			}
 			set {
-				options.SpaceWithinIndexerDeclarationBracket = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeIndexerDeclarationParameterComma {
-			get {
-				return options.SpaceBeforeIndexerDeclarationParameterComma;
-			}
-			set {
-				options.SpaceBeforeIndexerDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterIndexerDeclarationParameterComma {
-			get {
-				return options.SpaceAfterIndexerDeclarationParameterComma;
-			}
-			set {
-				options.SpaceAfterIndexerDeclarationParameterComma = value;
-			}
-		}
-		
-		// delegates
-		
-		[ItemProperty]
-		public bool BeforeDelegateDeclarationParentheses {
-			get {
-				return options.SpaceBeforeDelegateDeclarationParentheses;
-			}
-			set {
-				options.SpaceBeforeDelegateDeclarationParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BetweenEmptyDelegateDeclarationParentheses {
-			get {
-				return options.SpaceBetweenEmptyDelegateDeclarationParentheses;
-			}
-			set {
-				options.SpaceBetweenEmptyDelegateDeclarationParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeDelegateDeclarationParameterComma {
-			get {
-				return options.SpaceBeforeDelegateDeclarationParameterComma;
-			}
-			set {
-				options.SpaceBeforeDelegateDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterDelegateDeclarationParameterComma {
-			get {
-				return options.SpaceAfterDelegateDeclarationParameterComma;
-			}
-			set {
-				options.SpaceAfterDelegateDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinDelegateDeclarationParentheses {
-			get {
-				return options.SpaceWithinDelegateDeclarationParentheses;
-			}
-			set {
-				options.SpaceWithinDelegateDeclarationParentheses = value;
-			}
-		}
-		
-		
-		[ItemProperty]
-		public bool NewParentheses {
-			get {
-				return options.SpaceBeforeNewParentheses;
-			}
-			set {
-				options.SpaceBeforeNewParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IfParentheses {
-			get {
-				return options.SpaceBeforeIfParentheses;
-			}
-			set {
-				options.SpaceBeforeIfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WhileParentheses {
-			get {
-				return options.SpaceBeforeWhileParentheses;
-			}
-			set {
-				options.SpaceBeforeWhileParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ForParentheses {
-			get {
-				return options.SpaceBeforeForParentheses;
-			}
-			set {
-				options.SpaceBeforeForParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ForeachParentheses {
-			get {
-				return options.SpaceBeforeForeachParentheses;
-			}
-			set {
-				options.SpaceBeforeForeachParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool CatchParentheses {
-			get {
-				return options.SpaceBeforeCatchParentheses;
-			}
-			set {
-				options.SpaceBeforeCatchParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool SwitchParentheses {
-			get {
-				return options.SpaceBeforeSwitchParentheses;
-			}
-			set {
-				options.SpaceBeforeSwitchParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool LockParentheses {
-			get {
-				return options.SpaceBeforeLockParentheses;
-			}
-			set {
-				options.SpaceBeforeLockParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool UsingParentheses {
-			get {
-				return options.SpaceBeforeUsingParentheses;
-			}
-			set {
-				options.SpaceBeforeUsingParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundAssignmentParentheses {
-			get {
-				return options.SpaceAroundAssignment;
-			}
-			set {
-				options.SpaceAroundAssignment = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundLogicalOperatorParentheses {
-			get {
-				return options.SpaceAroundLogicalOperator;
-			}
-			set {
-				options.SpaceAroundLogicalOperator = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundEqualityOperatorParentheses {
-			get {
-				return options.SpaceAroundEqualityOperator;
-			}
-			set {
-				options.SpaceAroundEqualityOperator = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundRelationalOperatorParentheses {
-			get {
-				return options.SpaceAroundRelationalOperator;
-			}
-			set {
-				options.SpaceAroundRelationalOperator = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundBitwiseOperatorParentheses {
-			get {
-				return options.SpaceAroundBitwiseOperator;
-			}
-			set {
-				options.SpaceAroundBitwiseOperator = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundAdditiveOperatorParentheses {
-			get {
-				return options.SpaceAroundAdditiveOperator;
-			}
-			set {
-				options.SpaceAroundAdditiveOperator = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundMultiplicativeOperatorParentheses {
-			get {
-				return options.SpaceAroundMultiplicativeOperator;
-			}
-			set {
-				options.SpaceAroundMultiplicativeOperator = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundShiftOperatorParentheses {
-			get {
-				return options.SpaceAroundShiftOperator;
-			}
-			set {
-				options.SpaceAroundShiftOperator = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundNullCoalescingOperator {
-			get {
-				return options.SpaceAroundNullCoalescingOperator;
-			}
-			set {
-				options.SpaceAroundNullCoalescingOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForMembersInAnonymousTypes, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool SpaceAfterUnsafeAddressOfOperator {
+		public bool NewLineForClausesInQuery {
 			get {
-				return options.SpaceAfterUnsafeAddressOfOperator;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForClausesInQuery);
 			}
 			set {
-				options.SpaceAfterUnsafeAddressOfOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForClausesInQuery, value);
 			}
 		}
+		#endregion
 
+		#region Spacing options
 
 		[ItemProperty]
-		public bool SpaceAfterUnsafeAsteriskOfOperator {
+		public bool SpacingAfterMethodDeclarationName {
 			get {
-				return options.SpaceAfterUnsafeAsteriskOfOperator;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAfterMethodDeclarationName);
 			}
 			set {
-				options.SpaceAfterUnsafeAsteriskOfOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAfterMethodDeclarationName, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool SpaceAroundUnsafeArrowOperator {
+		public bool SpaceWithinMethodDeclarationParenthesis {
 			get {
-				return options.SpaceAroundUnsafeArrowOperator;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodDeclarationParenthesis);
 			}
 			set {
-				options.SpaceAroundUnsafeArrowOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodDeclarationParenthesis, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool WithinParentheses {
-			get {
-				return options.SpacesWithinParentheses;
-			}
-			set {
-				options.SpacesWithinParentheses = value;
-			}
-		}
-		
-		
-		[ItemProperty]
-		public bool WithinIfParentheses {
-			get {
-				return options.SpacesWithinIfParentheses;
-			}
-			set {
-				options.SpacesWithinIfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinWhileParentheses {
-			get {
-				return options.SpacesWithinWhileParentheses;
-			}
-			set {
-				options.SpacesWithinWhileParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinForParentheses {
-			get {
-				return options.SpacesWithinForParentheses;
-			}
-			set {
-				options.SpacesWithinForParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinForEachParentheses {
-			get {
-				return options.SpacesWithinForeachParentheses;
-			}
-			set {
-				options.SpacesWithinForeachParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinCatchParentheses {
-			get {
-				return options.SpacesWithinCatchParentheses;
-			}
-			set {
-				options.SpacesWithinCatchParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinSwitchParentheses {
-			get {
-				return options.SpacesWithinSwitchParentheses;
-			}
-			set {
-				options.SpacesWithinSwitchParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinLockParentheses {
-			get {
-				return options.SpacesWithinLockParentheses;
-			}
-			set {
-				options.SpacesWithinLockParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinUsingParentheses {
-			get {
-				return options.SpacesWithinUsingParentheses;
-			}
-			set {
-				options.SpacesWithinUsingParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinCastParentheses {
-			get {
-				return options.SpacesWithinCastParentheses;
-			}
-			set {
-				options.SpacesWithinCastParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinSizeOfParentheses {
-			get {
-				return options.SpacesWithinSizeOfParentheses;
-			}
-			set {
-				options.SpacesWithinSizeOfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeSizeOfParentheses {
-			get {
-				return options.SpaceBeforeSizeOfParentheses;
-			}
-			set {
-				options.SpaceBeforeSizeOfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinTypeOfParentheses {
-			get {
-				return options.SpacesWithinTypeOfParentheses;
-			}
-			set {
-				options.SpacesWithinTypeOfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinNewParentheses {
-			get {
-				return options.SpacesWithinNewParentheses;
-			}
-			set {
-				options.SpacesWithinNewParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BetweenEmptyNewParentheses {
-			get {
-				return options.SpacesBetweenEmptyNewParentheses;
-			}
-			set {
-				options.SpacesBetweenEmptyNewParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeNewParameterComma {
-			get {
-				return options.SpaceBeforeNewParameterComma;
-			}
-			set {
-				options.SpaceBeforeNewParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterNewParameterComma {
-			get {
-				return options.SpaceAfterNewParameterComma;
-			}
-			set {
-				options.SpaceAfterNewParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeTypeOfParentheses {
-			get {
-				return options.SpaceBeforeTypeOfParentheses;
-			}
-			set {
-				options.SpaceBeforeTypeOfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinCheckedExpressionParantheses {
-			get {
-				return options.SpacesWithinCheckedExpressionParantheses;
-			}
-			set {
-				options.SpacesWithinCheckedExpressionParantheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ConditionalOperatorBeforeConditionSpace {
-			get {
-				return options.SpaceBeforeConditionalOperatorCondition;
-			}
-			set {
-				options.SpaceBeforeConditionalOperatorCondition = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ConditionalOperatorAfterConditionSpace {
-			get {
-				return options.SpaceAfterConditionalOperatorCondition;
-			}
-			set {
-				options.SpaceAfterConditionalOperatorCondition = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ConditionalOperatorBeforeSeparatorSpace {
-			get {
-				return options.SpaceBeforeConditionalOperatorSeparator;
-			}
-			set {
-				options.SpaceBeforeConditionalOperatorSeparator = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ConditionalOperatorAfterSeparatorSpace {
-			get {
-				return options.SpaceAfterConditionalOperatorSeparator;
-			}
-			set {
-				options.SpaceAfterConditionalOperatorSeparator = value;
-			}
-		}
-		
-		// brackets
-		[ItemProperty]
-		public bool SpacesWithinBrackets {
-			get {
-				return options.SpacesWithinBrackets;
-			}
-			set {
-				options.SpacesWithinBrackets = value;
-			}
-		}
-		[ItemProperty]
-		public bool SpacesBeforeBrackets {
-			get {
-				return options.SpacesBeforeBrackets;
-			}
-			set {
-				options.SpacesBeforeBrackets = value;
-			}
-		}
-		[ItemProperty]
-		public bool BeforeBracketComma {
-			get {
-				return options.SpaceBeforeBracketComma;
-			}
-			set {
-				options.SpaceBeforeBracketComma = value;
-			}
-		}
-		[ItemProperty]
-		public bool AfterBracketComma {
-			get {
-				return options.SpaceAfterBracketComma;
-			}
-			set {
-				options.SpaceAfterBracketComma = value;
-			}
-		}
-		
-		
-		[ItemProperty]
-		public bool SpacesBeforeForSemicolon {
+		public bool SpaceBetweenEmptyMethodDeclarationParentheses {
 			get {
-				return options.SpaceBeforeForSemicolon;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodDeclarationParentheses);
 			}
 			set {
-				options.SpaceBeforeForSemicolon = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodDeclarationParentheses, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool SpaceBeforeSemicolon {
-			get {
-				return options.SpaceBeforeSemicolon;
-			}
-			set {
-				options.SpaceBeforeSemicolon = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool SpacesAfterForSemicolon {
+		public bool SpaceAfterMethodCallName {
 			get {
-				return options.SpaceAfterForSemicolon;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterMethodCallName);
 			}
 			set {
-				options.SpaceAfterForSemicolon = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterMethodCallName, value);
 			}
 		}
-		
-		[ItemProperty]
-		public bool SpacesAfterTypecast {
-			get {
-				return options.SpaceAfterTypecast;
-			}
-			set {
-				options.SpaceAfterTypecast = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool SpacesBeforeArrayDeclarationBrackets {
-			get {
-				return options.SpaceBeforeArrayDeclarationBrackets;
-			}
-			set {
-				options.SpaceBeforeArrayDeclarationBrackets = value;
-			}
-		}
-		#endregion
-		
-		#region Blank Lines
-		[ItemProperty]
-		public int BlankLinesBeforeUsings {
-			get {
-				return options.MinimumBlankLinesBeforeUsings;
-			}
-			set {
-				options.MinimumBlankLinesBeforeUsings = value;
-			}
-		}
-		
-		[ItemProperty]
-		public int BlankLinesAfterUsings {
-			get {
-				return options.MinimumBlankLinesAfterUsings;
-			}
-			set {
-				options.MinimumBlankLinesAfterUsings = value;
-			}
-		}
-		
-		[ItemProperty]
-		public int BlankLinesBeforeFirstDeclaration {
-			get {
-				return options.MinimumBlankLinesBeforeFirstDeclaration;
-			}
-			set {
-				options.MinimumBlankLinesBeforeFirstDeclaration = value;
-			}
-		}
-		
+
 		[ItemProperty]
-		public int BlankLinesBetweenTypes {
+		public bool SpaceWithinMethodCallParentheses {
 			get {
-				return options.MinimumBlankLinesBetweenTypes;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodCallParentheses);
 			}
 			set {
-				options.MinimumBlankLinesBetweenTypes = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodCallParentheses, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public int BlankLinesBetweenFields {
+		public bool SpaceBetweenEmptyMethodCallParentheses {
 			get {
-				return options.MinimumBlankLinesBetweenFields;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodCallParentheses);
 			}
 			set {
-				options.MinimumBlankLinesBetweenFields = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodCallParentheses, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public int BlankLinesBetweenEventFields {
+		public bool SpaceAfterControlFlowStatementKeyword {
 			get {
-				return options.MinimumBlankLinesBetweenEventFields;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterControlFlowStatementKeyword);
 			}
 			set {
-				options.MinimumBlankLinesBetweenEventFields = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterControlFlowStatementKeyword, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public int BlankLinesBetweenMembers {
+		public bool SpaceWithinExpressionParentheses {
 			get {
-				return options.MinimumBlankLinesBetweenMembers;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinExpressionParentheses);
 			}
 			set {
-				options.MinimumBlankLinesBetweenMembers = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinExpressionParentheses, value);
 			}
 		}
 
 		[ItemProperty]
-		public int BlankLinesAroundRegion {
+		public bool SpaceWithinCastParentheses {
 			get {
-				return options.MinimumBlankLinesAroundRegion;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinCastParentheses);
 			}
 			set {
-				options.MinimumBlankLinesAroundRegion = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinCastParentheses, value);
 			}
 		}
 
 		[ItemProperty]
-		public int BlankLinesInsideRegion {
+		public bool SpaceWithinOtherParentheses {
 			get {
-				return options.MinimumBlankLinesInsideRegion;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinOtherParentheses);
 			}
 			set {
-				options.MinimumBlankLinesInsideRegion = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinOtherParentheses, value);
 			}
 		}
-		#endregion
 
-		#region Wrapping
 		[ItemProperty]
-		public Wrapping MethodCallArgumentWrapping {
+		public bool SpaceAfterCast {
 			get {
-				return options.MethodCallArgumentWrapping;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterCast);
 			}
 			set {
-				options.MethodCallArgumentWrapping = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterCast, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement NewLineAferMethodCallOpenParentheses {
+		public bool SpacesIgnoreAroundVariableDeclaration {
 			get {
-				return options.NewLineAferMethodCallOpenParentheses;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacesIgnoreAroundVariableDeclaration);
 			}
 			set {
-				options.NewLineAferMethodCallOpenParentheses = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacesIgnoreAroundVariableDeclaration, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement MethodCallClosingParenthesesOnNewLine {
+		public bool SpaceBeforeOpenSquareBracket {
 			get {
-				return options.MethodCallClosingParenthesesOnNewLine;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeOpenSquareBracket);
 			}
 			set {
-				options.MethodCallClosingParenthesesOnNewLine = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeOpenSquareBracket, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool AlignToFirstMethodCallArgument {
+		public bool SpaceBetweenEmptySquareBrackets {
 			get {
-				return options.AlignToFirstMethodCallArgument;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptySquareBrackets);
 			}
 			set {
-				options.AlignToFirstMethodCallArgument = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptySquareBrackets, value);
 			}
 		}
 
 		[ItemProperty]
-		public Wrapping MethodDeclarationParameterWrapping {
+		public bool SpaceWithinSquareBrackets {
 			get {
-				return options.MethodDeclarationParameterWrapping;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinSquareBrackets);
 			}
 			set {
-				options.MethodDeclarationParameterWrapping = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinSquareBrackets, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement NewLineAferMethodDeclarationOpenParentheses {
+		public bool SpaceAfterColonInBaseTypeDeclaration {
 			get {
-				return options.NewLineAferMethodDeclarationOpenParentheses;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterColonInBaseTypeDeclaration);
 			}
 			set {
-				options.NewLineAferMethodDeclarationOpenParentheses = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterColonInBaseTypeDeclaration, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement MethodDeclarationClosingParenthesesOnNewLine {
+		public bool SpaceAfterComma {
 			get {
-				return options.MethodDeclarationClosingParenthesesOnNewLine;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterComma);
 			}
 			set {
-				options.MethodDeclarationClosingParenthesesOnNewLine = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterComma, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool AlignToFirstMethodDeclarationParameter {
+		public bool SpaceAfterDot {
 			get {
-				return options.AlignToFirstMethodDeclarationParameter;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterDot);
 			}
 			set {
-				options.AlignToFirstMethodDeclarationParameter = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterDot, value);
 			}
 		}
-	
+
 		[ItemProperty]
-		public Wrapping IndexerDeclarationParameterWrapping {
+		public bool SpaceAfterSemicolonsInForStatement {
 			get {
-				return options.IndexerDeclarationParameterWrapping;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterSemicolonsInForStatement);
 			}
 			set {
-				options.IndexerDeclarationParameterWrapping = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterSemicolonsInForStatement, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement NewLineAferIndexerDeclarationOpenBracket {
+		public bool SpaceBeforeColonInBaseTypeDeclaration {
 			get {
-				return options.NewLineAferIndexerDeclarationOpenBracket;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeColonInBaseTypeDeclaration);
 			}
 			set {
-				options.NewLineAferIndexerDeclarationOpenBracket = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeColonInBaseTypeDeclaration, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement IndexerDeclarationClosingBracketOnNewLine {
+		public bool SpaceBeforeComma {
 			get {
-				return options.IndexerDeclarationClosingBracketOnNewLine;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeComma);
 			}
 			set {
-				options.IndexerDeclarationClosingBracketOnNewLine = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeComma, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool AlignToFirstIndexerDeclarationParameter {
+		public bool SpaceBeforeDot {
 			get {
-				return options.AlignToFirstIndexerDeclarationParameter;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeDot);
 			}
 			set {
-				options.AlignToFirstIndexerDeclarationParameter = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeDot, value);
 			}
 		}
 
 		[ItemProperty]
-		public Wrapping IndexerArgumentWrapping {
+		public bool SpaceBeforeSemicolonsInForStatement {
 			get {
-				return options.IndexerArgumentWrapping;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeSemicolonsInForStatement);
 			}
 			set {
-				options.IndexerArgumentWrapping = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeSemicolonsInForStatement, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement NewLineAferIndexerOpenBracket {
+		public Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions SpacingAroundBinaryOperator {
 			get {
-				return options.NewLineAferIndexerOpenBracket;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAroundBinaryOperator);
 			}
 			set {
-				options.NewLineAferIndexerOpenBracket = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAroundBinaryOperator, value);
 			}
 		}
+		#endregion
+
+		#region Wrapping options
 
 		[ItemProperty]
-		public NewLinePlacement IndexerClosingBracketOnNewLine {
+		public bool WrappingPreserveSingleLine {
 			get {
-				return options.IndexerClosingBracketOnNewLine;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.WrappingPreserveSingleLine);
 			}
 			set {
-				options.IndexerClosingBracketOnNewLine = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.WrappingPreserveSingleLine, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool AlignToFirstIndexerArgument {
+		public bool WrappingKeepStatementsOnSingleLine {
 			get {
-				return options.AlignToFirstIndexerArgument;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.WrappingKeepStatementsOnSingleLine);
 			}
 			set {
-				options.AlignToFirstIndexerArgument = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.WrappingKeepStatementsOnSingleLine, value);
 			}
 		}
 
@@ -1656,7 +566,7 @@ namespace MonoDevelop.CSharp.Formatting
 
 		public CSharpFormattingPolicy ()
 		{
-			this.options = FormattingOptionsFactory.CreateMono ();
+			this.options = TypeSystemService.Workspace.Options;
 		}
 		
 		public static CSharpFormattingPolicy Load (FilePath selectedFile)
@@ -1707,10 +617,14 @@ namespace MonoDevelop.CSharp.Formatting
 				writer.WriteAttributeString ("name", Name);
 				foreach (PropertyInfo info in typeof (CSharpFormattingPolicy).GetProperties ()) {
 					if (info.GetCustomAttributes (false).Any (o => o.GetType () == typeof(ItemPropertyAttribute))) {
-						writer.WriteStartElement ("Property");
+						writer.WriteStartElement (info.Name);
+						writer.WriteValue (info.GetValue (this, null).ToString ());
+						writer.WriteEndElement ();
+
+						/*						writer.WriteStartElement ("Property");
 						writer.WriteAttributeString ("name", info.Name);
 						writer.WriteAttributeString ("value", info.GetValue (this, null).ToString ());
-						writer.WriteEndElement ();
+						writer.WriteEndElement ();*/
 					}
 				}
 				writer.WriteEndElement ();
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanel.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanel.cs
index e4475c07f3..c11aad0a58 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanel.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanel.cs
@@ -27,6 +27,7 @@
 using Gtk;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharp.Formatting
 {
@@ -37,7 +38,7 @@ namespace MonoDevelop.CSharp.Formatting
 		static CSharpFormattingPolicyPanel ()
 		{
 			// ensure that custom text editor shemes are loaded.
-			MonoDevelop.SourceEditor.SourceEditorDisplayBinding.InitSourceEditor ();
+			TextEditorDisplayBinding.InitSourceEditor ();
 		}
 		
 		public override Widget CreatePanelWidget ()
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs
index 614ba73928..3a892fa547 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs
@@ -26,6 +26,7 @@
 using System;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor;
 
 
 namespace MonoDevelop.CSharp.Formatting
@@ -33,7 +34,8 @@ namespace MonoDevelop.CSharp.Formatting
 	[System.ComponentModel.ToolboxItem(true)]
 	partial class CSharpFormattingPolicyPanelWidget : Gtk.Bin
 	{
-		readonly Mono.TextEditor.TextEditor texteditor = new Mono.TextEditor.TextEditor ();
+		readonly TextEditor texteditor = TextEditorFactory.CreateNewEditor ();
+
 //		Gtk.ListStore model = new Gtk.ListStore (typeof(string));
 //		List<CSharpFormattingPolicy> policies = new List<CSharpFormattingPolicy> ();
 		const string example = @"using System;
@@ -50,14 +52,14 @@ namespace Example {
 }";
 		TextStylePolicy textStylePolicy;
 		CSharpFormattingPolicy policy;
-		public CSharpFormattingPolicy Policy {
+		internal CSharpFormattingPolicy Policy {
 			get {
 				return policy;
 			}
 		}
 
 
-		public void SetPolicy (CSharpFormattingPolicy formattingPolicy, TextStylePolicy textStylePolicy)
+		internal void SetPolicy (CSharpFormattingPolicy formattingPolicy, TextStylePolicy textStylePolicy)
 		{
 			policy = formattingPolicy;
 			this.textStylePolicy = textStylePolicy;
@@ -77,26 +79,18 @@ namespace Example {
 			policy = new CSharpFormattingPolicy ();
 			buttonEdit.Clicked += HandleButtonEditClicked;
 			
-			var options = MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance;
-			texteditor.Options.FontName = options.FontName;
-			texteditor.Options.ColorScheme = options.ColorScheme;
-			texteditor.Options.ShowFoldMargin = false;
-			texteditor.Options.ShowIconMargin = false;
-			texteditor.Options.ShowLineNumberMargin = false;
-			texteditor.Document.ReadOnly = true;
-			texteditor.Document.MimeType = CSharpFormatter.MimeType;
+			texteditor.Options = DefaultSourceEditorOptions.PlainEditor;
+			texteditor.IsReadOnly = true;
+			texteditor.MimeType = CSharpFormatter.MimeType;
 			scrolledwindow1.Child = texteditor;
 			ShowAll ();
 		}
 
 		public void FormatSample ()
 		{
-			if (textStylePolicy != null) {
-				texteditor.Options.IndentationSize = textStylePolicy.IndentWidth;
-				texteditor.Options.TabSize = textStylePolicy.TabWidth;
-				texteditor.Options.TabsToSpaces = textStylePolicy.TabsToSpaces;
-			}
-			texteditor.Document.Text = CSharpFormatter.FormatText (policy, textStylePolicy, CSharpFormatter.MimeType, example, 0, example.Length);
+			texteditor.Options = DefaultSourceEditorOptions.Instance.WithTextStyle (textStylePolicy);
+
+			texteditor.Text = CSharpFormatter.FormatText (policy, textStylePolicy, CSharpFormatter.MimeType, example, 0, example.Length);
 		}
 
 		void HandleButtonEditClicked (object sender, EventArgs e)
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
index 346dad4f94..7f08f7dae2 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
@@ -30,391 +30,51 @@ using MonoDevelop.Ide;
 using System.Reflection;
 using System.Collections.Generic;
 using System.Linq;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Gui.Content;
 
 
 namespace MonoDevelop.CSharp.Formatting
 {
 	partial class CSharpFormattingProfileDialog : Dialog
 	{
-		readonly Mono.TextEditor.TextEditor texteditor = new Mono.TextEditor.TextEditor ();
+		readonly TextEditor texteditor = TextEditorFactory.CreateNewEditor ();
 		readonly CSharpFormattingPolicy profile;
-		TreeStore indentOptions, bacePositionOptions, newLineOptions, whiteSpaceOptions, wrappingOptions;
-		
-		static readonly Dictionary<Wrapping, string> arrayInitializerTranslationDictionary = new Dictionary<Wrapping, string> ();
-		static readonly Dictionary<BraceStyle, string> braceStyleTranslationDictionary = new Dictionary<BraceStyle, string> ();
-		//static Dictionary<BraceForcement, string> braceForcementTranslationDictionary = new Dictionary<BraceForcement, string> ();
-		static readonly Dictionary<PropertyFormatting, string> propertyFormattingTranslationDictionary = new Dictionary<PropertyFormatting, string> ();
-		static readonly Dictionary<NewLinePlacement, string>  newLinePlacementTranslationDictionary = new Dictionary<NewLinePlacement, string> ();
-		
+		TreeStore indentationOptions, newLineOptions, spacingOptions, styleOptions, wrappingOptions;
+		static readonly Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions, string> labelPositionOptionsTranslationDictionary = new Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions, string> ();
+		static readonly Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions, string> binaryOperatorSpacingOptionsDictionary = new Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions, string> ();
+
+
 		static CSharpFormattingProfileDialog ()
 		{
-			braceStyleTranslationDictionary [BraceStyle.DoNotChange] = GettextCatalog.GetString ("Do not change");
-			braceStyleTranslationDictionary [BraceStyle.EndOfLine] = GettextCatalog.GetString ("End of line");
-			braceStyleTranslationDictionary [BraceStyle.EndOfLineWithoutSpace] = GettextCatalog.GetString ("End of line without space");
-			braceStyleTranslationDictionary [BraceStyle.NextLine] = GettextCatalog.GetString ("Next line");
-			braceStyleTranslationDictionary [BraceStyle.NextLineShifted] = GettextCatalog.GetString ("Next line shifted");
-			braceStyleTranslationDictionary [BraceStyle.NextLineShifted2] = GettextCatalog.GetString ("Next line shifted2");
-			braceStyleTranslationDictionary [BraceStyle.BannerStyle] = GettextCatalog.GetString ("Banner style");
-			
-			propertyFormattingTranslationDictionary [PropertyFormatting.AllowOneLine] = GettextCatalog.GetString ("Allow one line");
-			propertyFormattingTranslationDictionary [PropertyFormatting.ForceOneLine] = GettextCatalog.GetString ("Force one line");
-			propertyFormattingTranslationDictionary [PropertyFormatting.ForceNewLine] = GettextCatalog.GetString ("Force new line");
-			
-			arrayInitializerTranslationDictionary [Wrapping.DoNotChange] = GettextCatalog.GetString ("Do not change");
-			arrayInitializerTranslationDictionary [Wrapping.DoNotWrap] = GettextCatalog.GetString ("Do not Wrap");
-			arrayInitializerTranslationDictionary [Wrapping.WrapAlways] = GettextCatalog.GetString ("Wrap always");
-			arrayInitializerTranslationDictionary [Wrapping.WrapIfTooLong] = GettextCatalog.GetString ("Wrap if too long");
+			labelPositionOptionsTranslationDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.LeftMost] = GettextCatalog.GetString ("leftmost column");
+			labelPositionOptionsTranslationDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.NoIndent] = GettextCatalog.GetString ("normal placement");
+			labelPositionOptionsTranslationDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.OneLess] = GettextCatalog.GetString ("one indent less");
 
-			newLinePlacementTranslationDictionary [NewLinePlacement.DoNotCare] = GettextCatalog.GetString ("Allow both");
-			newLinePlacementTranslationDictionary [NewLinePlacement.NewLine] = GettextCatalog.GetString ("Always new line");
-			newLinePlacementTranslationDictionary [NewLinePlacement.SameLine] = GettextCatalog.GetString ("Always same line");
+			binaryOperatorSpacingOptionsDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Ignore] = GettextCatalog.GetString ("ignore");
+			binaryOperatorSpacingOptionsDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Remove] = GettextCatalog.GetString ("remove");
+			binaryOperatorSpacingOptionsDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Single] = GettextCatalog.GetString ("single");
 		}
 		
 		public static string TranslateValue (object value)
 		{
-			if (value is BraceStyle)
-				return braceStyleTranslationDictionary [(BraceStyle)value];
-//			if (value is BraceForcement) 
-//				return braceForcementTranslationDictionary [(BraceForcement)value];
-			if (value is PropertyFormatting)
-				return propertyFormattingTranslationDictionary [(PropertyFormatting)value];
-			if (value is Wrapping)
-				return arrayInitializerTranslationDictionary [(Wrapping)value];
-			if (value is NewLinePlacement)
-				return newLinePlacementTranslationDictionary [(NewLinePlacement)value];
+			if (value is Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions)
+				return labelPositionOptionsTranslationDictionary [(Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions)value];
+			if (value is Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions)
+				return binaryOperatorSpacingOptionsDictionary [(Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions)value];
 			throw new Exception ("unknown property type: " + value);
 		}
-		
+
 		public static object ConvertProperty (Type propertyType, string newText)
 		{
-			if (propertyType == typeof(BraceStyle))
-				return braceStyleTranslationDictionary.First (p => p.Value == newText).Key;
-//			if (propertyType == typeof(BraceForcement)) 
-//				return braceForcementTranslationDictionary.First (p => p.Value == newText).Key;
-			if (propertyType == typeof(PropertyFormatting)) 
-				return propertyFormattingTranslationDictionary.First (p => p.Value == newText).Key;
-			if (propertyType == typeof(Wrapping))
-				return arrayInitializerTranslationDictionary.First (p => p.Value == newText).Key;
-			if (propertyType == typeof(NewLinePlacement))
-				return newLinePlacementTranslationDictionary.First (p => p.Value == newText).Key;
+			if (propertyType == typeof(Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions))
+				return labelPositionOptionsTranslationDictionary.First (p => p.Value == newText).Key;
+			if (propertyType == typeof(Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions))
+				return binaryOperatorSpacingOptionsDictionary.First (p => p.Value == newText).Key;
 			throw new Exception ("unknown property type: " + propertyType);
 		}
-		
-		#region Examples
-		const string methodSpaceExample = @"class ClassDeclaration { 
-		public static void Main (string[] args)
-		{
-			Console.WriteLine (""Hello World!"");
-		}
-	}";
-		
-		const string propertyExample = @"class ClassDeclaration { 
-		int myProperty;
-		int MyProperty { 
-			get { return myProperty;} 
-			set { myProperty = value;} 
-		}
-
-		string Simple { get { ; } set { ; } }
-
-		int myOtherProperty;
-		int MyOtherProperty { 
-			get { 
-				Console.WriteLine (""get myOtherProperty"");
-				return myOtherProperty;
-			} 
-			set { 
-				if (myOtherProperty != value)
-					myOtherProperty = value;
-			} 
-		}
-		
-		int MyAutoProperty { 
-			get;
-			set;
-		}
-
-		int MyOtherAutoProperty { get; set; }
-	}";
-		
-		const string spaceExample = @"class ClassDeclaration { 
-		public void TestMethod ()
-		{
-			try {
-				TestMethod ("""");
-			} catch (Exception e) {
-				// Do something
-			} finally {
-				// Do something
-			}
-		}
-		
-		public void TestMethod (string test)
-		{
-			lock (this) {
-				switch (test) {
-					case ""A"":
-						Console.WriteLine (""was A"");
-						break;
-					case ""B"":
-						Console.WriteLine (""was B"");
-						break;
-				}
-			}
-		}
-		
-		public void Calculate (int a, int b)
-		{
-			if (a < b) {
-				for (int i = a; i < b; i++) {
-					Console.WriteLine (i);
-				}
-			} else {
-				using (object o = new object ()) {
-					while (b < a) {
-						ConentryNamesole.WriteLine (b++);
-					}
-				}
-			}
-		}
-	}";
-		const string eventExample = @"class ClassDeclaration { 
-		EventHandler<EventArgs> onAction;
-		public event EventHandler<EventArgs> Action {
-			add { onAction = (EventHandler<EventArgs>)Delegate.Combine(onAction, value); }
-			remove { onAction = (EventHandler<EventArgs>)Delegate.Remove(onAction, value);}
-		}
-		EventHandler<EventArgs> onAnotherAction;
-		public event EventHandler<EventArgs> AnotherAction {
-			add { if (value != null) 
-					onAnotherAction = (EventHandler<EventArgs>)Delegate.Combine(onAnotherAction, value); }
-			remove { if (value != null) 
-					onAnotherAction = (EventHandler<EventArgs>)Delegate.Remove(onAnotherAction, value);}
-		}
-	}";
-		
-		const string simpleUsingStatement = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			using (object o = new object ()) {
-				Console.WriteLine (""Hello World!"");
-			}
-		}
-	}";
-		
-		const string simpleFixedStatement = @"class ClassDeclaration { 
-		public void Test (Point pt)
-		{
-			fixed (int* p = &pt.x) {
-				*p = 10; 
-			}
-		}
-	}";
-		
-		const string simpleIf = @"class ClassDeclaration { 
-		public void Test (int i)
-		{
-			if (i == 5) {
-				Console.WriteLine (""== 5"");
-			} else if (i > 0) {
-				Console.WriteLine ("">0"");
-			} else if (i < 0) {
-				Console.WriteLine (""<0"");
-			} else {
-				Console.WriteLine (""== 0"");
-			}
-		}
-	}";
-		const string longMethodCall = @"class ClassDeclaration { 
-		public void Test (int test)
-		{
-			LongMethodCallInSameLine (""Hello"", 1, test);
-			LongMethodCallInMultiple (
-""Hello"", 
-		1, 
-		test);
 
-		LongMethodCallInMultipleCase2 (""Hello"", 
-		                               1, 
-		                               test);
-	}
-}";
-		const string longMethodDeclaration = @"class ClassDeclaration { 
-	public void LongMethodCallInSameLine (int test, string foo, double bar)
-	{
-	}
-	public void LongMethodCallInMultiple (
-int test,
-string foo,
-double bar)
-	{
-	}
-	public void LongMethodCallInMultipleCase2 (int test,
-string foo,
-double bar)
-	{
-	}
-}";
-		const string longIndexerDeclaration = @"class ClassDeclaration { 
-	public int this [int test, string foo, double bar]
-	{
-		get {}
-	}
-	public int this [
-int test,
-string foo,
-double bar]
-	{
-		get {}
-	}
-	public int this [int test,
-string foo,
-double bar]
-	{
-		get {}
-	}
-}";
-		const string longIndexer = @"class ClassDeclaration { 
-		public void Test (int test)
-		{
-			this [""Hello"", 1, test] = 0;
-			this [
-""Hello"", 
-		1, 
-		test] = 0;
-
-		this [""Hello"", 
-		                               1, 
-		                               test] = 0;
-	}
-}";
-		const string simpleWhile = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			while (true) {
-				Console.WriteLine (""Hello World!"");
-			}
-		}
-	}";
-		const string simpleCatch = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			try {
-				Console.WriteLine (""Hello World!"");
-			} catch (Exception) {
-				Console.WriteLine (""Got exception!!"");
-			} finally {
-				Console.WriteLine (""finally done."");
-			}
-		}
-	}";
-		
-		const string simpleDoWhile = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			int i = 0;
-			do {
-				Console.WriteLine (""Hello World!"");
-			} while (i++ < 10);
-		}
-	}";
-		
-		const string simpleArrayInitializer = @"class ClassDeclaration { 
-		public void Test (object o)
-		{
-			int[] i = new int[] { 1, 3, 3, 7 };
-		}
-	}";
-		const string condOpExample = @"class ClassDeclaration { 
-		public string GetSign (int i)
-		{
-			return i < 0 ? ""-"" : ""+"";
-		}
-	}";
-		const string switchExample = @"class ClassDeclaration { 
-		public void Test (int i)
-		{
-			switch (i) {
-				case 0:
-					Console.WriteLine (""was zero"");
-					break;
-				case 1:
-					Console.WriteLine (""was one"");
-					break;
-				default:
-					Console.WriteLine (""was "" + i);
-					break;
-			}
-		}
-	}";
-		const string simpleFor = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			for (int i = 0; i < 10; i++) {
-				Console.WriteLine (""Hello World!"");
-			}
-		}
-	}";
-		const string simpleForeach = @"class ClassDeclaration : ArrayList { 
-		public void Test ()
-		{
-			foreach (object o in this) {
-				Console.WriteLine (""Hello World!"");
-			}
-		}
-	}";
-		const string simpleLock = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			lock (this) {
-				Console.WriteLine (""Hello World!"");
-			}
-		}
-	}";
-		const string operatorExample = @"class ClassDeclaration { 
-		public void TestMethod ()
-		{
-			int a = 5 << 5;
-			int b = (a + 5 - 3) * 6 / 2;
-			a += b;
-			a = a & ~255;
-			if (a == b || b < a >> 1) {
-				b -= a;
-			}
-		}
-		object Test (object a, object b)
-		{
-			return a ?? b;
-		}
-	}";
-		const string blankLineExample = @"// Example
-using System;
-using System.Collections;
-namespace TestSpace {
-	using MyNamespace;
-	class Test
-	{
-		int a;
-		string b;
-		public Test (int a, string b)
-		{
-			this.a = a;
-			this.b = b;
-		}
-		void Print ()
-		{
-			Console.WriteLine (""a: {0} b : {1}"", a, b);
-		}
-	}
-	class MyTest 
-	{
-	}
-}
-";
-		#endregion
-		
 		const int propertyColumn   = 0;
 		const int displayTextColumn = 1;
 		const int exampleTextColumn = 2;
@@ -437,15 +97,13 @@ namespace TestSpace {
 					treeView = treeviewIndentOptions;
 					break;
 				case 1:
-					treeView = treeviewBracePositions;
+					treeView = treeviewNewLines;
 					break;
 				case 2: // Blank lines
-					UpdateExample (blankLineExample);
-					return;
-				case 3: // white spaces
-					return;
-				case 4:
-					treeView = treeviewNewLines;
+					treeView = treeviewSpacing;
+					break;
+				case 3:
+					treeView = treeviewWrapping;
 					break;
 				default:
 					return;
@@ -458,30 +116,25 @@ namespace TestSpace {
 			};
 			notebookCategories.ShowTabs = false;
 			comboboxCategories.AppendText (GettextCatalog.GetString ("Indentation"));
-			comboboxCategories.AppendText (GettextCatalog.GetString ("Braces"));
-			comboboxCategories.AppendText (GettextCatalog.GetString ("Blank lines"));
-			comboboxCategories.AppendText (GettextCatalog.GetString ("Wrapping"));
-			comboboxCategories.AppendText (GettextCatalog.GetString ("White Space"));
 			comboboxCategories.AppendText (GettextCatalog.GetString ("New Lines"));
+			comboboxCategories.AppendText (GettextCatalog.GetString ("Spacing"));
+//			comboboxCategories.AppendText (GettextCatalog.GetString ("Style"));
+			comboboxCategories.AppendText (GettextCatalog.GetString ("Wrapping"));
 			comboboxCategories.Changed += delegate {
 				texteditor.Text = "";
 				notebookCategories.Page = comboboxCategories.Active;
 			};
 			comboboxCategories.Active = 0;
 			
-			var options = MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance;
-			texteditor.Options.FontName = options.FontName;
-			texteditor.Options.ColorScheme = options.ColorScheme;
-			texteditor.Options.ShowFoldMargin = false;
-			texteditor.Options.ShowIconMargin = false;
-			texteditor.Options.ShowLineNumberMargin = false;
-			texteditor.Document.ReadOnly = true;
-			texteditor.Document.MimeType = CSharpFormatter.MimeType;
+			var options = DefaultSourceEditorOptions.Instance;
+			texteditor.Options = DefaultSourceEditorOptions.PlainEditor;
+			texteditor.IsReadOnly = true;
+			texteditor.MimeType = CSharpFormatter.MimeType;
 			scrolledwindow.Child = texteditor;
 			ShowAll ();
 			
 			#region Indent options
-			indentOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+			indentationOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
 			
 			var column = new TreeViewColumn ();
 			// pixbuf column
@@ -495,7 +148,7 @@ namespace TestSpace {
 			column.PackStart (cellRendererText, true);
 			column.SetAttributes (cellRendererText, "text", 1);
 			 
-			treeviewIndentOptions.Model = indentOptions;
+			treeviewIndentOptions.Model = indentationOptions;
 			treeviewIndentOptions.HeadersVisible = false;
 			treeviewIndentOptions.Selection.Changed += TreeSelectionChanged;
 			treeviewIndentOptions.AppendColumn (column);
@@ -509,7 +162,7 @@ namespace TestSpace {
 			cellRendererCombo.HasEntry = false;
 			cellRendererCombo.Editable = !profile.IsBuiltIn;
 
-			cellRendererCombo.Edited += new ComboboxEditedHandler (this, indentOptions).ComboboxEdited;
+			cellRendererCombo.Edited += new ComboboxEditedHandler (this, indentationOptions).ComboboxEdited;
 			
 			column.PackStart (cellRendererCombo, false);
 			column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -518,58 +171,23 @@ namespace TestSpace {
 			var cellRendererToggle = new CellRendererToggle ();
 			cellRendererToggle.Ypad = 1;
 			cellRendererToggle.Activatable = !profile.IsBuiltIn;
-			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewIndentOptions, indentOptions).Toggled;
+			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewIndentOptions, indentationOptions).Toggled;
 			column.PackStart (cellRendererToggle, false);
 			column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
 			column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
-			
 			treeviewIndentOptions.AppendColumn (column);
-			var category = AddOption (indentOptions, null, GettextCatalog.GetString ("Declarations"), null);
-			AddOption (indentOptions, category, "IndentNamespaceBody", GettextCatalog.GetString ("within namespaces"), "namespace Test { class AClass {} }");
-			
-			AddOption (indentOptions, category, "IndentClassBody", GettextCatalog.GetString ("within classes"), "class AClass { int aField; void AMethod () {}}");
-			AddOption (indentOptions, category, "IndentInterfaceBody", GettextCatalog.GetString ("within interfaces"), "interface IAInterfaces { int AProperty {get;set;} void AMethod ();}");
-			AddOption (indentOptions, category, "IndentStructBody", GettextCatalog.GetString ("within structs"), "struct AStruct { int aField; void AMethod () {}}");
-			AddOption (indentOptions, category, "IndentEnumBody", GettextCatalog.GetString ("within enums"), "enum AEnum { A, B, C }");
-			
-			AddOption (indentOptions, category, "IndentMethodBody", GettextCatalog.GetString ("within methods"), methodSpaceExample);
-			AddOption (indentOptions, category, "IndentPropertyBody", GettextCatalog.GetString ("within properties"), propertyExample);
-			AddOption (indentOptions, category, "IndentEventBody", GettextCatalog.GetString ("within events"), eventExample);
-			
-			category = AddOption (indentOptions, null, GettextCatalog.GetString ("Statements"), null);
-			AddOption (indentOptions, category, "IndentBlocks", GettextCatalog.GetString ("within blocks"), spaceExample);
-			AddOption (indentOptions, category, "IndentSwitchBody", GettextCatalog.GetString ("Indent 'switch' body"), spaceExample);
-			AddOption (indentOptions, category, "IndentCaseBody", GettextCatalog.GetString ("Indent 'case' body"), spaceExample);
-			AddOption (indentOptions, category, "IndentBreakStatements", GettextCatalog.GetString ("Indent 'break' statements"), spaceExample);
-			AddOption (indentOptions, category, "IndentPreprocessorDirectives", GettextCatalog.GetString ("Indent pre processor directives"), 
-				@"#define DEBUG
-class Test {
-	#if DEBUG
-	void Example ()
-	{
-	}
-	#endif
-}
-");
 
-			AddOption (indentOptions, category, "IndentBlocksInsideExpressions", GettextCatalog.GetString ("Indent blocks inside expressions"), 
-				@"
-class Test
-{
-	void Example ()
-	{
-		Test(delegate {
-			Call ();
-		});
-	}
-}
-");
-			AddOption (indentOptions, category, "AlignEmbeddedStatements", GettextCatalog.GetString ("Align embedded statements"), "class AClass { void AMethod () { if (a) if (b) { int c; } } } ");
+
+			AddOption (indentationOptions, "IndentBlock", GettextCatalog.GetString ("Indent block contents"), "namespace Test { class AClass { void Method () { int x; int y; } } }");
+			AddOption (indentationOptions, "IndentBraces", GettextCatalog.GetString ("Indent open and close braces"), "class AClass { int aField; void AMethod () {}}");
+			AddOption (indentationOptions, "IndentSwitchSection", GettextCatalog.GetString ("Indent case contents"), "class AClass { void Method (int x) { switch (x) { case 1: break; } } }");
+			AddOption (indentationOptions, "IndentSwitchCaseSection", GettextCatalog.GetString ("Indent case labels"), "class AClass { void Method (int x) { switch (x) { case 1: break; } } }");
+			AddOption (indentationOptions, "LabelPositioning", GettextCatalog.GetString ("Label indentation"), "enum AEnum { A, B, C }");
 			treeviewIndentOptions.ExpandAll ();
 			#endregion
 			
-			#region Brace options
-			bacePositionOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+			#region New line options
+			newLineOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
 			
 			column = new TreeViewColumn ();
 			// pixbuf column
@@ -582,10 +200,10 @@ class Test
 			column.PackStart (cellRendererText, true);
 			column.SetAttributes (cellRendererText, "text", 1);
 			
-			treeviewBracePositions.Model = bacePositionOptions;
-			treeviewBracePositions.HeadersVisible = false;
-			treeviewBracePositions.Selection.Changed += TreeSelectionChanged;
-			treeviewBracePositions.AppendColumn (column);
+			treeviewNewLines.Model = newLineOptions;
+			treeviewNewLines.HeadersVisible = false;
+			treeviewNewLines.Selection.Changed += TreeSelectionChanged;
+			treeviewNewLines.AppendColumn (column);
 			
 			column = new TreeViewColumn ();
 			cellRendererCombo = new CellRendererCombo ();
@@ -595,7 +213,7 @@ class Test
 			cellRendererCombo.Model = ComboBoxStore;
 			cellRendererCombo.HasEntry = false;
 			cellRendererCombo.Editable = !profile.IsBuiltIn;
-			cellRendererCombo.Edited += new ComboboxEditedHandler (this, bacePositionOptions).ComboboxEdited;
+			cellRendererCombo.Edited += new ComboboxEditedHandler (this, newLineOptions).ComboboxEdited;
 
 			column.PackStart (cellRendererCombo, false);
 			column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -604,49 +222,103 @@ class Test
 			cellRendererToggle = new CellRendererToggle ();
 			cellRendererToggle.Activatable = !profile.IsBuiltIn;
 			cellRendererToggle.Ypad = 1;
-			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewBracePositions, bacePositionOptions).Toggled;
+			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewNewLines, newLineOptions).Toggled;
 			column.PackStart (cellRendererToggle, false);
 			column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
 			column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
 			
-			treeviewBracePositions.AppendColumn (column);
-			
-			AddOption (bacePositionOptions, "NamespaceBraceStyle", GettextCatalog.GetString ("Namespace declaration"), "namespace TestNameSpace {}");
-			
-			AddOption (bacePositionOptions, "ClassBraceStyle", GettextCatalog.GetString ("Class declaration"), "class ClassDeclaration {}");
-			AddOption (bacePositionOptions, "InterfaceBraceStyle", GettextCatalog.GetString ("Interface declaration"), "interface InterfaceDeclaraction {}");
-			AddOption (bacePositionOptions, "StructBraceStyle", GettextCatalog.GetString ("Struct declaration"), "struct StructDeclaration {}");
-			AddOption (bacePositionOptions, "EnumBraceStyle", GettextCatalog.GetString ("Enum declaration"), "enum EnumDeclaration { A, B, C}");
-			
-			AddOption (bacePositionOptions, "MethodBraceStyle", GettextCatalog.GetString ("Method declaration"), "class ClassDeclaration { void MyMethod () {} }");
-			AddOption (bacePositionOptions, "AnonymousMethodBraceStyle", GettextCatalog.GetString ("Anonymous methods"), "class ClassDeclaration { void MyMethod () { MyEvent += delegate (object sender, EventArgs e) { if (true) Console.WriteLine (\"Hello World\"); }; } }");
-			AddOption (bacePositionOptions, "ConstructorBraceStyle", GettextCatalog.GetString ("Constructor declaration"), "class ClassDeclaration { public ClassDeclaration () {} }");
-			AddOption (bacePositionOptions, "DestructorBraceStyle", GettextCatalog.GetString ("Destructor declaration"), "class ClassDeclaration { ~ClassDeclaration () {} }");
-			
-			AddOption (bacePositionOptions, "StatementBraceStyle", GettextCatalog.GetString ("Statements"), spaceExample);
-			
-			category = AddOption (bacePositionOptions, "PropertyBraceStyle", GettextCatalog.GetString ("Property declaration"), propertyExample);
-			AddOption (bacePositionOptions, category, "AutoPropertyFormatting", GettextCatalog.GetString ("Allow automatic property in one line"), propertyExample);
-			AddOption (bacePositionOptions, category, "SimplePropertyFormatting", GettextCatalog.GetString ("Allow simple property in one line"), propertyExample);
+			treeviewNewLines.AppendColumn (column);
 
+			var category = AddOption (newLineOptions, null, GettextCatalog.GetString ("New line options for braces"), null);
+			AddOption (newLineOptions, category, "NewLinesForBracesInTypes", GettextCatalog.GetString ("Place open brace on new line for types"), @"class Example
+{
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInMethods", GettextCatalog.GetString ("Place open brace on new line for methods"), @"void Example()
+{
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInAnonymousMethods", GettextCatalog.GetString ("Place open brace on new line for anonymous methods"), @"void Example()
+{
+	var del = new delegate (int i, int j) {
+	};
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInControlBlocks", GettextCatalog.GetString ("Place open brace on new line for control blocks"), @"void Example()
+{
+	if (true)
+	{
+	}
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInAnonymousTypes", GettextCatalog.GetString ("Place open brace on new line for anonymous types"), @"void Example()
+{
+	var c = new
+	{
+		A = 1,
+		B = 2
+	};
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInObjectInitializers", GettextCatalog.GetString ("Place open brace on new line for object initializers"), @"void Example()
+{
+	new MyObject
+	{
+		A = 1,
+		B = 2 
+	};
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInLambdaExpressionBody", GettextCatalog.GetString ("Place open brace on new line for lambda expression"), @"void Example()
+{
+	Action act = () =>
+	{
+	};
+}");
 
-			AddOption (bacePositionOptions, category, "PropertyGetBraceStyle", GettextCatalog.GetString ("Get declaration"), propertyExample);
-			AddOption (bacePositionOptions, category, "SimpleGetBlockFormatting", GettextCatalog.GetString ("Allow one line get"), propertyExample);
-			AddOption (bacePositionOptions, category, "PropertySetBraceStyle", GettextCatalog.GetString ("Set declaration"), propertyExample);
-			AddOption (bacePositionOptions, category, "SimpleSetBlockFormatting", GettextCatalog.GetString ("Allow one line set"), propertyExample);
-			
-			
-			category = AddOption (bacePositionOptions, "EventBraceStyle", GettextCatalog.GetString ("Event declaration"), eventExample);
-			AddOption (bacePositionOptions, category, "EventAddBraceStyle", GettextCatalog.GetString ("Add declaration"), eventExample);
-			AddOption (bacePositionOptions, category, "AllowEventAddBlockInline", GettextCatalog.GetString ("Allow one line add"), eventExample);
-			AddOption (bacePositionOptions, category, "EventRemoveBraceStyle", GettextCatalog.GetString ("Remove declaration"), eventExample);
-			AddOption (bacePositionOptions, category, "AllowEventRemoveBlockInline", GettextCatalog.GetString ("Allow one line remove"), eventExample);
-			
-			treeviewBracePositions.ExpandAll ();
+			category = AddOption (newLineOptions, null, GettextCatalog.GetString ("New line options for keywords"), null);
+			AddOption (newLineOptions, category, "NewLineForElse", GettextCatalog.GetString ("Place \"else\" on new line"), @"void Example()
+{
+	if (true) {
+		// ...
+	} else {
+		// ...
+	}
+}");
+			AddOption (newLineOptions, category, "NewLineForCatch", GettextCatalog.GetString ("Place \"catch\" on new line"), @"void Example()
+{
+	try {
+	} catch {
+	} finally {
+	}
+}");
+			AddOption (newLineOptions, category, "NewLineForFinally", GettextCatalog.GetString ("Place \"finally\" on new line"), @"void Example()
+{
+	try {
+	} catch {
+	} finally {
+	}
+}");
+
+			category = AddOption (newLineOptions, null, GettextCatalog.GetString ("New line options for expressions"), null);
+			AddOption (newLineOptions, category, "NewLineForMembersInObjectInit", GettextCatalog.GetString ("Place members in object initializers on new line"), @"void Example()
+{
+	new MyObject {
+		A = 1,
+		B = 2
+	};
+}");
+			AddOption (newLineOptions, category, "NewLineForMembersInAnonymousTypes", GettextCatalog.GetString ("Place members in anonymous types on new line"), @"void Example()
+{
+	var c = new
+	{
+		A = 1,
+		B = 2
+	};
+}");
+			AddOption (newLineOptions, category, "NewLineForClausesInQuery", GettextCatalog.GetString ("Place query expression clauses on new line"), @"void Example()
+{
+	from o in col select o.Foo;
+}");
+			treeviewNewLines.ExpandAll ();
 			#endregion
 			
-			#region New line options
-			newLineOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+			#region Spacing options
+			spacingOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
 
 			column = new TreeViewColumn ();
 			// pixbuf column
@@ -658,10 +330,10 @@ class Test
 			column.PackStart (cellRendererText, true);
 			column.SetAttributes (cellRendererText, "text", 1);
 
-			treeviewNewLines.Model = newLineOptions;
-			treeviewNewLines.HeadersVisible = false;
-			treeviewNewLines.Selection.Changed += TreeSelectionChanged;
-			treeviewNewLines.AppendColumn (column);
+			treeviewSpacing.Model = spacingOptions;
+			treeviewSpacing.HeadersVisible = false;
+			treeviewSpacing.Selection.Changed += TreeSelectionChanged;
+			treeviewSpacing.AppendColumn (column);
 
 			column = new TreeViewColumn ();
 			cellRendererCombo = new CellRendererCombo ();
@@ -671,7 +343,7 @@ class Test
 			cellRendererCombo.Model = ComboBoxStore;
 			cellRendererCombo.HasEntry = false;
 			cellRendererCombo.Editable = !profile.IsBuiltIn;
-			cellRendererCombo.Edited += new ComboboxEditedHandler (this, newLineOptions).ComboboxEdited;
+			cellRendererCombo.Edited += new ComboboxEditedHandler (this, spacingOptions).ComboboxEdited;
 
 			column.PackStart (cellRendererCombo, false);
 			column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -680,63 +352,137 @@ class Test
 			cellRendererToggle = new CellRendererToggle ();
 			cellRendererToggle.Activatable = !profile.IsBuiltIn;
 			cellRendererToggle.Ypad = 1;
-			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewNewLines, newLineOptions).Toggled;
+			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewSpacing, spacingOptions).Toggled;
 			column.PackStart (cellRendererToggle, false);
 			column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
 			column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
 
-			treeviewNewLines.AppendColumn (column);
+			treeviewSpacing.AppendColumn (column);
 
-			AddOption (newLineOptions, "ElseNewLinePlacement", GettextCatalog.GetString ("Place 'else' on new line"), simpleIf);
-			AddOption (newLineOptions, "ElseIfNewLinePlacement", GettextCatalog.GetString ("Place 'else if' on new line"), simpleIf);
-			AddOption (newLineOptions, "CatchNewLinePlacement", GettextCatalog.GetString ("Place 'catch' on new line"), simpleCatch);
-			AddOption (newLineOptions, "FinallyNewLinePlacement", GettextCatalog.GetString ("Place 'finally' on new line"), simpleCatch);
-			AddOption (newLineOptions, "WhileNewLinePlacement", GettextCatalog.GetString ("Place 'while' on new line"), simpleDoWhile);
-			AddOption (newLineOptions, "ArrayInitializerWrapping", GettextCatalog.GetString ("Place array initializers on new line"), simpleArrayInitializer);
-			AddOption (newLineOptions, "EmbeddedStatementPlacement", GettextCatalog.GetString ("Place embedded statements on new line"), @"class Test
+			category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for method declarations"), null);
+			AddOption (spacingOptions, category, "SpacingAfterMethodDeclarationName", GettextCatalog.GetString ("Insert space between method name and its opening parenthesis"), 
+				@"void Example()
 {
-	public void Example ()
-	{
-		if (true)
-			Call ();
-		
-		foreach (var o in col) DoSomething (o);
-	}
 }");
-			string constructorInitializer=@"class Test
+
+			AddOption (spacingOptions, category, "SpaceWithinMethodDeclarationParenthesis", GettextCatalog.GetString ("Insert space withing argument list parentheses"), 
+				@"void Example(int i, int j)
 {
+}");
+			AddOption (spacingOptions, category, "SpaceBetweenEmptyMethodDeclarationParentheses", GettextCatalog.GetString ("Insert space within empty argument list parentheses"), @"void Example()
+{
+}");
 
-	public Test () : base ()
-	{
+			category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for method calls"), null);
+			AddOption (spacingOptions, category, "SpaceAfterMethodCallName", GettextCatalog.GetString ("Insert space between method name and its opening parenthesis"), @"void Example()
+{
+	Test();
+}");
+			AddOption (spacingOptions, category, "SpaceWithinMethodCallParentheses", GettextCatalog.GetString ("Insert space withing argument list parentheses"), @"void Example()
+{
+	Test(1, 2);
+}");
+			AddOption (spacingOptions, category, "SpaceBetweenEmptyMethodCallParentheses", GettextCatalog.GetString ("Insert space within empty argument list parentheses"), @"void Example()
+{
+	Test();
+}");
 
+			category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set other spacing options"), null);
+			AddOption (spacingOptions, category, "SpaceAfterControlFlowStatementKeyword", GettextCatalog.GetString ("Insert space after keywords in control flow statements"), @"void Example()
+{
+	if (condition)
+	{
 	}
+}");
 
-	public Test ()
-		: base ()
+			AddOption (spacingOptions, category, "SpaceWithinExpressionParentheses", GettextCatalog.GetString ("Insert space within parentheses of expressions"), @"void Example()
+{
+	i = (5 + 3) * 2;
+}");
+			AddOption (spacingOptions, category, "SpaceWithinCastParentheses", GettextCatalog.GetString ("Insert space within parentheses of type casts"), @"void Example()
+{
+	test = (ITest)o;
+}");
+			AddOption (spacingOptions, category, "SpaceWithinOtherParentheses", GettextCatalog.GetString ("Insert space within parentheses of control flow statements"), @"void Example()
+{
+	if (condition)
 	{
-
 	}
+}");
 
-	public Test () :
-		base ()
-	{
+			AddOption (spacingOptions, category, "SpaceAfterCast", GettextCatalog.GetString ("Insert space after casts"), @"void Example()
+{
+	test = (ITest)o;
+}");
+			AddOption (spacingOptions, category, "SpacesIgnoreAroundVariableDeclaration", GettextCatalog.GetString ("Ignore spaces in declaration statements"), @"void Example()
+{
+	int x=5;
+}");
 
-	}
+			category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for brackets"), null);
+			AddOption (spacingOptions, category, "SpaceBeforeOpenSquareBracket", GettextCatalog.GetString ("Insert space before open square bracket"), @"void Example()
+{
+	i[5] = 3;
+}");
+			AddOption (spacingOptions, category, "SpaceBetweenEmptySquareBrackets", GettextCatalog.GetString ("Insert space within empty square brackets"), @"void Example()
+{
+	new int[] {1, 2};
+}");
+			AddOption (spacingOptions, category, "SpaceWithinSquareBrackets", GettextCatalog.GetString ("Insert space within square brackets"), @"void Example()
+{
+	i[5] = 3;
+}");
 
-	public Test ()
-		:
-		base ()
+			category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for brackets"), null);
+			AddOption (spacingOptions, category, "SpaceAfterColonInBaseTypeDeclaration", GettextCatalog.GetString ("Insert space after colon for base or interface in type declaration"), @"class Foo : Bar
+{
+}");
+			AddOption (spacingOptions, category, "SpaceAfterComma", GettextCatalog.GetString ("Insert space after comma"), @"void Example()
+{
+	for (int i =0; i < 10, i >5;i++)
 	{
-
 	}
-}";
-			AddOption (newLineOptions, "NewLineBeforeConstructorInitializerColon", GettextCatalog.GetString("Place constructor initializer ':' on new line"), constructorInitializer);
-			AddOption (newLineOptions, "NewLineAfterConstructorInitializerColon", GettextCatalog.GetString("Place constructor initializer 'base/this' on new line"), constructorInitializer);
-			treeviewNewLines.ExpandAll ();
+}");
+			AddOption (spacingOptions, category, "SpaceAfterDot", GettextCatalog.GetString ("Insert space after dot"), @"void Example()
+{
+	Foo.Bar.Test();
+}");
+			AddOption (spacingOptions, category, "SpaceAfterSemicolonsInForStatement", GettextCatalog.GetString ("Insert space after semicolon in \"for\" statement"), @"void Example()
+{
+	for (int i = 0; i< 10; i++)
+	{
+	}
+}");
+			AddOption (spacingOptions, category, "SpaceBeforeColonInBaseTypeDeclaration", GettextCatalog.GetString ("Insert space before colon for base or interface in type declaration"), @"class Foo : Bar
+{
+}");
+			AddOption (spacingOptions, category, "SpaceBeforeComma", GettextCatalog.GetString ("Insert space before comma"), @"void Example()
+{
+	for (int i =0; i < 10, i >5;i++)
+	{
+	}
+}");
+			AddOption (spacingOptions, category, "SpaceBeforeDot", GettextCatalog.GetString ("Insert space before dot"), @"void Example()
+{
+	Foo.Bar.Test();
+}");
+			AddOption (spacingOptions, category, "SpaceBeforeSemicolonsInForStatement", GettextCatalog.GetString ("Insert space before semicolon in \"for\" statement"), @"void Example()
+{
+	for (int i = 0; i< 10; i++)
+	{
+	}
+}");
+
+			AddOption (spacingOptions, category, "SpacingAroundBinaryOperator", GettextCatalog.GetString ("Set spacing for operators"), @"void Example()
+{
+	i = (5 + 3) * 2;
+}");
+
+			treeviewSpacing.ExpandAll ();
 			#endregion
-			
-			#region Wrapping options
-			wrappingOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+
+			#region Style options
+			styleOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
 
 			column = new TreeViewColumn ();
 			// pixbuf column
@@ -749,10 +495,10 @@ class Test
 			column.SetAttributes (cellRendererText, "text", 1);
 
 
-			treeviewWrappingCategory.Model = wrappingOptions;
-			treeviewWrappingCategory.HeadersVisible = false;
-			treeviewWrappingCategory.Selection.Changed += TreeSelectionChanged;
-			treeviewWrappingCategory.AppendColumn (column);
+			treeviewStyle.Model = styleOptions;
+			treeviewStyle.HeadersVisible = false;
+			treeviewStyle.Selection.Changed += TreeSelectionChanged;
+			treeviewStyle.AppendColumn (column);
 
 			column = new TreeViewColumn ();
 			cellRendererCombo = new CellRendererCombo ();
@@ -762,7 +508,7 @@ class Test
 			cellRendererCombo.Model = ComboBoxStore;
 			cellRendererCombo.HasEntry = false;
 			cellRendererCombo.Editable = !profile.IsBuiltIn;
-			cellRendererCombo.Edited += new ComboboxEditedHandler (this, wrappingOptions).ComboboxEdited;
+			cellRendererCombo.Edited += new ComboboxEditedHandler (this, styleOptions).ComboboxEdited;
 
 			column.PackStart (cellRendererCombo, false);
 			column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -771,59 +517,37 @@ class Test
 			cellRendererToggle = new CellRendererToggle ();
 			cellRendererToggle.Activatable = !profile.IsBuiltIn;
 			cellRendererToggle.Ypad = 1;
-			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewNewLines, wrappingOptions).Toggled;
+			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewSpacing, styleOptions).Toggled;
 			column.PackStart (cellRendererToggle, false);
 			column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
 			column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
 
-			treeviewWrappingCategory.AppendColumn (column);
-
-			category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Method declarations"), null);
-			AddOption (wrappingOptions, category, "MethodDeclarationParameterWrapping", GettextCatalog.GetString ("Parameters"), longMethodDeclaration);
-			AddOption (wrappingOptions, category, "NewLineAferMethodDeclarationOpenParentheses", GettextCatalog.GetString ("New line after open parentheses"), longMethodDeclaration);
-			AddOption (wrappingOptions, category, "MethodDeclarationClosingParenthesesOnNewLine", GettextCatalog.GetString ("New line before closing parentheses"), longMethodDeclaration);
-			AddOption (wrappingOptions, category, "AlignToFirstMethodDeclarationParameter", GettextCatalog.GetString ("Align to first parameter"), longMethodDeclaration);
-
-			category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Method calls"), null);
-			AddOption (wrappingOptions, category, "MethodCallArgumentWrapping", GettextCatalog.GetString ("Arguments"), longMethodCall);
-			AddOption (wrappingOptions, category, "NewLineAferMethodCallOpenParentheses", GettextCatalog.GetString ("New line after open parentheses"), longMethodCall);
-			AddOption (wrappingOptions, category, "MethodCallClosingParenthesesOnNewLine", GettextCatalog.GetString ("New line before closing parentheses"), longMethodCall);
-			AddOption (wrappingOptions, category, "AlignToFirstMethodCallArgument", GettextCatalog.GetString ("Align to first argument"), longMethodCall);
-
-			category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Indexer declarations"), null);
-			AddOption (wrappingOptions, category, "IndexerDeclarationParameterWrapping", GettextCatalog.GetString ("Parameters"), longIndexerDeclaration);
-			AddOption (wrappingOptions, category, "NewLineAferIndexerDeclarationOpenBracket", GettextCatalog.GetString ("New line after open parentheses"), longIndexerDeclaration);
-			AddOption (wrappingOptions, category, "IndexerDeclarationClosingBracketOnNewLine", GettextCatalog.GetString ("New line before closing parentheses"), longIndexerDeclaration);
-			AddOption (wrappingOptions, category, "AlignToFirstIndexerDeclarationParameter", GettextCatalog.GetString ("Align to first parameter"), longIndexerDeclaration);
+			treeviewStyle.AppendColumn (column);
 
-			category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Indexer usage"), null);
-			AddOption (wrappingOptions, category, "IndexerArgumentWrapping", GettextCatalog.GetString ("Arguments"), longIndexer);
-			AddOption (wrappingOptions, category, "NewLineAferIndexerOpenBracket", GettextCatalog.GetString ("New line after open bracket"), longIndexer);
-			AddOption (wrappingOptions, category, "IndexerClosingBracketOnNewLine", GettextCatalog.GetString ("New line before closing bracket"), longIndexer);
-			AddOption (wrappingOptions, category, "AlignToFirstIndexerArgument", GettextCatalog.GetString ("Align to first parameter"), longIndexer);
+			AddOption (styleOptions, category, null, GettextCatalog.GetString ("Qualify member access with 'this'"), null);
+			AddOption (styleOptions, category, null, GettextCatalog.GetString ("Use 'var' when generating locals"), null);
 
-			treeviewWrappingCategory.ExpandAll ();
+			treeviewStyle.ExpandAll ();
 			#endregion
 
-			#region White space options
-			whiteSpaceOptions = new TreeStore (typeof (string), typeof (string), typeof (string), typeof(bool), typeof(bool));
-			
-			
+			#region Wrapping options
+			wrappingOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+
 			column = new TreeViewColumn ();
 			// pixbuf column
 			column.PackStart (pixbufCellRenderer, false);
 			column.SetCellDataFunc (pixbufCellRenderer, RenderIcon);
-			
+
 			// text column
 			cellRendererText.Ypad = 1;
 			column.PackStart (cellRendererText, true);
 			column.SetAttributes (cellRendererText, "text", 1);
-			
-			treeviewInsertWhiteSpaceCategory.Model = whiteSpaceOptions;
-			treeviewInsertWhiteSpaceCategory.HeadersVisible = false;
-			treeviewInsertWhiteSpaceCategory.Selection.Changed += TreeSelectionChanged;
-			treeviewInsertWhiteSpaceCategory.AppendColumn (column);
-			
+
+			treeviewWrapping.Model = wrappingOptions;
+			treeviewWrapping.HeadersVisible = false;
+			treeviewWrapping.Selection.Changed += TreeSelectionChanged;
+			treeviewWrapping.AppendColumn (column);
+
 			column = new TreeViewColumn ();
 			cellRendererCombo = new CellRendererCombo ();
 			cellRendererCombo.Ypad = 1;
@@ -832,334 +556,26 @@ class Test
 			cellRendererCombo.Model = ComboBoxStore;
 			cellRendererCombo.HasEntry = false;
 			cellRendererCombo.Editable = !profile.IsBuiltIn;
-			cellRendererCombo.Edited += new ComboboxEditedHandler (this, whiteSpaceOptions).ComboboxEdited;
+			cellRendererCombo.Edited += new ComboboxEditedHandler (this, wrappingOptions).ComboboxEdited;
 
 			column.PackStart (cellRendererCombo, false);
 			column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
 			column.SetCellDataFunc (cellRendererCombo, ComboboxDataFunc);
-			
+
 			cellRendererToggle = new CellRendererToggle ();
 			cellRendererToggle.Activatable = !profile.IsBuiltIn;
 			cellRendererToggle.Ypad = 1;
-			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewInsertWhiteSpaceCategory, whiteSpaceOptions).Toggled;
+			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewSpacing, wrappingOptions).Toggled;
 			column.PackStart (cellRendererToggle, false);
 			column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
 			column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
-			
-			treeviewInsertWhiteSpaceCategory.AppendColumn (column);
-			
-			string example = @"class Example {
-		void Test ()
-		{
-		}
-		
-		void Test (int a, int b, int c)
-		{
-		}
-}";
-			category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Declarations"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeMethodDeclarationParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinMethodDeclarationParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BetweenEmptyMethodDeclarationParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeMethodDeclarationParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "AfterMethodDeclarationParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-			
-			example = @"class Example {
-		int a, b, c;
-}";
-			category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Fields"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeFieldDeclarationComma", GettextCatalog.GetString ("before comma in multiple field declarations"), example);
-			AddOption (whiteSpaceOptions, category, "AfterFieldDeclarationComma", GettextCatalog.GetString ("after comma in multiple field declarations"), example);
-			
-			example = @"class Example {
-	Example () 
-	{
-	}
-
-	Example (int a, int b, int c) 
-	{
-	}
-}";
-			category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Constructors"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeConstructorDeclarationParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinConstructorDeclarationParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BetweenEmptyConstructorDeclarationParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeConstructorDeclarationParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "AfterConstructorDeclarationParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-			
-			example = @"class Example {
-	public int this[int a, int b] {
-		get {
-			return a + b;
-		}
-	}
-}";
-			category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Indexer"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeIndexerDeclarationBracket", GettextCatalog.GetString ("before opening bracket"), example);
-			AddOption (whiteSpaceOptions, category, "WithinIndexerDeclarationBracket", GettextCatalog.GetString ("within brackets"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeIndexerDeclarationParameterComma", GettextCatalog.GetString ("before comma in brackets"), example);
-			AddOption (whiteSpaceOptions, category, "AfterIndexerDeclarationParameterComma", GettextCatalog.GetString ("after comma in brackets"), example);
-			
-			example = @"delegate void FooBar (int a, int b, int c);
-delegate void BarFoo ();
-";
-			
-			category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Delegates"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeDelegateDeclarationParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinDelegateDeclarationParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BetweenEmptyDelegateDeclarationParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeDelegateDeclarationParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "AfterDelegateDeclarationParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-			
-			var upperCategory = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Statements"), null);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'if'"), simpleIf);
-			AddOption (whiteSpaceOptions, category, "IfParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleIf);
-			AddOption (whiteSpaceOptions, category, "WithinIfParentheses", GettextCatalog.GetString ("within parenthesis"), simpleIf);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'while'"), simpleWhile);
-			AddOption (whiteSpaceOptions, category, "WhileParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleWhile);
-			AddOption (whiteSpaceOptions, category, "WithinWhileParentheses", GettextCatalog.GetString ("within parenthesis"), simpleWhile);
-
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'for'"), simpleFor);
-			AddOption (whiteSpaceOptions, category, "ForParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleFor);
-			AddOption (whiteSpaceOptions, category, "WithinForParentheses", GettextCatalog.GetString ("within parenthesis"), simpleFor);
-			AddOption (whiteSpaceOptions, category, "SpacesBeforeForSemicolon", GettextCatalog.GetString ("before semicolon"), simpleFor);
-			AddOption (whiteSpaceOptions, category, "SpacesAfterForSemicolon", GettextCatalog.GetString ("after semicolon"), simpleFor);
-
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'foreach'"), simpleForeach);
-			AddOption (whiteSpaceOptions, category, "ForeachParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleForeach);
-			AddOption (whiteSpaceOptions, category, "WithinForEachParentheses", GettextCatalog.GetString ("within parenthesis"), simpleForeach);
-
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'catch'"), simpleCatch);
-			AddOption (whiteSpaceOptions, category, "CatchParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleCatch);
-			AddOption (whiteSpaceOptions, category, "WithinCatchParentheses", GettextCatalog.GetString ("within parenthesis"), simpleCatch);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'switch'"), switchExample);
-			AddOption (whiteSpaceOptions, category, "SwitchParentheses", GettextCatalog.GetString ("before opening parenthesis"), switchExample);
-			AddOption (whiteSpaceOptions, category, "WithinSwitchParentheses", GettextCatalog.GetString ("within parenthesis"), switchExample);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'lock'"), simpleLock);
-			AddOption (whiteSpaceOptions, category, "LockParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleLock);
-			AddOption (whiteSpaceOptions, category, "WithinLockParentheses", GettextCatalog.GetString ("within parenthesis"), simpleLock);
-
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'using'"), simpleUsingStatement);
-			AddOption (whiteSpaceOptions, category, "UsingParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleUsingStatement);
-			AddOption (whiteSpaceOptions, category, "WithinUsingParentheses", GettextCatalog.GetString ("within parenthesis"), simpleUsingStatement);
-			
-			
-			upperCategory = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Expressions"), null);
-			
-			example = @"class Example {
-		void Test ()
-		{
-			Console.WriteLine();
-			Console.WriteLine(""{0} {1}!"", ""Hello"", ""World"");
-		}
-}";
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Method invocations"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeMethodCallParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinMethodCallParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BetweenEmptyMethodCallParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeMethodCallParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "AfterMethodCallParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Object creation"), example);
-			example = @"partial class Example {
-		void Test ()
-		{
-			var anExample = new Example (1, 2, 3);
-			var emptyExample = new Example ();
-		}
-}";
-			AddOption (whiteSpaceOptions, category, "NewParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinNewParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BetweenEmptyNewParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeNewParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "AfterNewParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-			
-			
-			example = @"class Example {
-		void Test ()
-		{
-			a[1,2] = b[3];
-		}
-}";
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Element access"), example);
-			AddOption (whiteSpaceOptions, category, "SpacesBeforeBrackets", GettextCatalog.GetString ("before opening bracket"), example);
-			AddOption (whiteSpaceOptions, category, "SpacesWithinBrackets", GettextCatalog.GetString ("within brackets"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeBracketComma", GettextCatalog.GetString ("before comma in brackets"), example);
-			AddOption (whiteSpaceOptions, category, "AfterBracketComma", GettextCatalog.GetString ("after comma in brackets"), example);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Parentheses"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "WithinParentheses", GettextCatalog.GetString ("within parenthesis"), operatorExample);
-			
-			example = @"class ClassDeclaration { 
-		public void Test (object o)
-		{
-			int i = (int)o;
-		}
-	}";
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Type cast"), example);
-			AddOption (whiteSpaceOptions, category, "WithinCastParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "SpacesAfterTypecast", GettextCatalog.GetString ("after type cast"), example);
-			
-			example = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			int i = sizeof (ClassDeclaration);
-		}
-	}";
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'sizeof'"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeSizeOfParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinSizeOfParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			
-			example = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			Type t = typeof (ClassDeclaration);
-		}
-	}";
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'typeof'"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeTypeOfParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinTypeOfParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Around Operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundAssignmentParentheses", GettextCatalog.GetString ("Assignment (=, +=, -=, ...)"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundLogicalOperatorParentheses", GettextCatalog.GetString ("Logical (&&, ||) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundEqualityOperatorParentheses", GettextCatalog.GetString ("Equality (==, !=) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundRelationalOperatorParentheses", GettextCatalog.GetString ("Relational (<, >, <=, >=) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundBitwiseOperatorParentheses", GettextCatalog.GetString ("Bitwise &, |, ^, ~() operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundAdditiveOperatorParentheses", GettextCatalog.GetString ("Additive (+, -) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundMultiplicativeOperatorParentheses", GettextCatalog.GetString ("Multiplicative (*, /, %) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundShiftOperatorParentheses", GettextCatalog.GetString ("Shift (<<, >>) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundNullCoalescingOperator", GettextCatalog.GetString ("Null coalescing (??) operator"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "SpaceAfterUnsafeAddressOfOperator", GettextCatalog.GetString ("Unsafe addressof operator (&)"), @"unsafe class ClassDeclaration { 
-	public void TestMethod ()
-	{
-		int* a = &x;
-	}
-}");
-			AddOption (whiteSpaceOptions, category, "SpaceAfterUnsafeAsteriskOfOperator", GettextCatalog.GetString ("Unsafe asterisk operator (*)"), @"unsafe class ClassDeclaration { 
-	public void TestMethod ()
-	{
-		int a = *x;
-	}
-}");
-			AddOption (whiteSpaceOptions, category, "SpaceAroundUnsafeArrowOperator", GettextCatalog.GetString ("Unsafe arrow operator (->)"), @"unsafe class ClassDeclaration { 
-	public void TestMethod ()
-	{
-		x->Foo();
-	}
-}");
 
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Conditional Operator (?:)"), condOpExample);
-			AddOption (whiteSpaceOptions, category, "ConditionalOperatorBeforeConditionSpace", GettextCatalog.GetString ("before '?'"), condOpExample);
-			AddOption (whiteSpaceOptions, category, "ConditionalOperatorAfterConditionSpace", GettextCatalog.GetString ("after '?'"), condOpExample);
-			AddOption (whiteSpaceOptions, category, "ConditionalOperatorBeforeSeparatorSpace", GettextCatalog.GetString ("before ':'"), condOpExample);
-			AddOption (whiteSpaceOptions, category, "ConditionalOperatorAfterSeparatorSpace", GettextCatalog.GetString ("after ':'"), condOpExample);
-			
-			example = @"class ClassDeclaration { 
-		string[][] field;
-		int[] test;
-	}";
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Array Declarations"), example);
-			AddOption (whiteSpaceOptions, category, "SpacesBeforeArrayDeclarationBrackets", GettextCatalog.GetString ("before opening bracket"), example);
+			treeviewWrapping.AppendColumn (column);
 
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Other"), example);
-			AddOption (whiteSpaceOptions, category, "SpaceBeforeSemicolon", GettextCatalog.GetString ("before semicolon"), example);
+			AddOption (wrappingOptions, "WrappingPreserveSingleLine", GettextCatalog.GetString ("Leave block on single line"), "");
+			AddOption (wrappingOptions, "WrappingKeepStatementsOnSingleLine", GettextCatalog.GetString ("Leave statements and member declarations on the same line"), "");
 
-			/*
-			whiteSpaceOptions= new ListStore (typeof (Option), typeof (bool), typeof (bool)); 
-			column = new TreeViewColumn ();
-			// text column
-			column.PackStart (cellRendererText, true);
-			column.SetCellDataFunc (cellRendererText, delegate (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) {
-				((CellRendererText)cell).Text = ((Option)model.GetValue (iter, 0)).DisplayName;
-			});
-			treeviewInsertWhiteSpaceOptions.AppendColumn (column);
-			
-			column = new TreeViewColumn ();
-			cellRendererCombo = new CellRendererCombo ();
-			cellRendererCombo.Ypad = 1;
-			cellRendererCombo.Mode = CellRendererMode.Editable;
-			cellRendererCombo.TextColumn = 1;
-			cellRendererCombo.Model = comboBoxStore;
-			cellRendererCombo.HasEntry = false;
-			cellRendererCombo.Editable = !profile.IsBuiltIn;
-
-			cellRendererCombo.Edited += delegate(object o, EditedArgs args) {
-				TreeIter iter;
-				var model = whiteSpaceOptions;
-				if (model.GetIterFromString (out iter, args.Path)) {
-					var option = (Option)model.GetValue (iter, 0);
-					PropertyInfo info = GetPropertyByName (option.PropertyName);
-					if (info == null)
-						return;
-					var value = Enum.Parse (info.PropertyType, args.NewText);
-					info.SetValue (profile, value, null);
-					UpdateExample (texteditor.Document.Text);
-				}
-			};
-			
-			column.PackStart (cellRendererCombo, false);
-			column.SetAttributes (cellRendererCombo, "visible", 2);
-			column.SetCellDataFunc (cellRendererCombo,  delegate (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) {
-				((CellRendererCombo)cell).Text = GetValue (((Option)model.GetValue (iter, 0)).PropertyName).ToString ();
-			});
-			
-			cellRendererToggle = new CellRendererToggle ();
-			cellRendererToggle.Activatable = !profile.IsBuiltIn;
-			cellRendererToggle.Ypad = 1;
-			cellRendererToggle.Toggled += delegate(object o, ToggledArgs args) {
-				TreeIter iter;
-				var model = whiteSpaceOptions;
-				if (model.GetIterFromString (out iter, args.Path)) {
-					var option = (Option)model.GetValue (iter, 0);
-					PropertyInfo info = GetPropertyByName (option.PropertyName);
-					if (info == null || info.PropertyType != typeof(bool))
-						return;
-					bool value = (bool)info.GetValue (this.profile, null);
-					info.SetValue (profile, !value, null);
-					UpdateExample (texteditor.Document.Text);
-				}
-			};
-			
-			column.PackStart (cellRendererToggle, false);
-			column.SetAttributes (cellRendererToggle, "visible", 1);
-			column.SetCellDataFunc (cellRendererToggle,  delegate (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) {
-				((CellRendererToggle)cell).Active = (bool)GetValue (((Option)model.GetValue (iter, 0)).PropertyName);
-			});
-			
-			treeviewInsertWhiteSpaceOptions.AppendColumn (column);
-			
-			treeviewInsertWhiteSpaceOptions.Model = whiteSpaceOptions;*/
-			treeviewInsertWhiteSpaceCategory.ExpandAll ();
-			#endregion
-			
-			#region Blank line options
-			entryBeforUsings.Text = profile.BlankLinesBeforeUsings.ToString ();
-			entryAfterUsings.Text = profile.BlankLinesAfterUsings.ToString ();
-			
-			entryBeforeFirstDeclaration.Text = profile.BlankLinesBeforeFirstDeclaration.ToString ();
-			entryBetweenTypes.Text = profile.BlankLinesBetweenTypes.ToString ();
-			
-			entryBetweenFields.Text = profile.BlankLinesBetweenFields.ToString ();
-			entryBetweenEvents.Text = profile.BlankLinesBetweenEventFields.ToString ();
-			entryBetweenMembers.Text = profile.BlankLinesBetweenMembers.ToString ();
-			entryInsideRegion.Text = profile.BlankLinesInsideRegion.ToString ();
-			entryAroundRegion.Text = profile.BlankLinesAroundRegion.ToString ();
-
-			entryBeforUsings.Changed += HandleEntryBeforUsingsChanged;
-			entryAfterUsings.Changed += HandleEntryBeforUsingsChanged;
-			entryBeforeFirstDeclaration.Changed += HandleEntryBeforUsingsChanged;
-			entryBetweenTypes.Changed += HandleEntryBeforUsingsChanged;
-			entryBetweenFields.Changed += HandleEntryBeforUsingsChanged;
-			entryBetweenEvents.Changed += HandleEntryBeforUsingsChanged;
-			entryBetweenMembers.Changed += HandleEntryBeforUsingsChanged;
-			entryAroundRegion.Changed += HandleEntryBeforUsingsChanged;
-			entryInsideRegion.Changed += HandleEntryBeforUsingsChanged;
+			treeviewWrapping.ExpandAll ();
 			#endregion
 		}
 		
@@ -1169,20 +585,6 @@ delegate void BarFoo ();
 			return int.TryParse (entry.Text, out newValue) ? newValue : oldValue;
 		}
 
-		void HandleEntryBeforUsingsChanged (object sender, EventArgs e)
-		{
-			profile.BlankLinesBeforeUsings = SetFlag (entryBeforUsings, profile.BlankLinesBeforeUsings);
-			profile.BlankLinesAfterUsings = SetFlag (entryAfterUsings, profile.BlankLinesAfterUsings);
-			profile.BlankLinesBeforeFirstDeclaration = SetFlag (entryBeforeFirstDeclaration, profile.BlankLinesBeforeFirstDeclaration);
-			profile.BlankLinesBetweenTypes = SetFlag (entryBetweenTypes, profile.BlankLinesBetweenTypes);
-			profile.BlankLinesBetweenFields = SetFlag (entryBetweenFields, profile.BlankLinesBetweenFields);
-			profile.BlankLinesBetweenMembers = SetFlag (entryBetweenMembers, profile.BlankLinesBetweenMembers);
-			profile.BlankLinesBetweenEventFields = SetFlag (entryBetweenEvents, profile.BlankLinesBetweenMembers);
-			profile.BlankLinesAroundRegion = SetFlag (entryAroundRegion, profile.BlankLinesAroundRegion);
-			profile.BlankLinesInsideRegion = SetFlag (entryInsideRegion, profile.BlankLinesInsideRegion);
-	UpdateExample (blankLineExample);
-		}
-		
 		static PropertyInfo GetPropertyByName (string name)
 		{
 			PropertyInfo info = typeof(CSharpFormattingPolicy).GetProperty (name);
@@ -1190,8 +592,7 @@ delegate void BarFoo ();
 				throw new Exception (name + " property not found");
 			return info;
 		}
-		
-		
+
 		static TreeIter AddOption (TreeStore model, string propertyName, string displayName, string example)
 		{
 			bool isBool = false;
@@ -1247,7 +648,10 @@ delegate void BarFoo ();
 			} else {
 				text = "";
 			}
-			texteditor.Document.Text = CSharpFormatter.FormatText (profile, null, CSharpFormatter.MimeType, text, 0, text.Length);
+
+			var types = DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
+			var textPolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> (types);
+			texteditor.Text = CSharpFormatter.FormatText (profile, textPolicy, CSharpFormatter.MimeType, text, 0, text.Length);
 		}
 		
 		static PropertyInfo GetProperty (TreeModel model, TreeIter iter)
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpIndentVirtualSpaceManager.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpIndentVirtualSpaceManager.cs
index 0782defa74..2970e88724 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpIndentVirtualSpaceManager.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpIndentVirtualSpaceManager.cs
@@ -24,62 +24,44 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
 using System;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.CSharp.Formatting
 {
-	class IndentVirtualSpaceManager : IIndentationTracker
+	class IndentVirtualSpaceManager : IndentationTracker
 	{
-		readonly TextEditorData data;
-		readonly CacheIndentEngine stateTracker;

-

-		public IndentVirtualSpaceManager(TextEditorData data, CacheIndentEngine stateTracker)
+		readonly TextEditor data;
+		readonly CacheIndentEngine stateTracker;
+
+		public IndentVirtualSpaceManager(TextEditor data, CacheIndentEngine stateTracker)
 		{
 			this.data = data;
 			this.stateTracker = stateTracker;
 		}
 
-		string GetIndentationString (DocumentLocation loc)
+		#region IndentationTracker implementation
+		public override string GetIndentationString (int lineNumber)
 		{
-			var line = data.Document.GetLine (loc.Line);
+			var line = data.GetLine (lineNumber);
 			if (line == null)
 				return "";
 			// Get context to the end of the line w/o changing the main engine's state
 			var offset = line.Offset;
-			string curIndent = line.GetIndentation (data.Document);
+			string curIndent = line.GetIndentation (data);
 			try {
-				stateTracker.Update (Math.Min (data.Length, offset + Math.Min (line.Length, loc.Column - 1)));
+				stateTracker.Update (data, Math.Min (data.Length, offset + line.Length));
 				int nlwsp = curIndent.Length;
-				if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && data.Document.GetCharAt (offset + nlwsp) == '*'))
+				if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && data.GetCharAt (offset + nlwsp) == '*'))
 					return stateTracker.ThisLineIndent;
 			} catch (Exception e) {
-				LoggingService.LogError ("Error while indenting at "+ loc, e); 
+				LoggingService.LogError ("Error while indenting at line " + lineNumber, e); 
 			}
 			return curIndent;
 		}
-
-		public string GetIndentationString (int lineNumber, int column)
-		{
-			return GetIndentationString (new DocumentLocation (lineNumber, column));
-		}
-
-		public string GetIndentationString (int offset)
-		{
-			return GetIndentationString (data.OffsetToLocation (offset));
-		}
-
-		public int GetVirtualIndentationColumn (int offset)
-		{
-			return 1 + GetIndentationString (offset).Length;
-		}
-		
-		public int GetVirtualIndentationColumn (int lineNumber, int column)
-		{
-			return 1 + GetIndentationString (lineNumber, column).Length;
-		}
+		#endregion
 	}
-}
-
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
index fce4666569..8e289dfa3f 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
@@ -31,37 +31,32 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.CSharp.Refactoring;
-using Mono.TextEditor;
 using MonoDevelop.Ide.CodeTemplates;
-using MonoDevelop.SourceEditor;
-using ICSharpCode.NRefactory.CSharp.Completion;
-using ICSharpCode.NRefactory.Editor;
 using System.Linq;
 using System.Text;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Projects;
+using MonoDevelop.Core.Text;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.CSharp.Formatting
 {
 	class CSharpTextEditorIndentation : TextEditorExtension
 	{
-		CacheIndentEngine stateTracker;
+		internal ICSharpCode.NRefactory6.CSharp.CacheIndentEngine stateTracker;
 		int cursorPositionBeforeKeyPress;
 
-		TextEditorData textEditorData {
-			get {
-				return document.Editor;
-			}
-		}
-
 		readonly IEnumerable<string> types = DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
 
 		CSharpFormattingPolicy Policy {
 			get {
-				if (Document != null && Document.Project != null && Document.Project.Policies != null) {
-					return Document.Project.Policies.Get<CSharpFormattingPolicy> (types);
+				if (DocumentContext != null && DocumentContext.Project != null && DocumentContext.Project.Policies != null) {
+					return DocumentContext.Project.Policies.Get<CSharpFormattingPolicy> (types);
 				}
 				return MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types);
 			}
@@ -69,8 +64,8 @@ namespace MonoDevelop.CSharp.Formatting
 
 		TextStylePolicy TextStylePolicy {
 			get {
-				if (Document != null && Document.Project != null && Document.Project.Policies != null) {
-					return Document.Project.Policies.Get<TextStylePolicy> (types);
+				if (DocumentContext != null && DocumentContext.Project != null && DocumentContext.Project.Policies != null) {
+					return DocumentContext.Project.Policies.Get<TextStylePolicy> (types);
 				}
 				return MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> (types);
 			}
@@ -81,17 +76,13 @@ namespace MonoDevelop.CSharp.Formatting
 		static CSharpTextEditorIndentation ()
 		{
 			CompletionWindowManager.WordCompleted += delegate(object sender, CodeCompletionContextEventArgs e) {
-				var editor = e.Widget as IExtensibleTextEditor;
+				var editor = e.Widget as IServiceProvider;
 				if (editor == null)
 					return;
-				var textEditorExtension = editor.Extension;
-				while (textEditorExtension != null && !(textEditorExtension is CSharpTextEditorIndentation)) {
-					textEditorExtension = textEditorExtension.Next;
-				}
-				var extension = textEditorExtension as CSharpTextEditorIndentation;
+				var extension = editor.GetService (typeof(CSharpTextEditorIndentation)) as CSharpTextEditorIndentation;
 				if (extension == null)
 					return;
-				extension.SafeUpdateIndentEngine (extension.textEditorData.Caret.Offset);
+				extension.SafeUpdateIndentEngine (extension.Editor.CaretOffset);
 				if (extension.stateTracker.NeedsReindent)
 					extension.DoReSmartIndent ();
 			};
@@ -100,44 +91,12 @@ namespace MonoDevelop.CSharp.Formatting
 		internal void SafeUpdateIndentEngine (int offset)
 		{
 			try {
-				stateTracker.Update (offset);
+				stateTracker.Update (Editor, offset);
 			} catch (Exception e) {
 				LoggingService.LogError ("Error while updating the indentation engine", e);
 			}
 		}
 
-		void HandleTextPaste (int insertionOffset, string text, int insertedChars)
-		{
-			if (document.Editor.Options.IndentStyle == IndentStyle.None ||
-			    document.Editor.Options.IndentStyle == IndentStyle.Auto)
-				return;
-
-			// Just correct the start line of the paste operation - the text is already indented.
-			var curLine = Editor.GetLineByOffset (insertionOffset);
-			var curLineOffset = curLine.Offset;
-			SafeUpdateIndentEngine (curLineOffset);
-			if (!stateTracker.IsInsideOrdinaryCommentOrString) {
-				int pos = curLineOffset;
-				string curIndent = curLine.GetIndentation (textEditorData.Document);
-				int nlwsp = curIndent.Length;
-
-				if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < curLine.LengthIncludingDelimiter && textEditorData.Document.GetCharAt (curLineOffset + nlwsp) == '*')) {
-					// Possibly replace the indent
-					SafeUpdateIndentEngine (curLineOffset + curLine.Length);
-					string newIndent = stateTracker.ThisLineIndent;
-					if (newIndent != curIndent) {
-						if (CompletionWindowManager.IsVisible) {
-							if (pos < CompletionWindowManager.CodeCompletionContext.TriggerOffset)
-								CompletionWindowManager.CodeCompletionContext.TriggerOffset -= nlwsp;
-						}
-						textEditorData.Replace (pos, nlwsp, newIndent);
-						textEditorData.Document.CommitLineUpdate (textEditorData.Caret.Line);
-					}
-				}
-			}
-			textEditorData.FixVirtualIndentation ();
-		}
-
 		public static bool OnTheFlyFormatting {
 			get {
 				return PropertyService.Get ("OnTheFlyFormatting", true);
@@ -147,24 +106,23 @@ namespace MonoDevelop.CSharp.Formatting
 			}
 		}
 
-		void RunFormatter (DocumentLocation location)
+		void RunFormatter (MonoDevelop.Ide.Editor.DocumentLocation location)
 		{
-			if (OnTheFlyFormatting && textEditorData != null && !(textEditorData.CurrentMode is TextLinkEditMode) && !(textEditorData.CurrentMode is InsertionCursorEditMode)) {
-				OnTheFlyFormatter.Format (Document, location);
-			}
+			if (!OnTheFlyFormatting || Editor == null || Editor.EditMode != EditMode.Edit)
+				return;
+			var offset = Editor.LocationToOffset (location);
+			OnTheFlyFormatter.Format (Editor, DocumentContext, offset, offset);
 		}
 
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 
-
-			if (textEditorData != null) {
-				textEditorData.Options.Changed += HandleTextOptionsChanged;
+			if (Editor != null) {
+				Editor.OptionsChanged += HandleTextOptionsChanged;
 				HandleTextOptionsChanged (this, EventArgs.Empty);
-				textEditorData.Document.TextReplacing += HandleTextReplacing;
-				textEditorData.Document.TextReplaced += HandleTextReplaced;
-				textEditorData.Paste += HandleTextPaste;
+				Editor.TextChanging += HandleTextReplacing;
+				Editor.TextChanged += HandleTextReplaced;
 			}
 			if (IdeApp.Workspace != null)
 				IdeApp.Workspace.ActiveConfigurationChanged += HandleTextOptionsChanged;
@@ -172,47 +130,61 @@ namespace MonoDevelop.CSharp.Formatting
 
 		bool indentationDisabled;
 
+		public static IEnumerable<string> GetDefinedSymbols (MonoDevelop.Projects.Project project)
+		{
+			var workspace = IdeApp.Workspace;
+			if (workspace == null || project == null)
+				yield break;
+			var configuration = project.GetConfiguration (workspace.ActiveConfiguration) as DotNetProjectConfiguration;
+			if (configuration != null) {
+				foreach (string s in configuration.GetDefineSymbols ())
+					yield return s;
+				// Workaround for mcs defined symbol
+				if (configuration.TargetRuntime.RuntimeId == "Mono") 
+					yield return "__MonoCS__";
+			}
+		}
+
 		void HandleTextOptionsChanged (object sender, EventArgs e)
 		{
-			var policy = Policy.CreateOptions ();
-			var options = Editor.CreateNRefactoryTextEditorOptions ();
-			options.IndentBlankLines = true;
-			IStateMachineIndentEngine indentEngine;
+			//var options = Editor.CreateNRefactoryTextEditorOptions ();
+			var policy = Policy.CreateOptions (Editor.Options);
+			//options.IndentBlankLines = true;
+			ICSharpCode.NRefactory6.CSharp.IStateMachineIndentEngine indentEngine;
 			try {
-				var csharpIndentEngine = new CSharpIndentEngine (textEditorData.Document, options, policy);
+				var csharpIndentEngine = new ICSharpCode.NRefactory6.CSharp.CSharpIndentEngine (policy);
 				//csharpIndentEngine.EnableCustomIndentLevels = true;
-				foreach (var symbol in MonoDevelop.CSharp.Highlighting.CSharpSyntaxMode.GetDefinedSymbols (document.Project)) {
+				foreach (var symbol in GetDefinedSymbols (DocumentContext.Project)) {
 					csharpIndentEngine.DefineSymbol (symbol);
 				}
 				indentEngine = csharpIndentEngine;
 			} catch (Exception ex) {
 				LoggingService.LogError ("Error while creating the c# indentation engine", ex);
-				indentEngine = new NullIStateMachineIndentEngine (textEditorData.Document);
+				indentEngine = new ICSharpCode.NRefactory6.CSharp.NullIStateMachineIndentEngine ();
 			}
-			stateTracker = new CacheIndentEngine (indentEngine);
+			stateTracker = new ICSharpCode.NRefactory6.CSharp.CacheIndentEngine (indentEngine);
 			if (DefaultSourceEditorOptions.Instance.IndentStyle == IndentStyle.Auto) {
-				textEditorData.IndentationTracker = new DefaultIndentationTracker (textEditorData.Document);
+				Editor.SetIndentationTracker (null);
 			} else {
-				textEditorData.IndentationTracker = new IndentVirtualSpaceManager (textEditorData, stateTracker);
+				Editor.SetIndentationTracker (new IndentVirtualSpaceManager (Editor, stateTracker));
 			}
 
 			indentationDisabled = DefaultSourceEditorOptions.Instance.IndentStyle == IndentStyle.Auto || DefaultSourceEditorOptions.Instance.IndentStyle == IndentStyle.None;
 			if (indentationDisabled) {
-				textEditorData.TextPasteHandler = null;
+				Editor.SetTextPasteHandler (null);
 			} else {
-				textEditorData.TextPasteHandler = new TextPasteIndentEngine (stateTracker, options, policy);
+				Editor.SetTextPasteHandler (new CSharpTextPasteHandler (this, stateTracker, policy));
 			}
 		}
 
 		public override void Dispose ()
 		{
-			if (textEditorData != null) {
-				textEditorData.TextPasteHandler = null;
-				textEditorData.Paste -= HandleTextPaste;
-				textEditorData.Options.Changed -= HandleTextOptionsChanged;
-				textEditorData.IndentationTracker = null;
-				textEditorData.Document.TextReplacing -= HandleTextReplacing;
-				textEditorData.Document.TextReplaced -= HandleTextReplaced;
+			if (Editor != null) {
+				Editor.SetTextPasteHandler (null);
+				Editor.OptionsChanged -= HandleTextOptionsChanged;
+				Editor.SetIndentationTracker (null);
+				Editor.TextChanging -= HandleTextReplacing;
+				Editor.TextChanged -= HandleTextReplaced;
 			}
 			IdeApp.Workspace.ActiveConfigurationChanged -= HandleTextOptionsChanged;
 			stateTracker = null;
@@ -221,31 +193,31 @@ namespace MonoDevelop.CSharp.Formatting
 
 		bool? wasInVerbatimString;
 
-		void HandleTextReplaced (object sender, DocumentChangeEventArgs e)
+		void HandleTextReplaced (object sender, MonoDevelop.Core.Text.TextChangeEventArgs e)
 		{
-			stateTracker.ResetEngineToPosition (e.Offset); 
+			stateTracker.ResetEngineToPosition (Editor, e.Offset); 
 			if (wasInVerbatimString == null)
 				return;
-			if (e.RemovalLength != 1 || textEditorData.Document.CurrentAtomicUndoOperationType == OperationType.Format)
+			if (e.RemovalLength != 1 /*|| textEditorData.Document.CurrentAtomicUndoOperationType == OperationType.Format*/)
 				return;
-			SafeUpdateIndentEngine (Math.Min (textEditorData.Document.TextLength, e.Offset + e.InsertionLength + 1));
+			SafeUpdateIndentEngine (Math.Min (Editor.Length, e.Offset + e.InsertionLength + 1));
 			if (wasInVerbatimString == true && !stateTracker.IsInsideVerbatimString) {
-				textEditorData.Document.TextReplacing -= HandleTextReplacing;
-				textEditorData.Document.TextReplaced -= HandleTextReplaced;
-				ConvertVerbatimStringToNormal (textEditorData, e.Offset + e.InsertionLength + 1);
-				textEditorData.Document.TextReplacing += HandleTextReplacing;
-				textEditorData.Document.TextReplaced += HandleTextReplaced;
+				Editor.TextChanging -= HandleTextReplacing;
+				Editor.TextChanged -= HandleTextReplaced;
+				ConvertVerbatimStringToNormal (Editor, e.Offset + e.InsertionLength + 1);
+				Editor.TextChanging += HandleTextReplacing;
+				Editor.TextChanged += HandleTextReplaced;
 			}
 		}
 
-		void HandleTextReplacing (object sender, DocumentChangeEventArgs e)
+		void HandleTextReplacing (object sender, MonoDevelop.Core.Text.TextChangeEventArgs e)
 		{
 			wasInVerbatimString = null;
 			var o = e.Offset + e.RemovalLength;
-			if (o < 0 || o + 1 > textEditorData.Length || e.RemovalLength != 1 || textEditorData.Document.IsInUndo) {
+			if (o < 0 || o + 1 > Editor.Length || e.RemovalLength != 1/* || textEditorData.Document.IsInUndo*/) {
 				return;
 			}
-			if (textEditorData.GetCharAt (o) != '"')
+			if (Editor.GetCharAt (o) != '"')
 				return;
 			SafeUpdateIndentEngine (o + 1);
 			wasInVerbatimString = stateTracker.IsInsideVerbatimString;
@@ -279,7 +251,7 @@ namespace MonoDevelop.CSharp.Formatting
 			return result.ToString ();
 		}
 
-		static void ConvertNormalToVerbatimString (TextEditorData textEditorData, int offset)
+		static void ConvertNormalToVerbatimString (ITextDocument textEditorData, int offset)
 		{
 			var endOffset = offset;
 			while (endOffset < textEditorData.Length) {
@@ -301,10 +273,10 @@ namespace MonoDevelop.CSharp.Formatting
 				return;
 			var plainText = TextPasteUtils.StringLiteralPasteStrategy.Instance.Decode (textEditorData.GetTextAt (offset, endOffset - offset));
 			var newText = TextPasteUtils.VerbatimStringStrategy.Encode (plainText);
-			textEditorData.Replace (offset, endOffset - offset, newText);
+			textEditorData.ReplaceText (offset, endOffset - offset, newText);
 		}
 
-		static void ConvertVerbatimStringToNormal (TextEditorData textEditorData, int offset)
+		static void ConvertVerbatimStringToNormal (ITextDocument textEditorData, int offset)
 		{
 			var endOffset = offset;
 			while (endOffset < textEditorData.Length) {
@@ -320,14 +292,12 @@ namespace MonoDevelop.CSharp.Formatting
 			}
 			var plainText = TextPasteUtils.VerbatimStringStrategy.Decode (textEditorData.GetTextAt (offset, endOffset - offset));
 			var newText = TextPasteUtils.StringLiteralPasteStrategy.Instance.Encode (plainText);
-			textEditorData.Replace (offset, endOffset - offset, newText);
+			textEditorData.ReplaceText (offset, endOffset - offset, newText);
 		}
 
-		internal IStateMachineIndentEngine StateTracker { get { return stateTracker; } }
-
 		public bool DoInsertTemplate ()
 		{
-			string word = CodeTemplate.GetWordBeforeCaret (textEditorData);
+			string word = CodeTemplate.GetWordBeforeCaret (Editor);
 			foreach (CodeTemplate template in CodeTemplateService.GetCodeTemplates (CSharpFormatter.MimeType)) {
 				if (template.Shortcut == word)
 					return true;
@@ -340,8 +310,8 @@ namespace MonoDevelop.CSharp.Formatting
 		void CheckXmlCommentCloseTag (char keyChar)
 		{
 			if (keyChar == '>' && stateTracker.IsInsideDocLineComment) {
-				var location = Editor.Caret.Location;
-				string lineText = Editor.GetLineText (Editor.Caret.Line);
+				var location = Editor.CaretLocation;
+				string lineText = Editor.GetLineText (Editor.CaretLine);
 				int startIndex = Math.Min (location.Column - 2, lineText.Length - 1);
 				while (startIndex >= 0 && lineText [startIndex] != '<') {
 					--startIndex;
@@ -357,8 +327,10 @@ namespace MonoDevelop.CSharp.Formatting
 						endIndex++;
 					}
 					string tag = endIndex - startIndex > 0 ? lineText.Substring (startIndex + 1, endIndex - startIndex - 1) : null;
-					if (!string.IsNullOrEmpty (tag) && CSharpCompletionEngine.CommentTags.Any (t => t == tag)) {
-						Editor.Document.Insert (Editor.Caret.Offset, "</" + tag + ">", AnchorMovementType.BeforeInsertion);
+					if (!string.IsNullOrEmpty (tag) && ICSharpCode.NRefactory.CSharp.Completion.CSharpCompletionEngine.CommentTags.Any (t => t == tag)) {
+						var caretOffset = Editor.CaretOffset;
+						Editor.InsertText (caretOffset, "</" + tag + ">");
+						Editor.CaretOffset = caretOffset;
 					}
 				}
 			}
@@ -366,99 +338,96 @@ namespace MonoDevelop.CSharp.Formatting
 
 		internal void ReindentOnTab ()
 		{
-			int cursor = textEditorData.Caret.Offset;
-			if (stateTracker.IsInsideVerbatimString && cursor > 0 && cursor < textEditorData.Document.TextLength && textEditorData.GetCharAt (cursor - 1) == '"')
+			int cursor = Editor.CaretOffset;
+			if (stateTracker.IsInsideVerbatimString && cursor > 0 && cursor < Editor.Length && Editor.GetCharAt (cursor - 1) == '"')
 				SafeUpdateIndentEngine (cursor + 1);
 			if (stateTracker.IsInsideVerbatimString) {
 				// insert normal tab inside @" ... "
-				if (textEditorData.IsSomethingSelected) {
-					textEditorData.SelectedText = "\t";
+				if (Editor.IsSomethingSelected) {
+					Editor.SelectedText = "\t";
 				}
 				else {
-					textEditorData.Insert (cursor, "\t");
+					Editor.InsertText (cursor, "\t");
 				}
-				textEditorData.Document.CommitLineUpdate (textEditorData.Caret.Line);
+				// textEditorData.Document.CommitLineUpdate (textEditorData.CaretLine);
 			}
 			else if (cursor >= 1) {
-				if (textEditorData.Caret.Column > 1) {
+				if (Editor.CaretColumn > 1) {
 					int delta = cursor - cursorPositionBeforeKeyPress;
 					if (delta < 2 && delta > 0) {
-						textEditorData.Remove (cursor - delta, delta);
-						textEditorData.Caret.Offset = cursor - delta;
-						textEditorData.Document.CommitLineUpdate (textEditorData.Caret.Line);
+						Editor.RemoveText (cursor - delta, delta);
+						Editor.CaretOffset = cursor - delta;
+						// textEditorData.Document.CommitLineUpdate (textEditorData.CaretLine);
 					}
 				}
-				SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+				SafeUpdateIndentEngine (Editor.CaretOffset);
 				DoReSmartIndent ();
 			}
 		}
 
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			bool skipFormatting = StateTracker.IsInsideOrdinaryCommentOrString ||
-			                      StateTracker.IsInsidePreprocessorDirective;
-
-			cursorPositionBeforeKeyPress = textEditorData.Caret.Offset;
-			bool isSomethingSelected = textEditorData.IsSomethingSelected;
-			if (key == Gdk.Key.BackSpace && textEditorData.Caret.Offset == lastInsertedSemicolon) {
-				textEditorData.Document.Undo ();
+			cursorPositionBeforeKeyPress = Editor.CaretOffset;
+			bool isSomethingSelected = Editor.IsSomethingSelected;
+			if (descriptor.SpecialKey == SpecialKey.BackSpace && Editor.CaretOffset == lastInsertedSemicolon) {
+				EditActions.Undo (Editor);
 				lastInsertedSemicolon = -1;
 				return false;
 			}
 			lastInsertedSemicolon = -1;
-			if (keyChar == ';' && !(textEditorData.CurrentMode is TextLinkEditMode) && !DoInsertTemplate () && !isSomethingSelected && PropertyService.Get (
+			if (descriptor.KeyChar == ';' && Editor.EditMode == EditMode.Edit && !DoInsertTemplate () && !isSomethingSelected && PropertyService.Get (
 				    "SmartSemicolonPlacement",
 				    false
 			    ) && !(stateTracker.IsInsideComment || stateTracker.IsInsideString)) {
-				bool retval = base.KeyPress (key, keyChar, modifier);
-				DocumentLine curLine = textEditorData.Document.GetLine (textEditorData.Caret.Line);
-				string text = textEditorData.Document.GetTextAt (curLine);
+				bool retval = base.KeyPress (descriptor);
+				var curLine = Editor.GetLine (Editor.CaretLine);
+				string text = Editor.GetTextAt (curLine);
 				if (!(text.EndsWith (";", StringComparison.Ordinal) || text.Trim ().StartsWith ("for", StringComparison.Ordinal))) {
 					int guessedOffset;
 
-					if (GuessSemicolonInsertionOffset (textEditorData, curLine, textEditorData.Caret.Offset, out guessedOffset)) {
-						using (var undo = textEditorData.OpenUndoGroup ()) {
-							textEditorData.Remove (textEditorData.Caret.Offset - 1, 1);
-							textEditorData.Caret.Offset = guessedOffset;
-							lastInsertedSemicolon = textEditorData.Caret.Offset + 1;
-							retval = base.KeyPress (key, keyChar, modifier);
+					if (GuessSemicolonInsertionOffset (Editor, curLine, Editor.CaretOffset, out guessedOffset)) {
+						using (var undo = Editor.OpenUndoGroup ()) {
+							Editor.RemoveText (Editor.CaretOffset - 1, 1);
+							Editor.CaretOffset = guessedOffset;
+							lastInsertedSemicolon = Editor.CaretOffset + 1;
+							retval = base.KeyPress (descriptor);
 						}
 					}
 				}
-				using (var undo = textEditorData.OpenUndoGroup ()) {
-					if (OnTheFlyFormatting && textEditorData != null && !(textEditorData.CurrentMode is TextLinkEditMode) && !(textEditorData.CurrentMode is InsertionCursorEditMode)) {
-						OnTheFlyFormatter.FormatStatmentAt (Document, textEditorData.Caret.Location);
+				using (var undo = Editor.OpenUndoGroup ()) {
+					if (OnTheFlyFormatting && Editor != null && Editor.EditMode == EditMode.Edit) {
+						OnTheFlyFormatter.FormatStatmentAt (Editor, DocumentContext, Editor.CaretLocation);
 					}
 				}
 				return retval;
 			}
 			
-			if (key == Gdk.Key.Tab) {
-				SafeUpdateIndentEngine (textEditorData.Caret.Offset);
-				if (stateTracker.IsInsideStringLiteral && !textEditorData.IsSomethingSelected) {
-					var lexer = new CSharpCompletionEngineBase.MiniLexer (textEditorData.Document.GetTextAt (0, textEditorData.Caret.Offset));
+			if (descriptor.SpecialKey == SpecialKey.Tab) {
+				SafeUpdateIndentEngine (Editor.CaretOffset);
+				if (stateTracker.IsInsideStringLiteral && !Editor.IsSomethingSelected) {
+					var lexer = new ICSharpCode.NRefactory.CSharp.Completion.CSharpCompletionEngineBase.MiniLexer (Editor.GetTextAt (0, Editor.CaretOffset));
 					lexer.Parse ();
 					if (lexer.IsInString) {
-						textEditorData.InsertAtCaret ("\\t");
+						Editor.InsertAtCaret ("\\t");
 						return false;
 					}
 				}
 			}
 
 
-			if (key == Gdk.Key.Tab && DefaultSourceEditorOptions.Instance.TabIsReindent && !CompletionWindowManager.IsVisible && !(textEditorData.CurrentMode is TextLinkEditMode) && !DoInsertTemplate () && !isSomethingSelected) {
+			if (descriptor.SpecialKey == SpecialKey.Tab && DefaultSourceEditorOptions.Instance.TabIsReindent && !CompletionWindowManager.IsVisible && Editor.EditMode == EditMode.Edit && !DoInsertTemplate () && !isSomethingSelected) {
 				ReindentOnTab ();
 
 				return false;
 			}
 
-			SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+			SafeUpdateIndentEngine (Editor.CaretOffset);
 			if (!stateTracker.IsInsideOrdinaryCommentOrString) {
-				if (keyChar == '@') {
-					var retval = base.KeyPress (key, keyChar, modifier);
-					int cursor = textEditorData.Caret.Offset;
-					if (cursor < textEditorData.Length && textEditorData.GetCharAt (cursor) == '"')
-						ConvertNormalToVerbatimString (textEditorData, cursor + 1);
+				if (descriptor.KeyChar == '@') {
+					var retval = base.KeyPress (descriptor);
+					int cursor = Editor.CaretOffset;
+					if (cursor < Editor.Length && Editor.GetCharAt (cursor) == '"')
+						ConvertNormalToVerbatimString (Editor, cursor + 1);
 					return retval;
 				}
 			}
@@ -468,34 +437,34 @@ namespace MonoDevelop.CSharp.Formatting
 			if (!indentationDisabled) {
 				bool retval;
 				//capture some of the current state
-				int oldBufLen = textEditorData.Length;
-				int oldLine = textEditorData.Caret.Line + 1;
+				int oldBufLen = Editor.Length;
+				int oldLine = Editor.CaretLine + 1;
 				bool reIndent = false;
 
 				//pass through to the base class, which actually inserts the character
 				//and calls HandleCodeCompletion etc to handles completion
-				using (var undo = textEditorData.OpenUndoGroup ()) {
-					DoPreInsertionSmartIndent (key);
+				using (var undo = Editor.OpenUndoGroup ()) {
+					DoPreInsertionSmartIndent (descriptor.SpecialKey);
 				}
 				wasInStringLiteral = stateTracker.IsInsideStringLiteral;
 				bool automaticReindent;
 				// need to be outside of an undo group - otherwise it interferes with other text editor extension
 				// esp. the documentation insertion undo steps.
-				retval = base.KeyPress (key, keyChar, modifier);
+				retval = base.KeyPress (descriptor);
 				//handle inserted characters
-				if (textEditorData.Caret.Offset <= 0 || textEditorData.IsSomethingSelected)
+				if (Editor.CaretOffset <= 0 || Editor.IsSomethingSelected)
 					return retval;
 				
-				lastCharInserted = TranslateKeyCharForIndenter (key, keyChar, textEditorData.GetCharAt (textEditorData.Caret.Offset - 1));
+				lastCharInserted = TranslateKeyCharForIndenter (descriptor.SpecialKey, descriptor.KeyChar, Editor.GetCharAt (Editor.CaretOffset - 1));
 				if (lastCharInserted == '\0')
 					return retval;
-				using (var undo = textEditorData.OpenUndoGroup ()) {
-					SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+				using (var undo = Editor.OpenUndoGroup ()) {
+					SafeUpdateIndentEngine (Editor.CaretOffset);
 
-					if (key == Gdk.Key.Return && modifier == Gdk.ModifierType.ControlMask) {
-						FixLineStart (textEditorData, stateTracker, textEditorData.Caret.Line + 1);
+					if (descriptor.SpecialKey == SpecialKey.Return && descriptor.ModifierKeys == ModifierKeys.Control) {
+						FixLineStart (Editor, stateTracker, Editor.CaretLine + 1);
 					} else {
-						if (!(oldLine == textEditorData.Caret.Line + 1 && lastCharInserted == '\n') && (oldBufLen != textEditorData.Length || lastCharInserted != '\0')) {
+						if (!(oldLine == Editor.CaretLine + 1 && lastCharInserted == '\n') && (oldBufLen != Editor.Length || lastCharInserted != '\0')) {
 							DoPostInsertionSmartIndent (lastCharInserted, out reIndent);
 						} else {
 							reIndent = lastCharInserted == '\n';
@@ -505,67 +474,121 @@ namespace MonoDevelop.CSharp.Formatting
 					//N.B. if the engine says we need to reindent, make sure that it's because a char was 
 					//inserted rather than just updating the stack due to moving around
 
-					SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+					SafeUpdateIndentEngine (Editor.CaretOffset);
 					// Automatically reindent in text link mode will cause the mode exiting, therefore we need to prevent that.
-					automaticReindent = (stateTracker.NeedsReindent && lastCharInserted != '\0') && !(textEditorData.CurrentMode is TextLinkEditMode);
-					if (key == Gdk.Key.Return && (reIndent || automaticReindent)) {
-						if (textEditorData.Options.IndentStyle == IndentStyle.Virtual) {
-							if (textEditorData.GetLine (textEditorData.Caret.Line).Length == 0)
-								textEditorData.Caret.Column = textEditorData.IndentationTracker.GetVirtualIndentationColumn (textEditorData.Caret.Location);
+					automaticReindent = (stateTracker.NeedsReindent && lastCharInserted != '\0') && Editor.EditMode == EditMode.Edit;
+					if (descriptor.SpecialKey == SpecialKey.Return && (reIndent || automaticReindent)) {
+						if (Editor.Options.IndentStyle == IndentStyle.Virtual) {
+							if (Editor.GetLine (Editor.CaretLine).Length == 0)
+								Editor.CaretColumn = Editor.GetVirtualIndentationColumn (Editor.CaretLine);
 						} else {
 							DoReSmartIndent ();
 						}
 					}
 				}
+
 				const string reindentChars = ";){}";
-				if (reIndent || key != Gdk.Key.Return && key != Gdk.Key.Tab && automaticReindent && reindentChars.Contains (keyChar)) {
-					using (var undo = textEditorData.OpenUndoGroup ()) {
+				if (reIndent || descriptor.SpecialKey != SpecialKey.Return && descriptor.SpecialKey != SpecialKey.Tab && automaticReindent && reindentChars.Contains (descriptor.KeyChar)) {
+					using (var undo = Editor.OpenUndoGroup ()) {
 						DoReSmartIndent ();
 					}
 				}
 
-				if (!skipFormatting && !(stateTracker.IsInsideComment || stateTracker.IsInsideString)) {
-					if (keyChar == ';' || keyChar == '}') {
-						using (var undo = textEditorData.OpenUndoGroup ()) {
-							if (OnTheFlyFormatting && textEditorData != null && !(textEditorData.CurrentMode is TextLinkEditMode) && !(textEditorData.CurrentMode is InsertionCursorEditMode)) {
-								OnTheFlyFormatter.FormatStatmentAt (Document, textEditorData.Caret.Location);
-							}
-						}
-					}
-				}
-
-				SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+				HandleOnTheFlyFormatting (descriptor);
+				SafeUpdateIndentEngine (Editor.CaretOffset);
 				lastCharInserted = '\0';
-				CheckXmlCommentCloseTag (keyChar);
+				CheckXmlCommentCloseTag (descriptor.KeyChar);
 				return retval;
 			}
 
-			if (textEditorData.Options.IndentStyle == IndentStyle.Auto && DefaultSourceEditorOptions.Instance.TabIsReindent && key == Gdk.Key.Tab) {
-				bool retval = base.KeyPress (key, keyChar, modifier);
+			if (Editor.Options.IndentStyle == IndentStyle.Auto && DefaultSourceEditorOptions.Instance.TabIsReindent && descriptor.SpecialKey == SpecialKey.Tab) {
+				bool retval = base.KeyPress (descriptor);
 				DoReSmartIndent ();
-				CheckXmlCommentCloseTag (keyChar);
+				CheckXmlCommentCloseTag (descriptor.KeyChar);
 				return retval;
 			}
 
 			//pass through to the base class, which actually inserts the character
 			//and calls HandleCodeCompletion etc to handles completion
-			var result = base.KeyPress (key, keyChar, modifier);
+			var result = base.KeyPress (descriptor);
 
-			if (!indentationDisabled && (key == Gdk.Key.Return || key == Gdk.Key.KP_Enter)) {
+			if (!indentationDisabled && (descriptor.SpecialKey == SpecialKey.Return)) {
 				DoReSmartIndent ();
 			}
 
-			CheckXmlCommentCloseTag (keyChar);
+			CheckXmlCommentCloseTag (descriptor.KeyChar);
 
-			if (!skipFormatting && keyChar == '}')
-				RunFormatter (new DocumentLocation (textEditorData.Caret.Location.Line, textEditorData.Caret.Location.Column));
+			HandleOnTheFlyFormatting (descriptor);
+			
 			return result;
 		}
 
-		static bool IsSemicolonalreadyPlaced (TextEditorData data, int caretOffset)
+		void HandleOnTheFlyFormatting (KeyDescriptor descriptor)
+		{
+			if (descriptor.KeyChar == '{')
+				return;
+			SafeUpdateIndentEngine (Editor.CaretOffset);
+			bool skipFormatting = stateTracker.IsInsideOrdinaryCommentOrString || stateTracker.IsInsidePreprocessorDirective;
+			if (!skipFormatting && !(stateTracker.IsInsideComment || stateTracker.IsInsideString)) {
+				if (DocumentContext.ParsedDocument == null || DocumentContext.ParsedDocument.GetAst<SemanticModel> () == null)
+					return;
+				var document = DocumentContext.AnalysisDocument;
+				if (document == null)
+					return;
+				if (!skipFormatting && service.SupportsFormattingOnTypedCharacter (document, descriptor.KeyChar)) {
+					var caretPosition = Editor.CaretOffset;
+					var token = CSharpEditorFormattingService.GetTokenBeforeTheCaretAsync (document, caretPosition, default(CancellationToken)).Result;
+					if (token.IsMissing || !service.ValidSingleOrMultiCharactersTokenKind (descriptor.KeyChar, token.Kind ()) || token.IsKind (SyntaxKind.EndOfFileToken, SyntaxKind.None))
+						return;
+					if (CSharpEditorFormattingService.TokenShouldNotFormatOnTypeChar (token))
+						return;
+					using (var undo = Editor.OpenUndoGroup ()) {
+						if (OnTheFlyFormatting && Editor != null && Editor.EditMode == EditMode.Edit) {
+							OnTheFlyFormatter.FormatStatmentAt (Editor, DocumentContext, Editor.CaretLocation);
+						}
+					}
+				}
+			}
+			if (OnTheFlyFormatting && descriptor.SpecialKey == SpecialKey.Return) {
+				try {
+					FormatOnReturn ();
+				} catch (Exception e) {
+					LoggingService.LogError ("Exception while formatting", e);
+				}
+			}
+		}
+
+		async void FormatOnReturn (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var document = DocumentContext.AnalysisDocument;
+			if (document == null)
+				return;
+			var caretPosition = Editor.CaretOffset;
+			var token = await CSharpEditorFormattingService.GetTokenBeforeTheCaretAsync(document, caretPosition, cancellationToken).ConfigureAwait(false);
+			if (token.IsMissing)
+				return;
+
+			string text = null;
+			if (service.IsInvalidToken(token, ref text))
+				return;
+			// Check to see if the token is ')' and also the parent is a using statement. If not, bail
+			if (CSharpEditorFormattingService.TokenShouldNotFormatOnReturn(token))
+				return;
+			var tokenRange = FormattingRangeHelper.FindAppropriateRange(token);
+			if (tokenRange == null || !tokenRange.HasValue || tokenRange.Value.Item1.Equals(tokenRange.Value.Item2))
+				return;
+			var value = tokenRange.Value;
+			using (var undo = Editor.OpenUndoGroup ()) {
+				OnTheFlyFormatter.Format (Editor, DocumentContext, value.Item1.SpanStart, value.Item2.Span.End);
+			}
+		}
+
+		CSharpEditorFormattingService service = new CSharpEditorFormattingService ();
+
+		static bool IsSemicolonalreadyPlaced (IReadonlyTextDocument data, int caretOffset)
 		{
 			for (int pos2 = caretOffset - 1; pos2-- > 0;) {
-				var ch2 = data.Document.GetCharAt (pos2);
+				var ch2 = data.GetCharAt (pos2);
 				if (ch2 == ';') {
 					return true;
 				}
@@ -575,7 +598,7 @@ namespace MonoDevelop.CSharp.Formatting
 			return false;
 		}
 
-		public static bool GuessSemicolonInsertionOffset (TextEditorData data, ISegment curLine, int caretOffset, out int outOffset)
+		public static bool GuessSemicolonInsertionOffset (IReadonlyTextDocument data, MonoDevelop.Core.Text.ISegment curLine, int caretOffset, out int outOffset)
 		{
 			int lastNonWsOffset = caretOffset;
 			char lastNonWsChar = '\0';
@@ -598,7 +621,7 @@ namespace MonoDevelop.CSharp.Formatting
 
 			var offset = curLine.Offset;
 			string lineText = data.GetTextAt (caretOffset, max - caretOffset);
-			var lexer = new CSharpCompletionEngineBase.MiniLexer (lineText);
+			var lexer = new ICSharpCode.NRefactory.CSharp.Completion.CSharpCompletionEngineBase.MiniLexer (lineText);
 			lexer.Parse ((ch, i) => {
 				if (lexer.IsInSingleComment || lexer.IsInMultiLineComment)
 					return true;
@@ -619,13 +642,12 @@ namespace MonoDevelop.CSharp.Formatting
 			return true;
 		}
 
-		static char TranslateKeyCharForIndenter (Gdk.Key key, char keyChar, char docChar)
+		static char TranslateKeyCharForIndenter (SpecialKey key, char keyChar, char docChar)
 		{
 			switch (key) {
-			case Gdk.Key.Return:
-			case Gdk.Key.KP_Enter:
+			case SpecialKey.Return:
 				return '\n';
-			case Gdk.Key.Tab:
+			case SpecialKey.Tab:
 				return '\t';
 			default:
 				if (docChar == keyChar)
@@ -637,14 +659,14 @@ namespace MonoDevelop.CSharp.Formatting
 		// removes "\s*\+\s*" patterns (used for special behaviour inside strings)
 		void HandleStringConcatinationDeletion (int start, int end)
 		{
-			if (start < 0 || end >= textEditorData.Length || textEditorData.IsSomethingSelected)
+			if (start < 0 || end >= Editor.Length || Editor.IsSomethingSelected)
 				return;
-			char ch = textEditorData.GetCharAt (start);
+			char ch = Editor.GetCharAt (start);
 			if (ch == '"') {
 				int sgn = Math.Sign (end - start);
 				bool foundPlus = false;
-				for (int max = start + sgn; max != end && max >= 0 && max < textEditorData.Length; max += sgn) {
-					ch = textEditorData.GetCharAt (max);
+				for (int max = start + sgn; max != end && max >= 0 && max < Editor.Length; max += sgn) {
+					ch = Editor.GetCharAt (max);
 					if (Char.IsWhiteSpace (ch))
 						continue;
 					if (ch == '+') {
@@ -655,11 +677,11 @@ namespace MonoDevelop.CSharp.Formatting
 						if (!foundPlus)
 							break;
 						if (sgn < 0) {
-							textEditorData.Remove (max, start - max);
-							textEditorData.Caret.Offset = max + 1;
+							Editor.RemoveText (max, start - max);
+							Editor.CaretOffset = max + 1;
 						} else {
-							textEditorData.Remove (start + sgn, max - start);
-							textEditorData.Caret.Offset = start;
+							Editor.RemoveText (start + sgn, max - start);
+							Editor.CaretOffset = start;
 						}
 						break;
 					} else {
@@ -669,23 +691,23 @@ namespace MonoDevelop.CSharp.Formatting
 			}
 		}
 
-		void DoPreInsertionSmartIndent (Gdk.Key key)
+		void DoPreInsertionSmartIndent (SpecialKey key)
 		{
 			switch (key) {
-			case Gdk.Key.BackSpace:
-				SafeUpdateIndentEngine (textEditorData.Caret.Offset);
-				HandleStringConcatinationDeletion (textEditorData.Caret.Offset - 1, 0);
+			case SpecialKey.BackSpace:
+				SafeUpdateIndentEngine (Editor.CaretOffset);
+				HandleStringConcatinationDeletion (Editor.CaretOffset - 1, 0);
 				break;
-			case Gdk.Key.Delete:
-				SafeUpdateIndentEngine (textEditorData.Caret.Offset);
-				HandleStringConcatinationDeletion (textEditorData.Caret.Offset, textEditorData.Length);
+			case SpecialKey.Delete:
+				SafeUpdateIndentEngine (Editor.CaretOffset);
+				HandleStringConcatinationDeletion (Editor.CaretOffset, Editor.Length);
 				break;
 			}
 		}
 		//special handling for certain characters just inserted , for comments etc
 		void DoPostInsertionSmartIndent (char charInserted, out bool reIndent)
 		{
-			SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+			SafeUpdateIndentEngine (Editor.CaretOffset);
 			reIndent = false;
 			switch (charInserted) {
 			case '}':
@@ -693,7 +715,7 @@ namespace MonoDevelop.CSharp.Formatting
 				reIndent = true;
 				break;
 			case '\n':
-				if (FixLineStart (textEditorData, stateTracker, stateTracker.Location.Line))
+				if (FixLineStart (Editor, stateTracker, Editor.OffsetToLineNumber (stateTracker.Offset)))
 					return;
 				//newline always reindents unless it's had special handling
 				reIndent = true;
@@ -703,17 +725,17 @@ namespace MonoDevelop.CSharp.Formatting
 
 		internal bool wasInStringLiteral;
 
-		public bool FixLineStart (TextEditorData textEditorData, IStateMachineIndentEngine stateTracker, int lineNumber)
+		public bool FixLineStart (TextEditor textEditorData, ICSharpCode.NRefactory6.CSharp.IStateMachineIndentEngine stateTracker, int lineNumber)
 		{
-			if (lineNumber > DocumentLocation.MinLine) {
-				DocumentLine line = textEditorData.Document.GetLine (lineNumber);
+			if (lineNumber > 1) {
+				var line = textEditorData.GetLine (lineNumber);
 				if (line == null)
 					return false;
 
-				DocumentLine prevLine = textEditorData.Document.GetLine (lineNumber - 1);
+				var prevLine = textEditorData.GetLine (lineNumber - 1);
 				if (prevLine == null)
 					return false;
-				string trimmedPreviousLine = textEditorData.Document.GetTextAt (prevLine).TrimStart ();
+				string trimmedPreviousLine = textEditorData.GetTextAt (prevLine).TrimStart ();
 
 				//xml doc comments
 				//check previous line was a doc comment
@@ -723,13 +745,13 @@ namespace MonoDevelop.CSharp.Formatting
 						return false;
 					//check that the newline command actually inserted a newline
 					textEditorData.EnsureCaretIsNotVirtual ();
-					var nextLineSegment = textEditorData.Document.GetLine (lineNumber + 1);
-					string nextLine = nextLineSegment != null ? textEditorData.Document.GetTextAt (nextLineSegment).TrimStart () : "";
+					var nextLineSegment = textEditorData.GetLine (lineNumber + 1);
+					string nextLine = nextLineSegment != null ? textEditorData.GetTextAt (nextLineSegment).TrimStart () : "";
 
 					if (trimmedPreviousLine.Length > "///".Length || nextLine.StartsWith ("///", StringComparison.Ordinal)) {
-						var insertionPoint = textEditorData.Caret.Offset;
-						int inserted = textEditorData.Insert (insertionPoint, "/// ");
-						textEditorData.Caret.Offset = insertionPoint + inserted;
+						var insertionPoint = textEditorData.CaretOffset;
+						textEditorData.InsertText (insertionPoint, "/// ");
+						textEditorData.CaretOffset = insertionPoint + "/// ".Length;
 						return true;
 					}
 					//multi-line comments
@@ -746,22 +768,22 @@ namespace MonoDevelop.CSharp.Formatting
 						commentPrefix = "*";
 					}
 
-					int indentSize = line.GetIndentation (textEditorData.Document).Length;
-					var insertedText = prevLine.GetIndentation (textEditorData.Document) + commentPrefix;
-					textEditorData.Replace (line.Offset, indentSize, insertedText);
-					textEditorData.Caret.Offset = line.Offset + insertedText.Length;
+					int indentSize = line.GetIndentation (textEditorData).Length;
+					var insertedText = prevLine.GetIndentation (textEditorData) + commentPrefix;
+					textEditorData.ReplaceText (line.Offset, indentSize, insertedText);
+					textEditorData.CaretOffset = line.Offset + insertedText.Length;
 					return true;
 				} else if (wasInStringLiteral) {
-					var lexer = new CSharpCompletionEngineBase.MiniLexer (textEditorData.Document.GetTextAt (0, prevLine.EndOffset).TrimEnd ());
+					var lexer = new ICSharpCode.NRefactory.CSharp.Completion.CSharpCompletionEngineBase.MiniLexer (textEditorData.GetTextAt (0, prevLine.EndOffset).TrimEnd ());
 					lexer.Parse ();
 					if (!lexer.IsInString)
 						return false;
 					textEditorData.EnsureCaretIsNotVirtual ();
-					textEditorData.Insert (prevLine.Offset + prevLine.Length, "\" +");
+					textEditorData.InsertText (prevLine.Offset + prevLine.Length, "\" +");
 
-					int indentSize = textEditorData.Caret.Offset - line.Offset;
-					var insertedText = prevLine.GetIndentation (textEditorData.Document) + (trimmedPreviousLine.StartsWith ("\"", StringComparison.Ordinal) ? "" : "\t") + "\"";
-					textEditorData.Replace (line.Offset, indentSize, insertedText);
+					int indentSize = textEditorData.CaretOffset - line.Offset;
+					var insertedText = prevLine.GetIndentation (textEditorData) + (trimmedPreviousLine.StartsWith ("\"", StringComparison.Ordinal) ? "" : "\t") + "\"";
+					textEditorData.ReplaceText (line.Offset, indentSize, insertedText);
 					return true;
 				}
 			}
@@ -770,7 +792,7 @@ namespace MonoDevelop.CSharp.Formatting
 		//does re-indenting and cursor positioning
 		void DoReSmartIndent ()
 		{
-			DoReSmartIndent (textEditorData.Caret.Offset);
+			DoReSmartIndent (Editor.CaretOffset);
 		}
 
 		void DoReSmartIndent (int cursor)
@@ -779,26 +801,26 @@ namespace MonoDevelop.CSharp.Formatting
 			if (stateTracker.LineBeganInsideVerbatimString || stateTracker.LineBeganInsideMultiLineComment)
 				return;
 			if (DefaultSourceEditorOptions.Instance.IndentStyle == IndentStyle.Auto) {
-				textEditorData.FixVirtualIndentation ();
+				Editor.FixVirtualIndentation ();
 				return;
 			}
-			var line = textEditorData.Document.GetLineByOffset (cursor);
+			var line = Editor.GetLineByOffset (cursor);
 
 			// Get context to the end of the line w/o changing the main engine's state
 			var curTracker = stateTracker.Clone ();
 			try {
 				for (int max = cursor; max < line.EndOffset; max++) {
-					curTracker.Push (textEditorData.Document.GetCharAt (max));
+					curTracker.Push (Editor.GetCharAt (max));
 				}
 			} catch (Exception e) {
 				LoggingService.LogError ("Exception during indentation", e);
 			}
 			
 			int pos = line.Offset;
-			string curIndent = line.GetIndentation (textEditorData.Document);
+			string curIndent = line.GetIndentation (Editor);
 			int nlwsp = curIndent.Length;
 			int offset = cursor > pos + nlwsp ? cursor - (pos + nlwsp) : 0;
-			if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && textEditorData.Document.GetCharAt (line.Offset + nlwsp) == '*')) {
+			if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && Editor.GetCharAt (line.Offset + nlwsp) == '*')) {
 				// Possibly replace the indent
 				string newIndent = curTracker.ThisLineIndent;
 				int newIndentLength = newIndent.Length;
@@ -807,9 +829,9 @@ namespace MonoDevelop.CSharp.Formatting
 						if (pos < CompletionWindowManager.CodeCompletionContext.TriggerOffset)
 							CompletionWindowManager.CodeCompletionContext.TriggerOffset -= nlwsp;
 					}
-
-					newIndentLength = textEditorData.Replace (pos, nlwsp, newIndent);
-					textEditorData.Document.CommitLineUpdate (textEditorData.Caret.Line);
+					newIndentLength = newIndent.Length;
+					Editor.ReplaceText (pos, nlwsp, newIndent);
+					//textEditorData.CommitLineUpdate (textEditorData.CaretLine);
 					CompletionWindowManager.HideWindow ();
 				}
 				pos += newIndentLength;
@@ -819,7 +841,7 @@ namespace MonoDevelop.CSharp.Formatting
 
 			pos += offset;
 
-			textEditorData.FixVirtualIndentation ();
+			Editor.FixVirtualIndentation ();
 		}
 
 		/*
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs
new file mode 100644
index 0000000000..cc4d6f58c6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs
@@ -0,0 +1,90 @@
+//
+// TextPasteIndentEngine.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Text;
+
+namespace MonoDevelop.CSharp.Formatting
+{
+	class CSharpTextPasteHandler : TextPasteHandler
+	{
+		readonly ICSharpCode.NRefactory6.CSharp.ITextPasteHandler engine;
+		readonly CSharpTextEditorIndentation indent;
+
+		public CSharpTextPasteHandler (CSharpTextEditorIndentation indent, ICSharpCode.NRefactory6.CSharp.IStateMachineIndentEngine decoratedEngine, OptionSet formattingOptions)
+		{
+			this.engine = new ICSharpCode.NRefactory6.CSharp.TextPasteIndentEngine (decoratedEngine, formattingOptions);
+			this.indent = indent;
+		}
+
+		public override string FormatPlainText (int offset, string text, byte[] copyData)
+		{
+			return engine.FormatPlainText (indent.Editor, offset, text, copyData);
+		}
+
+		public override byte[] GetCopyData (int offset, int length)
+		{
+			return engine.GetCopyData (indent.Editor, new TextSpan (offset, length));
+		}
+
+		public override void PostFomatPastedText (int insertionOffset, int insertedChars)
+		{
+			if (indent.Editor.Options.IndentStyle == IndentStyle.None ||
+				indent.Editor.Options.IndentStyle == IndentStyle.Auto)
+				return;
+
+			// Just correct the start line of the paste operation - the text is already indented.
+			var curLine = indent.Editor.GetLineByOffset (insertionOffset);
+			var curLineOffset = curLine.Offset;
+			indent.SafeUpdateIndentEngine (curLineOffset);
+			if (!indent.stateTracker.IsInsideOrdinaryCommentOrString) {
+				int pos = curLineOffset;
+				string curIndent = curLine.GetIndentation (indent.Editor);
+				int nlwsp = curIndent.Length;
+
+				if (!indent.stateTracker.LineBeganInsideMultiLineComment || (nlwsp < curLine.LengthIncludingDelimiter && indent.Editor.GetCharAt (curLineOffset + nlwsp) == '*')) {
+					// Possibly replace the indent
+					indent.SafeUpdateIndentEngine (curLineOffset + curLine.Length);
+					string newIndent = indent.stateTracker.ThisLineIndent;
+					if (newIndent != curIndent) {
+						if (CompletionWindowManager.IsVisible) {
+							if (pos < CompletionWindowManager.CodeCompletionContext.TriggerOffset)
+								CompletionWindowManager.CodeCompletionContext.TriggerOffset -= nlwsp;
+						}
+						indent.Editor.ReplaceText (pos, nlwsp, newIndent);
+						//						textEditorData.Document.CommitLineUpdate (textEditorData.CaretLine);
+					}
+				}
+			}
+			indent.Editor.FixVirtualIndentation ();
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/NewFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/NewFormattingProfileDialog.cs
index c9d37eaa91..5794cf9fad 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/NewFormattingProfileDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/NewFormattingProfileDialog.cs
@@ -36,14 +36,14 @@ namespace MonoDevelop.CSharp.Formatting
 		}
 		
 		
-		public CSharpFormattingPolicy InitializeFrom {
+		internal CSharpFormattingPolicy InitializeFrom {
 			get {
 				return policies[comboboxInitFrom.Active];
 			}
 		}
 		
 		readonly List<CSharpFormattingPolicy> policies;
-		public NewFormattingProfileDialog (List<CSharpFormattingPolicy> policies)
+		internal NewFormattingProfileDialog (List<CSharpFormattingPolicy> policies)
 		{
 			// ReSharper disable once DoNotCallOverridableMethodsInConstructor
 			this.Build ();
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs
index e8bb9b6b7d..239b50ce89 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs
@@ -23,244 +23,106 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using Mono.TextEditor;
+
 using MonoDevelop.Ide;
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Policies;
-using ICSharpCode.NRefactory.CSharp;
-using System.Text;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
+using System.Linq;
 using MonoDevelop.CSharp.Completion;
 using MonoDevelop.CSharp.Refactoring;
 using MonoDevelop.CSharp.Parser;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp.Completion;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Gui.Content;
+using Microsoft.CodeAnalysis.CSharp;
 
 namespace MonoDevelop.CSharp.Formatting
 {
 	static class OnTheFlyFormatter
 	{
-		public static void Format (MonoDevelop.Ide.Gui.Document data)
-		{
-			Format (data, 0, data.Editor.Length);
-		}
-
-		public static void Format (MonoDevelop.Ide.Gui.Document data, TextLocation location)
+		public static void Format (TextEditor editor, DocumentContext context)
 		{
-			Format (data, location, location, false);
-		} 
-
-		public static void Format (MonoDevelop.Ide.Gui.Document data, TextLocation startLocation, TextLocation endLocation, bool exact = true)
+			Format (editor, context, 0, editor.Length);
+		}

+

+		//		public static void Format (TextEditor editor, DocumentContext context, TextLocation location)

+		//		{

+		//			Format (editor, context, location, location, false);

+		//		} 

+		//

+		//		public static void Format (TextEditor editor, DocumentContext context, TextLocation startLocation, TextLocation endLocation, bool exact = true)

+		//		{

+		//			Format (editor, context, editor.LocationToOffset (startLocation), editor.LocationToOffset (endLocation), exact);

+		//		}

+

+		public static void Format (TextEditor editor, DocumentContext context, int startOffset, int endOffset, bool exact = true)
 		{
-			Format (data, data.Editor.LocationToOffset (startLocation), data.Editor.LocationToOffset (endLocation), exact);
-		}
-		
-		public static void Format (MonoDevelop.Ide.Gui.Document data, int startOffset, int endOffset, bool exact = true)
-		{
-			var policyParent = data.Project != null ? data.Project.Policies : PolicyService.DefaultPolicies;
+			var policyParent = context.Project != null ? context.Project.Policies : PolicyService.DefaultPolicies;
 			var mimeTypeChain = DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
-			Format (policyParent, mimeTypeChain, data, startOffset, endOffset, exact);
+			Format (policyParent, mimeTypeChain, editor, context, startOffset, endOffset, exact);
 		}
 
-		public static void FormatStatmentAt (MonoDevelop.Ide.Gui.Document data, DocumentLocation location)
+		public static void FormatStatmentAt (TextEditor editor, DocumentContext context, MonoDevelop.Ide.Editor.DocumentLocation location)
 		{
-			var offset = data.Editor.LocationToOffset (location);
-			var policyParent = data.Project != null ? data.Project.Policies : PolicyService.DefaultPolicies;
+			var offset = editor.LocationToOffset (location);
+			var policyParent = context.Project != null ? context.Project.Policies : PolicyService.DefaultPolicies;
 			var mimeTypeChain = DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
-			Format (policyParent, mimeTypeChain, data, offset, offset, false, true);
-		}		
-		
-
-		static string BuildStub (MonoDevelop.Ide.Gui.Document data, CSharpCompletionTextEditorExtension.TypeSystemTreeSegment seg, int endOffset, out int memberStartOffset)
-		{
-			var pf = data.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (pf == null) {
-				memberStartOffset = 0;
-				return null;
-			}
-			
-			var sb = new StringBuilder ();
-			
-			int closingBrackets = 0;
-			// use the member start location to determine the using scope, because this information is in sync, the position in
-			// the file may have changed since last parse run (we have up 2 date locations from the type segment tree).
-			var scope = pf.GetUsingScope (seg.Entity.Region.Begin);
-
-			while (scope != null && !string.IsNullOrEmpty (scope.NamespaceName)) {
-				// Hack: some syntax errors lead to invalid namespace names.
-				if (scope.NamespaceName.EndsWith ("<invalid>", StringComparison.Ordinal)) {
-					scope = scope.Parent;
-					continue;
-				}
-				sb.Append ("namespace Stub {");
-				sb.Append (data.Editor.EolMarker);
-				closingBrackets++;
-				while (scope.Parent != null && scope.Parent.Region == scope.Region)
-					scope = scope.Parent;
-				scope = scope.Parent;
-			}
-
-			var parent = seg.Entity.DeclaringTypeDefinition;
-			while (parent != null) {
-				sb.Append ("class " + parent.Name + " {");
-				sb.Append (data.Editor.EolMarker);
-				closingBrackets++;
-				parent = parent.DeclaringTypeDefinition;
-			}
-
-			var segmentLine = data.Editor.GetLineByOffset (seg.Offset);
-			memberStartOffset = sb.Length + seg.Offset - segmentLine.Offset;
-			var text = data.Editor.GetTextBetween (Math.Max (0, segmentLine.Offset), endOffset);
-			sb.Append (text);
-			var lex = new CSharpCompletionEngineBase.MiniLexer (text);
-			lex.Parse ((ch,i) => {
-				if (lex.IsInString || lex.IsInChar || lex.IsInVerbatimString || lex.IsInSingleComment || lex.IsInMultiLineComment || lex.IsInPreprocessorDirective)
-					return false;
-				if (ch =='{') {
-					closingBrackets++;
-				} else if (ch =='}') {
-					closingBrackets--;
-				}
-				return false;
-			});
-
-
-			// Insert at least caret column eol markers otherwise the reindent of the generated closing bracket
-			// could interfere with the current indentation.
-			var endLocation = data.Editor.OffsetToLocation (endOffset);
-			for (int i = 0; i <= endLocation.Column; i++) {
-				sb.Append (data.Editor.EolMarker);
-			}
-			sb.Append (data.Editor.EolMarker);
-			sb.Append (new string ('}', closingBrackets));
-			return sb.ToString ();
+			Format (policyParent, mimeTypeChain, editor, context, offset, offset, false, true);
 		}
-		
-		static FormattingChanges GetFormattingChanges (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, MonoDevelop.Ide.Gui.Document document, string input, DomRegion formattingRegion, ref int formatStartOffset, ref int formatLength, bool formatLastStatementOnly)
-		{
-			using (var stubData = TextEditorData.CreateImmutable (input)) {
-				stubData.Document.FileName = document.FileName;
-				var parser = document.HasProject ? new CSharpParser (TypeSystemParser.GetCompilerArguments (document.Project)) : new CSharpParser ();
-				var compilationUnit = parser.Parse (stubData);
-				bool hadErrors = parser.HasErrors;
-				if (hadErrors) {
-					using (var stubData2 = TextEditorData.CreateImmutable (input + "}")) {
-						compilationUnit = parser.Parse (stubData2);
-						hadErrors = parser.HasErrors;
-					}
-				}
-				// try it out, if the behavior is better when working only with correct code.
-				if (hadErrors) {
-					return null;
-				}
-				
-				var policy = policyParent.Get<CSharpFormattingPolicy> (mimeTypeChain);
-				
-				var formattingVisitor = new ICSharpCode.NRefactory.CSharp.CSharpFormatter (policy.CreateOptions (), document.Editor.CreateNRefactoryTextEditorOptions ());
-				formattingVisitor.FormattingMode = FormattingMode.Intrusive;
-				formattingVisitor.AddFormattingRegion (formattingRegion);
-
 
-				var changes = formattingVisitor.AnalyzeFormatting (stubData.Document, compilationUnit);
-
-				if (formatLastStatementOnly) {
-					AstNode node = compilationUnit.GetAdjacentNodeAt<Statement> (stubData.OffsetToLocation (formatStartOffset + formatLength - 1));
-					if (node != null) {
-						while (node.Role == Roles.EmbeddedStatement || node.Role == IfElseStatement.TrueRole || node.Role == IfElseStatement.FalseRole)
-							node = node.Parent;
-						// include indentation if node starts in new line
-						var formatNode = node.GetPrevNode ();
-						if (formatNode.Role != Roles.NewLine)
-							formatNode = node;
-						var start = stubData.LocationToOffset (formatNode.StartLocation);
-						if (start > formatStartOffset) {
-							var end = stubData.LocationToOffset (node.EndLocation);
-							formatStartOffset = start;
-							formatLength = end - start;
-						}
-					}
-				}
-				return changes;
-			}
-		}
-		
-		public static void Format (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, MonoDevelop.Ide.Gui.Document data, int startOffset, int endOffset, bool exact, bool formatLastStatementOnly = false)
+		static void Format (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, TextEditor editor, DocumentContext context, int startOffset, int endOffset, bool exact, bool formatLastStatementOnly = false)
 		{
-			if (data.ParsedDocument == null)
-				return;
-			var ext = data.GetContent<CSharpCompletionTextEditorExtension> ();
-			if (ext == null)
-				return;
-			string text;
-			int formatStartOffset, formatLength, realTextDelta;
-			DomRegion formattingRegion;
-			int startDelta = 1;
+			TextSpan span;
 			if (exact) {
-				text = data.Editor.Text;
-				var seg = ext.GetMemberSegmentAt (startOffset);
-				var seg2 = ext.GetMemberSegmentAt (endOffset);
-				if (seg != null && seg == seg2) {
-					var member = seg.Entity;
-					if (member == null || member.Region.IsEmpty || member.BodyRegion.End.IsEmpty)
-						return;
-
-					text = BuildStub (data, seg, endOffset, out formatStartOffset);
-					startDelta = startOffset - seg.Offset;
-					formatLength = endOffset - startOffset + startDelta;
-					realTextDelta = seg.Offset - formatStartOffset;
-					formattingRegion = new DomRegion (data.Editor.OffsetToLocation (formatStartOffset), data.Editor.OffsetToLocation (endOffset));
-				} else {
-					formatStartOffset = startOffset;
-					formatLength = endOffset - startOffset;
-					realTextDelta = 0;
-					formattingRegion = new DomRegion (data.Editor.OffsetToLocation (startOffset), data.Editor.OffsetToLocation (endOffset));
-				}
+				span = new TextSpan (startOffset, endOffset - startOffset);
 			} else {
-				var seg = ext.GetMemberSegmentAt (startOffset - 1);
-				if (seg == null) {
-					return;
-				}
-				var member = seg.Entity;
-				if (member == null)
-					return;
-	
-				// Build stub
-				text = BuildStub (data, seg, startOffset, out formatStartOffset);
-				formattingRegion = new DomRegion (data.Editor.OffsetToLocation (formatStartOffset), data.Editor.OffsetToLocation (endOffset));
-
-				formatLength = endOffset - seg.Offset;
-				realTextDelta = seg.Offset - formatStartOffset;
+				span = new TextSpan (0, endOffset);
 			}
-			// Get changes from formatting visitor
-			var changes = GetFormattingChanges (policyParent, mimeTypeChain, data, text, formattingRegion, ref formatStartOffset, ref formatLength, formatLastStatementOnly);
-			if (changes == null)
-				return;
 
-			// Do the actual formatting
-//			var originalVersion = data.Editor.Document.Version;
+			var analysisDocument = context.AnalysisDocument;
+			if (analysisDocument == null)
+				return;
 
-			using (var undo = data.Editor.OpenUndoGroup (OperationType.Format)) {
+			using (var undo = editor.OpenUndoGroup (/*OperationType.Format*/)) {
 				try {
-					changes.ApplyChanges (formatStartOffset + startDelta, Math.Max (0, formatLength - startDelta - 1), delegate (int replaceOffset, int replaceLength, string insertText) {
-						int translatedOffset = realTextDelta + replaceOffset;
-						data.Editor.Document.CommitLineUpdate (data.Editor.OffsetToLineNumber (translatedOffset));
-						data.Editor.Replace (translatedOffset, replaceLength, insertText);
-					}, (replaceOffset, replaceLength, insertText) => {
-						int translatedOffset = realTextDelta + replaceOffset;
-						if (translatedOffset < 0 || translatedOffset + replaceLength > data.Editor.Length || replaceLength < 0)
-							return true;
-						return data.Editor.GetTextAt (translatedOffset, replaceLength) == insertText;
-					});
+					var syntaxTree = analysisDocument.GetSyntaxTreeAsync ().Result;
+
+					if (formatLastStatementOnly) {
+						var root = syntaxTree.GetRoot ();
+						var token = root.FindToken (endOffset);
+						var tokens = ICSharpCode.NRefactory6.CSharp.FormattingRangeHelper.FindAppropriateRange (token);
+						if (tokens.HasValue) {
+							span = new TextSpan (tokens.Value.Item1.SpanStart, tokens.Value.Item2.Span.End - tokens.Value.Item1.SpanStart);
+						} else {
+							var parent = token.Parent;
+							if (parent != null)
+								span = parent.FullSpan;
+						}
+					}
+
+					var policy = policyParent.Get<CSharpFormattingPolicy> (mimeTypeChain);
+					var textPolicy = policyParent.Get<TextStylePolicy> (mimeTypeChain);
+
+					var doc = Formatter.FormatAsync (analysisDocument, span, policy.CreateOptions (textPolicy)).Result;
+					var newTree = doc.GetSyntaxTreeAsync ().Result;
+					var caretOffset = editor.CaretOffset;
+					foreach (var change in newTree.GetChanges (syntaxTree).OrderByDescending (c => c.Span.Start) ) {
+						if (!exact && change.Span.Start >= caretOffset)
+							continue;
+						var newText = change.NewText;
+						if (editor.EolMarker != "\r\n")
+							newText = newText.Replace ("\r", "");
+						editor.ReplaceText (change.Span.Start, change.Span.Length, newText); 
+					}
+					if (editor.CaretColumn == 1)
+						editor.CaretColumn = editor.GetVirtualIndentationColumn (editor.CaretLine);
 				} catch (Exception e) {
 					LoggingService.LogError ("Error in on the fly formatter", e);
 				}
-
-//				var currentVersion = data.Editor.Document.Version;
-//				data.Editor.Caret.Offset = originalVersion.MoveOffsetTo (currentVersion, caretOffset, ICSharpCode.NRefactory.Editor.AnchorMovementType.Default);
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml
index be1a18f6b7..f346f57e49 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml
@@ -27,138 +27,48 @@ THE SOFTWARE.
 -->
 
 <CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="False">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>True</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<SimplePropertyFormatting>AllowOneLine</SimplePropertyFormatting>
-	<AutoPropertyFormatting>AllowOneLine</AutoPropertyFormatting>
-	<NamespaceBraceStyle>NextLine</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLine</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLine</InterfaceBraceStyle>
-	<StructBraceStyle>NextLine</StructBraceStyle>
-	<EnumBraceStyle>NextLine</EnumBraceStyle>
-	<MethodBraceStyle>NextLine</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>NextLine</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLine</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLine</DestructorBraceStyle>
-	<PropertyBraceStyle>NextLine</PropertyBraceStyle>
-	<PropertyGetBraceStyle>NextLine</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>NextLine</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>NextLine</EventBraceStyle>
-	<EventAddBraceStyle>NextLine</EventAddBraceStyle>
-	<EventRemoveBraceStyle>NextLine</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>NextLine</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>NewLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>NewLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>NewLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>DoNotCare</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>DoNotChange</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>NextLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>False</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>False</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>False</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>False</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>False</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>False</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentPreprocessorDirectives>True</IndentPreprocessorDirectives>
-	<IndentBlocksInsideExpressions>True</IndentBlocksInsideExpressions>
+	<IndentBlock>True</IndentBlock>
+	<IndentBraces>False</IndentBraces>
+	<IndentSwitchSection>True</IndentSwitchSection>
+	<IndentSwitchCaseSection>True</IndentSwitchCaseSection>
+	<LabelPositioning>OneLess</LabelPositioning>
+	<NewLinesForBracesInTypes>True</NewLinesForBracesInTypes>
+	<NewLinesForBracesInMethods>True</NewLinesForBracesInMethods>
+	<NewLinesForBracesInAnonymousMethods>True</NewLinesForBracesInAnonymousMethods>
+	<NewLinesForBracesInControlBlocks>True</NewLinesForBracesInControlBlocks>
+	<NewLinesForBracesInAnonymousTypes>True</NewLinesForBracesInAnonymousTypes>
+	<NewLinesForBracesInObjectInitializers>True</NewLinesForBracesInObjectInitializers>
+	<NewLinesForBracesInLambdaExpressionBody>True</NewLinesForBracesInLambdaExpressionBody>
+	<NewLineForElse>True</NewLineForElse>
+	<NewLineForCatch>True</NewLineForCatch>
+	<NewLineForFinally>True</NewLineForFinally>
+	<NewLineForMembersInObjectInit>True</NewLineForMembersInObjectInit>
+	<NewLineForMembersInAnonymousTypes>True</NewLineForMembersInAnonymousTypes>
+	<NewLineForClausesInQuery>True</NewLineForClausesInQuery>
+	<SpacingAfterMethodDeclarationName>False</SpacingAfterMethodDeclarationName>
+	<SpaceWithinMethodDeclarationParenthesis>False</SpaceWithinMethodDeclarationParenthesis>
+	<SpaceBetweenEmptyMethodDeclarationParentheses>False</SpaceBetweenEmptyMethodDeclarationParentheses>
+	<SpaceAfterMethodCallName>False</SpaceAfterMethodCallName>
+	<SpaceWithinMethodCallParentheses>False</SpaceWithinMethodCallParentheses>
+	<SpaceBetweenEmptyMethodCallParentheses>False</SpaceBetweenEmptyMethodCallParentheses>
+	<SpaceAfterControlFlowStatementKeyword>True</SpaceAfterControlFlowStatementKeyword>
+	<SpaceWithinExpressionParentheses>False</SpaceWithinExpressionParentheses>
+	<SpaceWithinCastParentheses>False</SpaceWithinCastParentheses>
+	<SpaceWithinOtherParentheses>False</SpaceWithinOtherParentheses>
+	<SpaceAfterCast>False</SpaceAfterCast>
+	<SpacesIgnoreAroundVariableDeclaration>False</SpacesIgnoreAroundVariableDeclaration>
+	<SpaceBeforeOpenSquareBracket>False</SpaceBeforeOpenSquareBracket>
+	<SpaceBetweenEmptySquareBrackets>False</SpaceBetweenEmptySquareBrackets>
+	<SpaceWithinSquareBrackets>False</SpaceWithinSquareBrackets>
+	<SpaceAfterColonInBaseTypeDeclaration>True</SpaceAfterColonInBaseTypeDeclaration>
+	<SpaceAfterComma>True</SpaceAfterComma>
+	<SpaceAfterDot>False</SpaceAfterDot>
+	<SpaceAfterSemicolonsInForStatement>True</SpaceAfterSemicolonsInForStatement>
+	<SpaceBeforeColonInBaseTypeDeclaration>True</SpaceBeforeColonInBaseTypeDeclaration>
+	<SpaceBeforeComma>False</SpaceBeforeComma>
+	<SpaceBeforeDot>False</SpaceBeforeDot>
+	<SpaceBeforeSemicolonsInForStatement>False</SpaceBeforeSemicolonsInForStatement>
+	<SpacingAroundBinaryOperator>Single</SpacingAroundBinaryOperator>
+	<WrappingPreserveSingleLine>True</WrappingPreserveSingleLine>
+	<WrappingKeepStatementsOnSingleLine>True</WrappingKeepStatementsOnSingleLine>
 </CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml
deleted file mode 100644
index a40b19ac24..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<!--
-
-GNUCSharpPolicy.xml
- 
-Author:
-      Mike Krüger <mkrueger@xamarin.com>
-
-Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-
-<CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="False">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>True</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<PropertyFormatting>AllowOneLine</PropertyFormatting>
-	<NamespaceBraceStyle>NextLine</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLine</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLine</InterfaceBraceStyle>
-	<StructBraceStyle>NextLine</StructBraceStyle>
-	<EnumBraceStyle>NextLine</EnumBraceStyle>
-	<MethodBraceStyle>NextLine</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>EndOfLine</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLine</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLine</DestructorBraceStyle>
-	<PropertyBraceStyle>EndOfLine</PropertyBraceStyle>
-	<PropertyGetBraceStyle>EndOfLine</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>EndOfLine</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>EndOfLine</EventBraceStyle>
-	<EventAddBraceStyle>EndOfLine</EventAddBraceStyle>
-	<EventRemoveBraceStyle>EndOfLine</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>NextLineShifted2</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>SameLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>SameLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>SameLine</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>WrapIfTooLong</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>EndOfLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>False</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>False</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>False</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>False</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>False</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>False</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentBlocksInsideExpressions>False</IndentBlocksInsideExpressions>
-</CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUTextStylePolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUTextStylePolicy.xml
deleted file mode 100644
index e04fa3260f..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUTextStylePolicy.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
-GNUTextStylePolicy.xml
- 
-Author:
-      Mike Krüger <mkrueger@xamarin.com>
-
-Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<TextStylePolicy scope="text/x-csharp">
-	<FileWidth>120</FileWidth>
-	<TabWidth>4</TabWidth>
-	<IndentWidth>2</IndentWidth>
-	<TabsToSpaces>True</TabsToSpaces>
-	<NoTabsAfterNonTabs>False</NoTabsAfterNonTabs>
-	<RemoveTrailingWhitespace>True</RemoveTrailingWhitespace>
-	<EolMarker>Unix</EolMarker>
-</TextStylePolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml
index b9f7b6b8a6..92cb6cd61e 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml
@@ -27,138 +27,48 @@ THE SOFTWARE.
 -->
 
 <CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="False">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>True</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<SimplePropertyFormatting>AllowOneLine</SimplePropertyFormatting>
-	<AutoPropertyFormatting>AllowOneLine</AutoPropertyFormatting>
-	<NamespaceBraceStyle>NextLine</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLine</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLine</InterfaceBraceStyle>
-	<StructBraceStyle>NextLine</StructBraceStyle>
-	<EnumBraceStyle>NextLine</EnumBraceStyle>
-	<MethodBraceStyle>NextLine</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>EndOfLine</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLine</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLine</DestructorBraceStyle>
-	<PropertyBraceStyle>EndOfLine</PropertyBraceStyle>
-	<PropertyGetBraceStyle>EndOfLine</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>EndOfLine</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>EndOfLine</EventBraceStyle>
-	<EventAddBraceStyle>EndOfLine</EventAddBraceStyle>
-	<EventRemoveBraceStyle>EndOfLine</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>EndOfLine</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>SameLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>SameLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>SameLine</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>WrapIfTooLong</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>EndOfLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>False</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>False</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>False</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>False</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>False</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>False</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentPreprocessorDirectives>True</IndentPreprocessorDirectives>
-	<IndentBlocksInsideExpressions>False</IndentBlocksInsideExpressions>
+	<IndentBlock>True</IndentBlock>
+	<IndentBraces>False</IndentBraces>
+	<IndentSwitchSection>True</IndentSwitchSection>
+	<IndentSwitchCaseSection>True</IndentSwitchCaseSection>
+	<LabelPositioning>OneLess</LabelPositioning>
+	<NewLinesForBracesInTypes>True</NewLinesForBracesInTypes>
+	<NewLinesForBracesInMethods>True</NewLinesForBracesInMethods>
+	<NewLinesForBracesInAnonymousMethods>False</NewLinesForBracesInAnonymousMethods>
+	<NewLinesForBracesInControlBlocks>False</NewLinesForBracesInControlBlocks>
+	<NewLinesForBracesInAnonymousTypes>False</NewLinesForBracesInAnonymousTypes>
+	<NewLinesForBracesInObjectInitializers>False</NewLinesForBracesInObjectInitializers>
+	<NewLinesForBracesInLambdaExpressionBody>False</NewLinesForBracesInLambdaExpressionBody>
+	<NewLineForElse>False</NewLineForElse>
+	<NewLineForCatch>False</NewLineForCatch>
+	<NewLineForFinally>False</NewLineForFinally>
+	<NewLineForMembersInObjectInit>False</NewLineForMembersInObjectInit>
+	<NewLineForMembersInAnonymousTypes>False</NewLineForMembersInAnonymousTypes>
+	<NewLineForClausesInQuery>False</NewLineForClausesInQuery>
+	<SpacingAfterMethodDeclarationName>False</SpacingAfterMethodDeclarationName>
+	<SpaceWithinMethodDeclarationParenthesis>False</SpaceWithinMethodDeclarationParenthesis>
+	<SpaceBetweenEmptyMethodDeclarationParentheses>False</SpaceBetweenEmptyMethodDeclarationParentheses>
+	<SpaceAfterMethodCallName>False</SpaceAfterMethodCallName>
+	<SpaceWithinMethodCallParentheses>False</SpaceWithinMethodCallParentheses>
+	<SpaceBetweenEmptyMethodCallParentheses>False</SpaceBetweenEmptyMethodCallParentheses>
+	<SpaceAfterControlFlowStatementKeyword>True</SpaceAfterControlFlowStatementKeyword>
+	<SpaceWithinExpressionParentheses>False</SpaceWithinExpressionParentheses>
+	<SpaceWithinCastParentheses>False</SpaceWithinCastParentheses>
+	<SpaceWithinOtherParentheses>False</SpaceWithinOtherParentheses>
+	<SpaceAfterCast>False</SpaceAfterCast>
+	<SpacesIgnoreAroundVariableDeclaration>False</SpacesIgnoreAroundVariableDeclaration>
+	<SpaceBeforeOpenSquareBracket>False</SpaceBeforeOpenSquareBracket>
+	<SpaceBetweenEmptySquareBrackets>False</SpaceBetweenEmptySquareBrackets>
+	<SpaceWithinSquareBrackets>False</SpaceWithinSquareBrackets>
+	<SpaceAfterColonInBaseTypeDeclaration>True</SpaceAfterColonInBaseTypeDeclaration>
+	<SpaceAfterComma>True</SpaceAfterComma>
+	<SpaceAfterDot>False</SpaceAfterDot>
+	<SpaceAfterSemicolonsInForStatement>True</SpaceAfterSemicolonsInForStatement>
+	<SpaceBeforeColonInBaseTypeDeclaration>True</SpaceBeforeColonInBaseTypeDeclaration>
+	<SpaceBeforeComma>False</SpaceBeforeComma>
+	<SpaceBeforeDot>False</SpaceBeforeDot>
+	<SpaceBeforeSemicolonsInForStatement>False</SpaceBeforeSemicolonsInForStatement>
+	<SpacingAroundBinaryOperator>Single</SpacingAroundBinaryOperator>
+	<WrappingPreserveSingleLine>True</WrappingPreserveSingleLine>
+	<WrappingKeepStatementsOnSingleLine>True</WrappingKeepStatementsOnSingleLine>
 </CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml
index 9924d6f2c3..1a9b87ab52 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml
@@ -27,140 +27,48 @@ THE SOFTWARE.
 -->
 
 <CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="True">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>False</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<SimplePropertyFormatting>AllowOneLine</SimplePropertyFormatting>
-	<AutoPropertyFormatting>AllowOneLine</AutoPropertyFormatting>
-	<NamespaceBraceStyle>NextLine</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLine</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLine</InterfaceBraceStyle>
-	<StructBraceStyle>NextLine</StructBraceStyle>
-	<EnumBraceStyle>NextLine</EnumBraceStyle>
-	<MethodBraceStyle>NextLine</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>EndOfLine</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLine</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLine</DestructorBraceStyle>
-	<PropertyBraceStyle>EndOfLine</PropertyBraceStyle>
-	<PropertyGetBraceStyle>EndOfLine</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>EndOfLine</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>EndOfLine</EventBraceStyle>
-	<EventAddBraceStyle>EndOfLine</EventAddBraceStyle>
-	<EventRemoveBraceStyle>EndOfLine</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>EndOfLine</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>SameLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>SameLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>SameLine</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>WrapIfTooLong</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>EndOfLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>True</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>True</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>True</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>DoNotCare</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>DoNotCare</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>True</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>True</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>True</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentPreprocessorDirectives>True</IndentPreprocessorDirectives>
-	<AlignToFirstIndexerArgument>False</AlignToFirstIndexerArgument>
-	<AlignToFirstMethodCallArgument>False</AlignToFirstMethodCallArgument>
-	<IndentBlocksInsideExpressions>False</IndentBlocksInsideExpressions>
+	<IndentBlock>True</IndentBlock>
+	<IndentBraces>False</IndentBraces>
+	<IndentSwitchSection>False</IndentSwitchSection>
+	<IndentSwitchCaseSection>True</IndentSwitchCaseSection>
+	<LabelPositioning>OneLess</LabelPositioning>
+	<NewLinesForBracesInTypes>True</NewLinesForBracesInTypes>
+	<NewLinesForBracesInMethods>True</NewLinesForBracesInMethods>
+	<NewLinesForBracesInAnonymousMethods>False</NewLinesForBracesInAnonymousMethods>
+	<NewLinesForBracesInControlBlocks>False</NewLinesForBracesInControlBlocks>
+	<NewLinesForBracesInAnonymousTypes>False</NewLinesForBracesInAnonymousTypes>
+	<NewLinesForBracesInObjectInitializers>False</NewLinesForBracesInObjectInitializers>
+	<NewLinesForBracesInLambdaExpressionBody>False</NewLinesForBracesInLambdaExpressionBody>
+	<NewLineForElse>False</NewLineForElse>
+	<NewLineForCatch>False</NewLineForCatch>
+	<NewLineForFinally>False</NewLineForFinally>
+	<NewLineForMembersInObjectInit>False</NewLineForMembersInObjectInit>
+	<NewLineForMembersInAnonymousTypes>False</NewLineForMembersInAnonymousTypes>
+	<NewLineForClausesInQuery>False</NewLineForClausesInQuery>
+	<SpacingAfterMethodDeclarationName>True</SpacingAfterMethodDeclarationName>
+	<SpaceWithinMethodDeclarationParenthesis>False</SpaceWithinMethodDeclarationParenthesis>
+	<SpaceBetweenEmptyMethodDeclarationParentheses>False</SpaceBetweenEmptyMethodDeclarationParentheses>
+	<SpaceAfterMethodCallName>True</SpaceAfterMethodCallName>
+	<SpaceWithinMethodCallParentheses>False</SpaceWithinMethodCallParentheses>
+	<SpaceBetweenEmptyMethodCallParentheses>False</SpaceBetweenEmptyMethodCallParentheses>
+	<SpaceAfterControlFlowStatementKeyword>True</SpaceAfterControlFlowStatementKeyword>
+	<SpaceWithinExpressionParentheses>False</SpaceWithinExpressionParentheses>
+	<SpaceWithinCastParentheses>False</SpaceWithinCastParentheses>
+	<SpaceWithinOtherParentheses>False</SpaceWithinOtherParentheses>
+	<SpaceAfterCast>False</SpaceAfterCast>
+	<SpacesIgnoreAroundVariableDeclaration>False</SpacesIgnoreAroundVariableDeclaration>
+	<SpaceBeforeOpenSquareBracket>True</SpaceBeforeOpenSquareBracket>
+	<SpaceBetweenEmptySquareBrackets>False</SpaceBetweenEmptySquareBrackets>
+	<SpaceWithinSquareBrackets>False</SpaceWithinSquareBrackets>
+	<SpaceAfterColonInBaseTypeDeclaration>True</SpaceAfterColonInBaseTypeDeclaration>
+	<SpaceAfterComma>True</SpaceAfterComma>
+	<SpaceAfterDot>False</SpaceAfterDot>
+	<SpaceAfterSemicolonsInForStatement>True</SpaceAfterSemicolonsInForStatement>
+	<SpaceBeforeColonInBaseTypeDeclaration>True</SpaceBeforeColonInBaseTypeDeclaration>
+	<SpaceBeforeComma>False</SpaceBeforeComma>
+	<SpaceBeforeDot>False</SpaceBeforeDot>
+	<SpaceBeforeSemicolonsInForStatement>False</SpaceBeforeSemicolonsInForStatement>
+	<SpacingAroundBinaryOperator>Single</SpacingAroundBinaryOperator>
+	<WrappingPreserveSingleLine>True</WrappingPreserveSingleLine>
+	<WrappingKeepStatementsOnSingleLine>True</WrappingKeepStatementsOnSingleLine>
 </CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml
deleted file mode 100644
index 396628950f..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!--
-
-SharpDevelopCSharpPolicy.xml
- 
-Author:
-      Mike Krüger <mkrueger@xamarin.com>
-
-Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="False">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>True</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<SimplePropertyFormatting>AllowOneLine</SimplePropertyFormatting>
-	<AutoPropertyFormatting>AllowOneLine</AutoPropertyFormatting>
-	<NamespaceBraceStyle>NextLine</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLine</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLine</InterfaceBraceStyle>
-	<StructBraceStyle>NextLine</StructBraceStyle>
-	<EnumBraceStyle>NextLine</EnumBraceStyle>
-	<MethodBraceStyle>NextLine</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>EndOfLine</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLine</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLine</DestructorBraceStyle>
-	<PropertyBraceStyle>EndOfLine</PropertyBraceStyle>
-	<PropertyGetBraceStyle>EndOfLine</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>EndOfLine</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>EndOfLine</EventBraceStyle>
-	<EventAddBraceStyle>EndOfLine</EventAddBraceStyle>
-	<EventRemoveBraceStyle>EndOfLine</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>EndOfLine</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>SameLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>SameLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>SameLine</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>WrapIfTooLong</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>EndOfLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>False</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>False</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>False</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>False</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>False</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>False</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentPreprocessorDirectives>True</IndentPreprocessorDirectives>
-	<IndentBlocksInsideExpressions>False</IndentBlocksInsideExpressions>
-</CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml
deleted file mode 100644
index f4ed3e864e..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!--
-
-WhitesmithsCSharpPolicy.xml
- 
-Author:
-      Mike Krüger <mkrueger@xamarin.com>
-
-Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="False">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>True</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<SimplePropertyFormatting>AllowOneLine</SimplePropertyFormatting>
-	<AutoPropertyFormatting>AllowOneLine</AutoPropertyFormatting>
-	<NamespaceBraceStyle>NextLineShifted</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLineShifted</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLineShifted</InterfaceBraceStyle>
-	<StructBraceStyle>NextLineShifted</StructBraceStyle>
-	<EnumBraceStyle>NextLineShifted</EnumBraceStyle>
-	<MethodBraceStyle>NextLineShifted</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>NextLineShifted</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLineShifted</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLineShifted</DestructorBraceStyle>
-	<PropertyBraceStyle>NextLineShifted</PropertyBraceStyle>
-	<PropertyGetBraceStyle>NextLineShifted</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>NextLineShifted</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>NextLineShifted</EventBraceStyle>
-	<EventAddBraceStyle>NextLineShifted</EventAddBraceStyle>
-	<EventRemoveBraceStyle>NextLineShifted</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>NextLineShifted</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>SameLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>SameLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>SameLine</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>WrapIfTooLong</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>EndOfLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>False</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>False</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>False</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>False</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>False</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>False</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentPreprocessorDirectives>True</IndentPreprocessorDirectives>
-	<IndentBlocksInsideExpressions>True</IndentBlocksInsideExpressions>
-</CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs
index 9b252d0c6e..57f283bbb8 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs
@@ -24,78 +24,103 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using Mono.TextEditor;
 using MonoDevelop.CSharp.Formatting;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.CSharp.Highlighting
 {
-	class CSharpSelectionSurroundingProvider : DefaultSelectionSurroundingProvider
+	class CSharpSelectionSurroundingProvider : SelectionSurroundingProvider
 	{
-		MonoDevelop.Ide.Gui.Document document;
+		readonly DocumentContext context;
+		readonly TextEditor editor;
 
-		public CSharpSelectionSurroundingProvider (MonoDevelop.Ide.Gui.Document document)
+		public CSharpSelectionSurroundingProvider (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context)
 		{
-			this.document = document;
+			this.editor = editor;
+			this.context = context;
 		}
 
-		public override bool GetSelectionSurroundings (TextEditorData textEditorData, uint unicodeKey, out string start, out string end)
+		#region SelectionSurroundingProvider implementation
+
+		public override bool GetSelectionSurroundings (uint unicodeKey, out string start, out string end)
 		{
-			if (unicodeKey == '/') {
+			switch ((char)unicodeKey) {
+			case '"':
+				start = editor.SelectionRegion.BeginLine != editor.SelectionRegion.EndLine ? "@\"" : "\"";
+				end = "\"";
+				return true;
+			case '\'':
+				start = end = "'";
+				return true;
+			case '(':
+				start = "(";
+				end = ")";
+				return true;
+			case '<':
+				start = "<";
+				end = ">";
+				return true;
+			case '[':
+				start = "[";
+				end = "]";
+				return true;
+			case '{':
+				start = "{";
+				end = "}";
+				return true;
+			case '/':
 				start = "/*";
 				end = "*/";
 				return true;
+			default:
+				start = end = "";
+				return false;
 			}
-
-			if (unicodeKey == '"') {
-				start = textEditorData.MainSelection.Anchor.Line != textEditorData.MainSelection.Lead.Line ? "@\"" : "\"";
-				end = "\"";
-				return true;
-			}
-			return base.GetSelectionSurroundings (textEditorData, unicodeKey, out start, out end);
 		}
 
-		public override void HandleSpecialSelectionKey (TextEditorData textEditorData,uint unicodeKey)
+		public override void HandleSpecialSelectionKey (uint unicodeKey)
 		{
 			string start, end;
-			GetSelectionSurroundings (textEditorData, unicodeKey, out start, out end);
-			var selection = textEditorData.MainSelection;
+			((SelectionSurroundingProvider)this).GetSelectionSurroundings (unicodeKey, out start, out end);
+
+			if (editor.SelectionMode == SelectionMode.Block) {
+				var selection = editor.SelectionRegion;
+				int startCol = System.Math.Min (selection.Begin.Column, selection.End.Column) - 1;
+				int endCol = System.Math.Max (selection.Begin.Column, selection.End.Column);
+
+				int minLine = System.Math.Min (selection.Begin.Line, selection.End.Line);
+				int maxLine = System.Math.Max (selection.BeginLine, selection.End.Line);
+
 
-			if (textEditorData.MainSelection.SelectionMode == SelectionMode.Block) {
-				int startCol = System.Math.Min (selection.Anchor.Column, selection.Lead.Column) - 1;
-				int endCol = System.Math.Max (selection.Anchor.Column, selection.Lead.Column);
-				for (int lineNumber = selection.MinLine; lineNumber <= selection.MaxLine; lineNumber++) {
-					DocumentLine lineSegment = textEditorData.GetLine (lineNumber);
+				for (int lineNumber = minLine; lineNumber <= maxLine; lineNumber++) {
+					var lineSegment = editor.GetLine (lineNumber);
 
 					if (lineSegment.Offset + startCol < lineSegment.EndOffset)
-						textEditorData.Insert (lineSegment.Offset + startCol, start);
+						editor.InsertText (lineSegment.Offset + startCol, start);
 					if (lineSegment.Offset + endCol < lineSegment.EndOffset)
-						textEditorData.Insert (lineSegment.Offset + endCol, end);
+						editor.InsertText (lineSegment.Offset + endCol, end);
 				}
 
-				textEditorData.MainSelection = new Selection (
-					new DocumentLocation (selection.Anchor.Line, endCol == selection.Anchor.Column ? endCol + start.Length : startCol + 1 + start.Length),
-					new DocumentLocation (selection.Lead.Line, endCol == selection.Anchor.Column ? startCol + 1 + start.Length : endCol + start.Length),
-					Mono.TextEditor.SelectionMode.Block);
-				textEditorData.Document.CommitMultipleLineUpdate (textEditorData.MainSelection.MinLine, textEditorData.MainSelection.MaxLine);
+//				textEditorData.MainSelection = new Selection (
+//					new DocumentLocation (selection.Anchor.Line, endCol == selection.Anchor.Column ? endCol + start.Length : startCol + 1 + start.Length),
+//					new DocumentLocation (selection.Lead.Line, endCol == selection.Anchor.Column ? startCol + 1 + start.Length : endCol + start.Length),
+//					Mono.TextEditor.SelectionMode.Block);
 			} else {
-				int anchorOffset = selection.GetAnchorOffset (textEditorData);
-				int leadOffset = selection.GetLeadOffset (textEditorData);
-				if (leadOffset < anchorOffset) {
-					int tmp = anchorOffset;
-					anchorOffset = leadOffset;
-					leadOffset = tmp;
-				}
-				textEditorData.Insert (anchorOffset, start);
-				textEditorData.Insert (leadOffset >= anchorOffset ? leadOffset + start.Length : leadOffset, end);
-			//	textEditorData.SetSelection (anchorOffset + start.Length, leadOffset + start.Length);
+				var selectionRange = editor.SelectionRange;
+				int anchorOffset = selectionRange.Offset;
+				int leadOffset = selectionRange.EndOffset;
+
+				editor.InsertText (anchorOffset, start);
+				editor.InsertText (leadOffset >= anchorOffset ? leadOffset + start.Length : leadOffset, end);
+				//	textEditorData.SetSelection (anchorOffset + start.Length, leadOffset + start.Length);
 				if (CSharpTextEditorIndentation.OnTheFlyFormatting) {
-					var l1 = textEditorData.GetLineByOffset (anchorOffset);
-					var l2 = textEditorData.GetLineByOffset (leadOffset);
-					OnTheFlyFormatter.Format (document, l1.Offset, l2.EndOffsetIncludingDelimiter);
+					var l1 = editor.GetLineByOffset (anchorOffset);
+					var l2 = editor.GetLineByOffset (leadOffset);
+					OnTheFlyFormatter.Format (editor, context, l1.Offset, l2.EndOffsetIncludingDelimiter);
 				}
 			}
 		}
-
+		#endregion
 	}
-}
-
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
index 22a1d5f330..80c29fe41d 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
@@ -28,30 +28,17 @@
 
 using System;
 using System.Linq;
-using System.Collections.Generic;
-using Mono.TextEditor.Highlighting;
-using Mono.TextEditor;
-using System.Xml;
-using MonoDevelop.Projects;
-using MonoDevelop.CSharp.Project;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Tasks;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Analysis;
+using Microsoft.CodeAnalysis.Text;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using MonoDevelop.SourceEditor.QuickTasks;
 using System.Threading;
-using System.Diagnostics;
-using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp.Analysis;
-using ICSharpCode.NRefactory;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.Refactoring;
-
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.Core.Text;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
 
 namespace MonoDevelop.CSharp.Highlighting
 {
@@ -68,624 +55,161 @@ namespace MonoDevelop.CSharp.Highlighting
 			return true;
 		}
 	}
-	
-	class CSharpSyntaxMode : SyntaxMode, IQuickTaskProvider, IDisposable
-	{
-		readonly Document guiDocument;
-
-		CSharpAstResolver resolver;
-		CancellationTokenSource src;
 
-		public bool SemanticHighlightingEnabled {
-			get {
-				return true;
-			}
-		}
+	class CSharpSyntaxMode : SemanticHighlighting
+	{
+		HighlightingSegmentTree highlightTree;
+		CancellationTokenSource src = new CancellationTokenSource ();
 
-		internal class StyledTreeSegment : TreeSegment
+		public CSharpSyntaxMode (TextEditor editor, DocumentContext documentContext) : base (editor, documentContext)
 		{
-			public string Style {
-				get;
-				private set;
-			}
-			
-			public StyledTreeSegment (int offset, int length, string style) : base (offset, length)
-			{
-				Style = style;
-			}
+			DocumentParsed ();
 		}
-		
-		class HighlightingSegmentTree : SegmentTree<StyledTreeSegment>
-		{
-			public bool GetStyle (Chunk chunk, ref int endOffset, out string style)
-			{
-				var segment = GetSegmentsAt (chunk.Offset).FirstOrDefault ();
-				if (segment == null) {
-					style = null;
-					return false;
-				}
-				endOffset = segment.EndOffset;
-				style = segment.Style;
-				return true;
-			}
-			
-			public void AddStyle (int startOffset, int endOffset, string style)
-			{
-				if (IsDirty)
-					return;
-				Add (new StyledTreeSegment (startOffset, endOffset - startOffset, style));
-			}
-		}
-		
-		Dictionary<DocumentLine, HighlightingVisitior> lineSegments = new Dictionary<DocumentLine, HighlightingVisitior> ();
 
-		public bool DisableConditionalHighlighting {
-			get;
-			set;
-		}
+		#region implemented abstract members of SemanticHighlighting
 
-		public static IEnumerable<string> GetDefinedSymbols (MonoDevelop.Projects.Project project)
+		protected override void DocumentParsed ()
 		{
-			var workspace = IdeApp.Workspace;
-			if (workspace == null || project == null)
-				yield break;
-			var configuration = project.GetConfiguration (workspace.ActiveConfiguration) as DotNetProjectConfiguration;
-			if (configuration != null) {
-				foreach (string s in configuration.GetDefineSymbols ())
-					yield return s;
-				// Workaround for mcs defined symbol
-				if (configuration.TargetRuntime.RuntimeId == "Mono") 
-					yield return "__MonoCS__";
-			}
-		}
-
-		void HandleDocumentParsed (object sender, EventArgs e)
-		{
-			if (src != null)
-				src.Cancel ();
-			resolver = null;
-			if (guiDocument.IsProjectContextInUpdate) {
+			var parsedDocument = documentContext.ParsedDocument;
+			if (parsedDocument == null)
 				return;
-			}
-			if (guiDocument != null && SemanticHighlightingEnabled) {
-				var parsedDocument = guiDocument.ParsedDocument;
-				if (parsedDocument != null) {
-					if (guiDocument.Project != null && guiDocument.IsCompileableInProject) {
-						src = new CancellationTokenSource ();
-						var newResolverTask = guiDocument.GetSharedResolver ();
-						var cancellationToken = src.Token;
-						System.Threading.Tasks.Task.Factory.StartNew (delegate {
-							if (newResolverTask == null)
-								return;
-							var newResolver = newResolverTask.Result;
-							if (newResolver == null)
-								return;
-							var visitor = new QuickTaskVisitor (newResolver, cancellationToken);
-							try {
-								newResolver.RootNode.AcceptVisitor (visitor);
-							} catch (Exception ex) {
-								LoggingService.LogError ("Error while analyzing the file for the semantic highlighting.", ex);
-								return;
-							}
-							if (!cancellationToken.IsCancellationRequested) {
-								Gtk.Application.Invoke (delegate {
-									if (cancellationToken.IsCancellationRequested)
-										return;
-									var editorData = guiDocument.Editor;
-									if (editorData == null)
-										return;
-//									compilation = newResolver.Compilation;
-									resolver = newResolver;
-									quickTasks = visitor.QuickTasks;
-									OnTasksUpdated (EventArgs.Empty);
-									foreach (var kv in lineSegments) {
-										try {
-											kv.Value.tree.RemoveListener ();
-										} catch (Exception) {
-										}
-									}
-									lineSegments.Clear ();
-									var textEditor = editorData.Parent;
-									if (textEditor != null) {
-										if (!parsedDocument.HasErrors) {
-											var margin = textEditor.TextViewMargin;
-											margin.PurgeLayoutCache ();
-											textEditor.QueueDraw ();
-										}
-									}
-								});
-							}
-						}, cancellationToken);
-					}
-				}
-			}
-		}
-
-		class HighlightingVisitior : SemanticHighlightingVisitor<string>
-		{
-			readonly int lineNumber;
-			readonly int lineOffset;
-			readonly int lineLength;
-			internal HighlightingSegmentTree tree = new HighlightingSegmentTree ();
-
-			public HighlightingVisitior (CSharpAstResolver resolver, CancellationToken cancellationToken, int lineNumber, int lineOffset, int lineLength)
-			{
-				if (resolver == null)
-					throw new ArgumentNullException ("resolver");
-				this.resolver = resolver;
-				this.cancellationToken = cancellationToken;
-				this.lineNumber = lineNumber;
-				this.lineOffset = lineOffset;
-				this.lineLength = lineLength;
-				regionStart = new TextLocation (lineNumber, 1);
-				regionEnd  = new TextLocation (lineNumber, lineLength);
-
-				Setup ();
-			}
-
-			void Setup ()
-			{
-				defaultTextColor = "Plain Text";
-				referenceTypeColor = "User Types";
-				valueTypeColor = "User Types(Value types)";
-				interfaceTypeColor = "User Types(Interfaces)";
-				enumerationTypeColor = "User Types(Enums)";
-				typeParameterTypeColor = "User Types(Type parameters)";
-				delegateTypeColor = "User Types(Delegates)";
-
-				methodCallColor = "User Method Usage";
-				methodDeclarationColor = "User Method Declaration";
-
-				eventDeclarationColor = "User Event Declaration";
-				eventAccessColor = "User Event Usage";
-
-				fieldDeclarationColor ="User Field Declaration";
-				fieldAccessColor = "User Field Usage";
-
-				propertyDeclarationColor = "User Property Declaration";
-				propertyAccessColor = "User Property Usage";
-
-				variableDeclarationColor = "User Variable Declaration";
-				variableAccessColor = "User Variable Usage";
-
-				parameterDeclarationColor = "User Parameter Declaration";
-				parameterAccessColor = "User Parameter Usage";
+			var resolver = parsedDocument.GetAst<SemanticModel> ();
+			if (resolver == null)
+				return;
+			src.Cancel ();
+			src = new CancellationTokenSource ();
+			var token = src.Token;
 
-				valueKeywordColor = "Keyword(Context)";
-				externAliasKeywordColor = "Keyword(Namespace)";
-				varKeywordTypeColor = "Keyword(Type)";
+			Task.Run (async delegate {
+				try {
+					var root = await resolver.SyntaxTree.GetRootAsync (token);
+					var newTree = new HighlightingSegmentTree ();
 
-				parameterModifierColor = "Keyword(Parameter)";
-				inactiveCodeColor = "Excluded Code";
-				syntaxErrorColor = "Syntax Error";
+					var visitor = new HighlightingVisitior (resolver, newTree.Add, token, TextSegment.FromBounds(0, root.FullSpan.Length));
+					visitor.Visit (root);
 
-				stringFormatItemColor = "String Format Items";
-			}
-
-			protected override void Colorize(TextLocation start, TextLocation end, string color)
-			{
-				int startOffset;
-				if (start.Line == lineNumber) {
-					startOffset = lineOffset + start.Column - 1;
-				} else {
-					if (start.Line > lineNumber)
-						return;
-					startOffset = lineOffset;
-				}
-				int endOffset;
-				if (end.Line == lineNumber) {
-					endOffset = lineOffset +end.Column - 1;
-				} else {
-					if (end.Line < lineNumber)
-						return;
-					endOffset = lineOffset + lineLength;
-				}
-				tree.AddStyle (startOffset, endOffset, color);
-			}
-
-			public override void VisitSimpleType (SimpleType simpleType)
-			{
-				var identifierToken = simpleType.IdentifierToken;
-				VisitChildrenUntil(simpleType, identifierToken);
-				var resolveResult = resolver.Resolve (simpleType, cancellationToken);
-				if (resolveResult.Type.Namespace == "System") {
-					switch (resolveResult.Type.Name) {
-					case "nfloat":
-					case "nint":
-					case "nuint":
-						Colorize(identifierToken, "Keyword(Type)");
-						break;
-					default:
-						Colorize (identifierToken, resolveResult);
-						break;
-					}
-				} else {
-					Colorize (identifierToken, resolveResult);
-				}
-				VisitChildrenAfter(simpleType, identifierToken);
-			}
-
-			public override void VisitIdentifierExpression (IdentifierExpression identifierExpression)
-			{
-				var identifier = identifierExpression.IdentifierToken;
-				VisitChildrenUntil(identifierExpression, identifier);
-				if (isInAccessorContainingValueParameter && identifierExpression.Identifier == "value") {
-					Colorize(identifier, valueKeywordColor);
-				} else {
-					var resolveResult = resolver.Resolve (identifierExpression, cancellationToken);
-					if (resolveResult.Type.Namespace == "System") {
-						switch (resolveResult.Type.Name) {
-						case "nfloat":
-						case "nint":
-						case "nuint":
-							Colorize(identifier, "Keyword(Type)");
-							break;
-						default:
-							Colorize (identifier, resolveResult);
-							break;
-						}
-					} else {
-						Colorize (identifier, resolveResult);
+					if (!token.IsCancellationRequested) {
+						Gtk.Application.Invoke (delegate {
+							if (token.IsCancellationRequested)
+								return;
+							if (highlightTree != null) {
+								highlightTree.RemoveListener ();
+							}
+							highlightTree = newTree;
+							highlightTree.InstallListener (editor);
+							NotifySemanticHighlightingUpdate ();
+						});
 					}
+				} catch (OperationCanceledException) {
+				} catch (AggregateException ae) {
+					ae.Flatten ().Handle (x => x is OperationCanceledException); 
 				}
-				VisitChildrenAfter(identifierExpression, identifier);
-			}
+			}, token);
 		}
 
-		class QuickTaskVisitor : DepthFirstAstVisitor
+		public override IEnumerable<ColoredSegment> GetColoredSegments (ISegment segment)
 		{
-			internal List<QuickTask> QuickTasks = new List<QuickTask> ();
-			readonly CSharpAstResolver resolver;
-			readonly CancellationToken cancellationToken;
-
-			public QuickTaskVisitor (CSharpAstResolver resolver, CancellationToken cancellationToken)
-			{
-				this.resolver = resolver;
-				this.cancellationToken = cancellationToken;
-			}
-			
-			protected override void VisitChildren (AstNode node)
-			{
-				if (cancellationToken.IsCancellationRequested)
-					return;
-				base.VisitChildren (node);
-			}
-
-			public override void VisitIdentifierExpression (IdentifierExpression identifierExpression)
-			{
-				base.VisitIdentifierExpression (identifierExpression);
-				var result = resolver.Resolve (identifierExpression, cancellationToken);
-				if (result.IsError) {
-					QuickTasks.Add (new QuickTask (() => string.Format ("error CS0103: The name `{0}' does not exist in the current context", identifierExpression.Identifier), identifierExpression.StartLocation, Severity.Error));
-				}
-			}
-
-			public override void VisitMemberReferenceExpression (MemberReferenceExpression memberReferenceExpression)
-			{
-				base.VisitMemberReferenceExpression (memberReferenceExpression);
-				var result = resolver.Resolve (memberReferenceExpression, cancellationToken) as UnknownMemberResolveResult;
-				if (result != null && result.TargetType.Kind != TypeKind.Unknown) {
-					QuickTasks.Add (new QuickTask (string.Format ("error CS0117: `{0}' does not contain a definition for `{1}'", result.TargetType.FullName, memberReferenceExpression.MemberName), memberReferenceExpression.MemberNameToken.StartLocation, Severity.Error));
-				}
-			}
-
-			public override void VisitSimpleType (SimpleType simpleType)
-			{
-				base.VisitSimpleType (simpleType);
-				var result = resolver.Resolve (simpleType, cancellationToken);
-				if (result.IsError) {
-					QuickTasks.Add (new QuickTask (string.Format ("error CS0246: The type or namespace name `{0}' could not be found. Are you missing an assembly reference?", simpleType.Identifier), simpleType.StartLocation, Severity.Error));
-				}
-			}
+			var result = new List<ColoredSegment> ();
+			if (highlightTree == null)
+				return result;
+			return highlightTree.GetSegmentsOverlapping (segment).Select (seg => seg.GetColoredSegment () );
+		}
+		#endregion
+	}
 
-			public override void VisitMemberType (MemberType memberType)
-			{
-				base.VisitMemberType (memberType);
-				var result = resolver.Resolve (memberType, cancellationToken);
-				if (result.IsError) {
-					QuickTasks.Add (new QuickTask (string.Format ("error CS0246: The type or namespace name `{0}' could not be found. Are you missing an assembly reference?", memberType.MemberName), memberType.StartLocation, Severity.Error));
-				}
-			}
+	class StyledTreeSegment : TreeSegment
+	{
+		string style;
 
-			public override void VisitComment (ICSharpCode.NRefactory.CSharp.Comment comment)
-			{
-			}
-		}
-		
-		static CSharpSyntaxMode ()
+		public StyledTreeSegment (int offset, int length, string colorStyleKey) : base (offset, length)
 		{
-			MonoDevelop.Debugger.DebuggingService.DisableConditionalCompilation += OnDisableConditionalCompilation;
-			if (IdeApp.Workspace != null) {
-				IdeApp.Workspace.ActiveConfigurationChanged += delegate {
-					foreach (var doc in IdeApp.Workbench.Documents) {
-						TextEditorData data = doc.Editor;
-						if (data == null)
-							continue;
-						// Force syntax mode reparse (required for #if directives)
-						var editor = doc.Editor;
-						if (editor != null) {
-							if (data.Document.SyntaxMode is SyntaxMode) {
-								((SyntaxMode)data.Document.SyntaxMode).UpdateDocumentHighlighting ();
-								SyntaxModeService.WaitUpdate (data.Document);
-							}
-							editor.Parent.TextViewMargin.PurgeLayoutCache ();
-							doc.ReparseDocument ();
-							editor.Parent.QueueDraw ();
-						}
-					}
-				};
-			}
-			CommentTag.SpecialCommentTagsChanged += (sender, e) => {
-				UpdateCommentRule ();
-				var actDoc = IdeApp.Workbench.ActiveDocument;
-				if (actDoc != null && actDoc.Editor != null) {
-					actDoc.UpdateParseDocument ();
-					actDoc.Editor.Parent.TextViewMargin.PurgeLayoutCache ();
-					actDoc.Editor.Parent.QueueDraw ();
-				}
-			};
+			this.style = colorStyleKey;
 		}
-		
-		static void OnDisableConditionalCompilation (object s, DocumentEventArgs e)
+
+		public ColoredSegment GetColoredSegment ()
 		{
-			var mode = e.Document.Editor.Document.SyntaxMode as CSharpSyntaxMode;
-			if (mode == null)
-				return;
-			mode.DisableConditionalHighlighting = true;
-			e.Document.Editor.Document.CommitUpdateAll ();
+			return new ColoredSegment (Offset, Length, style);
 		}
-		
-		static Dictionary<string, string> contextualHighlightKeywords;
-		static readonly string[] ContextualKeywords = new string[] {
-			"value"
-/*			"async",
-			"await",
-			, //*
-			"get", "set", "add", "remove",  //*
-			"var", //*
-			"global",
-			"partial", //* 
-			"where",  //*
-			"select",
-			"group",
-			"by",
-			"into",
-			"from",
-			"ascending",
-			"descending",
-			"orderby",
-			"let",
-			"join",
-			"on",
-			"equals"*/
-		};
+	}
 
-		#region Syntax mode rule cache
-		static List<Rule> _rules;
-		static List<Mono.TextEditor.Highlighting.Keywords> _keywords;
-		static Span[] _spans;
-		static Match[] _matches;
-		static Marker[] _prevMarker;
-		static List<SemanticRule> _SemanticRules;
-		static Rule _commentRule;
-		static Dictionary<string, Mono.TextEditor.Highlighting.Keywords> _keywordTable;
-		static Dictionary<string, Mono.TextEditor.Highlighting.Keywords> _keywordTableIgnoreCase;
-		static Dictionary<string, List<string>> _properties;
-		#endregion
+	class HighlightingSegmentTree : SegmentTree<StyledTreeSegment>
+	{
+	}
 
-		static void UpdateCommentRule ()
+	class HighlightingVisitior : SemanticHighlightingVisitor<string>
+	{
+		readonly Action<StyledTreeSegment> colorizeCallback;
+
+		public HighlightingVisitior (SemanticModel resolver, Action<StyledTreeSegment> colorizeCallback, CancellationToken cancellationToken, ISegment textSpan) : base (resolver)
 		{
-			if (_commentRule == null)
-				return;
-			var joinedTasks = string.Join ("", CommentTag.SpecialCommentTags.Select (t => t.Tag));
-			_commentRule.SetDelimiter (new string ("&()<>{}[]~!%^*-+=|\\#/:;\"' ,\t.?".Where (c => joinedTasks.IndexOf (c) < 0).ToArray ()));
-			_commentRule.Keywords = new[] {
-				new Keywords {
-					Color = "Comment Tag",
-					Words = CommentTag.SpecialCommentTags.Select (t => t.Tag)
-				}
-			};
+			if (resolver == null)
+				throw new ArgumentNullException (nameof (resolver));
+			this.cancellationToken = cancellationToken;
+			this.colorizeCallback = colorizeCallback;
+			this.region = new TextSpan (textSpan.Offset, textSpan.Length);
+			Setup ();
 		}
-
-		public CSharpSyntaxMode (Document document)
+		
+		void Setup ()
 		{
-			this.guiDocument = document;
-			guiDocument.DocumentParsed += HandleDocumentParsed;
-			if (guiDocument.ParsedDocument != null)
-				HandleDocumentParsed (this, EventArgs.Empty);
+			
+			defaultTextColor = ColorScheme.PlainTextKey;
+			referenceTypeColor = ColorScheme.UserTypesKey;
+			valueTypeColor = ColorScheme.UserTypesValueTypesKey;
+			interfaceTypeColor = ColorScheme.UserTypesInterfacesKey;
+			enumerationTypeColor = ColorScheme.UserTypesEnumsKey;
+			typeParameterTypeColor = ColorScheme.UserTypesTypeParametersKey;
+			delegateTypeColor = ColorScheme.UserTypesDelegatesKey;
 
-			bool loadRules = _rules == null;
+			methodCallColor = ColorScheme.UserMethodUsageKey;
+			methodDeclarationColor = ColorScheme.UserMethodDeclarationKey;
 
-			if (loadRules) {
-				var provider = new ResourceStreamProvider (typeof(ResourceStreamProvider).Assembly, typeof(ResourceStreamProvider).Assembly.GetManifestResourceNames ().First (s => s.Contains ("CSharpSyntaxMode")));
-				using (var reader = provider.Open ()) {
-					SyntaxMode baseMode = SyntaxMode.Read (reader);
-					_rules = new List<Rule> (baseMode.Rules.Where (r => r.Name != "Comment"));
-					_rules.Add (new Rule {
-						Name = "PreProcessorComment"
-					});
+			eventDeclarationColor = ColorScheme.UserEventDeclarationKey;
+			eventAccessColor = ColorScheme.UserEventUsageKey;
 
-					_commentRule = new Rule {
-						Name = "Comment",
-						IgnoreCase = true
-					};
-					UpdateCommentRule ();
+			fieldDeclarationColor = ColorScheme.UserFieldDeclarationKey;
+			fieldAccessColor = ColorScheme.UserFieldUsageKey;
 
-					_rules.Add (_commentRule);
-					_keywords = new List<Keywords> (baseMode.Keywords);
-					_spans = new List<Span> (baseMode.Spans.Where (span => span.Begin.Pattern != "#")).ToArray ();
-					_matches = baseMode.Matches;
-					_prevMarker = baseMode.PrevMarker;
-					_SemanticRules = new List<SemanticRule> (baseMode.SemanticRules);
-					_keywordTable = baseMode.keywordTable;
-					_keywordTableIgnoreCase = baseMode.keywordTableIgnoreCase;
-					_properties = baseMode.Properties;
-				}
+			propertyDeclarationColor = ColorScheme.UserPropertyDeclarationKey;
+			propertyAccessColor = ColorScheme.UserPropertyUsageKey;
 
-				contextualHighlightKeywords = new Dictionary<string, string> ();
-				foreach (var word in ContextualKeywords) {
-					if (_keywordTable.ContainsKey (word)) {
-						contextualHighlightKeywords[word] = _keywordTable[word].Color;
-					} else {
-						Console.WriteLine ("missing keyword:"+word);
-					}
-				}
+			variableDeclarationColor = ColorScheme.UserVariableDeclarationKey;
+			variableAccessColor = ColorScheme.UserVariableUsageKey;
 
-				foreach (var word in ContextualKeywords) {
-					_keywordTable.Remove (word);
-				}
-			}
+			parameterDeclarationColor = ColorScheme.UserParameterDeclarationKey;
+			parameterAccessColor = ColorScheme.UserParameterUsageKey;
 
-			rules = _rules;
-			keywords = _keywords;
-			spans = _spans;
-			matches = _matches;
-			prevMarker = _prevMarker;
-			SemanticRules = _SemanticRules;
-			keywordTable = _keywordTable;
-			keywordTableIgnoreCase = _keywordTableIgnoreCase;
-			properties = _properties;
-
-			if (loadRules) {
-				AddSemanticRule ("Comment", new HighlightUrlSemanticRule ("Comment(Line)"));
-				AddSemanticRule ("XmlDocumentation", new HighlightUrlSemanticRule ("Comment(Doc)"));
-				AddSemanticRule ("String", new HighlightUrlSemanticRule ("String"));
-			}
-		}
+			valueKeywordColor = ColorScheme.KeywordContextKey;
+			externAliasKeywordColor = ColorScheme.KeywordNamespaceKey;
+			varKeywordTypeColor = ColorScheme.KeywordTypesKey;
 
-		#region IDisposable implementation
+			parameterModifierColor = ColorScheme.KeywordParameterKey;
+			inactiveCodeColor = ColorScheme.ExcludedCodeKey;
 
-		public void Dispose ()
-		{
-			if (src != null)
-				src.Cancel ();
-			guiDocument.DocumentParsed -= HandleDocumentParsed;
+			stringFormatItemColor = ColorScheme.StringFormatItemsKey;
+			nameofKeywordColor = ColorScheme.KeywordOtherKey;
+			whenKeywordColor = ColorScheme.KeywordOtherKey;
 		}
 
-		#endregion
-
-
-//		public override SpanParser CreateSpanParser (DocumentLine line, CloneableStack<Span> spanStack)
-//		{
-//			return new CSharpSpanParser (this, spanStack ?? line.StartSpan.Clone ());
-//		}
-		
-		public override ChunkParser CreateChunkParser (SpanParser spanParser, ColorScheme style, DocumentLine line)
+		protected override void Colorize (TextSpan span, string color)
 		{
-			return new CSharpChunkParser (this, spanParser, style, line);
+			colorizeCallback (new StyledTreeSegment (span.Start, span.Length, color));
 		}
 
-		protected class CSharpChunkParser : ChunkParser, IResolveVisitorNavigator
+		public override void VisitIdentifierName (Microsoft.CodeAnalysis.CSharp.Syntax.IdentifierNameSyntax node)
 		{
-
-			HashSet<string> tags = new HashSet<string> ();
-			
-			CSharpSyntaxMode csharpSyntaxMode;
-			int lineNumber;
-			public CSharpChunkParser (CSharpSyntaxMode csharpSyntaxMode, SpanParser spanParser, ColorScheme style, DocumentLine line) : base (csharpSyntaxMode, spanParser, style, line)
-			{
-				lineNumber = line.LineNumber;
-				this.csharpSyntaxMode = csharpSyntaxMode;
-				foreach (var tag in CommentTag.SpecialCommentTags) {
-					tags.Add (tag.Tag);
-				}
-
-			}
-
-			#region IResolveVisitorNavigator implementation
-			ResolveVisitorNavigationMode IResolveVisitorNavigator.Scan(AstNode node)
-			{
-				if (node is SimpleType || node is MemberType
-					|| node is IdentifierExpression || node is MemberReferenceExpression
-					|| node is InvocationExpression) {
-					return ResolveVisitorNavigationMode.Resolve;
-				}
-				return ResolveVisitorNavigationMode.Scan;
-			}
-			
-			void IResolveVisitorNavigator.Resolved(AstNode node, ResolveResult result)
-			{
-			}
-			
-			void IResolveVisitorNavigator.ProcessConversion(Expression expression, ResolveResult result, Conversion conversion, IType targetType)
-			{
-			}
-			#endregion
-			static int TokenLength (AstNode node)
-			{
-				Debug.Assert (node.StartLocation.Line == node.EndLocation.Line);
-				return node.EndLocation.Column - node.StartLocation.Column;
-			}
-
-			protected override void AddRealChunk (Chunk chunk)
-			{
-				var document = csharpSyntaxMode.guiDocument;
-				var parsedDocument = document != null ? document.ParsedDocument : null;
-				if (parsedDocument != null && csharpSyntaxMode.SemanticHighlightingEnabled && csharpSyntaxMode.resolver != null) {
-					int endLoc = -1;
-					string semanticStyle = null;
-					if (spanParser.CurSpan != null && (spanParser.CurSpan.Rule == "Comment" || spanParser.CurSpan.Rule == "PreProcessorComment")) {
-						base.AddRealChunk (chunk);
-						return;
-					}
-
-					try {
-						HighlightingVisitior visitor;
-						if (!csharpSyntaxMode.lineSegments.TryGetValue (line, out visitor)) {
-							var resolver = csharpSyntaxMode.resolver;
-							visitor = new HighlightingVisitior (resolver, default (CancellationToken), lineNumber, base.line.Offset, line.Length);
-							visitor.tree.InstallListener (doc);
-							resolver.RootNode.AcceptVisitor (visitor);
-							csharpSyntaxMode.lineSegments[line] = visitor;
-						}
-						string style;
-						if (visitor.tree.GetStyle (chunk, ref endLoc, out style)) {
-							semanticStyle = style;
-						}
-					} catch (Exception e) {
-						Console.WriteLine ("Error in semantic highlighting: " + e);
-					}
-					if (semanticStyle != null) {
-						if (endLoc < chunk.EndOffset) {
-							base.AddRealChunk (new Chunk (chunk.Offset, endLoc - chunk.Offset, semanticStyle));
-							base.AddRealChunk (new Chunk (endLoc, chunk.EndOffset - endLoc, chunk.Style));
-							return;
-						}
-						chunk.Style = semanticStyle;
-					}
-				}
-				
-				base.AddRealChunk (chunk);
-			}
-			
-			protected override string GetStyle (Chunk chunk)
-			{
-				if (spanParser.CurRule.Name == "Comment") {
-					if (tags.Contains (doc.GetTextAt (chunk))) 
-						return "Comment Tag";
+			switch (node.Identifier.Text) {
+			case "nfloat":
+			case "nint":
+			case "nuint":
+				var symbol = base.semanticModel.GetSymbolInfo (node).Symbol as INamedTypeSymbol;
+				if (symbol != null && symbol.ContainingNamespace.ToDisplayString () == "System") {
+					Colorize (node.Span, "Keyword(Type)");
+					return;
 				}
-				return base.GetStyle (chunk);
+				break;
 			}
+			base.VisitIdentifierName (node);
 		}
-		
-
-		#region IQuickTaskProvider implementation
-		public event EventHandler TasksUpdated;
-
-		protected virtual void OnTasksUpdated (EventArgs e)
-		{
-			var handler = TasksUpdated;
-			if (handler != null)
-				handler (this, e);
-		}
-
-		List<QuickTask> quickTasks;
-		public IEnumerable<QuickTask> QuickTasks {
-			get {
-				return quickTasks;
-			}
-		}
-		#endregion
 	}
 }
- 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
index 7c4df6c26c..e556081b67 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
@@ -26,78 +26,112 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp.Resolver;
 using MonoDevelop.Ide.FindInFiles;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp;
 using System.Threading;
 using MonoDevelop.SourceEditor;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide;
+using MonoDevelop.Refactoring;
+using Microsoft.CodeAnalysis.FindSymbols;
+using MonoDevelop.Ide.TypeSystem;
+using System.Threading.Tasks;
+using System.Collections.Immutable;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.CSharp.Highlighting
 {
-	public class HighlightUsagesExtension : AbstractUsagesExtension<ResolveResult>
+	class UsageData
+	{
+		public RefactoringSymbolInfo SymbolInfo;
+		public Document Document;
+
+		public ISymbol Symbol {
+			get { return SymbolInfo != null ? SymbolInfo.Symbol ?? SymbolInfo.DeclaredSymbol : null; }
+		}
+	}
+	
+	class HighlightUsagesExtension : AbstractUsagesExtension<UsageData>
 	{
 		CSharpSyntaxMode syntaxMode;
 
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
-
-			TextEditorData.SelectionSurroundingProvider = new CSharpSelectionSurroundingProvider (Document);
-			syntaxMode = new CSharpSyntaxMode (Document);
-			TextEditorData.Document.SyntaxMode = syntaxMode;
+			Editor.SetSelectionSurroundingProvider (new CSharpSelectionSurroundingProvider (Editor, DocumentContext));
+			syntaxMode = new CSharpSyntaxMode (Editor, DocumentContext);
+			Editor.SemanticHighlighting = syntaxMode;
 		}
 
 		public override void Dispose ()
 		{
 			if (syntaxMode != null) {
-				TextEditorData.Document.SyntaxMode = null;
+				Editor.SemanticHighlighting = null;
 				syntaxMode.Dispose ();
 				syntaxMode = null;
 			}
 			base.Dispose ();
 		}
+		
+		protected async override Task<UsageData> ResolveAsync (CancellationToken token)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return new UsageData ();
+			var analysisDocument = doc.AnalysisDocument;
+			if (analysisDocument == null)
+				return new UsageData ();
 
-		protected override bool TryResolve (out ResolveResult resolveResult)
+			var symbolInfo = await RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor.CaretOffset, token);
+			if (symbolInfo.Symbol == null && symbolInfo.DeclaredSymbol == null)
+				return new UsageData ();
+			return new UsageData {
+				Document = analysisDocument,
+				SymbolInfo = symbolInfo
+			};
+		}
+
+		protected override IEnumerable<MemberReference> GetReferences (UsageData resolveResult, CancellationToken token)
 		{
-			AstNode node;
-			resolveResult = null;
-			if (!Document.TryResolveAt (Document.Editor.Caret.Location, out resolveResult, out node)) {
-				return false;
+			if (resolveResult.Symbol == null)
+				yield break;
+			var doc = resolveResult.Document;
+			var documents = ImmutableHashSet.Create (doc); 
+			var symbol = resolveResult.Symbol;
+			foreach (var loc in symbol.Locations) {
+				if (loc.IsInSource && loc.SourceTree.FilePath == doc.FilePath)
+					yield return new MemberReference (symbol, doc.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length) {
+						ReferenceUsageType = ReferenceUsageType.Declariton	
+					};
 			}
-			if (node is PrimitiveType) {
-				return false;
+			foreach (var mref in SymbolFinder.FindReferencesAsync (symbol, TypeSystemService.Workspace.CurrentSolution, documents, token).Result) {
+				foreach (var loc in mref.Locations) {
+					yield return new MemberReference (symbol, doc.FilePath, loc.Location.SourceSpan.Start, loc.Location.SourceSpan.Length) {
+						ReferenceUsageType = GetUsage (loc.Location.SourceTree.GetRoot ().FindNode (loc.Location.SourceSpan))
+					};
+				}
 			}
-			return true;
 		}
 
-
-		protected override IEnumerable<MemberReference> GetReferences (ResolveResult resolveResult, CancellationToken token)
+		static ReferenceUsageType GetUsage (SyntaxNode node)
 		{
-			var finder = new MonoDevelop.CSharp.Refactoring.CSharpReferenceFinder ();
-			if (resolveResult is MemberResolveResult) {
-				finder.SetSearchedMembers (new [] { ((MemberResolveResult)resolveResult).Member });
-			} else if (resolveResult is TypeResolveResult) {
-				finder.SetSearchedMembers (new [] { resolveResult.Type });
-			} else if (resolveResult is MethodGroupResolveResult) { 
-				finder.SetSearchedMembers (((MethodGroupResolveResult)resolveResult).Methods);
-			} else if (resolveResult is NamespaceResolveResult) { 
-				finder.SetSearchedMembers (new [] { ((NamespaceResolveResult)resolveResult).Namespace });
-			} else if (resolveResult is LocalResolveResult) { 
-				finder.SetSearchedMembers (new [] { ((LocalResolveResult)resolveResult).Variable });
-			} else if (resolveResult is NamedArgumentResolveResult) { 
-				finder.SetSearchedMembers (new [] { ((NamedArgumentResolveResult)resolveResult).Parameter });
-			} else {
-				return EmptyList;
-			}
-
-			try {
-				return new List<MemberReference> (finder.FindInDocument (Document, token));
-			} catch (Exception e) {
-				LoggingService.LogError ("Error in highlight usages extension.", e);
-			}
-			return EmptyList;
+			if (node == null)
+				return ReferenceUsageType.Read;
+			
+			var parent = node.AncestorsAndSelf ().OfType<ExpressionSyntax> ().FirstOrDefault();
+			if (parent == null)
+				return ReferenceUsageType.Read;
+			if (parent.IsOnlyWrittenTo ())
+				return ReferenceUsageType.Write;
+			if (parent.IsWrittenTo ())
+				return ReferenceUsageType.ReadWrite;
+			return ReferenceUsageType.Read;
 		}
+
 	}
 }
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs
index adf3c8ecb1..5c4f859919 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs
@@ -28,7 +28,7 @@ using MonoDevelop.Components.Commands;
 using System.Linq;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui.Content;
-using Mono.TextEditor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.CSharp.Highlighting
 {
@@ -63,10 +63,10 @@ namespace MonoDevelop.CSharp.Highlighting
 			if (ext.IsTimerOnQueue)
 				ext.ForceUpdate ();
 
-			var caretOffset = doc.Editor.Caret.Offset;
-			for (int i = 0; i < ext.UsagesSegments.Count; i++) {
-				if (ext.UsagesSegments [i].TextSegment.Contains (caretOffset))
-					MoveToNextUsageHandler.MoveToSegment (doc, ext.UsagesSegments [(i + ext.UsagesSegments.Count - 1) % ext.UsagesSegments.Count]);
+			var caretOffset = doc.Editor.CaretOffset;
+			for (int i = 0; i < ext.Markers.Count; i++) {
+				if (ext.Markers [i].Contains (caretOffset))
+					MoveToNextUsageHandler.MoveToSegment (doc, ext.Markers [(i + ext.Markers.Count - 1) % ext.Markers.Count]);
 			}
 		}
 	}
@@ -95,24 +95,23 @@ namespace MonoDevelop.CSharp.Highlighting
 			if (ext == null || ext.Markers.Count == 0)
 				return;
 			
-			var caretOffset = doc.Editor.Caret.Offset;
-			for (int i = 0; i < ext.UsagesSegments.Count; i++) {
-				if (ext.UsagesSegments [i].TextSegment.Contains (caretOffset))
-					MoveToNextUsageHandler.MoveToSegment (doc, ext.UsagesSegments [(i + 1) % ext.UsagesSegments.Count]);
+			var caretOffset = doc.Editor.CaretOffset;
+			for (int i = 0; i < ext.Markers.Count; i++) {
+				if (ext.Markers [i].Contains (caretOffset))
+					MoveToNextUsageHandler.MoveToSegment (doc, ext.Markers [(i + 1) % ext.Markers.Count]);
 			}
 		}
 		
-		public static void MoveToSegment (MonoDevelop.Ide.Gui.Document doc, TextSegment segment)
+		public static void MoveToSegment (MonoDevelop.Ide.Gui.Document doc, ISegment segment)
 		{
-			if (segment.IsInvalid || segment.IsEmpty)
+			if (segment == null || segment.Offset < 0 || segment.Length == 0)
 				return;
-			TextEditorData data = doc.Editor;
-			data.Caret.Offset = segment.Offset;
-			data.Parent.ScrollTo (segment.EndOffset);
-			
-			var loc = data.Document.OffsetToLocation (segment.EndOffset);
-			if (data.Parent.TextViewMargin.ColumnToX (data.Document.GetLine (loc.Line), loc.Column) < data.HAdjustment.PageSize)
-				data.HAdjustment.Value = 0;
+			var data = doc.Editor;
+			data.CaretOffset = segment.Offset;
+
+//			var loc = data.OffsetToLocation (segment.EndOffset);
+//			if (data.ColumnToX (data.GetLine (loc.Line), loc.Column) < data.HAdjustment.PageSize)
+//				data.HAdjustment.Value = 0;
 		}
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpFoldingParser.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpFoldingParser.cs
index f87390b709..776abe4a87 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpFoldingParser.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpFoldingParser.cs
@@ -26,9 +26,7 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharp.Parser
 {
@@ -94,14 +92,14 @@ namespace MonoDevelop.CSharp.Parser
 
 		public unsafe ParsedDocument Parse (string fileName, string content)
 		{
-			var regionStack = new Stack<Tuple<string, TextLocation>> ();
+			var regionStack = new Stack<Tuple<string, DocumentLocation>> ();
 			var result = new DefaultParsedDocument (fileName);
 			bool inSingleComment = false, inMultiLineComment = false;
 			bool inString = false, inVerbatimString = false;
 			bool inChar = false;
 			bool inLineStart = true, hasStartedAtLine = false;
 			int line = 1, column = 1;
-			var startLoc = TextLocation.Empty;
+			var startLoc = DocumentLocation.Empty;
 			
 			fixed (char* startPtr = content) {
 				char* endPtr = startPtr + content.Length;
@@ -116,7 +114,7 @@ namespace MonoDevelop.CSharp.Parser
 						ptr++;
 
 						if (StartsIdentifier (ptr, endPtr, "region")) {
-							var regionLocation = new TextLocation (line, column);
+							var regionLocation = new DocumentLocation (line, column);
 							column++;
 							ptr += "region".Length;
 							column += "region".Length;
@@ -131,7 +129,7 @@ namespace MonoDevelop.CSharp.Parser
 								var beginRegion = regionStack.Pop ();
 								result.Add (new FoldingRegion (
 									beginRegion.Item1, 
-									new DomRegion (beginRegion.Item2.Line, beginRegion.Item2.Column, line, column),
+									new DocumentRegion (beginRegion.Item2.Line, beginRegion.Item2.Column, line, column),
 									FoldType.UserRegion,
 									true));
 							}
@@ -150,14 +148,14 @@ namespace MonoDevelop.CSharp.Parser
 							if (nextCh == '/') {
 								hasStartedAtLine = inLineStart;
 								beginPtr = ptr + 2;
-								startLoc = new TextLocation (line, column);
+								startLoc = new DocumentLocation (line, column);
 								ptr++;
 								column++;
 								inSingleComment = true;
 							} else if (nextCh == '*') {
 								hasStartedAtLine = inLineStart;
 								beginPtr = ptr + 2;
-								startLoc = new TextLocation (line, column);
+								startLoc = new DocumentLocation (line, column);
 								ptr++;
 								column++;
 								inMultiLineComment = true;
@@ -175,7 +173,7 @@ namespace MonoDevelop.CSharp.Parser
 								column += 2;
 								inMultiLineComment = false;
 								result.Add (new MonoDevelop.Ide.TypeSystem.Comment () {
-									Region = new DomRegion (startLoc, new TextLocation (line, column)),
+									Region = new DocumentRegion (startLoc, new DocumentLocation (line, column)),
 									OpenTag = "/*",
 									CommentType = MonoDevelop.Ide.TypeSystem.CommentType.Block,
 									Text = content.Substring ((int)(beginPtr - startPtr), (int)(ptr - beginPtr)),
@@ -202,7 +200,7 @@ namespace MonoDevelop.CSharp.Parser
 								beginPtr++;
 							
 							result.Add (new MonoDevelop.Ide.TypeSystem.Comment () { 
-								Region = new DomRegion (startLoc, new TextLocation (line, column)),
+								Region = new DocumentRegion (startLoc, new DocumentLocation (line, column)),
 								CommentType = MonoDevelop.Ide.TypeSystem.CommentType.SingleLine, 
 								OpenTag = "//",
 								Text = content.Substring ((int)(beginPtr - startPtr), (int)(ptr - beginPtr)),
@@ -254,7 +252,7 @@ namespace MonoDevelop.CSharp.Parser
 					ptr++;
 				}
 			}
-			foreach (var fold in result.Comments.ToFolds ()) {
+			foreach (var fold in result.GetCommentsAsync().Result.ToFolds ()) {
 				result.Add (fold);
 			}
 			return result;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpParsedDocument.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpParsedDocument.cs
new file mode 100644
index 0000000000..db4c99f3c8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpParsedDocument.cs
@@ -0,0 +1,444 @@
+//
+// CSharpParsedDocument.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
+using System.Collections.Generic;
+using System.Linq;
+using MonoDevelop.Ide.Editor;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.Parser
+{
+	class CSharpParsedDocument : ParsedDocument
+	{
+		internal SyntaxTree Unit {
+			get;
+			set;
+		}
+
+		public CSharpParsedDocument (string fileName) : base (fileName)
+		{
+		}
+		
+
+		#region implemented abstract members of ParsedDocument
+
+
+		WeakReference<IReadOnlyList<Comment>> weakComments;
+
+		public override Task<IReadOnlyList<Comment>> GetCommentsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			IReadOnlyList<Comment> result;
+			if (weakComments == null || !weakComments.TryGetTarget (out result)) {
+				var visitor = new CommentVisitor (cancellationToken);
+				if (Unit != null)
+					visitor.Visit (Unit.GetRoot (cancellationToken));
+				result = visitor.Comments;
+
+				var newRef = new WeakReference<IReadOnlyList<Comment>> (result);
+				var oldRef = weakComments;
+				while (Interlocked.CompareExchange (ref weakComments, newRef, oldRef) == oldRef) {
+				}
+			}
+			return Task.FromResult (result);
+		}
+
+
+		class CommentVisitor : CSharpSyntaxWalker
+		{
+			public readonly List<Comment> Comments = new List<Comment> ();
+
+			CancellationToken cancellationToken;
+
+			public CommentVisitor (CancellationToken cancellationToken) : base(SyntaxWalkerDepth.Trivia)
+			{
+				this.cancellationToken = cancellationToken;
+			}
+
+			static DocumentRegion GetRegion (SyntaxTrivia trivia)
+			{
+				var fullSpan = trivia.FullSpan;
+				var text = trivia.ToString ();
+				if (text.Length > 2) {
+					if (text [text.Length - 2] == '\r' && text [text.Length - 1] == '\n')
+						fullSpan = new Microsoft.CodeAnalysis.Text.TextSpan (fullSpan.Start, fullSpan.Length - 2);
+					else if (ICSharpCode.NRefactory6.NewLine.IsNewLine (text [text.Length - 1]))
+						fullSpan = new Microsoft.CodeAnalysis.Text.TextSpan (fullSpan.Start, fullSpan.Length - 1);
+				}
+				try {
+					var lineSpan = trivia.SyntaxTree.GetLineSpan (fullSpan);
+					return (DocumentRegion)lineSpan;
+				} catch (Exception) {
+					return DocumentRegion.Empty;
+				}
+			}
+
+			public override void VisitBlock (BlockSyntax node)
+			{
+				cancellationToken.ThrowIfCancellationRequested ();
+				base.VisitBlock (node);
+			}
+
+			bool StartsLine (SyntaxTrivia trivia)
+			{
+				var sourceText = trivia.SyntaxTree.GetText (cancellationToken);
+				Microsoft.CodeAnalysis.Text.TextLine textLine;
+				try {
+					textLine = sourceText.Lines.GetLineFromPosition (trivia.SpanStart);
+				} catch (ArgumentOutOfRangeException) {
+					return false;
+				}
+				//We need start of trivia.FullSpan and not trivia.SpanStart
+				//because in case of documentation /// <summary...
+				//trivia.SpanStart is space after /// and not 1st /
+				//so with trivia.FullSpan.Start we get index of 1st /
+				var startSpan = trivia.FullSpan.Start;
+				for (int i = textLine.Start; i < startSpan; i++) {
+					char ch = sourceText [i];
+					if (!char.IsWhiteSpace (ch))
+						return false;
+				}
+				return true;
+			}
+
+			static string CropStart (string text, string crop)
+			{
+				text = text.Trim ();
+				if (text.StartsWith (crop))
+					return text.Substring (crop.Length).TrimStart ();
+				return text;
+			}
+
+			public override void VisitTrivia (SyntaxTrivia trivia)
+			{
+				base.VisitTrivia (trivia);
+				switch (trivia.Kind ()) {
+				case SyntaxKind.MultiLineCommentTrivia:
+				case SyntaxKind.MultiLineDocumentationCommentTrivia:
+					{
+						var cmt = new Comment (CropStart (trivia.ToString (), "/*"));
+						cmt.CommentStartsLine = StartsLine(trivia);
+						cmt.CommentType = CommentType.Block;
+						cmt.OpenTag = "/*";
+						cmt.ClosingTag = "*/";
+						cmt.Region = GetRegion (trivia);
+						Comments.Add (cmt);
+						break;
+					}
+				case SyntaxKind.SingleLineCommentTrivia:
+					{
+						var cmt = new Comment (CropStart (trivia.ToString (), "//"));
+						cmt.CommentStartsLine = StartsLine(trivia);
+						cmt.CommentType = CommentType.SingleLine;
+						cmt.OpenTag = "//";
+						cmt.Region = GetRegion (trivia);
+						Comments.Add (cmt);
+						break;
+					}
+				case SyntaxKind.SingleLineDocumentationCommentTrivia:
+					{
+						var cmt = new Comment (CropStart (trivia.ToString (), "///"));
+						cmt.CommentStartsLine = StartsLine(trivia);
+						cmt.IsDocumentation = true;
+						cmt.CommentType = CommentType.Documentation;
+						cmt.OpenTag = "///";
+						cmt.ClosingTag = "*/";
+						cmt.Region = GetRegion (trivia);
+						Comments.Add (cmt);
+						break;
+					}
+
+				}
+
+			}
+		}
+
+		WeakReference<IReadOnlyList<Tag>> weakTags;
+
+		public override Task<IReadOnlyList<Tag>> GetTagCommentsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			IReadOnlyList<Tag> result;
+			if (weakTags == null || !weakTags.TryGetTarget (out result)) {
+				var visitor = new SemanticTagVisitor (cancellationToken);
+				if (Unit != null) {
+					try {
+						visitor.Visit (Unit.GetRoot (cancellationToken));
+					} catch {
+					}
+				}
+				result = visitor.Tags;
+
+				var newRef = new WeakReference<IReadOnlyList<Tag>> (result);
+				var oldRef = weakTags;
+				while (Interlocked.CompareExchange (ref weakTags, newRef, oldRef) == oldRef) {
+				}
+			}
+			return Task.FromResult (result);
+		}
+
+		sealed class SemanticTagVisitor : CSharpSyntaxWalker
+		{
+			string[] tagComments;
+			public List<Tag> Tags =  new List<Tag> ();
+			CancellationToken cancellationToken;
+
+			public SemanticTagVisitor () : base (SyntaxWalkerDepth.Trivia)
+			{
+				tagComments = MonoDevelop.Ide.Tasks.CommentTag.SpecialCommentTags.Select (t => t.Tag).ToArray ();
+
+			}
+
+			public SemanticTagVisitor (CancellationToken cancellationToken)
+			{
+				this.cancellationToken = cancellationToken;
+			}
+
+			public override void VisitBlock (BlockSyntax node)
+			{
+				cancellationToken.ThrowIfCancellationRequested ();
+				base.VisitBlock (node);
+			}
+
+			public override void VisitTrivia (SyntaxTrivia trivia)
+			{
+				cancellationToken.ThrowIfCancellationRequested ();
+				if (trivia.IsKind (SyntaxKind.SingleLineCommentTrivia) || 
+					trivia.IsKind (SyntaxKind.MultiLineCommentTrivia) || 
+					trivia.IsKind (SyntaxKind.SingleLineDocumentationCommentTrivia)) {
+					foreach (string tag in tagComments) {
+						var trimmedContent = trivia.ToString ().TrimStart ('/', ' ', '*');
+						if (!trimmedContent.StartsWith (tag))
+							continue;
+						var loc = trivia.GetLocation ().GetLineSpan ();
+						Tags.Add (new Tag (tag, trimmedContent, new DocumentRegion (loc.StartLinePosition, loc.EndLinePosition)));
+						break;
+					}
+				}
+			}
+
+			public override void VisitThrowStatement (Microsoft.CodeAnalysis.CSharp.Syntax.ThrowStatementSyntax node)
+			{
+				cancellationToken.ThrowIfCancellationRequested ();
+				base.VisitThrowStatement (node);
+				var createExpression = node.Expression as ObjectCreationExpressionSyntax;
+				if (createExpression == null)
+					return;
+				var st = createExpression.Type.ToString ();
+				if (st == "NotImplementedException" || st == "System.NotImplementedException") {
+					var loc = node.GetLocation ().GetLineSpan ();
+					if (createExpression.ArgumentList.Arguments.Count > 0) {
+						Tags.Add (new Tag ("High", GettextCatalog.GetString ("NotImplementedException({0}) thrown.", createExpression.ArgumentList.Arguments.First ().ToString ()), new DocumentRegion (loc.StartLinePosition, loc.EndLinePosition)));
+					} else {
+						Tags.Add (new Tag ("High", GettextCatalog.GetString ("NotImplementedException thrown."), new DocumentRegion (loc.StartLinePosition, loc.EndLinePosition)));
+					}
+				}
+			}
+		}
+
+		WeakReference<IReadOnlyList<FoldingRegion>> weakFoldings;
+
+		public override Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			IReadOnlyList<FoldingRegion> result;
+			if (weakFoldings == null || !weakFoldings.TryGetTarget (out result)) {
+
+				result = GenerateFoldings (cancellationToken).ToList ();
+
+				var newRef = new WeakReference<IReadOnlyList<FoldingRegion>> (result);
+				var oldRef = weakFoldings;
+				while (Interlocked.CompareExchange (ref weakFoldings, newRef, oldRef) == oldRef) {
+				}
+			}
+
+			return Task.FromResult (result);
+		}
+
+		IEnumerable<FoldingRegion> GenerateFoldings (CancellationToken cancellationToken)
+		{
+			foreach (var fold in GetCommentsAsync().Result.ToFolds ())
+				yield return fold;
+
+			var visitor = new FoldingVisitor (cancellationToken);
+			if (Unit != null) {
+				try {
+					visitor.Visit (Unit.GetRoot (cancellationToken));
+				} catch (Exception) { }
+			}
+			foreach (var fold in visitor.Foldings)
+				yield return fold;
+		}
+
+		class FoldingVisitor : CSharpSyntaxWalker
+		{
+			public readonly List<FoldingRegion> Foldings = new List<FoldingRegion> ();
+			CancellationToken cancellationToken;
+
+			public FoldingVisitor (CancellationToken cancellationToken)
+			{
+				this.cancellationToken = cancellationToken;
+			}
+
+			void AddUsings (SyntaxNode parent)
+			{
+				SyntaxNode firstChild = null, lastChild = null;
+				foreach (var child in parent.ChildNodes ()) {
+					if (child is UsingDirectiveSyntax) {
+						if (firstChild == null) {
+							firstChild = child;
+						}
+						lastChild = child;
+						continue;
+					}
+					if (firstChild != null)
+						break;
+				}
+
+				if (firstChild != null && firstChild != lastChild) {
+					var first = firstChild.GetLocation ().GetLineSpan ();
+					var last = lastChild.GetLocation ().GetLineSpan ();
+
+					Foldings.Add (new FoldingRegion (new DocumentRegion (first.StartLinePosition, last.EndLinePosition), FoldType.Undefined));
+				}
+			}
+
+			public override void VisitCompilationUnit (Microsoft.CodeAnalysis.CSharp.Syntax.CompilationUnitSyntax node)
+			{
+				AddUsings (node);
+				base.VisitCompilationUnit (node);
+			}
+
+			void AddFolding (SyntaxToken openBrace, SyntaxToken closeBrace)
+			{
+				openBrace = openBrace.GetPreviousToken (false, false, true, true);
+
+				try {
+					var first = openBrace.GetLocation ().GetLineSpan ();
+					var last = closeBrace.GetLocation ().GetLineSpan ();
+
+					if (first.EndLinePosition.Line != last.EndLinePosition.Line)
+						Foldings.Add (new FoldingRegion (new DocumentRegion (first.EndLinePosition, last.EndLinePosition), FoldType.Undefined));
+				} catch (ArgumentOutOfRangeException) {}
+			}
+
+			public override void VisitNamespaceDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.NamespaceDeclarationSyntax node)
+			{
+				AddUsings (node);
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken);
+				base.VisitNamespaceDeclaration (node);
+			}
+
+			public override void VisitClassDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.ClassDeclarationSyntax node)
+			{
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken);
+				base.VisitClassDeclaration (node);
+			}
+
+			public override void VisitStructDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.StructDeclarationSyntax node)
+			{
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken);
+				base.VisitStructDeclaration (node);
+			}
+
+			public override void VisitInterfaceDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.InterfaceDeclarationSyntax node)
+			{
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken);
+				base.VisitInterfaceDeclaration (node);
+			}
+
+			public override void VisitEnumDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.EnumDeclarationSyntax node)
+			{
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken);
+				base.VisitEnumDeclaration (node);
+			}
+
+			public override void VisitBlock (Microsoft.CodeAnalysis.CSharp.Syntax.BlockSyntax node)
+			{
+				cancellationToken.ThrowIfCancellationRequested ();
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken);
+				base.VisitBlock (node);
+			}
+		}
+
+		static readonly IReadOnlyList<Error> emptyErrors = new Error[0];
+		WeakReference<IReadOnlyList<Error>> weakErrors;
+
+		public override Task<IReadOnlyList<Error>> GetErrorsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var model = GetAst<SemanticModel> ();
+			if (model == null)
+				return Task.FromResult (emptyErrors);
+			
+			IReadOnlyList<Error> result;
+			if (weakErrors == null || !weakErrors.TryGetTarget (out result)) {
+				try {
+					result = model
+						.GetDiagnostics (null, cancellationToken)
+						.Where (diag => diag.Severity == DiagnosticSeverity.Error || diag.Severity == DiagnosticSeverity.Warning)
+						.Select ((Diagnostic diag) => new Error (GetErrorType (diag.Severity), diag.Id, diag.GetMessage (), GetRegion (diag)) { Tag = diag })
+						.ToList ();
+					var newRef = new WeakReference<IReadOnlyList<Error>> (result);
+					var oldRef = weakErrors;
+					while (Interlocked.CompareExchange (ref weakErrors, newRef, oldRef) == oldRef) {
+					}
+				} catch (OperationCanceledException) {
+					return Task.FromResult (emptyErrors);
+				} catch (Exception e) {
+					LoggingService.LogError ("Error while getting diagnostics.", e);
+					return Task.FromResult (emptyErrors);
+				}
+			}
+			return Task.FromResult (result);
+		}
+
+		static DocumentRegion GetRegion (Diagnostic diagnostic)
+		{
+			try {
+				var lineSpan = diagnostic.Location.GetLineSpan ();
+				return new DocumentRegion (lineSpan.StartLinePosition, lineSpan.EndLinePosition);
+			} catch (Exception) {
+				return DocumentRegion.Empty;
+			}
+		}
+
+		static ErrorType GetErrorType (DiagnosticSeverity severity)
+		{
+			switch (severity) {
+			case DiagnosticSeverity.Error:
+				return ErrorType.Error;
+			case DiagnosticSeverity.Warning:
+				return ErrorType.Warning;
+			}
+			return ErrorType.Unknown;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs
index 498d98544f..037656f295 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs
@@ -25,375 +25,90 @@
 // THE SOFTWARE.
 using System;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Collections.Generic;
 using MonoDevelop.Projects;
 using MonoDevelop.CSharp.Project;
-using MonoDevelop.Ide.Tasks;
 using Mono.CSharp;
 using System.Linq;
-using ICSharpCode.NRefactory;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp.Resolver;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Core.Text;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.CSharp.Parser
 {
-	public class TypeSystemParser : MonoDevelop.Ide.TypeSystem.TypeSystemParser
+	sealed class TypeSystemParser : MonoDevelop.Ide.TypeSystem.TypeSystemParser
 	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, System.IO.TextReader content, MonoDevelop.Projects.Project project = null)
+		static readonly List<Error> emptyList = new List<Error> ();
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (MonoDevelop.Ide.TypeSystem.ParseOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
 		{
-			var parser = new ICSharpCode.NRefactory.CSharp.CSharpParser (GetCompilerArguments (project));
-			parser.GenerateTypeSystemMode = !storeAst;
-			var result = new ParsedDocumentDecorator ();
+			var fileName = options.FileName;
+			var project = options.Project;
+			var result = new CSharpParsedDocument (fileName);
 
 			if (project != null) {
+				
 				var projectFile = project.Files.GetFile (fileName);
 				if (projectFile != null && !TypeSystemParserNode.IsCompileBuildAction (projectFile.BuildAction))
 					result.Flags |= ParsedDocumentFlags.NonSerializable;
 			}
 
-			var tagComments = CommentTag.SpecialCommentTags.Select (t => t.Tag).ToArray ();
-			
-			parser.CompilationUnitCallback = delegate (CompilerCompilationUnit top) {
-				foreach (var special in top.SpecialsBag.Specials) {
-					var comment = special as SpecialsBag.Comment;
-					if (comment != null) {
-						VisitComment (result, comment, tagComments);
-					} else {
-						if (storeAst) {
-							var ppd = special as SpecialsBag.PreProcessorDirective;
-							if  (ppd != null)
-								VisitPreprocessorDirective (result, ppd);
-						}
-					}
-				}
-			};
-			
-			var unit = parser.Parse (content, fileName);
-			unit.Freeze ();
-			var pf = unit.ToTypeSystem ();
-			try {
-				pf.LastWriteTime = System.IO.File.GetLastWriteTimeUtc (fileName);
-			} catch (Exception) {
-				pf.LastWriteTime = DateTime.UtcNow;
-			}
-
-			result.LastWriteTimeUtc = pf.LastWriteTime.Value;
-			result.ParsedFile = pf;
-			result.Add (GetSemanticTags (unit));
-
-			result.CreateRefactoringContext = delegate (MonoDevelop.Ide.Gui.Document doc, System.Threading.CancellationToken token) {
-				var task = MDRefactoringContext.Create (doc, doc.Editor.Caret.Location, token);
-				try {
-					task.Wait (5000, token);
-				} catch (AggregateException ae) {
-					ae.Flatten ().Handle (aex => aex is OperationCanceledException);
-					return null;
-				} catch (OperationCanceledException) {
-					return null;
-				}
-				if (!task.IsCompleted)
-					return null;
-				return task.Result;
-			};
-			result.CreateRefactoringContextWithEditor = (data, resolver, token) => new MDRefactoringContext ((DotNetProject)project, data, result, (CSharpAstResolver)resolver, TextLocation.Empty, token);
+			var compilerArguments = GetCompilerArguments (project);
+			SyntaxTree unit = null;
 
-			if (storeAst) {
-				result.Ast = unit;
-				result.Add (GenerateFoldings (unit, result));
-			}
-			return result;
-		}
-		
-		IEnumerable<FoldingRegion> GenerateFoldings (SyntaxTree unit, ParsedDocument doc)
-		{
-			foreach (var fold in doc.ConditionalRegions.ToFolds ())
-				yield return fold;
-			
-			foreach (var fold in doc.Comments.ToFolds ())
-				yield return fold;
-			
-			var visitor = new FoldingVisitor ();
-			unit.AcceptVisitor (visitor, null);
-			foreach (var fold in visitor.Foldings)
-				yield return fold;
-		}
-
-		class FoldingVisitor : DepthFirstAstVisitor<object, object>
-		{
-			public readonly List<FoldingRegion> Foldings = new List<FoldingRegion> ();
-
-			void AddUsings (AstNode parent)
-			{
-				var firstChild = parent.Children.FirstOrDefault (child => child is UsingDeclaration || child is UsingAliasDeclaration);
-				var node = firstChild;
-				while (node != null) {
-					var next = node.GetNextNode ();
-					if (next is UsingDeclaration || next is UsingAliasDeclaration) {
-						node = next;
-					} else {
-						break;
+			if (project != null) {
+				var curDoc = options.RoslynDocument;
+				if (curDoc == null) {
+					var curProject = TypeSystemService.GetCodeAnalysisProject (project);
+					if (curProject != null) {
+						var documentId = TypeSystemService.GetDocumentId (project, fileName);
+						if (documentId != null)
+							curDoc = curProject.GetDocument (documentId);
 					}
 				}
-				if (firstChild != node) {
-					Foldings.Add (new FoldingRegion (new DomRegion (firstChild.StartLocation, node.EndLocation), FoldType.Undefined));
-				}
-			}
-			public override object VisitSyntaxTree (SyntaxTree unit, object data)
-			{
-				AddUsings (unit);
-				return base.VisitSyntaxTree (unit, data);
-			}
-
-			static TextLocation CorrectEnd (AstNode token)
-			{
-				return new TextLocation (token.EndLocation.Line, token.EndLocation.Column + 1);
-			}
-
-			static bool LastToken(AstNode arg)
-			{
-				return !(arg.Role == Roles.NewLine || arg.Role == Roles.Whitespace || arg.Role == Roles.Comment);
-			}
-		
-			public override object VisitNamespaceDeclaration (NamespaceDeclaration namespaceDeclaration, object data)
-			{
-				AddUsings (namespaceDeclaration);
-				if (!namespaceDeclaration.RBraceToken.IsNull && namespaceDeclaration.LBraceToken.StartLocation.Line != namespaceDeclaration.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (namespaceDeclaration.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (namespaceDeclaration.RBraceToken)), FoldType.Undefined));
-				return base.VisitNamespaceDeclaration (namespaceDeclaration, data);
-			}
-			
-			public override object VisitTypeDeclaration (TypeDeclaration typeDeclaration, object data)
-			{
-				if (!typeDeclaration.RBraceToken.IsNull && typeDeclaration.LBraceToken.StartLocation.Line != typeDeclaration.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (typeDeclaration.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (typeDeclaration.RBraceToken)), FoldType.Type));
-				return base.VisitTypeDeclaration (typeDeclaration, data);
-			}
-			
-			public override object VisitMethodDeclaration (MethodDeclaration methodDeclaration, object data)
-			{
-				if (!methodDeclaration.Body.IsNull && methodDeclaration.Body.LBraceToken.StartLocation.Line != methodDeclaration.Body.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (methodDeclaration.Body.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (methodDeclaration.Body.RBraceToken)), FoldType.Member));
-				return base.VisitMethodDeclaration (methodDeclaration, data);
-			}
-			
-			public override object VisitConstructorDeclaration (ConstructorDeclaration constructorDeclaration, object data)
-			{
-				if (!constructorDeclaration.Body.IsNull && constructorDeclaration.Body.LBraceToken.StartLocation.Line != constructorDeclaration.Body.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (constructorDeclaration.Body.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (constructorDeclaration.Body.RBraceToken)), FoldType.Member));
-				return base.VisitConstructorDeclaration (constructorDeclaration, data);
-			}
-			
-			public override object VisitDestructorDeclaration (DestructorDeclaration destructorDeclaration, object data)
-			{
-				if (!destructorDeclaration.Body.IsNull && destructorDeclaration.Body.LBraceToken.StartLocation.Line != destructorDeclaration.Body.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (destructorDeclaration.Body.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (destructorDeclaration.Body.RBraceToken)), FoldType.Member));
-				return base.VisitDestructorDeclaration (destructorDeclaration, data);
-			}
-			
-			public override object VisitOperatorDeclaration (OperatorDeclaration operatorDeclaration, object data)
-			{
-				if (!operatorDeclaration.Body.IsNull && operatorDeclaration.Body.LBraceToken.StartLocation.Line != operatorDeclaration.Body.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (operatorDeclaration.Body.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (operatorDeclaration.Body.RBraceToken)), FoldType.Member));
-				return base.VisitOperatorDeclaration (operatorDeclaration, data);
-			}
-			
-			public override object VisitPropertyDeclaration (PropertyDeclaration propertyDeclaration, object data)
-			{
-				if (!propertyDeclaration.LBraceToken.IsNull && propertyDeclaration.LBraceToken.StartLocation.Line != propertyDeclaration.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (propertyDeclaration.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (propertyDeclaration.RBraceToken)), FoldType.Member));
-				return base.VisitPropertyDeclaration (propertyDeclaration, data);
-			}
-			
-			public override object VisitIndexerDeclaration (IndexerDeclaration indexerDeclaration, object data)
-			{
-				if (!indexerDeclaration.LBraceToken.IsNull && indexerDeclaration.LBraceToken.StartLocation.Line != indexerDeclaration.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (indexerDeclaration.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (indexerDeclaration.RBraceToken)), FoldType.Member));
-				return base.VisitIndexerDeclaration (indexerDeclaration, data);
-			}
-			
-			public override object VisitCustomEventDeclaration (CustomEventDeclaration eventDeclaration, object data)
-			{
-				if (!eventDeclaration.LBraceToken.IsNull && eventDeclaration.LBraceToken.StartLocation.Line != eventDeclaration.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (eventDeclaration.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (eventDeclaration.RBraceToken)), FoldType.Member));
-				return base.VisitCustomEventDeclaration (eventDeclaration, data);
-			}
-			
-			public override object VisitSwitchStatement (SwitchStatement switchStatement, object data)
-			{
-				if (!switchStatement.RBraceToken.IsNull && switchStatement.LBraceToken.StartLocation.Line != switchStatement.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (switchStatement.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (switchStatement.RBraceToken)), FoldType.Member));
-				return base.VisitSwitchStatement (switchStatement, data);
-			}
-			
-			public override object VisitBlockStatement (BlockStatement blockStatement, object data)
-			{
-				if (!(blockStatement.Parent is EntityDeclaration) && blockStatement.EndLocation.Line - blockStatement.StartLocation.Line > 2) {
-					Foldings.Add (new FoldingRegion (new DomRegion (blockStatement.GetPrevNode (LastToken).EndLocation, CorrectEnd (blockStatement.RBraceToken)), FoldType.Undefined));
-				}
-				
-				return base.VisitBlockStatement (blockStatement, data);
-			}
-		}
-
-		static IEnumerable<Tag> GetSemanticTags (SyntaxTree unit)
-		{
-			var visitor = new SemanticTagVisitor ();
-			unit.AcceptVisitor (visitor);
-			foreach (var fold in visitor.Tags)
-				yield return fold;
-		}
-
-		public class SemanticTagVisitor : DepthFirstAstVisitor
-		{
-			public List<Tag> Tags =  new List<Tag> ();
-
-			public override void VisitThrowStatement (ThrowStatement throwStatement)
-			{
-				var createExpression = throwStatement.Expression as ObjectCreateExpression;
-				if (createExpression == null)
-					return;
-				var st = createExpression.Type as SimpleType;
-				var mt = createExpression.Type as MemberType;
-				if (st != null && st.Identifier == "NotImplementedException" ||
-				    mt != null && mt.MemberName == "NotImplementedException" && mt.Target.ToString () == "System") {
-
-					if (createExpression.Arguments.Any ()) {
-						Tags.Add (new Tag ("High", GettextCatalog.GetString ("NotImplementedException({0}) thrown.", createExpression.Arguments.First ().ToString ()), new DomRegion (throwStatement.StartLocation, throwStatement.EndLocation)));
-					} else {
-						Tags.Add (new Tag ("High", GettextCatalog.GetString ("NotImplementedException thrown."), new DomRegion (throwStatement.StartLocation, throwStatement.EndLocation)));
+				if (curDoc != null) {
+					try {
+						var model = curDoc.GetSemanticModelAsync (cancellationToken).Result;
+						unit = model.SyntaxTree;
+						result.Ast = model;
+					} catch (AggregateException ae) {
+						ae.Flatten ().Handle (x => x is OperationCanceledException); 
+						return Task.FromResult ((ParsedDocument)result);
+					} catch (OperationCanceledException) {
+						return Task.FromResult ((ParsedDocument)result);
+					} catch (Exception e) {
+						LoggingService.LogError ("Error while getting the semantic model for " + fileName, e); 
 					}
 				}
 			}
-		}
 
-		void VisitMcsUnit ()
-		{
-		}
-		
-		void VisitComment (ParsedDocument result, SpecialsBag.Comment comment, string[] tagComments)
-		{
-			var cmt = new MonoDevelop.Ide.TypeSystem.Comment (comment.Content);
-			cmt.CommentStartsLine = comment.StartsLine;
-			switch (comment.CommentType) {
-			case SpecialsBag.CommentType.Multi:
-				cmt.CommentType = MonoDevelop.Ide.TypeSystem.CommentType.Block;
-				cmt.OpenTag = "/*";
-				cmt.ClosingTag = "*/";
-				break;
-			case SpecialsBag.CommentType.Single:
-				cmt.CommentType = MonoDevelop.Ide.TypeSystem.CommentType.SingleLine;
-				cmt.OpenTag = "//";
-				break;
-			case SpecialsBag.CommentType.Documentation:
-				cmt.CommentType = MonoDevelop.Ide.TypeSystem.CommentType.Documentation;
-				cmt.IsDocumentation = true;
-				cmt.OpenTag = "///";
-				break;
-			}
-			cmt.Region = new DomRegion (comment.Line, comment.Col, comment.EndLine, comment.EndCol);
-			result.Comments.Add (cmt);
-			var trimmedContent = comment.Content.TrimStart ();
-			foreach (string tag in tagComments) {
-				if (!trimmedContent.StartsWith (tag))
-					continue;
-				result.Add (new Tag (tag, comment.Content, cmt.Region));
-			}
-		}
-		
-		Stack<SpecialsBag.PreProcessorDirective> regions = new Stack<SpecialsBag.PreProcessorDirective> ();
-		Stack<SpecialsBag.PreProcessorDirective> ifBlocks = new Stack<SpecialsBag.PreProcessorDirective> ();
-		List<SpecialsBag.PreProcessorDirective> elifBlocks = new List<SpecialsBag.PreProcessorDirective> ();
-		SpecialsBag.PreProcessorDirective elseBlock = null;
-		
-		Stack<ConditionalRegion> conditionalRegions = new Stack<ConditionalRegion> ();
-		ConditionalRegion ConditionalRegion {
-			get {
-				return conditionalRegions.Count > 0 ? conditionalRegions.Peek () : null;
-			}
-		}
+			if (unit == null) {
+				unit = CSharpSyntaxTree.ParseText (SourceText.From (options.Content.Text), compilerArguments, fileName);
+			} 
 
-		void CloseConditionBlock (TextLocation loc)
-		{
-			if (ConditionalRegion == null || ConditionalRegion.ConditionBlocks.Count == 0 || !ConditionalRegion.ConditionBlocks[ConditionalRegion.ConditionBlocks.Count - 1].End.IsEmpty)
-				return;
-			ConditionalRegion.ConditionBlocks[ConditionalRegion.ConditionBlocks.Count - 1].End = loc;
-		}
+			result.Unit = unit;
 
-		void AddCurRegion (ParsedDocument result, int line, int col)
-		{
-			if (ConditionalRegion == null)
-				return;
-			ConditionalRegion.End = new TextLocation (line, col);
-			result.Add (ConditionalRegion);
-			conditionalRegions.Pop ();
-		}
-		
-		void VisitPreprocessorDirective (ParsedDocument result, SpecialsBag.PreProcessorDirective directive)
-		{
-			TextLocation loc = new TextLocation (directive.Line, directive.Col);
-			switch (directive.Cmd) {
-			case Tokenizer.PreprocessorDirective.If:
-				conditionalRegions.Push (new ConditionalRegion (directive.Arg));
-				ifBlocks.Push (directive);
-				ConditionalRegion.Start = loc;
-				break;
-			case Tokenizer.PreprocessorDirective.Elif:
-				CloseConditionBlock (new TextLocation (directive.EndLine, directive.EndCol));
-				if (ConditionalRegion != null)
-					ConditionalRegion.ConditionBlocks.Add (new ConditionBlock (directive.Arg, loc));
-				break;
-			case Tokenizer.PreprocessorDirective.Else:
-				CloseConditionBlock (new TextLocation (directive.EndLine, directive.EndCol));
-				if (ConditionalRegion != null)
-					ConditionalRegion.ElseBlock = new DomRegion (loc, TextLocation.Empty);
-				break;
-			case Tokenizer.PreprocessorDirective.Endif:
-				TextLocation endLoc = new TextLocation (directive.EndLine, directive.EndCol);
-				CloseConditionBlock (endLoc);
-				if (ConditionalRegion != null && !ConditionalRegion.ElseBlock.Begin.IsEmpty)
-					ConditionalRegion.ElseBlock = new DomRegion (ConditionalRegion.ElseBlock.Begin, endLoc);
-				AddCurRegion (result, directive.EndLine, directive.EndCol);
-				if (ifBlocks.Count > 0) {
-					var ifBlock = ifBlocks.Pop ();
-					var ifRegion = new DomRegion (ifBlock.Line, ifBlock.Col, directive.EndLine, directive.EndCol);
-					result.Add (new FoldingRegion ("#if " + ifBlock.Arg.Trim (), ifRegion, FoldType.UserRegion, false));
-					foreach (var d in elifBlocks) {
-						var elIlfRegion = new DomRegion (d.Line, d.Col, directive.EndLine, directive.EndCol);
-						result.Add (new FoldingRegion ("#elif " + ifBlock.Arg.Trim (), elIlfRegion, FoldType.UserRegion, false));
-					}
-					if (elseBlock != null) {
-						var elseBlockRegion = new DomRegion (elseBlock.Line, elseBlock.Col, elseBlock.Line, elseBlock.Col);
-						result.Add (new FoldingRegion ("#else", elseBlockRegion, FoldType.UserRegion, false));
-					}
-				}
-				elseBlock = null;
-				break;
-			case Tokenizer.PreprocessorDirective.Define:
-				result.Add (new PreProcessorDefine (directive.Arg, loc));
-				break;
-			case Tokenizer.PreprocessorDirective.Region:
-				regions.Push (directive);
-				break;
-			case Tokenizer.PreprocessorDirective.Endregion:
-				if (regions.Count > 0) {
-					var start = regions.Pop ();
-					DomRegion dr = new DomRegion (start.Line, start.Col, directive.EndLine, directive.EndCol);
-					result.Add (new FoldingRegion (start.Arg, dr, FoldType.UserRegion, true));
-				}
-				break;
+			DateTime time;
+			try {
+				time = System.IO.File.GetLastWriteTimeUtc (fileName);
+			} catch (Exception) {
+				time = DateTime.UtcNow;
 			}
+			result.LastWriteTimeUtc = time;
+			return Task.FromResult ((ParsedDocument)result);
 		}
 
-		public static ICSharpCode.NRefactory.CSharp.CompilerSettings GetCompilerArguments (MonoDevelop.Projects.Project project)
+		public static CSharpParseOptions GetCompilerArguments (MonoDevelop.Projects.Project project)
 		{
-			var compilerArguments = new ICSharpCode.NRefactory.CSharp.CompilerSettings ();
+			var compilerArguments = new CSharpParseOptions ();
 	//		compilerArguments.TabSize = 1;
 
 			if (project == null || MonoDevelop.Ide.IdeApp.Workspace == null) {
-				compilerArguments.AllowUnsafeBlocks = true;
+				// compilerArguments.AllowUnsafeBlocks = true;
 				return compilerArguments;
 			}
 
@@ -401,69 +116,54 @@ namespace MonoDevelop.CSharp.Parser
 			if (configuration == null)
 				return compilerArguments;
 
-			foreach (var sym in configuration.GetDefineSymbols ())
-				compilerArguments.ConditionalSymbols.Add (sym);
+			compilerArguments = compilerArguments.WithPreprocessorSymbols (configuration.GetDefineSymbols ());
 
 			var par = configuration.CompilationParameters as CSharpCompilerParameters;
 			if (par == null)
 				return compilerArguments;
-			
-			compilerArguments.AllowUnsafeBlocks = par.UnsafeCode;
-			compilerArguments.LanguageVersion = ConvertLanguageVersion (par.LangVersion);
-			compilerArguments.CheckForOverflow = par.GenerateOverflowChecks;
-			compilerArguments.WarningLevel = par.WarningLevel;
-			compilerArguments.TreatWarningsAsErrors = par.TreatWarningsAsErrors;
-			if (!string.IsNullOrEmpty (par.NoWarnings)) {
-				foreach (var warning in par.NoWarnings.Split (';', ',', ' ', '\t')) {
-					int w;
-					try {
-						w = int.Parse (warning);
-					} catch (Exception) {
-						continue;
-					}
-					compilerArguments.DisabledWarnings.Add (w);
-				}
-			}
+
+			 
+			// compilerArguments.AllowUnsafeBlocks = par.UnsafeCode;
+			compilerArguments = compilerArguments.WithLanguageVersion (ConvertLanguageVersion (par.LangVersion));
+//			compilerArguments.CheckForOverflow = par.GenerateOverflowChecks;
+
+//			compilerArguments.WarningLevel = par.WarningLevel;
+//			compilerArguments.TreatWarningsAsErrors = par.TreatWarningsAsErrors;
+//			if (!string.IsNullOrEmpty (par.NoWarnings)) {
+//				foreach (var warning in par.NoWarnings.Split (';', ',', ' ', '\t')) {
+//					int w;
+//					try {
+//						w = int.Parse (warning);
+//					} catch (Exception) {
+//						continue;
+//					}
+//					compilerArguments.DisabledWarnings.Add (w);
+//				}
+//			}
 			
 			return compilerArguments;
 		}
 		
-		internal static Version ConvertLanguageVersion (LangVersion ver)
+		internal static Microsoft.CodeAnalysis.CSharp.LanguageVersion ConvertLanguageVersion (LangVersion ver)
 		{
 			switch (ver) {
 			case LangVersion.ISO_1:
-				return new Version (1, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp1;
 			case LangVersion.ISO_2:
-				return new Version (2, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp2;
 			case LangVersion.Version3:
-				return new Version (3, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp3;
 			case LangVersion.Version4:
-				return new Version (4, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp4;
 			case LangVersion.Version5:
-				return new Version (5, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp5;
 			case LangVersion.Version6:
-				return new Version (6, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp6;
 			case LangVersion.Default:
 				break;
 			}
-			return new Version (6, 0, 0, 0);;
+			return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp6;
 		}
 	}
-	
-	static class FoldingUtils
-	{
-		public static IEnumerable<FoldingRegion> ToFolds (this IEnumerable<ConditionalRegion> conditionalRegions)
-		{
-			foreach (ConditionalRegion region in conditionalRegions) {
-				yield return new FoldingRegion ("#if " + region.Flag, region.Region, FoldType.ConditionalDefine);
-				foreach (ConditionBlock block in region.ConditionBlocks) {
-					yield return new FoldingRegion ("#elif " + block.Flag, block.Region,
-					                                FoldType.ConditionalDefine);
-				}
-				if (!region.ElseBlock.IsEmpty)
-					yield return new FoldingRegion ("#else", region.ElseBlock, FoldType.ConditionalDefine);
-			}
-		}		
-	}
 }
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
index fb6650042d..6a5f2cbbdf 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
@@ -34,6 +34,8 @@ using MonoDevelop.Core;
 using Mono.Collections.Generic;
 using System.Linq;
 using MonoDevelop.Projects.Formats.MSBuild;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.CSharp.Project
 {
@@ -112,6 +114,48 @@ namespace MonoDevelop.CSharp.Project
 			}
 		}
 
+		public override Microsoft.CodeAnalysis.CompilationOptions CreateCompilationOptions ()
+		{
+			CSharpProjectParameters cparams;
+			if (ParentConfiguration != null && ParentConfiguration.ProjectParameters != null) {
+				cparams = (CSharpProjectParameters)ParentConfiguration.ProjectParameters;
+			} else {
+				cparams = new CSharpProjectParameters ();
+			}
+
+			return new Microsoft.CodeAnalysis.CSharp.CSharpCompilationOptions (
+				OutputKind.ConsoleApplication,
+				null,
+				cparams.MainClass,
+				"Script",
+				null,
+				OptimizationLevel.Debug,
+				GenerateOverflowChecks,
+				UnsafeCode,
+				null,
+				null,
+				null,
+				Microsoft.CodeAnalysis.Platform.AnyCpu,
+				ReportDiagnostic.Default,
+				WarningLevel,
+				null,
+				false,
+				assemblyIdentityComparer: DesktopAssemblyIdentityComparer.Default
+			);
+		}
+
+		public override Microsoft.CodeAnalysis.ParseOptions CreateParseOptions ()
+		{
+			return new Microsoft.CodeAnalysis.CSharp.CSharpParseOptions (
+				GetRoslynLanguageVersion (langVersion),
+				Microsoft.CodeAnalysis.DocumentationMode.Parse,
+				Microsoft.CodeAnalysis.SourceCodeKind.Regular,
+				ImmutableArray<string>.Empty.AddRange (GetDefineSymbols ())
+			);
+
+		}
+
+
 		public LangVersion LangVersion {
 			get {
 				var val = TryLangVersionFromString (langVersion);
@@ -282,6 +326,19 @@ namespace MonoDevelop.CSharp.Project
 			}
 		}
 
+		Microsoft.CodeAnalysis.CSharp.LanguageVersion GetRoslynLanguageVersion (string value)
+		{
+			switch (value) {
+			case "ISO-1": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp1;
+			case "ISO-2": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp2;
+			case "3": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp3;
+			case "4": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp4;
+			case "5": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp5;
+			case "6": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp6;
+			default: return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp6;
+			}
+		}
+
 		internal static string TryLangVersionToString (LangVersion value)
 		{
 			switch (value) {
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
index 2f1603b1ce..dcbddc3bf8 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
@@ -35,8 +35,8 @@ using MonoDevelop.Projects;
 using MonoDevelop.Projects.Text;

 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.CSharp.Project
 {
@@ -209,16 +209,14 @@ namespace MonoDevelop.CSharp.Project
 		void FillClasses ()

 		{

 			try {
-				var ctx = TypeSystemService.GetCompilation (project);
+				var ctx = TypeSystemService.GetCompilationAsync (project).Result;
 				if (ctx == null)
 					// Project not found in parser database
 					return;
-				foreach (var c in ctx.GetAllTypeDefinitions ()) {

-					if (c.Methods != null) {

-						foreach (var m in c.Methods) {

-							if (m.IsStatic && m.Name == "Main")

-								classListStore.AppendValues (c.FullName);

-						}

+				foreach (var c in ctx.Assembly.GlobalNamespace.GetTypeMembers ()) {

+					foreach (var m in c.GetMembers().OfType<IMethodSymbol> ()) {

+						if (m.IsStatic && m.Name == "Main")

+							classListStore.AppendValues (c.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat));

 					}

 				}

 				classListFilled = true;

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/MoveTypeToFile.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/MoveTypeToFile.cs
deleted file mode 100644
index 31232cb27f..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/MoveTypeToFile.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// 
-// MoveTypeToFile.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.PatternMatching;
-using MonoDevelop.Core;
-using System.Collections.Generic;
-using Mono.TextEditor;
-using System.Linq;
-using MonoDevelop.Refactoring;
-using System.IO;
-using System.Text;
-using MonoDevelop.Ide.StandardHeader;
-using MonoDevelop.Core.ProgressMonitoring;
-using ICSharpCode.NRefactory;
-using System.Threading;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	class MoveTypeToFile : MonoDevelop.CodeActions.CodeActionProvider
-	{
-		public override IEnumerable<MonoDevelop.CodeActions.CodeAction> GetActions (MonoDevelop.Ide.Gui.Document document, object refactoringContext, TextLocation loc, CancellationToken cancellationToken)
-		{
-			var context = refactoringContext as MDRefactoringContext;
-			if (context == null)
-				return Enumerable.Empty<MonoDevelop.CodeActions.CodeAction> ();
-			return GetActions (context);
-		}
-		protected IEnumerable<MonoDevelop.CodeActions.CodeAction> GetActions (MDRefactoringContext context)
-		{
-			if (context.IsInvalid)
-				yield break;
-			var type = GetTypeDeclaration (context);
-			if (type == null)
-				yield break;
-			if (Path.GetFileNameWithoutExtension (context.TextEditor.FileName) == type.Name)
-				yield break;
-			string title;
-			if (IsSingleType (context)) {
-				title = String.Format (GettextCatalog.GetString ("Rename file to '{0}'"), Path.GetFileName (GetCorrectFileName (context, type)));
-			} else {
-				title = String.Format (GettextCatalog.GetString ("Move type to file '{0}'"), Path.GetFileName (GetCorrectFileName (context, type)));
-			}
-			yield return new MonoDevelop.CodeActions.DefaultCodeAction (title, (c, s) => {
-				var ctx = (MDRefactoringContext) c;
-				var script = (Script) s;
-				string correctFileName = GetCorrectFileName (ctx, type);
-				if (IsSingleType (ctx)) {
-					FileService.RenameFile (ctx.TextEditor.FileName, correctFileName);
-					if (ctx.FileContainerProject != null)
-						ctx.FileContainerProject.SaveAsync (new ProgressMonitor ());
-					return;
-				}
-				
-				CreateNewFile (ctx, type, correctFileName);
-				script.Remove (type);
-			});
-		}
-
-		static void CreateNewFile (MDRefactoringContext context, TypeDeclaration type, string correctFileName)
-		{
-			var content = context.TextEditor.Text;
-			
-			var types = new List<EntityDeclaration> (context.Unit.GetTypes ().Where (t => t.StartLocation != type.StartLocation));
-			types.Sort ((x, y) => y.StartLocation.CompareTo (x.StartLocation));
-
-			foreach (var removeType in types) {
-				var start = context.GetOffset (removeType.StartLocation);
-				var end = context.GetOffset (removeType.EndLocation);
-				content = content.Remove (start, end - start);
-			}
-			
-			if (context.FileContainerProject != null) {
-				string header = StandardHeaderService.GetHeader (context.FileContainerProject, correctFileName, true);
-				if (!string.IsNullOrEmpty (header))
-					content = header + context.TextEditor.EolMarker + StripHeader (content);
-			}
-			content = StripDoubleBlankLines (content);
-			
-			File.WriteAllText (correctFileName, content);
-			context.FileContainerProject.AddFile (correctFileName);
-			MonoDevelop.Ide.IdeApp.ProjectOperations.SaveAsync (context.FileContainerProject);
-		}
-
-		static bool IsBlankLine (TextDocument doc, int i)
-		{
-			var line = doc.GetLine (i);
-			return line.Length == line.GetIndentation (doc).Length;
-		}
-
-		static string StripDoubleBlankLines (string content)
-		{
-			var doc = new Mono.TextEditor.TextDocument (content);
-			for (int i = 1; i + 1 <= doc.LineCount; i++) {
-				if (IsBlankLine (doc, i) && IsBlankLine (doc, i + 1)) {
-					doc.Remove (doc.GetLine (i).SegmentIncludingDelimiter);
-					i--;
-					continue;
-				}
-			}
-			return doc.Text;
-		}
-
-		static string StripHeader (string content)
-		{
-			var doc = new Mono.TextEditor.TextDocument (content);
-			while (true) {
-				string lineText = doc.GetLineText (1);
-				if (lineText == null)
-					break;
-				if (lineText.StartsWith ("//")) {
-					doc.Remove (doc.GetLine (1).SegmentIncludingDelimiter);
-					continue;
-				}
-				break;
-			}
-			return doc.Text;
-		}
-		
-		bool IsSingleType (MDRefactoringContext context)
-		{
-			return context.Unit.GetTypes ().Count () == 1;
-		}
-		
-		TypeDeclaration GetTypeDeclaration (MDRefactoringContext context)
-		{
-			var result = context.GetNode<TypeDeclaration> ();
-			if (result == null || result.Parent is TypeDeclaration)
-				return null;
-			if (result != null && result.NameToken.Contains (context.Location))
-				return result;
-			return null;
-		}
-		
-		internal static string GetCorrectFileName (MDRefactoringContext context, EntityDeclaration type)
-		{
-			if (type == null)
-				return context.TextEditor.FileName;
-			return Path.Combine (Path.GetDirectoryName (context.TextEditor.FileName), type.Name + Path.GetExtension (context.TextEditor.FileName));
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/ContextActionExtensions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/ContextActionExtensions.cs
deleted file mode 100644
index a08ea332e3..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/ContextActionExtensions.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// 
-// ContextActionExtensions.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	static class ContextActionExtensions
-	{
-		public static int CalcIndentLevel (this MonoDevelop.Ide.Gui.Document doc, string indent)
-		{
-			int col = GetColumn (indent, 0, doc.Editor.Options.TabSize);
-			return System.Math.Max (0, col / doc.Editor.Options.TabSize);
-		}
-		
-		public static int GetColumn (string wrapper, int i, int tabSize)
-		{
-			int j = i;
-			int col = 0;
-			for (; j < wrapper.Length && (wrapper[j] == ' ' || wrapper[j] == '\t'); j++) {
-				if (wrapper[j] == ' ') {
-					col++;
-				} else {
-					col = GetNextTabstop (col, tabSize);
-				}
-			}
-			return col;
-		}
-		
-		static int GetNextTabstop (int currentColumn, int tabSize)
-		{
-			int result = currentColumn + tabSize;
-			return (result / tabSize) * tabSize;
-		}
-		
-		public static void FormatText (this AstNode node, MonoDevelop.Ide.Gui.Document doc)
-		{
-			doc.UpdateParseDocument ();
-			MonoDevelop.CSharp.Formatting.OnTheFlyFormatter.Format (doc, node.StartLocation);
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs
deleted file mode 100644
index c8c7d60632..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-// 
-// MDRefactoringContext.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory;
-using System.Threading;
-using MonoDevelop.Ide.Gui;
-using System.Diagnostics;
-using MonoDevelop.CSharp.Refactoring.CodeIssues;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.CSharp.Formatting;
-using System.Threading.Tasks;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	public class MDRefactoringContext : RefactoringContext, IRefactoringContext
-	{
-		MonoDevelop.Projects.Project fileContainerProject;
-
-		public TextEditorData TextEditor {
-			get;
-			private set;
-		}
-
-		public DotNetProject Project {
-			get;
-			private set;
-		}
-
-		public MonoDevelop.Projects.Project FileContainerProject {
-			get {
-				if (fileContainerProject == null)
-					fileContainerProject = FindProjectContainingFile () ?? Project;
-				return fileContainerProject;
-			}
-		}
-
-		MonoDevelop.Projects.Project FindProjectContainingFile ()
-		{
-			var file = TextEditor.FileName;
-			if (string.IsNullOrEmpty (file) || Project == null)
-				return null;
-
-			var pf = Project.GetProjectFile (file);
-			if (pf != null && (pf.Flags & ProjectItemFlags.Hidden) != 0) {
-				// The file is hidden in this project, so it may also be part of another project.
-				// Try to find a project in which this file is not hidden
-				foreach (var p in Project.ParentSolution.GetAllProjects ()) {
-					pf = p.GetProjectFile (file);
-					if (pf != null && (pf.Flags & ProjectItemFlags.Hidden) == 0)
-						return p;
-				}
-			}
-			return null;
-		}
-
-		public bool IsInvalid {
-			get {
-				if (Resolver == null || TextEditor == null)
-					return true;
-				return ParsedDocument == null;
-			}
-		}
-
-		public ParsedDocument ParsedDocument {
-			get;
-			private set;
-		}
-
-		public SyntaxTree Unit {
-			get {
-				Debug.Assert (!IsInvalid);
-				return Resolver.RootNode as SyntaxTree;
-			}
-		}
-
-		public override string DefaultNamespace {
-			get {
-				var p = FileContainerProject as IDotNetFileContainer;
-				if (p == null || TextEditor == null || string.IsNullOrEmpty (TextEditor.FileName))
-					return null;
-				return p.GetDefaultNamespace (TextEditor.FileName);
-			}
-		}
-
-		public override bool Supports (Version version)
-		{
-			var project = Project;
-			if (project == null)
-				return true;
-			switch (project.TargetFramework.ClrVersion) {
-			case ClrVersion.Net_1_1:
-				return version.Major > 1 || version.Major == 1 && version.Minor >= 1;
-			case ClrVersion.Net_2_0:
-				return version.Major >= 2;
-			case ClrVersion.Clr_2_1:
-				return version.Major > 2 || version.Major == 2 && version.Minor >= 1;
-			default:
-				return true;
-			}
-		}
-
-		public override ICSharpCode.NRefactory.CSharp.TextEditorOptions TextEditorOptions {
-			get {
-				return TextEditor.CreateNRefactoryTextEditorOptions ();
-			}
-		}
-
-		public override bool IsSomethingSelected { 
-			get {
-				return TextEditor.IsSomethingSelected;
-			}
-		}
-
-		public override string SelectedText {
-			get {
-				return TextEditor.SelectedText;
-			}
-		}
-
-		public override TextLocation SelectionStart {
-			get {
-				return TextEditor.MainSelection.Start;
-			}
-		}
-
-		public override TextLocation SelectionEnd { 
-			get {
-				return TextEditor.MainSelection.End;
-			}
-		}
-
-		public override int GetOffset (TextLocation location)
-		{
-			return TextEditor.LocationToOffset (location);
-		}
-
-		public override TextLocation GetLocation (int offset)
-		{
-			return TextEditor.OffsetToLocation (offset);
-		}
-
-		public override string GetText (int offset, int length)
-		{
-			return TextEditor.GetTextAt (offset, length);
-		}
-
-		public override string GetText (ICSharpCode.NRefactory.Editor.ISegment segment)
-		{
-			return TextEditor.GetTextAt (segment.Offset, segment.Length);
-		}
-
-		public override ICSharpCode.NRefactory.Editor.IDocumentLine GetLineByOffset (int offset)
-		{
-			return TextEditor.GetLineByOffset (offset);
-		}
-
-		readonly Document document;
-		TextLocation location;
-
-		public override TextLocation Location {
-			get {
-				return location;
-			}
-		}
-
-		internal void SetLocation (TextLocation loc)
-		{
-			if (document != null)
-				location = RefactoringService.GetCorrectResolveLocation (document, loc);
-			else
-				location = loc;
-		}
-
-		readonly CSharpFormattingOptions formattingOptions;
-
-		public CSharpFormattingOptions FormattingOptions {
-			get {
-				return formattingOptions;
-			}
-		}
-
-		public Script StartScript ()
-		{
-			return new MDRefactoringScript (this, formattingOptions);
-		}
-
-		public IDisposable CreateScript ()
-		{
-			return StartScript ();
-		}
-
-		internal static Task<MDRefactoringContext> Create (Document document, TextLocation loc, CancellationToken cancellationToken = default (CancellationToken))
-		{
-			var shared = document.GetSharedResolver ();
-			if (shared == null) {
-				var tcs = new TaskCompletionSource<MDRefactoringContext> ();
-				tcs.SetResult (null);
-				return tcs.Task;
-			}
-
-			return shared.ContinueWith (t => {
-				var sharedResolver = t.Result;
-				if (sharedResolver == null)
-					return null;
-				return new MDRefactoringContext (document, sharedResolver, loc, cancellationToken);
-				// Do not add TaskContinuationOptions.ExecuteSynchronously
-				// https://bugzilla.xamarin.com/show_bug.cgi?id=25065
-				// adding ExecuteSynchronously appears to create a deadlock situtation in TypeSystemParser.Parse()
-			});
-		}
-
-		internal MDRefactoringContext (Document document, CSharpAstResolver resolver, TextLocation loc, CancellationToken cancellationToken = default (CancellationToken)) : base (resolver, cancellationToken)
-		{
-			if (document == null)
-				throw new ArgumentNullException ("document");
-			this.document = document;
-			this.TextEditor = document.Editor;
-			this.ParsedDocument = document.ParsedDocument;
-			this.Project = document.Project as DotNetProject;
-			this.formattingOptions = document.GetFormattingOptions ();
-			this.location = loc;
-			var policy = document.HasProject ? document.Project.Policies.Get<NameConventionPolicy> () : MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<NameConventionPolicy> ();
-			Services.AddService (typeof(NamingConventionService), policy.CreateNRefactoryService ());
-			Services.AddService (typeof(ICSharpCode.NRefactory.CSharp.CodeGenerationService), new CSharpCodeGenerationService());
-		}
-
-		public MDRefactoringContext (DotNetProject project, TextEditorData data, ParsedDocument parsedDocument, CSharpAstResolver resolver, TextLocation loc, CancellationToken cancellationToken = default (CancellationToken)) : base (resolver, cancellationToken)
-		{
-			this.TextEditor = data;
-			this.ParsedDocument = parsedDocument;
-			this.Project = project;
-			var policy = Project.Policies.Get<CSharpFormattingPolicy> ();
-			this.formattingOptions = policy.CreateOptions ();
-			this.location = loc;
-			var namingPolicy = Project.Policies.Get<NameConventionPolicy> ();
-			Services.AddService (typeof(NamingConventionService), namingPolicy.CreateNRefactoryService ());
-		}
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs
deleted file mode 100644
index 02e35f0e04..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs
+++ /dev/null
@@ -1,377 +0,0 @@
-// 
-// MDRefactoringScript.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.Ide.Gui;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Core;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Refactoring.Rename;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.IO;
-using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.Ide;
-using System.Threading.Tasks;
-using MonoDevelop.Ide.FindInFiles;
-using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using MonoDevelop.Ide.Gui.Content;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	class MDRefactoringScript : DocumentScript
-	{
-		readonly MDRefactoringContext context;
-		readonly IDisposable undoGroup;
-		readonly ICSharpCode.NRefactory.Editor.ITextSourceVersion startVersion;
-		int operationsRunning;
-
-		public MDRefactoringScript (MDRefactoringContext context, CSharpFormattingOptions formattingOptions) : base(context.TextEditor.Document, formattingOptions, context.TextEditor.CreateNRefactoryTextEditorOptions ())
-		{
-			this.context = context;
-			undoGroup  = this.context.TextEditor.OpenUndoGroup ();
-			this.startVersion = this.context.TextEditor.Version;
-
-		}
-
-		void Rollback ()
-		{
-			DisposeOnClose (true);
-			foreach (var ver in context.TextEditor.Version.GetChangesTo (startVersion)) {
-				context.TextEditor.Document.Replace (ver.Offset, ver.RemovalLength, ver.InsertedText.Text);
-			}
-		}
-
-		public override void Select (AstNode node)
-		{
-			var seg = GetSegment (node);
-			var startOffset = seg.Offset;
-			var endOffset   = seg.EndOffset;
-			while (startOffset < endOffset) {
-				char ch = context.TextEditor.GetCharAt (startOffset);
-				if (!char.IsWhiteSpace (ch))
-					break;
-				startOffset++;
-			}
-			while (startOffset < endOffset && endOffset > 0) {
-				char ch = context.TextEditor.GetCharAt (endOffset - 1);
-				if (!char.IsWhiteSpace (ch))
-					break;
-				endOffset--;
-			}
-
-			context.TextEditor.Caret.Offset = endOffset;
-			context.TextEditor.SelectionRange = new TextSegment (startOffset, endOffset - startOffset);
-		}
-
-		public override Task<Script> InsertWithCursor (string operation, InsertPosition defaultPosition, IList<AstNode> nodes)
-		{
-			var tcs = new TaskCompletionSource<Script> ();
-			var editor = context.TextEditor;
-			DocumentLocation loc = context.TextEditor.Caret.Location;
-			var declaringType = context.ParsedDocument.GetInnermostTypeDefinition (loc);
-			var mode = new InsertionCursorEditMode (
-				editor.Parent,
-				MonoDevelop.Ide.TypeSystem.CodeGenerationService.GetInsertionPoints (context.TextEditor, context.ParsedDocument, declaringType));
-			if (mode.InsertionPoints.Count == 0) {
-				MessageService.ShowError (
-					GettextCatalog.GetString ("No valid insertion point can be found in type '{0}'.", declaringType.Name)
-				);
-				return tcs.Task;
-			}
-			var helpWindow = new Mono.TextEditor.PopupWindow.InsertionCursorLayoutModeHelpWindow ();
-			helpWindow.TitleText = operation;
-			mode.HelpWindow = helpWindow;
-			
-			switch (defaultPosition) {
-			case InsertPosition.Start:
-				mode.CurIndex = 0;
-				break;
-			case InsertPosition.End:
-				mode.CurIndex = mode.InsertionPoints.Count - 1;
-				break;
-			case InsertPosition.Before:
-				for (int i = 0; i < mode.InsertionPoints.Count; i++) {
-					if (mode.InsertionPoints [i].Location < loc)
-						mode.CurIndex = i;
-				}
-				break;
-			case InsertPosition.After:
-				for (int i = 0; i < mode.InsertionPoints.Count; i++) {
-					if (mode.InsertionPoints [i].Location > loc) {
-						mode.CurIndex = i;
-						break;
-					}
-				}
-				break;
-			}
-			operationsRunning++;
-			mode.StartMode ();
-			mode.Exited += delegate(object s, InsertionCursorEventArgs iCArgs) {
-				if (iCArgs.Success) {
-					if (iCArgs.InsertionPoint.LineAfter == NewLineInsertion.None && 
-					    iCArgs.InsertionPoint.LineBefore == NewLineInsertion.None && nodes.Count () > 1) {
-						iCArgs.InsertionPoint.LineAfter = NewLineInsertion.BlankLine;
-					}
-					foreach (var node in nodes.Reverse ()) {
-						var output = OutputNode (MonoDevelop.Ide.TypeSystem.CodeGenerationService.CalculateBodyIndentLevel (declaringType), node);
-						var offset = context.TextEditor.LocationToOffset (iCArgs.InsertionPoint.Location);
-						var delta = iCArgs.InsertionPoint.Insert (editor, output.Text);
-						output.RegisterTrackedSegments (this, delta + offset);
-					}
-					tcs.SetResult (this);
-				} else {
-					Rollback ();
-				}
-				DisposeOnClose (); 
-			};
-			return tcs.Task;
-		}
-
-		readonly List<Script> startedScripts = new List<Script> ();
-
-		public override Task<Script> InsertWithCursor (string operation, ITypeDefinition parentType, Func<Script, RefactoringContext, IList<AstNode>> nodeCallback)
-		{
-			var tcs = new TaskCompletionSource<Script>();
-			if (parentType == null)
-				return tcs.Task;
-			var part = parentType.Parts.FirstOrDefault ();
-			if (part == null)
-				return tcs.Task;
-
-			var loadedDocument = IdeApp.Workbench.OpenDocument (new FileOpenInformation (part.Region.FileName, null));
-			loadedDocument.RunWhenLoaded (delegate {
-				var editor = loadedDocument.Editor;
-				var loc = part.Region.Begin;
-				var parsedDocument = loadedDocument.UpdateParseDocument ();
-				var declaringType = parsedDocument.GetInnermostTypeDefinition (loc);
-				MDRefactoringScript script;
-
-				if (loadedDocument.Editor != context.TextEditor) {
-					script = new MDRefactoringScript (MDRefactoringContext.Create (loadedDocument, loc, context.CancellationToken).Result, FormattingOptions);
-					startedScripts.Add (script);
-				} else {
-					script = this;
-				}
-				var nodes = nodeCallback (script, script.context);
-				var mode = new InsertionCursorEditMode (
-					editor.Parent,
-					MonoDevelop.Ide.TypeSystem.CodeGenerationService.GetInsertionPoints (loadedDocument, declaringType));
-				if (mode.InsertionPoints.Count == 0) {
-					MessageService.ShowError (
-						GettextCatalog.GetString ("No valid insertion point can be found in type '{0}'.", declaringType.Name)
-					);
-					return;
-				}
-				if (declaringType.Kind == TypeKind.Enum) {
-					foreach (var node in nodes.Reverse ()) {
-						var output = OutputNode (MonoDevelop.Ide.TypeSystem.CodeGenerationService.CalculateBodyIndentLevel (declaringType), node);
-						var point = mode.InsertionPoints.First ();
-						var offset = loadedDocument.Editor.LocationToOffset (point.Location);
-						var text = output.Text + ",";
-						var delta = point.Insert (editor, text);
-						output.RegisterTrackedSegments (script, delta + offset);
-					}
-					tcs.SetResult (script);
-					return;
-				}
-
-				var helpWindow = new Mono.TextEditor.PopupWindow.InsertionCursorLayoutModeHelpWindow ();
-				helpWindow.TitleText = operation;
-				mode.HelpWindow = helpWindow;
-				
-				mode.CurIndex = 0;
-				operationsRunning++;
-				mode.StartMode ();
-				mode.Exited += delegate(object s, InsertionCursorEventArgs iCArgs) {
-					if (iCArgs.Success) {
-						if (iCArgs.InsertionPoint.LineAfter == NewLineInsertion.None && 
-						    iCArgs.InsertionPoint.LineBefore == NewLineInsertion.None && nodes.Count > 1) {
-							iCArgs.InsertionPoint.LineAfter = NewLineInsertion.BlankLine;
-						}
-						foreach (var node in nodes.Reverse ()) {
-							var output = OutputNode (MonoDevelop.Ide.TypeSystem.CodeGenerationService.CalculateBodyIndentLevel (declaringType), node);
-							var offset = loadedDocument.Editor.LocationToOffset (iCArgs.InsertionPoint.Location);
-							var text = output.Text;
-							var delta = iCArgs.InsertionPoint.Insert (editor, text);
-							output.RegisterTrackedSegments (script, delta + offset);
-						}
-						tcs.SetResult (script);
-					} else {
-						Rollback ();
-					}
-					DisposeOnClose (); 
-				};
-			});
-		
-			return tcs.Task;
-		}
-
-		public override Task Link (params AstNode[] nodes)
-		{
-			var tcs = new TaskCompletionSource<object> ();
-			var segments = new List<TextSegment> (nodes.Select (node => new TextSegment (GetSegment (node))).OrderBy (s => s.Offset));
-			
-			var link = new TextLink ("name");
-			segments.ForEach (link.AddLink);
-			var links = new List<TextLink> ();
-			links.Add (link);
-			var tle = new TextLinkEditMode (context.TextEditor.Parent, 0, links);
-			tle.SetCaretPosition = false;
-			if (tle.ShouldStartTextLinkMode) {
-				operationsRunning++;
-				context.TextEditor.Caret.Offset = segments [0].EndOffset;
-				tle.OldMode = context.TextEditor.CurrentMode;
-				tle.Cancel += (sender, e) => Rollback ();
-				tle.Exited += (sender, e) => DisposeOnClose (); 
-				tle.StartMode ();
-				context.TextEditor.CurrentMode = tle;
-				if (IdeApp.Workbench.ActiveDocument != null)
-					IdeApp.Workbench.ActiveDocument.ReparseDocument ();
-			}
-			return tcs.Task;
-		}
-
-		bool isDisposed;
-		void DisposeOnClose (bool force = false)
-		{
-			if (isDisposed)
-				return;
-			if (force)
-				operationsRunning = 0;
-			if (operationsRunning-- == 0) {
-				isDisposed = true;
-				undoGroup.Dispose ();
-				try {
-					base.Dispose ();
-				} catch (Exception e) {
-					LoggingService.LogError ("Error while disposing refactoring script", e);
-				}
-			}
-			foreach (var script in startedScripts)
-				script.Dispose ();
-		}
-		
-		public override void Dispose ()
-		{
-			DisposeOnClose ();
-		}
-
-		public override void Rename (ISymbol symbol, string name = null)
-		{
-			if (symbol is IEntity) {
-				RenameRefactoring.Rename ((IEntity)symbol, name);
-			} else if (symbol is IVariable) {
-				RenameRefactoring.RenameVariable ((IVariable)symbol, name);
-			} else if (symbol is INamespace) {
-				RenameRefactoring.RenameNamespace ((INamespace)symbol, name);
-			} else if (symbol is ITypeParameter) {
-				RenameRefactoring.RenameTypeParameter ((ITypeParameter)symbol, name);
-			}
-		}
-
-		public override void DoGlobalOperationOn (IEnumerable<IEntity> entities, Action<RefactoringContext, Script, IEnumerable<AstNode>> callback, string operationName = null)
-		{
-			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor (operationName ?? GettextCatalog.GetString ("Performing refactoring task..."), null)) {
-				var col = entities.SelectMany (entity => ReferenceFinder.FindReferences (entity, true, monitor)).OfType<CSharpReferenceFinder.CSharpMemberReference> ().GroupBy(reference => reference.FileName);
-
-				foreach (var r in col) {
-					string filename = r.Key;
-
-					bool isOpen;
-					System.Text.Encoding encoding;
-					bool hadBom;
-
-					var data = TextFileProvider.Instance.GetTextEditorData (filename, out hadBom, out encoding, out isOpen);
-
-					var firstReference = r.First ();
-
-					var project = firstReference.Project;
-
-					ParsedDocument parsedDocument;
-					using (var reader = new StreamReader (data.OpenStream ()))
-						parsedDocument = new MonoDevelop.CSharp.Parser.TypeSystemParser ().Parse (true, filename, reader, project);
-
-					var resolver = new CSharpAstResolver (TypeSystemService.GetCompilation (project), firstReference.SyntaxTree, parsedDocument.ParsedFile as CSharpUnresolvedFile);
-
-					var ctx = new MDRefactoringContext (project as DotNetProject, data, parsedDocument, resolver, firstReference.AstNode.StartLocation, context.CancellationToken);
-					var script = new MDRefactoringScript (ctx, FormattingOptions);
-
-					callback (ctx, script, r.Select (reference => reference.AstNode));
-
-					if (!isOpen) {
-						script.Dispose ();
-						Mono.TextEditor.Utils.TextFileUtility.WriteText (filename, data.Text, encoding, hadBom);
-					}
-				}
-			}
-		}
-
-		public override void CreateNewType (AstNode newType, NewTypeContext ntctx = NewTypeContext.CurrentNamespace)
-		{
-			if (newType == null)
-				throw new ArgumentNullException ("newType");
-			var correctFileName = MoveTypeToFile.GetCorrectFileName (context, (EntityDeclaration)newType);
-			
-			var content = context.TextEditor.Text;
-			
-			var types = new List<EntityDeclaration> (context.Unit.GetTypes ());
-			types.Sort ((x, y) => y.StartLocation.CompareTo (x.StartLocation));
-
-			foreach (var removeType in types) {
-				var start = context.GetOffset (removeType.StartLocation);
-				var end = context.GetOffset (removeType.EndLocation);
-				content = content.Remove (start, end - start);
-			}
-			
-			var insertLocation = types.Count > 0 ? context.GetOffset (types.Last ().StartLocation) : -1;
-			if (insertLocation < 0 || insertLocation > content.Length)
-				insertLocation = content.Length;
-			content = content.Substring (0, insertLocation) + newType.ToString (FormattingOptions) + content.Substring (insertLocation);
-
-			var project = context.FileContainerProject;
-			if (project != null) {
-				var policy = project.Policies.Get<CSharpFormattingPolicy> ();
-				var textPolicy = project.Policies.Get<TextStylePolicy> ();
-				content = MonoDevelop.CSharp.Formatting.CSharpFormatter.FormatText (policy, textPolicy, MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType, content, 0, content.Length);
-			}
-
-			File.WriteAllText (correctFileName, content);
-
-			if (project != null) {
-				project.AddFile (correctFileName);
-				IdeApp.ProjectOperations.SaveAsync (project);
-			}
-			IdeApp.Workbench.OpenDocument (correctFileName, project);
-		}
-
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeAction.cs
deleted file mode 100644
index adec92c9d5..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeAction.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// 
-// NRefactoryCodeAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.Ide.Gui;
-using ICSharpCode.NRefactory;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	class NRefactoryCodeAction : MonoDevelop.CodeActions.CodeAction
-	{
-		readonly CodeAction act;
-		
-		public NRefactoryCodeAction (string id, string title, CodeAction act, object siblingKey = null)
-		{
-			this.IdString = id;
-			this.Title = title;
-			this.act = act;
-			this.SiblingKey = siblingKey;
-			this.Severity = act.Severity;
-			this.DocumentRegion = new Mono.TextEditor.DocumentRegion (act.Start, act.End);
-		}
-
-		public override void Run (IRefactoringContext context, object script)
-		{
-			act.Run ((Script) script);
-		}
-
-		/// <summary>
-		/// All the sibling actions of this action, ie those actions which represent the same kind
-		/// of fix. This list includes the current action. 
-		/// </summary>
-		/// <value>The sibling actions.</value>
-		public IList<MonoDevelop.CodeActions.CodeAction> SiblingActions { get; set; }
-		
-		public override bool SupportsBatchRunning {
-			get{
-				return SiblingActions != null;// && SiblingActions.Count > 1;
-			}
-		}
-		
-		public override void BatchRun (Document document, TextLocation loc)
-		{
-			base.BatchRun (document, loc);
-			var context = MDRefactoringContext.Create (document, loc).Result;
-			if (context == null)
-				return;
-			using (var script = context.StartScript ()) {
-				foreach (var action in SiblingActions) {
-					context.SetLocation (action.DocumentRegion.Begin);
-					action.Run (context, script);
-				}
-			}
-		}
-	}
-	
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionProvider.cs
deleted file mode 100644
index ec7ec5754e..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionProvider.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// 
-// NRefactoryContextActionWrapper.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.Ide.Gui;
-using ICSharpCode.NRefactory;
-using System.Threading;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	class NRefactoryCodeActionProvider : MonoDevelop.CodeActions.CodeActionProvider
-	{
-		readonly List<string> actionId = new List<string> ();
-		readonly CodeActionProvider provider;
-
-		public NRefactoryCodeActionProvider (CodeActionProvider provider, ContextActionAttribute attr)
-		{
-			if (provider == null)
-				throw new ArgumentNullException ("provider");
-			if (attr == null)
-				throw new ArgumentNullException ("attr");
-			this.provider = provider;
-			Title = GettextCatalog.GetString (attr.Title ?? "");
-			Description = GettextCatalog.GetString (attr.Description ?? "");
-			Category = GettextCatalog.GetString (attr.Category ?? "");
-			MimeType = "text/x-csharp";
-		}
-
-		public override IEnumerable<MonoDevelop.CodeActions.CodeAction> GetActions (Document document, object _context, TextLocation loc, CancellationToken cancellationToken)
-		{
-			if (cancellationToken.IsCancellationRequested)
-				yield break;
-			var context = _context as MDRefactoringContext;
-			if (context == null || context.IsInvalid || context.RootNode == null)
-				yield break;
-			var actions = provider.GetActions (context);
-			if (actions == null) {
-				LoggingService.LogWarning (provider + " returned null actions.");
-				yield break;
-			}
-			int num = 0;
-			foreach (var action_ in actions) {
-				var action = action_;
-				if (actionId.Count <= num) {
-					actionId.Add (provider.GetType ().FullName + "'" + num);
-				}
-				yield return new NRefactoryCodeAction (actionId[num], GettextCatalog.GetString (action.Description ?? ""), action);
-				num++;
-			}
-		}
-
-		public override string IdString {
-			get {
-				return provider.GetType ().FullName;
-			}
-		}
-
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionSource.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionSource.cs
deleted file mode 100644
index ba431c6e0f..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionSource.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// 
-// NRefactoryCodeActionSource.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.CodeActions;
-using System.Collections.Generic;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	class NRefactoryCodeActionSource : ICodeActionProviderSource
-	{
-		#region ICodeActionProviderSource implementation
-		public IEnumerable<CodeActionProvider> GetProviders ()
-		{
-			foreach (var t in typeof (ICSharpCode.NRefactory.CSharp.Refactoring.AbstractAndVirtualConversionAction).Assembly.GetTypes ()) {
-				var attr = t.GetCustomAttributes (typeof(ICSharpCode.NRefactory.CSharp.ContextActionAttribute), false);
-				if (attr == null || attr.Length != 1)
-					continue;
-				if (t.Name == "AddUsingAction")
-					continue;
-				yield return new NRefactoryCodeActionProvider (
-					(ICSharpCode.NRefactory.CSharp.Refactoring.CodeActionProvider)Activator.CreateInstance (t),
-					(ICSharpCode.NRefactory.CSharp.ContextActionAttribute)attr [0]);
-			}
-		}
-		#endregion
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/BaseNRefactoryIssueProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/BaseNRefactoryIssueProvider.cs
deleted file mode 100644
index 89b24c2087..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/BaseNRefactoryIssueProvider.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// 
-// NRefactoryIssueWrapper.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Ide.Gui;
-using System.Threading;
-using MonoDevelop.CodeIssues;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using MonoDevelop.Core;
-using Mono.TextEditor;
-using MonoDevelop.Core.Instrumentation;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	class BaseNRefactoryIssueProvider : BaseCodeIssueProvider
-	{
-		NRefactoryIssueProvider parentIssue;
-		SubIssueAttribute subIssue;
-		TimerCounter counter;
-
-		public override CodeIssueProvider Parent {
-			get {
-				return parentIssue;
-			}
-		}
-
-		public override string MimeType {
-			get {
-				return parentIssue.MimeType;
-			}
-		}
-
-		
-		/// <summary>
-		/// Gets the identifier string used as property ID tag.
-		/// </summary>
-		public override string IdString {
-			get {
-				return parentIssue.IdString + "." + subIssue.Title;
-			}
-		}
-
-		public BaseNRefactoryIssueProvider (NRefactoryIssueProvider parentIssue, SubIssueAttribute subIssue)
-		{
-			this.parentIssue = parentIssue;
-			this.subIssue = subIssue;
-			this.Title = subIssue.Title;
-			this.Description = subIssue.Description;
-
-			DefaultSeverity = subIssue.Severity.HasValue ? subIssue.Severity.Value : parentIssue.DefaultSeverity;
-			IsEnabledByDefault = subIssue.IsEnabledByDefault.HasValue ? subIssue.IsEnabledByDefault.Value : parentIssue.IsEnabledByDefault;
-			UpdateSeverity ();
-
-			counter = InstrumentationService.CreateTimerCounter (IdString, "CodeIssueProvider run times");
-		}
-
-		/// <summary>
-		/// Gets all the code issues inside a document.
-		/// </summary>
-		public override IEnumerable<CodeIssue> GetIssues (object ctx, CancellationToken cancellationToken)
-		{
-			var context = ctx as MDRefactoringContext;
-			if (context == null || context.IsInvalid || context.RootNode == null || context.ParsedDocument.HasErrors)
-				return new CodeIssue[0];
-			// Holds all the actions in a particular sibling group.
-			IList<ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue> issues;
-			using (var timer = counter.BeginTiming ()) {
-				// We need to enumerate here in order to time it. 
-				// This shouldn't be a problem since there are current very few (if any) lazy providers.
-				var _issues = parentIssue.IssueProvider.GetIssues (context, subIssue.Title);
-				issues = _issues as IList<ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue> ?? _issues.ToList ();
-			}
-			return parentIssue.ToMonoDevelopRepresentation (cancellationToken, context, issues);
-		}
-
-
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/Issues/MonoTODOIssue.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/Issues/MonoTODOIssue.cs
deleted file mode 100644
index 20a593d9a1..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/Issues/MonoTODOIssue.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// MonoTODOIssue.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using MonoDevelop.CodeIssues;
-using ICSharpCode.NRefactory.CSharp;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
-
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	public class MonoTODOIssue : MonoDevelop.CodeIssues.CodeIssueProvider
-	{
-		public override bool HasSubIssues {
-			get {
-				return false;
-			}
-		}
-
-		public MonoTODOIssue ()
-		{
-			this.Title = "Mono TODO";
-			this.Description = "Find usages of mono todo items";
-			this.Category = IssueCategories.Notifications;
-			this.SetMimeType ("text/x-csharp");
-			this.IsEnabledByDefault = true;
-			this.SetSeverity (ICSharpCode.NRefactory.Refactoring.Severity.Warning); 
-			this.SetIsEnabled (true);
-		}
-
-		public override IEnumerable<CodeIssue> GetIssues (object refactoringContext, System.Threading.CancellationToken cancellationToken)
-		{
-			var context = refactoringContext as MDRefactoringContext;
-			if (context == null || context.IsInvalid || context.RootNode == null || context.ParsedDocument.HasErrors)
-				return new CodeIssue[0];
-			var visitor = new MonoTODOVisitor (this, context);
-			context.RootNode.AcceptVisitor (visitor);
-			return visitor.Issues;
-		}
-
-		class MonoTODOVisitor : DepthFirstAstVisitor
-		{
-			readonly MonoTODOIssue issue;
-			readonly MDRefactoringContext ctx;
-			public readonly List<CodeIssue> Issues = new List<CodeIssue> ();
-
-			public MonoTODOVisitor (MonoTODOIssue issue, MDRefactoringContext ctx)
-			{
-				this.issue = issue;
-				this.ctx = ctx;
-			}
-			static readonly Dictionary<string, string> attributes = new Dictionary<string, string> {
-				{ "MonoTODOAttribute", "Mono TODO" },
-				{ "MonoNotSupportedAttribute", "Mono NOT SUPPORTED" },
-				{ "MonoLimitationAttribute", "Mono LIMITATION" }
-			};
-			void Check (AstNode node, IMember member)
-			{
-				foreach (var attr in member.Attributes) {
-					if (attr.AttributeType.Namespace != "System")
-						continue;
-
-					string val;
-					if (attributes.TryGetValue (attr.AttributeType.Name, out val)) {
-						string msg = null;
-						var arg = attr.PositionalArguments.FirstOrDefault ();
-						if (arg != null)
-							msg = arg.ConstantValue != null ? arg.ConstantValue.ToString () : null;
-						Issues.Add (new CodeIssue (ICSharpCode.NRefactory.Refactoring.IssueMarker.WavedLine,
-							string.IsNullOrEmpty (msg) ? val : val + ": " + msg,
-							new DomRegion (node.StartLocation, node.EndLocation),
-							issue.IdString
-						)); 
-					}
-				}
-
-			}
-
-			public override void VisitMemberReferenceExpression (MemberReferenceExpression memberReferenceExpression)
-			{
-				base.VisitMemberReferenceExpression (memberReferenceExpression);
-				var rr = ctx.Resolve (memberReferenceExpression) as MemberResolveResult;
-				if (rr == null || rr.IsError)
-					return;
-				Check (memberReferenceExpression, rr.Member);
-			}
-
-			public override void VisitIdentifierExpression (IdentifierExpression identifierExpression)
-			{
-				base.VisitIdentifierExpression (identifierExpression);
-				var rr = ctx.Resolve (identifierExpression) as MemberResolveResult;
-				if (rr == null || rr.IsError)
-					return;
-				Check (identifierExpression, rr.Member);
-			}
-
-			public override void VisitInvocationExpression (InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression (invocationExpression);
-				var rr = ctx.Resolve (invocationExpression) as CSharpInvocationResolveResult;
-				if (rr == null || rr.IsError)
-					return;
-				Check (invocationExpression, rr.Member);
-			}
-
-			public override void VisitBlockStatement (BlockStatement blockStatement)
-			{
-				ctx.CancellationToken.ThrowIfCancellationRequested ();
-				base.VisitBlockStatement (blockStatement);
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryIssueProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryIssueProvider.cs
deleted file mode 100644
index 61592e7e9b..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryIssueProvider.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-// 
-// NRefactoryIssueWrapper.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Ide.Gui;
-using System.Threading;
-using MonoDevelop.CodeIssues;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using MonoDevelop.Core;
-using Mono.TextEditor;
-using MonoDevelop.Core.Instrumentation;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	class NRefactoryIssueProvider : CodeIssueProvider
-	{
-		readonly ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssueProvider issueProvider;
-		readonly IssueDescriptionAttribute attr;
-		readonly string providerIdString;
-		readonly TimerCounter counter;
-
-		public override string IdString {
-			get {
-				return "refactoring.codeissues." + MimeType + "." + issueProvider.GetType ().FullName;
-			}
-		}
-
-		public override bool HasSubIssues {
-			get {
-				return issueProvider.HasSubIssues;
-			}
-		}
-
-		readonly List<BaseCodeIssueProvider> subIssues;
-		public override IEnumerable<BaseCodeIssueProvider> SubIssues {
-			get {
-				return subIssues;
-			}
-		}
-
-		public ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssueProvider IssueProvider {
-			get {
-				return issueProvider;
-			}
-		}
-
-		public string ProviderIdString {
-			get {
-				return providerIdString;
-			}
-		}
-
-		public NRefactoryIssueProvider (ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssueProvider issue, IssueDescriptionAttribute attr)
-		{
-			issueProvider = issue;
-			this.attr = attr;
-			providerIdString = issueProvider.GetType ().FullName;
-			Category = GettextCatalog.GetString (attr.Category ?? "");
-			Title = GettextCatalog.GetString (attr.Title ?? "");
-			Description = GettextCatalog.GetString (attr.Description ?? "");
-			DefaultSeverity = attr.Severity;
-			IsEnabledByDefault = attr.IsEnabledByDefault;
-			SetMimeType ("text/x-csharp");
-			subIssues = issueProvider.SubIssues.Select (subIssue => (BaseCodeIssueProvider)new BaseNRefactoryIssueProvider (this, subIssue)).ToList ();
-
-			counter = InstrumentationService.CreateTimerCounter (IdString, "CodeIssueProvider run times");
-		}
-
-		public override IEnumerable<CodeIssue> GetIssues (object ctx, CancellationToken cancellationToken)
-		{
-			var context = ctx as MDRefactoringContext;
-			if (context == null || context.IsInvalid || context.RootNode == null || context.ParsedDocument.HasErrors)
-				return new CodeIssue[0];
-				
-			// Holds all the actions in a particular sibling group.
-			IList<ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue> issues;
-			using (var timer = counter.BeginTiming ()) {
-				// We need to enumerate here in order to time it. 
-				// This shouldn't be a problem since there are current very few (if any) lazy providers.
-				var _issues = issueProvider.GetIssues (context);
-				issues = _issues as IList<ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue> ?? _issues.ToList ();
-			}
-			return ToMonoDevelopRepresentation (cancellationToken, context, issues);
-		}
-
-		IEnumerable<NRefactoryCodeAction> GetActions (ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue issue, MDRefactoringContext context)
-		{
-			foreach (var action in issue.Actions)
-				yield return new NRefactoryCodeAction (IdString, action.Description, action, action.SiblingKey);
-
-			if (issue.ActionProvider != null) {
-				foreach (var provider in issue.ActionProvider) {
-					var boundActionProvider = (ICSharpCode.NRefactory.CSharp.Refactoring.CodeActionProvider)Activator.CreateInstance (provider);
-					context.SetLocation (issue.Start);
-					foreach (var action in boundActionProvider.GetActions (context)) {
-						yield return new NRefactoryCodeAction (provider.FullName, action.Description, action, action.SiblingKey);
-					}
-				}
-			}
-		}
-
-		internal IEnumerable<CodeIssue> ToMonoDevelopRepresentation (CancellationToken cancellationToken, MDRefactoringContext context, IEnumerable<ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue> issues)
-		{
-			var actionGroups = new Dictionary<object, IList<MonoDevelop.CodeActions.CodeAction>> ();
-			foreach (var issue in issues) {
-				if (cancellationToken.IsCancellationRequested)
-					yield break;
-				if (issue.Actions == null) {
-					LoggingService.LogError ("NRefactory actions == null in :" + Title);
-					continue;
-				}
-				var actions = new List<NRefactoryCodeAction> ();
-				foreach (var nrefactoryCodeAction in GetActions(issue, context)) {
-					if (cancellationToken.IsCancellationRequested)
-						yield break;
-					if (nrefactoryCodeAction == null) {
-						LoggingService.LogError ("NRefactory issue action was null in :" + Title);
-						continue;
-					}
-					if (nrefactoryCodeAction.SiblingKey != null) {
-						// make sure the action has a list of its siblings
-						IList<MonoDevelop.CodeActions.CodeAction> siblingGroup;
-						if (!actionGroups.TryGetValue (nrefactoryCodeAction.SiblingKey, out siblingGroup)) {
-							siblingGroup = new List<MonoDevelop.CodeActions.CodeAction> ();
-							actionGroups.Add (nrefactoryCodeAction.SiblingKey, siblingGroup);
-						}
-						siblingGroup.Add (nrefactoryCodeAction);
-						nrefactoryCodeAction.SiblingActions = siblingGroup;
-					}
-					actions.Add (nrefactoryCodeAction);
-				}
-				yield return new CodeIssue (issue.IssueMarker, GettextCatalog.GetString (issue.Description ?? ""), context.TextEditor.FileName, issue.Start, issue.End, IdString, actions) {
-					ActionProvider = issue.ActionProvider
-				};
-			}
-		}	
-
-		public override bool CanDisableOnce { get { return !string.IsNullOrEmpty (attr.AnalysisDisableKeyword); } }
-
-		public override bool CanDisableAndRestore { get { return !string.IsNullOrEmpty (attr.AnalysisDisableKeyword); } }
-
-		public override bool CanDisableWithPragma { get { return attr.PragmaWarning > 0; } }
-
-		public override bool CanSuppressWithAttribute { get { return !string.IsNullOrEmpty (attr.SuppressMessageCheckId); } }
-
-		const string analysisDisableTag = "Analysis ";
-
-		public override void DisableOnce (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			document.Editor.Insert (
-				document.Editor.LocationToOffset (loc.BeginLine, 1), 
-				document.Editor.IndentationTracker.GetIndentationString (loc.Begin) + "// " + analysisDisableTag + "disable once " + attr.AnalysisDisableKeyword + document.Editor.EolMarker
-			); 
-		}
-
-		public override void DisableAndRestore (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			using (document.Editor.OpenUndoGroup ()) {
-				document.Editor.Insert (
-					document.Editor.LocationToOffset (loc.EndLine + 1, 1),
-					document.Editor.IndentationTracker.GetIndentationString (loc.End) + "// " + analysisDisableTag + "restore " + attr.AnalysisDisableKeyword + document.Editor.EolMarker
-				); 
-				document.Editor.Insert (
-					document.Editor.LocationToOffset (loc.BeginLine, 1),
-					document.Editor.IndentationTracker.GetIndentationString (loc.Begin) + "// " + analysisDisableTag + "disable " + attr.AnalysisDisableKeyword + document.Editor.EolMarker
-				); 
-			}
-		}
-
-		public override void DisableWithPragma (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			using (document.Editor.OpenUndoGroup ()) {
-				document.Editor.Insert (
-					document.Editor.LocationToOffset (loc.EndLine + 1, 1),
-					document.Editor.IndentationTracker.GetIndentationString (loc.End) + "#pragma warning restore " + attr.PragmaWarning + document.Editor.EolMarker
-				); 
-				document.Editor.Insert (
-					document.Editor.LocationToOffset (loc.BeginLine, 1),
-					document.Editor.IndentationTracker.GetIndentationString (loc.Begin) + "#pragma warning disable " + attr.PragmaWarning + document.Editor.EolMarker
-				); 
-			}
-		}
-
-		public override void SuppressWithAttribute (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			var member = document.ParsedDocument.GetMember (loc.End);
-			document.Editor.Insert (
-				document.Editor.LocationToOffset (member.Region.BeginLine, 1),
-				document.Editor.IndentationTracker.GetIndentationString (loc.Begin) + string.Format ("[SuppressMessage(\"{0}\", \"{1}\")]" + document.Editor.EolMarker, attr.SuppressMessageCategory, attr.SuppressMessageCheckId)
-			); 
-		}
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerationService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerationService.cs
index 18cb6df5f9..a28f8a3750 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerationService.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerationService.cs
@@ -1,62 +1,62 @@
+////
+//// CSharpCodeGenerationService.cs
+////
+//// Author:
+////       Mike Krüger <mkrueger@xamarin.com>
+////
+//// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+////
+//// Permission is hereby granted, free of charge, to any person obtaining a copy
+//// of this software and associated documentation files (the "Software"), to deal
+//// in the Software without restriction, including without limitation the rights
+//// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//// copies of the Software, and to permit persons to whom the Software is
+//// furnished to do so, subject to the following conditions:
+////
+//// The above copyright notice and this permission notice shall be included in
+//// all copies or substantial portions of the Software.
+////
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//// THE SOFTWARE.
+//using System;
+//using ICSharpCode.NRefactory.CSharp;
+//using ICSharpCode.NRefactory.TypeSystem;
+//using ICSharpCode.NRefactory.CSharp.Refactoring;
+//using System.Linq;
+//using Atk;
+//using Gdk;
 //
-// CSharpCodeGenerationService.cs
+//namespace MonoDevelop.CSharp.Refactoring
+//{
+//	public class CSharpCodeGenerationService : DefaultCodeGenerationService
+//	{
+//		public override EntityDeclaration GenerateMemberImplementation (RefactoringContext context, IMember member, bool explicitImplementation)
+//		{
+//			var result = base.GenerateMemberImplementation (context, member, explicitImplementation);
+//			if (CSharpCodeGenerator.IsMonoTouchModelMember (member)) {
+//				var m = result as MethodDeclaration;
+//				if (m != null) {
+//					for (int i = CSharpCodeGenerator.MonoTouchComments.Length - 1; i >= 0; i--) {
+//						m.Body.InsertChildBefore (m.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
+//					}
+//				}
 //
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using System.Linq;
-using Atk;
-using Gdk;
-
-namespace MonoDevelop.CSharp.Refactoring
-{
-	public class CSharpCodeGenerationService : DefaultCodeGenerationService
-	{
-		public override EntityDeclaration GenerateMemberImplementation (RefactoringContext context, IMember member, bool explicitImplementation)
-		{
-			var result = base.GenerateMemberImplementation (context, member, explicitImplementation);
-			if (CSharpCodeGenerator.IsMonoTouchModelMember (member)) {
-				var m = result as MethodDeclaration;
-				if (m != null) {
-					for (int i = CSharpCodeGenerator.MonoTouchComments.Length - 1; i >= 0; i--) {
-						m.Body.InsertChildBefore (m.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
-					}
-				}
-
-				var p = result as PropertyDeclaration;
-				if (p != null) {
-					for (int i = CSharpCodeGenerator.MonoTouchComments.Length - 1; i >= 0; i--) {
-						if (!p.Getter.IsNull)
-							p.Getter.Body.InsertChildBefore (p.Getter.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
-						if (!p.Setter.IsNull)
-							p.Setter.Body.InsertChildBefore (p.Setter.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
-					}
-				}
-			}
-			return result;
-		}
-	}
-}
+//				var p = result as PropertyDeclaration;
+//				if (p != null) {
+//					for (int i = CSharpCodeGenerator.MonoTouchComments.Length - 1; i >= 0; i--) {
+//						if (!p.Getter.IsNull)
+//							p.Getter.Body.InsertChildBefore (p.Getter.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
+//						if (!p.Setter.IsNull)
+//							p.Setter.Body.InsertChildBefore (p.Setter.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
+//					}
+//				}
+//			}
+//			return result;
+//		}
+//	}
+//}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
index 5f6cd6b4f5..6a2f2bdbc7 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
@@ -1,5 +1,5 @@
 // 
-// CSharpCodecs
+// CSharpCodeGenerator.cs
 //  
 // Author:
 //       Mike Krüger <mkrueger@novell.com>
@@ -23,358 +23,405 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+
 using System;
-using ICSharpCode.NRefactory.CSharp;
-using System.Text;
-using MonoDevelop.CSharp.Formatting;
-using System.Collections.Generic;
 using System.Linq;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using MonoDevelop.Projects.Policies;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-using ICSharpCode.Decompiler;
-using ICSharpCode.Decompiler.Ast;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-
+using Microsoft.CodeAnalysis;
+using System.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide;
+using System.Collections.Generic;
+using MonoDevelop.CSharp.Formatting;
+using Microsoft.CodeAnalysis.Options;
 
 namespace MonoDevelop.CSharp.Refactoring
 {
-	class CSharpCodeGenerator : CodeGenerator
+	class CSharpCodeGenerator // : CodeGenerator
 	{
-		static CSharpAmbience ambience = new CSharpAmbience ();
-		
-		CSharpFormattingPolicy policy;
-		
-		public MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy Policy {
-			get {
-				if (policy == null) {
-					var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
-					if (PolicyParent != null)
-						policy = PolicyParent.Get<CSharpFormattingPolicy> (types);
-					if (policy == null) {
-						
-						policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types);
-					}
-				}
-				return this.policy;
-			}
-		}
-		
-		public override PolicyContainer PolicyParent {
-			get {
-				return base.PolicyParent;
-			}
-			set {
-				base.PolicyParent = value;
-				var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
-				policy = value.Get<CSharpFormattingPolicy> (types);
-			}
-		}
-		
-		
+//		static CSharpAmbience ambience = new CSharpAmbience ();
+//		
+//		CSharpFormattingPolicy policy;
+//		
+//		public MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy Policy {
+//			get {
+//				if (policy == null) {
+//					var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
+//					if (PolicyParent != null)
+//						policy = PolicyParent.Get<CSharpFormattingPolicy> (types);
+//					if (policy == null) {
+//						
+//						policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types);
+//					}
+//				}
+//				return this.policy;
+//			}
+//		}
+//		
+//		public override PolicyContainer PolicyParent {
+//			get {
+//				return base.PolicyParent;
+//			}
+//			set {
+//				base.PolicyParent = value;
+//				var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
+//				policy = value.Get<CSharpFormattingPolicy> (types);
+//			}
+//		}
+//		
+//		
 		class CodeGenerationOptions
 		{
 			public bool ExplicitDeclaration { get; set; }
-			public ITypeDefinition ImplementingType { get; set; }
-			public IUnresolvedTypeDefinition Part { get; set; }
+			public ITypeSymbol ImplementingType { get; set; }
+			public Location Part { get; set; }
+
+			public TextEditor Editor { get; set; }
+			public DocumentContext DocumentContext { get; set; }
 
-			public MonoDevelop.Ide.Gui.Document Document { get; set; }
+			public bool CreateProtocolMember { get; set; }
+
+			public SemanticModel SemanticModel {
+				get {
+					var model = DocumentContext.ParsedDocument.GetAst<SemanticModel> ();
+					return model;
+				}
+			}
 
 			public string GetShortType (string ns, string name, int typeArguments = 0)
 			{
-				if (Document == null || Document.ParsedDocument == null)
+				if (DocumentContext == null || Editor == null || SemanticModel == null || DocumentContext.ParsedDocument == null)
 					return ns + "." + name;
-				var typeDef = new GetClassTypeReference (ns, name, typeArguments).Resolve (Document.Compilation.TypeResolveContext);
-				if (typeDef == null)
+				
+				var model = DocumentContext.ParsedDocument.GetAst<SemanticModel> ();
+
+				if (model == null)
 					return ns + "." + name;
-				var file = Document.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-				var csResolver = file.GetResolver (Document.Compilation, Document.Editor.Caret.Location);
-				var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver);
-				return OutputNode (Document, builder.ConvertType (typeDef));
+
+				var type = model.Compilation.GetTypeByMetadataName (ns + "." + name);
+				if (type == null)
+					return ns + "." + name;
+
+
+				return type.ToMinimalDisplayString (model, Editor.CaretOffset); 
 			}
 		}
-		
-		public override string WrapInRegions (string regionName, string text)
+
+		static void AppendLine (StringBuilder sb)
 		{
-			StringBuilder result = new StringBuilder ();
-			AppendIndent (result);
-			result.Append ("#region ");
-			result.Append (regionName);
-			AppendLine (result);
-			result.Append (text);
-			AppendLine (result);
-			AppendIndent (result);
-			result.Append ("#endregion");
-			return result.ToString ();
+			sb.AppendLine ();
 		}
 
-		void AppendObsoleteAttribute (StringBuilder result, CodeGenerationOptions options, IEntity entity)
-		{
-			string reason;
-			if (!entity.IsObsolete (out reason))
-				return;
+//		public override string WrapInRegions (string regionName, string text)
+//		{
+//			StringBuilder result = new StringBuilder ();
+//			AppendIndent (result);
+//			result.Append ("#region ");
+//			result.Append (regionName);
+//			AppendLine (result);
+//			result.Append (text);
+//			AppendLine (result);
+//			AppendIndent (result);
+//			result.Append ("#endregion");
+//			return result.ToString ();
+//		}
 
-			var implementingType = options.Part;
-			var loc = implementingType.Region.End;
-			
-			var pf = implementingType.UnresolvedFile;
-			var file = pf as CSharpUnresolvedFile;
+		static void AppendObsoleteAttribute (StringBuilder result, CodeGenerationOptions options, ISymbol entity)
+		{
+			// TODO: Roslyn port
+//			string reason;
+//			if (!entity.IsObsolete (out reason))
+//				return;
+//
+//			var implementingType = options.Part;
+//			var loc = implementingType.Region.End;
+//			
+//			var pf = implementingType.UnresolvedFile;
+//			var file = pf as CSharpUnresolvedFile;
+//
+//			result.Append ("[");
+//			var obsoleteRef = ReflectionHelper.ParseReflectionName ("System.ObsoleteAttribute");
+//			var resolvedType = obsoleteRef.Resolve (options.ImplementingType.Compilation);
+//			var shortType = resolvedType.Kind != TypeKind.Unknown ? CreateShortType (options.ImplementingType.Compilation, file, loc, resolvedType) : null;
+//			var text = shortType != null ? shortType.ToString () : "System.Obsolete";
+//			if (text.EndsWith ("Attribute", StringComparison.Ordinal))
+//				text = text.Substring (0, text.Length - "Attribute".Length);
+//			result.Append (text);
+//			if (!string.IsNullOrEmpty (reason)) {
+//				result.Append (" (\"");
+//				result.Append (reason);
+//				result.Append ("\")");
+//			}
+//			result.Append ("]");
+//			result.AppendLine ();
+		}
+//		
+//		public override CodeGeneratorMemberResult CreateMemberImplementation (ITypeDefinition implementingType,
+//		                                                                      IUnresolvedTypeDefinition part,
+//		                                                                      IUnresolvedMember member,
+//		                                                                      bool explicitDeclaration)
+//		{
+//			SetIndentTo (part);
+//			var options = new CodeGenerationOptions () {
+//				ExplicitDeclaration = explicitDeclaration,
+//				ImplementingType = implementingType,
+//				Part = part
+//			};
+//			ITypeResolveContext ctx;
+//
+//			var doc = IdeApp.Workbench.GetDocument (part.Region.FileName);
+//			ctx = new CSharpTypeResolveContext (implementingType.Compilation.MainAssembly, null, implementingType, null);
+//			options.Document = doc;
+//
+//			if (member is IUnresolvedMethod)
+//				return GenerateCode ((IMethod) ((IUnresolvedMethod)member).CreateResolved (ctx), options);
+//			if (member is IUnresolvedProperty)
+//				return GenerateCode ((IProperty) ((IUnresolvedProperty)member).CreateResolved (ctx), options);
+//			if (member is IUnresolvedField)
+//				return GenerateCode ((IField) ((IUnresolvedField)member).CreateResolved (ctx), options);
+//			if (member is IUnresolvedEvent)
+//				return GenerateCode ((IEvent) ((IUnresolvedEvent)member).CreateResolved (ctx), options);
+//			throw new NotSupportedException ("member " +  member + " is not supported.");
+//		}
+		
+		public static CodeGeneratorMemberResult CreateOverridenMemberImplementation (DocumentContext document, TextEditor editor, ITypeSymbol implementingType, Location part, ISymbol member, bool explicitDeclaration)
+		{
+			var options = new CodeGenerationOptions {
+				ExplicitDeclaration = explicitDeclaration,
+				ImplementingType = implementingType,
+				Part = part,
+				DocumentContext = document,
+				Editor = editor
+			};
 
-			result.Append ("[");
-			var obsoleteRef = ReflectionHelper.ParseReflectionName ("System.ObsoleteAttribute");
-			var resolvedType = obsoleteRef.Resolve (options.ImplementingType.Compilation);
-			var shortType = resolvedType.Kind != TypeKind.Unknown ? CreateShortType (options.ImplementingType.Compilation, file, loc, resolvedType) : null;
-			var text = shortType != null ? shortType.ToString () : "System.Obsolete";
-			if (text.EndsWith ("Attribute", StringComparison.Ordinal))
-				text = text.Substring (0, text.Length - "Attribute".Length);
-			result.Append (text);
-			if (!string.IsNullOrEmpty (reason)) {
-				result.Append (" (\"");
-				result.Append (reason);
-				result.Append ("\")");
-			}
-			result.Append ("]");
-			result.AppendLine ();
+			if (member is IMethodSymbol)
+				return GenerateCode ((IMethodSymbol)member, options);
+			if (member is IPropertySymbol)
+				return GenerateCode ((IPropertySymbol)member, options);
+			if (member is IFieldSymbol)
+				return GenerateCode ((IFieldSymbol)member, options);
+			if (member is IEventSymbol)
+				return GenerateCode ((IEventSymbol)member, options);
+			throw new NotSupportedException ("member " +  member + " is not supported.");
 		}
-		
-		public override CodeGeneratorMemberResult CreateMemberImplementation (ITypeDefinition implementingType,
-		                                                                      IUnresolvedTypeDefinition part,
-		                                                                      IUnresolvedMember member,
-		                                                                      bool explicitDeclaration)
+
+		public static CodeGeneratorMemberResult CreateProtocolMemberImplementation (DocumentContext document, TextEditor editor, ITypeSymbol implementingType, Location part, ISymbol member, bool explicitDeclaration)
 		{
-			SetIndentTo (part);
-			var options = new CodeGenerationOptions () {
+			//			SetIndentTo (part);
+			var options = new CodeGenerationOptions {
 				ExplicitDeclaration = explicitDeclaration,
 				ImplementingType = implementingType,
-				Part = part
+				Part = part,
+				DocumentContext = document,
+				Editor = editor,
+				CreateProtocolMember = true
 			};
-			ITypeResolveContext ctx;
-
-			var doc = IdeApp.Workbench.GetDocument (part.Region.FileName);
-			ctx = new CSharpTypeResolveContext (implementingType.Compilation.MainAssembly, null, implementingType, null);
-			options.Document = doc;
 
-			if (member is IUnresolvedMethod)
-				return GenerateCode ((IMethod) ((IUnresolvedMethod)member).CreateResolved (ctx), options);
-			if (member is IUnresolvedProperty)
-				return GenerateCode ((IProperty) ((IUnresolvedProperty)member).CreateResolved (ctx), options);
-			if (member is IUnresolvedField)
-				return GenerateCode ((IField) ((IUnresolvedField)member).CreateResolved (ctx), options);
-			if (member is IUnresolvedEvent)
-				return GenerateCode ((IEvent) ((IUnresolvedEvent)member).CreateResolved (ctx), options);
+			if (member is IMethodSymbol)
+				return GenerateCode ((IMethodSymbol)member, options);
+			if (member is IPropertySymbol)
+				return GenerateCode ((IPropertySymbol)member, options);
+			if (member is IFieldSymbol)
+				return GenerateCode ((IFieldSymbol)member, options);
+			if (member is IEventSymbol)
+				return GenerateCode ((IEventSymbol)member, options);
 			throw new NotSupportedException ("member " +  member + " is not supported.");
 		}
-		
-		public override CodeGeneratorMemberResult CreateMemberImplementation (ITypeDefinition implementingType,
-		                                                                      IUnresolvedTypeDefinition part,
-		                                                                      IMember member,
-		                                                                      bool explicitDeclaration)
+
+		public static CodeGeneratorMemberResult CreatePartialMemberImplementation (DocumentContext document, TextEditor editor, ITypeSymbol implementingType, Location part, ISymbol member, bool explicitDeclaration)
 		{
-			SetIndentTo (part);
-			var options = new CodeGenerationOptions () {
+			var options = new CodeGenerationOptions {
 				ExplicitDeclaration = explicitDeclaration,
 				ImplementingType = implementingType,
 				Part = part,
-				Document = IdeApp.Workbench.GetDocument (part.Region.FileName)
+				DocumentContext = document,
+				Editor = editor
 			};
-			if (member is IMethod)
-				return GenerateCode ((IMethod)member, options);
-			if (member is IProperty)
-				return GenerateCode ((IProperty)member, options);
-			if (member is IField)
-				return GenerateCode ((IField)member, options);
-			if (member is IEvent)
-				return GenerateCode ((IEvent)member, options);
+
+			if (member is IMethodSymbol)
+				return GeneratePartialCode ((IMethodSymbol)member, options);
 			throw new NotSupportedException ("member " +  member + " is not supported.");
 		}
-		
-		void AppendBraceStart (StringBuilder result, BraceStyle braceStyle)
-		{
-			switch (braceStyle) {
-			case BraceStyle.BannerStyle:
-			case BraceStyle.EndOfLine:
-				result.Append (" {");
-				AppendLine (result);
-				break;
-			case BraceStyle.EndOfLineWithoutSpace:
-				result.Append ("{");
-				AppendLine (result);
-				break;
-			case BraceStyle.NextLine:
-				AppendLine (result);
-				AppendIndent (result);
-				result.Append ("{");
-				AppendLine (result);
-				break;
-			case BraceStyle.NextLineShifted:
-				AppendLine (result);
-				result.Append (GetIndent (IndentLevel + 1));
-				result.Append ("{");
-				AppendLine (result);
-				break;
-			case BraceStyle.NextLineShifted2:
-				AppendLine (result);
-				result.Append (GetIndent (IndentLevel + 1));
-				result.Append ("{");
-				AppendLine (result);
-				IndentLevel++;
-				break;
-			default:
-				goto case BraceStyle.NextLine;
-			}
-			IndentLevel++;
-		}
-		
-		void AppendBraceEnd (StringBuilder result, BraceStyle braceStyle)
-		{
-			switch (braceStyle) {
-			case BraceStyle.EndOfLineWithoutSpace:
-			case BraceStyle.NextLine:
-			case BraceStyle.EndOfLine:
-				IndentLevel --;
-				AppendIndent (result);
-				result.Append ("}");
-				break;
-			case BraceStyle.BannerStyle:
-			case BraceStyle.NextLineShifted:
-				AppendIndent (result);
-				result.Append ("}");
-				IndentLevel--;
-				break;
-			case BraceStyle.NextLineShifted2:
-				IndentLevel--;
-				AppendIndent (result);
-				result.Append ("}");
-				IndentLevel--;
-				break;
-			default:
-				goto case BraceStyle.NextLine;
-			}
-		}
-		
-		void AppendIndent (StringBuilder result)
-		{
-			result.Append (GetIndent (IndentLevel));
-		}
-		
-		void AppendReturnType (StringBuilder result, CodeGenerationOptions options, IType type)
+//
+//		void AppendBraceStart (StringBuilder result, BraceStyle braceStyle)
+//		{
+//			switch (braceStyle) {
+//			case BraceStyle.BannerStyle:
+//			case BraceStyle.EndOfLine:
+//				result.Append (" {");
+//				AppendLine (result);
+//				break;
+//			case BraceStyle.EndOfLineWithoutSpace:
+//				result.Append ("{");
+//				AppendLine (result);
+//				break;
+//			case BraceStyle.NextLine:
+//				AppendLine (result);
+//				AppendIndent (result);
+//				result.Append ("{");
+//				AppendLine (result);
+//				break;
+//			case BraceStyle.NextLineShifted:
+//				AppendLine (result);
+//				result.Append (GetIndent (IndentLevel + 1));
+//				result.Append ("{");
+//				AppendLine (result);
+//				break;
+//			case BraceStyle.NextLineShifted2:
+//				AppendLine (result);
+//				result.Append (GetIndent (IndentLevel + 1));
+//				result.Append ("{");
+//				AppendLine (result);
+//				IndentLevel++;
+//				break;
+//			default:
+//				goto case BraceStyle.NextLine;
+//			}
+//			IndentLevel++;
+//		}
+//		
+//		void AppendBraceEnd (StringBuilder result, BraceStyle braceStyle)
+//		{
+//			switch (braceStyle) {
+//			case BraceStyle.EndOfLineWithoutSpace:
+//			case BraceStyle.NextLine:
+//			case BraceStyle.EndOfLine:
+//				IndentLevel --;
+//				AppendIndent (result);
+//				result.Append ("}");
+//				break;
+//			case BraceStyle.BannerStyle:
+//			case BraceStyle.NextLineShifted:
+//				AppendIndent (result);
+//				result.Append ("}");
+//				IndentLevel--;
+//				break;
+//			case BraceStyle.NextLineShifted2:
+//				IndentLevel--;
+//				AppendIndent (result);
+//				result.Append ("}");
+//				IndentLevel--;
+//				break;
+//			default:
+//				goto case BraceStyle.NextLine;
+//			}
+//		}
+//		
+//		void AppendIndent (StringBuilder result)
+//		{
+//			result.Append (GetIndent (IndentLevel));
+//		}
+//		
+		static void AppendReturnType (StringBuilder result, CodeGenerationOptions options, ITypeSymbol type)
 		{
 			if (type == null)
 				throw new ArgumentNullException ("type");
-			var implementingType = options.Part;
-			var loc = implementingType.Region.End;
-			
-			var pf = implementingType.UnresolvedFile;
-			var file = pf as CSharpUnresolvedFile;
-			var resolved = type;
-			if (resolved.Kind == TypeKind.Unknown) {
-				result.Append (type.FullName);
-				return;
-			}
-			var def = type.GetDefinition ();
-			if (def != null) {
-				using (var stringWriter = new System.IO.StringWriter ()) {
-					var formatter = new TextWriterTokenWriter (stringWriter);
-					stringWriter.NewLine = EolMarker; 
-					var visitor = new CSharpOutputVisitor (formatter, FormattingOptionsFactory.CreateMono ());
-					var shortType = CreateShortType (def.Compilation, file, loc, resolved);
-					shortType.AcceptVisitor (visitor);
-					
-					var typeString = stringWriter.ToString ();
-					if (typeString.StartsWith ("global::"))
-						typeString = typeString.Substring ("global::".Length);
-					result.Append (typeString);
-				}
-			} else {
-				result.Append (new ICSharpCode.NRefactory.CSharp.CSharpAmbience ().ConvertType (type));
-			}
-		}
-		
-		/*
-		void ResolveReturnTypes ()
-		{
-			returnType = member.ReturnType;
-			foreach (IUsing u in unit.Usings) {
-				foreach (KeyValuePair<string, IReturnType> alias in u.Aliases) {
-					if (alias.Key == member.ReturnType.FullName) {
-						returnType = alias.Value;
-						return;
-					}
-				}
-			}
-		}*/
+			result.Append (type.ToMinimalDisplayString (options.SemanticModel, options.Part.SourceSpan.Start));
 
-		
-		CodeGeneratorMemberResult GenerateCode (IField field, CodeGenerationOptions options)
+//			var implementingType = options.Part;
+//			var loc = implementingType.Region.End;
+//			
+//			var pf = implementingType.UnresolvedFile;
+//			var file = pf as CSharpUnresolvedFile;
+//			var resolved = type;
+//			if (resolved.Kind == TypeKind.Unknown) {
+//				result.Append (type.FullName);
+//				return;
+//			}
+//			var def = type.GetDefinition ();
+//			if (def != null) {
+//				using (var stringWriter = new System.IO.StringWriter ()) {
+//					var formatter = new TextWriterTokenWriter (stringWriter);
+//					stringWriter.NewLine = EolMarker; 
+//					var visitor = new CSharpOutputVisitor (formatter, FormattingOptionsFactory.CreateMono ());
+//					var shortType = CreateShortType (def.Compilation, file, loc, resolved);
+//					shortType.AcceptVisitor (visitor);
+//					
+//					var typeString = stringWriter.ToString ();
+//					if (typeString.StartsWith ("global::"))
+//						typeString = typeString.Substring ("global::".Length);
+//					result.Append (typeString);
+//				}
+//			} else {
+//				result.Append (new ICSharpCode.NRefactory.CSharp.CSharpAmbience ().ConvertType (type));
+//			}
+		}
+//		
+//		/*
+//		void ResolveReturnTypes ()
+//		{
+//			returnType = member.ReturnType;
+//			foreach (IUsing u in unit.Usings) {
+//				foreach (KeyValuePair<string, IReturnType> alias in u.Aliases) {
+//					if (alias.Key == member.ReturnType.FullName) {
+//						returnType = alias.Value;
+//						return;
+//					}
+//				}
+//			}
+//		}*/
+//
+//		
+		static CodeGeneratorMemberResult GenerateCode (IFieldSymbol field, CodeGenerationOptions options)
 		{
 			StringBuilder result = new StringBuilder ();
 			AppendIndent (result);
 			AppendModifiers (result, options, field);
 			result.Append (" ");
-			AppendReturnType (result, options, field.ReturnType);
+			AppendReturnType (result, options, field.Type);
 			result.Append (" ");
 			result.Append (CSharpAmbience.FilterName (field.Name));
 			result.Append (";");
 			return new CodeGeneratorMemberResult (result.ToString (), -1, -1);
 		}
+
+		static void AppendIndent (StringBuilder result)
+		{
+			
+		}
 		
-		CodeGeneratorMemberResult GenerateCode (IEvent evt, CodeGenerationOptions options)
+		static CodeGeneratorMemberResult GenerateCode (IEventSymbol evt, CodeGenerationOptions options)
 		{
 			StringBuilder result = new StringBuilder ();
 			AppendObsoleteAttribute (result, options, evt);
 			AppendModifiers (result, options, evt);
 			
 			result.Append ("event ");
-			AppendReturnType (result, options, evt.ReturnType);
+			AppendReturnType (result, options, evt.Type);
 			result.Append (" ");
 			if (options.ExplicitDeclaration) {
-				result.Append (ambience.GetString (evt.DeclaringTypeDefinition, OutputFlags.IncludeGenerics));
+				AppendReturnType (result, options, evt.ContainingType);
 				result.Append (".");
 			}
+
 			result.Append (CSharpAmbience.FilterName (evt.Name));
 			if (options.ExplicitDeclaration) {
-				AppendBraceStart (result, Policy.EventBraceStyle);
+				result.Append ("{");
 				AppendIndent (result);
-				result.Append ("add");
-				AppendBraceStart (result, Policy.EventAddBraceStyle);
+				result.Append ("add {");
 				AppendIndent (result);
 				result.Append ("// TODO");
 				AppendLine (result);
-				AppendBraceEnd (result, Policy.EventAddBraceStyle);
-				
+				result.Append ("}");
+
 				AppendIndent (result);
-				result.Append ("remove");
-				AppendBraceStart (result, Policy.EventRemoveBraceStyle);
+				result.Append ("remove {");
 				AppendIndent (result);
 				result.Append ("// TODO");
 				AppendLine (result);
-				
-				AppendBraceEnd (result, Policy.EventRemoveBraceStyle);
-				AppendBraceEnd (result, Policy.EventBraceStyle);
+				result.Append ("}}");
 			} else {
 				result.Append (";");
 			}
 			return new CodeGeneratorMemberResult (result.ToString ());
 		}
 		
-		void AppendNotImplementedException (StringBuilder result, CodeGenerationOptions options,
-		                                           out int bodyStartOffset, out int bodyEndOffset)
+		static void AppendNotImplementedException (StringBuilder result, CodeGenerationOptions options, out int bodyStartOffset, out int bodyEndOffset)
 		{
 			AppendIndent (result);
 			bodyStartOffset = result.Length;
 			result.Append ("throw new ");
 			result.Append (options.GetShortType ("System", "NotImplementedException"));
-			//			AppendReturnType (result, options.ImplementingType, options.Ctx.GetTypeDefinition (typeof (System.NotImplementedException)));
-			if (Policy.BeforeMethodCallParentheses)
-				result.Append (" ");
 			result.Append ("();");
 			bodyEndOffset = result.Length;
 			AppendLine (result);
@@ -385,7 +432,7 @@ namespace MonoDevelop.CSharp.Refactoring
 			" see http://docs.xamarin.com/guides/ios/application_fundamentals/delegates,_protocols,_and_events"
 		};
 
-		void AppendMonoTouchTodo (StringBuilder result, CodeGenerationOptions options, out int bodyStartOffset, out int bodyEndOffset)
+		static void AppendMonoTouchTodo (StringBuilder result, CodeGenerationOptions options, out int bodyStartOffset, out int bodyEndOffset)
 		{
 			AppendIndent (result);
 			bodyStartOffset = result.Length;
@@ -395,34 +442,31 @@ namespace MonoDevelop.CSharp.Refactoring
 			}
 			result.Append ("throw new ");
 			result.Append (options.GetShortType ("System", "NotImplementedException"));
-
-			if (Policy.BeforeMethodCallParentheses)
-				result.Append (" ");
 			result.Append ("();");
 
 			bodyEndOffset = result.Length;
 			AppendLine (result);
 		}
 		
-		CodeGeneratorMemberResult GenerateCode (IMethod method, CodeGenerationOptions options)
+		static CodeGeneratorMemberResult GenerateCode (IMethodSymbol method, CodeGenerationOptions options)
 		{
 			int bodyStartOffset = -1, bodyEndOffset = -1;
-			StringBuilder result = new StringBuilder ();
+			var result = new StringBuilder ();
 			AppendObsoleteAttribute (result, options, method);
 			AppendModifiers (result, options, method);
-			if (method.IsPartial)
-				result.Append ("partial ");
+			//			if (method.IsPartial)
+			//				result.Append ("partial ");
 			AppendReturnType (result, options, method.ReturnType);
 			result.Append (" ");
 			if (options.ExplicitDeclaration) {
-				AppendReturnType (result, options, method.DeclaringType);
+				AppendReturnType (result, options, method.ContainingType);
 				result.Append (".");
 			}
 
 			result.Append (CSharpAmbience.FilterName (method.Name));
-			if (method.TypeParameters.Count > 0) {
+			if (method.TypeParameters.Length > 0) {
 				result.Append ("<");
-				for (int i = 0; i < method.TypeParameters.Count; i++) {
+				for (int i = 0; i < method.TypeParameters.Length; i++) {
 					if (i > 0)
 						result.Append (", ");
 					var p = method.TypeParameters [i];
@@ -430,86 +474,82 @@ namespace MonoDevelop.CSharp.Refactoring
 				}
 				result.Append (">");
 			}
-			if (Policy.BeforeMethodDeclarationParentheses)
-				result.Append (" ");
 			result.Append ("(");
-			AppendParameterList (result, options, method.Parameters);
+			AppendParameterList (result, options, method.Parameters, true);
 			result.Append (")");
-			
+
 			var typeParameters = method.TypeParameters;
-			
-			// This should also check the types are in the correct mscorlib
-			Func<IType, bool> validBaseType = t => t.FullName != "System.Object" && t.FullName != "System.ValueType";
 
-			bool isFromInterface = method.DeclaringType != null && method.DeclaringTypeDefinition.Kind == TypeKind.Interface;
+			//			// This should also check the types are in the correct mscorlib
+			//			Func<IType, bool> validBaseType = t => t.FullName != "System.Object" && t.FullName != "System.ValueType";
+			//
+			//			bool isFromInterface = method.DeclaringType != null && method.DeclaringTypeDefinition.Kind == TypeKind.Interface;
+			//
+			//			if (!options.ExplicitDeclaration && isFromInterface && typeParameters.Any (p => p.HasDefaultConstructorConstraint || p.HasReferenceTypeConstraint || p.HasValueTypeConstraint || p.DirectBaseTypes.Any (validBaseType))) {
+			//				result.Append (" where ");
+			//				int typeParameterCount = 0;
+			//				foreach (var p in typeParameters) {
+			//					if (typeParameterCount != 0)
+			//						result.Append (", ");
+			//					
+			//					typeParameterCount++;
+			//					result.Append (CSharpAmbience.FilterName (p.Name));
+			//					result.Append (" : ");
+			//					int constraintCount = 0;
+			//					
+			//					if (p.HasDefaultConstructorConstraint) {
+			//						result.Append ("new ()");
+			//						constraintCount++;
+			//					}
+			//					
+			//					if (p.HasValueTypeConstraint) {
+			//						if (constraintCount != 0)
+			//							result.Append (", ");
+			//						result.Append ("struct");
+			//						constraintCount++;
+			//					}
+			//					
+			//					if (p.HasReferenceTypeConstraint) {
+			//						if (constraintCount != 0)
+			//							result.Append (", ");
+			//						result.Append ("class");
+			//						constraintCount++;
+			//					}
+			//					//					bool hadInterfaces = false;
+			//					foreach (var c in p.DirectBaseTypes.Where (validBaseType)) {
+			//						if (constraintCount != 0)
+			//							result.Append (", ");
+			//						constraintCount++;
+			//						AppendReturnType (result, options, c);
+			//						//						if (c.Kind == TypeKind.Interface)
+			//						//							hadInterfaces = true;
+			//					}
+			//				}
+			//			}
 
-			if (!options.ExplicitDeclaration && isFromInterface && typeParameters.Any (p => p.HasDefaultConstructorConstraint || p.HasReferenceTypeConstraint || p.HasValueTypeConstraint || p.DirectBaseTypes.Any (validBaseType))) {
-				result.Append (" where ");
-				int typeParameterCount = 0;
-				foreach (var p in typeParameters) {
-					if (typeParameterCount != 0)
-						result.Append (", ");
-					
-					typeParameterCount++;
-					result.Append (CSharpAmbience.FilterName (p.Name));
-					result.Append (" : ");
-					int constraintCount = 0;
-					
-					if (p.HasDefaultConstructorConstraint) {
-						result.Append ("new ()");
-						constraintCount++;
-					}
-					
-					if (p.HasValueTypeConstraint) {
-						if (constraintCount != 0)
-							result.Append (", ");
-						result.Append ("struct");
-						constraintCount++;
-					}
-					
-					if (p.HasReferenceTypeConstraint) {
-						if (constraintCount != 0)
-							result.Append (", ");
-						result.Append ("class");
-						constraintCount++;
-					}
-					//					bool hadInterfaces = false;
-					foreach (var c in p.DirectBaseTypes.Where (validBaseType)) {
-						if (constraintCount != 0)
-							result.Append (", ");
-						constraintCount++;
-						AppendReturnType (result, options, c);
-						//						if (c.Kind == TypeKind.Interface)
-						//							hadInterfaces = true;
-					}
-				}
-			}
-			
-			if (options.ImplementingType.Kind == TypeKind.Interface) {
+			if (options.ImplementingType.TypeKind == TypeKind.Interface) {
 				result.Append (";");
 			} else {
-				AppendBraceStart (result, Policy.MethodBraceStyle);
-				if (method.Name == "ToString" && (method.Parameters == null || method.Parameters.Count == 0) && method.ReturnType != null/* && method.ReturnType.FullName == "System.String"*/) {
+				result.Append ("{");
+				if (method.Name == "ToString" && method.Parameters.Length == 0 && method.ReturnType != null/* && method.ReturnType.FullName == "System.String"*/) {
 					AppendIndent (result);
 					bodyStartOffset = result.Length;
 					result.Append ("return string.Format");
-					if (Policy.BeforeMethodDeclarationParentheses)
-						result.Append (" ");
 					result.Append ("(\"[");
 					result.Append (options.ImplementingType.Name);
-					if (options.ImplementingType.Properties.Any ()) 
+					if (options.ImplementingType.GetMembers ().OfType<IPropertySymbol> ().Any ()) 
 						result.Append (": ");
 					int i = 0;
-					var properties = new List<IProperty> ();
+					var properties = new List<IPropertySymbol> ();
 
-					foreach (IProperty property in options.ImplementingType.Properties) {
+					foreach (var property in options.ImplementingType.GetMembers ().OfType<IPropertySymbol> ()) {
 						if (properties.Any (p => p.Name == property.Name))
 							continue;
 						properties.Add (property); 
 					}
 
-					foreach (IProperty property in properties) {
-						if (property.IsStatic || !property.IsPublic)
+					foreach (var property in properties) {
+						if (property.IsStatic || property.DeclaredAccessibility != Accessibility.Public)
 							continue;
 						if (i > 0)
 							result.Append (", ");
@@ -519,8 +559,8 @@ namespace MonoDevelop.CSharp.Refactoring
 						result.Append ("}");
 					}
 					result.Append ("]\"");
-					foreach (IProperty property in properties) {
-						if (property.IsStatic || !property.IsPublic)
+					foreach (var property in properties) {
+						if (property.IsStatic || property.DeclaredAccessibility != Accessibility.Public)
 							continue;
 						result.Append (", ");
 						result.Append (property.Name);
@@ -530,72 +570,60 @@ namespace MonoDevelop.CSharp.Refactoring
 					AppendLine (result);
 				} else if (IsMonoTouchModelMember (method)) {
 					AppendMonoTouchTodo (result, options, out bodyStartOffset, out bodyEndOffset);
-				} else if (method.IsAbstract || !(method.IsVirtual || method.IsOverride) || method.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+				} else if (method.IsAbstract || !(method.IsVirtual || method.IsOverride) || method.ContainingType.TypeKind == TypeKind.Interface) {
 					AppendNotImplementedException (result, options, out bodyStartOffset, out bodyEndOffset);
 				} else {
 					bool skipBody = false;
 					// Analyze if the body consists just of a single throw instruction
 					// See: Bug 1373 - overriding [Model] class methods shouldn't insert base.Methods
 					// TODO: Extend this to user defined code.
-					try {
-						if (method.Region.FileName == null) {
-							var asm = AssemblyDefinition.ReadAssembly (method.ParentAssembly.UnresolvedAssembly.Location);
-							foreach (var type in asm.MainModule.Types) {
-								if (type.FullName != method.DeclaringType.FullName)
-									continue;
-								foreach (var m  in type.Resolve ().Methods) {
-									if (m.HasBody && m.Name == method.Name) {
-										var context = new DecompilerContext (asm.MainModule);
-										
-										context.CurrentType = type;
-				
-										context.Settings = new DecompilerSettings () {
-											AnonymousMethods = true,
-											AutomaticEvents  = true,
-											AutomaticProperties = true,
-											ForEachStatement = true,
-											LockStatement = true
-										};
-				
-										var astBuilder = new AstBuilder (context);
-										astBuilder.AddMethod (m);
-										
-										astBuilder.RunTransformations (o => false);
-
-										var visitor = new ThrowsExceptionVisitor ();
-										astBuilder.SyntaxTree.AcceptVisitor (visitor);
-										skipBody = visitor.Throws;
-										if (skipBody)
-											break;
-									}
-								}
-								if (skipBody)
-									break;
-							}
-						}
-					} catch (Exception) {
-					}
+					//					try {
+					//						if (method.Region.FileName == null) {
+					//							var asm = AssemblyDefinition.ReadAssembly (method.ParentAssembly.UnresolvedAssembly.Location);
+					//							foreach (var type in asm.MainModule.Types) {
+					//								if (type.FullName != method.DeclaringType.FullName)
+					//									continue;
+					//								foreach (var m  in type.Resolve ().Methods) {
+					//									if (m.HasBody && m.Name == method.Name) {
+					//										var context = new DecompilerContext (asm.MainModule);
+					//										
+					//										context.CurrentType = type;
+					//				
+					//										context.Settings = new DecompilerSettings () {
+					//											AnonymousMethods = true,
+					//											AutomaticEvents  = true,
+					//											AutomaticProperties = true,
+					//											ForEachStatement = true,
+					//											LockStatement = true
+					//										};
+					//				
+					//										var astBuilder = new AstBuilder (context);
+					//										astBuilder.AddMethod (m);
+					//										
+					//										astBuilder.RunTransformations (o => false);
+					//
+					//										var visitor = new ThrowsExceptionVisitor ();
+					//										astBuilder.SyntaxTree.AcceptVisitor (visitor);
+					//										skipBody = visitor.Throws;
+					//										if (skipBody)
+					//											break;
+					//									}
+					//								}
+					//								if (skipBody)
+					//									break;
+					//							}
+					//						}
+					//					} catch (Exception) {
+					//					}
 					AppendIndent (result);
 					bodyStartOffset = result.Length;
 					if (!skipBody) {
-						if (method.ReturnType.ReflectionName != typeof(void).FullName)
+						if (method.ReturnType.SpecialType != SpecialType.System_Void)
 							result.Append ("return ");
 						result.Append ("base.");
 						result.Append (CSharpAmbience.FilterName (method.Name));
-						if (Policy.BeforeMethodCallParentheses)
-							result.Append (" ");
 						result.Append ("(");
-						for (int i = 0; i < method.Parameters.Count; i++) {
-							if (i > 0)
-								result.Append (", ");
-							
-							var p = method.Parameters [i];
-							if (p.IsOut)
-								result.Append ("out ");
-							if (p.IsRef)
-								result.Append ("ref ");
-							result.Append (CSharpAmbience.FilterName (p.Name));
-						}
+						AppendParameterList (result, options, method.Parameters, false);
 						result.Append (");");
 					} else {
 						result.Append ("throw new System.NotImplementedException ();");
@@ -603,114 +631,141 @@ namespace MonoDevelop.CSharp.Refactoring
 					bodyEndOffset = result.Length;
 					AppendLine (result);
 				}
-				AppendBraceEnd (result, Policy.MethodBraceStyle);
+				result.Append ("}");
 			}
 			return new CodeGeneratorMemberResult (result.ToString (), bodyStartOffset, bodyEndOffset);
 		}
-		
-		class ThrowsExceptionVisitor : DepthFirstAstVisitor
+
+
+		static CodeGeneratorMemberResult GeneratePartialCode (IMethodSymbol method, CodeGenerationOptions options)
 		{
-			public bool Throws = false;
-			
-			public override void VisitBlockStatement (BlockStatement blockStatement)
-			{
-				if (blockStatement.Statements.Count == 1 && blockStatement.Statements.First () is ThrowStatement)
-					Throws = true;
+			int bodyStartOffset = -1, bodyEndOffset = -1;
+			var result = new StringBuilder ();
+			AppendObsoleteAttribute (result, options, method);
+			result.Append ("partial ");
+			AppendReturnType (result, options, method.ReturnType);
+			result.Append (" ");
+			if (options.ExplicitDeclaration) {
+				AppendReturnType (result, options, method.ContainingType);
+				result.Append (".");
 			}
+
+			result.Append (CSharpAmbience.FilterName (method.Name));
+			if (method.TypeParameters.Length > 0) {
+				result.Append ("<");
+				for (int i = 0; i < method.TypeParameters.Length; i++) {
+					if (i > 0)
+						result.Append (", ");
+					var p = method.TypeParameters [i];
+					result.Append (CSharpAmbience.FilterName (p.Name));
+				}
+				result.Append (">");
+			}
+			result.Append ("(");
+			AppendParameterList (result, options, method.Parameters, true);
+			result.Append (")");
+
+			var typeParameters = method.TypeParameters;
+			result.AppendLine ("{");
+			bodyStartOffset = result.Length;
+			AppendLine (result);
+			bodyEndOffset = result.Length;
+			result.AppendLine ("}");
+			return new CodeGeneratorMemberResult (result.ToString (), bodyStartOffset, bodyEndOffset);
 		}
-		
-		void AppendParameterList (StringBuilder result, CodeGenerationOptions options, IList<IParameter> parameters)
+
+//		class ThrowsExceptionVisitor : DepthFirstAstVisitor
+//		{
+//			public bool Throws = false;
+//			
+//			public override void VisitBlockStatement (BlockStatement blockStatement)
+//			{
+//				if (blockStatement.Statements.Count == 1 && blockStatement.Statements.First () is ThrowStatement)
+//					Throws = true;
+//			}
+//		}
+
+		static void AppendParameterList (StringBuilder result, CodeGenerationOptions options, IList<IParameterSymbol> parameters, bool asParameterList)
 		{
 			for (int i = 0; i < parameters.Count; i++) {
 				if (i > 0)
 					result.Append (", ");
 				
 				var p = parameters[i];
-				if (p.IsOut)
-					result.Append ("out ");
-				if (p.IsRef)
-					result.Append ("ref ");
-				if (p.IsParams)
-					result.Append ("params ");
-				AppendReturnType (result, options, p.Type);
-				result.Append (" ");
+				if (asParameterList) {
+					if (p.RefKind == RefKind.Out)
+						result.Append ("out ");
+					if (p.RefKind == RefKind.Ref)
+						result.Append ("ref ");
+					if (p.IsParams)
+						result.Append ("params ");
+						AppendReturnType (result, options, p.Type);
+						result.Append (" ");
+				}
 				result.Append (CSharpAmbience.FilterName (p.Name));
-				if (p.ConstantValue != null) {
+				if (p.HasExplicitDefaultValue) {
 					result.Append (" = ");
-					if (p.Type.Kind == TypeKind.Enum) {
-						bool found = false;
-						foreach (var literal in GetEnumLiterals(p.Type)) {
-							if (literal.ConstantValue.Equals (p.ConstantValue)) {
-								AppendReturnType (result, options, p.Type);
-								result.Append ("."+ literal.Name);
-								found = true;
-								break;
-							}
-						}
-						if (!found) {
+					if (p.ExplicitDefaultValue is Enum) {
+						var name = Enum.GetName (p.ExplicitDefaultValue.GetType (), p.ExplicitDefaultValue);
+						if (name != null)
+						{
+							AppendReturnType (result, options, p.Type);
+							result.Append ("."+ name);
+						} else {
 							result.Append ("(");
 							AppendReturnType (result, options, p.Type);
-							result.Append (")" + p.ConstantValue); 
+							result.Append (")" + p.ExplicitDefaultValue); 
 						}
-					} else if (p.ConstantValue is char) {
-						result.Append ("'" + p.ConstantValue + "'");
-					} else if (p.ConstantValue is string)  {
-						result.Append ("\"" + CSharpTextEditorIndentation.ConvertToStringLiteral ((string)p.ConstantValue) + "\"");
-					} else if (p.ConstantValue is bool)  {
-						result.Append ((bool)p.ConstantValue ? "true" : "false");
+					} else if (p.ExplicitDefaultValue is char) {
+						result.Append ("'" + p.ExplicitDefaultValue + "'");
+					} else if (p.ExplicitDefaultValue is string)  {
+						result.Append ("\"" + CSharpTextEditorIndentation.ConvertToStringLiteral ((string)p.ExplicitDefaultValue) + "\"");
+					} else if (p.ExplicitDefaultValue is bool)  {
+						result.Append ((bool)p.ExplicitDefaultValue ? "true" : "false");
 					} else {
-						result.Append (p.ConstantValue);
+						result.Append (p.ExplicitDefaultValue);
 					}
 				} 
 			}
 		}
 
-		public IEnumerable<IField> GetEnumLiterals(IType type)
+		public static IEnumerable<string> GetEnumLiterals(Type type)
 		{
-			if (type.Kind != TypeKind.Enum)
-				throw new ArgumentException ("Type is no enum.");
-			foreach (var field in type.GetFields (f => f.IsConst && f.IsPublic))
-				yield return field;
+			return Enum.GetNames (type);
 		}
 		
-		static string GetModifiers (ITypeDefinition implementingType, IUnresolvedTypeDefinition implementingPart, IMember member)
+		static string GetModifiers (ITypeSymbol implementingType, Location implementingPart, ISymbol member)
 		{
 			StringBuilder result = new StringBuilder ();
 
-			if (member.IsPublic || (member.DeclaringType != null && member.DeclaringTypeDefinition.Kind == TypeKind.Interface)) {
+			if (member.DeclaredAccessibility == Accessibility.Public || (member.ContainingType != null && member.ContainingType.TypeKind == TypeKind.Interface)) {
 				result.Append ("public ");
-			} else if (member.IsProtectedOrInternal) {
-				if (IdeApp.Workbench.ActiveDocument != null && member.DeclaringTypeDefinition.ParentAssembly != implementingType.ParentAssembly) {
+			} else if (member.DeclaredAccessibility == Accessibility.ProtectedOrInternal) {
+				if (IdeApp.Workbench.ActiveDocument != null && member.ContainingAssembly != implementingType.ContainingAssembly) {
 					result.Append ("protected ");
 				} else {
 					result.Append ("internal protected ");
 				}
-			} else if (member.IsProtectedAndInternal) {
-				if (IdeApp.Workbench.ActiveDocument != null && member.DeclaringTypeDefinition.ParentAssembly != implementingType.ParentAssembly) {
-					result.Append ("protected ");
-				} else {
-					result.Append ("protected internal ");
-				}
-			} else if (member.IsProtected) {
+			} else if (member.DeclaredAccessibility == Accessibility.Protected) {
 				result.Append ("protected ");
-			} else if (member.IsInternal) {
+			} else if (member.DeclaredAccessibility == Accessibility.Internal) {
 				result.Append ("internal ");
 			}
-				
+
 			if (member.IsStatic) 
 				result.Append ("static ");
-			
+
 			return result.ToString ();
 		}
 		
-		void AppendModifiers (StringBuilder result, CodeGenerationOptions options, IMember member)
+		static void AppendModifiers (StringBuilder result, CodeGenerationOptions options, ISymbol member)
 		{
-			AppendIndent (result);
-			if (options.ExplicitDeclaration || options.ImplementingType.Kind == TypeKind.Interface)
-				return;
+			//AppendIndent (result);
+			//if (options.ExplicitDeclaration || options.ImplementingType.Kind == TypeKind.Interface)
+			//	return;
 			result.Append (GetModifiers (options.ImplementingType, options.Part, member));
 			bool isFromInterface = false;
-			if (member.DeclaringType != null && member.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+			if (member.ContainingType != null && member.ContainingType.TypeKind == TypeKind.Interface) {
 				isFromInterface = true;
 // TODO: Type system conversion.
 //				if (options.ImplementingType != null) {
@@ -724,51 +779,58 @@ namespace MonoDevelop.CSharp.Refactoring
 //					}
 //				}
 			}
+			if (member is IMethodSymbol) {
+				var method = (IMethodSymbol)member;
+				if (!options.CreateProtocolMember)
+					result.Append ("override ");
+				if (method.IsAsync)
+					result.Append ("async ");
+			}
 
-			if (!isFromInterface && member.IsOverridable)
-				result.Append ("override ");
-			if (member is IMethod && ((IMethod)member).IsAsync)
-				result.Append ("async ");
+			if (member is IPropertySymbol) {
+				if (!options.CreateProtocolMember)
+					result.Append ("override ");
+			}
 		}
 		
-		CodeGeneratorMemberResult GenerateCode (IProperty property, CodeGenerationOptions options)
+		static CodeGeneratorMemberResult GenerateCode (IPropertySymbol property, CodeGenerationOptions options)
 		{
 			var regions = new List<CodeGeneratorBodyRegion> ();
 			var result = new StringBuilder ();
 			AppendObsoleteAttribute (result, options, property);
 			AppendModifiers (result, options, property);
-			AppendReturnType (result, options, property.ReturnType);
+			AppendReturnType (result, options, property.Type);
 			result.Append (" ");
 			if (property.IsIndexer) {
 				result.Append ("this[");
-				AppendParameterList (result, options, property.Parameters);
+				AppendParameterList (result, options, property.Parameters, true);
 				result.Append ("]");
 			} else {
-				if (options.ExplicitDeclaration) {
-					result.Append (ambience.GetString (property.DeclaringType, OutputFlags.IncludeGenerics));
-					result.Append (".");
-				}
+//				if (options.ExplicitDeclaration) {
+//					result.Append (ambience.GetString (property.DeclaringType, OutputFlags.IncludeGenerics));
+//					result.Append (".");
+//				}
 				result.Append (CSharpAmbience.FilterName (property.Name));
 			}
-			AppendBraceStart (result, Policy.PropertyBraceStyle);
-			if (property.CanGet) {
+			result.AppendLine (" {");
+			if (property.GetMethod != null) {
 				int bodyStartOffset, bodyEndOffset;
 				AppendIndent (result);
 				result.Append ("get");
-				if (options.ImplementingType.Kind == TypeKind.Interface) {
+				if (options.ImplementingType.TypeKind == TypeKind.Interface) {
 					result.AppendLine (";");
 				} else {
-					AppendBraceStart (result, Policy.PropertyGetBraceStyle);
+					result.AppendLine (" {");
 					if (IsMonoTouchModelMember (property)) {
 						AppendMonoTouchTodo (result, options, out bodyStartOffset, out bodyEndOffset);
-					} else if (property.IsAbstract || property.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+					} else if (property.IsAbstract || property.ContainingType.TypeKind == TypeKind.Interface) {
 						AppendNotImplementedException (result, options, out bodyStartOffset, out bodyEndOffset);
 					} else {
 						AppendIndent (result);
 						bodyStartOffset = result.Length;
-						if (property.SymbolKind == SymbolKind.Indexer) {
+						if (property.IsIndexer) {
 							result.Append ("return base[");
-							if (property.Parameters.Count > 0)
+							if (property.Parameters.Length > 0)
 								result.Append (CSharpAmbience.FilterName (property.Parameters.First ().Name));
 							result.Append ("];");
 						} else {
@@ -779,30 +841,30 @@ namespace MonoDevelop.CSharp.Refactoring
 						bodyEndOffset = result.Length;
 						AppendLine (result);
 					}
-					AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
+					result.Append ("}");
 					AppendLine (result);
 					regions.Add (new CodeGeneratorBodyRegion (bodyStartOffset, bodyEndOffset));
 				}
 			}
 			
-			if (property.CanSet) {
+			if (property.SetMethod != null) {
 				int bodyStartOffset, bodyEndOffset;
 				AppendIndent (result);
 				result.Append ("set");
-				if (options.ImplementingType.Kind == TypeKind.Interface) {
+				if (options.ImplementingType.TypeKind == TypeKind.Interface) {
 					result.AppendLine (";");
 				} else {
-					AppendBraceStart (result, Policy.PropertyGetBraceStyle);
+					result.AppendLine (" {");
 					if (IsMonoTouchModelMember (property)) {
 						AppendMonoTouchTodo (result, options, out bodyStartOffset, out bodyEndOffset);
-					} else if (property.IsAbstract || property.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+					} else if (property.IsAbstract || property.ContainingType.TypeKind == TypeKind.Interface) {
 						AppendNotImplementedException (result, options, out bodyStartOffset, out bodyEndOffset);
 					} else {
 						AppendIndent (result);
 						bodyStartOffset = result.Length;
-						if (property.SymbolKind == SymbolKind.Indexer) {
+						if (property.IsIndexer) {
 							result.Append ("base[");
-							if (property.Parameters.Count > 0)
+							if (property.Parameters.Length > 0)
 								result.Append (CSharpAmbience.FilterName (property.Parameters.First ().Name));
 							result.Append ("] = value;");
 						} else { 
@@ -813,241 +875,126 @@ namespace MonoDevelop.CSharp.Refactoring
 						bodyEndOffset = result.Length;
 						AppendLine (result);
 					}
-					AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
+					result.Append ("}");
 					AppendLine (result);
 					regions.Add (new CodeGeneratorBodyRegion (bodyStartOffset, bodyEndOffset));
 				}
 			}
-			AppendBraceEnd (result, Policy.PropertyBraceStyle);
+			result.Append ("}");
 			return new CodeGeneratorMemberResult (result.ToString (), regions);
 		}
-		
-		internal static bool IsMonoTouchModelMember (IMember member)
+
+		internal static bool IsMonoTouchModelMember (ISymbol member)
 		{
-			if (member == null || member.DeclaringType == null)
+			if (member == null || member.ContainingType == null)
 				return false;
-			return member.DeclaringTypeDefinition.Attributes.Any (attr => attr.AttributeType != null && attr.AttributeType.ReflectionName == "MonoTouch.Foundation.ModelAttribute");
-		}
-		
-		public override string CreateFieldEncapsulation (IUnresolvedTypeDefinition implementingType, IField field, string propertyName, Accessibility modifiers, bool readOnly)
-		{
-			SetIndentTo (implementingType);
-			StringBuilder result = new StringBuilder ();
-			AppendIndent (result);
-			
-//			if (modifiers != MonoDevelop.Projects.Dom.Modifiers.None) {
-//				switch (modifiers) {
-//				}
-//				result.Append (ambience.GetString (modifiers));
-//				result.Append (" ");
+			return member.ContainingType.GetAttributes().Any (attr => attr.AttributeClass.MetadataName == "MonoTouch.Foundation.ModelAttribute");
+		}
+		
+////		public override string CreateFieldEncapsulation (IUnresolvedTypeDefinition implementingType, IField field, string propertyName, Accessibility modifiers, bool readOnly)
+////		{
+////			SetIndentTo (implementingType);
+////			StringBuilder result = new StringBuilder ();
+////			AppendIndent (result);
+////			
+//////			if (modifiers != MonoDevelop.Projects.Dom.Modifiers.None) {
+//////				switch (modifiers) {
+//////				}
+//////				result.Append (ambience.GetString (modifiers));
+//////				result.Append (" ");
+//////			}
+////			var options = new CodeGenerationOptions () {
+////				ImplementingType = field.DeclaringTypeDefinition,
+////				Part = implementingType
+////			};
+////			result.Append ("public ");
+////			AppendReturnType (result, options, field.ReturnType);
+////			result.Append (" ");
+////			result.Append (propertyName);
+////			AppendBraceStart (result, Policy.PropertyBraceStyle);
+////			AppendIndent (result);
+////			
+////			result.Append ("get");
+////			AppendBraceStart (result, Policy.PropertyGetBraceStyle);
+////			AppendIndent (result);
+////			result.Append ("return this.");
+////			result.Append (CSharpAmbience.FilterName (field.Name));
+////			result.Append (";");
+////			AppendLine (result);
+////			AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
+////			AppendLine (result);
+////
+////			if (!readOnly) {
+////				AppendIndent (result);
+////				result.Append ("set");
+////				AppendBraceStart (result, Policy.PropertyGetBraceStyle);
+////				AppendIndent (result);
+////				result.Append (CSharpAmbience.FilterName (field.Name));
+////				result.Append (" = value;");
+////				AppendLine (result);
+////				AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
+////				AppendLine (result);
+////			}
+////			
+////			AppendBraceEnd (result, Policy.PropertyBraceStyle);
+////			return result.ToString ();
+////		}
+//		
+//		int CountBlankLines (IReadonlyTextDocument doc, int startLine)
+//		{
+//			int result = 0;
+//			IDocumentLine line;
+//			while ((line = doc.GetLine (startLine + result)) != null && doc.GetLineIndent (line).Length == line.Length) {
+//				result++;
 //			}
-			var options = new CodeGenerationOptions () {
-				ImplementingType = field.DeclaringTypeDefinition,
-				Part = implementingType
-			};
-			result.Append ("public ");
-			AppendReturnType (result, options, field.ReturnType);
-			result.Append (" ");
-			result.Append (propertyName);
-			AppendBraceStart (result, Policy.PropertyBraceStyle);
-			AppendIndent (result);
-			
-			result.Append ("get");
-			AppendBraceStart (result, Policy.PropertyGetBraceStyle);
-			AppendIndent (result);
-			result.Append ("return this.");
-			result.Append (CSharpAmbience.FilterName (field.Name));
-			result.Append (";");
-			AppendLine (result);
-			AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
-			AppendLine (result);
-
-			if (!readOnly) {
-				AppendIndent (result);
-				result.Append ("set");
-				AppendBraceStart (result, Policy.PropertyGetBraceStyle);
-				AppendIndent (result);
-				result.Append (CSharpAmbience.FilterName (field.Name));
-				result.Append (" = value;");
-				AppendLine (result);
-				AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
-				AppendLine (result);
-			}
-			
-			AppendBraceEnd (result, Policy.PropertyBraceStyle);
-			return result.ToString ();
-		}
-		
-		int CountBlankLines (MonoDevelop.Ide.Gui.Document doc, int startLine)
-		{
-			int result = 0;
-			DocumentLine line;
-			while ((line = doc.Editor.GetLine (startLine + result)) != null && doc.Editor.GetLineIndent (line).Length == line.Length) {
-				result++;
-			}
-		
-			return result;
-		}
-		
-		static bool InsertUsingAfter (AstNode node)
-		{
-			return node is NewLineNode && IsCommentOrUsing (node.GetNextSibling (s => !(s is NewLineNode))) ||
-				IsCommentOrUsing (node) || (node is PreProcessorDirective);
-		}
+//		
+//			return result;
+//		}
+//		
+//		static bool InsertUsingAfter (AstNode node)
+//		{
+//			return node is NewLineNode && IsCommentOrUsing (node.GetNextSibling (s => !(s is NewLineNode))) ||
+//				IsCommentOrUsing (node) || (node is PreProcessorDirective);
+//		}
+//
+//		static bool IsCommentOrUsing (AstNode node)
+//		{
+//			return node is ICSharpCode.NRefactory.CSharp.Comment ||
+//				node is UsingDeclaration ||
+//				node is UsingAliasDeclaration;
+//		}
+//		
 
-		static bool IsCommentOrUsing (AstNode node)
-		{
-			return node is ICSharpCode.NRefactory.CSharp.Comment ||
-				node is UsingDeclaration ||
-				node is UsingAliasDeclaration;
-		}
-		
-		static AstNode SearchUsingInsertionPoint (AstNode parent)
-		{
-			var node = parent.FirstChild;
-			while (true) {
-				var next = node.NextSibling;
-				if (!InsertUsingAfter (next))
-					break;
-				node = next;
-			}
-			return node;
-		}
-		
-		public override void AddGlobalNamespaceImport (MonoDevelop.Ide.Gui.Document doc, string nsName)
-		{
-			var parsedDocument = doc.ParsedDocument;
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
-				return;
-			
-			var policy = doc.Project != null ? doc.Project.Policies.Get <CSharpFormattingPolicy> () : null;
-			if (policy == null)
-				policy = Policy;
-			
-			var node = SearchUsingInsertionPoint (unit);
-			
-			var text = new StringBuilder ();
-			int lines = 0;
-			
-			if (InsertUsingAfter (node)) {
-				lines = policy.BlankLinesBeforeUsings + 1;
-				while (lines-- > 0) {
-					text.Append (doc.Editor.EolMarker);
-				}
-			}
-			
-			text.Append ("using ");
-			text.Append (nsName);
-			text.Append (";");
-			
-			int offset = 0;
-			if (node != null) {
-				var loc = InsertUsingAfter (node) ? node.EndLocation : node.StartLocation;
-				offset = Math.Max (0, doc.Editor.LocationToOffset (loc));
-			}
-			
-			lines = policy.BlankLinesAfterUsings;
-			lines -= CountBlankLines (doc, doc.Editor.OffsetToLineNumber (offset) + 1);
-			if (lines > 0)
-				text.Append (doc.Editor.EolMarker);
-			while (lines-- > 0) {
-				text.Append (doc.Editor.EolMarker);
-			}
-			doc.Editor.Insert (offset, text.ToString ());
-			doc.Editor.Document.CommitUpdateAll ();
-		}
-		
-		public override void AddLocalNamespaceImport (MonoDevelop.Ide.Gui.Document doc, string nsName, TextLocation caretLocation)
-		{
-			var parsedDocument = doc.ParsedDocument;
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
-				return;
-			
-			var nsDecl = unit.GetNodeAt<NamespaceDeclaration> (caretLocation);
-			if (nsDecl == null) {
-				AddGlobalNamespaceImport (doc, nsName);
-				return;
-			}
-			
-			var policy = doc.Project != null ? doc.Project.Policies.Get <CSharpFormattingPolicy> () : null;
-			if (policy == null)
-				policy = Policy;
-			
-			
-			var node = SearchUsingInsertionPoint (nsDecl);
-			
-			var text = new StringBuilder ();
-			int lines = 0;
-			
-			if (InsertUsingAfter (node)) {
-				lines = policy.BlankLinesBeforeUsings + 1;
-				while (lines-- > 0) {
-					text.Append (doc.Editor.EolMarker);
-				}
-			}
-			
-			string indent = doc.Editor.GetLineIndent (nsDecl.StartLocation.Line) + "\t";
-			text.Append (indent);
-			text.Append ("using ");
-			text.Append (nsName);
-			text.Append (";");
-			
-			int offset;
-			TextLocation loc;
-			if (node != null) {
-				loc = InsertUsingAfter (node) ? node.EndLocation : node.StartLocation;
-			} else {
-				loc = nsDecl.LBraceToken.EndLocation;
-			}
-			offset = doc.Editor.LocationToOffset (loc);
-			
-			lines = policy.BlankLinesAfterUsings;
-			lines -= CountBlankLines (doc, doc.Editor.OffsetToLineNumber (offset) + 1);
-			if (lines > 0)
-				text.Append (doc.Editor.EolMarker);
-			while (lines-- > 0) {
-				text.Append (doc.Editor.EolMarker);
-			}
-			
-			doc.Editor.Insert (offset, text.ToString ());
-		}
-		
-		public override string GetShortTypeString (MonoDevelop.Ide.Gui.Document doc, IType type)
-		{
-			var shortType = CreateShortType (doc.Compilation, doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile, doc.Editor.Caret.Location, type);
-			return OutputNode (doc, shortType);
-		}
-		
-		static string OutputNode (MonoDevelop.Ide.Gui.Document doc, AstNode node)
-		{
-			using (var stringWriter = new System.IO.StringWriter ()) {
-//				formatter.Indentation = indentLevel;
-				var formatter = new TextWriterTokenWriter (stringWriter);
-				stringWriter.NewLine = doc.Editor.EolMarker;
-				
-				var visitor = new CSharpOutputVisitor (formatter, doc.GetFormattingOptions ());
-				node.AcceptVisitor (visitor);
-				return stringWriter.ToString ();
-			}
-		}
-		
-		
-		public AstType CreateShortType (ICompilation compilation, CSharpUnresolvedFile parsedFile, TextLocation loc, IType fullType)
-		{
-			var csResolver = parsedFile.GetResolver (compilation, loc);
-			var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver);
-			return builder.ConvertType (fullType);			
-		}
-		
-		public override void CompleteStatement (MonoDevelop.Ide.Gui.Document doc)
-		{
-			var fixer = new ConstructFixer (doc.GetFormattingOptions (), doc.Editor.CreateNRefactoryTextEditorOptions ());
-			int newOffset;
-			if (fixer.TryFix (doc.Editor.Document, doc.Editor.Caret.Offset, out newOffset)) {
-				doc.Editor.Caret.Offset = newOffset;
-			}
-		}
+//		
+//		static string OutputNode (TextEditor editor, DocumentContext context, AstNode node)
+//		{
+//			using (var stringWriter = new System.IO.StringWriter ()) {
+////				formatter.Indentation = indentLevel;
+//				var formatter = new TextWriterTokenWriter (stringWriter);
+//				stringWriter.NewLine = editor.EolMarker;
+//
+//				var visitor = new CSharpOutputVisitor (formatter, null /* TODO: BROKEN DUE ROSLYN PORT (note: that code should be unused) */ );
+//				node.AcceptVisitor (visitor);
+//				return stringWriter.ToString ();
+//			}
+//		}
+//		
+//		
+//		public AstType CreateShortType (ICompilation compilation, CSharpUnresolvedFile parsedFile, TextLocation loc, IType fullType)
+//		{
+//			var csResolver = parsedFile.GetResolver (compilation, loc);
+//			var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver);
+//			return builder.ConvertType (fullType);			
+//		}
+//		
+//		public override void CompleteStatement (MonoDevelop.Ide.Gui.Document doc)
+//		{
+//			//  TODO: BROKEN DUE ROSLYN PORT - needs to be ported to NR6
+////			var fixer = new ConstructFixer (doc.GetFormattingOptions (), doc.Editor.CreateNRefactoryTextEditorOptions ());
+////			int newOffset;
+////			if (fixer.TryFix (new DocumentWrapper (doc.Editor), doc.Editor.CaretOffset, out newOffset)) {
+////				doc.Editor.CaretOffset = newOffset;
+////			}
+//		}
 	}
-}
\ No newline at end of file
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs
new file mode 100644
index 0000000000..af2f724aab
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs
@@ -0,0 +1,120 @@
+// 
+// RenameTextEditorExtension.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Commands;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Core;
+using MonoDevelop.Refactoring.Rename;
+using ICSharpCode.NRefactory6.CSharp.Features.GotoDefinition;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Refactoring;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	sealed class CSharpFeaturesTextEditorExtension : TextEditorExtension
+	{
+		public override bool IsValidInContext (MonoDevelop.Ide.Editor.DocumentContext context)
+		{
+			return context.Name != null && context.Name.EndsWith (".cs", FilePath.PathComparison);
+		}
+
+		[CommandUpdateHandler(EditCommands.Rename)]
+		public void RenameCommand_Update(CommandInfo ci)
+		{
+			new RenameHandler ().UpdateCommandInfo (ci);
+		}
+
+		[CommandHandler (EditCommands.Rename)]
+		public void RenameCommand ()
+		{
+			new RenameHandler ().Run (Editor, DocumentContext);
+		}
+
+		[CommandUpdateHandler(RefactoryCommands.GotoDeclaration)]
+		public void GotoDeclaration_Update(CommandInfo ci)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			if (doc.ParsedDocument == null || doc.ParsedDocument.GetAst<SemanticModel> () == null) {
+				ci.Enabled = false;
+			}
+			var info = RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor.CaretOffset).Result;
+			ci.Enabled = info.Symbol != null;
+		}
+
+		[CommandHandler (RefactoryCommands.GotoDeclaration)]
+		public void GotoDeclaration ()
+		{
+			GoToDefinitionService.TryGoToDefinition (base.DocumentContext.AnalysisDocument, Editor.CaretOffset, default(CancellationToken));
+		}
+
+		static readonly FindReferencesHandler findReferencesHandler = new FindReferencesHandler ();
+		[CommandUpdateHandler(RefactoryCommands.FindReferences)]
+		public void FindReferences_Update(CommandInfo ci)
+		{
+			findReferencesHandler.Update (ci);
+		}
+
+		[CommandHandler (RefactoryCommands.FindReferences)]
+		public void FindReferences ()
+		{
+			findReferencesHandler.Run (null);
+		}
+
+		static readonly FindAllReferencesHandler findAllReferencesHandler = new FindAllReferencesHandler ();
+		[CommandUpdateHandler(RefactoryCommands.FindAllReferences)]
+		public void FindAllReferencesHandler_Update(CommandInfo ci)
+		{
+			findAllReferencesHandler.Update (ci);
+		}
+
+		[CommandHandler (RefactoryCommands.FindAllReferences)]
+		public void FindAllReferences()
+		{
+			findAllReferencesHandler.Run (null);
+		}
+
+		static readonly FindDerivedSymbolsHandler findDerivedSymbolsHandler = new FindDerivedSymbolsHandler ();
+		[CommandUpdateHandler(RefactoryCommands.FindDerivedClasses)]
+		public void FindDerivedClasses_Update(CommandInfo ci)
+		{
+			findDerivedSymbolsHandler.Update (ci);
+		}
+
+		[CommandHandler (RefactoryCommands.FindDerivedClasses)]
+		public void FindDerivedClasses ()
+		{
+			findDerivedSymbolsHandler.Run (null);
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpReferenceFinder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpReferenceFinder.cs
deleted file mode 100644
index e8e1278ee1..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpReferenceFinder.cs
+++ /dev/null
@@ -1,359 +0,0 @@
-// 
-// CSharpReferenceFinder.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Xamarin Inc. (http://xamarin.com)
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using MonoDevelop.CSharp.Resolver;
-using MonoDevelop.Ide.FindInFiles;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.IO;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using System.Threading;
-
-namespace MonoDevelop.CSharp.Refactoring
-{
-	using MonoDevelop.Projects;
-	class CSharpReferenceFinder : ReferenceFinder
-	{
-		ICSharpCode.NRefactory.CSharp.Resolver.FindReferences refFinder = new ICSharpCode.NRefactory.CSharp.Resolver.FindReferences ();
-		List<object> searchedMembers;
-		List<FilePath> files = new List<FilePath> ();
-		List<Tuple<FilePath, MonoDevelop.Ide.Gui.Document>> openDocuments = new List<Tuple<FilePath, MonoDevelop.Ide.Gui.Document>> ();
-		
-		string memberName;
-		string keywordName;
-		
-		public CSharpReferenceFinder ()
-		{
-			IncludeDocumentation = true;
-		}
-		
-		public void SetSearchedMembers (IEnumerable<object> members)
-		{
-			searchedMembers = new List<object> (members);
-			var firstMember = searchedMembers.FirstOrDefault ();
-			if (firstMember is INamedElement) {
-				var namedElement = (INamedElement)firstMember;
-				var name = namedElement.Name;
-				if (namedElement is IMethod && (((IMethod)namedElement).IsConstructor | ((IMethod)namedElement).IsDestructor))
-					name = ((IMethod)namedElement).DeclaringType.Name;
-				memberName = name;
-
-				keywordName = CSharpAmbience.NetToCSharpTypeName (namedElement.FullName);
-				if (keywordName == namedElement.FullName)
-					keywordName = null;
-			}
-			if (firstMember is string)
-				memberName = firstMember.ToString ();
-			if (firstMember is IVariable)
-				memberName = ((IVariable)firstMember).Name;
-			if (firstMember is ITypeParameter)
-				memberName = ((ITypeParameter)firstMember).Name;
-			if (firstMember is INamespace)
-				memberName = ((INamespace)firstMember).Name;
-		}
-		
-		void SetPossibleFiles (IEnumerable<FilePath> files)
-		{
-			foreach (var file in files) {
-				var openDocument = IdeApp.Workbench.GetDocument (file);
-				if (openDocument == null) {
-					this.files.Add (file);
-				} else {
-					this.openDocuments.Add (Tuple.Create (file, openDocument));
-				}
-			}
-		}
-		
-		MemberReference GetReference (Project project, ResolveResult result, AstNode node, SyntaxTree syntaxTree, string fileName, Mono.TextEditor.TextEditorData editor)
-		{
-			AstNode originalNode = node;
-			if (result == null)
-				return null;
-
-			object valid = null;
-			if (result is MethodGroupResolveResult) {
-				valid = ((MethodGroupResolveResult)result).Methods.FirstOrDefault (
-					m => searchedMembers.Any (member => member is IMethod && ((IMethod)member).Region == m.Region));
-			} else if (result is MemberResolveResult) {
-				var foundMember = ((MemberResolveResult)result).Member;
-				valid = searchedMembers.FirstOrDefault (
-					member => member is IMember && ((IMember)member).Region == foundMember.Region);
-			} else if (result is NamespaceResolveResult) {
-				var ns = ((NamespaceResolveResult)result).Namespace;
-				valid = searchedMembers.FirstOrDefault (n => n is INamespace && ns.FullName.StartsWith (((INamespace)n).FullName, StringComparison.Ordinal));
-				if (!(node is NamespaceDeclaration))
-					goto skip;
-			} else if (result is LocalResolveResult) {
-				var ns = ((LocalResolveResult)result).Variable;
-				valid = searchedMembers.FirstOrDefault (n => n is IVariable && ((IVariable)n).Region == ns.Region);
-			} else if (result is TypeResolveResult) {
-				valid = searchedMembers.FirstOrDefault (n => n is IType);
-			}
-			if (node is ConstructorInitializer)
-				return null;
-			if (node is ObjectCreateExpression)
-				node = ((ObjectCreateExpression)node).Type;
-			if (node is IndexerDeclaration)
-				node = ((IndexerDeclaration)node).ThisToken;
-
-			if (node is InvocationExpression)
-				node = ((InvocationExpression)node).Target;
-			
-			if (node is MemberReferenceExpression)
-				node = ((MemberReferenceExpression)node).MemberNameToken;
-			
-			if (node is SimpleType)
-				node = ((SimpleType)node).IdentifierToken;
-
-			if (node is MemberType)
-				node = ((MemberType)node).MemberNameToken;
-			
-			if (node is NamespaceDeclaration) {
-				var nsd = ((NamespaceDeclaration)node);
-				node = nsd.NamespaceName;
-				if (node == null)
-					return null;
-			}
-
-			if (node is TypeDeclaration && (searchedMembers.First () is IType)) 
-				node = ((TypeDeclaration)node).NameToken;
-			if (node is DelegateDeclaration) 
-				node = ((DelegateDeclaration)node).NameToken;
-
-			if (node is EntityDeclaration && (searchedMembers.First () is IMember)) 
-				node = ((EntityDeclaration)node).NameToken;
-			
-			if (node is ParameterDeclaration && (searchedMembers.First () is IParameter)) 
-				node = ((ParameterDeclaration)node).NameToken;
-			if (node is ConstructorDeclaration)
-				node = ((ConstructorDeclaration)node).NameToken;
-			if (node is DestructorDeclaration)
-				node = ((DestructorDeclaration)node).NameToken;
-			if (node is NamedArgumentExpression)
-				node = ((NamedArgumentExpression)node).NameToken;
-			if (node is NamedExpression)
-				node = ((NamedExpression)node).NameToken;
-			if (node is VariableInitializer)
-				node = ((VariableInitializer)node).NameToken;
-
-			if (node is IdentifierExpression) {
-				node = ((IdentifierExpression)node).IdentifierToken;
-			}
-
-		skip:
-
-			var region = new DomRegion (fileName, node.StartLocation, node.EndLocation);
-
-			var length = node is PrimitiveType ? keywordName.Length : node.EndLocation.Column - node.StartLocation.Column;
-			if (valid == null)
-				valid = searchedMembers.FirstOrDefault ();
-			var reference = new CSharpMemberReference (project, originalNode, syntaxTree, valid, region, editor.LocationToOffset (region.Begin), length);
-
-			reference.ReferenceUsageType = GetUsage (originalNode);
-			return reference;
-		}
-
-		// same logic than the extract method analyzation, unfortunately it's not reusable in this context 
-		// we need to do it bottom up here.
-		ReferenceUsageType GetUsage (AstNode node)
-		{
-			if (node.Parent is UnaryOperatorExpression) {
-				var unaryOperatorExpression = (UnaryOperatorExpression)node.Parent;
-				if (unaryOperatorExpression.Operator == UnaryOperatorType.Increment || 
-				    unaryOperatorExpression.Operator == UnaryOperatorType.Decrement ||
-					unaryOperatorExpression.Operator == UnaryOperatorType.PostIncrement || 
-				    unaryOperatorExpression.Operator == UnaryOperatorType.PostDecrement) {
-					return ReferenceUsageType.ReadWrite;
-				}
-			} else if (node.Parent is DirectionExpression) {
-				var de = (DirectionExpression)node.Parent;
-				if (de.FieldDirection == FieldDirection.Ref)
-					return ReferenceUsageType.ReadWrite;
-				if (de.FieldDirection == FieldDirection.Out)
-					return ReferenceUsageType.Write;
-			} else if (node.Parent is AssignmentExpression) {
-				var ae = (AssignmentExpression)node.Parent;
-				if (ae.Left == node)
-					return ReferenceUsageType.Write;
-			} else if (node is VariableInitializer) {
-				return ReferenceUsageType.Write;
-			} else if (node is ParameterDeclaration) {
-				return ReferenceUsageType.Write;
-			} else if (node.Parent is ForeachStatement) {
-				if (node.Role == Roles.Identifier)
-					return ReferenceUsageType.Write;
-			}
-			return ReferenceUsageType.Read;
-		}
-
-		public class CSharpMemberReference : MemberReference
-		{
-			public SyntaxTree SyntaxTree {
-				get;
-				private set;
-			}
-
-			public AstNode AstNode {
-				get;
-				private set;
-			}
-
-			public Project Project {
-				get;
-				private set;
-			}
-
-			public CSharpMemberReference (Project project, AstNode astNode, SyntaxTree syntaxTree,  object entity, DomRegion region, int offset, int length) : base (entity, region, offset, length)
-			{
-				this.Project = project;
-				this.AstNode = astNode;
-				this.SyntaxTree = syntaxTree;
-			}
-		}
-
-		bool IsNodeValid (object searchedMember, AstNode node)
-		{
-			if (searchedMember is IField && node is FieldDeclaration)
-				return false;
-			return true;
-		}
-		
-		public IEnumerable<MemberReference> FindInDocument (MonoDevelop.Ide.Gui.Document doc, CancellationToken token = default (CancellationToken))
-		{
-			if (string.IsNullOrEmpty (memberName))
-				return Enumerable.Empty<MemberReference> ();
-			var editor = doc.Editor;
-			var parsedDocument = doc.ParsedDocument;
-			if (parsedDocument == null)
-				return Enumerable.Empty<MemberReference> ();
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			var file = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-			var result = new List<MemberReference> ();
-			
-			foreach (var obj in searchedMembers) {
-				if (obj is IVariable && !(obj is IParameter) && !(obj is IField)) {
-					refFinder.FindLocalReferences ((IVariable)obj, file, unit, doc.Compilation, (astNode, r) => { 
-						if (IsNodeValid (obj, astNode))
-							result.Add (GetReference (doc.Project, r, astNode, unit, editor.FileName, editor));
-					}, token);
-				} else if (obj is ISymbol) {
-					var sym = (ISymbol)obj;
-
-					// May happen for anonymous types since empty constructors are always generated.
-					// But there is no declaring type definition for them - we filter out this case.
-					if (sym.SymbolKind == SymbolKind.Constructor && ((IEntity)sym).DeclaringTypeDefinition == null)
-						continue;
-					refFinder.FindReferencesInFile (refFinder.GetSearchScopes (sym), file, unit, doc.Compilation, (astNode, r) => {
-						if (IsNodeValid (obj, astNode))
-							result.Add (GetReference (doc.Project, r, astNode, unit, editor.FileName, editor)); 
-					}, token);
-				}
-			}
-			return result;
-		}
-		
-		public override IEnumerable<MemberReference> FindReferences (Project project, IProjectContent content, IEnumerable<FilePath> possibleFiles, ProgressMonitor monitor, IEnumerable<object> members)
-		{
-			if (content == null)
-				throw new ArgumentNullException ("content", "Project content not set.");
-			SetPossibleFiles (possibleFiles);
-			SetSearchedMembers (members);
-			var scopes = searchedMembers.Select (e => e is INamespace ? refFinder.GetSearchScopes ((INamespace)e) : refFinder.GetSearchScopes ((ISymbol)e));
-			var compilation = project != null ? TypeSystemService.GetCompilation (project) : content.CreateCompilation ();
-			List<MemberReference> refs = new List<MemberReference> ();
-			foreach (var opendoc in openDocuments) {
-				foreach (var newRef in FindInDocument (opendoc.Item2)) {
-					if (newRef == null || refs.Any (r => r.FileName == newRef.FileName && r.Region == newRef.Region))
-						continue;
-					refs.Add (newRef);
-				}
-			}
-			foreach (var file in files) {
-				if (monitor != null)
-					monitor.Step (1);
-				string text;
-				try {
-					if  (!File.Exists (file))
-						continue;
-					text = Mono.TextEditor.Utils.TextFileUtility.ReadAllText (file);
-				} catch (Exception e) {
-					LoggingService.LogError ("Exception while file reading.", e);
-					continue;
-				}
-				if (memberName != null && text.IndexOf (memberName, StringComparison.Ordinal) < 0 &&
-					(keywordName == null || text.IndexOf (keywordName, StringComparison.Ordinal) < 0))
-					continue;
-				using (var editor = TextEditorData.CreateImmutable (text)) {
-					editor.Document.FileName = file;
-					var unit = new CSharpParser ().Parse (editor);
-					if (unit == null)
-						continue;
-					
-					var storedFile = content.GetFile (file);
-					var parsedFile = storedFile as CSharpUnresolvedFile;
-					
-					if (parsedFile == null && storedFile is ParsedDocumentDecorator) {
-						parsedFile = ((ParsedDocumentDecorator)storedFile).ParsedFile as CSharpUnresolvedFile;
-					}
-					
-					if (parsedFile == null) {
-						// for fallback purposes - should never happen.
-						parsedFile = unit.ToTypeSystem ();
-						content = content.AddOrUpdateFiles (parsedFile);
-						compilation = content.CreateCompilation ();
-					}
-					foreach (var scope in scopes) {
-						refFinder.FindReferencesInFile (
-							scope,
-							parsedFile,
-							unit,
-							compilation,
-							(astNode, result) => {
-								var newRef = GetReference (project, result, astNode, unit, file, editor);
-								if (newRef == null || refs.Any (r => r.FileName == newRef.FileName && r.Region == newRef.Region))
-									return;
-								refs.Add (newRef);
-							},
-							CancellationToken.None
-						);
-					}
-				}
-			}
-			return refs;
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CodeGenerationService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CodeGenerationService.cs
new file mode 100644
index 0000000000..8f911641af
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CodeGenerationService.cs
@@ -0,0 +1,302 @@
+// 
+// CodeGenerationService.cs
+//  
+// Author:
+//       mkrueger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using MonoDevelop.Core;
+using System.CodeDom;
+using MonoDevelop.Projects;
+using System.CodeDom.Compiler;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Simplification;
+using System.Threading;
+using Gtk;
+using MonoDevelop.Ide.CodeFormatting;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using MonoDevelop.CSharp.Formatting;
+using MonoDevelop.Ide.Gui.Content;
+
+namespace MonoDevelop.Refactoring
+{
+	public static class CodeGenerationService
+	{
+		//		public static IUnresolvedMember AddCodeDomMember (MonoDevelop.Projects.Project project, IUnresolvedTypeDefinition type, CodeTypeMember newMember)
+		//		{
+		//			bool isOpen;
+		//			var data = TextFileProvider.Instance.GetTextEditorData (type.Region.FileName, out isOpen);
+		//			var parsedDocument = TypeSystemService.ParseFile (data.FileName, data.MimeType, data.Text);
+		//			
+		//			var insertionPoints = GetInsertionPoints (data, parsedDocument, type);
+		//			
+		//			var suitableInsertionPoint = GetSuitableInsertionPoint (insertionPoints, type, newMember);
+		//			
+		//			var dotNetProject = project as DotNetProject;
+		//			if (dotNetProject == null) {
+		//				LoggingService.LogError ("Only .NET projects are supported.");
+		//				return null;
+		//			}
+		//			
+		//			var generator = dotNetProject.LanguageBinding.GetCodeDomProvider ();
+		//			StringWriter sw = new StringWriter ();
+		//			var options = new CodeGeneratorOptions ();
+		//			options.IndentString = data.GetLineIndent (type.Region.BeginLine) + "\t";
+		//			if (newMember is CodeMemberMethod)
+		//				options.BracingStyle = "C";
+		//			generator.GenerateCodeFromMember (newMember, sw, options);
+		//
+		//			var code = sw.ToString ();
+		//			if (!string.IsNullOrEmpty (code))
+		//				suitableInsertionPoint.Insert (data, code);
+		//			if (!isOpen) {
+		//				try {
+		//					File.WriteAllText (type.Region.FileName, data.Text);
+		//				} catch (Exception e) {
+		//					LoggingService.LogError (string.Format ("Failed to write file '{0}'.", type.Region.FileName), e);
+		//					MessageService.ShowError (GettextCatalog.GetString ("Failed to write file '{0}'.", type.Region.FileName));
+		//				}
+		//			}
+		//			var newDocument = TypeSystemService.ParseFile (data.FileName, data.MimeType, data.Text);
+		//			return newDocument.ParsedFile.GetMember (suitableInsertionPoint.Location.Line, int.MaxValue);
+		//		}
+
+		public static async Task AddNewMember (Projects.Project project, ITypeSymbol type, Location part, SyntaxNode newMember, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (project == null)
+				throw new ArgumentNullException (nameof (project));
+			if (type == null)
+				throw new ArgumentNullException (nameof (type));
+			if (newMember == null)
+				throw new ArgumentNullException (nameof (newMember));
+			if (!type.IsDefinedInSource ())
+				throw new ArgumentException ("The given type needs to be defined in source code.", nameof (type));
+
+
+			var ws = TypeSystemService.GetWorkspace (project.ParentSolution);
+			var projectId = ws.GetProjectId (project);
+			var docId = ws.GetDocumentId (projectId, part.SourceTree.FilePath);
+
+			var document = ws.GetDocument (docId, cancellationToken);
+
+			var root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+			var typeDecl = (ClassDeclarationSyntax)root.FindNode (part.SourceSpan);
+
+			// for some reason the reducer doesn't reduce this
+			var systemVoid = newMember.DescendantNodesAndSelf ().OfType<QualifiedNameSyntax> ().FirstOrDefault (ma => ma.ToString () == "System.Void");
+
+			if (systemVoid != null) newMember = newMember.ReplaceNode (systemVoid, SyntaxFactory.ParseTypeName ("void"));
+
+			var newRoot = root.ReplaceNode (typeDecl, typeDecl.AddMembers ((MemberDeclarationSyntax)newMember.WithAdditionalAnnotations (Simplifier.Annotation, Formatter.Annotation)));
+			document = document.WithSyntaxRoot (newRoot);
+			var policy = project.Policies.Get<CSharpFormattingPolicy> ("text/x-csharp");
+			var textPolicy = project.Policies.Get<TextStylePolicy> ("text/x-csharp");
+			var projectOptions = policy.CreateOptions (textPolicy);
+
+			document = await Formatter.FormatAsync (document, Formatter.Annotation, projectOptions, cancellationToken).ConfigureAwait (false);
+			document = await Simplifier.ReduceAsync (document, Simplifier.Annotation, projectOptions, cancellationToken).ConfigureAwait (false);
+			var text = await document.GetTextAsync (cancellationToken).ConfigureAwait (false);
+			var newSolution = ws.CurrentSolution.WithDocumentText (docId, text);
+			ws.TryApplyChanges (newSolution);
+		}
+
+		readonly static SyntaxAnnotation insertedMemberAnnotation = new SyntaxAnnotation ("INSERTION_ANNOTATAION");
+		public static async Task InsertMemberWithCursor (string operation, Projects.Project project, ITypeSymbol type, Location part, SyntaxNode newMember, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (operation == null)
+				throw new ArgumentNullException (nameof (operation));
+			if (project == null)
+				throw new ArgumentNullException (nameof (project));
+			if (type == null)
+				throw new ArgumentNullException (nameof (type));
+			if (newMember == null)
+				throw new ArgumentNullException (nameof (newMember));
+			var ws = TypeSystemService.GetWorkspace (project.ParentSolution);
+			var projectId = ws.GetProjectId (project);
+			var docId = ws.GetDocumentId (projectId, part.SourceTree.FilePath);
+
+			var document = ws.GetDocument (docId, cancellationToken);
+
+			var root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+			var typeDecl = (ClassDeclarationSyntax)root.FindNode (part.SourceSpan);
+
+			// for some reason the reducer doesn't reduce this
+			var systemVoid = newMember.DescendantNodesAndSelf ().OfType<QualifiedNameSyntax> ().FirstOrDefault (ma => ma.ToString () == "System.Void");
+
+			if (systemVoid != null) newMember = newMember.ReplaceNode (systemVoid, SyntaxFactory.ParseTypeName ("void"));
+
+			var newRoot = root.ReplaceNode (typeDecl, typeDecl.AddMembers ((MemberDeclarationSyntax)newMember.WithAdditionalAnnotations (Simplifier.Annotation, Formatter.Annotation, insertedMemberAnnotation)));
+			var doc = IdeApp.Workbench.OpenDocument (part.SourceTree.FilePath, project, true);
+
+			var policy = project.Policies.Get<CSharpFormattingPolicy> ("text/x-csharp");
+			var textPolicy = project.Policies.Get<TextStylePolicy> ("text/x-csharp");
+			var projectOptions = policy.CreateOptions (textPolicy);
+
+			document = document.WithSyntaxRoot (newRoot);
+			document = await Formatter.FormatAsync (document, Formatter.Annotation, projectOptions, cancellationToken).ConfigureAwait (false);
+			document = await Simplifier.ReduceAsync (document, Simplifier.Annotation, projectOptions, cancellationToken).ConfigureAwait (false);
+
+			root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+
+			var node = root.GetAnnotatedNodes (insertedMemberAnnotation).Single ();
+
+			Application.Invoke (delegate {
+				var insertionPoints = InsertionPointService.GetInsertionPoints (
+					doc.Editor,
+					doc.UpdateParseDocument (),
+					type,
+					part
+				);
+				var options = new InsertionModeOptions (
+					operation,
+					insertionPoints,
+					async point => {
+						if (!point.Success)
+							return;
+						var text = node.ToString ();
+						point.InsertionPoint.Insert (doc.Editor, doc, text);
+					}
+				);
+
+				doc.Editor.StartInsertionMode (options);
+			});
+		}
+
+		//public static Task<bool> InsertMemberWithCursor (string operation, ITypeSymbol type, Location part, SyntaxNode newMember, bool implementExplicit = false)
+		//{
+		//	//TODO: Add dialog for inserting position
+		//	AddNewMember (type, part, newMember, implementExplicit);
+		//	return Task.FromResult (true);
+		//}
+		//
+		//		public static int CalculateBodyIndentLevel (IUnresolvedTypeDefinition declaringType)
+		//		{
+		//			if (declaringType == null)
+		//				return 0;
+		//			int indentLevel = 1;
+		//			while (declaringType.DeclaringTypeDefinition != null) {
+		//				indentLevel++;
+		//				declaringType = declaringType.DeclaringTypeDefinition;
+		//			}
+		//			var file = declaringType.UnresolvedFile as CSharpUnresolvedFile;
+		//			if (file == null)
+		//				return indentLevel;
+		//			var scope = file.GetUsingScope (declaringType.Region.Begin);
+		//			while (scope != null && !string.IsNullOrEmpty (scope.NamespaceName)) {
+		//				indentLevel++;
+		//				// skip virtual scopes.
+		//				while (scope.Parent != null && scope.Parent.Region == scope.Region)
+		//					scope = scope.Parent;
+		//				scope = scope.Parent;
+		//			}
+		//			return indentLevel;
+		//		}
+		public static MonoDevelop.Ide.TypeSystem.CodeGenerator CreateCodeGenerator (this Ide.Gui.Document doc)
+		{
+			return MonoDevelop.Ide.TypeSystem.CodeGenerator.CreateGenerator (doc);
+		}
+
+
+		//		public static MonoDevelop.Ide.TypeSystem.CodeGenerator CreateCodeGenerator (this ITextDocument data, ICompilation compilation)
+		//		{
+		//			return MonoDevelop.Ide.TypeSystem.CodeGenerator.CreateGenerator (data, compilation);
+		//		}
+		//		
+		//		static IUnresolvedTypeDefinition GetMainPart (IType t)
+		//		{
+		//			return t.GetDefinition ().Parts.First ();
+		//		}
+
+
+		public static void AddAttribute (INamedTypeSymbol cls, string name, params object [] parameters)
+		{
+			if (cls == null)
+				throw new ArgumentNullException ("cls");
+			bool isOpen;
+			string fileName = cls.Locations.First ().SourceTree.FilePath;
+			var buffer = TextFileProvider.Instance.GetTextEditorData (fileName, out isOpen);
+
+
+			var code = new StringBuilder ();
+			int pos = cls.Locations.First ().SourceSpan.Start;
+			var line = buffer.GetLineByOffset (pos);
+			code.Append (buffer.GetLineIndent (line));
+			code.Append ("[");
+			code.Append (name);
+			if (parameters != null && parameters.Length > 0) {
+				code.Append ("(");
+				for (int i = 0; i < parameters.Length; i++) {
+					if (i > 0)
+						code.Append (", ");
+					code.Append (parameters [i]);
+				}
+				code.Append (")");
+			}
+			code.Append ("]");
+			code.AppendLine ();
+
+			buffer.InsertText (line.Offset, code.ToString ());
+
+			if (!isOpen) {
+				File.WriteAllText (fileName, buffer.Text);
+			}
+		}
+
+		public static ITypeSymbol AddType (DotNetProject project, string folder, string namspace, ClassDeclarationSyntax type)
+		{
+			if (project == null)
+				throw new ArgumentNullException (nameof (project));
+			if (folder == null)
+				throw new ArgumentNullException (nameof (folder));
+			if (namspace == null)
+				throw new ArgumentNullException (nameof (namspace));
+			if (type == null)
+				throw new ArgumentNullException (nameof (type));
+			var ns = SyntaxFactory.NamespaceDeclaration (SyntaxFactory.ParseName (namspace)).WithMembers (new SyntaxList<MemberDeclarationSyntax> () { type });
+
+			string fileName = project.LanguageBinding.GetFileName (Path.Combine (folder, type.Identifier.ToString ()));
+			using (var sw = new StreamWriter (fileName)) {
+				sw.WriteLine (ns.ToString ());
+			}
+			FileService.NotifyFileChanged (fileName);
+			var roslynProject = TypeSystemService.GetCodeAnalysisProject (project);
+			var id = TypeSystemService.GetDocumentId (roslynProject.Id, fileName);
+			if (id == null)
+				return null;
+			var model = roslynProject.GetDocument (id).GetSemanticModelAsync ().Result;
+			var typeSyntax = model.SyntaxTree.GetCompilationUnitRoot ().ChildNodes ().First ().ChildNodes ().First () as ClassDeclarationSyntax;
+			return model.GetDeclaredSymbol (typeSyntax);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ExtractMethodCommandHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ExtractMethodCommandHandler.cs
new file mode 100644
index 0000000000..f4cd6ae7d0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ExtractMethodCommandHandler.cs
@@ -0,0 +1,113 @@
+//
+// ExtractMethodCommandHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Components.Commands;
+using ICSharpCode.NRefactory6.CSharp.ExtractMethod;
+using MonoDevelop.Ide;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using System.Linq;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Core;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class ExtractMethodCommandHandler : CommandHandler
+	{
+		public static async Task<bool> IsValid (MonoDevelop.Ide.Gui.Document doc, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (doc == null)
+				return false;
+			if (doc.Editor == null || !doc.Editor.IsSomethingSelected)
+				return false;
+			var ad = doc.AnalysisDocument;
+			if (ad == null)
+				return false;
+			var selectionRange = doc.Editor.SelectionRange;
+			try {
+				var selection = new CSharpSelectionValidator (await SemanticDocument.CreateAsync (ad, cancellationToken).ConfigureAwait (false), new TextSpan (selectionRange.Offset, selectionRange.Length), doc.GetOptionSet ());
+				var result = await selection.GetValidSelectionAsync (cancellationToken).ConfigureAwait (false);
+				return result.ContainsValidContext;
+			} catch (Exception) {
+				return false;
+			}
+		}
+
+		protected async override void Update (CommandInfo info)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			info.Enabled = await IsValid (doc);
+		}
+
+		public async static Task Run (MonoDevelop.Ide.Gui.Document doc)
+		{
+			if (!doc.Editor.IsSomethingSelected)
+				return;
+			var ad = doc.AnalysisDocument;
+			if (ad == null)
+				return;
+			try {
+				var selectionRange = doc.Editor.SelectionRange;
+				var token = default(CancellationToken);
+				var selection = new CSharpSelectionValidator (await SemanticDocument.CreateAsync (ad, token).ConfigureAwait (false), new TextSpan (selectionRange.Offset, selectionRange.Length), doc.GetOptionSet ());
+				var result = await selection.GetValidSelectionAsync (token).ConfigureAwait (false);
+				if (!result.ContainsValidContext)
+					return;
+				var extractor = new CSharpMethodExtractor ((CSharpSelectionResult)result);
+				var extractionResult = await extractor.ExtractMethodAsync (token).ConfigureAwait (false);
+				var changes = await extractionResult.Document.GetTextChangesAsync (ad, token);
+				using (var undo = doc.Editor.OpenUndoGroup ()) {
+					foreach (var change in changes.OrderByDescending (ts => ts.Span.Start)) {
+						doc.Editor.ReplaceText (change.Span.Start, change.Span.Length, change.NewText);
+					}
+					// hack to remove the redundant private modifier.
+					if (doc.Editor.GetTextAt (extractionResult.MethodDeclarationNode.SpanStart, "private ".Length) == "private ") {
+						doc.Editor.RemoveText (extractionResult.MethodDeclarationNode.SpanStart, "private ".Length);
+					}
+				}
+				doc.UpdateParseDocument ();
+				var info = RefactoringSymbolInfo.GetSymbolInfoAsync (doc, extractionResult.InvocationNameToken.Span.Start).Result;
+				var sym = info.DeclaredSymbol ?? info.Symbol;
+				if (sym != null)
+					new MonoDevelop.Refactoring.Rename.RenameRefactoring ().Rename (sym);
+			}
+			catch (Exception e) {
+				LoggingService.LogError ("Error while extracting method", e);
+			}
+		}
+
+		protected async override void Run ()
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null)
+				return;
+			await Run (doc);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindDerivedSymbolsHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindDerivedSymbolsHandler.cs
new file mode 100644
index 0000000000..bfa67762ff
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindDerivedSymbolsHandler.cs
@@ -0,0 +1,109 @@
+//
+// FindDerivedSymbolsHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.FindInFiles;
+using MonoDevelop.Ide.TypeSystem;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using MonoDevelop.Projects;
+using System.Threading;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.FindSymbols;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Refactoring;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class FindDerivedSymbolsHandler
+	{
+		public static bool CanFindDerivedSymbols (ISymbol symbol, out string description)
+		{
+			if (symbol.Kind == SymbolKind.NamedType) {
+				var type = (ITypeSymbol)symbol;
+				description = type.TypeKind == TypeKind.Interface ? GettextCatalog.GetString ("Find Implementing Types") : GettextCatalog.GetString ("Find Derived Types");
+				return !type.IsStatic && !type.IsSealed;
+			}
+			if (symbol.ContainingType != null && symbol.ContainingType.TypeKind == TypeKind.Interface) {
+ 				description = GettextCatalog.GetString ("Find Implementing Symbols");
+			} else {
+ 				description = GettextCatalog.GetString ("Find Derived Symbols");
+			}
+			return symbol.IsVirtual || symbol.IsAbstract || symbol.IsOverride;
+		}
+
+		public static void FindDerivedSymbols (ISymbol symbol)
+		{
+			Task.Run (delegate {
+				using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+					IEnumerable<ISymbol> task;
+
+					if (symbol.ContainingType != null && symbol.ContainingType.TypeKind == TypeKind.Interface) {
+						task = SymbolFinder.FindImplementationsAsync (symbol, TypeSystemService.Workspace.CurrentSolution).Result; 
+					} else if (symbol.Kind == SymbolKind.NamedType) {
+						var type = (INamedTypeSymbol)symbol;
+						if (type.TypeKind == TypeKind.Interface) {
+							task = SymbolFinder.FindImplementationsAsync (symbol, TypeSystemService.Workspace.CurrentSolution).Result; 
+						} else {
+							task = type.FindDerivedClassesAsync (TypeSystemService.Workspace.CurrentSolution).Result.Cast<ISymbol> ();
+						}
+					} else {
+						task = SymbolFinder.FindOverridesAsync (symbol, TypeSystemService.Workspace.CurrentSolution).Result;
+					}
+					foreach (var foundSymbol in task) {
+						foreach (var loc in foundSymbol.Locations)
+							monitor.ReportResult (new MemberReference (foundSymbol, loc.SourceTree.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length));
+					}
+				}
+			});
+		}
+
+		public async void Update (CommandInfo info)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null) {
+				info.Enabled = false;
+				return;
+			}
+			var rinfo = await RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor.CaretOffset);
+			info.Enabled = rinfo.DeclaredSymbol != null;
+		}
+
+		public async void Run (object data)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			var info = await RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor.CaretOffset);
+			if (info.DeclaredSymbol != null)
+				FindDerivedSymbols (info.DeclaredSymbol);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindExtensionMethodHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindExtensionMethodHandler.cs
new file mode 100644
index 0000000000..a6035056dd
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindExtensionMethodHandler.cs
@@ -0,0 +1,94 @@
+//
+// FindExtensionMethodHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.FindInFiles;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class FindExtensionMethodHandler 
+	{
+		public static bool CanFindExtensionMethods (ISymbol declaredSymbol, out string description)
+		{
+//			var tr  = new ICSharpCode.NRefactory.CSharp.CSharpParser ().ParseTypeReference ("global::Thing<int>.Done<string>") as MemberType;
+//			Console.WriteLine (tr.Target);
+//			
+			description = GettextCatalog.GetString ("Find Extension Methods");
+//			return declaredSymbol.Kind == SymbolKind.NamedType;
+			return false;
+		}
+
+		public static void FindExtensionMethods (ISymbol declaredSymbol)
+		{
+		/*	using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+				var solution = TypeSystemService.Workspace.CurrentSolution;
+				foreach (var project in solution.Projects) {
+					var comp = project.GetCompilationAsync ().Result;
+					foreach (var type in comp.)
+
+				}
+			}
+			declaredSymbo*/
+		}
+
+
+//		public void Run ()
+//		{
+//			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+//				foreach (var project in IdeApp.ProjectOperations.CurrentSelectedSolution.GetAllProjects ()) {
+//					var comp = TypeSystemService.GetCompilation (project); 
+//					foreach (var type in comp.MainAssembly.GetAllTypeDefinitions ()) {
+//						if (!type.IsStatic)
+//							continue;
+//						foreach (var method in type.GetMethods (m => m.IsStatic)) {
+//							if (!method.IsExtensionMethod)
+//								continue;
+//							IType[] ifTypes;
+//							var typeDef = comp.Import (entity);
+//							if (typeDef == null)
+//								continue;
+//							if (!CSharpResolver.IsEligibleExtensionMethod (typeDef, method, true, out ifTypes))
+//								continue;
+//
+//							var tf = TextFileProvider.Instance.GetReadOnlyTextEditorData (method.Region.FileName);
+//							var start = tf.LocationToOffset (method.Region.Begin); 
+//							tf.SearchRequest.SearchPattern = method.Name;
+//							var sr = tf.SearchForward (start); 
+//							if (sr != null)
+//								start = sr.Offset;
+//							monitor.ReportResult (new MemberReference (method, method.Region.FileName, start, method.Name.Length));
+//						}
+//					}
+//				}
+//			}
+//		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindMemberOverloadsHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindMemberOverloadsHandler.cs
index db0f154683..b318f7994c 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindMemberOverloadsHandler.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindMemberOverloadsHandler.cs
@@ -24,51 +24,48 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using System.Linq;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.FindInFiles;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Analysis;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Core;
 
-namespace MonoDevelop.Refactoring
+namespace MonoDevelop.CSharp.Refactoring
 {
-	class FindMemberOverloadsHandler
+	static class FindMemberOverloadsHandler
 	{
-		//Ide.Gui.Document doc;
-		IMember entity;
-
-		public FindMemberOverloadsHandler (Ide.Gui.Document doc, IMember entity)
+		public static bool CanFindMemberOverloads (ISymbol symbol, out string description)
 		{
-			//this.doc = doc;
-			this.entity = entity;
-		}
-
-		public bool IsValid {
-			get {
-				foreach (var overloadedMember in entity.DeclaringType.GetMembers (m => m.Name == entity.Name && m.SymbolKind == entity.SymbolKind)) {
-					var fileName = overloadedMember.Region.FileName;
-					if (string.IsNullOrEmpty (fileName))
-						continue;
-					return true;
-				}
+			switch (symbol.Kind) {
+			case SymbolKind.Method:
+				description = GettextCatalog.GetString ("Find Method Overloads");
+				return symbol.ContainingType.GetMembers (symbol.Name).OfType<IMethodSymbol> ().Count () > 1;
+			case SymbolKind.Property:
+				description = GettextCatalog.GetString ("Find Indexer Overloads");
+				return symbol.ContainingType.GetMembers ().OfType<IPropertySymbol> () .Where (p => p.IsIndexer).Count () > 1;
+			default:
+				description = null;
 				return false;
 			}
 		}
 
-		public void Run ()
+		public static void FindOverloads (ISymbol symbol)
 		{
 			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
-				foreach (var overloadedMember in entity.DeclaringType.GetMembers (m => m.Name == entity.Name && m.SymbolKind == entity.SymbolKind)) {
-					var fileName = overloadedMember.Region.FileName;
-					if (string.IsNullOrEmpty (fileName))
-						continue;
-					var tf = TextFileProvider.Instance.GetReadOnlyTextEditorData (fileName);
-					var start = tf.LocationToOffset (overloadedMember.Region.Begin); 
-					tf.SearchRequest.SearchPattern = overloadedMember.Name;
-					var sr = tf.SearchForward (start); 
-					if (sr != null)
-						start = sr.Offset;
-					monitor.ReportResult (new MemberReference (overloadedMember, overloadedMember.Region, start, overloadedMember.Name.Length));
+				switch (symbol.Kind) {
+				case SymbolKind.Method:
+					foreach (var method in symbol.ContainingType.GetMembers (symbol.Name).OfType<IMethodSymbol> ()) {
+						foreach (var loc in method.Locations)
+							monitor.ReportResult (new MemberReference (method, loc.SourceTree.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length));
+					}
+					break;
+				case SymbolKind.Property:
+					foreach (var property in symbol.ContainingType.GetMembers ().OfType<IPropertySymbol> () .Where (p => p.IsIndexer)) {
+						foreach (var loc in property.Locations)
+							monitor.ReportResult (new MemberReference (property, loc.SourceTree.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length));
+					}
+					break;
+
 				}
 			}
 		}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindReferencesHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindReferencesHandler.cs
new file mode 100644
index 0000000000..4b702126e5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindReferencesHandler.cs
@@ -0,0 +1,156 @@
+// 
+// FindReferencesHandler.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Threading;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using MonoDevelop.Refactoring;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.FindInFiles;
+using MonoDevelop.Ide.Tasks;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class FindReferencesHandler
+	{
+		public static void FindRefs (ISymbol symbol)
+		{
+			var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true);
+			var solution = TypeSystemService.Workspace.CurrentSolution;
+			ThreadPool.QueueUserWorkItem (delegate {
+				try {
+					foreach (var loc in symbol.Locations) {
+						if (!loc.IsInSource)
+							continue;
+						var sr = new SearchResult (new FileProvider (loc.SourceTree.FilePath), loc.SourceSpan.Start, loc.SourceSpan.Length);
+						monitor.ReportResult (sr);
+					}
+					
+					foreach (var mref in SymbolFinder.FindReferencesAsync (symbol, solution).Result) {
+						foreach (var loc in mref.Locations) {
+							var sr = new SearchResult (new FileProvider (loc.Document.FilePath), loc.Location.SourceSpan.Start, loc.Location.SourceSpan.Length);
+							monitor.ReportResult (sr);
+						}
+					}
+				} catch (Exception ex) {
+					if (monitor != null)
+						monitor.ReportError ("Error finding references", ex);
+					else
+						LoggingService.LogError ("Error finding references", ex);
+				} finally {
+					if (monitor != null)
+						monitor.Dispose ();
+				}
+			});
+		}
+
+		public void Update (CommandInfo info)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null) {
+				info.Enabled = false;
+				return;
+			}
+			var pd = doc.ParsedDocument.GetAst<SemanticModel> ();
+			info.Enabled = pd != null;
+		}
+
+		public void Run (object data)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+
+			var info = RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor.CaretOffset).Result;
+			var sym = info.Symbol ?? info.DeclaredSymbol;
+			if (sym != null)
+				FindRefs (sym);
+		}
+	}
+
+	class FindAllReferencesHandler
+	{
+		public static void FindRefs (ISymbol obj, Compilation compilation)
+		{
+			var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true);
+			var solution = TypeSystemService.Workspace.CurrentSolution;
+			ThreadPool.QueueUserWorkItem (delegate {
+				try {
+					foreach (var simSym in SymbolFinder.FindSimilarSymbols (obj, compilation)) {
+						foreach (var loc in simSym.Locations) {
+							var sr = new SearchResult (new FileProvider (loc.SourceTree.FilePath), loc.SourceSpan.Start, loc.SourceSpan.Length);
+							monitor.ReportResult (sr);
+						}
+
+						foreach (var mref in SymbolFinder.FindReferencesAsync (simSym, solution).Result) {
+							foreach (var loc in mref.Locations) {
+								var sr = new SearchResult (new FileProvider (loc.Document.FilePath), loc.Location.SourceSpan.Start, loc.Location.SourceSpan.Length);
+								monitor.ReportResult (sr);
+							}
+						}
+					}
+				} catch (Exception ex) {
+					if (monitor != null)
+						monitor.ReportError ("Error finding references", ex);
+					else
+						LoggingService.LogError ("Error finding references", ex);
+				} finally {
+					if (monitor != null)
+						monitor.Dispose ();
+				}
+			});
+		}
+
+		public void Update (CommandInfo info)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null) {
+				info.Enabled = false;
+				return;
+			}
+			var pd = doc.ParsedDocument.GetAst<SemanticModel> ();
+			info.Enabled = pd != null;
+		}
+
+		public void Run (object data)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			
+			var info = RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor.CaretOffset).Result;
+			var sym = info.Symbol ?? info.DeclaredSymbol;
+			var semanticModel = doc.ParsedDocument.GetAst<SemanticModel> ();
+			if (sym != null)
+				FindRefs (sym, semanticModel.Compilation);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoBaseDeclarationHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoBaseDeclarationHandler.cs
new file mode 100644
index 0000000000..ea42862a3e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoBaseDeclarationHandler.cs
@@ -0,0 +1,111 @@
+//
+// GotoBaseDeclarationHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide;
+using System.Linq;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	static class GotoBaseDeclarationHandler
+	{
+		public static string GetDescription (ISymbol symbol)
+		{
+			if (symbol == null)
+				throw new ArgumentNullException ("symbol");
+			switch (symbol.Kind) {
+			case SymbolKind.NamedType:
+				return GettextCatalog.GetString ("Go to _Base Type");
+			case SymbolKind.Property:
+				var property = (IPropertySymbol)symbol;
+				return property.OverriddenProperty != null ? GettextCatalog.GetString ("Go to _Base Property") : GettextCatalog.GetString ("Go to _Interface Property");
+			case SymbolKind.Event:
+				var evt = (IEventSymbol)symbol;
+				return evt.OverriddenEvent != null ? GettextCatalog.GetString ("Go to _Base Event") : GettextCatalog.GetString ("Go to _Interface Event");
+			case SymbolKind.Method:
+				var method = (IMethodSymbol)symbol;
+				return method.OverriddenMethod != null ? GettextCatalog.GetString ("Go to _Base Method") : GettextCatalog.GetString ("Go to _Interface Method");
+			}
+			return GettextCatalog.GetString ("Go to _Base Symbol");
+		}
+
+		public static bool CanGotoBase (ISymbol symbol)
+		{
+			if (symbol == null)
+				return false;
+			switch (symbol.Kind) {
+			case SymbolKind.NamedType:
+				return true;
+			case SymbolKind.Property:
+				var property = (IPropertySymbol)symbol;
+				return property.OverriddenProperty != null || property.ExplicitInterfaceImplementations.Length > 0;
+			case SymbolKind.Event:
+				var evt = (IEventSymbol)symbol;
+				return evt.OverriddenEvent != null || evt.ExplicitInterfaceImplementations.Length > 0;
+			case SymbolKind.Method:
+				var method = (IMethodSymbol)symbol;
+				return method.OverriddenMethod != null || method.ExplicitInterfaceImplementations.Length > 0;
+			}
+			return false;
+		}
+
+		public static void GotoBase (MonoDevelop.Ide.Gui.Document doc, ISymbol symbol)
+		{
+			if (doc == null)
+				throw new ArgumentNullException ("doc");
+			if (symbol == null)
+				throw new ArgumentNullException ("symbol");
+			switch (symbol.Kind) {
+			case SymbolKind.NamedType:
+				IdeApp.ProjectOperations.JumpToDeclaration (((ITypeSymbol)symbol).BaseType, doc.Project);
+				break;
+			case SymbolKind.Property:
+				var property = (IPropertySymbol)symbol;
+				if (property.OverriddenProperty != null)
+					IdeApp.ProjectOperations.JumpToDeclaration (property.OverriddenProperty, doc.Project);
+				else
+					IdeApp.ProjectOperations.JumpToDeclaration (property.ExplicitInterfaceImplementations.First (), doc.Project);
+				break;
+			case SymbolKind.Event:
+				var evt = (IEventSymbol)symbol;
+				if (evt.OverriddenEvent != null)
+					IdeApp.ProjectOperations.JumpToDeclaration (evt.OverriddenEvent, doc.Project);
+				else
+					IdeApp.ProjectOperations.JumpToDeclaration (evt.ExplicitInterfaceImplementations.First (), doc.Project);
+				break;
+			case SymbolKind.Method:
+				var method = (IMethodSymbol)symbol;
+				if (method.OverriddenMethod != null)
+					IdeApp.ProjectOperations.JumpToDeclaration (method.OverriddenMethod, doc.Project);
+				else
+					IdeApp.ProjectOperations.JumpToDeclaration (method.ExplicitInterfaceImplementations.First (), doc.Project);
+				break;
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoDeclarationHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoDeclarationHandler.cs
new file mode 100644
index 0000000000..abc70cb939
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoDeclarationHandler.cs
@@ -0,0 +1,109 @@
+// 
+// GotoDeclarationHandler.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Ide;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using System.Threading;
+using System;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp.Features.GotoDefinition;
+using Mono.Posix;
+using MonoDevelop.Ide.TypeSystem;
+using System.Collections.Generic;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class GotoDeclarationHandler : CommandHandler
+	{
+		static GotoDeclarationHandler ()
+		{
+			GoToDefinitionService.TryNavigateToSymbol = delegate(ISymbol symbol, Microsoft.CodeAnalysis.Project project, bool usePreviewTab) {
+				IdeApp.ProjectOperations.JumpToDeclaration (symbol, TypeSystemService.GetMonoProject (project));
+				return true;
+			};
+
+			GoToDefinitionService.TryNavigateToSpan = delegate(Workspace workspace, DocumentId documentId, Microsoft.CodeAnalysis.Text.TextSpan textSpan, bool usePreviewTab) {
+				var project = workspace.CurrentSolution.GetProject (documentId.ProjectId);
+				if (project == null)
+					return false;
+
+				IdeApp.Workbench.OpenDocument (new FileOpenInformation (project.GetDocument (documentId).FilePath, TypeSystemService.GetMonoProject (project)) {
+					Offset = textSpan.Start
+				});
+				return true;
+			};
+
+			GoToDefinitionService.DisplayMultiple = delegate(IEnumerable<Tuple<Solution, ISymbol, Location>> list) {
+				using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+					foreach (var part in list)
+						monitor.ReportResult (GetJumpTypePartSearchResult (part.Item2, part.Item3));
+				}
+			};
+		}
+
+		static MonoDevelop.Ide.FindInFiles.SearchResult GetJumpTypePartSearchResult (Microsoft.CodeAnalysis.ISymbol part, Microsoft.CodeAnalysis.Location location)
+		{
+			var provider = new MonoDevelop.Ide.FindInFiles.FileProvider (location.SourceTree.FilePath);
+			var doc = TextEditorFactory.CreateNewDocument ();
+			doc.Text = provider.ReadString ();
+			int position = location.SourceSpan.Start;
+			while (position + part.Name.Length < doc.Length) {
+				if (doc.GetTextAt (position, part.Name.Length) == part.Name)
+					break;
+				position++;
+			}
+			return new MonoDevelop.Ide.FindInFiles.SearchResult (provider, position, part.Name.Length);
+		}
+
+		protected override void Run (object data)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			Run (doc);
+		}
+
+		public static void Run (MonoDevelop.Ide.Gui.Document doc)
+		{
+			GoToDefinitionService.TryGoToDefinition (doc.AnalysisDocument, doc.Editor.CaretOffset, default(CancellationToken));
+		}
+		
+		public static void JumpToDeclaration (MonoDevelop.Ide.Gui.Document doc, RefactoringSymbolInfo info)
+		{
+			if (info.Symbol != null)
+				IdeApp.ProjectOperations.JumpToDeclaration (info.Symbol, doc.Project);
+			if (info.CandidateSymbols.Length > 0)
+				IdeApp.ProjectOperations.JumpToDeclaration (info.CandidateSymbols[0], doc.Project);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs
index 17de3d3aaa..20374b3452 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs
@@ -1,76 +1,91 @@
-// 
-// HelperMethods.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2011 Xamarin Inc.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Refactoring;
-
-namespace MonoDevelop.CSharp.Refactoring
-{
-	static class HelperMethods
-	{
-		public static TextReplaceChange GetRemoveNodeChange (this TextEditorData editor, AstNode n)
-		{
-			var change = new TextReplaceChange ();
-			change.FileName = editor.FileName;
-			change.Offset = editor.LocationToOffset (n.StartLocation);
-			change.RemovedChars = editor.LocationToOffset (n.EndLocation) - change.Offset;
-			
-			// remove EOL, when line is empty
-			var line = editor.GetLineByOffset (change.Offset);
-			if (line != null && line.Length == change.RemovedChars)
-				change.RemovedChars += line.DelimiterLength;
-			return change;
-		}
-
-		public static ICSharpCode.NRefactory.CSharp.TextEditorOptions CreateNRefactoryTextEditorOptions (this TextEditorData doc)
-		{
-			return new ICSharpCode.NRefactory.CSharp.TextEditorOptions () {
-				TabsToSpaces = doc.TabsToSpaces,
-				TabSize = doc.Options.TabSize,
-				IndentSize = doc.Options.IndentationSize,
-				ContinuationIndent = doc.Options.IndentationSize,
-				LabelIndent = -doc.Options.IndentationSize,
-				EolMarker = doc.EolMarker,
-				IndentBlankLines = doc.Options.IndentStyle != IndentStyle.Virtual,
-				WrapLineLength = doc.Options.RulerColumn
-			};
-		}
-
-		public static void RemoveNode (this TextEditorData editor, AstNode n)
-		{
-			var change = editor.GetRemoveNodeChange (n);
-			editor.Remove (change.Offset, change.RemovedChars);
-		}
-		public static void Replace (this TextEditorData editor, AstNode n, AstNode replaceWith)
-		{
-			var change = editor.GetRemoveNodeChange (n);
-			editor.Replace (change.Offset, change.RemovedChars, replaceWith.ToString ());
-		}
-	}
-}
-
+//// 
+//// HelperMethods.cs
+////  
+//// Author:
+////       Mike Krüger <mkrueger@xamarin.com>
+//// 
+//// Copyright (c) 2011 Xamarin Inc.
+//// 
+//// Permission is hereby granted, free of charge, to any person obtaining a copy
+//// of this software and associated documentation files (the "Software"), to deal
+//// in the Software without restriction, including without limitation the rights
+//// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//// copies of the Software, and to permit persons to whom the Software is
+//// furnished to do so, subject to the following conditions:
+//// 
+//// The above copyright notice and this permission notice shall be included in
+//// all copies or substantial portions of the Software.
+//// 
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//// THE SOFTWARE.
+//using System;
+//using ICSharpCode.NRefactory.CSharp;
+//using MonoDevelop.Ide.Gui;
+//using MonoDevelop.Refactoring;
+//using MonoDevelop.Ide.Editor;
+//
+//namespace MonoDevelop.CSharp.Refactoring
+//{
+//	static class HelperMethods
+//	{
+//		public static TextReplaceChange GetRemoveNodeChange (this IReadonlyTextDocument editor, AstNode n)
+//		{
+//			var change = new TextReplaceChange ();
+//			change.FileName = editor.FileName;
+//			change.Offset = editor.LocationToOffset (n.StartLocation);
+//			change.RemovedChars = editor.LocationToOffset (n.EndLocation) - change.Offset;
+//			
+//			// remove EOL, when line is empty
+//			var line = editor.GetLineByOffset (change.Offset);
+//			if (line != null && line.Length == change.RemovedChars)
+//				change.RemovedChars += line.DelimiterLength;
+//			return change;
+//		}
+//
+//		public static ICSharpCode.NRefactory.CSharp.TextEditorOptions CreateNRefactoryTextEditorOptions (this IReadonlyTextDocument doc, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy policy, MonoDevelop.Ide.Gui.Content.TextStylePolicy textPolicy)
+//		{
+//			return new ICSharpCode.NRefactory.CSharp.TextEditorOptions () {
+//				TabsToSpaces = textPolicy.TabsToSpaces,
+//				TabSize = textPolicy.TabWidth,
+//				IndentSize = textPolicy.IndentWidth,
+//				ContinuationIndent = textPolicy.IndentWidth,
+//				LabelIndent = -textPolicy.IndentWidth,
+//				EolMarker = doc.GetEolMarker (),
+//				IndentBlankLines = DefaultSourceEditorOptions.Instance.IndentStyle != IndentStyle.Virtual,
+//				WrapLineLength = DefaultSourceEditorOptions.Instance.RulerColumn
+//			};
+//		}
+//
+//		public static ICSharpCode.NRefactory.CSharp.TextEditorOptions CreateNRefactoryTextEditorOptions (this TextEditor doc)
+//		{
+//			return new ICSharpCode.NRefactory.CSharp.TextEditorOptions () {
+//				TabsToSpaces = doc.Options.TabsToSpaces,
+//				TabSize = doc.Options.TabSize,
+//				IndentSize = doc.Options.IndentationSize,
+//				ContinuationIndent = doc.Options.IndentationSize,
+//				LabelIndent = -doc.Options.IndentationSize,
+//				EolMarker = doc.EolMarker,
+//				IndentBlankLines = doc.Options.IndentStyle != IndentStyle.Virtual,
+//				WrapLineLength = doc.Options.RulerColumn
+//			};
+//		}
+//
+//		public static void RemoveNode (this ITextDocument editor, AstNode n)
+//		{
+//			var change = editor.GetRemoveNodeChange (n);
+//			editor.RemoveText (change.Offset, change.RemovedChars);
+//		}
+//
+//		public static void Replace (this ITextDocument editor, AstNode n, AstNode replaceWith)
+//		{
+//			var change = editor.GetRemoveNodeChange (n);
+//			editor.ReplaceText (change.Offset, change.RemovedChars, replaceWith.ToString ());
+//		}
+//	}
+//}
+//
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RefactoryCommands.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RefactoryCommands.cs
new file mode 100644
index 0000000000..db00f7d3c4
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RefactoryCommands.cs
@@ -0,0 +1,229 @@
+//
+// RefactoryCommands.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeActions;
+using MonoDevelop.CodeIssues;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Refactoring;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	sealed class CurrentRefactoryOperationsHandler : CommandHandler
+	{
+		protected override void Run (object dataItem)
+		{
+			var del = (Action) dataItem;
+			if (del != null)
+				del ();
+		}
+
+		static CommandInfoSet CreateFixMenu (TextEditor editor, DocumentContext ctx, CodeActionContainer container)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (ctx == null)
+				throw new ArgumentNullException ("ctx");
+			if (container == null)
+				throw new ArgumentNullException ("container");
+			var result = new CommandInfoSet ();
+			result.Text = GettextCatalog.GetString ("Fix");
+			foreach (var diagnostic in container.CodeFixActions) {
+				var info = new CommandInfo (diagnostic.CodeAction.Title);
+				result.CommandInfos.Add (info, new Action (new CodeActionEditorExtension.ContextActionRunner (diagnostic.CodeAction, editor, ctx).Run));
+			}
+			if (result.CommandInfos.Count == 0)
+				return result;
+			bool firstDiagnosticOption = true;
+			foreach (var fix in container.DiagnosticsAtCaret) {
+
+				var inspector = BuiltInCodeDiagnosticProvider.GetCodeDiagnosticDescriptor (fix.Id);
+				if (inspector == null)
+					continue;
+
+				if (firstDiagnosticOption) {
+					result.CommandInfos.AddSeparator ();
+					firstDiagnosticOption = false;
+				}
+
+				var label = GettextCatalog.GetString ("_Options for \"{0}\"", fix.GetMessage ());
+				var subMenu = new CommandInfoSet ();
+				subMenu.Text = label;
+
+//				if (inspector.CanSuppressWithAttribute) {
+//					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Suppress with attribute"),
+//						delegate {
+//							
+//							inspector.SuppressWithAttribute (Editor, DocumentContext, GetTextSpan (fix.Item2)); 
+//						});
+//					subMenu.Add (menuItem);
+//				}
+
+				if (inspector.CanDisableWithPragma) {
+					var info = new CommandInfo (GettextCatalog.GetString ("_Suppress with #pragma"));
+					subMenu.CommandInfos.Add (info, new Action (() => inspector.DisableWithPragma (editor, ctx, fix.Location.SourceSpan)));
+				}
+
+				var configInfo = new CommandInfo (GettextCatalog.GetString ("_Configure Rule"));
+				subMenu.CommandInfos.Add (configInfo, new Action (() => {
+					IdeApp.Workbench.ShowGlobalPreferencesDialog (null, "C#", dialog => {
+						var panel = dialog.GetPanel<CodeIssuePanel> ("C#");
+						if (panel == null)
+							return;
+						panel.Widget.SelectCodeIssue (inspector.IdString);
+					});
+				}));
+
+				result.CommandInfos.Add (subMenu);
+			}
+
+			return result;
+		}
+
+		protected override void Update (CommandArrayInfo ainfo)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null)
+				return;
+			var semanticModel = doc.ParsedDocument.GetAst<SemanticModel> ();
+			if (semanticModel == null)
+				return;
+			var info = RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor.CaretOffset).Result;
+			bool added = false;
+
+			var ext = doc.GetContent<CodeActionEditorExtension> ();
+
+			if (ext != null && !ext.GetCurrentFixes ().IsEmpty) {
+				var fixMenu = CreateFixMenu (doc.Editor, doc, ext.GetCurrentFixes ());
+				if (fixMenu.CommandInfos.Count > 0) {
+					ainfo.Add (fixMenu, null);
+					added = true;
+				}
+			}
+			var ciset = new CommandInfoSet ();
+			ciset.Text = GettextCatalog.GetString ("Refactor");
+
+			bool canRename = RenameHandler.CanRename (info.Symbol ?? info.DeclaredSymbol);
+			if (canRename) {
+				ciset.CommandInfos.Add (IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.EditCommands.Rename), new Action (delegate {
+					new MonoDevelop.Refactoring.Rename.RenameRefactoring ().Rename (info.Symbol ?? info.DeclaredSymbol);
+				}));
+				added = true;
+			}
+			bool first = true;
+			if (ext != null) {
+				foreach (var fix in ext.GetCurrentFixes ().CodeRefactoringActions) {
+					if (added & first && ciset.CommandInfos.Count > 0)
+						ciset.CommandInfos.AddSeparator ();
+					var info2 = new CommandInfo (fix.CodeAction.Title);
+					ciset.CommandInfos.Add (info2, new Action (new CodeActionEditorExtension.ContextActionRunner (fix.CodeAction, doc.Editor, doc).Run));
+					added = true;
+					first = false;
+				}
+			}
+
+			if (ciset.CommandInfos.Count > 0) {
+				ainfo.Add (ciset, null);
+				added = true;
+			}
+
+			if (IdeApp.ProjectOperations.CanJumpToDeclaration (info.Symbol) || info.Symbol == null && IdeApp.ProjectOperations.CanJumpToDeclaration (info.CandidateSymbols.FirstOrDefault ())) {
+				var type = (info.Symbol ?? info.CandidateSymbols.FirstOrDefault ()) as INamedTypeSymbol;
+				if (type != null && type.Locations.Length > 1) {
+					var declSet = new CommandInfoSet ();
+					declSet.Text = GettextCatalog.GetString ("_Go to Declaration");
+					foreach (var part in type.Locations) {
+						var loc = part.GetLineSpan ();
+						declSet.CommandInfos.Add (string.Format (GettextCatalog.GetString ("{0}, Line {1}"), FormatFileName (part.SourceTree.FilePath), loc.StartLinePosition.Line + 1), new Action (() => IdeApp.ProjectOperations.JumpTo (type, part, doc.Project)));
+					}
+					ainfo.Add (declSet);
+				} else {
+					ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.GotoDeclaration), new Action (() => GotoDeclarationHandler.Run (doc)));
+				}
+				added = true;
+			}
+
+
+			if (info.DeclaredSymbol != null && GotoBaseDeclarationHandler.CanGotoBase (info.DeclaredSymbol)) {
+				ainfo.Add (GotoBaseDeclarationHandler.GetDescription (info.DeclaredSymbol), new Action (() => GotoBaseDeclarationHandler.GotoBase (doc, info.DeclaredSymbol)));
+				added = true;
+			}
+
+			var sym = info.Symbol ?? info.DeclaredSymbol;
+			if (doc.HasProject && sym != null) {
+				ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindReferences), new System.Action (() => FindReferencesHandler.FindRefs (sym)));
+				try {
+					if (Microsoft.CodeAnalysis.FindSymbols.SymbolFinder.FindSimilarSymbols (sym, semanticModel.Compilation).Count () > 1)
+						ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindAllReferences), new System.Action (() => FindAllReferencesHandler.FindRefs (info.Symbol, semanticModel.Compilation)));
+				} catch (Exception) {
+					// silently ignore roslyn bug.
+				}
+			}
+			added = true;
+
+			if (info.DeclaredSymbol != null) {
+				string description;
+				if (FindDerivedSymbolsHandler.CanFindDerivedSymbols (info.DeclaredSymbol, out description)) {
+					ainfo.Add (description, new Action (() => FindDerivedSymbolsHandler.FindDerivedSymbols (info.DeclaredSymbol)));
+					added = true;
+				}
+
+				if (FindMemberOverloadsHandler.CanFindMemberOverloads (info.DeclaredSymbol, out description)) {
+					ainfo.Add (description, new Action (() => FindMemberOverloadsHandler.FindOverloads (info.DeclaredSymbol)));
+					added = true;
+				}
+
+				if (FindExtensionMethodHandler.CanFindExtensionMethods (info.DeclaredSymbol, out description)) {
+					ainfo.Add (description, new Action (() => FindExtensionMethodHandler.FindExtensionMethods (info.DeclaredSymbol)));
+					added = true;
+				}
+			}
+		}
+
+		static string FormatFileName (string fileName)
+		{
+			if (fileName == null)
+				return null;
+			char[] seperators = { System.IO.Path.DirectorySeparatorChar, System.IO.Path.AltDirectorySeparatorChar };
+			int idx = fileName.LastIndexOfAny (seperators);
+			if (idx > 0) 
+				idx = fileName.LastIndexOfAny (seperators, idx - 1);
+			if (idx > 0) 
+				return "..." + fileName.Substring (idx);
+			return fileName;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RenameHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RenameHandler.cs
new file mode 100644
index 0000000000..7f38f5d085
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RenameHandler.cs
@@ -0,0 +1,96 @@
+// 
+// RenameHandler.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Refactoring.Rename;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class RenameHandler : CommandHandler
+	{
+		public void UpdateCommandInfo (CommandInfo ci)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			if (doc.ParsedDocument == null || doc.ParsedDocument.GetAst<SemanticModel> () == null) {
+				ci.Enabled = false;
+			}
+			var info = RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor.CaretOffset).Result;
+			var sym = info.DeclaredSymbol ?? info.Symbol;
+			if (!CanRename (sym))
+				ci.Bypass = true;
+		}
+
+		internal static bool CanRename (ISymbol symbol)
+		{
+			if (symbol == null || symbol.IsDefinedInMetadata ())
+				return false;
+			switch (symbol.Kind) {
+			case SymbolKind.Local:
+			case SymbolKind.Parameter:
+			case SymbolKind.NamedType:
+			case SymbolKind.Namespace:
+			case SymbolKind.Method:
+			case SymbolKind.Field:
+			case SymbolKind.Property:
+			case SymbolKind.Event:
+			case SymbolKind.Label:
+			case SymbolKind.TypeParameter:
+			case SymbolKind.RangeVariable:
+				return true;
+			}
+			return false;
+		}
+		
+		protected override void Run (object data)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			Run (doc.Editor, doc);
+		}
+
+		internal void Run (TextEditor editor, DocumentContext ctx)
+		{
+			var info = RefactoringSymbolInfo.GetSymbolInfoAsync (ctx, editor.CaretOffset).Result;
+			var sym = info.DeclaredSymbol ?? info.Symbol;
+			if (!CanRename (sym))
+				return;
+			new RenameRefactoring ().Rename (sym);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/DebuggerExpressionResolver.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/DebuggerExpressionResolver.cs
new file mode 100644
index 0000000000..e34bf4868d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/DebuggerExpressionResolver.cs
@@ -0,0 +1,170 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+//
+// DebuggerExpressionResolver.cs
+//
+// Author:
+//       David Karlaš <david.karlas@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Debugger;
+
+namespace MonoDevelop.CSharp.Resolver
+{
+	public static class DebuggerExpressionResolver
+	{
+		public static async Task<DebugDataTipInfo> ResolveAsync (IReadonlyTextDocument editor, DocumentContext document, int offset, CancellationToken cancellationToken)
+		{
+			var analysisDocument = document.AnalysisDocument;
+			DebugDataTipInfo result;
+			CompilationUnitSyntax compilationUnit = null;
+			if (analysisDocument == null) {
+				compilationUnit = SyntaxFactory.ParseCompilationUnit (editor.Text);
+				result = GetInfo (compilationUnit, null, offset, default(CancellationToken));
+			} else {
+				compilationUnit = await analysisDocument.GetCSharpSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+				var semantic = document.ParsedDocument?.GetAst<SemanticModel> ();
+				if (semantic == null) {
+					semantic = await analysisDocument.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+				}
+				result = GetInfo (compilationUnit, semantic, offset, default(CancellationToken));
+			}
+			if (result.IsDefault || !result.Span.Contains(offset)) {
+				return new DebugDataTipInfo (result.Span, null);
+			} else if (result.Text == null) {
+				return new DebugDataTipInfo (result.Span, compilationUnit.GetText ().ToString (result.Span));
+			} else {
+				return result;
+			}
+		}
+
+		static DebugDataTipInfo GetInfo (CompilationUnitSyntax root, SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var token = root.FindToken (position);
+			string textOpt = null;
+
+			var expression = token.Parent as ExpressionSyntax;
+			if (expression == null) {
+				if (Microsoft.CodeAnalysis.CSharpExtensions.IsKind (token, SyntaxKind.IdentifierToken)) {
+					if (token.Parent is MethodDeclarationSyntax) {
+						return default(DebugDataTipInfo);
+					}
+					if (semanticModel != null) {
+						if (token.Parent is PropertyDeclarationSyntax) {
+							var propertySymbol = semanticModel.GetDeclaredSymbol ((PropertyDeclarationSyntax)token.Parent);
+							if (propertySymbol.IsStatic) {
+								textOpt = propertySymbol.ContainingType.GetFullName () + "." + propertySymbol.Name;
+							}
+						} else if (token.GetAncestor<FieldDeclarationSyntax> () != null) {
+							var fieldSymbol = semanticModel.GetDeclaredSymbol (token.GetAncestor<VariableDeclaratorSyntax> ());
+							if (fieldSymbol.IsStatic) {
+								textOpt = fieldSymbol.ContainingType.GetFullName () + "." + fieldSymbol.Name;
+							}
+						}
+					}
+
+					return new DebugDataTipInfo (token.Span, text: textOpt);
+				} else {
+					return default(DebugDataTipInfo);
+				}
+			}
+
+			if (expression.IsAnyLiteralExpression ()) {
+				// If the user hovers over a literal, give them a DataTip for the type of the
+				// literal they're hovering over.
+				// Partial semantics should always be sufficient because the (unconverted) type
+				// of a literal can always easily be determined.
+				var type = semanticModel?.GetTypeInfo (expression, cancellationToken).Type;
+				return type == null
+					? default(DebugDataTipInfo)
+						: new DebugDataTipInfo (expression.Span, type.GetFullName ());
+			}

+

+			// Check if we are invoking method and if we do return null so we don't invoke it

+			if (expression.Parent is InvocationExpressionSyntax ||
+				(semanticModel != null &&

+				  expression.Parent is MemberAccessExpressionSyntax &&

+				  expression.Parent.Parent is InvocationExpressionSyntax &&

+				  semanticModel.GetSymbolInfo (token).Symbol is IMethodSymbol))

+			{
+				return default(DebugDataTipInfo);
+			}
+
+			if (expression.IsRightSideOfDotOrArrow ()) {
+				var curr = expression;
+				while (true) {
+					var conditionalAccess = curr.GetParentConditionalAccessExpression ();
+					if (conditionalAccess == null) {
+						break;
+					}
+
+					curr = conditionalAccess;
+				}
+
+				if (curr == expression) {
+					// NB: Parent.Span, not Span as below.
+					return new DebugDataTipInfo (expression.Parent.Span, text: null);
+				}
+
+				// NOTE: There may not be an ExpressionSyntax corresponding to the range we want.
+				// For example, for input a?.$$B?.C, we want span [|a?.B|]?.C.
+				return new DebugDataTipInfo (TextSpan.FromBounds (curr.SpanStart, expression.Span.End), text: null);
+			}
+
+			var typeSyntax = expression as TypeSyntax;
+			if (typeSyntax != null && typeSyntax.IsVar) {
+				// If the user is hovering over 'var', then pass back the full type name that 'var'
+				// binds to.
+				var type = semanticModel?.GetTypeInfo (typeSyntax, cancellationToken).Type;
+				if (type != null) {
+					textOpt = type.GetFullName ();
+				}
+			}
+
+			if (semanticModel != null) {
+				if (expression is IdentifierNameSyntax) {
+					if (expression.Parent is ObjectCreationExpressionSyntax) {
+						textOpt = ((INamedTypeSymbol)semanticModel.GetSymbolInfo (expression).Symbol).GetFullName ();
+					} else if (expression.Parent is AssignmentExpressionSyntax && expression.Parent.Parent is InitializerExpressionSyntax) {
+						var variable = expression.GetAncestor<VariableDeclaratorSyntax> ();
+						if (variable != null) {
+							textOpt = variable.Identifier.Text + "." + ((IdentifierNameSyntax)expression).Identifier.Text;
+						}
+					}
+
+				}
+			}
+			return new DebugDataTipInfo (expression.Span, textOpt);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs
index e10e928eb4..9f9662b968 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs
@@ -41,35 +41,30 @@ using MonoDevelop.Ide.CodeTemplates;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Refactoring;
 using MonoDevelop.CSharp.Parser;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Completion;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Components.PropertyGrid.PropertyEditors;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Options;
 
 namespace MonoDevelop.CSharp
 {
 	static class HelperMethods
 	{
-		public static void SetText (this CompletionData data, string text)
-		{
-			if (data is CompletionData) {
-				((CompletionData)data).CompletionText = text;
-			} else if (data is IEntityCompletionData) {
-				((IEntityCompletionData)data).CompletionText = text;
-			} else {
-				System.Console.WriteLine("Unknown completion data:" + data);
-			}
-		}
+//		public static void SetText (this CompletionData data, string text)
+//		{
+//			if (data is CompletionData) {
+//				((CompletionData)data).CompletionText = text;
+//			} else if (data is IEntityCompletionData) {
+//				((IEntityCompletionData)data).CompletionText = text;
+//			} else {
+//				System.Console.WriteLine("Unknown completion data:" + data);
+//			}
+//		}
 		
-		public static ICSharpCode.NRefactory.CSharp.SyntaxTree Parse (this ICSharpCode.NRefactory.CSharp.CSharpParser parser, TextEditorData data)
-		{
-			using (var stream = data.OpenStream ()) {
-				return parser.Parse (stream, data.Document.FileName);
-			}
-		}
+//		public static ICSharpCode.NRefactory.CSharp.SyntaxTree Parse (this ICSharpCode.NRefactory.CSharp.CSharpParser parser, IReadonlyTextDocument data)
+//		{
+//			return parser.Parse (new ICSharpCode.NRefactory.Editor.StringTextSource (data.Text), data.FileName);
+//		}
 		
 //		public static AstNode ParseSnippet (this ICSharpCode.NRefactory.CSharp.CSharpParser parser, TextEditorData data)
 //		{
@@ -90,7 +85,7 @@ namespace MonoDevelop.CSharp
 //			}
 //		}
 		
-		internal static MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy GetFormattingPolicy (this MonoDevelop.Ide.Gui.Document doc)
+		internal static MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy GetFormattingPolicy (this DocumentContext doc)
 		{
 			var policyParent = doc.Project != null ? doc.Project.Policies : null;
 			var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
@@ -98,43 +93,45 @@ namespace MonoDevelop.CSharp
 			return codePolicy;
 		}
 
-		public static CSharpFormattingOptions GetFormattingOptions (this MonoDevelop.Ide.Gui.Document doc)
+		public static OptionSet GetFormattingOptions (this DocumentContext doc)
 		{
-			return GetFormattingPolicy (doc).CreateOptions ();
+			return GetFormattingOptions (doc.Project);
 		}
 		
-		public static CSharpFormattingOptions GetFormattingOptions (this MonoDevelop.Projects.Project project)
+		public static OptionSet GetFormattingOptions (this MonoDevelop.Projects.Project project)
 		{
 			var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
 			var codePolicy = project != null ? project.Policies.Get<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types) :
 				MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
-			return codePolicy.CreateOptions ();
+			var textPolicy = project != null ? project.Policies.Get<TextStylePolicy> (types) :
+				MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> (types);
+			return codePolicy.CreateOptions (textPolicy);
 		}
 		
-		public static bool TryResolveAt (this Document doc, DocumentLocation loc, out ResolveResult result, out AstNode node)
-		{
-			if (doc == null)

-				throw new ArgumentNullException ("doc");
-			result = null;
-			node = null;
-			var parsedDocument = doc.ParsedDocument;
-			if (parsedDocument == null)
-				return false;
-
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-			
-			if (unit == null || parsedFile == null)
-				return false;
-			try {
-				result = ResolveAtLocation.Resolve (new Lazy<ICompilation>(() => doc.Compilation), parsedFile, unit, loc, out node);
-				if (result == null || node is Statement)
-					return false;
-			} catch (Exception e) {
-				Console.WriteLine ("Got resolver exception:" + e);
-				return false;
-			}
-			return true;
-		}
+//		public static bool TryResolveAt (this DocumentContext documentContext, DocumentLocation loc, out ResolveResult result, out AstNode node)
+//		{
+//			if (documentContext == null)

+//				throw new ArgumentNullException ("documentContext");
+//			result = null;
+//			node = null;
+//			var parsedDocument = documentContext.ParsedDocument;
+//			if (parsedDocument == null)
+//				return false;
+//
+//			var unit = parsedDocument.GetAst<SyntaxTree> ();
+//			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
+//			
+//			if (unit == null || parsedFile == null)
+//				return false;
+//			try {
+//				result = ResolveAtLocation.Resolve (new Lazy<ICompilation>(() => documentContext.Compilation), parsedFile, unit, loc, out node);
+//				if (result == null || node is Statement)
+//					return false;
+//			} catch (Exception e) {
+//				Console.WriteLine ("Got resolver exception:" + e);
+//				return false;
+//			}
+//			return true;
+//		}
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs
index c17bb0fd7b..97484f3c25 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs
@@ -1,21 +1,21 @@
-// 
+//
 // TextEditorResolverProvider.cs
-//  
+//
 // Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
+//       David Karlaš <david.karlas@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,290 +23,62 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System;
 using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Core;
-using Mono.TextEditor;
-using System.Text;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
 using System.Linq;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using System.Threading;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
 
 namespace MonoDevelop.CSharp.Resolver
 {
 	class TextEditorResolverProvider : ITextEditorResolverProvider
 	{
 		#region ITextEditorResolverProvider implementation
-		
-		public string GetExpression (Mono.TextEditor.TextEditorData data, int offset)
-		{
-			if (offset < 0)
-				return "";
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null)
-				return "";
-			var loc = RefactoringService.GetCorrectResolveLocation (doc, data.OffsetToLocation (offset));
-			var unit = doc.ParsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			var node       = unit.GetNodeAt<Expression> (loc.Line, loc.Column);
-			if (unit == null || parsedFile == null || node == null)
-				return "";
-			
-			return data.GetTextBetween (node.StartLocation, node.EndLocation);
-		}
-		
-		
-		public ResolveResult GetLanguageItem (MonoDevelop.Ide.Gui.Document doc, int offset, out DomRegion expressionRegion)
-		{
-			if (offset < 0) {
-				expressionRegion = DomRegion.Empty;
-				return null;
-			}
-			var loc = RefactoringService.GetCorrectResolveLocation (doc, doc.Editor.OffsetToLocation (offset));
-			ResolveResult result;
-			AstNode node;
 
-			if (!doc.TryResolveAt (loc, out result, out node)) {
-				expressionRegion = DomRegion.Empty;
-				return null;
-			}
-			expressionRegion = new DomRegion (node.StartLocation, node.EndLocation);
-			return result;
-		}
-		
-		public ResolveResult GetLanguageItem (MonoDevelop.Ide.Gui.Document doc, int offset, string expression)
+		public ISymbol GetLanguageItem (MonoDevelop.Ide.Gui.Document document, int offset, out DocumentRegion expressionRegion)
 		{
-			if (offset < 0) {
-				return null;
-			}
-
-			var parsedDocument = doc.ParsedDocument;
+			expressionRegion = DocumentRegion.Empty;
+			var parsedDocument = document.ParsedDocument;
 			if (parsedDocument == null)
 				return null;
-			var data = doc.Editor;
-			var loc = data.OffsetToLocation (offset);
-
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-			
-			if (unit == null || parsedFile == null) {
+			var model = parsedDocument.GetAst<SemanticModel> ();
+			if (model == null)
 				return null;
+			foreach (var symbol in model.LookupSymbols (offset)) {
+				var firstDeclaration = symbol.DeclaringSyntaxReferences.FirstOrDefault ();
+				if (firstDeclaration != null) {
+					expressionRegion = new DocumentRegion (
+						document.Editor.OffsetToLocation (firstDeclaration.Span.Start),
+						document.Editor.OffsetToLocation (firstDeclaration.Span.End));
+				}
+				return symbol;
 			}
-			var node = unit.GetNodeAt (loc);
-			if (node == null) {
-				return null;
-			}
-			
-			var resolver = new CSharpAstResolver (doc.Compilation, unit, parsedFile);
-			resolver.ApplyNavigator (new NodeListResolveVisitorNavigator (node), CancellationToken.None);
-			var state = resolver.GetResolverStateBefore (node, CancellationToken.None);
-
-			var list = new List<IType> ();
-			int indexOf = expression.IndexOf ('`');
-			if (indexOf != -1) {
-				var intType = new PrimitiveType ("int").ToTypeReference ().Resolve (doc.Compilation);
-				var num = expression.Substring (indexOf + 1);
-				int number = int.Parse (num);
-				for (int i = 0; i < number; i++)
-					list.Add (intType);
-				expression = expression.Remove (indexOf);
-			}
-			return state.LookupSimpleNameOrTypeName (expression, list, NameLookupMode.Expression);
-		}
-		
-		
-		static string paramStr = GettextCatalog.GetString ("Parameter");
-		static string localStr = GettextCatalog.GetString ("Local variable");
-		static string methodStr = GettextCatalog.GetString ("Method");
-
-		static string namespaceStr = GettextCatalog.GetString ("Namespace");		
-		static string GetString (IType type)
-		{
-			switch (type.Kind) {
-			case TypeKind.Class:
-				return GettextCatalog.GetString ("Class");
-			case TypeKind.Interface:
-				return GettextCatalog.GetString ("Interface");
-			case TypeKind.Struct:
-				return GettextCatalog.GetString ("Struct");
-			case TypeKind.Delegate:
-				return GettextCatalog.GetString ("Delegate");
-			case TypeKind.Enum:
-				return GettextCatalog.GetString ("Enum");
-			
-			case TypeKind.Dynamic:
-				return GettextCatalog.GetString ("Dynamic");
-			case TypeKind.TypeParameter:
-				return GettextCatalog.GetString ("Type parameter");
-			
-			case TypeKind.Array:
-				return GettextCatalog.GetString ("Array");
-			case TypeKind.Pointer:
-				return GettextCatalog.GetString ("Pointer");
-			}
-			
 			return null;
 		}
-		
-		static string GetString (IMember member)
-		{
-			switch (member.SymbolKind) {
-			case SymbolKind.Field:
-				var field = member as IField;
-				if (field.IsConst)
-					return GettextCatalog.GetString ("Constant");
-				return GettextCatalog.GetString ("Field");
-			case SymbolKind.Property:
-				return GettextCatalog.GetString ("Property");
-			case SymbolKind.Indexer:
-				return GettextCatalog.GetString ("Indexer");
-				
-			case SymbolKind.Event:
-				return GettextCatalog.GetString ("Event");
-			}
-			return GettextCatalog.GetString ("Member");
-		}
-		
-		string GetConst (object obj)
-		{
-			if (obj is string)
-				return '"' + obj.ToString () + '"';
-			if (obj is char)
-				return "'" + obj + "'";
-			return obj.ToString ();
-		}
-		static CSharpAmbience ambience = new CSharpAmbience ();
 
-		static TypeSystemAstBuilder CreateBuilder (MonoDevelop.Ide.Gui.Document doc, int offset, ICompilation compilation)
+		public ISymbol GetLanguageItem (MonoDevelop.Ide.Gui.Document document, int offset, string identifier)
 		{
-			var ctx = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			var state = ctx.GetResolver (doc.Compilation, doc.Editor.OffsetToLocation (offset));
-			var builder = new TypeSystemAstBuilder (state);
-			builder.AddAnnotations = true;
-			var dt = state.CurrentTypeDefinition;
-			var declaring = dt != null ? dt.DeclaringTypeDefinition : null;
-			if (declaring != null) {
-				while (dt != null) {
-					if (dt.Equals (declaring)) {
-						builder.AlwaysUseShortTypeNames = true;
-						break;
-					}
-					dt = dt.DeclaringTypeDefinition;
-				}
-			}
-			return builder;
-		}
+			if (document.ParsedDocument == null)
+				return null;
+			var model = document.ParsedDocument.GetAst<SemanticModel> ();
+			if (model == null)
+				return null;
 
-		internal static MonoDevelop.CSharp.Completion.MemberCompletionData.MyAmbience CreateAmbience (Document doc, int offset, ICompilation compilation)
-		{
-			return new MonoDevelop.CSharp.Completion.MemberCompletionData.MyAmbience (CreateBuilder (doc, offset, compilation));
-		}
+			int index = identifier.IndexOf ("`");
+			int arity = 0;
+			if (index != -1) {
+				arity = int.Parse (identifier.Substring (index + 1));
+				identifier = identifier.Remove (index);
+			}
 
-		public string CreateTooltip (MonoDevelop.Ide.Gui.Document doc, int offset, ResolveResult result, string errorInformations, Gdk.ModifierType modifierState)
-		{
-			try {
-				OutputSettings settings = new OutputSettings (OutputFlags.ClassBrowserEntries | OutputFlags.IncludeParameterName | OutputFlags.IncludeKeywords | OutputFlags.IncludeMarkup | OutputFlags.UseFullName);
-				// Approximate value for usual case
-				StringBuilder s = new StringBuilder (150);
-				string documentation = null;
-				if (result != null) {
-					if (result is UnknownIdentifierResolveResult) {
-						s.Append (String.Format (GettextCatalog.GetString ("Unresolved identifier '{0}'"), ((UnknownIdentifierResolveResult)result).Identifier));
-					} else if (result.IsError) {
-						s.Append (GettextCatalog.GetString ("Resolve error."));
-					} else if (result is LocalResolveResult) {
-						var lr = (LocalResolveResult)result;
-						s.Append ("<small><i>");
-						s.Append (lr.IsParameter ? paramStr : localStr);
-						s.Append ("</i></small>\n");
-						s.Append (ambience.GetString (lr.Variable.Type, settings));
-						s.Append (" ");
-						s.Append (lr.Variable.Name);
-					} else if (result is MethodGroupResolveResult) {
-						var mrr = (MethodGroupResolveResult)result;
-						s.Append ("<small><i>");
-						s.Append (methodStr);
-						s.Append ("</i></small>\n");
-						var allMethods = new List<IMethod> (mrr.Methods);
-						foreach (var l in mrr.GetExtensionMethods ()) {
-							allMethods.AddRange (l);
-						}
-						var method = allMethods.FirstOrDefault ();
-						if (method != null) {
-							s.Append (GLib.Markup.EscapeText (CreateAmbience (doc, offset, method.Compilation).ConvertEntity (method)));
-							if (allMethods.Count > 1) {
-								int overloadCount = allMethods.Count - 1;
-								s.Append (string.Format (GettextCatalog.GetPluralString (" (+{0} overload)", " (+{0} overloads)", overloadCount), overloadCount));
-							}
-							documentation = AmbienceService.GetSummaryMarkup (method);
-						}
-					} else if (result is MemberResolveResult) {
-						var member = ((MemberResolveResult)result).Member;
-						s.Append ("<small><i>");
-						s.Append (GetString (member));
-						s.Append ("</i></small>\n");
-						var field = member as IField;
-						if (field != null && field.IsConst) {
-							s.Append (GLib.Markup.EscapeText (CreateAmbience (doc, offset, field.Compilation).ConvertType (field.Type)));
-							s.Append (" ");
-							s.Append (field.Name);
-							s.Append (" = ");
-							s.Append (GetConst (field.ConstantValue));
-							s.Append (";");
-						} else {
-							s.Append (GLib.Markup.EscapeText (CreateAmbience (doc, offset, member.Compilation).ConvertEntity (member)));
-						}
-						documentation = AmbienceService.GetSummaryMarkup (member);
-					} else if (result is NamespaceResolveResult) {
-						s.Append ("<small><i>");
-						s.Append (namespaceStr);
-						s.Append ("</i></small>\n");
-						s.Append (ambience.GetString (((NamespaceResolveResult)result).NamespaceName, settings));
-					} else {
-						var tr = result;
-						var typeString = GetString (tr.Type);
-						if (!string.IsNullOrEmpty (typeString)) {
-							s.Append ("<small><i>");
-							s.Append (typeString);
-							s.Append ("</i></small>\n");
-						}
-						settings.OutputFlags |= OutputFlags.UseFullName;
-						s.Append (ambience.GetString (tr.Type, settings));
-						documentation = AmbienceService.GetSummaryMarkup (tr.Type.GetDefinition ());
-					}
-					
-					if (!string.IsNullOrEmpty (documentation)) {
-						s.Append ("\n<small>");
-						s.Append (documentation);
-						s.Append ("</small>");
-					}
+			foreach (var symbol in model.LookupSymbols (offset, name: identifier)) {
+				var typeSymbol = symbol as INamedTypeSymbol;
+				if (typeSymbol != null && (arity == 0 || arity == typeSymbol.Arity)) {
+					return symbol;
 				}
-				
-				if (!string.IsNullOrEmpty (errorInformations)) {
-					if (s.Length != 0)
-						s.Append ("\n\n");
-					s.Append ("<small>");
-					s.Append (errorInformations);
-					s.Append ("</small>");
-				}
-				return s.ToString ();
-			} catch (Exception e){
-				return e.ToString ();
 			}
+			return null;
 		}
-		
+
 		#endregion
 	}
 }
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs
index 619cb802d0..6dc8705134 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs
@@ -25,94 +25,70 @@
 //
 //
 using System;
-using Mono.TextEditor;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
-using Gtk;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using System.Threading;
-using System.Text;
 using MonoDevelop.Core;
-using System.Collections.Generic;
-using System.Linq;
-using MonoDevelop.CSharp.Resolver;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.CSharp.Completion;
 using MonoDevelop.Components;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
 using MonoDevelop.Projects;
 using Mono.Cecil.Cil;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using Gtk;
 
 namespace MonoDevelop.SourceEditor
 {
 	class LanguageItemTooltipProvider: TooltipProvider, IDisposable
 	{
-		public LanguageItemTooltipProvider ()
-		{
-		}
-
 		class ToolTipData
 		{
-			public SyntaxTree Unit;
-			public ResolveResult Result;
-			public AstNode Node;
-			public CSharpAstResolver Resolver;
+			public readonly SymbolInfo SymbolInfo;
+			public ISymbol Symbol { get { return SymbolInfo.Symbol; } }
+			public readonly SyntaxToken Token;
 
-			public ToolTipData (ICSharpCode.NRefactory.CSharp.SyntaxTree unit, ICSharpCode.NRefactory.Semantics.ResolveResult result, ICSharpCode.NRefactory.CSharp.AstNode node, CSharpAstResolver file)
+			public ToolTipData (SymbolInfo symbol, SyntaxToken token)
 			{
-				this.Unit = unit;
-				this.Result = result;
-				this.Node = node;
-				this.Resolver = file;
+				Token = token;
+				SymbolInfo = symbol;
+			}
+			
+			public override string ToString ()
+			{
+				return string.Format ("[ToolTipData: Symbol={0}, Token={1}]", Symbol, Token);
 			}
 		}
 
 		#region ITooltipProvider implementation 
-		
-		public override TooltipItem GetItem (Mono.TextEditor.TextEditor editor, int offset)
+		public override TooltipItem GetItem (TextEditor editor, DocumentContext ctx, int offset)
 		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.ParsedDocument == null)
+			if (ctx == null)
 				return null;
-			var unit = doc.ParsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
+			var analysisDocument = ctx.ParsedDocument;
+			if (analysisDocument == null)
 				return null;
-
-			var file = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (file == null)
+			var unit = analysisDocument.GetAst<SemanticModel> ();
+			if (unit == null)
 				return null;
 			
-			ResolveResult result;
-			AstNode node;
-			var loc = editor.OffsetToLocation (offset);
-			if (!doc.TryResolveAt (loc, out result, out node)) {
-				if (node is CSharpTokenNode) {
-					int startOffset2 = editor.LocationToOffset (node.StartLocation);
-					int endOffset2 = editor.LocationToOffset (node.EndLocation);
-
-					return new TooltipItem (new ToolTipData (unit, result, node, null), startOffset2, endOffset2 - startOffset2);
-				}
+			var root = unit.SyntaxTree.GetRoot ();
+			SyntaxToken token;
+			try {
+				token = root.FindToken (offset);
+			} catch (ArgumentOutOfRangeException) {
 				return null;
 			}
-			if (node == lastNode)
-				return lastResult;
-			var resolver = new CSharpAstResolver (doc.Compilation, unit, file);
-			resolver.ApplyNavigator (new NodeListResolveVisitorNavigator (node), CancellationToken.None);
-
-			var hoverNode = node.GetNodeAt (loc) ?? node;
-
-			int startOffset = editor.LocationToOffset (hoverNode.StartLocation);
-			int endOffset = editor.LocationToOffset (hoverNode.EndLocation);
-			return lastResult = new TooltipItem (new ToolTipData (unit, result, node, resolver), startOffset, endOffset - startOffset);
+			if (!token.Span.IntersectsWith (offset))
+				return null;
+			var symbolInfo = unit.GetSymbolInfo (token.Parent); 
+			return new TooltipItem (new ToolTipData (symbolInfo, token), token.Span.Start, token.Span.Length);
 		}
 		
-		AstNode lastNode = null;
 		static TooltipInformationWindow lastWindow = null;
-		TooltipItem lastResult;
 
 		static void DestroyLastTooltipWindow ()
 		{
@@ -127,21 +103,20 @@ namespace MonoDevelop.SourceEditor
 		public void Dispose ()
 		{
 			DestroyLastTooltipWindow ();
-			lastNode = null;
-			lastResult = null;
 		}
 
 		#endregion
 
-		protected override Gtk.Window CreateTooltipWindow (Mono.TextEditor.TextEditor editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)
+
+		public override Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Gdk.ModifierType modifierState)
 		{
-			var doc = IdeApp.Workbench.ActiveDocument;
+			var doc = ctx;
 			if (doc == null)
 				return null;
 
 			var titem = (ToolTipData)item.Item;
 
-			var tooltipInformation = CreateTooltip (titem, offset, null, modifierState);
+			var tooltipInformation = CreateTooltip (titem, editor, ctx, offset, modifierState);
 			if (tooltipInformation == null || string.IsNullOrEmpty (tooltipInformation.SignatureMarkup))
 				return null;
 
@@ -152,259 +127,192 @@ namespace MonoDevelop.SourceEditor
 			return result;
 		}
 
-		public override Gtk.Window ShowTooltipWindow (TextEditor editor, int offset, Gdk.ModifierType modifierState, int mouseX, int mouseY, TooltipItem item)
+		TooltipInformation CreateTooltip (ToolTipData data, TextEditor editor, DocumentContext doc, int offset, Gdk.ModifierType modifierState)
 		{
-			var titem = (ToolTipData)item.Item;
-			if (lastNode != null && lastWindow != null && lastWindow.IsRealized && titem.Node != null && lastNode == titem.Node)
-				return lastWindow;
-			
-			DestroyLastTooltipWindow ();
-
-			var tipWindow = CreateTooltipWindow (editor, offset, modifierState, item) as TooltipInformationWindow;
-			if (tipWindow == null)
-				return null;
-
-			var hoverNode = titem.Node.GetNodeAt (editor.OffsetToLocation (offset)) ?? titem.Node;
-			var p1 = editor.LocationToPoint (hoverNode.StartLocation);
-			var p2 = editor.LocationToPoint (hoverNode.EndLocation);
-			var positionWidget = editor.TextArea;
-			var caret = new Gdk.Rectangle ((int)p1.X - positionWidget.Allocation.X, (int)p2.Y - positionWidget.Allocation.Y, (int)(p2.X - p1.X), (int)editor.LineHeight);
-
-			tipWindow.ShowPopup (positionWidget, caret, PopupPosition.Top);
-			tipWindow.EnterNotifyEvent += delegate {
-				editor.HideTooltip (false);
-			};
-			lastWindow = tipWindow;
-			lastNode = titem.Node;
-			return tipWindow;
-		}
-
-		TooltipInformation CreateTooltip (ToolTipData data, int offset, Ambience ambience, Gdk.ModifierType modifierState)
-		{
-			ResolveResult result = data.Result;
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null)
-				return null;
 			bool createFooter = (modifierState & Gdk.ModifierType.Mod1Mask) != 0;
-			var file = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (file == null)
-				return null;
 			try {
-
-				if (result is AliasNamespaceResolveResult) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetAliasedNamespaceTooltip ((AliasNamespaceResolveResult)result);
-				}
+				TooltipInformation result;
+				var sig = new SignatureMarkupCreator (doc, offset);
+				sig.BreakLineAfterReturnType = false;
 				
-				if (result is AliasTypeResolveResult) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetAliasedTypeTooltip ((AliasTypeResolveResult)result);
-				}
+				var typeOfExpression = data.Token.Parent as TypeOfExpressionSyntax;
+				if (typeOfExpression != null && data.Symbol is ITypeSymbol)
+					return sig.GetTypeOfTooltip (typeOfExpression, (ITypeSymbol)data.Symbol);
 				
-				if (data.Node is ThisReferenceExpression && result is ThisResolveResult) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					
-					return sig.GetKeywordTooltip ("this", data.Node);
-				}
+//				var parentKind = data.Token.Parent != null ? data.Token.Parent.Kind () : SyntaxKind.None;
+//				switch (parentKind) {
+//					case SyntaxKind.ConstructorConstraint:
+//					case SyntaxKind.ClassConstraint:
+//					case SyntaxKind.StructConstraint:
+//						return sig.GetConstraintTooltip (data.Token);
+//				}
+//
+//				if (data.Node is ThisReferenceExpression && result is ThisResolveResult) {
+//					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
+//					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
+//					sig.BreakLineAfterReturnType = false;
+//					
+//					return sig.GetKeywordTooltip ("this", data.Node);
+//				}
+//				
+//				if (data.Node is TypeOfExpression) {
+//					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
+//					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
+//					sig.BreakLineAfterReturnType = false;
+//					return sig.GetTypeOfTooltip ((TypeOfExpression)data.Node, result as TypeOfResolveResult);
+//				}
+//				if (data.Node is PrimitiveType && data.Node.Parent is Constraint) {
+//					var t = (PrimitiveType)data.Node;
+//					if (t.Keyword == "class" || t.Keyword == "new" || t.Keyword == "struct") {
+//						var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
+//						var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
+//						sig.BreakLineAfterReturnType = false;
+//						return sig.GetConstraintTooltip (t.Keyword);
+//					}
+//					return null;
+//				}
+				result = sig.GetKeywordTooltip (data.Token); 
+				if (result != null)
+					return result;
 				
-				if (data.Node is TypeOfExpression) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetTypeOfTooltip ((TypeOfExpression)data.Node, result as TypeOfResolveResult);
-				}
-				if (data.Node is PrimitiveType && data.Node.Parent is Constraint) {
-					var t = (PrimitiveType)data.Node;
-					if (t.Keyword == "class" || t.Keyword == "new" || t.Keyword == "struct") {
-						var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-						var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-						sig.BreakLineAfterReturnType = false;
-						return sig.GetConstraintTooltip (t.Keyword);
-					}
-					return null;
-				}
-				if (data.Node is ExternAliasDeclaration) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetExternAliasTooltip ((ExternAliasDeclaration)data.Node, doc.Project as DotNetProject);
-				}
-				if (result == null && data.Node is CSharpTokenNode) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetKeywordTooltip (data.Node);
-				}
-				if (data.Node is PrimitiveType && ((PrimitiveType)data.Node).KnownTypeCode == KnownTypeCode.Void) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetKeywordTooltip ("void", null);
-				}
-				if (data.Node is NullReferenceExpression) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetKeywordTooltip ("null", null);
-				}
-
-				if (result is UnknownIdentifierResolveResult) {
-					return new TooltipInformation () {
-						SignatureMarkup = string.Format ("error CS0103: The name `{0}' does not exist in the current context", ((UnknownIdentifierResolveResult)result).Identifier)
-					};
-				} else if (result is UnknownMemberResolveResult) {
-					var ur = (UnknownMemberResolveResult)result;
-					if (ur.TargetType.Kind != TypeKind.Unknown) {
-						return new TooltipInformation () {
-							SignatureMarkup = string.Format ("error CS0117: `{0}' does not contain a definition for `{1}'", ur.TargetType.FullName, ur.MemberName)
-						};
-					}
-				} else if (result.IsError) {
-					return new TooltipInformation () {
-						SignatureMarkup = "Unknown resolve error."
-					};
+				if (data.Symbol != null) {
+					result = RoslynSymbolCompletionData.CreateTooltipInformation (editor, doc, data.Symbol, false, createFooter);
 				}
-				if (result is LocalResolveResult) {
-					var lr = (LocalResolveResult)result;
-					var tooltipInfo = new TooltipInformation ();
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					tooltipInfo.SignatureMarkup = sig.GetLocalVariableMarkup (lr.Variable);
-					return tooltipInfo;
-				} else if (result is MethodGroupResolveResult) {
-					var mrr = (MethodGroupResolveResult)result;
-					var allMethods = new List<IMethod> (mrr.Methods);
-					foreach (var l in mrr.GetExtensionMethods ()) {
-						allMethods.AddRange (l);
-					}
 				
-					var method = allMethods.FirstOrDefault ();
-					if (method != null) {
-						return MemberCompletionData.CreateTooltipInformation (
-							doc.Compilation,
-							file,
-							doc.Editor,
-							doc.GetFormattingPolicy (),
-							method,
-							false,
-							createFooter);
-					}
-				} else if (result is CSharpInvocationResolveResult) {
-					var invocationResult = (CSharpInvocationResolveResult)result;
-					var member = (IMember)invocationResult.ReducedMethod ?? invocationResult.Member;
-					return MemberCompletionData.CreateTooltipInformation (
-						doc.Compilation,
-						file,
-						doc.Editor,
-						doc.GetFormattingPolicy (),
-						member, 
-						false,
-						createFooter);
-				} else if (result is MemberResolveResult) {
-					var member = ((MemberResolveResult)result).Member;
-					return MemberCompletionData.CreateTooltipInformation (
-						doc.Compilation,
-						file,
-						doc.Editor,
-						doc.GetFormattingPolicy (),
-						member, 
-						false,
-						createFooter);
-				} else if (result is NamespaceResolveResult) {
-					var tooltipInfo = new TooltipInformation ();
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					try {
-						tooltipInfo.SignatureMarkup = sig.GetMarkup (((NamespaceResolveResult)result).Namespace);
-					} catch (Exception e) {
-						LoggingService.LogError ("Got exception while creating markup for :" + ((NamespaceResolveResult)result).Namespace, e);
-						return new TooltipInformation ();
-					}
-					return tooltipInfo;
-				} else if (result is OperatorResolveResult) {
-					var or = result as OperatorResolveResult;
-					var tooltipInfo = new TooltipInformation ();
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					try {
-						var method = or.UserDefinedOperatorMethod;
-						if (method == null)
-							return null;
-						tooltipInfo.SignatureMarkup = sig.GetMarkup (method);
-					} catch (Exception e) {
-						LoggingService.LogError ("Got exception while creating markup for :" + result, e);
-						return new TooltipInformation ();
-					}
-					return tooltipInfo;
-				} else {
-					return MemberCompletionData.CreateTooltipInformation (
-						doc.Compilation,
-						file,
-						doc.Editor,
-						doc.GetFormattingPolicy (),
-						result.Type, 
-						false,
-						createFooter);
-				}
+//				if (result == null && parentKind == SyntaxKind.IdentifierName) {
+//					if (data.SymbolInfo.CandidateReason == CandidateReason.None) {
+//						if (data.Token.Parent.Parent.Kind () == SyntaxKind.SimpleMemberAccessExpression ||
+//							data.Token.Parent.Parent.Kind () == SyntaxKind.PointerMemberAccessExpression) {
+//							var ma = (MemberAccessExpressionSyntax)data.Token.Parent.Parent;
+//							return new TooltipInformation {
+//								SignatureMarkup = string.Format ("error CS0117: `{0}' does not contain a definition for `{1}'", ma.Expression, ma.Name)
+//							};
+//						}
+//						return new TooltipInformation {
+//							SignatureMarkup = string.Format ("error CS0103: The name `{0}' does not exist in the current context", data.Token)
+//						};
+//					}
+//				}
+				
+				return result;
+
+//				if (result is AliasNamespaceResolveResult) {
+//					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
+//					var sig = new SignatureMarkupCreator (doc);
+//					sig.BreakLineAfterReturnType = false;
+//					return sig.GetAliasedNamespaceTooltip ((AliasNamespaceResolveResult)result);
+//				}
+//				
+//				if (result is AliasTypeResolveResult) {
+//					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
+//					var sig = new SignatureMarkupCreator (doc);
+//					sig.BreakLineAfterReturnType = false;
+//					return sig.GetAliasedTypeTooltip ((AliasTypeResolveResult)result);
+//				}
+//				
+//				
+//				if (data.Node is ExternAliasDeclaration) {
+//					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
+//					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
+//					sig.BreakLineAfterReturnType = false;
+//					return sig.GetExternAliasTooltip ((ExternAliasDeclaration)data.Node, doc.Project as DotNetProject);
+//				}
+//				if (result is MethodGroupResolveResult) {
+//					var mrr = (MethodGroupResolveResult)result;
+//					var allMethods = new List<IMethod> (mrr.Methods);
+//					foreach (var l in mrr.GetExtensionMethods ()) {
+//						allMethods.AddRange (l);
+//					}
+//				
+//					var method = allMethods.FirstOrDefault ();
+//					if (method != null) {
+////						return MemberCompletionData.CreateTooltipInformation (
+////							doc.Compilation,
+////							file,
+////							doc.Editor,
+////							doc.GetFormattingPolicy (),
+////							method,
+////							false,
+////							createFooter);
+//					}
+//				} else if (result is CSharpInvocationResolveResult) {
+//					var invocationResult = (CSharpInvocationResolveResult)result;
+//					var member = (IMember)invocationResult.ReducedMethod ?? invocationResult.Member;
+////						return MemberCompletionData.CreateTooltipInformation (
+////							doc.Compilation,
+////							file,
+////							doc.Editor,
+////							doc.GetFormattingPolicy (),
+////							member, 
+////							false,
+////							createFooter);
+//				} else if (result is MemberResolveResult) {
+//					var member = ((MemberResolveResult)result).Member;
+////					return MemberCompletionData.CreateTooltipInformation (
+////						doc.Compilation,
+////						file,
+////						doc.Editor,
+////						doc.GetFormattingPolicy (),
+////						member, 
+////						false,
+////						createFooter);
+//				} else {
+//					return MemberCompletionData.CreateTooltipInformation (
+//						doc.Compilation,
+//						file,
+//						doc.Editor,
+//						doc.GetFormattingPolicy (),
+//						result.Type, 
+//						false,
+//						createFooter);
+//				}
 			} catch (Exception e) {
 				LoggingService.LogError ("Error while creating tooltip.", e);
 				return null;
 			}
-		
-			return null;
-		}
-		class ErrorVisitor : DepthFirstAstVisitor
-		{
-			readonly CSharpAstResolver resolver;
-			readonly CancellationToken cancellationToken;
-			ResolveResult errorResolveResult;
-
-			public ResolveResult ErrorResolveResult {
-				get {
-					return errorResolveResult;
-				}
-			}
-
-			AstNode errorNode;
-
-			public AstNode ErrorNode {
-				get {
-					return errorNode;
-				}
-			}
-
-			public ErrorVisitor (CSharpAstResolver resolver, CancellationToken cancellationToken = default(CancellationToken))
-			{
-				this.resolver = resolver;
-				this.cancellationToken = cancellationToken;
-			}
-			
-			protected override void VisitChildren (AstNode node)
-			{
-				if (ErrorResolveResult != null || cancellationToken.IsCancellationRequested)
-					return;
-				if (node is Expression) {
-					var rr = resolver.Resolve (node, cancellationToken);
-					if (rr.IsError) {
-						errorResolveResult = rr;
-						errorNode = node;
-					}
-				}
-				base.VisitChildren (node);
-			}
 		}
-
 		
-		protected override void GetRequiredPosition (Mono.TextEditor.TextEditor editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)
+//		class ErrorVisitor : DepthFirstAstVisitor
+//		{
+//			readonly CSharpAstResolver resolver;
+//			readonly CancellationToken cancellationToken;
+//			ResolveResult errorResolveResult;
+//
+//			public ResolveResult ErrorResolveResult {
+//				get {
+//					return errorResolveResult;
+//				}
+//			}
+//
+//			AstNode errorNode;
+//
+//			public AstNode ErrorNode {
+//				get {
+//					return errorNode;
+//				}
+//			}
+//
+//			public ErrorVisitor (CSharpAstResolver resolver, CancellationToken cancellationToken = default(CancellationToken))
+//			{
+//				this.resolver = resolver;
+//				this.cancellationToken = cancellationToken;
+//			}
+//			
+//			protected override void VisitChildren (AstNode node)
+//			{
+//				if (ErrorResolveResult != null || cancellationToken.IsCancellationRequested)
+//					return;
+//				if (node is Expression) {
+//					var rr = resolver.Resolve (node, cancellationToken);
+//					if (rr.IsError) {
+//						errorResolveResult = rr;
+//						errorNode = node;
+//					}
+//				}
+//				base.VisitChildren (node);
+//			}
+//		}
+		public override void GetRequiredPosition (TextEditor editor, Control tipWindow, out int requiredWidth, out double xalign)
 		{
 			var win = (TooltipInformationWindow)tipWindow;
 			requiredWidth = win.Allocation.Width;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs
index 759d23c430..34b54c09f1 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs
@@ -24,74 +24,80 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.CSharp.Resolver;
 using System.Collections.Generic;
 using MonoDevelop.NUnit;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharp
 {
 	class UnitTestTextEditorExtension : AbstractUnitTestTextEditorExtension
 	{
-		public override IList<UnitTestLocation> GatherUnitTests ()
+		static readonly IList<UnitTestLocation> emptyList = new UnitTestLocation[0];
+		public override Task<IList<UnitTestLocation>> GatherUnitTests (CancellationToken token)
 		{
-			var resolver = document.GetSharedResolver ();
-			if (resolver == null || resolver.Result == null)
-				return null;
-			var parsedDocument = document.ParsedDocument;
+			var parsedDocument = DocumentContext.ParsedDocument;
 			if (parsedDocument == null)
-				return null;
-			var syntaxTree = parsedDocument.GetAst<SyntaxTree> ();
-			if (syntaxTree == null)
-				return null;
+				return Task.FromResult (emptyList);
+			
+			var semanticModel = parsedDocument.GetAst<SemanticModel> ();
+			if (semanticModel == null)
+				return Task.FromResult (emptyList);
 
-			var visitor = new NUnitVisitor (resolver.Result);
+			var visitor = new NUnitVisitor (semanticModel, token);
 			try {
-				visitor.VisitSyntaxTree (syntaxTree);
-			} catch (Exception ex) {
+				visitor.Visit (semanticModel.SyntaxTree.GetRoot (token));
+			} catch (OperationCanceledException) {
+				throw;
+			}catch (Exception ex) {
 				LoggingService.LogError ("Exception while analyzing ast for unit tests.", ex);
-				return null;
+				return Task.FromResult (emptyList);
 			}
-			return visitor.FoundTests;
+			return Task.FromResult (visitor.FoundTests);
 		}
 
-		class NUnitVisitor : DepthFirstAstVisitor
+		class NUnitVisitor : CSharpSyntaxWalker
 		{
-			readonly CSharpAstResolver resolver;
+			readonly SemanticModel semanticModel;
+			readonly CancellationToken token;
 			List<UnitTestLocation> foundTests = new List<UnitTestLocation> ();
-
+			HashSet<ClassDeclarationSyntax> unitTestClasses = new HashSet<ClassDeclarationSyntax> ();
 			public IList<UnitTestLocation> FoundTests {
 				get {
 					return foundTests;
 				}
 			}
 
-			public NUnitVisitor (CSharpAstResolver resolver)
+			public NUnitVisitor (SemanticModel semanticModel, CancellationToken token)
 			{
-				this.resolver = resolver;
+				this.semanticModel = semanticModel;
+				this.token = token;
 			}
 
-			static string GetFullName (TypeDeclaration typeDeclaration)
+			static string GetFullName (ClassDeclarationSyntax typeDeclaration)
 			{
 				var parts = new List<string> ();
 				while (true) {
-					parts.Add (typeDeclaration.Name);
-					if (typeDeclaration.Parent is TypeDeclaration) {
-						typeDeclaration = (TypeDeclaration)typeDeclaration.Parent;
+					parts.Add (typeDeclaration.Identifier.ToString ());
+					if (typeDeclaration.Parent is ClassDeclarationSyntax) {
+						typeDeclaration = (ClassDeclarationSyntax)typeDeclaration.Parent;
 					}
 					else {
 						break;
 					}
 				}
 				;
-				var ns = typeDeclaration.Parent as NamespaceDeclaration;
+				var ns = typeDeclaration.Parent as NamespaceDeclarationSyntax;
 				if (ns != null)
-					parts.Add (ns.FullName);
+					parts.Add (ns.Name.ToString ());
 				parts.Reverse ();
 				return string.Join (".", parts);
 			}
@@ -109,77 +115,73 @@ namespace MonoDevelop.CSharp
 					sb.Append ('\"');
 			}
 
-			static string BuildArguments (IAttribute attr)
+			static string BuildArguments (AttributeData attr)
 			{
 				var sb = new StringBuilder ();
-				foreach (var arg in attr.PositionalArguments) {
+				foreach (var arg in attr.ConstructorArguments) {
 					if (sb.Length > 0)
 						sb.Append (", ");
-					var cr = arg as ConversionResolveResult;
-					if (cr != null) {
-						AppendConstant (sb, cr.Input.ConstantValue);
-						continue;
-					}
-					AppendConstant (sb, arg.ConstantValue);
+//					var cr = arg as ConversionResolveResult;
+//					if (cr != arg.Value) {
+//						AppendConstant (sb, cr.Input.ConstantValue);
+//						continue;
+//					}
+					AppendConstant (sb, arg.Value);
 				}
 				return sb.ToString ();
 			}
 
-			public override void VisitMethodDeclaration (MethodDeclaration methodDeclaration)
+			public override void VisitMethodDeclaration (MethodDeclarationSyntax node)
 			{
-				var result = resolver.Resolve (methodDeclaration) as MemberResolveResult;
-				if (result == null)
-					return;
-				var method = result.Member as IMethod;
+				var method = semanticModel.GetDeclaredSymbol (node);
 				if (method == null)
 					return;
-
+				var parentClass = node.Parent as ClassDeclarationSyntax;
+				if (parentClass == null)
+					return;
 				UnitTestLocation test = null;
-				foreach (var attr in method.Attributes) {
-					if (attr.AttributeType.ReflectionName == "NUnit.Framework.TestAttribute") {
+				foreach (var attr in method.GetAttributes ()) {
+					if (attr.AttributeClass.GetFullName () == "NUnit.Framework.TestAttribute") {
 						if (test == null) {
-							test = new UnitTestLocation (methodDeclaration.NameToken.StartLocation.Line);
-							test.UnitTestIdentifier = GetFullName ((TypeDeclaration)methodDeclaration.Parent) + "." + methodDeclaration.Name;
+							TagClass (parentClass);
+							test = new UnitTestLocation (node.Identifier.SpanStart);
+							test.UnitTestIdentifier = GetFullName (parentClass) + "." + method.Name;
 							foundTests.Add (test);
 						}
 					}
 				}
 				if (test != null) {
-					foreach (var attr in method.Attributes) {
-						if (attr.AttributeType.ReflectionName == "NUnit.Framework.TestCaseAttribute") {
+					foreach (var attr in method.GetAttributes ()) {
+						if (attr.AttributeClass.GetFullName () == "NUnit.Framework.TestCaseAttribute") {
 							test.TestCases.Add ("(" + BuildArguments (attr) + ")");
 						} else
-							test.IsIgnored |= attr.AttributeType.ReflectionName == "NUnit.Framework.IgnoreAttribute";
+							test.IsIgnored |= attr.AttributeClass.GetFullName () == "NUnit.Framework.IgnoreAttribute";
 					}
 				}
 			}
 
-			public override void VisitTypeDeclaration (TypeDeclaration typeDeclaration)
+			void TagClass (ClassDeclarationSyntax c)
 			{
-				if (typeDeclaration.HasModifier (Modifiers.Abstract))
-					return;
-				var result = resolver.Resolve (typeDeclaration);
-				if (result == null || result.Type.GetDefinition () == null)
+				if (unitTestClasses.Contains (c))
 					return;
-				UnitTestLocation unitTest = null;
-				bool isIgnored = false;
-				foreach (var attr in result.Type.GetDefinition ().GetAttributes ()) {
-					if (attr.AttributeType.ReflectionName == "NUnit.Framework.TestFixtureAttribute") {
-						unitTest = new UnitTestLocation (typeDeclaration.NameToken.StartLocation.Line);
-						unitTest.IsFixture = true;
-						unitTest.UnitTestIdentifier = GetFullName (typeDeclaration);
-						foundTests.Add (unitTest);
-					} else
-						isIgnored |= attr.AttributeType.ReflectionName == "NUnit.Framework.IgnoreAttribute";
-				}
-				if (unitTest != null) {
-					unitTest.IsIgnored = isIgnored;
-					base.VisitTypeDeclaration (typeDeclaration);
+				unitTestClasses.Add (c);
+
+				var type = semanticModel.GetDeclaredSymbol (c);
+				var test = new UnitTestLocation (c.Identifier.SpanStart);
+				test.IsFixture = true;
+				test.UnitTestIdentifier = GetFullName (c);
+				foundTests.Add (test);
+
+				if (test != null) {
+					foreach (var attr in type.GetAttributes ()) {
+							test.IsIgnored |= attr.AttributeClass.GetFullName () == "NUnit.Framework.IgnoreAttribute";
+					}
 				}
 			}
 
-			public override void VisitBlockStatement (BlockStatement blockStatement)
+			public override void VisitBlock (BlockSyntax node)
 			{
+				token.ThrowIfCancellationRequested ();
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs
index b03f260a13..34a02f2a3a 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs
@@ -24,82 +24,90 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.CSharp;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using MonoDevelop.Core;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
 
 namespace MonoDevelop.CSharp
 {
 	class AstAmbience
 	{
-		CSharpFormattingOptions options;
+//		OptionSet options;
 		
-		public AstAmbience (ICSharpCode.NRefactory.CSharp.CSharpFormattingOptions options)
+		public AstAmbience (OptionSet options)
 		{
-			this.options = options;
+//			this.options = options;
 		}
 		
-		static bool IsObsolete (EntityDeclaration entity)
+		static bool IsObsolete (MemberDeclarationSyntax entity)
 		{
 			if (entity == null)
 				return false;
-			foreach (var section in entity.Attributes) {
-				foreach (var attr in section.Attributes) {
-					var attrText = attr.Type.ToString ();
-					if (attrText == "Obsolete" || attrText == "ObsoleteAttribute" || attrText == "System.Obsolete" || attrText == "System.ObsoleteAttribute" )
-						return true;
-				}
-			}
+			// TODO!
+//			foreach (var section in entity.Attributes) {
+//				foreach (var attr in section.Attributes) {
+//					var attrText = attr.Type.ToString ();
+//					if (attrText == "Obsolete" || attrText == "ObsoleteAttribute" || attrText == "System.Obsolete" || attrText == "System.ObsoleteAttribute" )
+//						return true;
+//				}
+//			}
 			return false;
 		}
 		
-		void AppendTypeParameter (StringBuilder sb, IEnumerable<TypeParameterDeclaration> parameters)
+		void AppendTypeParameter (StringBuilder sb, TypeParameterListSyntax parameters)
 		{
-			if (!parameters.Any ()) 
+			if (parameters == null || parameters.Parameters.Count == 0) 
 				return;
 			sb.Append ("&lt;");
 			bool first = true;
-			foreach (var param in parameters) {
+			foreach (var param in parameters.Parameters) {
 				if (!first) {
 					sb.Append (", ");
 				} else {
 					first = false;
 				}
-				AppendEscaped (sb, param.ToString (options));
+				AppendEscaped (sb, param.ToString ());
 			}
 			sb.Append ("&gt;");
 		}
 		
-		void AppendParameter (StringBuilder sb, IEnumerable<ParameterDeclaration> parameters)
+		void AppendParameter (StringBuilder sb, ParameterListSyntax parameters)
 		{
-			if (options.SpaceBeforeMethodDeclarationParentheses)
-				sb.Append (" ");
+			// Missing roslyn formatting option ?
+			//			if (options.GetOption (CSharpFormattingOptions.Spacing ???))
+			//	sb.Append (" ");
 			sb.Append ("(");
-			var hasParameters = parameters.Any ();
-			if (!hasParameters && options.SpaceBetweenEmptyMethodDeclarationParentheses) {
-				sb.Append (" )");
-				return;
-			}
-			if (hasParameters && options.SpaceWithinMethodDeclarationParentheses)
-				sb.Append (" ");
-			
+			var hasParameters = parameters != null && parameters.Parameters.Count > 0;
+
+			// Missing roslyn formatting option ?
+			//if (hasParameters && options.GetOption (SpaceWithinMethodDeclarationParentheses))
+			//	sb.Append (" ");
+
 			bool first = true;
-			foreach (var param in parameters) {
-				if (!first) {
-					if (options.SpaceBeforeMethodDeclarationParameterComma)
-						sb.Append (" ");
-					sb.Append (",");
-					if (options.SpaceAfterMethodDeclarationParameterComma)
+			if (hasParameters) {
+				foreach (var param in parameters.Parameters) {
+					if (!first) {
+						//if (options.SpaceBeforeMethodDeclarationParameterComma)
+						//	sb.Append (" ");
+						sb.Append (",");
+						//if (options.SpaceAfterMethodDeclarationParameterComma)
 						sb.Append (" ");
-				} else {
-					first = false;
+					} else {
+						first = false;
+					}
+					AppendEscaped (sb, param.ToString ());
 				}
-				AppendEscaped (sb, param.ToString (options));
 			}
-			if (hasParameters && options.SpaceWithinMethodDeclarationParentheses)
-				sb.Append (" ");
+
+			// Missing roslyn formatting option ?
+			//if (hasParameters && options.SpaceWithinMethodDeclarationParentheses)
+			//	sb.Append (" ");
 			sb.Append (")");
 		}
 		
@@ -131,128 +139,121 @@ namespace MonoDevelop.CSharp
 			}
 		}
 		
-		public string GetEntityMarkup (AstNode e)
+		public string GetEntityMarkup (SyntaxNode e)
 		{
 			var sb = new StringBuilder ();
-			if (e is TypeDeclaration) {
-				var type = e as TypeDeclaration;
-				sb.Append (type.Name);
-				AppendTypeParameter (sb, type.TypeParameters);
-			} else if (e is DelegateDeclaration) {
-				var del = e as DelegateDeclaration;
-				sb.Append (del.Name);
-				AppendTypeParameter (sb, del.TypeParameters);
-				AppendParameter (sb, del.Parameters);
-			} else if (e is Accessor) {
-				if (e.Role == PropertyDeclaration.GetterRole) {
+			if (e is NamespaceDeclarationSyntax) {
+				return ((NamespaceDeclarationSyntax)e).Name.ToString ();
+			}
+			if (e is TypeDeclarationSyntax) {
+				var type = e as TypeDeclarationSyntax;
+				sb.Append (type.Identifier);
+				AppendTypeParameter (sb, type.TypeParameterList);
+			} else if (e is DelegateDeclarationSyntax) {
+				var del = e as DelegateDeclarationSyntax;
+				sb.Append (del.Identifier);
+				AppendTypeParameter (sb, del.TypeParameterList);
+				AppendParameter (sb, del.ParameterList);
+			} else if (e is AccessorDeclarationSyntax) {
+				if (e.Kind () == SyntaxKind.GetAccessorDeclaration) {
 					sb.Append ("get");
-				} else if (e.Role == PropertyDeclaration.SetterRole) {
+				} else if (e.Kind () == SyntaxKind.SetAccessorDeclaration) {
 					sb.Append ("set");
-				} else if (e.Role == CustomEventDeclaration.AddAccessorRole) {
+				} else if (e.Kind () == SyntaxKind.AddAccessorDeclaration) {
 					sb.Append ("add");
-				} else if (e.Role == CustomEventDeclaration.RemoveAccessorRole) {
+				} else if (e.Kind () == SyntaxKind.RemoveAccessorDeclaration) {
 					sb.Append ("remove");
 				}
-			} else if (e is OperatorDeclaration) {
-				var op = e as OperatorDeclaration;
+			} else if (e is OperatorDeclarationSyntax) {
+				var op = (OperatorDeclarationSyntax)e;
 				sb.Append ("operator ");
-				if (!op.OperatorTypeToken.IsNull)
-					AppendEscaped (sb, op.OperatorTypeToken.ToString ());
-				AppendParameter (sb, op.Parameters);
-			} else if (e is MethodDeclaration) {
-				var method = e as MethodDeclaration;
-				if (!method.PrivateImplementationType.IsNull)
-					AppendEscaped (sb, method.PrivateImplementationType.ToString () + ".");
-				sb.Append (method.Name);
-				AppendTypeParameter (sb, method.TypeParameters);
-				AppendParameter (sb, method.Parameters);
-				if (method.Body.IsNull) {
+				AppendEscaped (sb, op.OperatorToken.ToString ());
+				AppendParameter (sb, op.ParameterList);
+			} else if (e is MethodDeclarationSyntax) {
+				var method = (MethodDeclarationSyntax)e;
+				if (method.ExplicitInterfaceSpecifier != null)
+					AppendEscaped (sb, method.ExplicitInterfaceSpecifier + ".");
+				sb.Append (method.Identifier);
+				AppendTypeParameter (sb, method.TypeParameterList);
+				AppendParameter (sb, method.ParameterList);
+				if (method.Body != null && !method.Body.IsMissing) {
 					string tag = null;
-					if (method.HasModifier (Modifiers.Abstract))
+					if (method.Modifiers.Any (m => m.Kind () == SyntaxKind.AbstractKeyword))
 						tag = GettextCatalog.GetString ("(abstract)");
-					if (method.HasModifier (Modifiers.Partial))
+					if (method.Modifiers.Any (m => m.Kind () == SyntaxKind.PartialKeyword))
 						tag = GettextCatalog.GetString ("(partial)");
 					if (tag != null)
 						sb.Append (" <small>" + tag + "</small>");
 				}
-			} else if (e is ConstructorDeclaration) {
-				var constructor = e as ConstructorDeclaration;
-				sb.Append (constructor.Name);
-				AppendParameter (sb, constructor.Parameters);
-			} else if (e is DestructorDeclaration) {
-				var destructror = e as DestructorDeclaration;
+			} else if (e is ConstructorDeclarationSyntax) {
+				var constructor = e as ConstructorDeclarationSyntax;
+				sb.Append (constructor.Identifier);
+				AppendParameter (sb, constructor.ParameterList);
+			} else if (e is DestructorDeclarationSyntax) {
+				var destructror = e as DestructorDeclarationSyntax;
 				sb.Append ("~");
-				sb.Append (destructror.Name);
-				if (options.SpaceBeforeMethodDeclarationParentheses)
-					sb.Append (" ");
+				sb.Append (destructror.Identifier);
+				//				if (options.SpaceBeforeMethodDeclarationParentheses)
+				//	sb.Append (" ");
 				sb.Append ("()");
-			} else if (e is IndexerDeclaration) {
-				var indexer = e as IndexerDeclaration;
+			} else if (e is IndexerDeclarationSyntax) {
+				var indexer = e as IndexerDeclarationSyntax;
 				sb.Append ("this");
-				if (options.SpaceBeforeIndexerDeclarationBracket)
-					sb.Append (" ");
+				//if (options.SpaceBeforeIndexerDeclarationBracket)
+				//	sb.Append (" ");
 				sb.Append ("[");
-				if (options.SpaceWithinIndexerDeclarationBracket)
-					sb.Append (" ");
+				//if (options.SpaceWithinIndexerDeclarationBracket)
+				//	sb.Append (" ");
 				
 				bool first = true;
-				foreach (var param in indexer.Parameters) {
+				foreach (var param in indexer.ParameterList.Parameters) {
 					if (!first) {
-						if (options.SpaceBeforeIndexerDeclarationParameterComma)
-							sb.Append (" ");
+						//if (options.SpaceBeforeIndexerDeclarationParameterComma)
+						//	sb.Append (" ");
 						sb.Append (",");
-						if (options.SpaceAfterIndexerDeclarationParameterComma)
-							sb.Append (" ");
+						//if (options.SpaceAfterIndexerDeclarationParameterComma)
+						//	sb.Append (" ");
 					} else {
 						first = false;
 					}
-					sb.Append (param.ToString (options));
+					sb.Append (param.ToString ());
 				}
-				if (options.SpaceWithinIndexerDeclarationBracket)
-					sb.Append (" ");
+				//if (options.SpaceWithinIndexerDeclarationBracket)
+				//	sb.Append (" ");
 				sb.Append ("]");
-			} else if (e is VariableInitializer) {
-				var initializer = (VariableInitializer)e;
-				sb.Append (initializer.Name);
-				if (IsObsolete (initializer.Parent as EntityDeclaration))
-					return "<s>" + sb.ToString () + "</s>";
-			} else if (e is FixedVariableInitializer) {
-				var initializer = (FixedVariableInitializer)e;
-				sb.Append (initializer.Name);
-				if (IsObsolete (initializer.Parent as EntityDeclaration))
+			} else if (e is VariableDeclaratorSyntax) {
+				var initializer = (VariableDeclaratorSyntax)e;
+				sb.Append (initializer.Identifier);
+				if (IsObsolete (initializer.Parent as MemberDeclarationSyntax))
 					return "<s>" + sb.ToString () + "</s>";
-			} else if (e is FieldDeclaration) {
-				var field = (FieldDeclaration)e;
-				if (!field.Variables.Any ())
+			} else if (e is FieldDeclarationSyntax) {
+				var field = (FieldDeclarationSyntax)e;
+				if (!field.Declaration.Variables.Any ())
 					return "";
-				sb.Append (field.Variables.First ().Name);
-			} else if (e is FixedFieldDeclaration) {
-				var field = (FixedFieldDeclaration)e;
-				if (!field.Variables.Any ())
+				sb.Append (field.Declaration.Variables.First ().Identifier);
+			} else if (e is EventFieldDeclarationSyntax) {
+				var evt = (EventFieldDeclarationSyntax)e;
+				if (!evt.Declaration.Variables.Any ())
 					return "";
-				sb.Append (field.Variables.First ().Name);
-			} else if (e is EventDeclaration) {
-				var evt = (EventDeclaration)e;
-				if (!evt.Variables.Any ())
-					return "";
-				sb.Append (evt.Variables.First ().Name);
-			} else if (e is PropertyDeclaration) {
-				var property = (PropertyDeclaration)e;
-				if (!property.PrivateImplementationType.IsNull)
-					AppendEscaped (sb, property.PrivateImplementationType.ToString () + ".");
-				sb.Append (property.Name);
-			} else if (e is CustomEventDeclaration) {
-				var customEvent = (CustomEventDeclaration)e;
-				if (!customEvent.PrivateImplementationType.IsNull)
-					AppendEscaped (sb, customEvent.PrivateImplementationType.ToString () + ".");
-				sb.Append (customEvent.Name);
-			} else if (e is EntityDeclaration) {
-				var entity = (EntityDeclaration)e;
-				sb.Append (entity.Name);
-			}
+				sb.Append (evt.Declaration.Variables.First ().Identifier);
+			} else if (e is PropertyDeclarationSyntax) {
+				var property = (PropertyDeclarationSyntax)e;
+				if (property.ExplicitInterfaceSpecifier != null)
+					AppendEscaped (sb, property.ExplicitInterfaceSpecifier + ".");
+				sb.Append (property.Identifier);
+			} else if (e is EventDeclarationSyntax) {
+				var customEvent = (EventDeclarationSyntax)e;
+				if (customEvent.ExplicitInterfaceSpecifier != null)
+					AppendEscaped (sb, customEvent.ExplicitInterfaceSpecifier + ".");
+				sb.Append (customEvent.Identifier);
+			} /*else if (e is MemberDeclarationSyntax) {
+				LoggingService.LogWarning ("can't display : " + e);
+				//				var entity = (MemberDeclarationSyntax)e;
+				// sb.Append (entity.Name);
+			}*/
 
 			string markup = sb.ToString ();
-			if (IsObsolete (e as EntityDeclaration))
+			if (IsObsolete (e as MemberDeclarationSyntax))
 				return "<s>" + markup + "</s>";
 			return markup;
 		}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs
index aec03f9f17..d8b09e4689 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs
@@ -25,10 +25,12 @@
 // THE SOFTWARE.
 
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 
 namespace MonoDevelop.CSharp
 {
@@ -41,7 +43,6 @@ namespace MonoDevelop.CSharp
 		static readonly IconId Field = "md-field";
 		static readonly IconId Interface = "md-interface";
 		static readonly IconId Method = "md-method";
-		static readonly IconId ExtensionMethod = "md-extensionmethod";
 		static readonly IconId Property = "md-property";
 		static readonly IconId Struct = "md-struct";
 		static readonly IconId Delegate = "md-delegate";
@@ -54,7 +55,6 @@ namespace MonoDevelop.CSharp
 		static readonly IconId InternalField = "md-internal-field";
 		static readonly IconId InternalInterface = "md-internal-interface";
 		static readonly IconId InternalMethod = "md-internal-method";
-		static readonly IconId InternalExtensionMethod = "md-internal-extensionmethod";
 		static readonly IconId InternalProperty = "md-internal-property";
 		static readonly IconId InternalStruct = "md-internal-struct";
 
@@ -65,7 +65,6 @@ namespace MonoDevelop.CSharp
 		static readonly IconId InternalAndProtectedField = "md-InternalAndProtected-field";
 		static readonly IconId InternalAndProtectedInterface = "md-InternalAndProtected-interface";
 		static readonly IconId InternalAndProtectedMethod = "md-InternalAndProtected-method";
-		static readonly IconId InternalAndProtectedExtensionMethod = "md-InternalAndProtected-extensionmethod";
 		static readonly IconId InternalAndProtectedProperty = "md-InternalAndProtected-property";
 		static readonly IconId InternalAndProtectedStruct = "md-InternalAndProtected-struct";
 
@@ -76,7 +75,6 @@ namespace MonoDevelop.CSharp
 		static readonly IconId PrivateField = "md-private-field";
 		static readonly IconId PrivateInterface = "md-private-interface";
 		static readonly IconId PrivateMethod = "md-private-method";
-		static readonly IconId PrivateExtensionMethod = "md-private-extensionmethod";
 		static readonly IconId PrivateProperty = "md-private-property";
 		static readonly IconId PrivateStruct = "md-private-struct";
 
@@ -87,7 +85,6 @@ namespace MonoDevelop.CSharp
 		static readonly IconId ProtectedField = "md-protected-field";
 		static readonly IconId ProtectedInterface = "md-protected-interface";
 		static readonly IconId ProtectedMethod = "md-protected-method";
-		static readonly IconId ProtectedExtensionMethod = "md-protected-extensionmethod";
 		static readonly IconId ProtectedProperty = "md-protected-property";
 		static readonly IconId ProtectedStruct = "md-protected-struct";
 		
@@ -98,7 +95,6 @@ namespace MonoDevelop.CSharp
 		static readonly IconId ProtectedOrInternalField = "md-ProtectedOrInternal-field";
 		static readonly IconId ProtectedOrInternalInterface = "md-ProtectedOrInternal-interface";
 		static readonly IconId ProtectedOrInternalMethod = "md-ProtectedOrInternal-method";
-		static readonly IconId ProtectedOrInternalExtensionMethod = "md-ProtectedOrInternal-extensionmethod";
 		static readonly IconId ProtectedOrInternalProperty = "md-ProtectedOrInternal-property";
 		static readonly IconId ProtectedOrInternalStruct = "md-ProtectedOrInternal-struct";
 		
@@ -115,9 +111,6 @@ namespace MonoDevelop.CSharp
 		static readonly IconId[] methodIconTable = {
 			AstStockIcons.Method, AstStockIcons.PrivateMethod, AstStockIcons.Method, AstStockIcons.ProtectedMethod, AstStockIcons.InternalMethod, AstStockIcons.ProtectedOrInternalMethod, AstStockIcons.InternalAndProtectedMethod
 		};
-		static readonly IconId[] extensionMethodIconTable = {
-			AstStockIcons.ExtensionMethod, AstStockIcons.PrivateExtensionMethod, AstStockIcons.ExtensionMethod, AstStockIcons.ProtectedExtensionMethod, AstStockIcons.InternalExtensionMethod, AstStockIcons.ProtectedOrInternalExtensionMethod, AstStockIcons.InternalAndProtectedExtensionMethod
-		};
 		static readonly IconId[] propertyIconTable = {
 			AstStockIcons.Property, AstStockIcons.PrivateProperty, AstStockIcons.Property, AstStockIcons.ProtectedProperty, AstStockIcons.InternalProperty, AstStockIcons.ProtectedOrInternalProperty, AstStockIcons.InternalAndProtectedProperty
 		};
@@ -125,86 +118,111 @@ namespace MonoDevelop.CSharp
 			AstStockIcons.Event, AstStockIcons.PrivateEvent, AstStockIcons.Event, AstStockIcons.ProtectedEvent, AstStockIcons.InternalEvent, AstStockIcons.ProtectedOrInternalEvent, AstStockIcons.InternalAndProtectedEvent
 		};
 
-		static bool GetAccessibility (EntityDeclaration element, out Accessibility acc)
+		static void AdjustAccessibility (SyntaxTokenList modifiers, ref Accessibility acc, ref bool result)
+		{
+			if (modifiers.Any (mod => mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.ProtectedKeyword) &&
+				modifiers.Any (mod => mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.InternalKeyword)) {
+				acc = Accessibility.ProtectedOrInternal;
+				result = true;
+				return;
+			}
+
+			foreach (var mod in modifiers) {
+				if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.PublicKeyword) {
+					acc = Accessibility.Public;
+					result = true;
+					return;
+				}
+				if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.PrivateKeyword) {
+					acc = Accessibility.Private;
+					result = true;
+					return;
+				}
+					if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.ProtectedKeyword) {
+					acc = Accessibility.Protected;
+					result = true;
+					return;
+				}
+				if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.InternalKeyword) {
+					acc = Accessibility.Internal;
+					result = true;
+					return;
+				}
+			}
+		}
+
+		static bool GetAccessibility (SyntaxNode element, out Accessibility acc)
 		{
-			if (element.Parent is TypeDeclaration && ((TypeDeclaration)element.Parent).ClassType == ClassType.Interface) {
+			if (element.Parent is TypeDeclarationSyntax && element.Parent is InterfaceDeclarationSyntax) {
 				acc = Accessibility.Public;
 				return true;
 			}
 			bool result = false;
 			acc = Accessibility.Private;
-			if (element is TypeDeclaration && !(element.Parent is TypeDeclaration))
-				acc = Accessibility.Internal;
-			if (element.HasModifier (Modifiers.Public)) {
-				acc = Accessibility.Public;
-				result = true;
-			} else if (element.HasModifier (Modifiers.Private)) {
-				acc = Accessibility.Private;
-				result = true;
-			} else if (element.HasModifier (Modifiers.Protected | Modifiers.Internal)) {
-				acc = Accessibility.ProtectedOrInternal;
-				result = true;
-			} else if (element.HasModifier (Modifiers.Protected)) {
-				acc = Accessibility.Protected;
-				result = true;
-			} else if (element.HasModifier (Modifiers.Internal)) {
+			if (element is TypeDeclarationSyntax && !(element.Parent is TypeDeclarationSyntax))
 				acc = Accessibility.Internal;
-				result = true;
-			} 
+
+			if (element is TypeDeclarationSyntax)
+				AdjustAccessibility (((TypeDeclarationSyntax)element).Modifiers, ref acc, ref result);
+			if (element is BaseFieldDeclarationSyntax)
+				AdjustAccessibility (((BaseFieldDeclarationSyntax)element).Modifiers, ref acc, ref result);
+			if (element is BasePropertyDeclarationSyntax)
+				AdjustAccessibility (((BasePropertyDeclarationSyntax)element).Modifiers, ref acc, ref result);
+			if (element is BaseMethodDeclarationSyntax)
+				AdjustAccessibility (((BaseMethodDeclarationSyntax)element).Modifiers, ref acc, ref result);
 			return result;
 		}
 		
-		
-		public static string GetStockIcon (this EntityDeclaration element)
+		public static string GetStockIcon (this SyntaxNode element)
 		{
 			Accessibility acc = Accessibility.Public;
 
+			if (element is NamespaceDeclarationSyntax)
+				return Namespace;
 			
-			if (element is Accessor) {
-				if (!GetAccessibility (element, out acc))
-					GetAccessibility (element.Parent as EntityDeclaration, out acc);
+			if (element is AccessorDeclarationSyntax) {
+				if (!GetAccessibility ((MemberDeclarationSyntax)element, out acc))
+					GetAccessibility (element.Parent as MemberDeclarationSyntax, out acc);
 
 				return methodIconTable [(int) (acc)];
 			}
 
 			GetAccessibility (element, out acc);
 
-			if (element is TypeDeclaration) {
-				var type = element as TypeDeclaration;
-				
-				switch (type.ClassType) {
-				case ClassType.Class:
+			if (element is TypeDeclarationSyntax) {
+				var type = element as TypeDeclarationSyntax;
+				switch (type.Keyword.Kind ()) {
+				case SyntaxKind.ClassKeyword:
 					return typeIconTable [0, (int) (acc)];
-				case ClassType.Struct:
+				case SyntaxKind.StructKeyword:
 					return typeIconTable [3, (int) (acc)];
-				case ClassType.Interface:
+				case SyntaxKind.InterfaceKeyword:
 					return typeIconTable [2, (int) (acc)];
-				case ClassType.Enum:
+				case SyntaxKind.EnumKeyword:
 					return typeIconTable [1, (int) (acc)];
 				default:
 					throw new ArgumentOutOfRangeException ();
 				}
 			}
-			if (element is DelegateDeclaration)
+			if (element is DelegateDeclarationSyntax)
 				return typeIconTable [4, (int) (acc)];
 
 			// member accessibility
 			GetAccessibility (element, out acc);
 
-			if (element is MethodDeclaration) {
-				var method = element as MethodDeclaration;
-				if (method.IsExtensionMethod)
-					return extensionMethodIconTable [(int) (acc)];
+			if (element is BaseMethodDeclarationSyntax) {
+				// TODO!
+				// var method = element as MethodDeclarationSyntax;
+				//				if (method.ParameterList.Parameters.First ())
+				//	return extensionMethodIconTable [(int) (acc)];
 				return methodIconTable [(int) (acc)];
 			}
-			if (element is OperatorDeclaration || element is ConstructorDeclaration || element is DestructorDeclaration || element is Accessor)
-				return methodIconTable [(int) (acc)];
 
-			if (element is PropertyDeclaration ||  element is IndexerDeclaration)
+			if (element is PropertyDeclarationSyntax || element is IndexerDeclarationSyntax)
 				return propertyIconTable [(int) (acc)];
-			if (element is EventDeclaration || element is CustomEventDeclaration)
+			if (element is EventDeclarationSyntax || element is EventFieldDeclarationSyntax)
 				return eventIconTable [(int) (acc)];
-			 if (element.Parent is TypeDeclaration && ((TypeDeclaration)element.Parent).ClassType == ClassType.Enum)
+			if (element.Parent is EnumDeclarationSyntax)
 				acc = Accessibility.Public;
 			return fieldIconTable [(int) (acc)];
 		}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
index 3536c9a86c..db298762d5 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
@@ -32,16 +32,11 @@ using MonoDevelop.CSharp.Formatting;
 using MonoDevelop.Ide;
 using System.Collections.ObjectModel;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
 using System.IO;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
 
 namespace MonoDevelop.CSharp
 {
-	class CSharpAmbience : Ambience
+	class CSharpAmbience : AmbienceTooltipProvider
 	{
 		static Dictionary<string, string> netToCSharpTypes = new Dictionary<string, string> ();
 		static HashSet<string> keywords = new HashSet<string> (new [] {
@@ -186,40 +181,33 @@ namespace MonoDevelop.CSharp
 			netToCSharpTypes ["System.Decimal"] = "decimal";
 			netToCSharpTypes ["System.String"] = "string";
 			
-			classTypes [TypeKind.Class] = "class";
-			classTypes [TypeKind.Enum] = "enum";
-			classTypes [TypeKind.Interface] = "interface";
-			classTypes [TypeKind.Struct] = "struct";
-			classTypes [TypeKind.Delegate] = "delegate";
+//			classTypes [TypeKind.Class] = "class";
+//			classTypes [TypeKind.Enum] = "enum";
+//			classTypes [TypeKind.Interface] = "interface";
+//			classTypes [TypeKind.Struct] = "struct";
+//			classTypes [TypeKind.Delegate] = "delegate";
 		}
-		
-		public CSharpAmbience () : base ("C#")
-		{
-		}
-		
-		static Dictionary<TypeKind, string> classTypes = new Dictionary<TypeKind, string> ();
-
-		public override MonoDevelop.Ide.CodeCompletion.TooltipInformation GetTooltip (IEntity entity)
+//		
+//		public CSharpAmbience () : base ("C#")
+//		{
+//		}
+//		
+//		static Dictionary<TypeKind, string> classTypes = new Dictionary<TypeKind, string> ();
+//
+		public override MonoDevelop.Ide.CodeCompletion.TooltipInformation GetTooltip (Microsoft.CodeAnalysis.ISymbol entity)
 		{
 			if (entity == null)
 				throw new ArgumentNullException ("entity");
-			return MonoDevelop.CSharp.Completion.MemberCompletionData.CreateTooltipInformation (
-				entity.Compilation,
-				null,
-				null,
-				new CSharpFormattingPolicy (),
-				entity,
-				false,
-				true);
+			return MonoDevelop.CSharp.Completion.RoslynSymbolCompletionData.CreateTooltipInformation (null, null, entity, false, true);
 		}
 
-		static string GetString (TypeKind classType)
-		{
-			string res;
-			if (classTypes.TryGetValue (classType, out res))
-				return res;
-			return string.Empty;
-		}
+//		static string GetString (TypeKind classType)
+//		{
+//			string res;
+//			if (classTypes.TryGetValue (classType, out res))
+//				return res;
+//			return string.Empty;
+//		}
 		
 		internal static string FilterName (string name)
 		{
@@ -235,334 +223,334 @@ namespace MonoDevelop.CSharp
 			return netTypeName;
 		}
 		
-		#region implemented abstract members of MonoDevelop.Ide.TypeSystem.Ambience
-		public override string GetIntrinsicTypeName (string reflectionName)
-		{
-			return NetToCSharpTypeName (reflectionName);
-		}
-
-		public override string SingleLineComment (string text)
-		{
-			return "// " + text;
-		}
-
-		public override string GetString (string nameSpace, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			if (settings.IncludeKeywords)
-				result.Append (settings.EmitKeyword ("namespace"));
-			result.Append (Format (nameSpace));
-			return result.ToString ();
-		}
-		
-		public void AppendType (StringBuilder sb, IType type, OutputSettings settings)
-		{
-			if (type.Kind == TypeKind.Unknown) {
-				sb.Append (settings.IncludeMarkup ? settings.Markup (type.Name) : type.Name);
-				return;
-			}
-			if (type.Kind == TypeKind.TypeParameter) {
-				sb.Append (settings.IncludeMarkup ? settings.Markup (type.Name) : type.Name);
-				return;
-			}
-			if (type.DeclaringType != null) {
-				AppendType (sb, type.DeclaringType, settings);
-				sb.Append (settings.Markup ("."));
-			}
-			if (type.Namespace == "System" && type.TypeParameterCount == 0) {
-				switch (type.Name) {
-				case "Object":
-					sb.Append ("object");
-					return;
-				case "Boolean":
-					sb.Append ("bool");
-					return;
-				case "Char":
-					sb.Append ("char");
-					return;
-				case "SByte":
-					sb.Append ("sbyte");
-					return;
-				case "Byte":
-					sb.Append ("byte");
-					return;
-				case "Int16":
-					sb.Append ("short");
-					return;
-				case "UInt16":
-					sb.Append ("ushort");
-					return;
-				case "Int32":
-					sb.Append ("int");
-					return;
-				case "UInt32":
-					sb.Append ("uint");
-					return;
-				case "Int64":
-					sb.Append ("long");
-					return;
-				case "UInt64":
-					sb.Append ("ulong");
-					return;
-				case "Single":
-					sb.Append ("float");
-					return;
-				case "Double":
-					sb.Append ("double");
-					return;
-				case "Decimal":
-					sb.Append ("decimal");
-					return;
-				case "String":
-					sb.Append ("string");
-					return;
-				case "Void":
-					sb.Append ("void");
-					return;
-				}
-			}
-			
-			var typeWithElementType = type as TypeWithElementType;
-			if (typeWithElementType != null) {
-				AppendType (sb, typeWithElementType.ElementType, settings);
-				
-				if (typeWithElementType is PointerType) {
-					sb.Append (settings.Markup ("*"));
-				} 
-				
-				if (typeWithElementType is ArrayType) {
-					sb.Append (settings.Markup ("["));
-					sb.Append (settings.Markup (new string (',', ((ArrayType)type).Dimensions - 1)));
-					sb.Append (settings.Markup ("]"));
-				}
-				return;
-			}
-			
-			if (type.TypeArguments.Count > 0) {
-				if (type.Name == "Nullable" && type.Namespace == "System" && type.TypeParameterCount == 1) {
-					AppendType (sb, type.TypeArguments [0], settings);
-					sb.Append (settings.Markup ("?"));
-					return;
-				}
-				sb.Append (type.Name);
-				if (type.TypeParameterCount > 0) {
-					sb.Append (settings.Markup ("<"));
-					for (int i = 0; i < type.TypeParameterCount; i++) {
-						if (i > 0)
-							sb.Append (settings.Markup (", "));
-						AppendType (sb, type.TypeArguments [i], settings);
-					}
-					sb.Append (settings.Markup (">"));
-				}
-				return;
-			}
-			
-			var typeDef = type as ITypeDefinition ?? type.GetDefinition ();
-			if (typeDef != null) {
-				if (settings.UseFullName) {
-					sb.Append (settings.IncludeMarkup ? settings.Markup (typeDef.FullName) : typeDef.FullName);
-				} else {
-					sb.Append (settings.IncludeMarkup ? settings.Markup (typeDef.Name) : typeDef.Name);
-				}
-				
-				if (typeDef.TypeParameterCount > 0) {
-					sb.Append (settings.Markup ("<"));
-					for (int i = 0; i < typeDef.TypeParameterCount; i++) {
-						if (i > 0)
-							sb.Append (settings.Markup (", "));
-						AppendVariance (sb, typeDef.TypeParameters [i].Variance);
-						AppendType (sb, typeDef.TypeParameters [i], settings);
-					}
-					sb.Append (settings.Markup (">"));
-				}
-			}
-		}
-
-		static void AppendVariance (StringBuilder sb, VarianceModifier variance)
-		{
-			if (variance  == VarianceModifier.Contravariant) {
-				sb.Append ("in ");
-			} else if (variance  == VarianceModifier.Covariant) {
-				sb.Append ("out ");
-			}
-		}
-
-		protected override string GetTypeReferenceString (IType reference, OutputSettings settings)
-		{
-			if (reference == null)
-				return "null";
-			var type = reference;
-			if (type.Kind == TypeKind.Unknown) {
-				return settings.IncludeMarkup ? settings.Markup (reference.Name) : reference.Name;
-			}
-			
-			if (reference.Kind == TypeKind.TypeParameter)
-				return settings.IncludeMarkup ? settings.Markup (reference.Name) : reference.FullName;
-			
-			var sb = new StringBuilder ();
-			if (type is ITypeDefinition && ((ITypeDefinition)type).IsSynthetic && ((ITypeDefinition)type).Name == "$Anonymous$") {
-				sb.Append ("new {");
-				foreach (var property in ((ITypeDefinition)type).Properties) {
-					sb.AppendLine ();
-					sb.Append ("\t");
-					sb.Append (GetTypeReferenceString (property.ReturnType, settings) ?? "?");
-					sb.Append (" ");
-					sb.Append (settings.IncludeMarkup ? settings.Markup (property.Name) : property.Name);
-					sb.Append (";");
-				}
-				sb.AppendLine ();
-				sb.Append ("}");
-				return sb.ToString ();
-			}
-			
-			AppendType (sb, type, settings);
-			return sb.ToString ();
-		}
-
-		protected override string GetTypeString (IType t, OutputSettings settings)
-		{
-			if (t.Kind == TypeKind.Unknown) {
-				return settings.IncludeMarkup ? settings.Markup (t.Name) : t.Name;
-			}
-			
-			if (t.Kind == TypeKind.TypeParameter)
-				return settings.IncludeMarkup ? settings.Markup (t.FullName) : t.FullName;
-
-			var typeWithElementType = t as TypeWithElementType;
-			if (typeWithElementType != null) {
-				var sb = new StringBuilder ();
-			
-				if (typeWithElementType is PointerType) {
-					sb.Append (settings.Markup ("*"));
-				} 
-				AppendType (sb, typeWithElementType.ElementType, settings);
-				
-				if (typeWithElementType is ArrayType) {
-					sb.Append (settings.Markup ("["));
-					sb.Append (settings.Markup (new string (',', ((ArrayType)t).Dimensions - 1)));
-					sb.Append (settings.Markup ("]"));
-				}
-				return sb.ToString ();
-			}
-			
-			ITypeDefinition type = t.GetDefinition ();
-			if (type == null)
-				return "";
-			
-			if (!settings.UseNETTypeNames && type.Namespace == "System" && type.TypeParameterCount == 0) {
-				switch (type.Name) {
-				case "Object":
-					return "object";
-				case "Boolean":
-					return "bool";
-				case "Char":
-					return "char";
-				case "SByte":
-					return "sbyte";
-				case "Byte":
-					return "byte";
-				case "Int16":
-					return "short";
-				case "UInt16":
-					return "ushort";
-				case "Int32":
-					return "int";
-				case "UInt32":
-					return "uint";
-				case "Int64":
-					return "long";
-				case "UInt64":
-					return "ulong";
-				case "Single":
-					return "float";
-				case "Double":
-					return "double";
-				case "Decimal":
-					return "decimal";
-				case "String":
-					return "string";
-				case "Void":
-					return "void";
-				}
-			}
-			
-			// output anonymous type
-			if (type.IsSynthetic && type.Name == "$Anonymous$")
-				return GetTypeReferenceString (type, settings);
-			
-			var result = new StringBuilder ();
-
-
-			var def = type;
-			AppendModifiers (result, settings, def);
-			if (settings.IncludeKeywords)
-				result.Append (GetString (def.Kind));
-			if (result.Length > 0 && !result.ToString ().EndsWith (" "))
-				result.Append (settings.Markup (" "));
-			
-			
-			if (type.Kind == TypeKind.Delegate && settings.ReformatDelegates && settings.IncludeReturnType) {
-				var invoke = type.GetDelegateInvokeMethod ();
-				result.Append (GetTypeReferenceString (invoke.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (settings.UseFullName && !string.IsNullOrEmpty (type.Namespace)) 
-				result.Append ((settings.IncludeMarkup ? settings.Markup (t.Namespace) : type.Namespace) + ".");
-			
-			if (settings.UseFullInnerTypeName && type.DeclaringTypeDefinition != null) {
-				bool includeGenerics = settings.IncludeGenerics;
-				settings.OutputFlags |= OutputFlags.IncludeGenerics;
-				string typeString = GetTypeReferenceString (type.DeclaringTypeDefinition, settings);
-				if (!includeGenerics)
-					settings.OutputFlags &= ~OutputFlags.IncludeGenerics;
-				result.Append (typeString);
-				result.Append (settings.Markup ("."));
-			}
-			result.Append (settings.EmitName (type, settings.IncludeMarkup ? settings.Markup (t.Name) : type.Name));
-			if (settings.IncludeGenerics && type.TypeParameterCount > 0) {
-				result.Append (settings.Markup ("<"));
-				for (int i = 0; i < type.TypeParameterCount; i++) {
-					if (i > 0)
-						result.Append (settings.Markup (settings.HideGenericParameterNames ? "," : ", "));
-					if (!settings.HideGenericParameterNames) {
-						if (t.TypeArguments.Count > 0) {
-							result.Append (GetTypeReferenceString (t.TypeArguments [i], settings));
-						} else {
-							AppendVariance (result, type.TypeParameters [i].Variance);
-							result.Append (NetToCSharpTypeName (type.TypeParameters [i].FullName));
-						}
-					}
-				}
-				result.Append (settings.Markup (">"));
-			}
-			
-			if (t.Kind == TypeKind.Delegate && settings.ReformatDelegates) {
-//				var policy = GetPolicy (settings);
-//				if (policy.BeforeMethodCallParentheses)
-//					result.Append (settings.Markup (" "));
-				result.Append (settings.Markup ("("));
-				var invoke = type.GetDelegateInvokeMethod ();
-				if (invoke != null) 
-					AppendParameterList (result, settings, invoke.Parameters);
-				result.Append (settings.Markup (")"));
-				return result.ToString ();
-			}
-			
-			if (settings.IncludeBaseTypes && type.DirectBaseTypes.Any ()) {
-				bool first = true;
-				foreach (var baseType in type.DirectBaseTypes) {
-//				if (baseType.FullName == "System.Object" || baseType.FullName == "System.Enum")
-//					continue;
-					result.Append (settings.Markup (first ? " : " : ", "));
-					first = false;
-					result.Append (GetTypeReferenceString (baseType, settings));	
-				}
-				
-			}
-//		OutputConstraints (result, settings, type.TypeParameters);
-			return result.ToString ();
-		}
+//		#region implemented abstract members of MonoDevelop.Ide.TypeSystem.Ambience
+//		public override string GetIntrinsicTypeName (string reflectionName)
+//		{
+//			return NetToCSharpTypeName (reflectionName);
+//		}
+//
+//		public override string SingleLineComment (string text)
+//		{
+//			return "// " + text;
+//		}
+//
+//		public override string GetString (string nameSpace, OutputSettings settings)
+//		{
+//			var result = new StringBuilder ();
+//			if (settings.IncludeKeywords)
+//				result.Append (settings.EmitKeyword ("namespace"));
+//			result.Append (Format (nameSpace));
+//			return result.ToString ();
+//		}
+//		
+//		public void AppendType (StringBuilder sb, IType type, OutputSettings settings)
+//		{
+//			if (type.Kind == TypeKind.Unknown) {
+//				sb.Append (settings.IncludeMarkup ? settings.Markup (type.Name) : type.Name);
+//				return;
+//			}
+//			if (type.Kind == TypeKind.TypeParameter) {
+//				sb.Append (settings.IncludeMarkup ? settings.Markup (type.Name) : type.Name);
+//				return;
+//			}
+//			if (type.DeclaringType != null) {
+//				AppendType (sb, type.DeclaringType, settings);
+//				sb.Append (settings.Markup ("."));
+//			}
+//			if (type.Namespace == "System" && type.TypeParameterCount == 0) {
+//				switch (type.Name) {
+//				case "Object":
+//					sb.Append ("object");
+//					return;
+//				case "Boolean":
+//					sb.Append ("bool");
+//					return;
+//				case "Char":
+//					sb.Append ("char");
+//					return;
+//				case "SByte":
+//					sb.Append ("sbyte");
+//					return;
+//				case "Byte":
+//					sb.Append ("byte");
+//					return;
+//				case "Int16":
+//					sb.Append ("short");
+//					return;
+//				case "UInt16":
+//					sb.Append ("ushort");
+//					return;
+//				case "Int32":
+//					sb.Append ("int");
+//					return;
+//				case "UInt32":
+//					sb.Append ("uint");
+//					return;
+//				case "Int64":
+//					sb.Append ("long");
+//					return;
+//				case "UInt64":
+//					sb.Append ("ulong");
+//					return;
+//				case "Single":
+//					sb.Append ("float");
+//					return;
+//				case "Double":
+//					sb.Append ("double");
+//					return;
+//				case "Decimal":
+//					sb.Append ("decimal");
+//					return;
+//				case "String":
+//					sb.Append ("string");
+//					return;
+//				case "Void":
+//					sb.Append ("void");
+//					return;
+//				}
+//			}
+//			
+//			var typeWithElementType = type as TypeWithElementType;
+//			if (typeWithElementType != null) {
+//				AppendType (sb, typeWithElementType.ElementType, settings);
+//				
+//				if (typeWithElementType is PointerType) {
+//					sb.Append (settings.Markup ("*"));
+//				} 
+//				
+//				if (typeWithElementType is ArrayType) {
+//					sb.Append (settings.Markup ("["));
+//					sb.Append (settings.Markup (new string (',', ((ArrayType)type).Dimensions - 1)));
+//					sb.Append (settings.Markup ("]"));
+//				}
+//				return;
+//			}
+//			
+//			if (type.TypeArguments.Count > 0) {
+//				if (type.Name == "Nullable" && type.Namespace == "System" && type.TypeParameterCount == 1) {
+//					AppendType (sb, type.TypeArguments [0], settings);
+//					sb.Append (settings.Markup ("?"));
+//					return;
+//				}
+//				sb.Append (type.Name);
+//				if (type.TypeParameterCount > 0) {
+//					sb.Append (settings.Markup ("<"));
+//					for (int i = 0; i < type.TypeParameterCount; i++) {
+//						if (i > 0)
+//							sb.Append (settings.Markup (", "));
+//						AppendType (sb, type.TypeArguments [i], settings);
+//					}
+//					sb.Append (settings.Markup (">"));
+//				}
+//				return;
+//			}
+//			
+//			var typeDef = type as ITypeDefinition ?? type.GetDefinition ();
+//			if (typeDef != null) {
+//				if (settings.UseFullName) {
+//					sb.Append (settings.IncludeMarkup ? settings.Markup (typeDef.FullName) : typeDef.FullName);
+//				} else {
+//					sb.Append (settings.IncludeMarkup ? settings.Markup (typeDef.Name) : typeDef.Name);
+//				}
+//				
+//				if (typeDef.TypeParameterCount > 0) {
+//					sb.Append (settings.Markup ("<"));
+//					for (int i = 0; i < typeDef.TypeParameterCount; i++) {
+//						if (i > 0)
+//							sb.Append (settings.Markup (", "));
+//						AppendVariance (sb, typeDef.TypeParameters [i].Variance);
+//						AppendType (sb, typeDef.TypeParameters [i], settings);
+//					}
+//					sb.Append (settings.Markup (">"));
+//				}
+//			}
+//		}
+//
+//		static void AppendVariance (StringBuilder sb, VarianceModifier variance)
+//		{
+//			if (variance  == VarianceModifier.Contravariant) {
+//				sb.Append ("in ");
+//			} else if (variance  == VarianceModifier.Covariant) {
+//				sb.Append ("out ");
+//			}
+//		}
+//
+//		protected override string GetTypeReferenceString (IType reference, OutputSettings settings)
+//		{
+//			if (reference == null)
+//				return "null";
+//			var type = reference;
+//			if (type.Kind == TypeKind.Unknown) {
+//				return settings.IncludeMarkup ? settings.Markup (reference.Name) : reference.Name;
+//			}
+//			
+//			if (reference.Kind == TypeKind.TypeParameter)
+//				return settings.IncludeMarkup ? settings.Markup (reference.Name) : reference.FullName;
+//			
+//			var sb = new StringBuilder ();
+//			if (type is ITypeDefinition && ((ITypeDefinition)type).IsSynthetic && ((ITypeDefinition)type).Name == "$Anonymous$") {
+//				sb.Append ("new {");
+//				foreach (var property in ((ITypeDefinition)type).Properties) {
+//					sb.AppendLine ();
+//					sb.Append ("\t");
+//					sb.Append (GetTypeReferenceString (property.ReturnType, settings) ?? "?");
+//					sb.Append (" ");
+//					sb.Append (settings.IncludeMarkup ? settings.Markup (property.Name) : property.Name);
+//					sb.Append (";");
+//				}
+//				sb.AppendLine ();
+//				sb.Append ("}");
+//				return sb.ToString ();
+//			}
+//			
+//			AppendType (sb, type, settings);
+//			return sb.ToString ();
+//		}
+//
+//		protected override string GetTypeString (IType t, OutputSettings settings)
+//		{
+//			if (t.Kind == TypeKind.Unknown) {
+//				return settings.IncludeMarkup ? settings.Markup (t.Name) : t.Name;
+//			}
+//			
+//			if (t.Kind == TypeKind.TypeParameter)
+//				return settings.IncludeMarkup ? settings.Markup (t.FullName) : t.FullName;
+//
+//			var typeWithElementType = t as TypeWithElementType;
+//			if (typeWithElementType != null) {
+//				var sb = new StringBuilder ();
+//			
+//				if (typeWithElementType is PointerType) {
+//					sb.Append (settings.Markup ("*"));
+//				} 
+//				AppendType (sb, typeWithElementType.ElementType, settings);
+//				
+//				if (typeWithElementType is ArrayType) {
+//					sb.Append (settings.Markup ("["));
+//					sb.Append (settings.Markup (new string (',', ((ArrayType)t).Dimensions - 1)));
+//					sb.Append (settings.Markup ("]"));
+//				}
+//				return sb.ToString ();
+//			}
+//			
+//			ITypeDefinition type = t.GetDefinition ();
+//			if (type == null)
+//				return "";
+//			
+//			if (!settings.UseNETTypeNames && type.Namespace == "System" && type.TypeParameterCount == 0) {
+//				switch (type.Name) {
+//				case "Object":
+//					return "object";
+//				case "Boolean":
+//					return "bool";
+//				case "Char":
+//					return "char";
+//				case "SByte":
+//					return "sbyte";
+//				case "Byte":
+//					return "byte";
+//				case "Int16":
+//					return "short";
+//				case "UInt16":
+//					return "ushort";
+//				case "Int32":
+//					return "int";
+//				case "UInt32":
+//					return "uint";
+//				case "Int64":
+//					return "long";
+//				case "UInt64":
+//					return "ulong";
+//				case "Single":
+//					return "float";
+//				case "Double":
+//					return "double";
+//				case "Decimal":
+//					return "decimal";
+//				case "String":
+//					return "string";
+//				case "Void":
+//					return "void";
+//				}
+//			}
+//			
+//			// output anonymous type
+//			if (type.IsSynthetic && type.Name == "$Anonymous$")
+//				return GetTypeReferenceString (type, settings);
+//			
+//			var result = new StringBuilder ();
+//
+//
+//			var def = type;
+//			AppendModifiers (result, settings, def);
+//			if (settings.IncludeKeywords)
+//				result.Append (GetString (def.Kind));
+//			if (result.Length > 0 && !result.ToString ().EndsWith (" "))
+//				result.Append (settings.Markup (" "));
+//			
+//			
+//			if (type.Kind == TypeKind.Delegate && settings.ReformatDelegates && settings.IncludeReturnType) {
+//				var invoke = type.GetDelegateInvokeMethod ();
+//				result.Append (GetTypeReferenceString (invoke.ReturnType, settings));
+//				result.Append (settings.Markup (" "));
+//			}
+//			
+//			if (settings.UseFullName && !string.IsNullOrEmpty (type.Namespace)) 
+//				result.Append ((settings.IncludeMarkup ? settings.Markup (t.Namespace) : type.Namespace) + ".");
+//			
+//			if (settings.UseFullInnerTypeName && type.DeclaringTypeDefinition != null) {
+//				bool includeGenerics = settings.IncludeGenerics;
+//				settings.OutputFlags |= OutputFlags.IncludeGenerics;
+//				string typeString = GetTypeReferenceString (type.DeclaringTypeDefinition, settings);
+//				if (!includeGenerics)
+//					settings.OutputFlags &= ~OutputFlags.IncludeGenerics;
+//				result.Append (typeString);
+//				result.Append (settings.Markup ("."));
+//			}
+//			result.Append (settings.EmitName (type, settings.IncludeMarkup ? settings.Markup (t.Name) : type.Name));
+//			if (settings.IncludeGenerics && type.TypeParameterCount > 0) {
+//				result.Append (settings.Markup ("<"));
+//				for (int i = 0; i < type.TypeParameterCount; i++) {
+//					if (i > 0)
+//						result.Append (settings.Markup (settings.HideGenericParameterNames ? "," : ", "));
+//					if (!settings.HideGenericParameterNames) {
+//						if (t.TypeArguments.Count > 0) {
+//							result.Append (GetTypeReferenceString (t.TypeArguments [i], settings));
+//						} else {
+//							AppendVariance (result, type.TypeParameters [i].Variance);
+//							result.Append (NetToCSharpTypeName (type.TypeParameters [i].FullName));
+//						}
+//					}
+//				}
+//				result.Append (settings.Markup (">"));
+//			}
+//			
+//			if (t.Kind == TypeKind.Delegate && settings.ReformatDelegates) {
+////				var policy = GetPolicy (settings);
+////				if (policy.BeforeMethodCallParentheses)
+////					result.Append (settings.Markup (" "));
+//				result.Append (settings.Markup ("("));
+//				var invoke = type.GetDelegateInvokeMethod ();
+//				if (invoke != null) 
+//					AppendParameterList (result, settings, invoke.Parameters);
+//				result.Append (settings.Markup (")"));
+//				return result.ToString ();
+//			}
+//			
+//			if (settings.IncludeBaseTypes && type.DirectBaseTypes.Any ()) {
+//				bool first = true;
+//				foreach (var baseType in type.DirectBaseTypes) {
+////				if (baseType.FullName == "System.Object" || baseType.FullName == "System.Enum")
+////					continue;
+//					result.Append (settings.Markup (first ? " : " : ", "));
+//					first = false;
+//					result.Append (GetTypeReferenceString (baseType, settings));	
+//				}
+//				
+//			}
+////		OutputConstraints (result, settings, type.TypeParameters);
+//			return result.ToString ();
+//		}
 		
 		internal static string GetOperator (string methodName)
 		{
@@ -623,336 +611,336 @@ namespace MonoDevelop.CSharp
 			}
 			return methodName;
 		}
-		
-		string InternalGetMethodString (IMethod method, OutputSettings settings, string methodName, bool getReturnType)
-		{
-			if (method == null)
-				return "";
-			var result = new StringBuilder ();
-			AppendModifiers (result, settings, method);
-			if (!settings.CompletionListFomat && settings.IncludeReturnType && getReturnType) {
-				result.Append (GetTypeReferenceString (method.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (!settings.IncludeReturnType && settings.UseFullName) {
-				result.Append (GetTypeReferenceString (method.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
-				result.Append (settings.Markup ("."));
-			}
-			AppendExplicitInterfaces (result, method, settings);
-			if (method.SymbolKind == SymbolKind.Operator) {
-				result.Append ("operator ");
-				result.Append (settings.Markup (GetOperator (methodName)));
-			} else {
-				result.Append (methodName);
-			}
-			
-			if (settings.IncludeGenerics) {
-				if (method.TypeParameters.Count > 0) {
-					result.Append (settings.Markup ("<"));
-					for (int i = 0; i < method.TypeParameters.Count; i++) {
-						if (i > 0)
-							result.Append (settings.Markup (settings.HideGenericParameterNames ? "," : ", "));
-						if (!settings.HideGenericParameterNames) {
-							AppendVariance (result, method.TypeParameters [i].Variance);
-							result.Append (NetToCSharpTypeName (method.TypeParameters [i].Name));
-						}
-					}
-					result.Append (settings.Markup (">"));
-				}
-			}
-			
-			if (settings.IncludeParameters) {
-//			CSharpFormattingPolicy policy = GetPolicy (settings);
-//			if (policy.BeforeMethodCallParentheses)
+//		
+//		string InternalGetMethodString (IMethod method, OutputSettings settings, string methodName, bool getReturnType)
+//		{
+//			if (method == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			AppendModifiers (result, settings, method);
+//			if (!settings.CompletionListFomat && settings.IncludeReturnType && getReturnType) {
+//				result.Append (GetTypeReferenceString (method.ReturnType, settings));
 //				result.Append (settings.Markup (" "));
-				result.Append (settings.Markup ("("));
-				AppendParameterList (result, settings, method.Parameters);
-				result.Append (settings.Markup (")"));
-			}
-			
-			if (settings.CompletionListFomat && settings.IncludeReturnType && getReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (method.ReturnType, settings));
-			}
-			
-//		OutputConstraints (result, settings, method.TypeParameters);
-			
-			return result.ToString ();			
-		}
-
-		protected override string GetMethodString (IMethod method, OutputSettings settings)
-		{
-			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.SymbolKind == SymbolKind.Constructor || method.SymbolKind == SymbolKind.Destructor ? method.DeclaringTypeDefinition.Name : method.Name))), true);
-		}
-
-		protected override string GetConstructorString (IMethod method, OutputSettings settings)
-		{
-			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.DeclaringTypeDefinition != null ? method.DeclaringTypeDefinition.Name : method.Name))), false);
-		}
-
-		protected override string GetDestructorString (IMethod method, OutputSettings settings)
-		{
-			return InternalGetMethodString (method, settings, settings.EmitName (method, settings.Markup ("~") + Format (FilterName (method.DeclaringTypeDefinition != null ? method.DeclaringTypeDefinition.Name : method.Name))), false);
-		}
-
-		protected override string GetOperatorString (IMethod method, OutputSettings settings)
-		{
-			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.Name))), true);
-		}
-
-		protected override string GetFieldString (IField field, OutputSettings settings)
-		{
-			if (field == null)
-				return "";
-			var result = new StringBuilder ();
-			bool isEnum = field.DeclaringTypeDefinition != null && field.DeclaringTypeDefinition.Kind == TypeKind.Enum;
-			AppendModifiers (result, settings, field);
-			
-			if (!settings.CompletionListFomat && settings.IncludeReturnType && !isEnum) {
-				result.Append (GetTypeReferenceString (field.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (!settings.IncludeReturnType && settings.UseFullName) {
-				result.Append (GetTypeReferenceString (field.DeclaringTypeDefinition, settings));
-				result.Append (settings.Markup ("."));
-			}
-			result.Append (settings.EmitName (field, FilterName (Format (field.Name))));
-			
-			if (settings.CompletionListFomat && settings.IncludeReturnType && !isEnum) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (field.ReturnType, settings));
-			}
-			return result.ToString ();
-		}
-
-		protected override string GetEventString (IEvent evt, OutputSettings settings)
-		{
-			if (evt == null)
-				return "";
-			var result = new StringBuilder ();
-			AppendModifiers (result, settings, evt);
-			if (settings.IncludeKeywords)
-				result.Append (settings.EmitKeyword ("event"));
-			if (!settings.CompletionListFomat && settings.IncludeReturnType) {
-				result.Append (GetTypeReferenceString (evt.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (!settings.IncludeReturnType && settings.UseFullName) {
-				result.Append (GetTypeReferenceString (evt.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
-				result.Append (settings.Markup ("."));
-			}
-			
-			AppendExplicitInterfaces (result, evt, settings);
-			result.Append (settings.EmitName (evt, Format (FilterName (evt.Name))));
-			
-			if (settings.CompletionListFomat && settings.IncludeReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (evt.ReturnType, settings));
-			}
-			return result.ToString ();
-		}
-
-		protected override string GetPropertyString (IProperty property, OutputSettings settings)
-		{
-			if (property == null)
-				return "";
-			var result = new StringBuilder ();
-			AppendModifiers (result, settings, property);
-			if (!settings.CompletionListFomat && settings.IncludeReturnType) {
-				result.Append (GetTypeReferenceString (property.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (!settings.IncludeReturnType && settings.UseFullName) {
-				result.Append (GetTypeReferenceString (property.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
-				result.Append (settings.Markup ("."));
-			}
-			
-			AppendExplicitInterfaces (result, property, settings);
-			
-			if (property.SymbolKind == SymbolKind.Indexer) {
-				result.Append (settings.EmitName (property, "this"));
-			} else {
-				result.Append (settings.EmitName (property, Format (FilterName (property.Name))));
-			}
-			
-			if (settings.IncludeParameters && property.Parameters.Count > 0) {
-				result.Append (settings.Markup ("["));
-				AppendParameterList (result, settings, property.Parameters);
-				result.Append (settings.Markup ("]"));
-			}
-						
-			if (settings.CompletionListFomat && settings.IncludeReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (property.ReturnType, settings));
-			}
-			
-			if (settings.IncludeAccessor) {
-				result.Append (settings.Markup (" {"));
-				if (property.CanGet)
-					result.Append (settings.Markup (" get;"));
-				if (property.CanSet)
-					result.Append (settings.Markup (" set;"));
-				result.Append (settings.Markup (" }"));
-			}
-			
-			return result.ToString ();
-		}
-
-		protected override string GetIndexerString (IProperty property, OutputSettings settings)
-		{
-			if (property == null)
-				return "";
-			var result = new StringBuilder ();
-			
-			AppendModifiers (result, settings, property);
-			
-			if (settings.IncludeReturnType) {
-				result.Append (GetTypeReferenceString (property.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (!settings.IncludeReturnType && settings.UseFullName) {
-				result.Append (GetTypeReferenceString (property.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
-				result.Append (settings.Markup ("."));
-			}
-			
-			AppendExplicitInterfaces (result, property, settings);
-			
-			result.Append (settings.EmitName (property, Format ("this")));
-			
-			if (settings.IncludeParameters && property.Getter.Parameters.Count > 0) {
-				result.Append (settings.Markup ("["));
-				AppendParameterList (result, settings, property.Getter.Parameters);
-				result.Append (settings.Markup ("]"));
-			}
-			if (settings.IncludeAccessor) {
-				result.Append (settings.Markup (" {"));
-				if (property.CanGet)
-					result.Append (settings.Markup (" get;"));
-				if (property.CanSet)
-					result.Append (settings.Markup (" set;"));
-				result.Append (settings.Markup (" }"));
-			}
-			return result.ToString ();
-		}
-
-		protected override string GetParameterString (IParameterizedMember member, IParameter parameter, OutputSettings settings)
-		{
-			if (parameter == null)
-				return "";
-			var result = new StringBuilder ();
-			if (settings.IncludeParameterName) {
-				if (settings.IncludeModifiers) {
-					if (parameter.IsOut) {
-						result.Append (settings.EmitKeyword ("out"));
-					}
-					if (parameter.IsRef) {
-						result.Append (settings.EmitKeyword ("ref"));
-					}
-					if (parameter.IsParams) {
-						result.Append (settings.EmitKeyword ("params"));
-					}
-				}
-				
-				result.Append (GetTypeReferenceString (parameter.Type, settings));
-				result.Append (" ");
-
-				if (settings.HighlightName) {
-					result.Append (settings.EmitName (parameter, settings.Highlight (Format (FilterName (parameter.Name)))));
-				} else {
-					result.Append (settings.EmitName (parameter, Format (FilterName (parameter.Name))));
-				}
-			} else {
-				result.Append (GetTypeReferenceString (parameter.Type, settings));
-			}
-			return result.ToString ();
-		}
-
-		#endregion
-		
-		void AppendExplicitInterfaces (StringBuilder sb, IMember member, OutputSettings settings)
-		{
-			if (member == null || !member.IsExplicitInterfaceImplementation)
-				return;
-			foreach (var implementedInterfaceMember in member.ImplementedInterfaceMembers) {
-				if (settings.UseFullName) {
-					sb.Append (Format (implementedInterfaceMember.DeclaringTypeDefinition.FullName));
-				} else {
-					sb.Append (Format (implementedInterfaceMember.DeclaringTypeDefinition.Name));
-				}
-				sb.Append (settings.Markup ("."));
-			}
-		}
-
-		void AppendParameterList (StringBuilder result, OutputSettings settings, IEnumerable<IParameter> parameterList)
-		{
-			if (parameterList == null)
-				return;
-			
-			bool first = true;
-			foreach (var parameter in parameterList) {
-				if (!first)
-					result.Append (settings.Markup (", "));
-				AppendParameter (settings, result, parameter);
-				first = false;
-			}
-		}
-		
-		void AppendParameter (OutputSettings settings, StringBuilder result, IParameter parameter)
-		{
-			if (parameter == null)
-				return;
-			if (parameter.IsOut) {
-				result.Append (settings.Markup ("out"));
-				result.Append (settings.Markup (" "));
-			} else if (parameter.IsRef) {
-				result.Append (settings.Markup ("ref"));
-				result.Append (settings.Markup (" "));
-			} else if (parameter.IsParams) {
-				result.Append (settings.Markup ("params"));
-				result.Append (settings.Markup (" "));
-			}
-			result.Append (GetParameterString (null, parameter, settings));
-		}
-		
-		void AppendModifiers (StringBuilder result, OutputSettings settings, IEntity entity)
-		{
-			if (!settings.IncludeModifiers)
-				return;
-			if (entity.IsStatic)
-				result.Append (settings.EmitModifiers ("static"));
-			if (entity.IsSealed)
-				result.Append (settings.EmitModifiers ("sealed"));
-			if (entity.IsAbstract)
-				result.Append (settings.EmitModifiers ("abstract"));
-			if (entity.IsShadowing)
-				result.Append (settings.EmitModifiers ("new"));
-			
-			switch (entity.Accessibility) {
-			case Accessibility.Internal:
-				result.Append (settings.EmitModifiers ("internal"));
-				break;
-			case Accessibility.ProtectedAndInternal:
-				result.Append (settings.EmitModifiers ("protected internal"));
-				break;
-			case Accessibility.ProtectedOrInternal:
-				result.Append (settings.EmitModifiers ("internal protected"));
-				break;
-			case Accessibility.Protected:
-				result.Append (settings.EmitModifiers ("protected"));
-				break;
-			case Accessibility.Private:
-				result.Append (settings.EmitModifiers ("private"));
-				break;
-			case Accessibility.Public:
-				result.Append (settings.EmitModifiers ("public"));
-				break;
-			}
-		}
+//			}
+//			
+//			if (!settings.IncludeReturnType && settings.UseFullName) {
+//				result.Append (GetTypeReferenceString (method.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
+//				result.Append (settings.Markup ("."));
+//			}
+//			AppendExplicitInterfaces (result, method, settings);
+//			if (method.SymbolKind == SymbolKind.Operator) {
+//				result.Append ("operator ");
+//				result.Append (settings.Markup (GetOperator (methodName)));
+//			} else {
+//				result.Append (methodName);
+//			}
+//			
+//			if (settings.IncludeGenerics) {
+//				if (method.TypeParameters.Count > 0) {
+//					result.Append (settings.Markup ("<"));
+//					for (int i = 0; i < method.TypeParameters.Count; i++) {
+//						if (i > 0)
+//							result.Append (settings.Markup (settings.HideGenericParameterNames ? "," : ", "));
+//						if (!settings.HideGenericParameterNames) {
+//							AppendVariance (result, method.TypeParameters [i].Variance);
+//							result.Append (NetToCSharpTypeName (method.TypeParameters [i].Name));
+//						}
+//					}
+//					result.Append (settings.Markup (">"));
+//				}
+//			}
+//			
+//			if (settings.IncludeParameters) {
+////			CSharpFormattingPolicy policy = GetPolicy (settings);
+////			if (policy.BeforeMethodCallParentheses)
+////				result.Append (settings.Markup (" "));
+//				result.Append (settings.Markup ("("));
+//				AppendParameterList (result, settings, method.Parameters);
+//				result.Append (settings.Markup (")"));
+//			}
+//			
+//			if (settings.CompletionListFomat && settings.IncludeReturnType && getReturnType) {
+//				result.Append (settings.Markup (" : "));
+//				result.Append (GetTypeReferenceString (method.ReturnType, settings));
+//			}
+//			
+////		OutputConstraints (result, settings, method.TypeParameters);
+//			
+//			return result.ToString ();			
+//		}
+//
+//		protected override string GetMethodString (IMethod method, OutputSettings settings)
+//		{
+//			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.SymbolKind == SymbolKind.Constructor || method.SymbolKind == SymbolKind.Destructor ? method.DeclaringTypeDefinition.Name : method.Name))), true);
+//		}
+//
+//		protected override string GetConstructorString (IMethod method, OutputSettings settings)
+//		{
+//			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.DeclaringTypeDefinition != null ? method.DeclaringTypeDefinition.Name : method.Name))), false);
+//		}
+//
+//		protected override string GetDestructorString (IMethod method, OutputSettings settings)
+//		{
+//			return InternalGetMethodString (method, settings, settings.EmitName (method, settings.Markup ("~") + Format (FilterName (method.DeclaringTypeDefinition != null ? method.DeclaringTypeDefinition.Name : method.Name))), false);
+//		}
+//
+//		protected override string GetOperatorString (IMethod method, OutputSettings settings)
+//		{
+//			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.Name))), true);
+//		}
+//
+//		protected override string GetFieldString (IField field, OutputSettings settings)
+//		{
+//			if (field == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			bool isEnum = field.DeclaringTypeDefinition != null && field.DeclaringTypeDefinition.Kind == TypeKind.Enum;
+//			AppendModifiers (result, settings, field);
+//			
+//			if (!settings.CompletionListFomat && settings.IncludeReturnType && !isEnum) {
+//				result.Append (GetTypeReferenceString (field.ReturnType, settings));
+//				result.Append (settings.Markup (" "));
+//			}
+//			
+//			if (!settings.IncludeReturnType && settings.UseFullName) {
+//				result.Append (GetTypeReferenceString (field.DeclaringTypeDefinition, settings));
+//				result.Append (settings.Markup ("."));
+//			}
+//			result.Append (settings.EmitName (field, FilterName (Format (field.Name))));
+//			
+//			if (settings.CompletionListFomat && settings.IncludeReturnType && !isEnum) {
+//				result.Append (settings.Markup (" : "));
+//				result.Append (GetTypeReferenceString (field.ReturnType, settings));
+//			}
+//			return result.ToString ();
+//		}
+//
+//		protected override string GetEventString (IEvent evt, OutputSettings settings)
+//		{
+//			if (evt == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			AppendModifiers (result, settings, evt);
+//			if (settings.IncludeKeywords)
+//				result.Append (settings.EmitKeyword ("event"));
+//			if (!settings.CompletionListFomat && settings.IncludeReturnType) {
+//				result.Append (GetTypeReferenceString (evt.ReturnType, settings));
+//				result.Append (settings.Markup (" "));
+//			}
+//			
+//			if (!settings.IncludeReturnType && settings.UseFullName) {
+//				result.Append (GetTypeReferenceString (evt.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
+//				result.Append (settings.Markup ("."));
+//			}
+//			
+//			AppendExplicitInterfaces (result, evt, settings);
+//			result.Append (settings.EmitName (evt, Format (FilterName (evt.Name))));
+//			
+//			if (settings.CompletionListFomat && settings.IncludeReturnType) {
+//				result.Append (settings.Markup (" : "));
+//				result.Append (GetTypeReferenceString (evt.ReturnType, settings));
+//			}
+//			return result.ToString ();
+//		}
+//
+//		protected override string GetPropertyString (IProperty property, OutputSettings settings)
+//		{
+//			if (property == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			AppendModifiers (result, settings, property);
+//			if (!settings.CompletionListFomat && settings.IncludeReturnType) {
+//				result.Append (GetTypeReferenceString (property.ReturnType, settings));
+//				result.Append (settings.Markup (" "));
+//			}
+//			
+//			if (!settings.IncludeReturnType && settings.UseFullName) {
+//				result.Append (GetTypeReferenceString (property.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
+//				result.Append (settings.Markup ("."));
+//			}
+//			
+//			AppendExplicitInterfaces (result, property, settings);
+//			
+//			if (property.SymbolKind == SymbolKind.Indexer) {
+//				result.Append (settings.EmitName (property, "this"));
+//			} else {
+//				result.Append (settings.EmitName (property, Format (FilterName (property.Name))));
+//			}
+//			
+//			if (settings.IncludeParameters && property.Parameters.Count > 0) {
+//				result.Append (settings.Markup ("["));
+//				AppendParameterList (result, settings, property.Parameters);
+//				result.Append (settings.Markup ("]"));
+//			}
+//						
+//			if (settings.CompletionListFomat && settings.IncludeReturnType) {
+//				result.Append (settings.Markup (" : "));
+//				result.Append (GetTypeReferenceString (property.ReturnType, settings));
+//			}
+//			
+//			if (settings.IncludeAccessor) {
+//				result.Append (settings.Markup (" {"));
+//				if (property.CanGet)
+//					result.Append (settings.Markup (" get;"));
+//				if (property.CanSet)
+//					result.Append (settings.Markup (" set;"));
+//				result.Append (settings.Markup (" }"));
+//			}
+//			
+//			return result.ToString ();
+//		}
+//
+//		protected override string GetIndexerString (IProperty property, OutputSettings settings)
+//		{
+//			if (property == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			
+//			AppendModifiers (result, settings, property);
+//			
+//			if (settings.IncludeReturnType) {
+//				result.Append (GetTypeReferenceString (property.ReturnType, settings));
+//				result.Append (settings.Markup (" "));
+//			}
+//			
+//			if (!settings.IncludeReturnType && settings.UseFullName) {
+//				result.Append (GetTypeReferenceString (property.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
+//				result.Append (settings.Markup ("."));
+//			}
+//			
+//			AppendExplicitInterfaces (result, property, settings);
+//			
+//			result.Append (settings.EmitName (property, Format ("this")));
+//			
+//			if (settings.IncludeParameters && property.Getter.Parameters.Count > 0) {
+//				result.Append (settings.Markup ("["));
+//				AppendParameterList (result, settings, property.Getter.Parameters);
+//				result.Append (settings.Markup ("]"));
+//			}
+//			if (settings.IncludeAccessor) {
+//				result.Append (settings.Markup (" {"));
+//				if (property.CanGet)
+//					result.Append (settings.Markup (" get;"));
+//				if (property.CanSet)
+//					result.Append (settings.Markup (" set;"));
+//				result.Append (settings.Markup (" }"));
+//			}
+//			return result.ToString ();
+//		}
+//
+//		protected override string GetParameterString (IParameterizedMember member, IParameter parameter, OutputSettings settings)
+//		{
+//			if (parameter == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			if (settings.IncludeParameterName) {
+//				if (settings.IncludeModifiers) {
+//					if (parameter.IsOut) {
+//						result.Append (settings.EmitKeyword ("out"));
+//					}
+//					if (parameter.IsRef) {
+//						result.Append (settings.EmitKeyword ("ref"));
+//					}
+//					if (parameter.IsParams) {
+//						result.Append (settings.EmitKeyword ("params"));
+//					}
+//				}
+//				
+//				result.Append (GetTypeReferenceString (parameter.Type, settings));
+//				result.Append (" ");
+//
+//				if (settings.HighlightName) {
+//					result.Append (settings.EmitName (parameter, settings.Highlight (Format (FilterName (parameter.Name)))));
+//				} else {
+//					result.Append (settings.EmitName (parameter, Format (FilterName (parameter.Name))));
+//				}
+//			} else {
+//				result.Append (GetTypeReferenceString (parameter.Type, settings));
+//			}
+//			return result.ToString ();
+//		}
+//
+//		#endregion
+//		
+//		void AppendExplicitInterfaces (StringBuilder sb, IMember member, OutputSettings settings)
+//		{
+//			if (member == null || !member.IsExplicitInterfaceImplementation)
+//				return;
+//			foreach (var implementedInterfaceMember in member.ImplementedInterfaceMembers) {
+//				if (settings.UseFullName) {
+//					sb.Append (Format (implementedInterfaceMember.DeclaringTypeDefinition.FullName));
+//				} else {
+//					sb.Append (Format (implementedInterfaceMember.DeclaringTypeDefinition.Name));
+//				}
+//				sb.Append (settings.Markup ("."));
+//			}
+//		}
+//
+//		void AppendParameterList (StringBuilder result, OutputSettings settings, IEnumerable<IParameter> parameterList)
+//		{
+//			if (parameterList == null)
+//				return;
+//			
+//			bool first = true;
+//			foreach (var parameter in parameterList) {
+//				if (!first)
+//					result.Append (settings.Markup (", "));
+//				AppendParameter (settings, result, parameter);
+//				first = false;
+//			}
+//		}
+//		
+//		void AppendParameter (OutputSettings settings, StringBuilder result, IParameter parameter)
+//		{
+//			if (parameter == null)
+//				return;
+//			if (parameter.IsOut) {
+//				result.Append (settings.Markup ("out"));
+//				result.Append (settings.Markup (" "));
+//			} else if (parameter.IsRef) {
+//				result.Append (settings.Markup ("ref"));
+//				result.Append (settings.Markup (" "));
+//			} else if (parameter.IsParams) {
+//				result.Append (settings.Markup ("params"));
+//				result.Append (settings.Markup (" "));
+//			}
+//			result.Append (GetParameterString (null, parameter, settings));
+//		}
+//		
+//		void AppendModifiers (StringBuilder result, OutputSettings settings, IEntity entity)
+//		{
+//			if (!settings.IncludeModifiers)
+//				return;
+//			if (entity.IsStatic)
+//				result.Append (settings.EmitModifiers ("static"));
+//			if (entity.IsSealed)
+//				result.Append (settings.EmitModifiers ("sealed"));
+//			if (entity.IsAbstract)
+//				result.Append (settings.EmitModifiers ("abstract"));
+//			if (entity.IsShadowing)
+//				result.Append (settings.EmitModifiers ("new"));
+//			
+//			switch (entity.Accessibility) {
+//			case Accessibility.Internal:
+//				result.Append (settings.EmitModifiers ("internal"));
+//				break;
+//			case Accessibility.ProtectedAndInternal:
+//				result.Append (settings.EmitModifiers ("protected internal"));
+//				break;
+//			case Accessibility.ProtectedOrInternal:
+//				result.Append (settings.EmitModifiers ("internal protected"));
+//				break;
+//			case Accessibility.Protected:
+//				result.Append (settings.EmitModifiers ("protected"));
+//				break;
+//			case Accessibility.Private:
+//				result.Append (settings.EmitModifiers ("private"));
+//				break;
+//			case Accessibility.Public:
+//				result.Append (settings.EmitModifiers ("public"));
+//				break;
+//			}
+//		}
 	}
-		
+
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpLanguageBinding.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpLanguageBinding.cs
index eab17d4f76..b6a3c101b3 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpLanguageBinding.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpLanguageBinding.cs
@@ -41,7 +41,6 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.Instrumentation;
 
 using MonoDevelop.CSharp.Parser;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.CSharp.Formatting;
 using MonoDevelop.CSharp.Project;
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/ExpandSelectionHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/ExpandSelectionHandler.cs
index a09c5ecf26..95595339d0 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/ExpandSelectionHandler.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/ExpandSelectionHandler.cs
@@ -24,10 +24,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
 using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.CSharp
 {
@@ -39,68 +39,99 @@ namespace MonoDevelop.CSharp
 	
 	class ExpandSelectionHandler : CommandHandler
 	{
+		internal class ExpandSelectionAnnotation
+		{
+			readonly MonoDevelop.Ide.Editor.TextEditor editor;
+
+			public Stack<SyntaxNode> Stack = new Stack<SyntaxNode> ();
+
+			public ExpandSelectionAnnotation (MonoDevelop.Ide.Editor.TextEditor editor)
+			{
+				this.editor = editor;
+				editor.CaretPositionChanged += Editor_CaretPositionChanged;
+			}
+
+			void Editor_CaretPositionChanged (object sender, EventArgs e)
+			{
+				editor.CaretPositionChanged -= Editor_CaretPositionChanged;
+				Stack = null;
+				editor.RemoveAnnotations<ExpandSelectionAnnotation> ();
+			}
+		}
+
+		internal static ExpandSelectionAnnotation GetSelectionAnnotation (MonoDevelop.Ide.Editor.TextEditor editor)
+		{
+			var result = editor.Annotation<ExpandSelectionAnnotation> ();
+			if (result == null) {
+				result = new ExpandSelectionAnnotation (editor);
+				editor.AddAnnotation (result);
+			}
+			return result;
+		}
+
 		protected override void Run ()
 		{
 			var doc = IdeApp.Workbench.ActiveDocument;
 			if (doc == null)
 				return;
+			var selectionRange = doc.Editor.SelectionRange;
 			var parsedDocument = doc.ParsedDocument;
 			if (parsedDocument == null)
 				return;
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
+			var model = parsedDocument.GetAst<SemanticModel> ();
+			if (model == null)
 				return;
-			var node = unit.GetNodeAt (doc.Editor.Caret.Location);
+			var unit = model.SyntaxTree.GetRoot ();
+			var node = unit.FindNode (Microsoft.CodeAnalysis.Text.TextSpan.FromBounds (selectionRange.Offset, selectionRange.EndOffset));
 			if (node == null)
 				return;
 			
 			if (doc.Editor.IsSomethingSelected) {
-				while (node != null && doc.Editor.MainSelection.IsSelected (node.StartLocation, node.EndLocation)) {
+				while (node != null && ShrinkSelectionHandler.IsSelected (doc.Editor, node.Span)) {
 					node = node.Parent;
 				}
 			}
-			
-			if (node != null)
-				doc.Editor.SetSelection (node.StartLocation, node.EndLocation);
+
+			if (node != null) {
+				var selectionAnnotation = GetSelectionAnnotation (doc.Editor);
+				selectionAnnotation.Stack.Push (node);
+				doc.Editor.SetSelection (node.SpanStart, node.Span.End);
+			}
 		}
 	}
 	
 	class ShrinkSelectionHandler : CommandHandler
 	{
-		protected override void Run ()
+		internal static bool IsSelected (MonoDevelop.Ide.Editor.TextEditor editor, Microsoft.CodeAnalysis.Text.TextSpan span)
+		{
+			var selection = editor.SelectionRange;
+			return selection.Offset == span.Start && selection.Length == span.Length;
+		}
+
+		protected async override void Run ()
 		{
 			var doc = IdeApp.Workbench.ActiveDocument;
-			var parsedDocument = doc.ParsedDocument;
+			if (doc == null)
+				return;
+			var selectionRange = doc.Editor.CaretOffset;
+			var analysisDocument = doc.AnalysisDocument;
+			if (analysisDocument == null)
+				return;
+			var parsedDocument = await analysisDocument.GetSyntaxTreeAsync ();
 			if (parsedDocument == null)
 				return;
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
+			var unit = parsedDocument.GetRoot ();
 			if (unit == null)
 				return;
-			var node = unit.GetNodeAt (doc.Editor.Caret.Line, doc.Editor.Caret.Column);
-			if (node == null)
-				return;
-			var nodeStack = new Stack<AstNode> ();
-			nodeStack.Push (node);
-			if (doc.Editor.IsSomethingSelected) {
-				while (node != null && doc.Editor.MainSelection.IsSelected (node.StartLocation, node.EndLocation)) {
-					node = node.Parent;
-					if (node != null) {
-						if (nodeStack.Count > 0 && nodeStack.Peek ().StartLocation == node.StartLocation && nodeStack.Peek ().EndLocation == node.EndLocation)
-							nodeStack.Pop ();
-						nodeStack.Push (node);
-					}
-				}
-			}
-			
-			if (nodeStack.Count > 2) {
-				nodeStack.Pop (); // parent
-				nodeStack.Pop (); // current node
-				node = nodeStack.Pop (); // next children in which the caret is
-				doc.Editor.SetSelection (node.StartLocation, node.EndLocation);
+
+			var selectionAnnotation = ExpandSelectionHandler.GetSelectionAnnotation (doc.Editor);
+			selectionAnnotation.Stack.Pop ();
+			if (selectionAnnotation.Stack.Count > 0) {
+				var node = selectionAnnotation.Stack.Peek ();
+				doc.Editor.SetSelection (node.SpanStart, node.Span.End);
 			} else {
 				doc.Editor.ClearSelection ();
 			}
 		}
 	}
-}
-
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
index 4484afcad9..fe409ae573 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
@@ -27,16 +27,20 @@ using System;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Components;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Core;
 using MonoDevelop.CSharp.Completion;
 using System.Linq;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp;
 using System.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
 using MonoDevelop.Projects;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
 
 namespace MonoDevelop.CSharp
 {
@@ -44,19 +48,19 @@ namespace MonoDevelop.CSharp
 	{
 		public override void Dispose ()
 		{
+			Editor.CaretPositionChanged -= UpdatePath;
 			IdeApp.Workspace.FileAddedToProject -= HandleProjectChanged;
 			IdeApp.Workspace.FileRemovedFromProject -= HandleProjectChanged;
 			IdeApp.Workspace.WorkspaceItemUnloaded -= HandleWorkspaceItemUnloaded;
-			IdeApp.Workspace.WorkspaceItemLoaded -= HandleWorkspaceItemLoaded;;
+			IdeApp.Workspace.WorkspaceItemLoaded -= HandleWorkspaceItemLoaded;
+			IdeApp.Workspace.ItemAddedToSolution -= HandleProjectChanged;
+
 
-			if (caret != null) {
-				caret.PositionChanged -= UpdatePath;
-				caret = null;
-			}
 			if (ext != null) {
 				ext.TypeSegmentTreeUpdated -= HandleTypeSegmentTreeUpdated;
 				ext = null;
 			}
+
 			currentPath = null;
 			lastType = null;
 			lastMember = null;
@@ -64,12 +68,16 @@ namespace MonoDevelop.CSharp
 		}
 
 		bool isPathSet;
-		Mono.TextEditor.Caret caret;
 		CSharpCompletionTextEditorExtension ext;
 
 		List<DotNetProject> ownerProjects = new List<DotNetProject> ();
 
-		public override void Initialize ()
+		public override bool IsValidInContext (DocumentContext context)
+		{
+			return context.GetContent<CSharpCompletionTextEditorExtension> () != null;
+		}
+
+		protected override void Initialize ()
 		{
 			CurrentPath = new PathEntry[] { new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = null } };
 			isPathSet = false;
@@ -79,14 +87,15 @@ namespace MonoDevelop.CSharp
 				UpdateOwnerProjects ();
 				UpdatePath (null, null);
 			});
-			caret = Document.Editor.Caret;
-			caret.PositionChanged += UpdatePath;
-			ext = Document.GetContent<CSharpCompletionTextEditorExtension> ();
+			Editor.CaretPositionChanged += UpdatePath;
+			ext = DocumentContext.GetContent<CSharpCompletionTextEditorExtension> ();
 			ext.TypeSegmentTreeUpdated += HandleTypeSegmentTreeUpdated;
+
 			IdeApp.Workspace.FileAddedToProject += HandleProjectChanged;
 			IdeApp.Workspace.FileRemovedFromProject += HandleProjectChanged;
 			IdeApp.Workspace.WorkspaceItemUnloaded += HandleWorkspaceItemUnloaded;
-			IdeApp.Workspace.WorkspaceItemLoaded += HandleWorkspaceItemLoaded;;
+			IdeApp.Workspace.WorkspaceItemLoaded += HandleWorkspaceItemLoaded;
+			IdeApp.Workspace.ItemAddedToSolution += HandleProjectChanged;
 		}
 
 		void HandleWorkspaceItemLoaded (object sender, WorkspaceItemEventArgs e)
@@ -105,11 +114,11 @@ namespace MonoDevelop.CSharp
 			}
 			if (ownerProjects.Count == 0) {
 				ownerProjects = null;
-				Document.AttachToProject (null);
+				DocumentContext.AttachToProject (null);
 			}
 		}
 
-		void HandleProjectChanged (object sender, ProjectFileEventArgs e)
+		void HandleProjectChanged (object sender, EventArgs e)
 		{
 			UpdateOwnerProjects ();
 			UpdatePath (null, null);
@@ -122,16 +131,16 @@ namespace MonoDevelop.CSharp
 
 		void UpdateOwnerProjects (IEnumerable<DotNetProject> allProjects)
 		{
-			var projects = new HashSet<DotNetProject> (allProjects.Where (p => p.IsFileInProject (Document.FileName)));
+			var projects = new HashSet<DotNetProject> (allProjects.Where (p => p.IsFileInProject (DocumentContext.Name)));
 			if (ownerProjects == null || !projects.SetEquals (ownerProjects)) {
 				ownerProjects = projects.OrderBy (p => p.Name).ToList ();
-				var dnp = Document.Project as DotNetProject;
+				var dnp = DocumentContext.Project as DotNetProject;
 				if (ownerProjects.Count > 0 && (dnp == null || !ownerProjects.Contains (dnp))) {
 					// If the project for the document is not a DotNetProject but there is a project containing this file
 					// in the current solution, then use that project
-					var pp = Document.Project != null ? ownerProjects.FirstOrDefault (p => p.ParentSolution == Document.Project.ParentSolution) : null;
+					var pp = DocumentContext.Project != null ? ownerProjects.FirstOrDefault (p => p.ParentSolution == DocumentContext.Project.ParentSolution) : null;
 					if (pp != null)
-						Document.AttachToProject (pp);
+						DocumentContext.AttachToProject (pp);
 				}
 			}
 		}
@@ -139,8 +148,8 @@ namespace MonoDevelop.CSharp
 		void UpdateOwnerProjects ()
 		{
 			UpdateOwnerProjects (IdeApp.Workspace.GetAllItems<DotNetProject> ());
-			if (Document.Project == null && ownerProjects.Count > 0)
-				Document.AttachToProject (ownerProjects[0]);
+			if (DocumentContext.Project == null && ownerProjects.Count > 0)
+				DocumentContext.AttachToProject (ownerProjects[0]);
 		}
 
 		#region IPathedDocument implementation
@@ -158,7 +167,7 @@ namespace MonoDevelop.CSharp
 		{
 			readonly PathedDocumentTextEditorExtension ext;
 			object tag;
-			List<AstNode> memberList = new List<AstNode> ();
+			List<SyntaxNode> memberList = new List<SyntaxNode> ();
 
 			public DataProvider (PathedDocumentTextEditorExtension ext, object tag)
 			{
@@ -171,17 +180,14 @@ namespace MonoDevelop.CSharp
 
 			#region IListDataProvider implementation
 
-			void AddTypeToMemberList (TypeDeclaration type)
+			void AddTypeToMemberList (TypeDeclarationSyntax type)
 			{
 				foreach (var member in type.Members) {
-					if (member is FieldDeclaration) {
-						foreach (var variable in ((FieldDeclaration)member).Variables)
-							memberList.Add (variable);
-					} else if (member is FixedFieldDeclaration) {
-						foreach (var variable in ((FixedFieldDeclaration)member).Variables)
+					if (member is FieldDeclarationSyntax) {
+						foreach (var variable in ((FieldDeclarationSyntax)member).Declaration.Variables)
 							memberList.Add (variable);
-					} else if (member is EventDeclaration) {
-						foreach (var variable in ((EventDeclaration)member).Variables)
+					} else if (member is EventFieldDeclarationSyntax) {
+						foreach (var variable in ((EventFieldDeclarationSyntax)member).Declaration.Variables)
 							memberList.Add (variable);
 					} else {
 						memberList.Add (member);
@@ -194,16 +200,16 @@ namespace MonoDevelop.CSharp
 				memberList.Clear ();
 				if (tag is SyntaxTree) {
 					var unit = tag as SyntaxTree;
-					memberList.AddRange (unit.GetTypes (true));
-				} else if (tag is TypeDeclaration) {
-					AddTypeToMemberList ((TypeDeclaration)tag);
-				} else if (tag is Accessor) {
-					var acc = (Accessor)tag;
-					var parent = (EntityDeclaration)acc.Parent;
-					memberList.AddRange (parent.Children.OfType<Accessor> ());
-				} else if (tag is EntityDeclaration) {
-					var entity = (EntityDeclaration)tag;
-					var type = entity.Parent as TypeDeclaration;
+					memberList.AddRange (unit.GetRoot ().DescendantNodes ().OfType<TypeDeclarationSyntax> ());
+				} else if (tag is TypeDeclarationSyntax) {
+					AddTypeToMemberList ((TypeDeclarationSyntax)tag);
+				} else if (tag is AccessorDeclarationSyntax) {
+					var acc = (AccessorDeclarationSyntax)tag;
+					var parent = (MemberDeclarationSyntax)acc.Parent;
+					memberList.AddRange (parent.ChildNodes ().OfType<AccessorDeclarationSyntax> ());
+				} else if (tag is MemberDeclarationSyntax) {
+					var entity = (MemberDeclarationSyntax)tag;
+					var type = entity.Parent as TypeDeclarationSyntax;
 					if (type != null) {
 						AddTypeToMemberList (type);
 					}
@@ -217,74 +223,77 @@ namespace MonoDevelop.CSharp
 						result = GetParameters (x).CompareTo (GetParameters (y));
 
 					// partial methods without body should come last
-					if (result == 0 && x is MethodDeclaration && y is MethodDeclaration) {
-						var mx = x as MethodDeclaration;
-						var my = y as MethodDeclaration;
-						if (mx.Body.IsNull && !my.Body.IsNull)
+					if (result == 0 && x is MethodDeclarationSyntax && y is MethodDeclarationSyntax) {
+						var mx = x as MethodDeclarationSyntax;
+						var my = y as MethodDeclarationSyntax;
+						if (mx.Body == null && my.Body != null)
 							return 1;
-						if (!mx.Body.IsNull && my.Body.IsNull)
+						if (mx.Body != null && my.Body == null)
 							return -1;
 					}
 					return result;
 				});
 			}
 
-			static int GetTypeParameters (AstNode x)
+			static int GetTypeParameters (SyntaxNode x)
 			{
-				return x.GetChildrenByRole (Roles.TypeParameter).Count ();
+				return 0; //x.GetChildrenByRole (Roles.TypeParameter).Count ();
 			}
 
-			static int GetParameters (AstNode x)
+			static int GetParameters (SyntaxNode x)
 			{
-				return x.GetChildrenByRole (Roles.Parameter).Count ();
+				return 0; // x.GetChildrenByRole (Roles.Parameter).Count ();
 			}
 
-			string GetName (AstNode node)
+			string GetName (SyntaxNode node)
 			{
 				if (tag is SyntaxTree) {
-					var type = node as TypeDeclaration;
+					var type = node as TypeDeclarationSyntax;
 					if (type != null) {
 						var sb = new StringBuilder ();
-						sb.Append (type.Name);
-						while (type.Parent is TypeDeclaration) {
-							type = type.Parent as TypeDeclaration;
-							sb.Insert (0, type.Name + ".");
+						sb.Append (type.Identifier.ToString ());
+						while (type.Parent is TypeDeclarationSyntax) {
+							type = type.Parent as TypeDeclarationSyntax;
+							sb.Insert (0, type.Identifier + ".");
 						}
 						return sb.ToString ();
 					}
-					var delegateDecl = node as DelegateDeclaration;
+					var delegateDecl = node as DelegateDeclarationSyntax;
 					if (delegateDecl != null) {
 						var sb = new StringBuilder ();
-						sb.Append (delegateDecl.Name);
-						var parentType = delegateDecl.Parent as TypeDeclaration;
+						sb.Append (delegateDecl.Identifier.ToString ());
+						var parentType = delegateDecl.Parent as TypeDeclarationSyntax;
 						while (parentType != null) {
-							sb.Insert (0, parentType.Name + ".");
-							parentType = parentType.Parent as TypeDeclaration;
+							sb.Insert (0, parentType.Identifier + ".");
+							parentType = parentType.Parent as TypeDeclarationSyntax;
 						}
 						return sb.ToString ();
 					}
 				}
 				
-				if (node is Accessor) {
-					if (node.Role == PropertyDeclaration.GetterRole)
+				var accessor = node as AccessorDeclarationSyntax;
+				if (accessor != null) {
+					if (accessor.Kind () == SyntaxKind.GetAccessorDeclaration)
 						return "get";
-					if (node.Role == PropertyDeclaration.SetterRole)
+					if (accessor.Kind () == SyntaxKind.SetAccessorDeclaration)
 						return "set";
-					if (node.Role == CustomEventDeclaration.AddAccessorRole)
+					if (accessor.Kind () == SyntaxKind.AddAccessorDeclaration)
 						return "add";
-					if (node.Role == CustomEventDeclaration.RemoveAccessorRole)
+					if (accessor.Kind () == SyntaxKind.RemoveAccessorDeclaration)
 						return "remove";
 					return node.ToString ();
 				}
-				if (node is OperatorDeclaration)
+				if (node is OperatorDeclarationSyntax)
 					return "operator";
 
-				if (node is EntityDeclaration)
-					return ((EntityDeclaration)node).Name;
-				if (node is FixedVariableInitializer) {
-					return ((FixedVariableInitializer)node).Name;
-				}
-				return ((VariableInitializer)node).Name;
+				if (node is MemberDeclarationSyntax)
+					return ((MemberDeclarationSyntax)node).ToString ();
+//				if (node is fixeds) {
+//					return ((FixedVariableInitializer)node).Name;
+//				}
+				if (node is VariableDeclaratorSyntax)
+					return ((VariableDeclaratorSyntax)node).Identifier.ToString ();
+				return node.ToString ();
 			}
 
 			public string GetMarkup (int n)
@@ -299,7 +308,7 @@ namespace MonoDevelop.CSharp
 					if (type != null) {
 						var sb = new StringBuilder ();
 						sb.Append (ext.GetEntityMarkup (type));
-						while (type.Parent is TypeDeclaration) {
+						while (type.Parent is TypeDeclarationSyntax) {
 							sb.Insert (0, ext.GetEntityMarkup (type.Parent) + ".");
 							type = type.Parent;
 						}
@@ -316,10 +325,10 @@ namespace MonoDevelop.CSharp
 					icon = ext.ownerProjects [n].StockIcon;
 				} else {
 					var node = memberList [n];
-					if (node is EntityDeclaration) {
-						icon = ((EntityDeclaration)node).GetStockIcon ();
+					if (node is MemberDeclarationSyntax) {
+						icon = ((MemberDeclarationSyntax)node).GetStockIcon ();
 					} else {
-						icon = ((EntityDeclaration)node.Parent).GetStockIcon ();
+						icon = node.Parent.GetStockIcon ();
 					}
 				}
 				return ImageService.GetIcon (icon, Gtk.IconSize.Menu);
@@ -336,26 +345,20 @@ namespace MonoDevelop.CSharp
 			public void ActivateItem (int n)
 			{
 				if (tag is DotNetProject) {
-					ext.Document.AttachToProject (ext.ownerProjects [n]);
+					ext.DocumentContext.AttachToProject (ext.ownerProjects [n]);
 				} else {
 					var node = memberList [n];
-					var extEditor = ext.Document.GetContent<IExtensibleTextEditor> ();
+					var extEditor = ext.DocumentContext.GetContent<TextEditor> ();
 					if (extEditor != null) {
-						int line, col;
-						if (node is OperatorDeclaration) { 
-							line = Math.Max (1, ((OperatorDeclaration)node).OperatorToken.StartLocation.Line);
-							col = Math.Max (1, ((OperatorDeclaration)node).OperatorToken.StartLocation.Column);
-						} else if (node is IndexerDeclaration) { 
-							line = Math.Max (1, ((IndexerDeclaration)node).ThisToken.StartLocation.Line);
-							col = Math.Max (1, ((IndexerDeclaration)node).ThisToken.StartLocation.Column);
-						} else if (node is EntityDeclaration && !(node is Accessor)) {
-							line = Math.Max (1, ((EntityDeclaration)node).NameToken.StartLocation.Line);
-							col = Math.Max (1, ((EntityDeclaration)node).NameToken.StartLocation.Column);
+						int offset;
+						if (node is OperatorDeclarationSyntax) { 
+							offset = Math.Max (1, ((OperatorDeclarationSyntax)node).OperatorToken.SpanStart);
+						} else if (node is MemberDeclarationSyntax && !(node is AccessorDeclarationSyntax)) {
+							offset = Math.Max (1, ((MemberDeclarationSyntax)node).SpanStart);
 						} else {
-							line = node.StartLocation.Line;
-							col = node.StartLocation.Column;
+							offset = node.SpanStart;
 						}
-						extEditor.SetCaretTo (line, col);
+						extEditor.SetCaretLocation (extEditor.OffsetToLocation (offset), true);
 					}
 				}
 			}
@@ -375,14 +378,17 @@ namespace MonoDevelop.CSharp
 
 		class CompilationUnitDataProvider : DropDownBoxListWindow.IListDataProvider
 		{
-			Document Document {
+			TextEditor editor;
+
+			DocumentContext DocumentContext {
 				get;
 				set;
 			}
 
-			public CompilationUnitDataProvider (Document document)
+			public CompilationUnitDataProvider (TextEditor editor, DocumentContext documentContext)
 			{
-				this.Document = document;
+				this.editor = editor;
+				this.DocumentContext = documentContext;
 			}
 
 			#region IListDataProvider implementation
@@ -393,7 +399,7 @@ namespace MonoDevelop.CSharp
 
 			public string GetMarkup (int n)
 			{
-				return GLib.Markup.EscapeText (Document.ParsedDocument.UserRegions.ElementAt (n).Name);
+				return GLib.Markup.EscapeText (DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n).Name);
 			}
 			
 			internal static Xwt.Drawing.Image Pixbuf {
@@ -409,22 +415,23 @@ namespace MonoDevelop.CSharp
 
 			public object GetTag (int n)
 			{
-				return Document.ParsedDocument.UserRegions.ElementAt (n);
+				return DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n);
 			}
 
 			public void ActivateItem (int n)
 			{
-				var reg = Document.ParsedDocument.UserRegions.ElementAt (n);
-				var extEditor = Document.GetContent<MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor> ();
-				if (extEditor != null)
-					extEditor.SetCaretTo (Math.Max (1, reg.Region.BeginLine), reg.Region.BeginColumn);
+				var reg = DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n);
+				var extEditor = editor;
+				if (extEditor != null) {
+					extEditor.SetCaretLocation(Math.Max (1, reg.Region.BeginLine), reg.Region.BeginColumn, true);
+				}
 			}
 
 			public int IconCount {
 				get {
-					if (Document.ParsedDocument == null)
+					if (DocumentContext.ParsedDocument == null)
 						return 0;
-					return Document.ParsedDocument.UserRegions.Count ();
+					return DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.Count ();
 				}
 			}
 
@@ -438,7 +445,7 @@ namespace MonoDevelop.CSharp
 			if (path == null || index < 0 || index >= path.Length)
 				return null;
 			var tag = path [index].Tag;
-			var window = new DropDownBoxListWindow (tag == null ? (DropDownBoxListWindow.IListDataProvider)new CompilationUnitDataProvider (Document) : new DataProvider (this, tag));
+			var window = new DropDownBoxListWindow (tag == null ? (DropDownBoxListWindow.IListDataProvider)new CompilationUnitDataProvider (Editor, DocumentContext) : new DataProvider (this, tag));
 			window.FixedRowHeight = 22;
 			window.MaxVisibleRows = 14;
 			window.SelectItem (path [index].Tag);
@@ -457,12 +464,19 @@ namespace MonoDevelop.CSharp
 			}
 		}
 
-		static PathEntry GetRegionEntry (ParsedDocument unit, Mono.TextEditor.DocumentLocation loc)
+		static PathEntry GetRegionEntry (ParsedDocument unit, DocumentLocation loc)
 		{
 			PathEntry entry;
-			if (!unit.UserRegions.Any ())
+			FoldingRegion reg;
+			try {
+				if (unit == null || !unit.GetUserRegionsAsync ().Result.Any ())
+					return null;
+				reg = unit.GetUserRegionsAsync ().Result.LastOrDefault (r => r.Region.Contains (loc));
+			} catch (AggregateException) {
 				return null;
-			var reg = unit.UserRegions.LastOrDefault (r => r.Region.IsInside (loc));
+			} catch (OperationCanceledException) {
+				return null;
+			}
 			if (reg == null) {
 				entry = new PathEntry (GettextCatalog.GetString ("No region"));
 			} else {
@@ -480,59 +494,57 @@ namespace MonoDevelop.CSharp
 			OnPathChanged (new DocumentPathChangedEventArgs (prev));	
 		}
 
-		EntityDeclaration lastType;
+		SyntaxNode lastType;
 		string lastTypeMarkup;
-		EntityDeclaration lastMember;
+		SyntaxNode lastMember;
 		string lastMemberMarkup;
 		MonoDevelop.Projects.Project lastProject;
 		AstAmbience amb;
 
-		string GetEntityMarkup (AstNode node)
+		string GetEntityMarkup (SyntaxNode node)
 		{
-			if (amb == null)
+			if (amb == null || node == null)
 				return "";
 			return amb.GetEntityMarkup (node);
 		}
 
-		void UpdatePath (object sender, Mono.TextEditor.DocumentLocationEventArgs e)
+
+		void UpdatePath (object sender, EventArgs e)
 		{
-			var parsedDocument = Document.ParsedDocument;
-			if (parsedDocument == null || parsedDocument.ParsedFile == null)
+			var parsedDocument = DocumentContext.ParsedDocument;
+			if (parsedDocument == null)
 				return;
-			amb = new AstAmbience (document.GetFormattingOptions ());
+			var caretOffset = Editor.CaretOffset;
+			var model = parsedDocument.GetAst<SemanticModel> ();
+			if (model == null)
+				return;
+			var unit = model.SyntaxTree;
+			amb = new AstAmbience (TypeSystemService.Workspace.Options);
 			
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
+			var loc = Editor.CaretLocation;
+//			var compExt = Editor.GetContent<CSharpCompletionTextEditorExtension> ();
+
+			var root = unit.GetRoot ();
+			SyntaxNode token;
+			try {
+				token = root.FindNode (TextSpan.FromBounds (caretOffset, caretOffset));
+			} catch (Exception) {
 				return;
-
-			var loc = Document.Editor.Caret.Location;
-			var compExt = Document.GetContent<CSharpCompletionTextEditorExtension> ();
-			var caretOffset = Document.Editor.Caret.Offset;
-			var segType = compExt.GetTypeAt (caretOffset);
-			if (segType != null)
-				loc = segType.Region.Begin;
-
-			var curType = (EntityDeclaration)unit.GetNodeAt (loc, n => n is TypeDeclaration || n is DelegateDeclaration);
-
-			var curProject = ownerProjects != null && ownerProjects.Count > 1 ? Document.Project : null;
-
-			var segMember = compExt.GetMemberAt (caretOffset);
-			if (segMember != null) {
-				loc = segMember.Region.Begin;
-			} else {
-				loc = Document.Editor.Caret.Location;
 			}
+			var curMember = token.AncestorsAndSelf ().FirstOrDefault (m => m is MemberDeclarationSyntax && !(m is NamespaceDeclarationSyntax));
+			var curType = token.AncestorsAndSelf ().FirstOrDefault (m => m is TypeDeclarationSyntax || m is DelegateDeclarationSyntax);
 
-			var curMember = unit.GetNodeAt<EntityDeclaration> (loc);
-			if (curType == curMember || curType is DelegateDeclaration)
+			var curProject = ownerProjects != null && ownerProjects.Count > 1 ? DocumentContext.Project : null;
+
+			if (curType == curMember || curType is DelegateDeclarationSyntax)
 				curMember = null;
 			if (isPathSet && curType == lastType && curMember == lastMember && curProject == lastProject)
 				return;
 
 			var curTypeMakeup = GetEntityMarkup (curType);
 			var curMemberMarkup = GetEntityMarkup (curMember);
-			if (isPathSet && curType != null && lastType != null && curType.StartLocation == lastType.StartLocation && curTypeMakeup == lastTypeMarkup &&
-				curMember != null && lastMember != null && curMember.StartLocation == lastMember.StartLocation && curMemberMarkup == lastMemberMarkup && curProject == lastProject)
+			if (isPathSet && curType != null && lastType != null && curTypeMakeup == lastTypeMarkup &&
+				curMember != null && lastMember != null && curMemberMarkup == lastMemberMarkup && curProject == lastProject)
 				return;
 
 			lastType = curType;
@@ -547,13 +559,13 @@ namespace MonoDevelop.CSharp
 
 			if (ownerProjects != null && ownerProjects.Count > 1) {
 				// Current project if there is more than one
-				result.Add (new PathEntry (ImageService.GetIcon (Document.Project.StockIcon, Gtk.IconSize.Menu), GLib.Markup.EscapeText (Document.Project.Name)) { Tag = Document.Project });
+				result.Add (new PathEntry (ImageService.GetIcon (DocumentContext.Project.StockIcon, Gtk.IconSize.Menu), GLib.Markup.EscapeText (DocumentContext.Project.Name)) { Tag = DocumentContext.Project });
 			}
 
 			if (curType == null) {
-				if (CurrentPath != null && CurrentPath.Length == 1 && CurrentPath [0].Tag is IUnresolvedFile)
+				if (CurrentPath != null && CurrentPath.Length == 1 && CurrentPath [0].Tag is CSharpSyntaxTree)
 					return;
-				if (CurrentPath != null && CurrentPath.Length == 2 && CurrentPath [1].Tag is IUnresolvedFile)
+				if (CurrentPath != null && CurrentPath.Length == 2 && CurrentPath [1].Tag is CSharpSyntaxTree)
 					return;
 				var prevPath = CurrentPath;
 				result.Add (new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = unit });
@@ -566,29 +578,33 @@ namespace MonoDevelop.CSharp
 				var type = curType;
 				var pos = result.Count;
 				while (type != null) {
-					var declaringType = type.Parent as TypeDeclaration;
-					result.Insert (pos, new PathEntry (ImageService.GetIcon (type.GetStockIcon (), Gtk.IconSize.Menu), GetEntityMarkup (type)) { Tag = (AstNode)declaringType ?? unit });
-					type = declaringType;
+					if (!(type is TypeDeclarationSyntax))
+						break;
+					result.Insert (pos, new PathEntry (ImageService.GetIcon (type.GetStockIcon (), Gtk.IconSize.Menu), GetEntityMarkup (type)) { Tag = (object)type ?? unit });
+					type = type.Parent;
 				}
 			}
 				
 			if (curMember != null) {
 				result.Add (new PathEntry (ImageService.GetIcon (curMember.GetStockIcon (), Gtk.IconSize.Menu), curMemberMarkup) { Tag = curMember });
-				if (curMember is Accessor) {
-					var parent = curMember.Parent as EntityDeclaration;
+				if (curMember.Kind () == SyntaxKind.GetAccessorDeclaration ||
+					curMember.Kind () == SyntaxKind.SetAccessorDeclaration ||
+					curMember.Kind () == SyntaxKind.AddAccessorDeclaration ||
+					curMember.Kind () == SyntaxKind.RemoveAccessorDeclaration) {
+					var parent = curMember.Parent;
 					if (parent != null)
 						result.Insert (result.Count - 1, new PathEntry (ImageService.GetIcon (parent.GetStockIcon (), Gtk.IconSize.Menu), GetEntityMarkup (parent)) { Tag = parent });
 				}
 			}
 				
-			var entry = GetRegionEntry (parsedDocument, loc);
+			var entry = GetRegionEntry (DocumentContext.ParsedDocument, loc);
 			if (entry != null)
 				result.Add (entry);
 				
 			PathEntry noSelection = null;
 			if (curType == null) {
 				noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = unit };
-			} else if (curMember == null && !(curType is DelegateDeclaration)) { 
+			} else if (curMember == null && !(curType is DelegateDeclarationSyntax)) { 
 				noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = curType };
 			}
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
index 4938335f00..c57f0e699d 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
@@ -26,31 +26,35 @@
 using System;
 using MonoDevelop.Ide.TypeSystem;
 using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
 using System.IO;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using System.Collections.Generic;
-using Mono.TextEditor.Highlighting;
-using Mono.TextEditor;
 using System.Linq;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.Semantics;
 using System.ComponentModel;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using System.Collections.Immutable;
+using MonoDevelop.NUnit;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor.Highlighting;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.CSharp
 {
 	class SignatureMarkupCreator
 	{
 		const double optionalAlpha = 0.7;
-		readonly CSharpResolver resolver;
-		readonly TypeSystemAstBuilder astBuilder;
-		readonly CSharpFormattingOptions formattingOptions;
+		readonly DocumentContext ctx;
+		readonly OptionSet options;
 		readonly ColorScheme colorStyle;
+		readonly int offset;
 
 		public bool BreakLineAfterReturnType {
 			get;
@@ -68,129 +72,148 @@ namespace MonoDevelop.CSharp
 			}
 		}
 
-		public SignatureMarkupCreator (CSharpResolver resolver, CSharpFormattingOptions formattingOptions)
+		public SignatureMarkupCreator (DocumentContext ctx, int offset)
 		{
+			this.offset = offset;
 			this.colorStyle = SyntaxModeService.GetColorStyle (MonoDevelop.Ide.IdeApp.Preferences.ColorScheme);
-
-			this.resolver = resolver;
-			this.astBuilder = new TypeSystemAstBuilder (resolver) {
-				ConvertUnboundTypeArguments = true,
-				UseAliases = false
-			};
-			this.formattingOptions = formattingOptions;
+			this.ctx = ctx;
+			if (ctx != null) {
+				if (ctx.ParsedDocument == null || ctx.AnalysisDocument == null) {
+					LoggingService.LogError ("Signature markup creator created with invalid context." + Environment.NewLine + Environment.StackTrace);
+				}
+				this.options = ctx.GetOptionSet ();
+			} else {
+				this.options = TypeSystemService.Workspace.Options;
+			}
 		}
 
-		public string GetTypeReferenceString (IType type, bool highlight = true)
+		public string GetTypeReferenceString (ITypeSymbol type, bool highlight = true)
 		{
 			if (type == null)
 				throw new ArgumentNullException ("type");
-			if (type.Kind == TypeKind.Null)
+			if (type.TypeKind == TypeKind.Error)
 				return "?";
-			if (type.Kind == TypeKind.Array) {
-				var arrayType = (ArrayType)type;
-				return GetTypeReferenceString (arrayType.ElementType, highlight) + "[" + new string (',', arrayType.Dimensions - 1) + "]";
+			if (type.TypeKind == TypeKind.Array) {
+				var arrayType = (IArrayTypeSymbol)type;
+				return GetTypeReferenceString (arrayType.ElementType, highlight) + "[" + new string (',', arrayType.Rank - 1) + "]";
 			}
-			if (type.Kind == TypeKind.Pointer)
-				return GetTypeReferenceString (((PointerType)type).ElementType, highlight) + "*";
-			AstType astType;
-			try {
-				astType = astBuilder.ConvertType (type);
-			} catch (Exception e) {
-				var compilation = GetCompilation (type);
-				if (compilation == null) {
-					LoggingService.LogWarning ("type:" + type.GetType (), e);
-					return "?";
+			if (type.TypeKind == TypeKind.Pointer)
+				return GetTypeReferenceString (((IPointerTypeSymbol)type).PointedAtType, highlight) + "*";
+			string displayString;
+
+			if (ctx != null) {
+				SemanticModel model = null;
+				var parsedDocument = ctx.ParsedDocument;
+				if (parsedDocument != null) {
+					model = parsedDocument.GetAst<SemanticModel> () ?? ctx.AnalysisDocument.GetSemanticModelAsync ().Result;
 				}
-				astType = new TypeSystemAstBuilder (new CSharpResolver (compilation)).ConvertType (type);
+				//Math.Min (model.SyntaxTree.Length, offset)) is needed in case parsedDocument.GetAst<SemanticModel> () is outdated
+				//this is tradeoff between performance and consistency between editor text(offset) and model, since
+				//ToMinimalDisplayString can use little outdated model this is fine
+				//but in case of Sketches where user usually is at end of document when typing text this can throw exception
+				//because offset can be >= Length
+				displayString = model != null ? type.ToMinimalDisplayString (model, Math.Min (model.SyntaxTree.Length, offset)) : type.Name;
+			} else {
+				displayString = type.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat);
 			}
 
-			if (astType is PrimitiveType) {
-				return Highlight (astType.ToString (formattingOptions), colorStyle.KeywordTypes);
-			}
-			var text = AmbienceService.EscapeText (astType.ToString (formattingOptions));
+			var text = Ambience.EscapeText (displayString);
 			return highlight ? HighlightSemantically (text, colorStyle.UserTypes) : text;
 		}
 
-		static ICompilation GetCompilation (IType type)
-		{
-			var def = type.GetDefinition ();
-			if (def == null) {	
-				var t = type;
-				while (t is TypeWithElementType) {
-					t = ((TypeWithElementType)t).ElementType;
-				}
-				if (t != null)
-					def = t.GetDefinition ();
-			}
-			if (def != null)
-				return def.Compilation;
-			return null;
-		}
-
-		public string GetMarkup (IType type)
+//		static ICompilation GetCompilation (IType type)
+//		{
+//			var def = type.GetDefinition ();
+//			if (def == null) {	
+//				var t = type;
+//				while (t is TypeWithElementType) {
+//					t = ((TypeWithElementType)t).ElementType;
+//				}
+//				if (t != null)
+//					def = t.GetDefinition ();
+//			}
+//			if (def != null)
+//				return def.Compilation;
+//			return null;
+//		}
+
+		public string GetMarkup (ITypeSymbol type)
 		{
 			if (type == null)
 				throw new ArgumentNullException ("entity");
 			return GetTypeMarkup (type);
 		}
 
-		public string GetMarkup (IEntity entity)
+
+		public string GetMarkup (Microsoft.CodeAnalysis.ISymbol entity)
 		{
 			if (entity == null)
 				throw new ArgumentNullException ("entity");
 			string result;
-			switch (entity.SymbolKind) {
-			case SymbolKind.TypeDefinition:
-				result = GetTypeMarkup ((ITypeDefinition)entity);
+			switch (entity.Kind) {
+			case Microsoft.CodeAnalysis.SymbolKind.NamedType:
+				result = GetTypeMarkup ((ITypeSymbol)entity);
 				break;
-			case SymbolKind.Field:
-				result = GetFieldMarkup ((IField)entity);
+			case Microsoft.CodeAnalysis.SymbolKind.Field:
+				result = GetFieldMarkup ((IFieldSymbol)entity);
 				break;
-			case SymbolKind.Property:
-			case SymbolKind.Indexer:
-				result = GetPropertyMarkup ((IProperty)entity);
+			case Microsoft.CodeAnalysis.SymbolKind.Property:
+				result = GetPropertyMarkup ((IPropertySymbol)entity);
 				break;
-			case SymbolKind.Event:
-				result = GetEventMarkup ((IEvent)entity);
+			case Microsoft.CodeAnalysis.SymbolKind.Event:
+				result = GetEventMarkup ((IEventSymbol)entity);
 				break;
-			case SymbolKind.Method:
-			case SymbolKind.Operator:
-				result = GetMethodMarkup ((IMethod)entity);
+			case Microsoft.CodeAnalysis.SymbolKind.Method:
+				var method = (IMethodSymbol)entity;
+				switch (method.MethodKind) {
+				case MethodKind.Constructor:
+					result = GetConstructorMarkup (method);
+					break;
+				case MethodKind.Destructor:
+					result = GetDestructorMarkup (method);
+					break;
+				default:
+					result = GetMethodMarkup (method);
+					break;
+				}
 				break;
-			case SymbolKind.Constructor:
-				result = GetConstructorMarkup ((IMethod)entity);
+			case Microsoft.CodeAnalysis.SymbolKind.Namespace:
+				result = GetNamespaceMarkup ((INamespaceSymbol)entity);
 				break;
-			case SymbolKind.Destructor:
-				result = GetDestructorMarkup ((IMethod)entity);
+			case Microsoft.CodeAnalysis.SymbolKind.Local:
+				result = GetLocalVariableMarkup ((ILocalSymbol)entity);
+				break;
+			case Microsoft.CodeAnalysis.SymbolKind.Parameter:
+				result = GetParameterVariableMarkup ((IParameterSymbol)entity);
 				break;
 			default:
-				throw new ArgumentOutOfRangeException ();
-			}
-			string reason;
-			if (entity.IsObsolete (out reason)) {
-				var attr = reason == null ? "[Obsolete]" : "[Obsolete(\"" + reason + "\")]";
-				result = "<span size=\"smaller\">" + attr + "</span>" + Environment.NewLine + result;
+				Console.WriteLine (entity.Kind);
+				return null;
 			}
+			// TODO
+//			if (entity.IsObsolete (out reason)) {
+//				var attr = reason == null ? "[Obsolete]" : "[Obsolete(\"" + reason + "\")]";
+//				result = "<span size=\"smaller\">" + attr + "</span>" + Environment.NewLine + result;
+//			}
 			return result;
 		}
 
-		public string GetMarkup (INamespace ns)
+		string GetNamespaceMarkup (INamespaceSymbol ns)
 		{
 			var result = new StringBuilder ();
 			result.Append (Highlight ("namespace ", colorStyle.KeywordNamespace));
-			result.Append (ns.FullName);
+			result.Append (ns.Name);
 
 			return result.ToString ();
 		}
-
-		void AppendModifiers (StringBuilder result, IEntity entity)
+		void AppendModifiers (StringBuilder result, ISymbol entity)
 		{
-			if (entity.DeclaringType != null && entity.DeclaringType.Kind == TypeKind.Interface)
+			if (entity.ContainingType != null && entity.ContainingType.TypeKind == TypeKind.Interface)
 				return;
 
-			switch (entity.Accessibility) {
+			switch (entity.DeclaredAccessibility) {
 			case Accessibility.Internal:
-				if (entity.SymbolKind != SymbolKind.TypeDefinition)
+				if (entity.Kind != SymbolKind.NamedType)
 					result.Append (Highlight ("internal ", colorStyle.KeywordModifiers));
 				break;
 			case Accessibility.ProtectedAndInternal:
@@ -210,35 +233,41 @@ namespace MonoDevelop.CSharp
 				result.Append (Highlight ("public ", colorStyle.KeywordModifiers));
 				break;
 			}
-			var field = entity as IField;
-
+			var field = entity as IFieldSymbol;
+			
 			if (field != null) {
-				if (field.IsFixed) {
+				//  TODO!!!!
+				/*if (field.IsFixed) {
 					result.Append (Highlight ("fixed ", colorStyle.KeywordModifiers));
-				} else if (field.IsConst) {
+				} else*/
+				if (field.IsConst) {
 					result.Append (Highlight ("const ", colorStyle.KeywordModifiers));
 				}
 			} else if (entity.IsStatic) {
 				result.Append (Highlight ("static ", colorStyle.KeywordModifiers));
 			} else if (entity.IsSealed) {
-				if (!(entity is IType && ((IType)entity).Kind == TypeKind.Delegate))
+				if (!(entity is ITypeSymbol && ((ITypeSymbol)entity).TypeKind == TypeKind.Delegate))
 					result.Append (Highlight ("sealed ", colorStyle.KeywordModifiers));
 			} else if (entity.IsAbstract) {
-				if (!(entity is IType && ((IType)entity).Kind == TypeKind.Interface))
+				if (!(entity is ITypeSymbol && ((ITypeSymbol)entity).TypeKind == TypeKind.Interface))
 					result.Append (Highlight ("abstract ", colorStyle.KeywordModifiers));
 			}
 
+//  TODO!!!!
+//			if (entity.IsShadowing)
+//				result.Append (Highlight ("new ", colorStyle.KeywordModifiers));
 
-			if (entity.IsShadowing)
-				result.Append (Highlight ("new ", colorStyle.KeywordModifiers));
-
-			var member = entity as IMember;
-			if (member != null) {
-				if (member.IsOverride) {
+			var method = entity as IMethodSymbol;
+			if (method != null) {
+				if (method.IsOverride) {
 					result.Append (Highlight ("override ", colorStyle.KeywordModifiers));
-				} else if (member.IsVirtual) {
+				} else if (method.IsVirtual) {
 					result.Append (Highlight ("virtual ", colorStyle.KeywordModifiers));
 				}
+				if (method.IsAsync)
+					result.Append (Highlight ("async ", colorStyle.KeywordModifiers));
+				if (method.PartialDefinitionPart != null || method.PartialImplementationPart != null)
+					result.Append (Highlight ("partial ", colorStyle.KeywordModifiers));
 			}
 			if (field != null) {
 				if (field.IsVolatile)
@@ -247,18 +276,11 @@ namespace MonoDevelop.CSharp
 					result.Append (Highlight ("readonly ", colorStyle.KeywordModifiers));
 			}
 
-			var method = entity as IMethod;
-			if (method != null) {
-				if (method.IsAsync)
-					result.Append (Highlight ("async ", colorStyle.KeywordModifiers));
-				if (method.IsPartial)
-					result.Append (Highlight ("partial ", colorStyle.KeywordModifiers));
-			}
 		}
 
-		void AppendAccessibility (StringBuilder result, IMethod entity)
+		void AppendAccessibility (StringBuilder result, IMethodSymbol entity)
 		{
-			switch (entity.Accessibility) {
+			switch (entity.DeclaredAccessibility) {
 			case Accessibility.Internal:
 				result.Append (Highlight ("internal", colorStyle.KeywordModifiers));
 				break;
@@ -309,13 +331,12 @@ namespace MonoDevelop.CSharp
 			return result;
 		}
 
-		static bool IsObjectOrValueType (IType type)
+		static bool IsObjectOrValueType (ITypeSymbol type)
 		{
-			var d = type.GetDefinition ();
-			return d != null && (d.KnownTypeCode == KnownTypeCode.Object || d.KnownTypeCode == KnownTypeCode.ValueType);
+			return type != null && (type.SpecialType == SpecialType.System_Object || type.IsValueType);
 		}
 
-		string GetTypeParameterMarkup (IType t)
+		string GetTypeParameterMarkup (ITypeSymbol t)
 		{
 			if (t == null)
 				throw new ArgumentNullException ("t");
@@ -324,12 +345,12 @@ namespace MonoDevelop.CSharp
 			result.Append (highlightedTypeName);
 
 			var color = AlphaBlend (colorStyle.PlainText.Foreground, colorStyle.PlainText.Background, optionalAlpha);
-			var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);
+			var colorString = MonoDevelop.Components.HelperMethods.GetColorString (color);
 
 			result.Append ("<span foreground=\"" + colorString + "\">" + " (type parameter)</span>");
-			var tp = t as ITypeParameter;
+			var tp = t as ITypeParameterSymbol;
 			if (tp != null) {
-				if (!tp.HasDefaultConstructorConstraint && !tp.HasReferenceTypeConstraint && !tp.HasValueTypeConstraint && tp.DirectBaseTypes.All (IsObjectOrValueType))
+				if (!tp.HasConstructorConstraint && !tp.HasReferenceTypeConstraint && !tp.HasValueTypeConstraint && tp.ConstraintTypes.All (IsObjectOrValueType))
 					return result.ToString ();
 				result.AppendLine ();
 				result.Append (Highlight (" where ", colorStyle.KeywordContext));
@@ -344,7 +365,7 @@ namespace MonoDevelop.CSharp
 					constraints++;
 					result.Append (Highlight ("struct", colorStyle.KeywordDeclaration));
 				}
-				foreach (var bt in tp.DirectBaseTypes) {
+				foreach (var bt in tp.ConstraintTypes) {
 					if (!IsObjectOrValueType (bt)) {
 						if (constraints > 0) {
 							result.Append (",");
@@ -357,7 +378,7 @@ namespace MonoDevelop.CSharp
 						result.Append (GetTypeReferenceString (bt));
 					}
 				}
-				if (tp.HasDefaultConstructorConstraint) {
+				if (tp.HasConstructorConstraint) {
 					if (constraints > 0)
 						result.Append (",");
 					result.Append (Highlight ("new", colorStyle.KeywordOperators));
@@ -367,62 +388,70 @@ namespace MonoDevelop.CSharp
 			return result.ToString ();
 		}
 
-		string GetNullableMarkup (IType t)
+		string GetNullableMarkup (ITypeSymbol t)
 		{
 			var result = new StringBuilder ();
 			result.Append (GetTypeReferenceString (t));
 			return result.ToString ();
 		}
 
-		void AppendTypeParameterList (StringBuilder result, ITypeDefinition def)
+		void AppendTypeParameterList (StringBuilder result, INamedTypeSymbol def)
 		{
-			IEnumerable<ITypeParameter> parameters = def.TypeParameters;
-			if (def.DeclaringTypeDefinition != null)
-				parameters = parameters.Skip (def.DeclaringTypeDefinition.TypeParameterCount);
+			var parameters = def.TypeParameters;
+//			if (def.ContainingType != null)
+//				parameters = parameters.Skip (def.DeclaringTypeDefinition.TypeParameterCount);
 			AppendTypeParameters (result, parameters);
 		}
 
-		void AppendTypeArgumentList (StringBuilder result, IType def)
+		void AppendTypeArgumentList (StringBuilder result, INamedTypeSymbol def)
 		{
-			IEnumerable<IType> parameters = def.TypeArguments;
-			if (def.DeclaringType != null)
-				parameters = parameters.Skip (def.DeclaringType.TypeParameterCount);
+			var parameters = def.TypeArguments;
+//			if (def.DeclaringType != null)
+//				parameters = parameters.Skip (def.DeclaringType.TypeParameterCount);
 			AppendTypeParameters (result, parameters);
 		}
 
-		string GetTypeNameWithParameters (IType t)
+		string GetTypeNameWithParameters (ITypeSymbol t)
 		{
 			StringBuilder result = new StringBuilder ();
 			result.Append (Highlight (FilterEntityName (t.Name), colorStyle.UserTypesTypeParameters));
-			if (t.TypeParameterCount > 0) {
-				if (t.TypeArguments.Count > 0) {
-					AppendTypeArgumentList (result, t);
-				} else {
-					AppendTypeParameterList (result, t.GetDefinition ());
+			var namedTypeSymbol = t as INamedTypeSymbol;
+			if (namedTypeSymbol != null) {
+				if (namedTypeSymbol.IsGenericType) {
+					AppendTypeParameterList (result, namedTypeSymbol);
+				} else if (namedTypeSymbol.IsUnboundGenericType) {
+					AppendTypeArgumentList (result, namedTypeSymbol);
 				}
 			}
 			return result.ToString ();
 		}
+		
+		public static bool IsNullableType (ITypeSymbol type)
+		{
+			var original = type.OriginalDefinition;
+			return original.SpecialType == SpecialType.System_Nullable_T;
+		}
+
 
-		string GetTypeMarkup (IType t, bool includeDeclaringTypes = false)
+		string GetTypeMarkup (ITypeSymbol t, bool includeDeclaringTypes = false)
 		{
 			if (t == null)
 				throw new ArgumentNullException ("t");
-			if (t.Kind == TypeKind.Null)
+			if (t.TypeKind == TypeKind.Error)
 				return "Type can not be resolved.";
-			if (t.Kind == TypeKind.Delegate)
-				return GetDelegateMarkup (t);
-			if (t.Kind == TypeKind.TypeParameter)
+			if (t.TypeKind == TypeKind.Delegate)
+				return GetDelegateMarkup ((INamedTypeSymbol)t);
+			if (t.TypeKind == TypeKind.TypeParameter)
 				return GetTypeParameterMarkup (t);
-			if (t.Kind == TypeKind.Array || t.Kind == TypeKind.Pointer)
+			if (t.TypeKind == TypeKind.Array || t.TypeKind == TypeKind.Pointer)
 				return GetTypeReferenceString (t);
-			if (NullableType.IsNullable (t))
+			if (t.SpecialType == SpecialType.System_Nullable_T)
 				return GetNullableMarkup (t);
 			var result = new StringBuilder ();
-			if (t.GetDefinition () != null)
-				AppendModifiers (result, t.GetDefinition ());
+			if (IsNullableType (t))
+				AppendModifiers (result, t);
 
-			switch (t.Kind) {
+			switch (t.TypeKind) {
 			case TypeKind.Class:
 				result.Append (Highlight ("class ", colorStyle.KeywordDeclaration));
 				break;
@@ -442,7 +471,7 @@ namespace MonoDevelop.CSharp
 				var curType = t;
 				while (curType != null) {
 					typeNames.Add (GetTypeNameWithParameters (curType));
-					curType = curType.DeclaringType;
+					curType = curType.ContainingType;
 				}
 				typeNames.Reverse ();
 				result.Append (string.Join (".", typeNames));
@@ -450,21 +479,26 @@ namespace MonoDevelop.CSharp
 				result.Append (GetTypeNameWithParameters (t));
 			}
 
-			if (t.Kind == TypeKind.Array)
+			if (t.TypeKind == TypeKind.Array)
 				return result.ToString ();
 
 			bool first = true;
 			int maxLength = GetMarkupLength (result.ToString ());
 			int length = maxLength;
-			var sortedTypes = new List<IType> (t.DirectBaseTypes.Where (x => x.FullName != "System.Object"));
+			var sortedTypes = new List<INamedTypeSymbol> (t.Interfaces);
+		
 			sortedTypes.Sort ((x, y) => GetTypeReferenceString (y).Length.CompareTo (GetTypeReferenceString (x).Length));
-			if (t.Kind != TypeKind.Enum) {
+			
+			if (t.BaseType != null && t.BaseType.SpecialType != SpecialType.System_Object)
+				sortedTypes.Insert (0, t.BaseType);
+			
+			if (t.TypeKind != TypeKind.Enum) {
 				foreach (var directBaseType in sortedTypes) {
 					if (first) {
 						result.AppendLine (" :");
 						result.Append ("  ");
 						length = 2;
-					} else {
+					} else { // 5.5. um 10:45
 						result.Append (", ");
 						length += 2;
 					}
@@ -481,8 +515,8 @@ namespace MonoDevelop.CSharp
 					first = false;
 				}
 			} else { 
-				var enumBase = t.GetDefinition ().EnumUnderlyingType;
-				if (enumBase.Name != "Int32") {
+				var enumBase = t.BaseType;
+				if (enumBase.SpecialType != SpecialType.System_Int32) {
 					result.AppendLine (" :");
 					result.Append ("  ");
 					result.Append (GetTypeReferenceString (enumBase, false));
@@ -492,7 +526,7 @@ namespace MonoDevelop.CSharp
 			return result.ToString ();
 		}
 
-		void AppendTypeParameters (StringBuilder result, IEnumerable<ITypeParameter> typeParameters)
+		void AppendTypeParameters (StringBuilder result, ImmutableArray<ITypeParameterSymbol> typeParameters)
 		{
 			if (!typeParameters.Any ())
 				return;
@@ -514,7 +548,7 @@ namespace MonoDevelop.CSharp
 			result.Append ("&gt;");
 		}
 
-		void AppendTypeParameters (StringBuilder result, IEnumerable<IType> typeParameters)
+		void AppendTypeParameters (StringBuilder result, ImmutableArray<ITypeSymbol> typeParameters)
 		{
 			if (!typeParameters.Any ())
 				return;
@@ -529,8 +563,8 @@ namespace MonoDevelop.CSharp
 						result.Append (", ");
 					}
 				}
-				if (typeParameter is ITypeParameter)
-					AppendVariance (result, ((ITypeParameter)typeParameter).Variance);
+				if (typeParameter is ITypeParameterSymbol)
+					AppendVariance (result, ((ITypeParameterSymbol)typeParameter).Variance);
 				result.Append (GetTypeReferenceString (typeParameter, false));
 				i++;
 			}
@@ -539,14 +573,14 @@ namespace MonoDevelop.CSharp
 
 		static string FilterEntityName (string name)
 		{
-			return AmbienceService.EscapeText (CSharpAmbience.FilterName (name));
+			return Ambience.EscapeText (CSharpAmbience.FilterName (name));
 		}
 
-		public string GetDelegateInfo (IType type)
+		public string GetDelegateInfo (ITypeSymbol type)
 		{
 			if (type == null)
-				throw new ArgumentNullException ("returnType");
-			var t = type.GetDefinition ();
+				throw new ArgumentNullException ("type");
+			var t = type;
 
 			var result = new StringBuilder ();
 			
@@ -563,25 +597,32 @@ namespace MonoDevelop.CSharp
 			
 			AppendTypeParameters (result, method.TypeParameters);
 
-			if (formattingOptions.SpaceBeforeDelegateDeclarationParentheses)
-				result.Append (" ");
+			// TODO:
+//			if (document.GetOptionSet ().GetOption (CSharpFormattingOptions.SpaceBeforeDelegateDeclarationParentheses))
+//				result.Append (" ");
 			
 			result.Append ('(');
-			AppendParameterList (result, method.Parameters, formattingOptions.SpaceBeforeDelegateDeclarationParameterComma, formattingOptions.SpaceAfterDelegateDeclarationParameterComma, false);
+			AppendParameterList (
+				result, 
+				method.Parameters, 
+				false /* formattingOptions.SpaceBeforeDelegateDeclarationParameterComma */, 
+				true /* formattingOptions.SpaceAfterDelegateDeclarationParameterComma*/, 
+				false
+			);
 			result.Append (')');
 			return result.ToString ();
 		}
 
-		string GetDelegateMarkup (IType delegateType)
+		string GetDelegateMarkup (INamedTypeSymbol delegateType)
 		{
 			var result = new StringBuilder ();
-			
-			var method = delegateType.GetDelegateInvokeMethod ();
+			var type = delegateType.IsUnboundGenericType ? delegateType.OriginalDefinition : delegateType;
+			var method = type.GetDelegateInvokeMethod ();
 
-			if (delegateType.GetDefinition () != null)
-				AppendModifiers (result, delegateType.GetDefinition ());
+			AppendModifiers (result, type);
 			result.Append (Highlight ("delegate ", colorStyle.KeywordDeclaration));
-			result.Append (GetTypeReferenceString (method.ReturnType));
+			if (method != null)
+				result.Append (GetTypeReferenceString (method.ReturnType));
 			if (BreakLineAfterReturnType) {
 				result.AppendLine ();
 			} else {
@@ -589,67 +630,91 @@ namespace MonoDevelop.CSharp
 			}
 			
 			
-			result.Append (FilterEntityName (delegateType.Name));
-
-			if (delegateType.TypeArguments.Count > 0) {
-				AppendTypeArgumentList (result, delegateType);
+			result.Append (FilterEntityName (type.Name));
+			
+			if (type.TypeArguments.Length > 0) {
+				AppendTypeArgumentList (result, type);
 			} else {
-				AppendTypeParameterList (result, delegateType.GetDefinition ());
+				AppendTypeParameterList (result, type);
 			}
-
-			if (formattingOptions.SpaceBeforeMethodDeclarationParameterComma)
-				result.Append (" ");
+//  TODO
+//			if (formattingOptions.SpaceBeforeMethodDeclarationParameterComma)
+//				result.Append (" ");
 			
 			result.Append ('(');
-			AppendParameterList (result, method.Parameters, formattingOptions.SpaceBeforeDelegateDeclarationParameterComma, formattingOptions.SpaceAfterDelegateDeclarationParameterComma);
+			AppendParameterList (
+				result, 
+				method.Parameters, 
+				false /* formattingOptions.SpaceBeforeDelegateDeclarationParameterComma */, 
+				false /* formattingOptions.SpaceAfterDelegateDeclarationParameterComma */);
 			result.Append (')');
 			return result.ToString ();
 		}
 
-		public string GetLocalVariableMarkup (IVariable variable)
+		string GetLocalVariableMarkup (ILocalSymbol local)
 		{
-			if (variable == null)
-				throw new ArgumentNullException ("field");
+			if (local == null)
+				throw new ArgumentNullException ("local");
 			
 			var result = new StringBuilder ();
 
-			if (variable.IsConst)
+			if (local.IsConst)
 				result.Append (Highlight ("const ", colorStyle.KeywordModifiers));
 
-			result.Append (GetTypeReferenceString (variable.Type));
+			result.Append (GetTypeReferenceString (local.Type));
 			if (BreakLineAfterReturnType) {
 				result.AppendLine ();
 			} else {
 				result.Append (" ");
 			}
 	
-			result.Append (FilterEntityName (variable.Name));
+			result.Append (FilterEntityName (local.Name));
+			
+			if (local.IsConst) {
+				if (options.GetOption (CSharpFormattingOptions.SpacingAroundBinaryOperator) == BinaryOperatorSpacingOptions.Single) {
+					result.Append (" = ");
+				} else {
+					result.Append ("=");
+				}
+				AppendConstant (result, local.Type, local.ConstantValue);
+			}
 			
-			if (variable.IsConst) {
-				if (formattingOptions.SpaceAroundAssignment) {
+			return result.ToString ();
+		}
+		
+		string GetParameterVariableMarkup (IParameterSymbol parameter)
+		{
+			if (parameter == null)
+				throw new ArgumentNullException ("parameter");
+			
+			var result = new StringBuilder ();
+			AppendParameter (result, parameter);
+			
+			if (parameter.HasExplicitDefaultValue) {
+				if (options.GetOption (CSharpFormattingOptions.SpacingAroundBinaryOperator) == BinaryOperatorSpacingOptions.Single) {
 					result.Append (" = ");
 				} else {
 					result.Append ("=");
 				}
-				AppendConstant (result, variable.Type, variable.ConstantValue);
+				AppendConstant (result, parameter.Type, parameter.ExplicitDefaultValue);
 			}
 			
 			return result.ToString ();
 		}
 
 
-		string GetFieldMarkup (IField field)
+		string GetFieldMarkup (IFieldSymbol field)
 		{
 			if (field == null)
 				throw new ArgumentNullException ("field");
 
 			var result = new StringBuilder ();
-			bool isEnum = field.DeclaringTypeDefinition != null && field.DeclaringTypeDefinition.Kind == TypeKind.Enum;
+			bool isEnum = field.ContainingType.TypeKind == TypeKind.Enum;
 			if (!isEnum) {
 				AppendModifiers (result, field);
-				result.Append (GetTypeReferenceString (field.ReturnType));
+				result.Append (GetTypeReferenceString (field.Type));
 			} else {
-				result.Append (GetTypeReferenceString (field.DeclaringType));
+				result.Append (GetTypeReferenceString (field.ContainingType));
 			}
 			if (BreakLineAfterReturnType) {
 				result.AppendLine ();
@@ -659,34 +724,36 @@ namespace MonoDevelop.CSharp
 
 			result.Append (HighlightSemantically (FilterEntityName (field.Name), colorStyle.UserFieldDeclaration));
 
-			if (field.IsFixed) {
-				if (formattingOptions.SpaceBeforeArrayDeclarationBrackets) {
-					result.Append (" [");
-				} else {
-					result.Append ("[");
-				}
-				if (formattingOptions.SpacesWithinBrackets)
-					result.Append (" ");
-				AppendConstant (result, field.Type, field.ConstantValue);
-				if (formattingOptions.SpacesWithinBrackets)
-					result.Append (" ");
-				result.Append ("]");
-			} else if (field.IsConst) {
-				if (isEnum && !(field.DeclaringTypeDefinition.Attributes.Any (attr => attr.AttributeType.FullName == "System.FlagsAttribute"))) {
+//			if (field.IsFixed) {
+//				if (formattingOptions.SpaceBeforeArrayDeclarationBrackets) {
+//					result.Append (" [");
+//				} else {
+//					result.Append ("[");
+//				}
+//				if (formattingOptions.SpacesWithinBrackets)
+//					result.Append (" ");
+//				AppendConstant (result, field.Type, field.ConstantValue);
+//				if (formattingOptions.SpacesWithinBrackets)
+//					result.Append (" ");
+//				result.Append ("]");
+//			} else 
+			
+			if (field.IsConst) {
+				if (isEnum && !(field.ContainingType.GetAttributes ().Any ((AttributeData attr) => attr.AttributeClass.Name == "FlagsAttribute" && attr.AttributeClass.ContainingNamespace.Name == "System"))) {
 					return result.ToString ();
 				}
-				if (formattingOptions.SpaceAroundAssignment) {
+				if (options.GetOption (CSharpFormattingOptions.SpacingAroundBinaryOperator) == BinaryOperatorSpacingOptions.Single) {
 					result.Append (" = ");
 				} else {
 					result.Append ("=");
 				}
-				AppendConstant (result, field.Type, field.ConstantValue, field.DeclaringType.Kind == TypeKind.Enum);
+				AppendConstant (result, field.Type, field.ConstantValue, isEnum);
 			}
 
 			return result.ToString ();
 		}
 
-		string GetMethodMarkup (IMethod method)
+		string GetMethodMarkup (IMethodSymbol method)
 		{
 			if (method == null)
 				throw new ArgumentNullException ("method");
@@ -700,17 +767,17 @@ namespace MonoDevelop.CSharp
 				result.Append (" ");
 			}
 
-			AppendExplicitInterfaces (result, method);
+			AppendExplicitInterfaces (result, method.ExplicitInterfaceImplementations.Cast<ISymbol> ());
 
-			if (method.SymbolKind == SymbolKind.Operator) {
+			if (method.MethodKind == MethodKind.BuiltinOperator || method.MethodKind == MethodKind.UserDefinedOperator) {
 				result.Append ("operator ");
 				result.Append (CSharpAmbience.GetOperator (method.Name));
 			} else {
 				result.Append (HighlightSemantically (FilterEntityName (method.Name), colorStyle.UserMethodDeclaration));
 			}
-			if (method.TypeArguments.Count > 0) {
+			if (method.TypeArguments.Length > 0) {
 				result.Append ("&lt;");
-				for (int i = 0; i < method.TypeArguments.Count; i++) {
+				for (int i = 0; i < method.TypeArguments.Length; i++) {
 					if (i > 0)
 						result.Append (", ");
 					result.Append (HighlightSemantically (GetTypeReferenceString (method.TypeArguments [i], false), colorStyle.UserTypes));
@@ -719,18 +786,20 @@ namespace MonoDevelop.CSharp
 			} else {
 				AppendTypeParameters (result, method.TypeParameters);
 			}
-
-			if (formattingOptions.SpaceBeforeMethodDeclarationParentheses)
-				result.Append (" ");
+// TODO!
+//			if (formattingOptions.SpaceBeforeMethodDeclarationParentheses)
+//				result.Append (" ");
 
 			result.Append ('(');
-			IList<IParameter> parameters = method.Parameters;
-			AppendParameterList (result, parameters, formattingOptions.SpaceBeforeMethodDeclarationParameterComma, formattingOptions.SpaceAfterMethodDeclarationParameterComma);
+			var parameters = method.Parameters;
+			AppendParameterList (result, parameters, 
+				false /* formattingOptions.SpaceBeforeMethodDeclarationParameterComma*/, 
+				false /* formattingOptions.SpaceAfterMethodDeclarationParameterComma*/);
 			result.Append (')');
 			return result.ToString ();
 		}
 
-		string GetConstructorMarkup (IMethod method)
+		string GetConstructorMarkup (IMethodSymbol method)
 		{
 			if (method == null)
 				throw new ArgumentNullException ("method");
@@ -739,24 +808,28 @@ namespace MonoDevelop.CSharp
 			var result = new StringBuilder ();
 			AppendModifiers (result, method);
 
-			result.Append (FilterEntityName (method.DeclaringType.Name));
-
-			if (formattingOptions.SpaceBeforeConstructorDeclarationParentheses)
-				result.Append (" ");
+			result.Append (FilterEntityName (method.ContainingType.Name));
+//
+//			if (formattingOptions.SpaceBeforeConstructorDeclarationParentheses)
+//				result.Append (" ");
 
 			result.Append ('(');
-			if (method.DeclaringType.Kind == TypeKind.Delegate) {
+			if (method.ContainingType.TypeKind == TypeKind.Delegate) {
 				result.Append (Highlight ("delegate", colorStyle.KeywordDeclaration) + " (");
-				AppendParameterList (result, method.DeclaringType.GetDelegateInvokeMethod ().Parameters, formattingOptions.SpaceBeforeConstructorDeclarationParameterComma, formattingOptions.SpaceAfterConstructorDeclarationParameterComma);
+				AppendParameterList (result, method.ContainingType.GetDelegateInvokeMethod ().Parameters, 
+					false /* formattingOptions.SpaceBeforeConstructorDeclarationParameterComma */,
+					false /* formattingOptions.SpaceAfterConstructorDeclarationParameterComma */);
 				result.Append (")");
 			} else {
-				AppendParameterList (result, method.Parameters, formattingOptions.SpaceBeforeConstructorDeclarationParameterComma, formattingOptions.SpaceAfterConstructorDeclarationParameterComma);
+				AppendParameterList (result, method.Parameters, 
+					false /* formattingOptions.SpaceBeforeConstructorDeclarationParameterComma */,
+					false /* formattingOptions.SpaceAfterConstructorDeclarationParameterComma */);
 			}
 			result.Append (')');
 			return result.ToString ();
 		}
 
-		string GetDestructorMarkup (IMethod method)
+		string GetDestructorMarkup (IMethodSymbol method)
 		{
 			if (method == null)
 				throw new ArgumentNullException ("method");
@@ -770,68 +843,75 @@ namespace MonoDevelop.CSharp
 			}
 			
 			result.Append ("~");
-			result.Append (FilterEntityName (method.DeclaringType.Name));
+			result.Append (FilterEntityName (method.ContainingType.Name));
 			
-			if (formattingOptions.SpaceBeforeConstructorDeclarationParentheses)
-				result.Append (" ");
+//			if (formattingOptions.SpaceBeforeConstructorDeclarationParentheses)
+//				result.Append (" ");
 			
 			result.Append ('(');
-			AppendParameterList (result, method.Parameters, formattingOptions.SpaceBeforeConstructorDeclarationParameterComma, formattingOptions.SpaceAfterConstructorDeclarationParameterComma);
+			AppendParameterList (result, method.Parameters, 
+				false /* formattingOptions.SpaceBeforeConstructorDeclarationParameterComma */, 
+				false /* formattingOptions.SpaceAfterConstructorDeclarationParameterComma */);
 			result.Append (')');
 			return result.ToString ();
 		}
 
-		bool IsAccessibleOrHasSourceCode (IEntity entity)
+		bool IsAccessibleOrHasSourceCode (ISymbol entity)
 		{
-			if (!entity.Region.Begin.IsEmpty)
-				return true;
-			var lookup = new MemberLookup (resolver.CurrentTypeDefinition, resolver.Compilation.MainAssembly);
-			return lookup.IsAccessible (entity, false);
+			if (entity.DeclaredAccessibility == Accessibility.Public)
+				return true;	
+			return entity.IsDefinedInSource ();
+//			if (!entity.Region.Begin.IsEmpty)
+//				return true;
+//			var lookup = new MemberLookup (resolver.CurrentTypeDefinition, resolver.Compilation.MainAssembly);
+//			return lookup.IsAccessible (entity, false);
 		}
 
-		string GetPropertyMarkup (IProperty property)
+		string GetPropertyMarkup (IPropertySymbol property)
 		{
 			if (property == null)
 				throw new ArgumentNullException ("property");
 			var result = new StringBuilder ();
 			AppendModifiers (result, property);
-			result.Append (GetTypeReferenceString (property.ReturnType));
+			result.Append (GetTypeReferenceString (property.Type));
 			if (BreakLineAfterReturnType) {
 				result.AppendLine ();
 			} else {
 				result.Append (" ");
 			}
 
-			AppendExplicitInterfaces (result, property);
+			AppendExplicitInterfaces (result, property.ExplicitInterfaceImplementations.Cast<ISymbol> ());
 			
-			if (property.SymbolKind == SymbolKind.Indexer) {
+			if (property.IsIndexer) {
 				result.Append (Highlight ("this", colorStyle.KeywordAccessors));
 			} else {
 				result.Append (HighlightSemantically (FilterEntityName (property.Name), colorStyle.UserPropertyDeclaration));
 			}
 			
-			if (property.Parameters.Count > 0) {
-				if (formattingOptions.SpaceBeforeIndexerDeclarationBracket)
-					result.Append (" ");
+			if (property.Parameters.Length > 0) {
+//				if (formattingOptions.SpaceBeforeIndexerDeclarationBracket)
+//					result.Append (" ");
 				result.Append ("[");
-				AppendParameterList (result, property.Parameters, formattingOptions.SpaceBeforeIndexerDeclarationParameterComma, formattingOptions.SpaceAfterIndexerDeclarationParameterComma);
+				AppendParameterList (result, property.Parameters, 
+					false /*formattingOptions.SpaceBeforeIndexerDeclarationParameterComma*/,
+					false /*formattingOptions.SpaceAfterIndexerDeclarationParameterComma*/);
 				result.Append ("]");
 			}
 			
 			result.Append (" {");
-			if (property.CanGet && IsAccessibleOrHasSourceCode (property.Getter)) {
-				if (property.Getter.Accessibility != property.Accessibility) {
+			if (property.GetMethod != null&& IsAccessibleOrHasSourceCode (property.GetMethod)) {
+				if (property.GetMethod.DeclaredAccessibility != property.DeclaredAccessibility) {
 
 					result.Append (" ");
-					AppendAccessibility (result, property.Getter);
+					AppendAccessibility (result, property.GetMethod);
 				}
 				result.Append (Highlight (" get", colorStyle.KeywordProperty) + ";");
 			}
 
-			if (property.CanSet && IsAccessibleOrHasSourceCode (property.Setter)) {
-				if (property.Setter.Accessibility != property.Accessibility) {
+			if (property.SetMethod != null && IsAccessibleOrHasSourceCode (property.SetMethod)) {
+				if (property.SetMethod.DeclaredAccessibility != property.DeclaredAccessibility) {
 					result.Append (" ");
-					AppendAccessibility (result, property.Setter);
+					AppendAccessibility (result, property.SetMethod);
 				}
 				result.Append (Highlight (" set", colorStyle.KeywordProperty) + ";");
 			}
@@ -841,17 +921,17 @@ namespace MonoDevelop.CSharp
 		}
 
 		
-		public TooltipInformation GetExternAliasTooltip (ExternAliasDeclaration externAliasDeclaration, DotNetProject project)
+		public TooltipInformation GetExternAliasTooltip (ExternAliasDirectiveSyntax externAliasDeclaration, DotNetProject project)
 		{
 			var result = new TooltipInformation ();
-			result.SignatureMarkup = Highlight ("extern ", colorStyle.KeywordModifiers) + Highlight ("alias ", colorStyle.KeywordNamespace) + externAliasDeclaration.Name;
+			result.SignatureMarkup = Highlight ("extern ", colorStyle.KeywordModifiers) + Highlight ("alias ", colorStyle.KeywordNamespace) + externAliasDeclaration.Identifier;
 			if (project == null)
 				return result;
 			foreach (var r in project.References) {
 				if (string.IsNullOrEmpty (r.Aliases))
 					continue;
 				foreach (var alias in r.Aliases.Split (',', ';')) {
-					if (alias == externAliasDeclaration.Name)
+					if (alias == externAliasDeclaration.Identifier.ToFullString ())
 						result.AddCategory (GettextCatalog.GetString ("Reference"), r.StoredReference);
 				}
 			}
@@ -859,66 +939,61 @@ namespace MonoDevelop.CSharp
 			return result;
 		}
 
-		public TooltipInformation GetKeywordTooltip (AstNode node)
-		{
-			return GetKeywordTooltip (node.ToString (), node);
-		}
-
-		public TooltipInformation GetKeywordTooltip (string keyword, AstNode hintNode)
+		public TooltipInformation GetKeywordTooltip (SyntaxToken node)
 		{
 			var result = new TooltipInformation ();
 
 			var color = AlphaBlend (colorStyle.PlainText.Foreground, colorStyle.PlainText.Background, optionalAlpha);
-			var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);
+			var colorString = MonoDevelop.Components.HelperMethods.GetColorString (color);
 			
 			var keywordSign = "<span foreground=\"" + colorString + "\">" + " (keyword)</span>";
 
-			switch (keyword) {
-			case "abstract":
+			switch (node.Kind ()) {
+			case SyntaxKind.AbstractKeyword:
 				result.SignatureMarkup = Highlight ("abstract", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("abstract", colorStyle.KeywordModifiers) + " modifier can be used with classes, methods, properties, indexers, and events.";
 				break;
-			case "add":
+			case SyntaxKind.AddKeyword:
 				result.SignatureMarkup = Highlight ("add", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", "[modifiers] " + Highlight ("add", colorStyle.KeywordContext) + " { accessor-body }");
 				result.SummaryMarkup = "The " + Highlight ("add", colorStyle.KeywordContext) + " keyword is used to define a custom accessor for when an event is subscribed to. If supplied, a remove accessor must also be supplied.";
 				break;
-			case "ascending":
+			case SyntaxKind.AscendingKeyword:
 				result.SignatureMarkup = Highlight ("ascending", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("orderby", colorStyle.KeywordContext) + " ordering-statement " + Highlight ("ascending", colorStyle.KeywordContext));
 				result.SummaryMarkup = "The " + Highlight ("ascending", colorStyle.KeywordContext) + " keyword is used to set the sorting order from smallest to largest in a query expression. This is the default behaviour.";
 				break;
-			case "async":
+			case SyntaxKind.AsyncKeyword:
 				result.SignatureMarkup = Highlight ("async", colorStyle.KeywordContext) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("async", colorStyle.KeywordContext) + " modifier is used to specify that a class method, anonymous method, or lambda expression is asynchronous.";
 				break;
-			case "as":
+			case SyntaxKind.AsKeyword:
 				result.SignatureMarkup = Highlight ("as", colorStyle.KeywordOperators) + keywordSign;
 				result.AddCategory ("Form", "expression " + Highlight ("as", colorStyle.KeywordOperators) + " type");
 				result.SummaryMarkup = "The " + Highlight ("as", colorStyle.KeywordOperators) + " operator is used to perform conversions between compatible types. ";
 				break;
-			case "await":
+			case SyntaxKind.AwaitKeyword:
 				result.SignatureMarkup = Highlight ("await", colorStyle.KeywordContext) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("await", colorStyle.KeywordContext) + " operator is used to specify that an " + Highlight ("async", colorStyle.KeywordContext) + " method is to have its execution suspended until the " + Highlight ("await", colorStyle.KeywordContext) +
 				" task has completed.";
 				break;
-			case "base":
+			case SyntaxKind.BaseKeyword:
 				result.SignatureMarkup = Highlight ("base", colorStyle.KeywordAccessors) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("base", colorStyle.KeywordAccessors) + " keyword is used to access members of the base class from within a derived class.";
 				break;
-			case "break":
+			case SyntaxKind.BreakKeyword:
 				result.SignatureMarkup = Highlight ("break", colorStyle.KeywordJump) + keywordSign;
 				result.AddCategory ("Form", Highlight ("break", colorStyle.KeywordJump) + ";");
 				result.SummaryMarkup = "The " + Highlight ("break", colorStyle.KeywordJump) + " statement terminates the closest enclosing loop or switch statement in which it appears.";
 				break;
-			case "case":
+			case SyntaxKind.CaseKeyword:
 				result.SignatureMarkup = Highlight ("case", colorStyle.KeywordSelection) + keywordSign;
 				result.AddCategory ("Form", Highlight ("case", colorStyle.KeywordSelection) + " constant-expression:" + Environment.NewLine +
 				"  statement" + Environment.NewLine +
 				"  jump-statement");
 				result.SummaryMarkup = "";
 				break;
-			case "catch":
+			case SyntaxKind.CatchKeyword:
 				result.SignatureMarkup = Highlight ("catch", colorStyle.KeywordException) + keywordSign;
 				result.AddCategory ("Form", Highlight ("try", colorStyle.KeywordException) + " try-block" + Environment.NewLine +
 				"  " + Highlight ("catch", colorStyle.KeywordException) + " (exception-declaration-1) catch-block-1" + Environment.NewLine +
@@ -927,37 +1002,37 @@ namespace MonoDevelop.CSharp
 				Highlight ("try", colorStyle.KeywordException) + " try-block " + Highlight ("catch", colorStyle.KeywordException) + " catch-block");
 				result.SummaryMarkup = "";
 				break;
-			case "checked":
+			case SyntaxKind.CheckedKeyword:
 				result.SignatureMarkup = Highlight ("checked", colorStyle.KeywordOther) + keywordSign;
 				result.AddCategory ("Form", Highlight ("checked", colorStyle.KeywordOther) + " block" + Environment.NewLine +
 				"or" + Environment.NewLine +
 				Highlight ("checked", colorStyle.KeywordOther) + " (expression)");
 				result.SummaryMarkup = "The " + Highlight ("checked", colorStyle.KeywordOther) + " keyword is used to control the overflow-checking context for integral-type arithmetic operations and conversions. It can be used as an operator or a statement.";
 				break;
-			case "class":
+			case SyntaxKind.ClassKeyword:
 				result.SignatureMarkup = Highlight ("class", colorStyle.KeywordDeclaration) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("class", colorStyle.KeywordDeclaration) + " identifier [:base-list] { class-body }[;]");
 				result.SummaryMarkup = "Classes are declared using the keyword " + Highlight ("class", colorStyle.KeywordDeclaration) + ".";
 				break;
-			case "const":
+			case SyntaxKind.ConstKeyword:
 				result.SignatureMarkup = Highlight ("const", colorStyle.KeywordModifiers) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("const", colorStyle.KeywordModifiers) + " type declarators;");
 				result.SummaryMarkup = "The " + Highlight ("const", colorStyle.KeywordModifiers) + " keyword is used to modify a declaration of a field or local variable. It specifies that the value of the field or the local variable cannot be modified. ";
 				break;
-			case "continue":
+			case SyntaxKind.ContinueKeyword:
 				result.SignatureMarkup = Highlight ("continue", colorStyle.KeywordJump) + keywordSign;
 				result.AddCategory ("Form", Highlight ("continue", colorStyle.KeywordJump) + ";");
 				result.SummaryMarkup = "The " + Highlight ("continue", colorStyle.KeywordJump) + " statement passes control to the next iteration of the enclosing iteration statement in which it appears.";
 				break;
-			case "default":
+			case SyntaxKind.DefaultKeyword:
 				result.SignatureMarkup = Highlight ("default", colorStyle.KeywordSelection) + keywordSign;
 				result.SummaryMarkup = "";
-				if (hintNode != null) {
-					if (hintNode.Parent is DefaultValueExpression) {
+				if (node.Parent != null) {
+					if (node.Parent is DefaultExpressionSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("default", colorStyle.KeywordSelection) + " (Type)");
 						break;
-					} else if (hintNode.Parent is CaseLabel) {
+					} else if (node.Parent is SwitchStatementSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("switch", colorStyle.KeywordSelection) + " (expression) { " + Environment.NewLine +
 							"  " + Highlight ("case", colorStyle.KeywordSelection) + " constant-expression:" + Environment.NewLine +
@@ -972,36 +1047,40 @@ namespace MonoDevelop.CSharp
 				}
 				result.AddCategory ("Form",
 					Highlight ("default", colorStyle.KeywordSelection) + " (Type)" + Environment.NewLine + Environment.NewLine +
-						"or" + Environment.NewLine + Environment.NewLine +
+					"or" + Environment.NewLine + Environment.NewLine +
 					Highlight ("switch", colorStyle.KeywordSelection) + " (expression) { " + Environment.NewLine +
-						"  " + Highlight ("case", colorStyle.KeywordSelection) + " constant-expression:" + Environment.NewLine +
-						"    statement" + Environment.NewLine +
-						"    jump-statement" + Environment.NewLine +
-						"  [" + Highlight ("default", colorStyle.KeywordSelection) + ":" + Environment.NewLine +
-						"    statement" + Environment.NewLine +
-						"    jump-statement]" + Environment.NewLine +
-						"}");
-				break;
-			case "delegate":
+					"  " + Highlight ("case", colorStyle.KeywordSelection) + " constant-expression:" + Environment.NewLine +
+					"    statement" + Environment.NewLine +
+					"    jump-statement" + Environment.NewLine +
+					"  [" + Highlight ("default", colorStyle.KeywordSelection) + ":" + Environment.NewLine +
+					"    statement" + Environment.NewLine +
+					"    jump-statement]" + Environment.NewLine +
+					"}");
+				break;
+			case SyntaxKind.DelegateKeyword:
 				result.SignatureMarkup = Highlight ("delegate", colorStyle.KeywordDeclaration) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("delegate", colorStyle.KeywordDeclaration) + " result-type identifier ([formal-parameters]);");
 				result.SummaryMarkup = "A " + Highlight ("delegate", colorStyle.KeywordDeclaration) + " declaration defines a reference type that can be used to encapsulate a method with a specific signature.";
 				break;
-			case "dynamic":
-				result.SignatureMarkup = Highlight ("dynamic", colorStyle.KeywordContext) + keywordSign;
-				result.SummaryMarkup = "The " + Highlight ("dynamic", colorStyle.KeywordContext) + " type allows for an object to bypass compile-time type checking and resolve type checking during run-time.";
+			case SyntaxKind.IdentifierName:
+				if (node.ToFullString () == "dynamic") {
+					result.SignatureMarkup = Highlight ("dynamic", colorStyle.KeywordContext) + keywordSign;
+					result.SummaryMarkup = "The " + Highlight ("dynamic", colorStyle.KeywordContext) + " type allows for an object to bypass compile-time type checking and resolve type checking during run-time.";
+				} else {
+					return null;
+				}
 				break;
-			case "descending":
+			case SyntaxKind.DescendingKeyword:
 				result.SignatureMarkup = Highlight ("descending", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("orderby", colorStyle.KeywordContext) + " ordering-statement " + Highlight ("descending", colorStyle.KeywordContext));
 				result.SummaryMarkup = "The " + Highlight ("descending", colorStyle.KeywordContext) + " keyword is used to set the sorting order from largest to smallest in a query expression.";
 				break;
-			case "do":
+			case SyntaxKind.DoKeyword:
 				result.SignatureMarkup = Highlight ("do", colorStyle.KeywordIteration) + keywordSign;
 				result.AddCategory ("Form", Highlight ("do", colorStyle.KeywordIteration) + " statement " + Highlight ("while", colorStyle.KeywordIteration) + " (expression);");
 				result.SummaryMarkup = "The " + Highlight ("do", colorStyle.KeywordIteration) + " statement executes a statement or a block of statements repeatedly until a specified expression evaluates to false.";
 				break;
-			case "else":
+			case SyntaxKind.ElseKeyword:
 				result.SignatureMarkup = Highlight ("else", colorStyle.KeywordSelection) + keywordSign;
 				result.AddCategory ("Form", Highlight ("if", colorStyle.KeywordSelection) + " (expression)" + Environment.NewLine +
 					"  statement1" + Environment.NewLine +
@@ -1009,69 +1088,69 @@ namespace MonoDevelop.CSharp
 					"  statement2]");
 				result.SummaryMarkup = "";
 				break;
-			case "enum":
+			case SyntaxKind.EnumKeyword:
 				result.SignatureMarkup = Highlight ("enum", colorStyle.KeywordDeclaration) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("enum", colorStyle.KeywordDeclaration) + " identifier [:base-type] {enumerator-list} [;]");
 				result.SummaryMarkup = "The " + Highlight ("enum", colorStyle.KeywordDeclaration) + " keyword is used to declare an enumeration, a distinct type consisting of a set of named constants called the enumerator list.";
 				break;
-			case "event":
+			case SyntaxKind.EventKeyword:
 				result.SignatureMarkup = Highlight ("event", colorStyle.KeywordModifiers) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("event", colorStyle.KeywordModifiers) + " type declarator;" + Environment.NewLine +
 					"[attributes] [modifiers] " + Highlight ("event", colorStyle.KeywordModifiers) + " type member-name {accessor-declarations};");
 				result.SummaryMarkup = "Specifies an event.";
 				break;
-			case "explicit":
+			case SyntaxKind.ExplicitKeyword:
 				result.SignatureMarkup = Highlight ("explicit", colorStyle.KeywordOperatorDeclaration) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("explicit", colorStyle.KeywordOperatorDeclaration) + " keyword is used to declare an explicit user-defined type conversion operator.";
 				break;
-			case "extern":
+			case SyntaxKind.ExternKeyword:
 				result.SignatureMarkup = Highlight ("extern", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "Use the " + Highlight ("extern", colorStyle.KeywordModifiers) + " modifier in a method declaration to indicate that the method is implemented externally. A common use of the extern modifier is with the DllImport attribute.";
 				break;
-			case "finally":
+			case SyntaxKind.FinallyKeyword:
 				result.SignatureMarkup = Highlight ("finally", colorStyle.KeywordException) + keywordSign;
 				result.AddCategory ("Form", Highlight ("try", colorStyle.KeywordException) + " try-block " + Highlight ("finally", colorStyle.KeywordException) + " finally-block");
 				result.SummaryMarkup = "The " + Highlight ("finally", colorStyle.KeywordException) + " block is useful for cleaning up any resources allocated in the try block. Control is always passed to the finally block regardless of how the try block exits.";
 				break;
-			case "fixed":
+			case SyntaxKind.FixedKeyword:
 				result.SignatureMarkup = Highlight ("fixed", colorStyle.KeywordOther) + keywordSign;
 				result.AddCategory ("Form", Highlight ("fixed", colorStyle.KeywordOther) + " ( type* ptr = expr ) statement");
 				result.SummaryMarkup = "Prevents relocation of a variable by the garbage collector.";
 				break;
-			case "for":
+			case SyntaxKind.ForKeyword:
 				result.SignatureMarkup = Highlight ("for", colorStyle.KeywordIteration) + keywordSign;
 				result.AddCategory ("Form", Highlight ("for", colorStyle.KeywordIteration) + " ([initializers]; [expression]; [iterators]) statement");
 				result.SummaryMarkup = "The " + Highlight ("for", colorStyle.KeywordIteration) + " loop executes a statement or a block of statements repeatedly until a specified expression evaluates to false.";
 				break;
-			case "foreach":
+			case SyntaxKind.ForEachKeyword:
 				result.SignatureMarkup = Highlight ("foreach", colorStyle.KeywordIteration) + keywordSign;
 				result.AddCategory ("Form", Highlight ("foreach", colorStyle.KeywordIteration) + " (type identifier " + Highlight ("in", colorStyle.KeywordIteration) + " expression) statement");
 				result.SummaryMarkup = "The " + Highlight ("foreach", colorStyle.KeywordIteration) + " statement repeats a group of embedded statements for each element in an array or an object collection. ";
 				break;
-			case "from":
+			case SyntaxKind.FromKeyword:
 				result.SignatureMarkup = Highlight ("from", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", Highlight ("from", colorStyle.KeywordContext) + " range-variable " + Highlight ("in", colorStyle.KeywordIteration)
 				+ " data-source [query clauses] " + Highlight ("select", colorStyle.KeywordContext) + " product-expression");
 				result.SummaryMarkup = "The " + Highlight ("from", colorStyle.KeywordContext) + " keyword marks the beginning of a query expression and defines the data source and local variable to represent the elements in the sequence.";
 				break;
-			case "get":
+			case SyntaxKind.GetKeyword:
 				result.SignatureMarkup = Highlight ("get", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", "[modifiers] " + Highlight ("get", colorStyle.KeywordContext) + " [ { accessor-body } ]");
 				result.SummaryMarkup = "The " + Highlight ("get", colorStyle.KeywordContext) + " keyword is used to define an accessor method to retrieve the value of the property or indexer element.";
 				break;
-			case "global":
+			case SyntaxKind.GlobalKeyword:
 				result.SignatureMarkup = Highlight ("global", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", Highlight ("global", colorStyle.KeywordContext) + " :: type");
 				result.SummaryMarkup = "The " + Highlight ("global", colorStyle.KeywordContext) + " keyword is used to specify a type is within the global namespace.";
 				break;
-			case "goto":
+			case SyntaxKind.GotoKeyword:
 				result.SignatureMarkup = Highlight ("goto", colorStyle.KeywordJump) + keywordSign;
 				result.AddCategory ("Form", Highlight ("goto", colorStyle.KeywordJump) + " identifier;" + Environment.NewLine +
 				Highlight ("goto", colorStyle.KeywordJump) + " " + Highlight ("case", colorStyle.KeywordSelection) + " constant-expression;" + Environment.NewLine +
 				Highlight ("goto", colorStyle.KeywordJump) + " " + Highlight ("default", colorStyle.KeywordSelection) + ";");
 				result.SummaryMarkup = "The " + Highlight ("goto", colorStyle.KeywordJump) + " statement transfers the program control directly to a labeled statement. ";
 				break;
-			case "group":
+			case SyntaxKind.GroupKeyword:
 				result.SignatureMarkup = Highlight ("group", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("group", colorStyle.KeywordContext) + " range-variable " + Highlight ("by", colorStyle.KeywordContext) + "key-value"
 					+ Environment.NewLine + Environment.NewLine + "or" + Environment.NewLine + Environment.NewLine +
@@ -1079,7 +1158,7 @@ namespace MonoDevelop.CSharp
 				result.SummaryMarkup = "The " + Highlight ("group", colorStyle.KeywordContext) + " keyword groups elements together from a query which match the key value and stores the result in an "
 					+ Highlight ("IGrouping&lt;TKey, TElement&gt;", colorStyle.KeywordTypes) + ". It can also be stored in a group for further use in the query with 'into'.";
 				break;
-			case "if":
+			case SyntaxKind.IfKeyword:
 				result.SignatureMarkup = Highlight ("if", colorStyle.KeywordSelection) + keywordSign;
 				result.AddCategory ("Form", Highlight ("if", colorStyle.KeywordSelection) + " (expression)" + Environment.NewLine +
 					"  statement1" + Environment.NewLine +
@@ -1087,29 +1166,29 @@ namespace MonoDevelop.CSharp
 					"  statement2]");
 				result.SummaryMarkup = "The " + Highlight ("if", colorStyle.KeywordSelection) + " statement selects a statement for execution based on the value of a Boolean expression. ";
 				break;
-			case "into":
+			case SyntaxKind.IntoKeyword:
 				result.SignatureMarkup = Highlight ("into", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("group", colorStyle.KeywordContext) + " range-variable " + Highlight ("by", colorStyle.KeywordContext) + " key-value " + Highlight ("into", colorStyle.KeywordContext) + " group-name ");
 				result.SummaryMarkup = "The " + Highlight ("into", colorStyle.KeywordContext) + " keyword stores the result of a group statement for further use in the query.";
 				break;
-			case "implicit":
+			case SyntaxKind.ImplicitKeyword:
 				result.SignatureMarkup = Highlight ("implicit", colorStyle.KeywordOperatorDeclaration) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("implicit", colorStyle.KeywordOperatorDeclaration) + " keyword is used to declare an implicit user-defined type conversion operator.";
 				break;
-			case "in":
+			case SyntaxKind.InKeyword:
 				result.SignatureMarkup = Highlight ("in", colorStyle.KeywordIteration) + keywordSign;
-				if (hintNode != null) {
-					if (hintNode.Parent is ForeachStatement) {
+				if (node.Parent != null) {
+					if (node.Parent is ForEachStatementSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("foreach", colorStyle.KeywordIteration) + " (type identifier " + Highlight ("in", colorStyle.KeywordIteration) + " expression) statement");
 						break;
 					}
-					if (hintNode.Parent is QueryFromClause) {
+					if (node.Parent is FromClauseSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("from", colorStyle.KeywordContext) + " range-variable " + Highlight ("in", colorStyle.KeywordIteration) + " data-source [query clauses] " + Highlight ("select", colorStyle.KeywordContext) + " product-expression");
 						break;
 					}
-					if (hintNode.Parent is TypeParameterDeclaration) {
+					if (node.Parent is TypeParameterConstraintClauseSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("interface", colorStyle.KeywordDeclaration) + " IMyInterface&lt;" + Highlight ("in", colorStyle.KeywordIteration) + " T&gt; {}");
 						break;
@@ -1122,52 +1201,52 @@ namespace MonoDevelop.CSharp
 				Highlight ("interface", colorStyle.KeywordDeclaration) + " IMyInterface&lt;" + Highlight ("in", colorStyle.KeywordIteration) + " T&gt; {}"
 				);
 				break;
-			case "interface":
+			case SyntaxKind.InterfaceKeyword:
 				result.SignatureMarkup = Highlight ("interface", colorStyle.KeywordDeclaration) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("interface", colorStyle.KeywordDeclaration) + " identifier [:base-list] {interface-body}[;]");
 				result.SummaryMarkup = "An interface defines a contract. A class or struct that implements an interface must adhere to its contract.";
 				break;
-			case "internal":
+			case SyntaxKind.InternalKeyword:
 				result.SignatureMarkup = Highlight ("internal", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("internal", colorStyle.KeywordModifiers) + " keyword is an access modifier for types and type members. Internal members are accessible only within files in the same assembly.";
 				break;
-			case "is":
+			case SyntaxKind.IsKeyword:
 				result.SignatureMarkup = Highlight ("is", colorStyle.KeywordOperators) + keywordSign;
 				result.AddCategory ("Form", "expression " + Highlight ("is", colorStyle.KeywordOperators) + " type");
 				result.SummaryMarkup = "The " + Highlight ("is", colorStyle.KeywordOperators) + " operator is used to check whether the run-time type of an object is compatible with a given type.";
 				break;
-			case "join":
+			case SyntaxKind.JoinKeyword:
 				result.SignatureMarkup = Highlight ("join", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("join", colorStyle.KeywordContext) + " range-variable2 " + Highlight ("in", colorStyle.KeywordContext) + " range2 " + Highlight ("on", colorStyle.KeywordContext)
 					+ " statement1 " + Highlight ("equals", colorStyle.KeywordContext) + " statement2 [ " + Highlight ("into", colorStyle.KeywordContext) + " group-name ]");
 				result.SummaryMarkup = "The " + Highlight ("join", colorStyle.KeywordContext) + " clause produces a new sequence of elements from two source sequences on a given equality condition.";
 				break;
-			case "let":
+			case SyntaxKind.LetKeyword:
 				result.SignatureMarkup = Highlight ("let", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("let", colorStyle.KeywordContext) + " range-variable = expression");
 				result.SummaryMarkup = "The " + Highlight ("let", colorStyle.KeywordContext) + " clause allows for a sub-expression to have its value stored in a new range variable for use later in the query.";
 				break;
-			case "lock":
+			case SyntaxKind.LockKeyword:
 				result.SignatureMarkup = Highlight ("lock", colorStyle.KeywordOther) + keywordSign;
 				result.AddCategory ("Form", Highlight ("lock", colorStyle.KeywordOther) + " (expression) statement_block");
 				result.SummaryMarkup = "The " + Highlight ("lock", colorStyle.KeywordOther) + " keyword marks a statement block as a critical section by obtaining the mutual-exclusion lock for a given object, executing a statement, and then releasing the lock. ";
 				break;
-			case "namespace":
+			case SyntaxKind.NamespaceKeyword:
 				result.SignatureMarkup = Highlight ("namespace", colorStyle.KeywordNamespace) + keywordSign;
 				result.AddCategory ("Form", Highlight ("namespace", colorStyle.KeywordNamespace) + " name[.name1] ...] {" + Environment.NewLine +
 					"type-declarations" + Environment.NewLine +
 					" }");
 				result.SummaryMarkup = "The " + Highlight ("namespace", colorStyle.KeywordNamespace) + " keyword is used to declare a scope. ";
 				break;
-			case "new":
+			case SyntaxKind.NewKeyword:
 				result.SignatureMarkup = Highlight ("new", colorStyle.KeywordOperators) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("new", colorStyle.KeywordOperators) + " keyword can be used as an operator or as a modifier. The operator is used to create objects on the heap and invoke constructors. The modifier is used to hide an inherited member from a base class member.";
 				break;
-			case "null":
+			case SyntaxKind.NullKeyword:
 				result.SignatureMarkup = Highlight ("null", colorStyle.KeywordConstants) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("null", colorStyle.KeywordConstants) + " keyword is a literal that represents a null reference, one that does not refer to any object. " + Highlight ("null", colorStyle.KeywordConstants) + " is the default value of reference-type variables.";
 				break;
-			case "operator":
+			case SyntaxKind.OperatorKeyword:
 				result.SignatureMarkup = Highlight ("operator", colorStyle.KeywordOperatorDeclaration) + keywordSign;
 				result.AddCategory ("Form", Highlight ("public static ", colorStyle.KeywordModifiers) + "result-type " + Highlight ("operator", colorStyle.KeywordOperatorDeclaration) + " unary-operator ( op-type operand )" + Environment.NewLine +
 				Highlight ("public static ", colorStyle.KeywordModifiers) + "result-type " + Highlight ("operator", colorStyle.KeywordOperatorDeclaration) + " binary-operator (" + Environment.NewLine +
@@ -1179,20 +1258,20 @@ namespace MonoDevelop.CSharp
 				);
 				result.SummaryMarkup = "The " + Highlight ("operator", colorStyle.KeywordOperatorDeclaration) + " keyword is used to declare an operator in a class or struct declaration.";
 				break;
-			case "orderby":
+			case SyntaxKind.OrderByKeyword:
 				result.SignatureMarkup = Highlight ("orderby", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("orderby", colorStyle.KeywordContext) + " order-key1 [ " + Highlight ("ascending", colorStyle.KeywordContext) + "|" + Highlight ("descending", colorStyle.KeywordContext) + " , [order-key2, ...]");
 				result.SummaryMarkup = "The " + Highlight ("orderby", colorStyle.KeywordContext) + " clause specifies for the returned sequence to be sorted on a given element in either ascending or descending order.";
 				break;
-			case "out":
+			case SyntaxKind.OutKeyword:
 				result.SignatureMarkup = Highlight ("out", colorStyle.KeywordParameter) + keywordSign;
-				if (hintNode != null) {
-					if (hintNode.Parent is TypeParameterDeclaration) {
+				if (node.Parent != null) {
+					if (node.Parent is TypeParameterSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("interface", colorStyle.KeywordDeclaration) + " IMyInterface&lt;" + Highlight ("out", colorStyle.KeywordParameter) + " T&gt; {}");
 						break;
 					}
-					if (hintNode.Parent is ParameterDeclaration) {
+					if (node.Parent is ParameterSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("out", colorStyle.KeywordParameter) + " parameter-name");
 						result.SummaryMarkup = "The " + Highlight ("out", colorStyle.KeywordParameter) + " method parameter keyword on a method parameter causes a method to refer to the same variable that was passed into the method.";
@@ -1206,22 +1285,22 @@ namespace MonoDevelop.CSharp
 					Highlight ("interface", colorStyle.KeywordDeclaration) + " IMyInterface&lt;" + Highlight ("out", colorStyle.KeywordParameter) + " T&gt; {}"
 				);
 				break;
-			case "override":
+			case SyntaxKind.OverrideKeyword:
 				result.SignatureMarkup = Highlight ("override", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("override", colorStyle.KeywordModifiers) + " modifier is used to override a method, a property, an indexer, or an event.";
 				break;
-			case "params":
+			case SyntaxKind.ParamKeyword:
 				result.SignatureMarkup = Highlight ("params", colorStyle.KeywordParameter) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("params", colorStyle.KeywordParameter) + " keyword lets you specify a method parameter that takes an argument where the number of arguments is variable.";
 				break;
-			case "partial":
+			case SyntaxKind.PartialKeyword:
 				result.SignatureMarkup = Highlight ("partial", colorStyle.KeywordContext) + keywordSign;
-				if (hintNode != null) {
-					if (hintNode.Parent is TypeDeclaration) {
+				if (node.Parent != null) {
+					if (node.Parent is TypeDeclarationSyntax) {
 						result.AddCategory ("Form", "[modifiers] " + Highlight ("partial", colorStyle.KeywordContext) + " type-declaration");
 						result.SummaryMarkup = "The " + Highlight ("partial", colorStyle.KeywordContext) + " keyword on a type declaration allows for the definition to be split into multiple files.";
 						break;
-					} else if (hintNode.Parent is MethodDeclaration) {
+					} else if (node.Parent is MethodDeclarationSyntax) {
 						result.AddCategory ("Form", Highlight ("partial", colorStyle.KeywordContext) + " method-declaration");
 						result.SummaryMarkup = "The " + Highlight ("partial", colorStyle.KeywordContext) + " keyword on a method declaration allows for the implementation of a method to be defined in another part of the partial class.";
 					}
@@ -1229,70 +1308,70 @@ namespace MonoDevelop.CSharp
 					result.AddCategory ("Form", "[modifiers] " + Highlight ("partial", colorStyle.KeywordContext) + " type-declaration" + Environment.NewLine + Environment.NewLine + "or" + Environment.NewLine + Environment.NewLine +
 					Highlight ("partial", colorStyle.KeywordContext) + " method-declaration");
 				break;
-			case "private":
+			case SyntaxKind.PrivateKeyword:
 				result.SignatureMarkup = Highlight ("private", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("private", colorStyle.KeywordModifiers) + " keyword is a member access modifier. Private access is the least permissive access level. Private members are accessible only within the body of the class or the struct in which they are declared.";
 				break;
-			case "protected":
+			case SyntaxKind.ProtectedKeyword:
 				result.SignatureMarkup = Highlight ("protected", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("protected", colorStyle.KeywordModifiers) + " keyword is a member access modifier. A protected member is accessible from within the class in which it is declared, and from within any class derived from the class that declared this member.";
 				break;
-			case "public":
+			case SyntaxKind.PublicKeyword:
 				result.SignatureMarkup = Highlight ("public", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("public", colorStyle.KeywordModifiers) + " keyword is an access modifier for types and type members. Public access is the most permissive access level. There are no restrictions on accessing public members.";
 				break;
-			case "readonly":
+			case SyntaxKind.ReadOnlyKeyword:
 				result.SignatureMarkup = Highlight ("readonly", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("readonly", colorStyle.KeywordModifiers) + " keyword is a modifier that you can use on fields. When a field declaration includes a " + Highlight ("readonly", colorStyle.KeywordModifiers) + " modifier, assignments to the fields introduced by the declaration can only occur as part of the declaration or in a constructor in the same class.";
 				break;
-			case "ref":
+			case SyntaxKind.RefKeyword:
 				result.SignatureMarkup = Highlight ("ref", colorStyle.KeywordParameter) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("ref", colorStyle.KeywordParameter) + " method parameter keyword on a method parameter causes a method to refer to the same variable that was passed into the method.";
 				break;
-			case "remove":
+			case SyntaxKind.RemoveKeyword:
 				result.SignatureMarkup = Highlight ("remove", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", "[modifiers] " + Highlight ("remove", colorStyle.KeywordContext) + " { accessor-body }");
 				result.SummaryMarkup = "The " + Highlight ("remove", colorStyle.KeywordContext) + " keyword is used to define a custom accessor for when an event is unsubscribed from. If supplied, an add accessor must also be supplied.";
 				break;
-			case "return":
+			case SyntaxKind.ReturnKeyword:
 				result.SignatureMarkup = Highlight ("return", colorStyle.KeywordJump) + keywordSign;
 				result.AddCategory ("Form", Highlight ("return", colorStyle.KeywordJump) + " [expression];");
 				result.SummaryMarkup = "The " + Highlight ("return", colorStyle.KeywordJump) + " statement terminates execution of the method in which it appears and returns control to the calling method.";
 				break;
-			case "select":
+			case SyntaxKind.SelectKeyword:
 				result.SignatureMarkup = Highlight ("select", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("select", colorStyle.KeywordContext) + " return-type");
 				result.SummaryMarkup = "The " + Highlight ("select", colorStyle.KeywordContext) + " clause specifies the type of value to return from the query.";
 				break;
-			case "sealed":
+			case SyntaxKind.SealedKeyword:
 				result.SignatureMarkup = Highlight ("sealed", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "A sealed class cannot be inherited.";
 				break;
-			case "set":
+			case SyntaxKind.SetKeyword:
 				result.SignatureMarkup = Highlight ("set", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", "[modifiers] " + Highlight ("set", colorStyle.KeywordContext) + " [ { accessor-body } ]");
 				result.SummaryMarkup = "The " + Highlight ("set", colorStyle.KeywordContext) + " keyword is used to define an accessor method to assign to the value of the property or indexer element.";
 				break;
-			case "sizeof":
+			case SyntaxKind.SizeOfKeyword:
 				result.SignatureMarkup = Highlight ("sizeof", colorStyle.KeywordOperators) + keywordSign;
 				result.AddCategory ("Form", Highlight ("sizeof", colorStyle.KeywordOperators) + " (type)");
 				result.SummaryMarkup = "The " + Highlight ("sizeof", colorStyle.KeywordOperators) + " operator is used to obtain the size in bytes for a value type.";
 				break;
-			case "stackalloc":
+			case SyntaxKind.StackAllocKeyword:
 				result.SignatureMarkup = Highlight ("stackalloc", colorStyle.KeywordOperators) + keywordSign;
 				result.AddCategory ("Form", "type * ptr = " + Highlight ("stackalloc", colorStyle.KeywordOperators) + " type [ expr ];");
 				result.SummaryMarkup = "Allocates a block of memory on the stack.";
 				break;
-			case "static":
+			case SyntaxKind.StaticKeyword:
 				result.SignatureMarkup = Highlight ("static", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "Use the " + Highlight ("static", colorStyle.KeywordModifiers) + " modifier to declare a static member, which belongs to the type itself rather than to a specific object.";
 				break;
-			case "struct":
+			case SyntaxKind.StructKeyword:
 				result.SignatureMarkup = Highlight ("struct", colorStyle.KeywordDeclaration) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("struct", colorStyle.KeywordDeclaration) + " identifier [:interfaces] body [;]");
 				result.SummaryMarkup = "A " + Highlight ("struct", colorStyle.KeywordDeclaration) + " type is a value type that can contain constructors, constants, fields, methods, properties, indexers, operators, events, and nested types. ";
 				break;
-			case "switch":
+			case SyntaxKind.SwitchKeyword:
 				result.SignatureMarkup = Highlight ("switch", colorStyle.KeywordSelection) + keywordSign;
 				result.AddCategory ("Form", Highlight ("switch", colorStyle.KeywordSelection) + " (expression)" + Environment.NewLine +
 					" {" + Environment.NewLine +
@@ -1305,16 +1384,16 @@ namespace MonoDevelop.CSharp
 					" }");
 				result.SummaryMarkup = "The " + Highlight ("switch", colorStyle.KeywordSelection) + " statement is a control statement that handles multiple selections by passing control to one of the " + Highlight ("case", colorStyle.KeywordSelection) + " statements within its body.";
 				break;
-			case "this":
+			case SyntaxKind.ThisKeyword:
 				result.SignatureMarkup = Highlight ("this", colorStyle.KeywordAccessors) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("this", colorStyle.KeywordAccessors) + " keyword refers to the current instance of the class.";
 				break;
-			case "throw":
+			case SyntaxKind.ThrowKeyword:
 				result.SignatureMarkup = Highlight ("throw", colorStyle.KeywordException) + keywordSign;
 				result.AddCategory ("Form", Highlight ("throw", colorStyle.KeywordException) + " [expression];");
 				result.SummaryMarkup = "The " + Highlight ("throw", colorStyle.KeywordException) + " statement is used to signal the occurrence of an anomalous situation (exception) during the program execution.";
 				break;
-			case "try":
+			case SyntaxKind.TryKeyword:
 				result.SignatureMarkup = Highlight ("try", colorStyle.KeywordException) + keywordSign;
 				result.AddCategory ("Form", Highlight ("try", colorStyle.KeywordException) + " try-block" + Environment.NewLine +
 					"  " + Highlight ("catch", colorStyle.KeywordException) + " (exception-declaration-1) catch-block-1 " + Environment.NewLine +
@@ -1323,48 +1402,48 @@ namespace MonoDevelop.CSharp
 					Highlight ("try", colorStyle.KeywordException) + " try-block " + Highlight ("catch", colorStyle.KeywordException) + " catch-block");
 				result.SummaryMarkup = "The try-catch statement consists of a " + Highlight ("try", colorStyle.KeywordException) + " block followed by one or more " + Highlight ("catch", colorStyle.KeywordException) + " clauses, which specify handlers for different exceptions.";
 				break;
-			case "typeof":
+			case SyntaxKind.TypeOfKeyword:
 				result.SignatureMarkup = Highlight ("typeof", colorStyle.KeywordOperators) + keywordSign;
 				result.AddCategory ("Form", Highlight ("typeof", colorStyle.KeywordOperators) + "(type)");
 				result.SummaryMarkup = "The " + Highlight ("typeof", colorStyle.KeywordOperators) + " operator is used to obtain the System.Type object for a type.";
 				break;
-			case "unchecked":
+			case SyntaxKind.UncheckedKeyword:
 				result.SignatureMarkup = Highlight ("unchecked", colorStyle.KeywordOther) + keywordSign;
 				result.AddCategory ("Form", Highlight ("unchecked", colorStyle.KeywordOther) + " block" + Environment.NewLine +
 				Highlight ("unchecked", colorStyle.KeywordOther) + " (expression)");
 				result.SummaryMarkup = "The " + Highlight ("unchecked", colorStyle.KeywordOther) + " keyword is used to control the overflow-checking context for integral-type arithmetic operations and conversions.";
 				break;
-			case "unsafe":
+			case SyntaxKind.UnsafeKeyword:
 				result.SignatureMarkup = Highlight ("unsafe", colorStyle.KeywordOther) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("unsafe", colorStyle.KeywordOther) + " keyword denotes an unsafe context, which is required for any operation involving pointers.";
 				break;
-			case "using":
+			case SyntaxKind.UsingKeyword:
 				result.SignatureMarkup = Highlight ("using", colorStyle.KeywordNamespace) + keywordSign;
 				result.AddCategory ("Form", Highlight ("using", colorStyle.KeywordNamespace) + " (expression | type identifier = initializer) statement" + Environment.NewLine +
 				Highlight ("using", colorStyle.KeywordNamespace) + " [alias = ]class_or_namespace;");
 				result.SummaryMarkup = "The " + Highlight ("using", colorStyle.KeywordNamespace) + " directive creates an alias for a namespace or imports types defined in other namespaces. The " + Highlight ("using", colorStyle.KeywordNamespace) + " statement defines a scope at the end of which an object will be disposed.";
 				break;
-			case "virtual":
+			case SyntaxKind.VirtualKeyword:
 				result.SignatureMarkup = Highlight ("virtual", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("virtual", colorStyle.KeywordModifiers) + " keyword is used to modify a method, property, indexer, or event declaration and allow for it to be overridden in a derived class.";
 				break;
-			case "volatile":
+			case SyntaxKind.VolatileKeyword:
 				result.SignatureMarkup = Highlight ("volatile", colorStyle.KeywordModifiers) + keywordSign;
 				result.AddCategory ("Form", Highlight ("volatile", colorStyle.KeywordModifiers) + " declaration");
 				result.SummaryMarkup = "The " + Highlight ("volatile", colorStyle.KeywordModifiers) + " keyword indicates that a field can be modified in the program by something such as the operating system, the hardware, or a concurrently executing thread.";
 				break;
-			case "void":
+			case SyntaxKind.VoidKeyword:
 				result.SignatureMarkup = Highlight ("void", colorStyle.KeywordTypes) + keywordSign;
 				break;
-			case "where":
+			case SyntaxKind.WhereKeyword:
 				result.SignatureMarkup = Highlight ("where", colorStyle.KeywordContext) + keywordSign;
-				if (hintNode != null) {
-					if (hintNode.Parent is QueryWhereClause) {
+				if (node.Parent != null) {
+					if (node.Parent is WhereClauseSyntax) {
 						result.AddCategory ("Query Form", Highlight ("where", colorStyle.KeywordContext) + " condition");
 						result.SummaryMarkup = "The " + Highlight ("where", colorStyle.KeywordContext) + " clause specifies which elements from the data source to be returned according to a given condition.";
 						break;
 					}
-					if (hintNode.Parent is Constraint) {
+					if (node.Parent is TypeConstraintSyntax) {
 						result.AddCategory ("Form", "generic-class-declaration " + Highlight ("where", colorStyle.KeywordContext) + " type-parameter : type-constraint");
 						result.SummaryMarkup = "The " + Highlight ("where", colorStyle.KeywordContext) + " clause constrains which types can be used as the type parameter in a generic declaration.";
 						break;
@@ -1375,41 +1454,43 @@ namespace MonoDevelop.CSharp
 					" condition" + " [query-clauses]");
 				}
 				break;
-			case "yield":
+			case SyntaxKind.YieldKeyword:
 				result.SignatureMarkup = Highlight ("yield", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", Highlight ("yield", colorStyle.KeywordContext) + Highlight ("break", colorStyle.KeywordJump) + Environment.NewLine
 				+ Environment.NewLine + "or" + Environment.NewLine + Environment.NewLine
 				+ Highlight ("yield", colorStyle.KeywordContext) + Highlight ("return", colorStyle.KeywordJump) + " expression");
 				result.SummaryMarkup = "The " + Highlight ("yield", colorStyle.KeywordContext) + " keyword is used to indicate that a method, get accessor, or operator is an iterator.";
 				break;
-			case "while":
+			case SyntaxKind.WhileKeyword:
 				result.SignatureMarkup = Highlight ("while", colorStyle.KeywordIteration) + keywordSign;
 				result.AddCategory ("Form", Highlight ("while", colorStyle.KeywordIteration) + " (expression) statement");
 				result.SummaryMarkup = "The " + Highlight ("while", colorStyle.KeywordIteration) + " statement executes a statement or a block of statements until a specified expression evaluates to false. ";
 				break;
+			default:
+				return null;
 			}
 			return result;
 		}
 
-		public TooltipInformation GetConstraintTooltip (string keyword)
+		public TooltipInformation GetConstraintTooltip (SyntaxToken keyword)
 		{
 			var result = new TooltipInformation ();
 
 			var color = AlphaBlend (colorStyle.PlainText.Foreground, colorStyle.PlainText.Background, optionalAlpha);
-			var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);
+			var colorString = MonoDevelop.Components.HelperMethods.GetColorString (color);
 			
 			var keywordSign = "<span foreground=\"" + colorString + "\">" + " (keyword)</span>";
 
-			result.SignatureMarkup = Highlight (keyword, colorStyle.KeywordTypes) + keywordSign;
+			result.SignatureMarkup = Highlight (keyword.ToFullString (), colorStyle.KeywordTypes) + keywordSign;
 
-			switch (keyword) {
-			case "class":
+			switch (keyword.Parent.Kind ()) {
+			case SyntaxKind.ClassConstraint:
 				result.AddCategory ("Constraint", "The type argument must be a reference type; this applies also to any class, interface, delegate, or array type.");
 				break;
-			case "new":
+			case SyntaxKind.ConstructorConstraint:
 				result.AddCategory ("Constraint", "The type argument must have a public parameterless constructor. When used together with other constraints, the new() constraint must be specified last.");
 				break;
-			case "struct":
+			case SyntaxKind.StructConstraint:
 				result.AddCategory ("Constraint", "The type argument must be a value type. Any value type except Nullable can be specified. See Using Nullable Types (C# Programming Guide) for more information.");
 				break;
 			}
@@ -1417,48 +1498,48 @@ namespace MonoDevelop.CSharp
 			return result;
 		}
 
-		public TooltipInformation GetTypeOfTooltip (TypeOfExpression typeOfExpression, TypeOfResolveResult resolveResult)
+		public TooltipInformation GetTypeOfTooltip (TypeOfExpressionSyntax typeOfExpression, ITypeSymbol resolveResult)
 		{
 			var result = new TooltipInformation ();
 			if (resolveResult == null) {
-				result.SignatureMarkup = AmbienceService.EscapeText (typeOfExpression.Type.ToString ());
+				result.SignatureMarkup = Ambience.EscapeText (typeOfExpression.Type.ToString ());
 			} else {
-				result.SignatureMarkup = GetTypeMarkup (resolveResult.ReferencedType, true);
+				result.SignatureMarkup = GetTypeMarkup (resolveResult, true);
 			}
 			return result;
 		}
 
-		public TooltipInformation GetAliasedNamespaceTooltip (AliasNamespaceResolveResult resolveResult)
-		{
-			var result = new TooltipInformation ();
-			result.SignatureMarkup = GetMarkup (resolveResult.Namespace);
-			result.AddCategory (GettextCatalog.GetString ("Alias information"), GettextCatalog.GetString ("Resolved using alias '{0}'", resolveResult.Alias));
-			return result;
-		}
-
-		public TooltipInformation GetAliasedTypeTooltip (AliasTypeResolveResult resolveResult)
-		{
-			var result = new TooltipInformation ();
-			result.SignatureMarkup = GetTypeMarkup (resolveResult.Type, true);
-			result.AddCategory (GettextCatalog.GetString ("Alias information"), GettextCatalog.GetString ("Resolved using alias '{0}'", resolveResult.Alias));
-			return result;
-		}
-
-		string GetEventMarkup (IEvent evt)
+//		public TooltipInformation GetAliasedNamespaceTooltip (AliasNamespaceResolveResult resolveResult)
+//		{
+//			var result = new TooltipInformation ();
+//			result.SignatureMarkup = GetMarkup (resolveResult.Namespace);
+//			result.AddCategory (GettextCatalog.GetString ("Alias information"), GettextCatalog.GetString ("Resolved using alias '{0}'", resolveResult.Alias));
+//			return result;
+//		}
+//
+//		public TooltipInformation GetAliasedTypeTooltip (AliasTypeResolveResult resolveResult)
+//		{
+//			var result = new TooltipInformation ();
+//			result.SignatureMarkup = GetTypeMarkup (resolveResult.Type, true);
+//			result.AddCategory (GettextCatalog.GetString ("Alias information"), GettextCatalog.GetString ("Resolved using alias '{0}'", resolveResult.Alias));
+//			return result;
+//		}
+
+		string GetEventMarkup (IEventSymbol evt)
 		{
 			if (evt == null)
 				throw new ArgumentNullException ("evt");
 			var result = new StringBuilder ();
 			AppendModifiers (result, evt);
 			result.Append (Highlight ("event ", colorStyle.KeywordModifiers));
-			result.Append (GetTypeReferenceString (evt.ReturnType));
+			result.Append (GetTypeReferenceString (evt.Type));
 			if (BreakLineAfterReturnType) {
 				result.AppendLine ();
 			} else {
 				result.Append (" ");
 			}
-
-			AppendExplicitInterfaces (result, evt);
+			
+			AppendExplicitInterfaces (result, evt.ExplicitInterfaceImplementations.Cast<ISymbol>());
 			result.Append (HighlightSemantically (FilterEntityName (evt.Name), colorStyle.UserEventDeclaration));
 			return result.ToString ();
 		}
@@ -1474,17 +1555,17 @@ namespace MonoDevelop.CSharp
 			}
 		}
 
-		void AppendParameterList (StringBuilder result, IList<IParameter> parameterList, bool spaceBefore, bool spaceAfter, bool newLine = true)
+		void AppendParameterList (StringBuilder result, ImmutableArray<IParameterSymbol> parameterList, bool spaceBefore, bool spaceAfter, bool newLine = true)
 		{
-			if (parameterList == null || parameterList.Count == 0)
+			if (parameterList == null || parameterList.Length == 0)
 				return;
 			if (newLine)
 				result.AppendLine ();
-			for (int i = 0; i < parameterList.Count; i++) {
+			for (int i = 0; i < parameterList.Length; i++) {
 				var parameter = parameterList [i];
 				if (newLine)
 					result.Append (new string (' ', 2));
-				var doHighightParameter = i == HighlightParameter || HighlightParameter >= i && i == parameterList.Count - 1 && parameter.IsParams;
+				var doHighightParameter = i == HighlightParameter || HighlightParameter >= i && i == parameterList.Length - 1 && parameter.IsParams;
 				if (doHighightParameter)
 					result.Append ("<u>");
 				/*				if (parameter.IsOptional) {
@@ -1495,18 +1576,18 @@ namespace MonoDevelop.CSharp
 				}*/
 				AppendParameter (result, parameter);
 				if (parameter.IsOptional) {
-					if (formattingOptions.SpaceAroundAssignment) {
+					if (options.GetOption (CSharpFormattingOptions.SpacingAroundBinaryOperator) == BinaryOperatorSpacingOptions.Single) {
 						result.Append (" = ");
 					} else {
 						result.Append ("=");
 					}
-					AppendConstant (result, parameter.Type, parameter.ConstantValue);
+					AppendConstant (result, parameter.Type, parameter.ExplicitDefaultValue);
 //					GrayOut = false;
 //					result.Append ("</span>");
 				}
 				if (doHighightParameter)
 					result.Append ("</u>");
-				if (i + 1 < parameterList.Count) {
+				if (i + 1 < parameterList.Length) {
 					if (spaceBefore)
 						result.Append (' ');
 					result.Append (',');
@@ -1522,13 +1603,13 @@ namespace MonoDevelop.CSharp
 				result.AppendLine ();
 		}
 
-		void AppendParameter (StringBuilder result, IParameter parameter)
+		void AppendParameter (StringBuilder result, IParameterSymbol parameter)
 		{
 			if (parameter == null)
 				return;
-			if (parameter.IsOut) {
+			if (parameter.RefKind == RefKind.Out) {
 				result.Append (Highlight ("out ", colorStyle.KeywordParameter));
-			} else if (parameter.IsRef) {
+			} else if (parameter.RefKind == RefKind.Ref) {
 				result.Append (Highlight ("ref ", colorStyle.KeywordParameter));
 			} else if (parameter.IsParams) {
 				result.Append (Highlight ("params ", colorStyle.KeywordParameter));
@@ -1538,12 +1619,10 @@ namespace MonoDevelop.CSharp
 			result.Append (FilterEntityName (parameter.Name));
 		}
 
-		void AppendExplicitInterfaces (StringBuilder sb, IMember member)
+		void AppendExplicitInterfaces (StringBuilder sb, IEnumerable<Microsoft.CodeAnalysis.ISymbol> member)
 		{
-			if (member == null || !member.IsExplicitInterfaceImplementation)
-				return;
-			foreach (var implementedInterfaceMember in member.ImplementedInterfaceMembers) {
-				sb.Append (GetTypeReferenceString (implementedInterfaceMember.DeclaringTypeDefinition));
+			foreach (var implementedInterfaceMember in member) {
+				sb.Append (GetTypeReferenceString (implementedInterfaceMember.ContainingType));
 				sb.Append (".");
 			}
 		}
@@ -1560,7 +1639,7 @@ namespace MonoDevelop.CSharp
 			}
 		}
 
-		void AppendConstant (StringBuilder sb, IType constantType, object constantValue, bool useNumericalEnumValue = false)
+		void AppendConstant (StringBuilder sb, ITypeSymbol constantType, object constantValue, bool useNumericalEnumValue = false)
 		{
 			if (constantValue is string) {
 				sb.Append (Highlight ("\"" + constantValue + "\"", colorStyle.String));
@@ -1576,7 +1655,7 @@ namespace MonoDevelop.CSharp
 			}
 
 			if (constantValue == null) {
-				if (constantType.Kind == TypeKind.Struct) {
+				if (constantType.TypeKind == TypeKind.Struct) {
 					// structs can never be == null, therefore it's the default value.
 					sb.Append (Highlight ("default", colorStyle.KeywordSelection) + "(" + GetTypeReferenceString (constantType) + ")");
 				} else {
@@ -1584,11 +1663,11 @@ namespace MonoDevelop.CSharp
 				}
 				return;
 			}
-
-			while (NullableType.IsNullable (constantType))
-				constantType = NullableType.GetUnderlyingType (constantType);
-			if (constantType.Kind == TypeKind.Enum) {
-				foreach (var field in constantType.GetFields ()) {
+//			TODOδ
+//			while (IsNullableType (constantType))
+//				constantType = NullableType.GetUnderlyingType (constantType);
+			if (constantType.TypeKind == TypeKind.Enum) {
+				foreach (var field in constantType.GetMembers ().OfType<IFieldSymbol> ()) {
 					if (field.ConstantValue == constantValue) {
 						if (useNumericalEnumValue) {
 							sb.Append (Highlight (string.Format ("0x{0:X}", field.ConstantValue), colorStyle.Number));
@@ -1599,11 +1678,11 @@ namespace MonoDevelop.CSharp
 					}
 				}
 				// try to decompose flags
-				if (constantType.GetDefinition ().Attributes.Any (attr => attr.AttributeType.Name == "FlagsAttribute" && attr.AttributeType.Namespace == "System")) {
+				if (constantType.GetAttributes ().Any (attr => attr.AttributeClass.Name == "FlagsAttribute" && attr.AttributeClass.ContainingNamespace.Name == "System")) {
 					var val = GetUlong (constantValue.ToString ());
 					var outVal = 0UL;
-					var fields = new List<IField> ();
-					foreach (var field in constantType.GetFields ()) {
+					var fields = new List<IFieldSymbol> ();
+					foreach (var field in constantType.GetMembers ().OfType<IFieldSymbol> ()) {
 						if (field.ConstantValue == null)
 							continue;
 						var val2 = GetUlong (field.ConstantValue.ToString ());
@@ -1631,11 +1710,11 @@ namespace MonoDevelop.CSharp
 			sb.Append (Highlight (constantValue.ToString (), colorStyle.Number));
 		}
 
-		void AppendVariance (StringBuilder sb, VarianceModifier variance)
+		void AppendVariance (StringBuilder sb, VarianceKind variance)
 		{
-			if (variance == VarianceModifier.Contravariant) {
+			if (variance == VarianceKind.In) {
 				sb.Append (Highlight ("in ", colorStyle.KeywordParameter));
-			} else if (variance == VarianceModifier.Covariant) {
+			} else if (variance == VarianceKind.Out) {
 				sb.Append (Highlight ("out ", colorStyle.KeywordParameter));
 			}
 		}
@@ -1654,7 +1733,12 @@ namespace MonoDevelop.CSharp
 			return AlphaBlend ((Gdk.Color)((HslColor)color), (Gdk.Color)((HslColor)color2), alpha);
 		}
 
-		public string GetArrayIndexerMarkup (ArrayType arrayType)
+		HslColor AlphaBlend (HslColor color, HslColor color2, double alpha)
+		{
+			return (HslColor)AlphaBlend ((Gdk.Color )color, (Gdk.Color)color2, alpha);
+		}
+
+		public string GetArrayIndexerMarkup (IArrayTypeSymbol arrayType)
 		{
 			if (arrayType == null)
 				throw new ArgumentNullException ("arrayType");
@@ -1667,7 +1751,7 @@ namespace MonoDevelop.CSharp
 			}
 			result.Append (Highlight ("this", colorStyle.KeywordAccessors));
 			result.Append ("[");
-			for (int i = 0; i < arrayType.Dimensions; i++) {
+			for (int i = 0; i < arrayType.Rank; i++) {
 				if (i > 0)
 					result.Append (", ");
 				var doHighightParameter = i == HighlightParameter;
@@ -1675,7 +1759,7 @@ namespace MonoDevelop.CSharp
 					result.Append ("<u>");
 
 				result.Append (Highlight ("int ", colorStyle.KeywordTypes));
-				result.Append (arrayType.Dimensions == 1 ? "index" : "i" + (i + 1));
+				result.Append (arrayType.Rank == 1 ? "index" : "i" + (i + 1));
 				if (doHighightParameter)
 					result.Append ("</u>");
 			}
@@ -1698,51 +1782,53 @@ namespace MonoDevelop.CSharp
 				color = AlphaBlend (color, (Gdk.Color)((HslColor)colorStyle.PlainText.Background), optionalAlpha);
 			}
 
-			var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);
+			var colorString = MonoDevelop.Components.HelperMethods.GetColorString (color);
 			return "<span foreground=\"" + colorString + "\">" + str + "</span>";
 		}
 
 		string HighlightSemantically (string str, ChunkStyle style)
 		{
-			if (!MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance.EnableSemanticHighlighting)
+			if (!DefaultSourceEditorOptions.Instance.EnableSemanticHighlighting)
 				return str;
 			return Highlight (str, style);
 		}
 
-		public string CreateFooter (IEntity entity)
+		public string CreateFooter (ISymbol entity)
 		{
-			var type = entity as IType;
+			var type = entity as ITypeSymbol;
 			if (type != null) {
-				var def = type.GetDefinition ();
-				if (def != null) {
-					if (!def.Region.IsEmpty) {
-						MonoDevelop.Projects.Project project;
-
-						if (def.TryGetSourceProject (out project)) {
-							var relPath = FileService.AbsoluteToRelativePath (project.BaseDirectory, def.Region.FileName);
-							return (string.IsNullOrEmpty (def.Namespace) ? "" : "<small>" + GettextCatalog.GetString ("Namespace:\t{0}", AmbienceService.EscapeText (def.Namespace)) + "</small>" + Environment.NewLine) +
-								"<small>" + GettextCatalog.GetString ("Project:\t{0}", AmbienceService.EscapeText (def.ParentAssembly.AssemblyName)) + "</small>" + Environment.NewLine +
-								"<small>" + GettextCatalog.GetString ("File:\t\t{0} (line {1})", AmbienceService.EscapeText (relPath), def.Region.Begin.Line) + "</small>";
-						}
-					}
-					return (string.IsNullOrEmpty (def.Namespace) ? "" : "<small>" + GettextCatalog.GetString ("Namespace:\t{0}", AmbienceService.EscapeText (def.Namespace)) + "</small>" + Environment.NewLine) +
-						"<small>" + GettextCatalog.GetString ("Assembly:\t{0}", AmbienceService.EscapeText (def.ParentAssembly.AssemblyName)) + "</small>";
+				var loc = type.Locations.First ();
+				if (loc.IsInSource) {// TODO:
+//					MonoDevelop.Projects.Project project;
+//					
+//					if (type.TryGetSourceProject (out project)) {
+//						var relPath = FileService.AbsoluteToRelativePath (project.BaseDirectory, loc.SourceTree.FilePath);
+//						var line = loc.SourceTree.GetLineSpan (loc.SourceSpan, true).StartLinePosition.Line;
+//						
+//						return (type.ContainingNamespace.IsGlobalNamespace ? "" : "<small>" + GettextCatalog.GetString ("Namespace:\t{0}", AmbienceService.EscapeText (type.ContainingNamespace.Name)) + "</small>" + Environment.NewLine) +
+//							"<small>" + GettextCatalog.GetString ("Project:\t{0}", AmbienceService.EscapeText (type.ContainingAssembly.Name)) + "</small>" + Environment.NewLine +
+//							"<small>" + GettextCatalog.GetString ("File:\t\t{0} (line {1})", AmbienceService.EscapeText (relPath), line) + "</small>";
+//					}
 				}
-				return null;
+				return (type.ContainingNamespace.IsGlobalNamespace ? "" : "<small>" + GettextCatalog.GetString ("Namespace:\t{0}", Ambience.EscapeText (type.ContainingNamespace.Name)) + "</small>" + Environment.NewLine) +
+					"<small>" + GettextCatalog.GetString ("Assembly:\t{0}", Ambience.EscapeText (type.ContainingAssembly.Name)) + "</small>";
 			} 
 
-			if (entity.DeclaringTypeDefinition != null) {
-				if (!entity.Region.IsEmpty) {
-					MonoDevelop.Projects.Project project;
-					if (entity.DeclaringTypeDefinition.TryGetSourceProject (out project)) {
-						var relPath = FileService.AbsoluteToRelativePath (project.BaseDirectory, entity.Region.FileName);
-						return "<small>" + GettextCatalog.GetString ("Project:\t{0}", AmbienceService.EscapeText (project.Name)) + "</small>" + Environment.NewLine +
-							"<small>" + GettextCatalog.GetString ("From type:\t{0}", AmbienceService.EscapeText (entity.DeclaringTypeDefinition.FullName)) + "</small>" + Environment.NewLine +
-							"<small>" + GettextCatalog.GetString ("File:\t\t{0} (line {1})", AmbienceService.EscapeText (relPath), entity.Region.Begin.Line) + "</small>";
-					}
+			if (entity.ContainingType != null) {
+						var loc = entity.Locations.First ();
+				if (!loc.IsInSource) {
+					// TODO:
+//					MonoDevelop.Projects.Project project;
+//					if (entity.ContainingType.TryGetSourceProject (out project)) {
+//						var relPath = FileService.AbsoluteToRelativePath (project.BaseDirectory, loc.SourceTree.FilePath);
+//						var line = loc.SourceTree.GetLineSpan (loc.SourceSpan, true).StartLinePosition.Line;
+//						return "<small>" + GettextCatalog.GetString ("Project:\t{0}", AmbienceService.EscapeText (project.Name)) + "</small>" + Environment.NewLine +
+//								"<small>" + GettextCatalog.GetString ("From type:\t{0}", AmbienceService.EscapeText (entity.ContainingType.Name)) + "</small>" + Environment.NewLine +
+//								"<small>" + GettextCatalog.GetString ("File:\t\t{0} (line {1})", AmbienceService.EscapeText (relPath), line) + "</small>";
+//					}
 				}
-				return "<small>" + GettextCatalog.GetString ("From type:\t{0}", AmbienceService.EscapeText (entity.DeclaringTypeDefinition.FullName)) + "</small>" + Environment.NewLine +
-					"<small>" + GettextCatalog.GetString ("Assembly:\t{0}", AmbienceService.EscapeText (entity.DeclaringTypeDefinition.ParentAssembly.AssemblyName)) + "</small>";
+				return "<small>" + GettextCatalog.GetString ("From type:\t{0}", Ambience.EscapeText (entity.ContainingType.Name)) + "</small>" + Environment.NewLine +
+					"<small>" + GettextCatalog.GetString ("Assembly:\t{0}", Ambience.EscapeText (entity.ContainingAssembly.Name)) + "</small>";
 			}
 			return null;
 		}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonIndentEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentEngine.cs
index 18be36da2b..320000b80b 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonIndentEngine.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentEngine.cs
@@ -24,27 +24,35 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
 using System.Text;
-using ICSharpCode.NRefactory;
+using ICSharpCode.NRefactory6.CSharp;
+using ICSharpCode.NRefactory6;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.TypeSystem;
 
-namespace MonoDevelop.SourceEditor.JSon
+namespace MonoDevelop.JSon
 {
 	class JSonIndentEngine : IStateMachineIndentEngine
 	{
-		TextEditorData data;
+		TextEditor editor;
+		DocumentContext ctx;
 		int offset, line, column;
 		internal Indent thisLineIndent, nextLineIndent;
 		StringBuilder currentIndent;
-		char previousNewline = '\0';
+		// char previousNewline = '\0';
 		char previousChar = '\0';
 		bool isLineStart;
 		bool isInString;
 
-		public JSonIndentEngine (TextEditorData data)
+		public JSonIndentEngine (TextEditor editor, DocumentContext ctx)
 		{
-			this.data = data;
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (ctx == null)
+				throw new ArgumentNullException ("ctx");
+			this.editor = editor;
+			this.ctx = ctx;
 			Reset ();
 		}
 
@@ -141,20 +149,6 @@ namespace MonoDevelop.SourceEditor.JSon
 
 		#endregion
 
-		public static ICSharpCode.NRefactory.CSharp.TextEditorOptions CreateNRefactoryTextEditorOptions (TextEditorData doc)
-		{
-			return new ICSharpCode.NRefactory.CSharp.TextEditorOptions {
-				TabsToSpaces = doc.TabsToSpaces,
-				TabSize = doc.Options.TabSize,
-				IndentSize = doc.Options.IndentationSize,
-				ContinuationIndent = doc.Options.IndentationSize,
-				LabelIndent = -doc.Options.IndentationSize,
-				EolMarker = doc.EolMarker,
-				IndentBlankLines = doc.Options.IndentStyle != IndentStyle.Virtual,
-				WrapLineLength = doc.Options.RulerColumn
-			};
-		}
-
 		#region IDocumentIndentEngine implementation
 
 		public void Push (char ch)
@@ -181,7 +175,7 @@ namespace MonoDevelop.SourceEditor.JSon
 
 			offset++;
 			if (!isNewLine) {
-				previousNewline = '\0';
+				// previousNewline = '\0';
 
 				isLineStart &= char.IsWhiteSpace (ch);
 
@@ -189,13 +183,13 @@ namespace MonoDevelop.SourceEditor.JSon
 					currentIndent.Append (ch);
 
 				if (ch == '\t') {
-					var nextTabStop = (column - 1 + data.Options.IndentationSize) / data.Options.IndentationSize;
-					column = 1 + nextTabStop * data.Options.IndentationSize;
+					var nextTabStop = (column - 1 + editor.Options.IndentationSize) / editor.Options.IndentationSize;
+					column = 1 + nextTabStop * editor.Options.IndentationSize;
 				} else {
 					column++;
 				}
 			} else {
-				previousNewline = ch;
+				// previousNewline = ch;
 				currentIndent.Length = 0;
 				isLineStart = true;
 				column = 1;
@@ -209,22 +203,22 @@ namespace MonoDevelop.SourceEditor.JSon
 		{
 			offset = 0;
 			line = column = 1;
-			thisLineIndent = new Indent (CreateNRefactoryTextEditorOptions (data));
-			nextLineIndent = new Indent (CreateNRefactoryTextEditorOptions (data));
+			thisLineIndent = new Indent (ctx.GetOptionSet ());
+			nextLineIndent = new Indent (ctx.GetOptionSet ());
 			currentIndent = new StringBuilder ();
-			previousNewline = '\0';
+			// previousNewline = '\0';
 			previousChar = '\0';
 			isLineStart = true;
 			isInString = false;
 		}
 
-		public void Update (int offset)
+		public void Update (SourceText sourceText, int offset)
 		{
 			if (Offset > offset)
 				Reset ();
 
 			while (Offset < offset) {
-				Push (Document.GetCharAt (Offset));
+				Push (sourceText [Offset]);
 			}
 		}
 
@@ -233,9 +227,10 @@ namespace MonoDevelop.SourceEditor.JSon
 			return Clone ();
 		}
 
-		public ICSharpCode.NRefactory.Editor.IDocument Document {
+		SourceText sourceText;
+		public SourceText Document {
 			get {
-				return data.Document;
+				return sourceText ?? (sourceText = new MonoDevelopSourceText (editor));
 			}
 		}
 
@@ -268,12 +263,12 @@ namespace MonoDevelop.SourceEditor.JSon
 				return offset;
 			}
 		}
-
-		public TextLocation Location {
-			get {
-				return new TextLocation (line, column);
-			}
-		}
+//
+//		public TextLocation Location {
+//			get {
+//				return new TextLocation (line, column);
+//			}
+//		}
 
 		public bool EnableCustomIndentLevels {
 			get;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonIndentationTracker.cs b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentationTracker.cs
index 7ebfbe34fb..a5a2d3402b 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonIndentationTracker.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentationTracker.cs
@@ -23,19 +23,20 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
 using System;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using ICSharpCode.NRefactory6.CSharp;
 
-namespace MonoDevelop.SourceEditor.JSon
+namespace MonoDevelop.JSon
 {
-	class JSonIndentationTracker : IIndentationTracker
+	class JSonIndentationTracker : IndentationTracker
 	{
-		readonly TextEditorData data;
+		readonly TextEditor data;
 		readonly CacheIndentEngine stateTracker;
 
-		public JSonIndentationTracker(TextEditorData data, CacheIndentEngine stateTracker)
+		public JSonIndentationTracker(TextEditor data, CacheIndentEngine stateTracker)
 		{
 			this.data = data;
 			this.stateTracker = stateTracker;
@@ -43,16 +44,16 @@ namespace MonoDevelop.SourceEditor.JSon
 
 		string GetIndentationString (DocumentLocation loc)
 		{
-			var line = data.Document.GetLine (loc.Line);
+			var line = data.GetLine (loc.Line);
 			if (line == null)
 				return "";
 			// Get context to the end of the line w/o changing the main engine's state
 			var offset = line.Offset;
-			string curIndent = line.GetIndentation (data.Document);
+			string curIndent = line.GetIndentation (data);
 			try {
-				stateTracker.Update (Math.Min (data.Length, offset + Math.Min (line.Length, loc.Column - 1)));
+				stateTracker.Update (data, Math.Min (data.Length, offset + Math.Min (line.Length, loc.Column - 1)));
 				int nlwsp = curIndent.Length;
-				if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && data.Document.GetCharAt (offset + nlwsp) == '*'))
+				if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && data.GetCharAt (offset + nlwsp) == '*'))
 					return stateTracker.ThisLineIndent;
 			} catch (Exception e) {
 				LoggingService.LogError ("Error while indenting at "+ loc, e); 
@@ -60,27 +61,10 @@ namespace MonoDevelop.SourceEditor.JSon
 			return curIndent;
 		}
 
-		#region IIndentationTracker implementation
-		public string GetIndentationString (int offset)
+		public override string GetIndentationString (int lineNumber)
 		{
-			return GetIndentationString (data.OffsetToLocation (offset));
+			return GetIndentationString (new DocumentLocation (lineNumber, 1));
 		}
-
-		public string GetIndentationString (int lineNumber, int column)
-		{
-			return GetIndentationString (new DocumentLocation (lineNumber, column));
-		}
-
-		public int GetVirtualIndentationColumn (int offset)
-		{
-			return 1 + GetIndentationString (offset).Length;
-		}
-
-		public int GetVirtualIndentationColumn (int lineNumber, int column)
-		{
-			return 1 + GetIndentationString (lineNumber, column).Length;
-		}
-		#endregion
 	}
 }
 
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs
index 5ae84fa44a..1121e293ad 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs
@@ -23,44 +23,37 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using MonoDevelop.Ide.Gui.Content;
-using ICSharpCode.NRefactory.CSharp;
-using Gdk;
-using Mono.TextEditor;
+
 using System;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.Editor.Extension;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide.Editor;
 
-namespace MonoDevelop.SourceEditor.JSon
+namespace MonoDevelop.JSon
 {
 	class JSonTextEditorExtension : TextEditorExtension
 	{
 		CacheIndentEngine stateTracker;
 
-		TextEditorData textEditorData {
-			get {
-				return document.Editor;
-			}
-		}
 
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 			IStateMachineIndentEngine indentEngine;
-			indentEngine = new JSonIndentEngine (document.Editor);
+			indentEngine = new JSonIndentEngine (Editor, DocumentContext);
 			stateTracker = new CacheIndentEngine (indentEngine);
-			document.Editor.IndentationTracker = new JSonIndentationTracker (document.Editor, stateTracker);
+			Editor.SetIndentationTracker (new JSonIndentationTracker (Editor, stateTracker));
 		}
-
-
-		public override bool KeyPress (Key key, char keyChar, ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			var result = base.KeyPress (key, keyChar, modifier);
+			var result = base.KeyPress (descriptor);
 
-			if (key == Key.Return) {
-				if (textEditorData.Options.IndentStyle == IndentStyle.Virtual) {
-					if (textEditorData.GetLine (textEditorData.Caret.Line).Length == 0)
-						textEditorData.Caret.Column = textEditorData.IndentationTracker.GetVirtualIndentationColumn (textEditorData.Caret.Location);
+			if (descriptor.SpecialKey == SpecialKey.Return) {
+				if (Editor.Options.IndentStyle == MonoDevelop.Ide.Editor.IndentStyle.Virtual) {
+					if (Editor.GetLine (Editor.CaretLine).Length == 0)
+						Editor.CaretColumn = Editor.GetVirtualIndentationColumn (Editor.CaretLine);
 				} else {
 					DoReSmartIndent ();
 				}
@@ -71,7 +64,7 @@ namespace MonoDevelop.SourceEditor.JSon
 
 		void DoReSmartIndent ()
 		{
-			DoReSmartIndent (textEditorData.Caret.Offset);
+			DoReSmartIndent (Editor.CaretOffset);
 		}
 
 		void DoReSmartIndent (int cursor)
@@ -79,23 +72,23 @@ namespace MonoDevelop.SourceEditor.JSon
 			SafeUpdateIndentEngine (cursor);
 			if (stateTracker.LineBeganInsideVerbatimString || stateTracker.LineBeganInsideMultiLineComment)
 				return;
-			var line = textEditorData.Document.GetLineByOffset (cursor);
+			var line = Editor.GetLineByOffset (cursor);
 
 			// Get context to the end of the line w/o changing the main engine's state
 			var curTracker = stateTracker.Clone ();
 			try {
 				for (int max = cursor; max < line.EndOffset; max++) {
-					curTracker.Push (textEditorData.Document.GetCharAt (max));
+					curTracker.Push (Editor.GetCharAt (max));
 				}
 			} catch (Exception e) {
 				LoggingService.LogError ("Exception during indentation", e);
 			}
 
 			int pos = line.Offset;
-			string curIndent = line.GetIndentation (textEditorData.Document);
+			string curIndent = line.GetIndentation (Editor);
 			int nlwsp = curIndent.Length;
 			int offset = cursor > pos + nlwsp ? cursor - (pos + nlwsp) : 0;
-			if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && textEditorData.Document.GetCharAt (line.Offset + nlwsp) == '*')) {
+			if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && Editor.GetCharAt (line.Offset + nlwsp) == '*')) {
 				// Possibly replace the indent
 				string newIndent = curTracker.ThisLineIndent;
 				int newIndentLength = newIndent.Length;
@@ -105,8 +98,8 @@ namespace MonoDevelop.SourceEditor.JSon
 							CompletionWindowManager.CodeCompletionContext.TriggerOffset -= nlwsp;
 					}
 
-					newIndentLength = textEditorData.Replace (pos, nlwsp, newIndent);
-					textEditorData.Document.CommitLineUpdate (textEditorData.Caret.Line);
+					Editor.ReplaceText (pos, nlwsp, newIndent);
+					newIndentLength = newIndent.Length;
 					CompletionWindowManager.HideWindow ();
 				}
 				pos += newIndentLength;
@@ -116,12 +109,13 @@ namespace MonoDevelop.SourceEditor.JSon
 
 			pos += offset;
 
-			textEditorData.FixVirtualIndentation ();
+			Editor.FixVirtualIndentation ();
 		}
+
 		internal void SafeUpdateIndentEngine (int offset)
 		{
 			try {
-				stateTracker.Update (offset);
+				stateTracker.Update (Editor, offset);
 			} catch (Exception e) {
 				LoggingService.LogError ("Error while updating the indentation engine", e);
 			}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.cs
index debf11a674..1dda3f6bac 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.cs
@@ -1,25 +1,29 @@
 
 // This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.DesignerSupport
+namespace MonoDevelop.CSharp.ClassOutline
 {
-	internal partial class ClassOutlineSortingPreferencesDialog
+	internal partial class OutlineSortingPreferencesDialog
 	{
 		private global::Gtk.VBox vbox2;
+		
 		private global::Gtk.Label label;
+		
 		private global::MonoDevelop.Ide.Gui.Components.PriorityList priorityList;
+		
 		private global::Gtk.Button buttonCancel;
-		private global::Gtk.Button buttonOk;
 		
+		private global::Gtk.Button buttonOk;
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog
-			this.Name = "MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog";
+			// Widget MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog
+			this.Name = "MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog";
 			this.Title = global::Mono.Unix.Catalog.GetString ("Document Outline Preferences");
 			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
 			this.Modal = true;
 			this.DestroyWithParent = true;
-			// Internal child MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog.VBox
+			// Internal child MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.VBox
 			global::Gtk.VBox w1 = this.VBox;
 			w1.Name = "dialog1_VBox";
 			w1.BorderWidth = ((uint)(2));
@@ -48,7 +52,7 @@ namespace MonoDevelop.DesignerSupport
 			w1.Add (this.vbox2);
 			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
 			w4.Position = 0;
-			// Internal child MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog.ActionArea
+			// Internal child MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.ActionArea
 			global::Gtk.HButtonBox w5 = this.ActionArea;
 			w5.Name = "dialog1_ActionArea";
 			w5.Spacing = 10;
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog.cs
index e1b750e4a6..bf5870fd72 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog.cs
@@ -1,45 +1,72 @@
 
 // This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
 {
 	internal partial class NameConventionEditRuleDialog
 	{
 		private global::Gtk.VBox vbox3;
+		
 		private global::Gtk.HBox hbox3;
+		
 		private global::Gtk.Label label4;
+		
 		private global::Gtk.Entry entryRuleName;
+		
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.Table table1;
+		
 		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+		
 		private global::Gtk.TreeView treeviewEntities;
+		
 		private global::Gtk.ScrolledWindow GtkScrolledWindow1;
+		
 		private global::Gtk.TreeView treeviewAccessibility;
+		
 		private global::Gtk.Label label5;
+		
 		private global::Gtk.Label label6;
+		
 		private global::Gtk.Table table2;
+		
 		private global::Gtk.Entry entryPrefix;
+		
 		private global::Gtk.Entry entryPrefixAllowed;
+		
 		private global::Gtk.Entry entrySuffix;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.Label label3;
+		
 		private global::Gtk.Label label8;
+		
 		private global::Gtk.ComboBox styleComboBox;
+		
 		private global::Gtk.VBox vbox1;
+		
 		private global::Gtk.CheckButton checkbuttonStatic;
+		
 		private global::Gtk.CheckButton checkbuttonInstanceMembers;
+		
 		private global::Gtk.VBox vbox5;
+		
 		private global::Gtk.Label label9;
+		
 		private global::Gtk.Button buttonCancel;
+		
 		private global::Gtk.Button buttonOk;
 
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog
+			// Widget MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog
 			this.WidthRequest = 640;
 			this.HeightRequest = 480;
-			this.Name = "MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog";
+			this.Name = "MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog";
 			this.Title = global::Mono.Unix.Catalog.GetString ("Edit Naming Rule");
 			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
 			this.Modal = true;
@@ -47,7 +74,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.DestroyWithParent = true;
 			this.SkipPagerHint = true;
 			this.SkipTaskbarHint = true;
-			// Internal child MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.VBox
+			// Internal child MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog.VBox
 			global::Gtk.VBox w1 = this.VBox;
 			w1.Name = "dialog1_VBox";
 			w1.Spacing = 6;
@@ -93,6 +120,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
 			this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(2)), false);
+			this.table1.Name = "table1";
 			this.table1.RowSpacing = ((uint)(6));
 			this.table1.ColumnSpacing = ((uint)(6));
 			this.table1.BorderWidth = ((uint)(6));
@@ -324,7 +352,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox3]));
 			w27.Position = 0;
 			w27.Padding = ((uint)(6));
-			// Internal child MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.ActionArea
+			// Internal child MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog.ActionArea
 			global::Gtk.HButtonBox w28 = this.ActionArea;
 			w28.Name = "dialog1_ActionArea";
 			w28.Spacing = 10;
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget.cs
index c508c70e70..ca3e1675e6 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget.cs
@@ -1,24 +1,30 @@
 
 // This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
 {
-	public partial class NameConventionPanelWidget
+	internal partial class NameConventionPanelWidget
 	{
 		private global::Gtk.HBox hbox3;
+		
 		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+		
 		private global::Gtk.TreeView treeviewConventions;
+		
 		private global::Gtk.VBox vbox3;
+		
 		private global::Gtk.Button buttonEdit;
+		
 		private global::Gtk.Button buttonAdd;
+		
 		private global::Gtk.Button buttonRemove;
 
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget
+			// Widget MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget
 			global::Stetic.BinContainer.Attach (this);
-			this.Name = "MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget";
-			// Container child MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget.Gtk.Container+ContainerChild
+			this.Name = "MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget";
+			// Container child MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget.Gtk.Container+ContainerChild
 			this.hbox3 = new global::Gtk.HBox ();
 			this.hbox3.Name = "hbox3";
 			this.hbox3.Spacing = 6;
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingPolicyPanelWidget.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingPolicyPanelWidget.cs
index 323a37ccd6..7ed1eb6ce1 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingPolicyPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingPolicyPanelWidget.cs
@@ -2,12 +2,16 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.CSharp.Formatting
 {
-	internal partial class CSharpFormattingPolicyPanelWidget
+	public partial class CSharpFormattingPolicyPanelWidget
 	{
 		private global::Gtk.VBox vbox1;
+		
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.Button buttonEdit;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow1;
 
 		protected virtual void Build ()
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs
index a44402e53d..77a4416fad 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs
@@ -5,55 +5,59 @@ namespace MonoDevelop.CSharp.Formatting
 	internal partial class CSharpFormattingProfileDialog
 	{
 		private global::Gtk.VBox vbox5;
+		
 		private global::Gtk.HPaned hpaned1;
+		
 		private global::Gtk.VBox vbox2;
+		
 		private global::Gtk.HBox hbox4;
+		
 		private global::Gtk.Label label12;
+		
 		private global::Gtk.ComboBox comboboxCategories;
+		
 		private global::Gtk.Notebook notebookCategories;
+		
 		private global::Gtk.VBox vbox8;
+		
 		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+		
 		private global::Gtk.TreeView treeviewIndentOptions;
+		
 		private global::Gtk.Label label8;
+		
 		private global::Gtk.ScrolledWindow GtkScrolledWindow1;
-		private global::Gtk.TreeView treeviewBracePositions;
+		
+		private global::Gtk.TreeView treeviewNewLines;
+		
 		private global::Gtk.Label label9;
-		private global::Gtk.Table table4;
-		private global::Gtk.Entry entryAfterUsings;
-		private global::Gtk.Entry entryAroundRegion;
-		private global::Gtk.Entry entryBeforeFirstDeclaration;
-		private global::Gtk.Entry entryBeforUsings;
-		private global::Gtk.Entry entryBetweenEvents;
-		private global::Gtk.Entry entryBetweenFields;
-		private global::Gtk.Entry entryBetweenMembers;
-		private global::Gtk.Entry entryBetweenTypes;
-		private global::Gtk.Entry entryInsideRegion;
-		private global::Gtk.Label GtkLabel8;
-		private global::Gtk.Label GtkLabel9;
-		private global::Gtk.Label label1;
-		private global::Gtk.Label label15;
-		private global::Gtk.Label label16;
-		private global::Gtk.Label label19;
-		private global::Gtk.Label label20;
-		private global::Gtk.Label label21;
-		private global::Gtk.Label label22;
-		private global::Gtk.Label label23;
-		private global::Gtk.Label label24;
-		private global::Gtk.Label label25;
+		
+		private global::Gtk.ScrolledWindow GtkScrolledWindow5;
+		
+		private global::Gtk.TreeView treeviewSpacing;
+		
 		private global::Gtk.Label label14;
-		private global::Gtk.ScrolledWindow GtkScrolledWindow3;
-		private global::Gtk.TreeView treeviewWrappingCategory;
-		private global::Gtk.Label label2;
+		
 		private global::Gtk.ScrolledWindow GtkScrolledWindow2;
-		private global::Gtk.TreeView treeviewInsertWhiteSpaceCategory;
+		
+		private global::Gtk.TreeView treeviewWrapping;
+		
 		private global::Gtk.Label label10;
-		private global::Gtk.ScrolledWindow GtkScrolledWindow4;
-		private global::Gtk.TreeView treeviewNewLines;
-		private global::Gtk.Label label11;
+		
+		private global::Gtk.ScrolledWindow GtkScrolledWindow3;
+		
+		private global::Gtk.TreeView treeviewStyle;
+		
+		private global::Gtk.Label label2;
+		
 		private global::Gtk.VBox vbox6;
+		
 		private global::Gtk.Label label13;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow;
+		
 		private global::Gtk.Button buttonCancel;
+		
 		private global::Gtk.Button buttonOk;
 
 		protected virtual void Build ()
@@ -131,7 +135,7 @@ namespace MonoDevelop.CSharp.Formatting
 			// Notebook tab
 			this.label8 = new global::Gtk.Label ();
 			this.label8.Name = "label8";
-			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("page1");
+			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Indentation");
 			this.notebookCategories.SetTabLabel (this.vbox8, this.label8);
 			this.label8.ShowAll ();
 			// Container child notebookCategories.Gtk.Notebook+NotebookChild
@@ -139,363 +143,79 @@ namespace MonoDevelop.CSharp.Formatting
 			this.GtkScrolledWindow1.Name = "GtkScrolledWindow1";
 			this.GtkScrolledWindow1.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child GtkScrolledWindow1.Gtk.Container+ContainerChild
-			this.treeviewBracePositions = new global::Gtk.TreeView ();
-			this.treeviewBracePositions.CanFocus = true;
-			this.treeviewBracePositions.Name = "treeviewBracePositions";
-			this.GtkScrolledWindow1.Add (this.treeviewBracePositions);
+			this.treeviewNewLines = new global::Gtk.TreeView ();
+			this.treeviewNewLines.CanFocus = true;
+			this.treeviewNewLines.Name = "treeviewNewLines";
+			this.GtkScrolledWindow1.Add (this.treeviewNewLines);
 			this.notebookCategories.Add (this.GtkScrolledWindow1);
 			global::Gtk.Notebook.NotebookChild w9 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow1]));
 			w9.Position = 1;
 			// Notebook tab
 			this.label9 = new global::Gtk.Label ();
 			this.label9.Name = "label9";
-			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("page2");
+			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("NewLines");
 			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow1, this.label9);
 			this.label9.ShowAll ();
 			// Container child notebookCategories.Gtk.Notebook+NotebookChild
-			this.table4 = new global::Gtk.Table (((uint)(12)), ((uint)(3)), false);
-			this.table4.Name = "table4";
-			this.table4.RowSpacing = ((uint)(6));
-			this.table4.ColumnSpacing = ((uint)(6));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryAfterUsings = new global::Gtk.Entry ();
-			this.entryAfterUsings.CanFocus = true;
-			this.entryAfterUsings.Name = "entryAfterUsings";
-			this.entryAfterUsings.IsEditable = true;
-			this.entryAfterUsings.WidthChars = 5;
-			this.entryAfterUsings.InvisibleChar = '●';
-			this.table4.Add (this.entryAfterUsings);
-			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryAfterUsings]));
-			w10.TopAttach = ((uint)(2));
-			w10.BottomAttach = ((uint)(3));
-			w10.LeftAttach = ((uint)(1));
-			w10.RightAttach = ((uint)(2));
-			w10.XOptions = ((global::Gtk.AttachOptions)(2));
-			w10.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryAroundRegion = new global::Gtk.Entry ();
-			this.entryAroundRegion.CanFocus = true;
-			this.entryAroundRegion.Name = "entryAroundRegion";
-			this.entryAroundRegion.IsEditable = true;
-			this.entryAroundRegion.WidthChars = 5;
-			this.entryAroundRegion.InvisibleChar = '●';
-			this.table4.Add (this.entryAroundRegion);
-			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryAroundRegion]));
-			w11.TopAttach = ((uint)(10));
-			w11.BottomAttach = ((uint)(11));
-			w11.LeftAttach = ((uint)(1));
-			w11.RightAttach = ((uint)(2));
-			w11.XOptions = ((global::Gtk.AttachOptions)(0));
-			w11.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBeforeFirstDeclaration = new global::Gtk.Entry ();
-			this.entryBeforeFirstDeclaration.CanFocus = true;
-			this.entryBeforeFirstDeclaration.Name = "entryBeforeFirstDeclaration";
-			this.entryBeforeFirstDeclaration.IsEditable = true;
-			this.entryBeforeFirstDeclaration.WidthChars = 5;
-			this.entryBeforeFirstDeclaration.InvisibleChar = '●';
-			this.table4.Add (this.entryBeforeFirstDeclaration);
-			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBeforeFirstDeclaration]));
-			w12.TopAttach = ((uint)(4));
-			w12.BottomAttach = ((uint)(5));
-			w12.LeftAttach = ((uint)(1));
-			w12.RightAttach = ((uint)(2));
-			w12.XOptions = ((global::Gtk.AttachOptions)(0));
-			w12.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBeforUsings = new global::Gtk.Entry ();
-			this.entryBeforUsings.CanFocus = true;
-			this.entryBeforUsings.Name = "entryBeforUsings";
-			this.entryBeforUsings.IsEditable = true;
-			this.entryBeforUsings.WidthChars = 5;
-			this.entryBeforUsings.InvisibleChar = '●';
-			this.table4.Add (this.entryBeforUsings);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBeforUsings]));
-			w13.TopAttach = ((uint)(1));
-			w13.BottomAttach = ((uint)(2));
-			w13.LeftAttach = ((uint)(1));
-			w13.RightAttach = ((uint)(2));
-			w13.XOptions = ((global::Gtk.AttachOptions)(2));
-			w13.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBetweenEvents = new global::Gtk.Entry ();
-			this.entryBetweenEvents.CanFocus = true;
-			this.entryBetweenEvents.Name = "entryBetweenEvents";
-			this.entryBetweenEvents.IsEditable = true;
-			this.entryBetweenEvents.WidthChars = 5;
-			this.entryBetweenEvents.InvisibleChar = '●';
-			this.table4.Add (this.entryBetweenEvents);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBetweenEvents]));
-			w14.TopAttach = ((uint)(8));
-			w14.BottomAttach = ((uint)(9));
-			w14.LeftAttach = ((uint)(1));
-			w14.RightAttach = ((uint)(2));
-			w14.XOptions = ((global::Gtk.AttachOptions)(0));
-			w14.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBetweenFields = new global::Gtk.Entry ();
-			this.entryBetweenFields.CanFocus = true;
-			this.entryBetweenFields.Name = "entryBetweenFields";
-			this.entryBetweenFields.IsEditable = true;
-			this.entryBetweenFields.WidthChars = 5;
-			this.entryBetweenFields.InvisibleChar = '●';
-			this.table4.Add (this.entryBetweenFields);
-			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBetweenFields]));
-			w15.TopAttach = ((uint)(7));
-			w15.BottomAttach = ((uint)(8));
-			w15.LeftAttach = ((uint)(1));
-			w15.RightAttach = ((uint)(2));
-			w15.XOptions = ((global::Gtk.AttachOptions)(0));
-			w15.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBetweenMembers = new global::Gtk.Entry ();
-			this.entryBetweenMembers.CanFocus = true;
-			this.entryBetweenMembers.Name = "entryBetweenMembers";
-			this.entryBetweenMembers.IsEditable = true;
-			this.entryBetweenMembers.WidthChars = 5;
-			this.entryBetweenMembers.InvisibleChar = '●';
-			this.table4.Add (this.entryBetweenMembers);
-			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBetweenMembers]));
-			w16.TopAttach = ((uint)(9));
-			w16.BottomAttach = ((uint)(10));
-			w16.LeftAttach = ((uint)(1));
-			w16.RightAttach = ((uint)(2));
-			w16.XOptions = ((global::Gtk.AttachOptions)(0));
-			w16.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBetweenTypes = new global::Gtk.Entry ();
-			this.entryBetweenTypes.CanFocus = true;
-			this.entryBetweenTypes.Name = "entryBetweenTypes";
-			this.entryBetweenTypes.IsEditable = true;
-			this.entryBetweenTypes.WidthChars = 5;
-			this.entryBetweenTypes.InvisibleChar = '●';
-			this.table4.Add (this.entryBetweenTypes);
-			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBetweenTypes]));
-			w17.TopAttach = ((uint)(5));
-			w17.BottomAttach = ((uint)(6));
-			w17.LeftAttach = ((uint)(1));
-			w17.RightAttach = ((uint)(2));
-			w17.XOptions = ((global::Gtk.AttachOptions)(0));
-			w17.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryInsideRegion = new global::Gtk.Entry ();
-			this.entryInsideRegion.CanFocus = true;
-			this.entryInsideRegion.Name = "entryInsideRegion";
-			this.entryInsideRegion.IsEditable = true;
-			this.entryInsideRegion.WidthChars = 5;
-			this.entryInsideRegion.InvisibleChar = '●';
-			this.table4.Add (this.entryInsideRegion);
-			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryInsideRegion]));
-			w18.TopAttach = ((uint)(11));
-			w18.BottomAttach = ((uint)(12));
-			w18.LeftAttach = ((uint)(1));
-			w18.RightAttach = ((uint)(2));
-			w18.XOptions = ((global::Gtk.AttachOptions)(0));
-			w18.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.GtkLabel8 = new global::Gtk.Label ();
-			this.GtkLabel8.Name = "GtkLabel8";
-			this.GtkLabel8.Xalign = 0F;
-			this.GtkLabel8.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Minimum blank lines in namespaces</b>");
-			this.GtkLabel8.UseMarkup = true;
-			this.table4.Add (this.GtkLabel8);
-			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table4 [this.GtkLabel8]));
-			w19.TopAttach = ((uint)(3));
-			w19.BottomAttach = ((uint)(4));
-			w19.RightAttach = ((uint)(3));
-			w19.XOptions = ((global::Gtk.AttachOptions)(4));
-			w19.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.GtkLabel9 = new global::Gtk.Label ();
-			this.GtkLabel9.Name = "GtkLabel9";
-			this.GtkLabel9.Xalign = 0F;
-			this.GtkLabel9.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Minimum blank lines in types</b>");
-			this.GtkLabel9.UseMarkup = true;
-			this.table4.Add (this.GtkLabel9);
-			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table4 [this.GtkLabel9]));
-			w20.TopAttach = ((uint)(6));
-			w20.BottomAttach = ((uint)(7));
-			w20.RightAttach = ((uint)(3));
-			w20.XOptions = ((global::Gtk.AttachOptions)(4));
-			w20.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.Xalign = 0F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Minimum blank lines in compilation unit</b>");
-			this.label1.UseMarkup = true;
-			this.table4.Add (this.label1);
-			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table4 [this.label1]));
-			w21.RightAttach = ((uint)(3));
-			w21.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label15 = new global::Gtk.Label ();
-			this.label15.Name = "label15";
-			this.label15.Xalign = 1F;
-			this.label15.LabelProp = global::Mono.Unix.Catalog.GetString ("Before using declaration:");
-			this.table4.Add (this.label15);
-			global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table4 [this.label15]));
-			w22.TopAttach = ((uint)(1));
-			w22.BottomAttach = ((uint)(2));
-			w22.XOptions = ((global::Gtk.AttachOptions)(4));
-			w22.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label16 = new global::Gtk.Label ();
-			this.label16.Name = "label16";
-			this.label16.Xalign = 1F;
-			this.label16.LabelProp = global::Mono.Unix.Catalog.GetString ("After using declaration:");
-			this.table4.Add (this.label16);
-			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table4 [this.label16]));
-			w23.TopAttach = ((uint)(2));
-			w23.BottomAttach = ((uint)(3));
-			w23.XOptions = ((global::Gtk.AttachOptions)(4));
-			w23.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label19 = new global::Gtk.Label ();
-			this.label19.Name = "label19";
-			this.label19.Xalign = 1F;
-			this.label19.LabelProp = global::Mono.Unix.Catalog.GetString ("Between type declarations:");
-			this.table4.Add (this.label19);
-			global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table4 [this.label19]));
-			w24.TopAttach = ((uint)(5));
-			w24.BottomAttach = ((uint)(6));
-			w24.XOptions = ((global::Gtk.AttachOptions)(4));
-			w24.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label20 = new global::Gtk.Label ();
-			this.label20.Name = "label20";
-			this.label20.Xalign = 1F;
-			this.label20.LabelProp = global::Mono.Unix.Catalog.GetString ("Before first declaration:");
-			this.table4.Add (this.label20);
-			global::Gtk.Table.TableChild w25 = ((global::Gtk.Table.TableChild)(this.table4 [this.label20]));
-			w25.TopAttach = ((uint)(4));
-			w25.BottomAttach = ((uint)(5));
-			w25.XOptions = ((global::Gtk.AttachOptions)(4));
-			w25.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label21 = new global::Gtk.Label ();
-			this.label21.Name = "label21";
-			this.label21.Xalign = 1F;
-			this.label21.LabelProp = global::Mono.Unix.Catalog.GetString ("Between field declarations:");
-			this.table4.Add (this.label21);
-			global::Gtk.Table.TableChild w26 = ((global::Gtk.Table.TableChild)(this.table4 [this.label21]));
-			w26.TopAttach = ((uint)(7));
-			w26.BottomAttach = ((uint)(8));
-			w26.XOptions = ((global::Gtk.AttachOptions)(4));
-			w26.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label22 = new global::Gtk.Label ();
-			this.label22.Name = "label22";
-			this.label22.Xalign = 1F;
-			this.label22.LabelProp = global::Mono.Unix.Catalog.GetString ("Between other member declarations:");
-			this.table4.Add (this.label22);
-			global::Gtk.Table.TableChild w27 = ((global::Gtk.Table.TableChild)(this.table4 [this.label22]));
-			w27.TopAttach = ((uint)(9));
-			w27.BottomAttach = ((uint)(10));
-			w27.XOptions = ((global::Gtk.AttachOptions)(4));
-			w27.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label23 = new global::Gtk.Label ();
-			this.label23.Name = "label23";
-			this.label23.Xalign = 1F;
-			this.label23.LabelProp = global::Mono.Unix.Catalog.GetString ("Between simple event declarations:");
-			this.table4.Add (this.label23);
-			global::Gtk.Table.TableChild w28 = ((global::Gtk.Table.TableChild)(this.table4 [this.label23]));
-			w28.TopAttach = ((uint)(8));
-			w28.BottomAttach = ((uint)(9));
-			w28.XOptions = ((global::Gtk.AttachOptions)(4));
-			w28.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label24 = new global::Gtk.Label ();
-			this.label24.Name = "label24";
-			this.label24.Xalign = 1F;
-			this.label24.LabelProp = global::Mono.Unix.Catalog.GetString ("Around region:");
-			this.table4.Add (this.label24);
-			global::Gtk.Table.TableChild w29 = ((global::Gtk.Table.TableChild)(this.table4 [this.label24]));
-			w29.TopAttach = ((uint)(10));
-			w29.BottomAttach = ((uint)(11));
-			w29.XOptions = ((global::Gtk.AttachOptions)(4));
-			w29.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label25 = new global::Gtk.Label ();
-			this.label25.Name = "label25";
-			this.label25.Xalign = 1F;
-			this.label25.LabelProp = global::Mono.Unix.Catalog.GetString ("Inside region:");
-			this.table4.Add (this.label25);
-			global::Gtk.Table.TableChild w30 = ((global::Gtk.Table.TableChild)(this.table4 [this.label25]));
-			w30.TopAttach = ((uint)(11));
-			w30.BottomAttach = ((uint)(12));
-			w30.XOptions = ((global::Gtk.AttachOptions)(4));
-			w30.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.notebookCategories.Add (this.table4);
-			global::Gtk.Notebook.NotebookChild w31 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.table4]));
-			w31.Position = 2;
+			this.GtkScrolledWindow5 = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow5.Name = "GtkScrolledWindow5";
+			this.GtkScrolledWindow5.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow5.Gtk.Container+ContainerChild
+			this.treeviewSpacing = new global::Gtk.TreeView ();
+			this.treeviewSpacing.CanFocus = true;
+			this.treeviewSpacing.Name = "treeviewSpacing";
+			this.GtkScrolledWindow5.Add (this.treeviewSpacing);
+			this.notebookCategories.Add (this.GtkScrolledWindow5);
+			global::Gtk.Notebook.NotebookChild w11 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow5]));
+			w11.Position = 2;
 			// Notebook tab
 			this.label14 = new global::Gtk.Label ();
 			this.label14.Name = "label14";
-			this.label14.LabelProp = global::Mono.Unix.Catalog.GetString ("page5");
-			this.notebookCategories.SetTabLabel (this.table4, this.label14);
+			this.label14.LabelProp = global::Mono.Unix.Catalog.GetString ("Spacing");
+			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow5, this.label14);
 			this.label14.ShowAll ();
 			// Container child notebookCategories.Gtk.Notebook+NotebookChild
-			this.GtkScrolledWindow3 = new global::Gtk.ScrolledWindow ();
-			this.GtkScrolledWindow3.Name = "GtkScrolledWindow3";
-			this.GtkScrolledWindow3.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child GtkScrolledWindow3.Gtk.Container+ContainerChild
-			this.treeviewWrappingCategory = new global::Gtk.TreeView ();
-			this.treeviewWrappingCategory.CanFocus = true;
-			this.treeviewWrappingCategory.Name = "treeviewWrappingCategory";
-			this.GtkScrolledWindow3.Add (this.treeviewWrappingCategory);
-			this.notebookCategories.Add (this.GtkScrolledWindow3);
-			global::Gtk.Notebook.NotebookChild w33 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow3]));
-			w33.Position = 3;
-			// Notebook tab
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("page6");
-			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow3, this.label2);
-			this.label2.ShowAll ();
-			// Container child notebookCategories.Gtk.Notebook+NotebookChild
 			this.GtkScrolledWindow2 = new global::Gtk.ScrolledWindow ();
 			this.GtkScrolledWindow2.Name = "GtkScrolledWindow2";
 			this.GtkScrolledWindow2.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child GtkScrolledWindow2.Gtk.Container+ContainerChild
-			this.treeviewInsertWhiteSpaceCategory = new global::Gtk.TreeView ();
-			this.treeviewInsertWhiteSpaceCategory.CanFocus = true;
-			this.treeviewInsertWhiteSpaceCategory.Name = "treeviewInsertWhiteSpaceCategory";
-			this.GtkScrolledWindow2.Add (this.treeviewInsertWhiteSpaceCategory);
+			this.treeviewWrapping = new global::Gtk.TreeView ();
+			this.treeviewWrapping.CanFocus = true;
+			this.treeviewWrapping.Name = "treeviewWrapping";
+			this.GtkScrolledWindow2.Add (this.treeviewWrapping);
 			this.notebookCategories.Add (this.GtkScrolledWindow2);
-			global::Gtk.Notebook.NotebookChild w35 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow2]));
-			w35.Position = 4;
+			global::Gtk.Notebook.NotebookChild w13 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow2]));
+			w13.Position = 3;
 			// Notebook tab
 			this.label10 = new global::Gtk.Label ();
 			this.label10.Name = "label10";
-			this.label10.LabelProp = global::Mono.Unix.Catalog.GetString ("page3");
+			this.label10.LabelProp = global::Mono.Unix.Catalog.GetString ("Wrapping");
 			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow2, this.label10);
 			this.label10.ShowAll ();
 			// Container child notebookCategories.Gtk.Notebook+NotebookChild
-			this.GtkScrolledWindow4 = new global::Gtk.ScrolledWindow ();
-			this.GtkScrolledWindow4.Name = "GtkScrolledWindow4";
-			this.GtkScrolledWindow4.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child GtkScrolledWindow4.Gtk.Container+ContainerChild
-			this.treeviewNewLines = new global::Gtk.TreeView ();
-			this.treeviewNewLines.CanFocus = true;
-			this.treeviewNewLines.Name = "treeviewNewLines";
-			this.GtkScrolledWindow4.Add (this.treeviewNewLines);
-			this.notebookCategories.Add (this.GtkScrolledWindow4);
-			global::Gtk.Notebook.NotebookChild w37 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow4]));
-			w37.Position = 5;
+			this.GtkScrolledWindow3 = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow3.Name = "GtkScrolledWindow3";
+			this.GtkScrolledWindow3.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow3.Gtk.Container+ContainerChild
+			this.treeviewStyle = new global::Gtk.TreeView ();
+			this.treeviewStyle.CanFocus = true;
+			this.treeviewStyle.Name = "treeviewStyle";
+			this.GtkScrolledWindow3.Add (this.treeviewStyle);
+			this.notebookCategories.Add (this.GtkScrolledWindow3);
+			global::Gtk.Notebook.NotebookChild w15 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow3]));
+			w15.Position = 4;
 			// Notebook tab
-			this.label11 = new global::Gtk.Label ();
-			this.label11.Name = "label11";
-			this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("page4");
-			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow4, this.label11);
-			this.label11.ShowAll ();
+			this.label2 = new global::Gtk.Label ();
+			this.label2.Name = "label2";
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Style");
+			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow3, this.label2);
+			this.label2.ShowAll ();
 			this.vbox2.Add (this.notebookCategories);
-			global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.notebookCategories]));
-			w38.Position = 1;
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.notebookCategories]));
+			w16.Position = 1;
 			this.hpaned1.Add (this.vbox2);
-			global::Gtk.Paned.PanedChild w39 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.vbox2]));
-			w39.Resize = false;
+			global::Gtk.Paned.PanedChild w17 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.vbox2]));
+			w17.Resize = false;
 			// Container child hpaned1.Gtk.Paned+PanedChild
 			this.vbox6 = new global::Gtk.VBox ();
 			this.vbox6.Name = "vbox6";
@@ -506,31 +226,31 @@ namespace MonoDevelop.CSharp.Formatting
 			this.label13.Xalign = 0F;
 			this.label13.LabelProp = global::Mono.Unix.Catalog.GetString ("Preview:");
 			this.vbox6.Add (this.label13);
-			global::Gtk.Box.BoxChild w40 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.label13]));
-			w40.Position = 0;
-			w40.Expand = false;
-			w40.Fill = false;
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.label13]));
+			w18.Position = 0;
+			w18.Expand = false;
+			w18.Fill = false;
 			// Container child vbox6.Gtk.Box+BoxChild
 			this.scrolledwindow = new global::Gtk.ScrolledWindow ();
 			this.scrolledwindow.CanFocus = true;
 			this.scrolledwindow.Name = "scrolledwindow";
 			this.scrolledwindow.ShadowType = ((global::Gtk.ShadowType)(1));
 			this.vbox6.Add (this.scrolledwindow);
-			global::Gtk.Box.BoxChild w41 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.scrolledwindow]));
-			w41.Position = 1;
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.scrolledwindow]));
+			w19.Position = 1;
 			this.hpaned1.Add (this.vbox6);
 			this.vbox5.Add (this.hpaned1);
-			global::Gtk.Box.BoxChild w43 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hpaned1]));
-			w43.Position = 0;
+			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hpaned1]));
+			w21.Position = 0;
 			w1.Add (this.vbox5);
-			global::Gtk.Box.BoxChild w44 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5]));
-			w44.Position = 0;
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5]));
+			w22.Position = 0;
 			// Internal child MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.ActionArea
-			global::Gtk.HButtonBox w45 = this.ActionArea;
-			w45.Name = "dialog1_ActionArea";
-			w45.Spacing = 10;
-			w45.BorderWidth = ((uint)(5));
-			w45.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			global::Gtk.HButtonBox w23 = this.ActionArea;
+			w23.Name = "dialog1_ActionArea";
+			w23.Spacing = 10;
+			w23.BorderWidth = ((uint)(5));
+			w23.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonCancel = new global::Gtk.Button ();
 			this.buttonCancel.CanDefault = true;
@@ -540,9 +260,9 @@ namespace MonoDevelop.CSharp.Formatting
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
 			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w46 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w45 [this.buttonCancel]));
-			w46.Expand = false;
-			w46.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w24 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w23 [this.buttonCancel]));
+			w24.Expand = false;
+			w24.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonOk = new global::Gtk.Button ();
 			this.buttonOk.CanDefault = true;
@@ -552,10 +272,10 @@ namespace MonoDevelop.CSharp.Formatting
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
 			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w47 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w45 [this.buttonOk]));
-			w47.Position = 1;
-			w47.Expand = false;
-			w47.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w25 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w23 [this.buttonOk]));
+			w25.Position = 1;
+			w25.Expand = false;
+			w25.Fill = false;
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.NewFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.NewFormattingProfileDialog.cs
index 6dc530487f..55ada2a1b7 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.NewFormattingProfileDialog.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.NewFormattingProfileDialog.cs
@@ -2,14 +2,20 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.CSharp.Formatting
 {
-	internal partial class NewFormattingProfileDialog
+	public partial class NewFormattingProfileDialog
 	{
 		private global::Gtk.VBox vbox4;
+		
 		private global::Gtk.Label label3;
+		
 		private global::Gtk.Entry entryProfileName;
+		
 		private global::Gtk.Label label4;
+		
 		private global::Gtk.ComboBox comboboxInitFrom;
+		
 		private global::Gtk.Button buttonCancel;
+		
 		private global::Gtk.Button buttonOk;
 
 		protected virtual void Build ()
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs
index 954a522bf3..73bb6d6a87 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs
@@ -5,36 +5,67 @@ namespace MonoDevelop.CSharp.Project
 	internal partial class CodeGenerationPanelWidget
 	{
 		private global::Gtk.VBox vbox62;
+		
 		private global::Gtk.Label label82;
+		
 		private global::Gtk.HBox hbox56;
+		
 		private global::Gtk.Label label81;
+		
 		private global::Gtk.VBox vbox65;
+		
 		private global::Gtk.Table table1;
+		
 		private global::Gtk.CheckButton enableOptimizationCheckButton;
+		
 		private global::Gtk.CheckButton generateOverflowChecksCheckButton;
+		
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.ComboBox comboPlatforms;
+		
 		private global::Gtk.HBox hbox2;
+		
 		private global::Gtk.ComboBox comboDebug;
+		
 		private global::Gtk.HBox hbox4;
+		
 		private global::Gtk.CheckButton generateXmlOutputCheckButton;
+		
 		private global::MonoDevelop.Components.FileEntry xmlDocsEntry;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.Label label87;
+		
 		private global::Gtk.Entry symbolsEntry;
+		
 		private global::Gtk.Label label93;
+		
 		private global::Gtk.HBox hbox48;
+		
 		private global::Gtk.Label label73;
+		
 		private global::Gtk.VBox vbox67;
+		
 		private global::Gtk.HBox hbox60;
+		
 		private global::Gtk.Label label85;
+		
 		private global::Gtk.SpinButton warningLevelSpinButton;
+		
 		private global::Gtk.HBox hbox3;
+		
 		private global::Gtk.Label label86;
+		
 		private global::Gtk.Entry ignoreWarningsEntry;
+		
 		private global::Gtk.CheckButton warningsAsErrorsCheckButton;
+		
 		private global::Gtk.HBox hbox5;
+		
 		private global::Gtk.Label label74;
 
 		protected virtual void Build ()
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs
index 25f72f18b7..d65f8b1428 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs
@@ -5,29 +5,53 @@ namespace MonoDevelop.CSharp.Project
 	public partial class CompilerOptionsPanelWidget
 	{
 		private global::Gtk.VBox vbox1;
+		
 		private global::Gtk.Label label82;
+		
 		private global::Gtk.HBox hbox5;
+		
 		private global::Gtk.Label label76;
+		
 		private global::Gtk.VBox vbox2;
+		
 		private global::Gtk.Table table7;
+		
 		private global::Gtk.ComboBoxEntry codepageEntry;
+		
 		private global::Gtk.HBox hbox57;
+		
 		private global::Gtk.ComboBox compileTargetCombo;
+		
 		private global::MonoDevelop.Components.FileEntry iconEntry;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.Label label3;
+		
 		private global::Gtk.Label label86;
+		
 		private global::Gtk.Label label88;
+		
 		private global::Gtk.ComboBoxEntry mainClassEntry;
+		
 		private global::Gtk.CheckButton noStdLibCheckButton;
+		
 		private global::Gtk.Label label83;
+		
 		private global::Gtk.Label label75;
+		
 		private global::Gtk.HBox hbox7;
+		
 		private global::Gtk.Label label74;
+		
 		private global::Gtk.VBox vbox3;
+		
 		private global::Gtk.Table table2;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.ComboBox langVerCombo;
+		
 		private global::Gtk.CheckButton allowUnsafeCodeCheckButton;
 
 		protected virtual void Build ()
@@ -104,6 +128,7 @@ namespace MonoDevelop.CSharp.Project
 			// Container child table7.Gtk.Table+TableChild
 			this.iconEntry = new global::MonoDevelop.Components.FileEntry ();
 			this.iconEntry.Name = "iconEntry";
+			this.iconEntry.DisplayAsRelativePath = false;
 			this.table7.Add (this.iconEntry);
 			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table7 [this.iconEntry]));
 			w6.TopAttach = ((uint)(2));
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs
index 8654054487..c7a5415c2a 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs
@@ -5,9 +5,13 @@ namespace MonoDevelop.CodeGeneration
 	public partial class GenerateCodeWindow
 	{
 		private global::Gtk.VBox vbox1;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow1;
+		
 		private global::Gtk.Label labelDescription;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow2;
 
 		protected virtual void Build ()
diff --git a/main/src/addins/CSharpBinding/gtk-gui/gui.stetic b/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
index ebc8427558..ad4c8e592a 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
+++ b/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
@@ -6,9 +6,7 @@
   </configuration>
   <import>
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
-    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll" />
     <widget-library name="../../../../build/AddIns/NUnit/MonoDevelop.NUnit.dll" />
     <widget-library name="../../../../build/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll" internal="true" />
@@ -1197,7 +1195,7 @@ None</property>
                         <child>
                           <widget class="Gtk.Label" id="label8">
                             <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page1</property>
+                            <property name="LabelProp" translatable="yes">Indentation</property>
                           </widget>
                           <packing>
                             <property name="type">tab</property>
@@ -1208,7 +1206,7 @@ None</property>
                             <property name="MemberName" />
                             <property name="ShadowType">In</property>
                             <child>
-                              <widget class="Gtk.TreeView" id="treeviewBracePositions">
+                              <widget class="Gtk.TreeView" id="treeviewNewLines">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
                                 <property name="ShowScrollbars">True</property>
@@ -1222,525 +1220,18 @@ None</property>
                         <child>
                           <widget class="Gtk.Label" id="label9">
                             <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page2</property>
-                          </widget>
-                          <packing>
-                            <property name="type">tab</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Table" id="table4">
-                            <property name="MemberName" />
-                            <property name="NRows">12</property>
-                            <property name="NColumns">3</property>
-                            <property name="RowSpacing">6</property>
-                            <property name="ColumnSpacing">6</property>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryAfterUsings">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">2</property>
-                                <property name="BottomAttach">3</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">Shrink</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">True</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryAroundRegion">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">10</property>
-                                <property name="BottomAttach">11</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBeforeFirstDeclaration">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">4</property>
-                                <property name="BottomAttach">5</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBeforUsings">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">1</property>
-                                <property name="BottomAttach">2</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">Shrink</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">True</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBetweenEvents">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">8</property>
-                                <property name="BottomAttach">9</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBetweenFields">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">7</property>
-                                <property name="BottomAttach">8</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBetweenMembers">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">9</property>
-                                <property name="BottomAttach">10</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBetweenTypes">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">5</property>
-                                <property name="BottomAttach">6</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryInsideRegion">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">11</property>
-                                <property name="BottomAttach">12</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="GtkLabel8">
-                                <property name="MemberName" />
-                                <property name="Xalign">0</property>
-                                <property name="LabelProp" translatable="yes">&lt;b&gt;Minimum blank lines in namespaces&lt;/b&gt;</property>
-                                <property name="UseMarkup">True</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">3</property>
-                                <property name="BottomAttach">4</property>
-                                <property name="RightAttach">3</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="GtkLabel9">
-                                <property name="MemberName" />
-                                <property name="Xalign">0</property>
-                                <property name="LabelProp" translatable="yes">&lt;b&gt;Minimum blank lines in types&lt;/b&gt;</property>
-                                <property name="UseMarkup">True</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">6</property>
-                                <property name="BottomAttach">7</property>
-                                <property name="RightAttach">3</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label1">
-                                <property name="MemberName" />
-                                <property name="Xalign">0</property>
-                                <property name="LabelProp" translatable="yes">&lt;b&gt;Minimum blank lines in compilation unit&lt;/b&gt;</property>
-                                <property name="UseMarkup">True</property>
-                              </widget>
-                              <packing>
-                                <property name="RightAttach">3</property>
-                                <property name="AutoSize">False</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">True</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label15">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Before using declaration:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">1</property>
-                                <property name="BottomAttach">2</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label16">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">After using declaration:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">2</property>
-                                <property name="BottomAttach">3</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label19">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Between type declarations:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">5</property>
-                                <property name="BottomAttach">6</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label20">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Before first declaration:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">4</property>
-                                <property name="BottomAttach">5</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label21">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Between field declarations:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">7</property>
-                                <property name="BottomAttach">8</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label22">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Between other member declarations:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">9</property>
-                                <property name="BottomAttach">10</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label23">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Between simple event declarations:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">8</property>
-                                <property name="BottomAttach">9</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label24">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Around region:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">10</property>
-                                <property name="BottomAttach">11</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label25">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Inside region:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">11</property>
-                                <property name="BottomAttach">12</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="Position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="label14">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page5</property>
+                            <property name="LabelProp" translatable="yes">NewLines</property>
                           </widget>
                           <packing>
                             <property name="type">tab</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow3">
+                          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow5">
                             <property name="MemberName" />
                             <property name="ShadowType">In</property>
                             <child>
-                              <widget class="Gtk.TreeView" id="treeviewWrappingCategory">
+                              <widget class="Gtk.TreeView" id="treeviewSpacing">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
                                 <property name="ShowScrollbars">True</property>
@@ -1748,13 +1239,13 @@ None</property>
                             </child>
                           </widget>
                           <packing>
-                            <property name="Position">3</property>
+                            <property name="Position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="Gtk.Label" id="label2">
+                          <widget class="Gtk.Label" id="label14">
                             <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page6</property>
+                            <property name="LabelProp" translatable="yes">Spacing</property>
                           </widget>
                           <packing>
                             <property name="type">tab</property>
@@ -1765,7 +1256,7 @@ None</property>
                             <property name="MemberName" />
                             <property name="ShadowType">In</property>
                             <child>
-                              <widget class="Gtk.TreeView" id="treeviewInsertWhiteSpaceCategory">
+                              <widget class="Gtk.TreeView" id="treeviewWrapping">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
                                 <property name="ShowScrollbars">True</property>
@@ -1773,24 +1264,24 @@ None</property>
                             </child>
                           </widget>
                           <packing>
-                            <property name="Position">4</property>
+                            <property name="Position">3</property>
                           </packing>
                         </child>
                         <child>
                           <widget class="Gtk.Label" id="label10">
                             <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page3</property>
+                            <property name="LabelProp" translatable="yes">Wrapping</property>
                           </widget>
                           <packing>
                             <property name="type">tab</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow4">
+                          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow3">
                             <property name="MemberName" />
                             <property name="ShadowType">In</property>
                             <child>
-                              <widget class="Gtk.TreeView" id="treeviewNewLines">
+                              <widget class="Gtk.TreeView" id="treeviewStyle">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
                                 <property name="ShowScrollbars">True</property>
@@ -1798,13 +1289,13 @@ None</property>
                             </child>
                           </widget>
                           <packing>
-                            <property name="Position">5</property>
+                            <property name="Position">4</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="Gtk.Label" id="label11">
+                          <widget class="Gtk.Label" id="label2">
                             <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page4</property>
+                            <property name="LabelProp" translatable="yes">Style</property>
                           </widget>
                           <packing>
                             <property name="type">tab</property>
@@ -1917,9 +1408,10 @@ None</property>
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget" design-size="300 300">
+  <widget class="Gtk.Bin" id="MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget" design-size="300 300">
     <property name="MemberName" />
     <property name="Visible">False</property>
+    <property name="GeneratePublic">False</property>
     <child>
       <widget class="Gtk.HBox" id="hbox3">
         <property name="MemberName" />
@@ -2086,7 +1578,7 @@ None</property>
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Dialog" id="MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog" design-size="804 508">
+  <widget class="Gtk.Dialog" id="MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog" design-size="804 508">
     <property name="MemberName" />
     <property name="WidthRequest">640</property>
     <property name="HeightRequest">480</property>
@@ -2610,4 +2102,190 @@ None</property>
       </widget>
     </child>
   </widget>
+  <widget class="Gtk.Dialog" id="MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog" design-size="424 367">
+    <property name="MemberName" />
+    <property name="Visible">False</property>
+    <property name="GeneratePublic">False</property>
+    <property name="Title" translatable="yes">Document Outline Preferences</property>
+    <property name="WindowPosition">CenterOnParent</property>
+    <property name="Modal">True</property>
+    <property name="DestroyWithParent">True</property>
+    <property name="Buttons">2</property>
+    <property name="HelpButton">False</property>
+    <child internal-child="VBox">
+      <widget class="Gtk.VBox" id="dialog1_VBox">
+        <property name="MemberName" />
+        <property name="BorderWidth">2</property>
+        <child>
+          <widget class="Gtk.VBox" id="vbox2">
+            <property name="MemberName" />
+            <property name="Spacing">6</property>
+            <property name="BorderWidth">6</property>
+            <child>
+              <widget class="Gtk.Label" id="label">
+                <property name="MemberName" />
+                <property name="WidthRequest">400</property>
+                <property name="LabelProp" translatable="yes">Group sorting order when grouping is enabled:</property>
+                <property name="Wrap">True</property>
+              </widget>
+              <packing>
+                <property name="Position">0</property>
+                <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="MonoDevelop.Ide.Gui.Components.PriorityList" id="priorityList">
+                <property name="MemberName" />
+              </widget>
+              <packing>
+                <property name="Position">1</property>
+                <property name="AutoSize">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">0</property>
+            <property name="AutoSize">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+    <child internal-child="ActionArea">
+      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
+        <property name="MemberName" />
+        <property name="Spacing">10</property>
+        <property name="BorderWidth">5</property>
+        <property name="Size">2</property>
+        <property name="LayoutStyle">End</property>
+        <child>
+          <widget class="Gtk.Button" id="buttonCancel">
+            <property name="MemberName" />
+            <property name="CanDefault">True</property>
+            <property name="CanFocus">True</property>
+            <property name="UseStock">True</property>
+            <property name="Type">StockItem</property>
+            <property name="StockId">gtk-cancel</property>
+            <property name="ResponseId">-6</property>
+            <property name="label">gtk-cancel</property>
+          </widget>
+          <packing>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Button" id="buttonOk">
+            <property name="MemberName" />
+            <property name="CanDefault">True</property>
+            <property name="CanFocus">True</property>
+            <property name="UseStock">True</property>
+            <property name="Type">StockItem</property>
+            <property name="StockId">gtk-ok</property>
+            <property name="ResponseId">-5</property>
+            <property name="label">gtk-ok</property>
+          </widget>
+          <packing>
+            <property name="Position">1</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="Gtk.Dialog" id="MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog" design-size="424 367">
+    <property name="MemberName" />
+    <property name="Visible">False</property>
+    <property name="GeneratePublic">False</property>
+    <property name="Title" translatable="yes">Document Outline Preferences</property>
+    <property name="WindowPosition">CenterOnParent</property>
+    <property name="Modal">True</property>
+    <property name="DestroyWithParent">True</property>
+    <property name="Buttons">2</property>
+    <property name="HelpButton">False</property>
+    <child internal-child="VBox">
+      <widget class="Gtk.VBox" id="dialog1_VBox">
+        <property name="MemberName" />
+        <property name="BorderWidth">2</property>
+        <child>
+          <widget class="Gtk.VBox" id="vbox2">
+            <property name="MemberName" />
+            <property name="Spacing">6</property>
+            <property name="BorderWidth">6</property>
+            <child>
+              <widget class="Gtk.Label" id="label">
+                <property name="MemberName" />
+                <property name="WidthRequest">400</property>
+                <property name="LabelProp" translatable="yes">Group sorting order when grouping is enabled:</property>
+                <property name="Wrap">True</property>
+              </widget>
+              <packing>
+                <property name="Position">0</property>
+                <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="MonoDevelop.Ide.Gui.Components.PriorityList" id="priorityList">
+                <property name="MemberName" />
+              </widget>
+              <packing>
+                <property name="Position">1</property>
+                <property name="AutoSize">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">0</property>
+            <property name="AutoSize">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+    <child internal-child="ActionArea">
+      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
+        <property name="MemberName" />
+        <property name="Spacing">10</property>
+        <property name="BorderWidth">5</property>
+        <property name="Size">2</property>
+        <property name="LayoutStyle">End</property>
+        <child>
+          <widget class="Gtk.Button" id="buttonCancel">
+            <property name="MemberName" />
+            <property name="CanDefault">True</property>
+            <property name="CanFocus">True</property>
+            <property name="UseStock">True</property>
+            <property name="Type">StockItem</property>
+            <property name="StockId">gtk-cancel</property>
+            <property name="ResponseId">-6</property>
+            <property name="label">gtk-cancel</property>
+          </widget>
+          <packing>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Button" id="buttonOk">
+            <property name="MemberName" />
+            <property name="CanDefault">True</property>
+            <property name="CanFocus">True</property>
+            <property name="UseStock">True</property>
+            <property name="Type">StockItem</property>
+            <property name="StockId">gtk-ok</property>
+            <property name="ResponseId">-5</property>
+            <property name="label">gtk-ok</property>
+          </widget>
+          <packing>
+            <property name="Position">1</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </stetic-interface>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/packages.config b/main/src/addins/CSharpBinding/packages.config
new file mode 100644
index 0000000000..40b4864e8f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/packages.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
index af7840f2b4..5bfcd63773 100644
--- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
+++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
@@ -35,6 +35,7 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Gui.Pads.ProjectPad;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.ChangeLogAddIn
 {
@@ -80,7 +81,7 @@ namespace MonoDevelop.ChangeLogAddIn
 		
 		static void InsertEntry(Document document)
 		{
-			IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();					
+			var textBuffer = document.GetContent<TextEditor>();					
 			if (textBuffer == null) return;
 
 			string changeLogFileName = document.FileName;
@@ -98,16 +99,16 @@ namespace MonoDevelop.ChangeLogAddIn
 				textBuffer.InsertText (insertPos, text);
 				
 				insertPos += text.Length;
-				textBuffer.Select (insertPos, insertPos);
-				textBuffer.CursorPosition = insertPos;
-				
+				textBuffer.CaretOffset = insertPos;
+				textBuffer.SetSelection (insertPos, insertPos);
+
 				document.Select ();
 			}
 		}
 		
 		static bool InsertHeader (Document document)
 		{
-			IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();					
+			var textBuffer = document.Editor;					
 			if (textBuffer == null) return false;
 			
 			AuthorInformation userInfo = document.Project != null ? document.Project.AuthorInformation : AuthorInformation.Default;
@@ -126,19 +127,19 @@ namespace MonoDevelop.ChangeLogAddIn
 			// Read the first line and compare it with the header: if they are
 			// the same don't insert a new header.
 			int pos = GetHeaderEndPosition(document);
-			if (pos < 0 || (pos + 2 > textBuffer.Length) || textBuffer.GetText (0, pos + 2) != text)
+			if (pos < 0 || (pos + 2 > textBuffer.Length) || textBuffer.GetTextAt (0, pos + 2) != text)
 				textBuffer.InsertText (0, text);
 			return true;
 		}
         
 		static int GetHeaderEndPosition(Document document)
 		{
-			IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();					
+			var textBuffer = document.Editor;				
 			if (textBuffer == null) return 0;
 			
 			// This is less than optimal, we simply read 1024 chars hoping to
 			// find a newline there: if we don't find it we just return 0.
-			string text = textBuffer.GetText (0, Math.Min (textBuffer.Length, 1023));
+			string text = textBuffer.GetTextAt (0, Math.Min (textBuffer.Length, 1023));
 			string eol = document.Editor != null ? document.Editor.EolMarker : Environment.NewLine;
 			
 			return text.IndexOf (eol + eol, StringComparison.Ordinal);
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj
index d3edc7350f..673c410fe2 100644
--- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj
+++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj
@@ -54,21 +54,11 @@
       <Name>MonoDevelop.VersionControl</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
@@ -112,6 +102,22 @@
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ChangeLogAddIn.cs" />
@@ -140,6 +146,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/main/src/addins/ChangeLogAddIn/packages.config b/main/src/addins/ChangeLogAddIn/packages.config
new file mode 100644
index 0000000000..d3fca62c00
--- /dev/null
+++ b/main/src/addins/ChangeLogAddIn/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs
index 939f8b75df..73d0cad10f 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs
@@ -25,16 +25,16 @@ namespace MonoDevelop.Deployment.Linux
 			}
 		}
 		
-		public override void Load (string fileName)
+		public override void Load (FileOpenInformation fileOpenInformation)
 		{
-			ContentName = fileName;
-			entry.Load (fileName);
+			ContentName = fileOpenInformation.FileName;
+			entry.Load (fileOpenInformation.FileName);
 			widget.DesktopEntry = entry;
 		}
 		
-		public override void Save (string fileName)
+		public override void Save (FileSaveInformation fileSaveInformation)
 		{
-			entry.Save (fileName);
+			entry.Save (fileSaveInformation.FileName);
 			IsDirty = false;
 		}
 		
diff --git a/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs b/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs
index 62ad087fe7..7aef34e322 100644
--- a/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs
+++ b/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs
@@ -186,6 +186,11 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			};
 
 			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidResizeNotification, notif => {
+				// Skip updates with a null Window. Only crashes on Mavericks.
+				// The View gets updated once again when the window resize finishes.
+				if (bar.Window == null)
+					return;
+
 				double maxSize = Math.Round (bar.Window.Frame.Width * 0.30f);
 				double minSize = Math.Round (bar.Window.Frame.Width * 0.25f);
 				item.MinSize = new CGSize ((nfloat)Math.Max (280, minSize), 22);
@@ -204,7 +209,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 		{
 			gtkWindow = window;
 			widget = new NSToolbar (MainToolbarId) {
-				DisplayMode = NSToolbarDisplayMode.IconAndLabel,
+				DisplayMode = NSToolbarDisplayMode.Icon,
 			};
 			widget.WillInsertItem = (tool, id, send) => {
 				switch (id) {
diff --git a/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs b/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs
index 4607d50380..99db372328 100644
--- a/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs
+++ b/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs
@@ -221,7 +221,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 					return;
 
 				// fix the icon alignment, move it slightly up
-				var alignFix = new CGRect (0, Window.Screen.BackingScaleFactor == 2 ? -0.5f : -1f, 16, 16);
+				var alignFix = new CGRect (0, Window.BackingScaleFactor == 2 ? -0.5f : -1f, 16, 16);
 				PathComponentCells [ConfigurationIdx].Image.AlignmentRect = alignFix;
 				PathComponentCells [RuntimeIdx].Image.AlignmentRect = alignFix;
 			}
diff --git a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs
index 78ba52939c..bdd167ea9e 100644
--- a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs
+++ b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs
@@ -160,7 +160,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			updateHandler = delegate {
 				int ec=0, wc=0;
 
-				foreach (TaskListEntry t in TaskService.Errors) {
+				foreach (var t in TaskService.Errors) {
 					if (t.Severity == TaskSeverity.Error)
 						ec++;
 					else if (t.Severity == TaskSeverity.Warning)
@@ -198,6 +198,9 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			TaskService.Errors.TasksRemoved += updateHandler;
 
 			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidChangeBackingPropertiesNotification, delegate {
+				if (Window == null)
+					return;
+
 				ReconstructString ();
 				foreach (var layer in Layer.Sublayers) {
 					if (layer.Name != null && layer.Name.StartsWith (StatusIconPrefixId, StringComparison.Ordinal))
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
index b0beb0d94c..59ea407e2e 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
@@ -46,7 +46,6 @@
   <ItemGroup>
     <Reference Include="Mono.Posix" />
     <Reference Include="System" />
-    <Reference Include="System.Xml" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -64,6 +63,24 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -76,11 +93,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
       <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
       <Name>MonoDevelop.Refactoring</Name>
@@ -96,11 +108,6 @@
       <Name>ICSharpCode.Decompiler</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
@@ -131,6 +138,11 @@
       <Name>Xwt</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
+      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
+      <Name>Mono.TextEditor</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -169,6 +181,8 @@
     <Compile Include="XmlDocIdLib\OperatorType.cs" />
     <Compile Include="XmlDocIdLib\XmlDocIdGenerator.cs" />
     <Compile Include="AddinInfo.cs" />
+    <Compile Include="MonoDevelop.AssemblyBrowser\NRefactoryStock.cs" />
+    <Compile Include="MonoDevelop.AssemblyBrowser\HelpExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
@@ -183,4 +197,7 @@
     <Folder Include="MonoDevelop.AssemblyBrowser\TreeNodes\" />
     <Folder Include="XmlDocIdLib\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
index c6ab4132c6..5cbeeac429 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
@@ -72,10 +72,10 @@ namespace MonoDevelop.AssemblyBrowser
 			IsDisposed = false;
 		}
 		
-		public override void Load (string fileName)
+		public override void Load (FileOpenInformation fileOpenInformation)
 		{
 			ContentName = GettextCatalog.GetString ("Assembly Browser");
-			widget.AddReferenceByFileName (fileName);
+			widget.AddReferenceByFileName (fileOpenInformation.FileName);
 		}
 		
 		public override bool IsFile {
@@ -108,30 +108,17 @@ namespace MonoDevelop.AssemblyBrowser
 
 		#region IUrlHandler implementation 
 		
-		public void Open (INamedElement element)
+		public void Open (Microsoft.CodeAnalysis.ISymbol element)
 		{
-			var member = element as IUnresolvedEntity;
-			if (member == null) {
-				var entity = element as IMember;
-				if (entity != null)
-					member = entity.UnresolvedMember;
+			var url = element.OriginalDefinition.GetDocumentationCommentId ();//AssemblyBrowserWidget.GetIdString (member); 
+			widget.Open (url);
+		}
 
-			}
-			if (member == null) {
-				var entity = element as IType;
-				if (entity != null)
-					member = entity.GetDefinition ().Parts [0];
-			}
-			if (member == null)
-				return;
-			var url = AssemblyBrowserWidget.GetIdString (member);
-			try {
-				widget.Open (url);
-			} catch (Exception e) {
-				MessageService.ShowError (GettextCatalog.GetString ("{0} could not be opened", url), e);
-			}
+		public void Open (string documentationCommentId)
+		{
+			widget.Open (documentationCommentId);
 		}
-		
+
 		#endregion 
 
 		[MonoDevelop.Components.Commands.CommandHandler(MonoDevelop.Refactoring.RefactoryCommands.FindReferences)]
@@ -140,7 +127,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var member = widget.ActiveMember as IMember;
 			if (member == null)
 				return;
-			FindReferencesHandler.FindRefs (member);
+			// FindReferencesHandler.FindRefs (member);
 		}
 		
 		[MonoDevelop.Components.Commands.CommandHandler(MonoDevelop.Refactoring.RefactoryCommands.FindDerivedClasses)]
@@ -149,7 +136,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var type = widget.ActiveMember as ITypeDefinition;
 			if (type == null)
 				return;
-			FindDerivedClassesHandler.FindDerivedClasses (type);
+			//FindDerivedClassesHandler.FindDerivedClasses (type);
 		}
 
 		public void FillWidget ()
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
index 3ff7e29ebc..f560573715 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
@@ -40,19 +40,17 @@ using MonoDevelop.Ide;
 using MonoDevelop.Ide.Commands;
 using MonoDevelop.Ide.Gui.Components;
 using System.Linq;
-using Mono.TextEditor;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.Documentation;
 using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Projects;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using Mono.TextEditor.Theatrics;
-using MonoDevelop.SourceEditor;
 using XmlDocIdLib;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Components;
 using System.Threading.Tasks;
 using System.Threading;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -77,11 +75,6 @@ namespace MonoDevelop.AssemblyBrowser
 			}
 		}
 		
-		Ambience ambience = AmbienceService.GetAmbience ("text/x-csharp");
-		public Ambience Ambience {
-			get { return ambience; }
-		}
-		
 		DocumentationPanel documentationPanel = new DocumentationPanel ();
 		readonly TextEditor inspectEditor;
 
@@ -111,6 +104,28 @@ namespace MonoDevelop.AssemblyBrowser
 			}
 		}
 
+		static string GetLink (ReferenceSegment referencedSegment)
+		{
+			if (referencedSegment == null)
+				return null;
+			if (referencedSegment.Reference is TypeDefinition)
+				return new XmlDocIdGenerator ().GetXmlDocPath ((TypeDefinition)referencedSegment.Reference);
+			if (referencedSegment.Reference is MethodDefinition)
+				return new XmlDocIdGenerator ().GetXmlDocPath ((MethodDefinition)referencedSegment.Reference);
+			if (referencedSegment.Reference is PropertyDefinition)
+				return new XmlDocIdGenerator ().GetXmlDocPath ((PropertyDefinition)referencedSegment.Reference);
+			if (referencedSegment.Reference is FieldDefinition)
+				return new XmlDocIdGenerator ().GetXmlDocPath ((FieldDefinition)referencedSegment.Reference);
+			if (referencedSegment.Reference is EventDefinition)
+				return new XmlDocIdGenerator ().GetXmlDocPath ((EventDefinition)referencedSegment.Reference);
+			if (referencedSegment.Reference is FieldDefinition)
+				return new XmlDocIdGenerator ().GetXmlDocPath ((FieldDefinition)referencedSegment.Reference);
+			if (referencedSegment.Reference is TypeReference) {
+				return new XmlDocIdGenerator ().GetXmlDocPath ((TypeReference)referencedSegment.Reference);
+			}
+			return referencedSegment.Reference.ToString ();
+		}
+
 		public AssemblyBrowserWidget ()
 		{
 			this.Build ();
@@ -198,47 +213,15 @@ namespace MonoDevelop.AssemblyBrowser
 //			this.documentationLabel.ModifyBg (Gtk.StateType.Normal, new Gdk.Color (255, 255, 225));
 //			this.documentationLabel.Wrap = true;
 			
-			var options = new MonoDevelop.Ide.Gui.CommonTextEditorOptions () {
-				ShowFoldMargin = false,
-				ShowIconMargin = false,
-				ShowLineNumberMargin = false,
-				HighlightCaretLine = true,
-			};
-			inspectEditor = new TextEditor (new TextDocument (), options);
-			inspectEditor.ButtonPressEvent += HandleInspectEditorButtonPressEvent;
+
+			inspectEditor = TextEditorFactory.CreateNewEditor ();
+			inspectEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+
+			//inspectEditor.ButtonPressEvent += HandleInspectEditorButtonPressEvent;
 			
-			this.inspectEditor.Document.ReadOnly = true;
+			this.inspectEditor.IsReadOnly = true;
 //			this.inspectEditor.Document.SyntaxMode = new Mono.TextEditor.Highlighting.MarkupSyntaxMode ();
-			this.inspectEditor.TextViewMargin.GetLink = delegate(Mono.TextEditor.MarginMouseEventArgs arg) {
-				var loc = inspectEditor.PointToLocation (arg.X, arg.Y);
-				int offset = inspectEditor.LocationToOffset (loc);
-				var referencedSegment = ReferencedSegments != null ? ReferencedSegments.FirstOrDefault (seg => seg.Segment.Contains (offset)) : null;
-				if (referencedSegment == null)
-					return null;
-				if (referencedSegment.Reference is TypeDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((TypeDefinition)referencedSegment.Reference);
-				
-				if (referencedSegment.Reference is MethodDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((MethodDefinition)referencedSegment.Reference);
-				
-				if (referencedSegment.Reference is PropertyDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((PropertyDefinition)referencedSegment.Reference);
-				
-				if (referencedSegment.Reference is FieldDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((FieldDefinition)referencedSegment.Reference);
-				
-				if (referencedSegment.Reference is EventDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((EventDefinition)referencedSegment.Reference);
-				
-				if (referencedSegment.Reference is FieldDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((FieldDefinition)referencedSegment.Reference);
-
-				if (referencedSegment.Reference is TypeReference) {
-					return new XmlDocIdGenerator ().GetXmlDocPath ((TypeReference)referencedSegment.Reference);
-				}
-				return referencedSegment.Reference.ToString ();
-			};
-			this.inspectEditor.LinkRequest += InspectEditorhandleLinkRequest;
+//			this.inspectEditor.LinkRequest += InspectEditorhandleLinkRequest;
 			documentationScrolledWindow.Add (inspectEditor);
 
 			this.hpaned1.ExposeEvent += HPaneExpose;
@@ -299,13 +282,13 @@ namespace MonoDevelop.AssemblyBrowser
 		[CommandHandler (EditCommands.Copy)]
 		protected void OnCopyCommand ()
 		{
-			inspectEditor.RunAction (Mono.TextEditor.ClipboardActions.Copy);
+			EditActions.ClipboardCopy (inspectEditor);
 		}
 		
 		[CommandHandler (EditCommands.SelectAll)]
 		protected void OnSelectAllCommand ()
 		{
-			inspectEditor.RunAction (Mono.TextEditor.SelectionActions.SelectAll);
+			EditActions.SelectAll (inspectEditor);
 		}
 		
 		void HandleInspectEditorButtonPressEvent (object o, ButtonPressEventArgs args)
@@ -343,22 +326,7 @@ namespace MonoDevelop.AssemblyBrowser
 			FillInspectLabel ();
 		}
 
-		void InspectEditorhandleLinkRequest (object sender, Mono.TextEditor.LinkEventArgs args)
-		{
-			var loader = (AssemblyLoader)this.TreeView.GetSelectedNode ().GetParentDataItem (typeof(AssemblyLoader), true);
 
-			if (args.Button == 2 || (args.Button == 1 && (args.ModifierState & Gdk.ModifierType.ShiftMask) == Gdk.ModifierType.ShiftMask)) {
-				AssemblyBrowserViewContent assemblyBrowserView = new AssemblyBrowserViewContent ();
-				foreach (var cu in definitions) {
-					assemblyBrowserView.Load (cu.UnresolvedAssembly.AssemblyName);
-				}
-				IdeApp.Workbench.OpenDocument (assemblyBrowserView, true);
-				((AssemblyBrowserWidget)assemblyBrowserView.Control).Open (args.Link);
-			} else {
-				this.Open (args.Link, loader);
-			}
-		}
-		
 		public IEntity ActiveMember  {
 			get;
 			set;
@@ -456,7 +424,7 @@ namespace MonoDevelop.AssemblyBrowser
 			StringBuilder sb;
 			
 			switch (member.SymbolKind) {
-			case SymbolKind.TypeDefinition:
+			case ICSharpCode.NRefactory.TypeSystem.SymbolKind.TypeDefinition:
 				var type = member as IUnresolvedTypeDefinition;
 				if (type.TypeParameters.Count == 0)
 					return "T:" + type.FullName;
@@ -1066,34 +1034,50 @@ namespace MonoDevelop.AssemblyBrowser
 			
 			return result.ToString ();
 		}
-		
+	 
 		List<ReferenceSegment> ReferencedSegments = new List<ReferenceSegment>();
-		List<UnderlineMarker> underlineMarkers = new List<UnderlineMarker> ();
+		List<ITextSegmentMarker> underlineMarkers = new List<ITextSegmentMarker> ();
 		
 		public void ClearReferenceSegment ()
 		{
 			ReferencedSegments = null;
-			underlineMarkers.ForEach (m => inspectEditor.Document.RemoveMarker (m));
+			underlineMarkers.ForEach (m => inspectEditor.RemoveMarker (m));
 			underlineMarkers.Clear ();
 		}
 		
-		public void SetReferencedSegments (List<ReferenceSegment> refs)
+		internal void SetReferencedSegments (List<ReferenceSegment> refs)
 		{
 			ReferencedSegments = refs;
 			if (ReferencedSegments == null)
 				return;
-			foreach (var seg in refs) {
-				DocumentLine line = inspectEditor.GetLineByOffset (seg.Offset);
+			foreach (var _seg in refs) {
+				var seg = _seg;
+				var line = inspectEditor.GetLineByOffset (seg.Offset);
 				if (line == null)
 					continue;
 				// FIXME: ILSpy sometimes gives reference segments for punctuation. See http://bugzilla.xamarin.com/show_bug.cgi?id=2918
-				string text = inspectEditor.GetTextAt (seg);
+				string text = inspectEditor.GetTextAt (seg.Offset, seg.Length);
 				if (text != null && text.Length == 1 && !(char.IsLetter (text [0]) || text [0] == '…'))
 					continue;
-				var marker = new UnderlineMarker (new Cairo.Color (0, 0, 1.0), 1 + seg.Offset - line.Offset, 1 + seg.EndOffset - line.Offset);
-				marker.Wave = false;
+				var marker = TextMarkerFactory.CreateLinkMarker (inspectEditor, seg.Offset, seg.Length, delegate (LinkRequest request) {
+					var link = GetLink (seg);
+					if (link == null)
+						return;
+					var loader = (AssemblyLoader)this.TreeView.GetSelectedNode ().GetParentDataItem (typeof(AssemblyLoader), true);
+					// args.Button == 2 || (args.Button == 1 && (args.ModifierState & Gdk.ModifierType.ShiftMask) == Gdk.ModifierType.ShiftMask)
+					if (request == LinkRequest.RequestNewView) {
+						AssemblyBrowserViewContent assemblyBrowserView = new AssemblyBrowserViewContent ();
+						foreach (var cu in definitions) {
+							assemblyBrowserView.Load (cu.UnresolvedAssembly.AssemblyName);
+						}
+						IdeApp.Workbench.OpenDocument (assemblyBrowserView, true);
+						((AssemblyBrowserWidget)assemblyBrowserView.Control).Open (link);
+					} else {
+						this.Open (link, loader);
+					}
+				});
 				underlineMarkers.Add (marker);
-				inspectEditor.Document.AddMarker (line, marker);
+				inspectEditor.AddMarker (marker);
 			}
 		}
 
@@ -1104,34 +1088,33 @@ namespace MonoDevelop.AssemblyBrowser
 				return;
 			IAssemblyBrowserNodeBuilder builder = nav.TypeNodeBuilder as IAssemblyBrowserNodeBuilder;
 			if (builder == null) {
-				this.inspectEditor.Document.Text = "";
+				this.inspectEditor.Text = "";
 				return;
 			}
 			
 			ClearReferenceSegment ();
-			inspectEditor.Document.ClearFoldSegments ();
+			inspectEditor.SetFoldings (Enumerable.Empty<IFoldSegment> ());
 			switch (this.languageCombobox.Active) {
 			case 0:
-				inspectEditor.Options.ShowFoldMargin = true;
-				this.inspectEditor.Document.MimeType = "text/x-csharp";
-				SetReferencedSegments (builder.GetSummary (inspectEditor.GetTextEditorData (), nav, PublicApiOnly));
+				inspectEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+				this.inspectEditor.MimeType = "text/x-csharp";
+				SetReferencedSegments (builder.GetSummary (inspectEditor, nav, PublicApiOnly));
 				break;
 			case 1:
-				inspectEditor.Options.ShowFoldMargin = true;
-				this.inspectEditor.Document.MimeType = "text/x-ilasm";
-				SetReferencedSegments (builder.Disassemble (inspectEditor.GetTextEditorData (), nav));
+				inspectEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+				this.inspectEditor.MimeType = "text/x-ilasm";
+				SetReferencedSegments (builder.Disassemble (inspectEditor, nav));
 				break;
 			case 2:
-				inspectEditor.Options.ShowFoldMargin = true;
-				this.inspectEditor.Document.MimeType = "text/x-csharp";
-				SetReferencedSegments (builder.Decompile (inspectEditor.GetTextEditorData (), nav, PublicApiOnly));
+				inspectEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+				this.inspectEditor.MimeType = "text/x-csharp";
+				SetReferencedSegments (builder.Decompile (inspectEditor, nav, PublicApiOnly));
 				break;
 			default:
-				inspectEditor.Options.ShowFoldMargin = false;
-				this.inspectEditor.Document.Text = "Invalid combobox value: " + this.languageCombobox.Active;
+				inspectEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+				this.inspectEditor.Text = "Invalid combobox value: " + this.languageCombobox.Active;
 				break;
 			}
-			this.inspectEditor.QueueDraw ();
 		}
 			
 		void CreateOutput ()
@@ -1187,7 +1170,7 @@ namespace MonoDevelop.AssemblyBrowser
 			this.hpaned1.Position = Math.Min (350, this.Allocation.Width * 2 / 3);
 		}
 		
-		public void Open (string url, AssemblyLoader currentAssembly = null)
+		internal void Open (string url, AssemblyLoader currentAssembly = null)
 		{
 			ITreeNavigator nav = SearchMember (url);
 			if (definitions == null) // we've been disposed
@@ -1364,11 +1347,11 @@ namespace MonoDevelop.AssemblyBrowser
 				documentationPanel.Destroy ();
 				documentationPanel = null;
 			}
-			if (inspectEditor != null) {
-				inspectEditor.TextViewMargin.GetLink = null;
-				inspectEditor.LinkRequest -= InspectEditorhandleLinkRequest;
-				inspectEditor.Destroy ();
-			}
+//			if (inspectEditor != null) {
+//				inspectEditor.TextViewMargin.GetLink = null;
+//				inspectEditor.LinkRequest -= InspectEditorhandleLinkRequest;
+//				inspectEditor.Destroy ();
+//			}
 			
 			if (this.UIManager != null) {
 				this.UIManager.Dispose ();
@@ -1412,12 +1395,12 @@ namespace MonoDevelop.AssemblyBrowser
 		List<AssemblyLoader> definitions = new List<AssemblyLoader> ();
 		List<Project> projects = new List<Project> ();
 		
-		public AssemblyLoader AddReferenceByAssemblyName (AssemblyNameReference reference)
+		internal AssemblyLoader AddReferenceByAssemblyName (AssemblyNameReference reference)
 		{
 			return AddReferenceByAssemblyName (reference.Name);
 		}
 		
-		public AssemblyLoader AddReferenceByAssemblyName (string assemblyFullName)
+		internal AssemblyLoader AddReferenceByAssemblyName (string assemblyFullName)
 		{
 			string assemblyFile = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyLocation (assemblyFullName, null);
 			if (assemblyFile == null || !System.IO.File.Exists (assemblyFile)) {
@@ -1433,7 +1416,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return AddReferenceByFileName (assemblyFile);
 		}
 		
-		public AssemblyLoader AddReferenceByFileName (string fileName)
+		internal AssemblyLoader AddReferenceByFileName (string fileName)
 		{
 			var result = definitions.FirstOrDefault (d => d.FileName == fileName);
 			if (result != null) {
@@ -1499,77 +1482,7 @@ namespace MonoDevelop.AssemblyBrowser
 			builder.Selected = builder.Expanded = selectReference;
 		}
 
-		[CommandHandler (SearchCommands.FindNext)]
-		public void FindNext ()
-		{
-			SearchAndReplaceWidget.FindNext (this.inspectEditor);
-		}
-
-		[CommandHandler (SearchCommands.FindPrevious)]
-		public void FindPrevious ()
-		{
-			SearchAndReplaceWidget.FindPrevious (this.inspectEditor);
-		}
-		
-		[CommandHandler (SearchCommands.Find)]
-		public void ShowSearchWidget ()
-		{
-			if (searchAndReplaceWidget == null) {
-				popupWidgetFrame = new MonoDevelop.Components.RoundedFrame ();
-				//searchAndReplaceWidgetFrame.SetFillColor (MonoDevelop.Components.CairoExtensions.GdkColorToCairoColor (widget.TextEditor.ColorStyle.Default.BackgroundColor));
-				popupWidgetFrame.SetFillColor (MonoDevelop.Components.CairoExtensions.GdkColorToCairoColor (Style.Background (StateType.Normal)));
-				popupWidgetFrame.Show ();
-				
-				popupWidgetFrame.Child = searchAndReplaceWidget = new SearchAndReplaceWidget (inspectEditor, popupWidgetFrame);
-				searchAndReplaceWidget.Destroyed += (sender, e) => {
-					DestroyFrames ();
-					if (inspectEditor.IsRealized)
-						inspectEditor.GrabFocus ();
-				};
-				searchAndReplaceWidget.UpdateSearchPattern ();
-				inspectEditor.AddAnimatedWidget (popupWidgetFrame, 300, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Blocking.Downstage, inspectEditor.Allocation.Width - 400, -searchAndReplaceWidget.Allocation.Height);
-				searchAndReplaceWidget.IsReplaceMode = false;
-			}
-			
-			searchAndReplaceWidget.Focus ();
-		}
-
 		MonoDevelop.Components.RoundedFrame popupWidgetFrame;
-
-		GotoLineNumberWidget gotoLineNumberWidget;
-		SearchAndReplaceWidget searchAndReplaceWidget;
-		void DestroyFrames ()
-		{
-			if (popupWidgetFrame != null) {
-				popupWidgetFrame.Destroy ();
-				popupWidgetFrame = null;
-				gotoLineNumberWidget = null;
-				searchAndReplaceWidget = null;
-			}
-		}
-
-		[CommandHandler (SearchCommands.GotoLineNumber)]
-		public void ShowGotoLineNumberWidget ()
-		{
-			if (gotoLineNumberWidget == null) {
-				DestroyFrames ();
-				popupWidgetFrame = new MonoDevelop.Components.RoundedFrame ();
-				//searchAndReplaceWidgetFrame.SetFillColor (MonoDevelop.Components.CairoExtensions.GdkColorToCairoColor (widget.TextEditor.ColorStyle.Default.BackgroundColor));
-				popupWidgetFrame.SetFillColor (MonoDevelop.Components.CairoExtensions.GdkColorToCairoColor (Style.Background (StateType.Normal)));
-				popupWidgetFrame.Show ();
-				
-				popupWidgetFrame.Child = gotoLineNumberWidget = new GotoLineNumberWidget (inspectEditor, popupWidgetFrame);
-				gotoLineNumberWidget.Destroyed += (sender, e) => {
-					DestroyFrames ();
-					if (inspectEditor.IsRealized)
-						inspectEditor.GrabFocus ();
-				};
-				inspectEditor.AddAnimatedWidget (popupWidgetFrame, 300, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Blocking.Downstage, inspectEditor.Allocation.Width - 400, -gotoLineNumberWidget.Allocation.Height);
-			}
-			
-			gotoLineNumberWidget.Focus ();
-		}
-
 	
 		#region NavigationHistory
 		Stack<ITreeNavigator> navigationBackwardHistory = new Stack<ITreeNavigator> ();
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyReferenceFolder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyReferenceFolder.cs
index 36912b98df..d0266fe485 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyReferenceFolder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyReferenceFolder.cs
@@ -34,7 +34,6 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Pads;
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using ICSharpCode.NRefactory.TypeSystem;
 
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs
index 05d9a3fbfc..e63acbb988 100755
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs
@@ -28,9 +28,10 @@ using ICSharpCode.NRefactory;
 using System;
 using System.Text;
 using ICSharpCode.Decompiler;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using System.Linq;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -80,13 +81,13 @@ namespace MonoDevelop.AssemblyBrowser
 	class ColoredCSharpFormatter : ICSharpCode.Decompiler.ITextOutput
 	{
 		public StringBuilder sb = new StringBuilder();
-		TextDocument doc;
+		TextEditor doc;
 		bool write_indent;
 		int indent;
-		public List<FoldSegment>      FoldSegments       = new List<FoldSegment>();
+		public List<IFoldSegment>     FoldSegments       = new List<IFoldSegment>();
 		public List<ReferenceSegment> ReferencedSegments = new List<ReferenceSegment>();
 		
-		public ColoredCSharpFormatter (TextDocument doc)
+		public ColoredCSharpFormatter (TextEditor doc)
 		{
 			this.doc = doc;
 		}
@@ -94,7 +95,7 @@ namespace MonoDevelop.AssemblyBrowser
 		public void SetDocumentData ()
 		{
 			doc.Text = sb.ToString ();
-			doc.UpdateFoldSegments (FoldSegments, false);
+			doc.SetFoldings (FoldSegments);
 		}
 		
 		#region ITextOutput implementation
@@ -105,9 +106,9 @@ namespace MonoDevelop.AssemblyBrowser
 			}
 		}
 		
-		public TextLocation Location {
+		public ICSharpCode.NRefactory.TextLocation Location {
 			get {
-				return new TextLocation (currentLine, 1);
+				return new ICSharpCode.NRefactory.TextLocation (currentLine, 1);
 			}
 		}
 		
@@ -193,9 +194,8 @@ namespace MonoDevelop.AssemblyBrowser
 		public void MarkFoldEnd ()
 		{
 			var curFold = foldSegmentStarts.Pop ();
-			FoldSegments.Add (new FoldSegment (doc, curFold.Item2 ,curFold.Item1, sb.Length - curFold.Item1, FoldingType.None) {
-				IsFolded = curFold.Item3
-			});
+			var seg = FoldSegmentFactory.CreateFoldSegment (doc, curFold.Item1, sb.Length - curFold.Item1, curFold.Item3, curFold.Item2);
+			FoldSegments.Add (seg);
 		}
 		#endregion
 		
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/HelpExtensions.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/HelpExtensions.cs
new file mode 100644
index 0000000000..ee67c390d8
--- /dev/null
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/HelpExtensions.cs
@@ -0,0 +1,168 @@
+//
+// HelpExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using Monodoc;
+using System.Threading;
+using MonoDevelop.Core;
+using Mono.Addins;
+using System.IO;
+using System.Collections.Generic;
+using MonoDevelop.Projects.Extensions;
+using System.Text;
+using System.Xml;
+using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Projects;
+using ICSharpCode.NRefactory.Documentation;
+
+namespace MonoDevelop.AssemblyBrowser
+{
+	static class HelpExtension
+	{
+		static void AppendTypeReference (StringBuilder result, ITypeReference type)
+		{
+			if (type is ArrayTypeReference) {
+				var array = (ArrayTypeReference)type;
+				AppendTypeReference (result, array.ElementType);
+				result.Append ("[");
+				result.Append (new string (',', array.Dimensions));
+				result.Append ("]");
+				return;
+			}
+					
+			if (type is PointerTypeReference) {
+				var ptr = (PointerTypeReference)type;
+				AppendTypeReference (result, ptr.ElementType);
+				result.Append ("*");
+				return;
+			}
+					
+			if (type is IType)
+				result.Append (((IType)type).FullName);
+		}
+
+				
+		static void AppendHelpParameterList (StringBuilder result, IList<IParameter> parameters)
+		{
+			result.Append ('(');
+			if (parameters != null) {
+				for (int i = 0; i < parameters.Count; i++) {
+					if (i > 0)
+						result.Append (',');
+					var p = parameters [i];
+					if (p == null)
+						continue;
+					if (p.IsRef || p.IsOut)
+						result.Append ("&");
+					AppendTypeReference (result, p.Type.ToTypeReference ());
+				}
+			}
+			result.Append (')');
+		}
+
+		static void AppendHelpParameterList (StringBuilder result, IList<IUnresolvedParameter> parameters)
+		{
+			result.Append ('(');
+			if (parameters != null) {
+				for (int i = 0; i < parameters.Count; i++) {
+					if (i > 0)
+						result.Append (',');
+					var p = parameters [i];
+					if (p == null)
+						continue;
+					if (p.IsRef || p.IsOut)
+						result.Append ("&");
+					AppendTypeReference (result, p.Type);
+				}
+			}
+			result.Append (')');
+		}
+
+		static XmlNode FindMatch (IMethod method, XmlNodeList nodes)
+		{
+			foreach (XmlNode node in nodes) {
+				XmlNodeList paramList = node.SelectNodes ("Parameters/*");
+				if (method.Parameters.Count == 0 && paramList.Count == 0)
+					return node;
+				if (method.Parameters.Count != paramList.Count)
+					continue;
+						
+				/*				bool matched = true;
+						for (int i = 0; i < p.Count; i++) {
+							if (p [i].ReturnType.FullName != paramList [i].Attributes ["Type"].Value) {
+								matched = false;
+								break;
+							}
+						}
+						if (matched)*/
+				return node;
+			}
+			return null;
+		}
+
+		public static XmlNode GetMonodocDocumentation (this IEntity member)
+		{
+			if (member.SymbolKind == SymbolKind.TypeDefinition) {
+				var helpXml = HelpService.HelpTree != null ? HelpService.HelpTree.GetHelpXml (IdStringProvider.GetIdString (member)) : null;
+				if (helpXml == null)
+					return null;
+				return helpXml.SelectSingleNode ("/Type/Docs");
+			}
+					
+			var declaringXml = HelpService.HelpTree != null && member.DeclaringTypeDefinition != null ? HelpService.HelpTree.GetHelpXml (member.DeclaringTypeDefinition.GetIdString ()) : null;
+			if (declaringXml == null)
+				return null;
+					
+			switch (member.SymbolKind) {
+			case SymbolKind.Method:
+				{
+					var nodes = declaringXml.SelectNodes ("/Type/Members/Member[@MemberName='" + member.Name + "']");
+					XmlNode node = nodes.Count == 1 ? nodes [0] : FindMatch ((IMethod)member, nodes);
+					if (node != null) {
+						System.Xml.XmlNode result = node.SelectSingleNode ("Docs");
+						return result;
+					}
+					return null;
+				}
+			case SymbolKind.Constructor:
+				{
+					var nodes = declaringXml.SelectNodes ("/Type/Members/Member[@MemberName='.ctor']");
+					XmlNode node = nodes.Count == 1 ? nodes [0] : FindMatch ((IMethod)member, nodes);
+					if (node != null) {
+						System.Xml.XmlNode result = node.SelectSingleNode ("Docs");
+						return result;
+					}
+					return null;
+				}
+			default:
+				return declaringXml.SelectSingleNode ("/Type/Members/Member[@MemberName='" + member.Name + "']/Docs");
+			}
+		}
+
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs
index 7a13a020b6..2355c9897c 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs
@@ -29,16 +29,16 @@
 using System;
 using MonoDevelop.Ide.Gui.Pads;
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor;
 using System.Collections.Generic;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
 	interface IAssemblyBrowserNodeBuilder
 	{
 		string GetDocumentationMarkup (ITreeNavigator navigator);
-		List<ReferenceSegment> Disassemble (TextEditorData data, ITreeNavigator navigator);
-		List<ReferenceSegment> Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly);
-		List<ReferenceSegment> GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly);
+		List<ReferenceSegment> Disassemble (TextEditor data, ITreeNavigator navigator);
+		List<ReferenceSegment> Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly);
+		List<ReferenceSegment> GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly);
 	}
 }
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/NRefactoryStock.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/NRefactoryStock.cs
new file mode 100644
index 0000000000..9d4624c339
--- /dev/null
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/NRefactoryStock.cs
@@ -0,0 +1,302 @@
+//
+// NRefactoryStock.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace MonoDevelop.AssemblyBrowser
+{
+	static class NRefactoryStock
+	{
+		static readonly IconId Class = "md-class";
+		static readonly IconId Enum = "md-enum";
+		static readonly IconId Event = "md-event";
+		static readonly IconId Field = "md-field";
+		static readonly IconId Interface = "md-interface";
+		static readonly IconId Method = "md-method";
+		static readonly IconId ExtensionMethod = "md-extensionmethod";
+		static readonly IconId Property = "md-property";
+		static readonly IconId Struct = "md-struct";
+		static readonly IconId Delegate = "md-delegate";
+		public static readonly IconId Namespace = "md-name-space";
+
+		static readonly IconId InternalClass = "md-internal-class";
+		static readonly IconId InternalDelegate = "md-internal-delegate";
+		static readonly IconId InternalEnum = "md-internal-enum";
+		static readonly IconId InternalEvent = "md-internal-event";
+		static readonly IconId InternalField = "md-internal-field";
+		static readonly IconId InternalInterface = "md-internal-interface";
+		static readonly IconId InternalMethod = "md-internal-method";
+		static readonly IconId InternalExtensionMethod = "md-internal-extensionmethod";
+		static readonly IconId InternalProperty = "md-internal-property";
+		static readonly IconId InternalStruct = "md-internal-struct";
+
+		static readonly IconId InternalAndProtectedClass = "md-InternalAndProtected-class";
+		static readonly IconId InternalAndProtectedDelegate = "md-InternalAndProtected-delegate";
+		static readonly IconId InternalAndProtectedEnum = "md-InternalAndProtected-enum";
+		static readonly IconId InternalAndProtectedEvent = "md-InternalAndProtected-event";
+		static readonly IconId InternalAndProtectedField = "md-InternalAndProtected-field";
+		static readonly IconId InternalAndProtectedInterface = "md-InternalAndProtected-interface";
+		static readonly IconId InternalAndProtectedMethod = "md-InternalAndProtected-method";
+		static readonly IconId InternalAndProtectedExtensionMethod = "md-InternalAndProtected-extensionmethod";
+		static readonly IconId InternalAndProtectedProperty = "md-InternalAndProtected-property";
+		static readonly IconId InternalAndProtectedStruct = "md-InternalAndProtected-struct";
+
+		static readonly IconId PrivateClass = "md-private-class";
+		static readonly IconId PrivateDelegate = "md-private-delegate";
+		static readonly IconId PrivateEnum = "md-private-enum";
+		static readonly IconId PrivateEvent = "md-private-event";
+		static readonly IconId PrivateField = "md-private-field";
+		static readonly IconId PrivateInterface = "md-private-interface";
+		static readonly IconId PrivateMethod = "md-private-method";
+		static readonly IconId PrivateExtensionMethod = "md-private-extensionmethod";
+		static readonly IconId PrivateProperty = "md-private-property";
+		static readonly IconId PrivateStruct = "md-private-struct";
+
+		static readonly IconId ProtectedClass = "md-protected-class";
+		static readonly IconId ProtectedDelegate = "md-protected-delegate";
+		static readonly IconId ProtectedEnum = "md-protected-enum";
+		static readonly IconId ProtectedEvent = "md-protected-event";
+		static readonly IconId ProtectedField = "md-protected-field";
+		static readonly IconId ProtectedInterface = "md-protected-interface";
+		static readonly IconId ProtectedMethod = "md-protected-method";
+		static readonly IconId ProtectedExtensionMethod = "md-protected-extensionmethod";
+		static readonly IconId ProtectedProperty = "md-protected-property";
+		static readonly IconId ProtectedStruct = "md-protected-struct";
+
+		static readonly IconId ProtectedOrInternalClass = "md-ProtectedOrInternal-class";
+		static readonly IconId ProtectedOrInternalDelegate = "md-ProtectedOrInternal-delegate";
+		static readonly IconId ProtectedOrInternalEnum = "md-ProtectedOrInternal-enum";
+		static readonly IconId ProtectedOrInternalEvent = "md-ProtectedOrInternal-event";
+		static readonly IconId ProtectedOrInternalField = "md-ProtectedOrInternal-field";
+		static readonly IconId ProtectedOrInternalInterface = "md-ProtectedOrInternal-interface";
+		static readonly IconId ProtectedOrInternalMethod = "md-ProtectedOrInternal-method";
+		static readonly IconId ProtectedOrInternalExtensionMethod = "md-ProtectedOrInternal-extensionmethod";
+		static readonly IconId ProtectedOrInternalProperty = "md-ProtectedOrInternal-property";
+		static readonly IconId ProtectedOrInternalStruct = "md-ProtectedOrInternal-struct";
+
+		static IconId[,] typeIconTable = new IconId[,] {
+			{Class,     PrivateClass,		Class,		ProtectedClass,     InternalClass,		ProtectedOrInternalClass, 		InternalAndProtectedClass},     // class
+			{Enum,      PrivateEnum,		Enum,		ProtectedEnum,      InternalEnum,		ProtectedOrInternalEnum, 		InternalAndProtectedEnum},      // enum
+			{Interface, PrivateInterface,	Interface,	ProtectedInterface, InternalInterface,	ProtectedOrInternalInterface,	InternalAndProtectedInterface}, // interface
+			{Struct,    PrivateStruct,		Struct,   	ProtectedStruct,    InternalStruct,		ProtectedOrInternalStruct,		InternalAndProtectedStruct},    // struct
+			{Delegate,  PrivateDelegate,	Delegate, 	ProtectedDelegate,  InternalDelegate,	ProtectedOrInternalDelegate,	InternalAndProtectedDelegate}   // delegate
+		};
+		static readonly IconId[] fieldIconTable = {
+			NRefactoryStock.Field, NRefactoryStock.PrivateField, NRefactoryStock.Field, NRefactoryStock.ProtectedField, NRefactoryStock.InternalField, NRefactoryStock.ProtectedOrInternalField, NRefactoryStock.InternalAndProtectedField
+		};
+		static readonly IconId[] methodIconTable = {
+			NRefactoryStock.Method, NRefactoryStock.PrivateMethod, NRefactoryStock.Method, NRefactoryStock.ProtectedMethod, NRefactoryStock.InternalMethod, NRefactoryStock.ProtectedOrInternalMethod, NRefactoryStock.InternalAndProtectedMethod
+		};
+		static readonly IconId[] extensionMethodIconTable = {
+			NRefactoryStock.ExtensionMethod, NRefactoryStock.PrivateExtensionMethod, NRefactoryStock.ExtensionMethod, NRefactoryStock.ProtectedExtensionMethod, NRefactoryStock.InternalExtensionMethod, NRefactoryStock.ProtectedOrInternalExtensionMethod, NRefactoryStock.InternalAndProtectedExtensionMethod
+		};
+		static readonly IconId[] propertyIconTable = {
+			NRefactoryStock.Property, NRefactoryStock.PrivateProperty, NRefactoryStock.Property, NRefactoryStock.ProtectedProperty, NRefactoryStock.InternalProperty, NRefactoryStock.ProtectedOrInternalProperty, NRefactoryStock.InternalAndProtectedProperty
+		};
+		static readonly IconId[] eventIconTable = {
+			NRefactoryStock.Event, NRefactoryStock.PrivateEvent, NRefactoryStock.Event, NRefactoryStock.ProtectedEvent, NRefactoryStock.InternalEvent, NRefactoryStock.ProtectedOrInternalEvent, NRefactoryStock.InternalAndProtectedEvent
+		};
+
+		public static IconId GetStockIcon (this INamedElement element)
+		{
+			if (element is IType)
+				return ((IType)element).GetStockIcon ();
+			if (element is ITypeParameter)
+				return ((ITypeParameter)element).GetStockIcon ();
+			if (element is IUnresolvedEntity)
+				return ((IUnresolvedEntity)element).GetStockIcon ();
+			return ((IEntity)element).GetStockIcon ();
+		}
+
+		public static IconId GetStockIcon (this ITypeDefinition entity)
+		{
+			return GetStockIcon ((IType)entity);
+		}
+
+		public static IconId GetStockIcon (this IType entity)
+		{
+			var def = entity.GetDefinition ();
+			if (def == null)
+				return Class;
+			switch (def.Kind) {
+			case TypeKind.Class:
+				return typeIconTable [0, (int)def.Accessibility];
+			case TypeKind.Enum:
+				return typeIconTable [1, (int)def.Accessibility];
+			case TypeKind.Interface:
+				return typeIconTable [2, (int)def.Accessibility];
+			case TypeKind.Struct:
+				return typeIconTable [3, (int)def.Accessibility];
+			case TypeKind.Delegate:
+				return typeIconTable [4, (int)def.Accessibility];
+			default:
+				return typeIconTable [0, (int)def.Accessibility];
+			}
+		}
+		public static IconId GetStockIcon (this IUnresolvedTypeDefinition def)
+		{
+			switch (def.Kind) {
+			case TypeKind.Class:
+				return typeIconTable [0, (int)def.Accessibility];
+			case TypeKind.Enum:
+				return typeIconTable [1, (int)def.Accessibility];
+			case TypeKind.Interface:
+				return typeIconTable [2, (int)def.Accessibility];
+			case TypeKind.Struct:
+				return typeIconTable [3, (int)def.Accessibility];
+			case TypeKind.Delegate:
+				return typeIconTable [4, (int)def.Accessibility];
+			default:
+				return typeIconTable [0, (int)def.Accessibility];
+			}
+		}
+
+		static int GetTypeIndex (Microsoft.CodeAnalysis.TypeKind typeKind)
+		{
+			switch (typeKind) {
+			case Microsoft.CodeAnalysis.TypeKind.Unknown:
+			case Microsoft.CodeAnalysis.TypeKind.Array:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Class:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Delegate:
+				return 4;
+			case Microsoft.CodeAnalysis.TypeKind.Dynamic:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Enum:
+				return 1;
+			case Microsoft.CodeAnalysis.TypeKind.Error:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Interface:
+				return 2;
+			case Microsoft.CodeAnalysis.TypeKind.Module:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Pointer:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Struct:
+				return 3;
+			case Microsoft.CodeAnalysis.TypeKind.TypeParameter:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Submission:
+				return 0;
+			default:
+				throw new ArgumentOutOfRangeException ();
+			}
+		}
+
+		public static IconId GetStockIcon (this IField field)
+		{
+			return GetStockIcon ((IEntity)field);
+		}
+
+		public static IconId GetStockIcon (this IVariable variable)
+		{
+			return Field;
+		}
+
+		public static IconId GetStockIcon (this IParameter parameter)
+		{
+			return Field;
+		}
+
+		public static IconId GetStockIcon (this IUnresolvedTypeParameter parameter)
+		{
+			return Field;
+		}
+
+		public static IconId GetStockIcon (this IEntity entity, bool showAccessibility = true)
+		{
+			switch (entity.SymbolKind) {
+			case SymbolKind.TypeDefinition:
+				return GetStockIcon ((IType)entity);
+			case SymbolKind.Field:
+				if (showAccessibility)
+					return fieldIconTable [(int)entity.Accessibility];
+				else
+					return fieldIconTable [0];
+			case SymbolKind.Method:
+			case SymbolKind.Constructor:
+			case SymbolKind.Destructor:
+			case SymbolKind.Operator:
+				if (showAccessibility) {
+					if (((IMethod)entity).IsExtensionMethod)
+						return extensionMethodIconTable [(int)entity.Accessibility];
+					return methodIconTable [(int)entity.Accessibility];
+				} else {
+					if (((IMethod)entity).IsExtensionMethod)
+						return extensionMethodIconTable [0];
+					return methodIconTable [0];
+				}
+			case SymbolKind.Property:
+			case SymbolKind.Indexer:
+				if (showAccessibility)
+					return propertyIconTable [(int)entity.Accessibility];
+				else
+					return propertyIconTable [0];
+			case SymbolKind.Event:
+				if (showAccessibility)
+					return eventIconTable [(int)entity.Accessibility];
+				else
+					return eventIconTable [0];
+			}
+			return "";
+		}
+		public static IconId GetStockIcon (this IUnresolvedEntity entity, bool showAccessibility = true)
+		{
+			switch (entity.SymbolKind) {
+			case SymbolKind.TypeDefinition:
+				return GetStockIcon ((IUnresolvedTypeDefinition)entity);
+			case SymbolKind.Field:
+				if (showAccessibility)
+					return fieldIconTable [(int)entity.Accessibility];
+				else
+					return fieldIconTable [0];
+			case SymbolKind.Method:
+			case SymbolKind.Constructor:
+			case SymbolKind.Destructor:
+			case SymbolKind.Operator:
+				if (showAccessibility)
+					return methodIconTable [(int)entity.Accessibility];
+				else
+					return methodIconTable [0];
+			case SymbolKind.Property:
+			case SymbolKind.Indexer:
+				if (showAccessibility)
+					return propertyIconTable [(int)entity.Accessibility];
+				else
+					return propertyIconTable [0];
+			case SymbolKind.Event:
+				if (showAccessibility)
+					return eventIconTable [(int)entity.Accessibility];
+				else
+					return eventIconTable [0];
+			}
+			return "";
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyBrowserTypeNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyBrowserTypeNodeBuilder.cs
index 99f4050b9c..683c8b04a1 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyBrowserTypeNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyBrowserTypeNodeBuilder.cs
@@ -32,6 +32,7 @@ using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory.CSharp;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -41,10 +42,11 @@ namespace MonoDevelop.AssemblyBrowser
 			get; 
 			private set; 
 		}
-		
-		protected MonoDevelop.Ide.TypeSystem.Ambience Ambience {
+		readonly static CSharpAmbience ambience = new CSharpAmbience ();
+
+		protected CSharpAmbience Ambience {
 			get {
-				return Widget.Ambience; 
+				return ambience; 
 			}
 		}
 		
@@ -104,9 +106,11 @@ namespace MonoDevelop.AssemblyBrowser
 				var simpleCompilation = new SimpleCompilation (mainAssembly);
 				return new SimpleTypeResolveContext (simpleCompilation.MainAssembly);
 			}
-			var project = (Project)treeBuilder.GetParentDataItem (typeof(Project), true);
-			var compilation = TypeSystemService.GetCompilation (project);
-			return new SimpleTypeResolveContext (compilation.MainAssembly);
+			// TODO: roslyn port ?
+			// var project = (Project)treeBuilder.GetParentDataItem (typeof(Project), true);
+			// var compilation = TypeSystemService.GetCompilation (project);
+			// return new SimpleTypeResolveContext (compilation.MainAssembly);
+			return null;
 		}
 		
 		protected IMember Resolve (ITreeNavigator treeBuilder, IUnresolvedMember member, ITypeDefinition currentType = null)
@@ -122,9 +126,11 @@ namespace MonoDevelop.AssemblyBrowser
 				var simpleCompilation = new SimpleCompilation (mainAssembly);
 				return type.Resolve (new SimpleTypeResolveContext (simpleCompilation.MainAssembly));
 			}
-			var project = (Project)treeBuilder.GetParentDataItem (typeof(Project), true);
-			var ctx = TypeSystemService.GetCompilation (project);
-			return ctx.MainAssembly.GetTypeDefinition (type.Namespace, type.Name, type.TypeParameters.Count);
+			// TODO: roslyn port ?
+			// var project = (Project)treeBuilder.GetParentDataItem (typeof(Project), true);
+			// var ctx = TypeSystemService.GetCompilation (project);
+			// return ctx.MainAssembly.GetTypeDefinition (type.Namespace, type.Name, type.TypeParameters.Count);
+			return null;
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs
index a9dd6a68ba..21fdf47598 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs
@@ -36,10 +36,10 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Pads;
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using ICSharpCode.NRefactory.TypeSystem;
 using System.IO;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -130,10 +130,10 @@ namespace MonoDevelop.AssemblyBrowser
 		void PrintAssemblyHeader (StringBuilder result, AssemblyDefinition assemblyDefinition)
 		{
 			result.Append ("<span style=\"comment\">");
-			result.Append (Ambience.SingleLineComment (
+			result.Append ("// " +
                                String.Format (GettextCatalog.GetString ("Assembly <b>{0}</b>, Version {1}"),
 			                                  assemblyDefinition.Name.Name,
-			                                  assemblyDefinition.Name.Version)));
+			                                  assemblyDefinition.Name.Version));
 			result.Append ("</span>");
 			result.AppendLine ();
 		}
@@ -151,7 +151,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return GettextCatalog.GetString ("Unknown");
 		}
 		
-		public List<ReferenceSegment> Disassemble (TextEditorData data, ITreeNavigator navigator)
+		public List<ReferenceSegment> Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			var assembly = ((AssemblyLoader)navigator.DataItem).UnresolvedAssembly;
 			var compilationUnit = Widget.CecilLoader.GetCecilObject (assembly);
@@ -163,7 +163,7 @@ namespace MonoDevelop.AssemblyBrowser
 		}
 		
 		
-		public List<ReferenceSegment> Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		public List<ReferenceSegment> Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			var assembly = ((AssemblyLoader)navigator.DataItem).UnresolvedAssembly;
 			var compilationUnit = Widget.CecilLoader.GetCecilObject (assembly);
@@ -177,7 +177,7 @@ namespace MonoDevelop.AssemblyBrowser
 			});
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			var assembly = ((AssemblyLoader)navigator.DataItem).UnresolvedAssembly;
 			var compilationUnit = Widget.CecilLoader.GetCecilObject (assembly);
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomEventNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomEventNodeBuilder.cs
index d04c119022..cca966e2bc 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomEventNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomEventNodeBuilder.cs
@@ -34,12 +34,13 @@ using MonoDevelop.Ide;
 using ICSharpCode.Decompiler.Ast;
 using ICSharpCode.Decompiler;
 using System.Threading;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using Mono.Cecil;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using MonoDevelop.Ide.Editor;
+using ICSharpCode.NRefactory.CSharp;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -64,7 +65,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var evt = (IUnresolvedEvent)dataObject;
 			try {
 				var resolved = Resolve (treeBuilder, evt);
-				nodeInfo.Label = Ambience.GetString (resolved, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.CompletionListFomat);
+				nodeInfo.Label = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved));
 			} catch (Exception) {
 				nodeInfo.Label = evt.Name;
 			}
@@ -90,7 +91,7 @@ namespace MonoDevelop.AssemblyBrowser
 		}
 		
 		#region IAssemblyBrowserNodeBuilder
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditorData data, ITreeNavigator navigator)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -98,7 +99,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Disassemble (data, rd => rd.DisassembleEvent (evt));
 		}
 		
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -106,7 +107,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Decompile (data, DomMethodNodeBuilder.GetModule (navigator), evt.DeclaringType, b => b.AddEvent (evt));
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -120,17 +121,12 @@ namespace MonoDevelop.AssemblyBrowser
 			var resolved = Resolve (navigator, evt);
 			StringBuilder result = new StringBuilder ();
 			result.Append ("<big>");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved)));
 			result.Append ("</big>");
 			result.AppendLine ();
-			
-			var options = new AmbienceService.DocumentationFormatOptions ();
-			options.MaxLineLength = -1;
-			options.BigHeadings = true;
-			options.Ambience = Ambience;
 			result.AppendLine ();
-			
-			result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
+
+			//result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
 			
 			return result.ToString ();
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomFieldNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomFieldNodeBuilder.cs
index f56ad572f6..5271725dc4 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomFieldNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomFieldNodeBuilder.cs
@@ -34,12 +34,12 @@ using MonoDevelop.Ide;
 using ICSharpCode.Decompiler.Ast;
 using ICSharpCode.Decompiler;
 using System.Threading;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using Mono.Cecil;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -65,7 +65,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var field = (IUnresolvedField)dataObject;
 			try {
 				var resolved = Resolve (treeBuilder, field);
-				nodeInfo.Label = Ambience.GetString (resolved, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.CompletionListFomat);
+				nodeInfo.Label = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved));
 			} catch (Exception) {
 				nodeInfo.Label = field.Name;
 			}
@@ -77,7 +77,7 @@ namespace MonoDevelop.AssemblyBrowser
 		
 		#region IAssemblyBrowserNodeBuilder
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditorData data, ITreeNavigator navigator)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -85,7 +85,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Disassemble (data, rd => rd.DisassembleField (field));
 		}
 		
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -93,7 +93,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Decompile (data, DomMethodNodeBuilder.GetModule (navigator), field.DeclaringType, b => b.AddField (field));
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -107,17 +107,11 @@ namespace MonoDevelop.AssemblyBrowser
 			var resolved = Resolve (navigator, field);
 			StringBuilder result = new StringBuilder ();
 			result.Append ("<big>");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved)));
 			result.Append ("</big>");
 			result.AppendLine ();
-			
-			var options = new AmbienceService.DocumentationFormatOptions ();
-			options.MaxLineLength = -1;
-			options.BigHeadings = true;
-			options.Ambience = Ambience;
-			result.AppendLine ();
-			
-			result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
+
+			//result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
 			
 			return result.ToString ();
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomMethodNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomMethodNodeBuilder.cs
index 1a9b29e791..2fb905e139 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomMethodNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomMethodNodeBuilder.cs
@@ -40,13 +40,14 @@ using ICSharpCode.Decompiler.Ast;
 using ICSharpCode.Decompiler;
 using System.Threading;
 using ICSharpCode.Decompiler.Disassembler;
-using Mono.TextEditor;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using System.IO;
 using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Projects;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -78,8 +79,9 @@ namespace MonoDevelop.AssemblyBrowser
 			var method = (IUnresolvedMethod)dataObject;
 			var dt = new DefaultResolvedTypeDefinition (GetContext (treeBuilder), method.DeclaringTypeDefinition);
 			var resolved = (DefaultResolvedMethod)Resolve (treeBuilder, method, dt);
+			var ambience = new CSharpAmbience ();
 			try {
-				nodeInfo.Label = Ambience.GetString (resolved, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.CompletionListFomat);
+				nodeInfo.Label = ambience.ConvertSymbol (resolved);
 			} catch (Exception) {
 				nodeInfo.Label = method.Name;
 			}
@@ -119,16 +121,16 @@ namespace MonoDevelop.AssemblyBrowser
 			return (ModuleDefinition)nav.DataItem;
 		}
 
-		public static List<ReferenceSegment> Decompile (TextEditorData data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData)
+		public static List<ReferenceSegment> Decompile (TextEditor data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData)
 		{
-			var types = DesktopService.GetMimeTypeInheritanceChain (data.Document.MimeType);
+			var types = DesktopService.GetMimeTypeInheritanceChain (data.MimeType);
 			var codePolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
 			var settings = DomTypeNodeBuilder.CreateDecompilerSettings (false, codePolicy);
 			return Decompile (data, module, currentType, setData, settings);
 		}
 
 
-		public static List<ReferenceSegment> Decompile (TextEditorData data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData, DecompilerSettings settings)
+		public static List<ReferenceSegment> Decompile (TextEditor data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData, DecompilerSettings settings)
 		{
 			var context = new DecompilerContext (module);
 			var source = new CancellationTokenSource ();
@@ -140,7 +142,7 @@ namespace MonoDevelop.AssemblyBrowser
 				setData (astBuilder);
 				astBuilder.RunTransformations (o => false);
 				GeneratedCodeSettings.Default.Apply (astBuilder.SyntaxTree);
-				var output = new ColoredCSharpFormatter (data.Document);
+				var output = new ColoredCSharpFormatter (data);
 				astBuilder.GenerateCode (output);
 				output.SetDocumentData ();
 				return output.ReferencedSegments;
@@ -152,10 +154,10 @@ namespace MonoDevelop.AssemblyBrowser
 					setData (astBuilder);
 					astBuilder.RunTransformations (o => false);
 					GeneratedCodeSettings.Default.Apply (astBuilder.SyntaxTree);
-					var output = new ColoredCSharpFormatter (data.Document);
+					var output = new ColoredCSharpFormatter (data);
 					astBuilder.GenerateCode (output);
 					output.SetDocumentData ();
-					data.Document.Insert (data.Document.TextLength, "/* body decompilation failed: \n" + e + " */"); 
+					data.InsertText (data.Length, "/* body decompilation failed: \n" + e + " */"); 
 				} catch (Exception e2) {
 					data.Text = "/* fallback decompilation failed: \n" + e2 +"*/";
 				}
@@ -163,15 +165,15 @@ namespace MonoDevelop.AssemblyBrowser
 			return null;
 		}
 
-		public static List<ReferenceSegment> GetSummary (TextEditorData data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData)
+		public static List<ReferenceSegment> GetSummary (TextEditor data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData)
 		{
-			var types = DesktopService.GetMimeTypeInheritanceChain (data.Document.MimeType);
+			var types = DesktopService.GetMimeTypeInheritanceChain (data.MimeType);
 			var codePolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
 			var settings = DomTypeNodeBuilder.CreateDecompilerSettings (false, codePolicy);
 			return GetSummary (data, module, currentType, setData, settings);
 		}
 
-		public static List<ReferenceSegment> GetSummary (TextEditorData data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData, DecompilerSettings settings)
+		public static List<ReferenceSegment> GetSummary (TextEditor data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData, DecompilerSettings settings)
 		{
 			var context = new DecompilerContext (module);
 			var source = new CancellationTokenSource ();
@@ -184,7 +186,7 @@ namespace MonoDevelop.AssemblyBrowser
 				setData (astBuilder);
 				astBuilder.RunTransformations (o => false);
 				GeneratedCodeSettings.Default.Apply (astBuilder.SyntaxTree);
-				var output = new ColoredCSharpFormatter (data.Document);
+				var output = new ColoredCSharpFormatter (data);
 				astBuilder.GenerateCode (output);
 				output.SetDocumentData ();
 				return output.ReferencedSegments;
@@ -194,20 +196,22 @@ namespace MonoDevelop.AssemblyBrowser
 			return null;
 		}
 
-		internal static string GetAttributes (Ambience ambience, IEnumerable<IAttribute> attributes)
+		internal static string GetAttributes (IEnumerable<IAttribute> attributes)
 		{
 			StringBuilder result = new StringBuilder ();
+			var ambience = new CSharpAmbience ();
+
 			foreach (var attr in attributes) {
 				if (result.Length > 0)
 					result.AppendLine ();
-	//			result.Append (ambience.GetString (attr, OutputFlags.AssemblyBrowserDescription));
+				// result.Append (ambience.ConvertSymbol (attr));
 			}
 			if (result.Length > 0)
 				result.AppendLine ();
 			return result.ToString ();
 		}
 		
-		public List<ReferenceSegment> Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		public List<ReferenceSegment> Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			var method = (IUnresolvedMethod)navigator.DataItem;
 			if (HandleSourceCodeEntity (navigator, data)) 
@@ -218,7 +222,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Decompile (data, DomMethodNodeBuilder.GetModule (navigator), cecilMethod.DeclaringType, b => b.AddMethod (cecilMethod));
 		}
 		
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			var method = (IUnresolvedMethod)navigator.DataItem;
 			if (HandleSourceCodeEntity (navigator, data)) 
@@ -238,29 +242,29 @@ namespace MonoDevelop.AssemblyBrowser
 			sb.Append ("</a></u></span>");
 		}
 		
-		public static List<ReferenceSegment> Disassemble (TextEditorData data, Action<ReflectionDisassembler> setData)
+		public static List<ReferenceSegment> Disassemble (TextEditor data, Action<ReflectionDisassembler> setData)
 		{
 			var source = new CancellationTokenSource ();
-			var output = new ColoredCSharpFormatter (data.Document);
+			var output = new ColoredCSharpFormatter (data);
 			var disassembler = new ReflectionDisassembler (output, true, source.Token);
 			setData (disassembler);
 			output.SetDocumentData ();
 			return output.ReferencedSegments;
 		}
 		
-		internal static bool HandleSourceCodeEntity (ITreeNavigator navigator, TextEditorData data)
+		internal static bool HandleSourceCodeEntity (ITreeNavigator navigator, TextEditor data)
 		{
 			if (IsFromAssembly (navigator))
 				return false;
 			
 			var method = (IUnresolvedEntity)navigator.DataItem;
-			data.Text = Mono.TextEditor.Utils.TextFileUtility.ReadAllText (method.Region.FileName);
-			data.Caret.Location = method.Region.Begin;
-			data.CenterToCaret ();
+			var source = StringTextSource.ReadFrom (method.Region.FileName);
+			data.Text = source.Text;
+			data.CaretLocation = new MonoDevelop.Ide.Editor.DocumentLocation (method.Region.BeginLine, method.Region.BeginColumn);
 			return true;
 		}
 		
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditorData data, ITreeNavigator navigator)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			var method = (IUnresolvedMethod)navigator.DataItem;
 			if (HandleSourceCodeEntity (navigator, data)) 
@@ -276,21 +280,15 @@ namespace MonoDevelop.AssemblyBrowser
 			var method = (IUnresolvedMethod)navigator.DataItem;
 			var resolved = Resolve (navigator, method);
 			if (GetMainAssembly (navigator) == null) {
-				return Mono.TextEditor.Utils.TextFileUtility.ReadAllText (method.Region.FileName);
+				return StringTextSource.ReadFrom (method.Region.FileName).Text;
 			}
 			StringBuilder result = new StringBuilder ();
 			result.Append ("<big>");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription | OutputFlags.IncludeConstraints));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved)));
 			result.Append ("</big>");
 			result.AppendLine ();
-			
-			AmbienceService.DocumentationFormatOptions options = new AmbienceService.DocumentationFormatOptions ();
-			options.MaxLineLength = -1;
-			options.BigHeadings = true;
-			options.Ambience = Ambience;
-			result.AppendLine ();
-			
-			result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
+
+			//result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
 			
 			return result.ToString ();
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomPropertyNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomPropertyNodeBuilder.cs
index 465b41300b..7461dd9a83 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomPropertyNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomPropertyNodeBuilder.cs
@@ -35,12 +35,12 @@ using MonoDevelop.Projects.Text;
 using ICSharpCode.Decompiler.Ast;
 using ICSharpCode.Decompiler;
 using System.Threading;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using Mono.Cecil;
 using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -66,7 +66,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var property = (IUnresolvedProperty)dataObject;
 			try {
 				var resolved = Resolve (treeBuilder, property);
-				nodeInfo.Label = Ambience.GetString (resolved, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.CompletionListFomat);
+				nodeInfo.Label = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved));
 			} catch (Exception) {
 				nodeInfo.Label = property.Name;
 			}
@@ -87,7 +87,7 @@ namespace MonoDevelop.AssemblyBrowser
 		
 		#region IAssemblyBrowserNodeBuilder
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditorData data, ITreeNavigator navigator)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -107,7 +107,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return result;
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -115,7 +115,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Decompile (data, DomMethodNodeBuilder.GetModule (navigator), property.DeclaringType, b => b.AddProperty (property));
 		}
 		
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -129,17 +129,11 @@ namespace MonoDevelop.AssemblyBrowser
 			var resolved = Resolve (navigator, property);
 			StringBuilder result = new StringBuilder ();
 			result.Append ("<big>");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved)));
 			result.Append ("</big>");
 			result.AppendLine ();
-			
-			AmbienceService.DocumentationFormatOptions options = new AmbienceService.DocumentationFormatOptions ();
-			options.MaxLineLength = -1;
-			options.BigHeadings = true;
-			options.Ambience = Ambience;
-			result.AppendLine ();
-			
-			result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
+
+			//result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
 			
 			return result.ToString ();
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomTypeNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomTypeNodeBuilder.cs
index 35ba03ed84..362a78969e 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomTypeNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomTypeNodeBuilder.cs
@@ -30,19 +30,21 @@ using System;
 using System.Text;
 using System.Linq;
 using Mono.Cecil;
-
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor.Highlighting;
 using MonoDevelop.Ide;
 using ICSharpCode.Decompiler.Ast;
 using ICSharpCode.Decompiler;
 using System.Threading;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
+using Mono.TextEditor.Highlighting;
+using MonoDevelop.Ide.Gui.Content;
+using ICSharpCode.NRefactory.CSharp;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -61,8 +63,7 @@ namespace MonoDevelop.AssemblyBrowser
 			
 		}
 		
-		internal static OutputSettings settings;
-		static SyntaxMode mode = SyntaxModeService.GetSyntaxMode (null, "text/x-csharp");
+		static SyntaxMode mode = Mono.TextEditor.Highlighting.SyntaxModeService.GetSyntaxMode (null, "text/x-csharp");
 
 		internal static string MarkupKeyword (string text)
 		{
@@ -75,34 +76,7 @@ namespace MonoDevelop.AssemblyBrowser
 			}
 			return text;
 		}
-		
-		static DomTypeNodeBuilder ()
-		{
-			DomTypeNodeBuilder.settings = new OutputSettings (OutputFlags.AssemblyBrowserDescription);
-			
-			DomTypeNodeBuilder.settings.MarkupCallback += delegate (string text) {
-				return "<span style=\"text\">" + text + "</span>";
-			};
-			DomTypeNodeBuilder.settings.EmitModifiersCallback = delegate (string text) {
-				return "<span style=\"keyword.modifier\">" + text + "</span>";
-			};
-			DomTypeNodeBuilder.settings.EmitKeywordCallback = delegate (string text) {
-				return MarkupKeyword (text);
-			};
-//			DomTypeNodeBuilder.settings.EmitNameCallback = delegate (IEntity domVisitable, ref string outString) {
-//				if (domVisitable is IType) {
-//					outString = "<span style=\"text.link\"><u><a ref=\"" + ((IType)domVisitable).HelpUrl + "\">" + outString + "</a></u></span>";
-//				} else {
-//					outString = "<span style=\"text\">" + outString + "</span>";
-//				}
-//			};
-//			DomTypeNodeBuilder.settings.PostProcessCallback = delegate (IEntity domVisitable, ref string outString) {
-//				if (domVisitable is IReturnType) {
-//					outString = "<span style=\"text.link\"><u><a ref=\"" + ((IReturnType)domVisitable).HelpUrl + "\">" + outString + "</a></u></span>";
-//				}
-//			};
-		}
-		
+
 		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
 		{
 			var type = (IUnresolvedTypeDefinition)dataObject;
@@ -114,7 +88,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var type = (IUnresolvedTypeDefinition)dataObject;
 			try {
 				var resolved = Resolve (treeBuilder, type);
-				nodeInfo.Label = Ambience.GetString (resolved, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.UseNETTypeNames);
+				nodeInfo.Label = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertType (resolved));
 			} catch (Exception) {
 				nodeInfo.Label = type.Name;
 			}
@@ -161,7 +135,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var resolved = Resolve (navigator, type);
 			StringBuilder result = new StringBuilder ();
 			result.Append ("<span font_family=\"monospace\">");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertType (resolved)));
 			result.Append ("</span>");
 			result.AppendLine ();
 			result.Append (String.Format (GettextCatalog.GetString ("<b>Name:</b>\t{0}"), type.FullName));
@@ -170,7 +144,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return result.ToString ();
 		}
 		
-		public List<ReferenceSegment> Disassemble (TextEditorData data, ITreeNavigator navigator)
+		public List<ReferenceSegment> Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -193,19 +167,19 @@ namespace MonoDevelop.AssemblyBrowser
 				LockStatement = true,
 				AsyncAwait = true,
 				ShowXmlDocumentation = true,
-				CSharpFormattingOptions = codePolicy.CreateOptions (),
+				CSharpFormattingOptions = FormattingOptionsFactory.CreateMono (),
 				HideNonPublicMembers = publicOnly
 			};
 		}
 
-		public List<ReferenceSegment> Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		public List<ReferenceSegment> Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
 			var type = CecilLoader.GetCecilObject ((IUnresolvedTypeDefinition)navigator.DataItem);
 			if (type == null)
 				return null;
-			var types = DesktopService.GetMimeTypeInheritanceChain (data.Document.MimeType);
+			var types = DesktopService.GetMimeTypeInheritanceChain (data.MimeType);
 			var codePolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
 			var settings = CreateDecompilerSettings (publicOnly, codePolicy);
 			return DomMethodNodeBuilder.Decompile (data, DomMethodNodeBuilder.GetModule (navigator), type, builder => {
@@ -213,14 +187,14 @@ namespace MonoDevelop.AssemblyBrowser
 			}, settings);
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
 			var type = CecilLoader.GetCecilObject ((IUnresolvedTypeDefinition)navigator.DataItem);
 			if (type == null)
 				return null;
-			var types = DesktopService.GetMimeTypeInheritanceChain (data.Document.MimeType);
+			var types = DesktopService.GetMimeTypeInheritanceChain (data.MimeType);
 			var codePolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
 			var settings = CreateDecompilerSettings (publicOnly, codePolicy);
 			return DomMethodNodeBuilder.GetSummary (data, DomMethodNodeBuilder.GetModule (navigator), type, builder => {
@@ -228,24 +202,17 @@ namespace MonoDevelop.AssemblyBrowser
 			}, settings);
 		}
 
-
 		string IAssemblyBrowserNodeBuilder.GetDocumentationMarkup (ITreeNavigator navigator)
 		{
 			var type = (IUnresolvedTypeDefinition)navigator.DataItem;
 			var resolved = Resolve (navigator, type);
 			var result = new StringBuilder ();
 			result.Append ("<big>");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertType (resolved)));
 			result.Append ("</big>");
 			result.AppendLine ();
 			
-			AmbienceService.DocumentationFormatOptions options = new AmbienceService.DocumentationFormatOptions ();
-			options.MaxLineLength = -1;
-			options.BigHeadings = true;
-			options.Ambience = Ambience;
-			result.AppendLine ();
-			
-			result.Append (AmbienceService.GetDocumentationMarkup (resolved.GetDefinition (), AmbienceService.GetDocumentation (resolved.GetDefinition ()), options));
+			//result.Append (AmbienceService.GetDocumentationMarkup (resolved.GetDefinition (), AmbienceService.GetDocumentation (resolved.GetDefinition ()), options));
 			
 			return result.ToString ();
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/NamespaceBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/NamespaceBuilder.cs
index e19351f894..dd0854bd00 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/NamespaceBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/NamespaceBuilder.cs
@@ -31,9 +31,9 @@ using System.Text;
 using System.Linq;
 
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -98,7 +98,7 @@ namespace MonoDevelop.AssemblyBrowser
 		
 		#region IAssemblyBrowserNodeBuilder
 
-		public List<ReferenceSegment> Disassemble (TextEditorData data, ITreeNavigator navigator)
+		public List<ReferenceSegment> Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 		//	bool publicOnly = Widget.PublicApiOnly;
 			Namespace ns = (Namespace)navigator.DataItem;
@@ -107,12 +107,12 @@ namespace MonoDevelop.AssemblyBrowser
 			return null;
 		}
 		
-		public List<ReferenceSegment> Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		public List<ReferenceSegment> Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			return Disassemble (data, navigator);
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			return Disassemble (data, navigator);
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ProjectNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ProjectNodeBuilder.cs
index 21269962f9..ba69c55f8a 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ProjectNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ProjectNodeBuilder.cs
@@ -34,7 +34,6 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Pads;
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using ICSharpCode.NRefactory.TypeSystem;
 using System.IO;
@@ -76,33 +75,35 @@ namespace MonoDevelop.AssemblyBrowser
 		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
 		{
 			var project = (Project)dataObject;
-			var ctx = TypeSystemService.GetProjectContext (project);
-			if (ctx == null)
-				return;
-			
-			var namespaces = new Dictionary<string, Namespace> ();
-
-			foreach (var type in ctx.TopLevelTypeDefinitions) {
-				string namespaceName = string.IsNullOrEmpty (type.Namespace) ? "-" : type.Namespace;
-				if (!namespaces.ContainsKey (namespaceName))
-					namespaces [namespaceName] = new Namespace (namespaceName);
-				
-				var ns = namespaces [namespaceName];
-				ns.Types.Add (type);
-			}
-			
-			foreach (var ns in namespaces.Values) {
-				builder.AddChild (ns);
-			}
+			// TODO: Roslyn port.
+//			var ctx = TypeSystemService.GetProjectContext (project);
+//			if (ctx == null)
+//				return;
+//			
+//			var namespaces = new Dictionary<string, Namespace> ();
+//
+//			foreach (var type in ctx.TopLevelTypeDefinitions) {
+//				string namespaceName = string.IsNullOrEmpty (type.Namespace) ? "-" : type.Namespace;
+//				if (!namespaces.ContainsKey (namespaceName))
+//					namespaces [namespaceName] = new Namespace (namespaceName);
+//				
+//				var ns = namespaces [namespaceName];
+//				ns.Types.Add (type);
+//			}
+//			
+//			foreach (var ns in namespaces.Values) {
+//				builder.AddChild (ns);
+//			}
 		}
 		
 		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
 		{
 			var project = (Project)dataObject;
-			var ctx = TypeSystemService.GetProjectContext (project);
-			if (ctx == null)
+			// TODO: Roslyn port.
+			//var ctx = TypeSystemService.GetProjectContext (project);
+			//if (ctx == null)
 				return false;
-			return ctx.TopLevelTypeDefinitions.Any ();
+			// return ctx.TopLevelTypeDefinitions.Any ();
 		}
 		
 		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/packages.config b/main/src/addins/MonoDevelop.AssemblyBrowser/packages.config
new file mode 100644
index 0000000000..d3fca62c00
--- /dev/null
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/CorApi2.csproj b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/CorApi2.csproj
index 0b234e8a96..8193510ef7 100644
--- a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/CorApi2.csproj
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/CorApi2.csproj
@@ -23,6 +23,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/AddinInfo.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/AddinInfo.cs
index be6398819e..fae19d46b0 100644
--- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/AddinInfo.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/AddinInfo.cs
@@ -14,4 +14,3 @@ using Mono.Addins.Description;
 [assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("Debugger", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("AspNet", MonoDevelop.BuildInfo.Version)]
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerEngine.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerEngine.cs
index 9d1d77f225..092f0ae140 100644
--- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerEngine.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerEngine.cs
@@ -4,7 +4,9 @@ using System.IO;
 using Mono.Debugging.Client;

 using MonoDevelop.Core;

 using MonoDevelop.Core.Execution;

+#if ASPNET

 using MonoDevelop.AspNet.Execution;

+#endif

 

 namespace MonoDevelop.Debugger.Win32

 {

@@ -17,9 +19,11 @@ namespace MonoDevelop.Debugger.Win32
 			DotNetExecutionCommand cmd = command as DotNetExecutionCommand;

 			if (cmd != null)

 				return (cmd.TargetRuntime == null || cmd.TargetRuntime.RuntimeId == "MS.NET");

+#if ASPNET

 			var acmd = command as AspNetExecutionCommand;

 			if (acmd != null)

 				return (acmd.TargetRuntime == null || acmd.TargetRuntime.RuntimeId == "MS.NET");

+#endif

 			return false;

 		}

 

@@ -37,7 +41,7 @@ namespace MonoDevelop.Debugger.Win32
 				}

 				return startInfo;

 			}

-

+#if ASPNET

 			var acmd = command as AspNetExecutionCommand;

 			if (acmd != null) {

 				DebuggerStartInfo startInfo = new DebuggerStartInfo ();

@@ -56,6 +60,7 @@ namespace MonoDevelop.Debugger.Win32
 				startInfo.EnvironmentVariables["DEVPATH"] = Path.GetDirectoryName (xspPath);

 				return startInfo;

 			}

+#endif

 			throw new NotSupportedException ();

 		}

 

diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj
index 951b9df5ba..53c5979a07 100644
--- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj
@@ -122,11 +122,6 @@
       <Name>Mono.Addins</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\AspNet\MonoDevelop.AspNet.csproj">
-      <Project>{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}</Project>
-      <Name>MonoDevelop.AspNet</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
index be2a768d5d..a3bd79b733 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
@@ -40,6 +40,8 @@ namespace MonoDevelop.Debugger
 		{
 			this.TypeHint = WindowTypeHint.PopupMenu;
 			this.Decorated = false;
+			if (((Gtk.Window)invokingWidget.Toplevel).Modal)
+				this.Modal = true;
 			TransientFor = (Gtk.Window) invokingWidget.Toplevel;
 
 			Theme.SetFlatColor (new Cairo.Color (245 / 256.0, 245 / 256.0, 245 / 256.0));
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj
index 25bf813d8d..b1212633d0 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj
@@ -60,11 +60,6 @@
       <Name>MonoDevelop.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
       <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
       <Name>MonoDevelop.Ide</Name>
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
index 205a6ae228..4cb96364ed 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
@@ -90,7 +90,59 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Composition.AttributedModel">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Composition.Convention">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Composition.Hosting">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Composition.Runtime">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Composition.TypedParts">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -103,11 +155,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
@@ -128,6 +175,11 @@
       <Name>Mono.Debugging</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -136,7 +188,6 @@
     <Compile Include="MonoDevelop.Debugger\WatchPad.cs" />
     <Compile Include="MonoDevelop.Debugger\Initializer.cs" />
     <Compile Include="MonoDevelop.Debugger\DisassemblyView.cs" />
-    <Compile Include="MonoDevelop.Debugger\DebugTextMarker.cs" />
     <Compile Include="MonoDevelop.Debugger\BreakpointPad.cs" />
     <Compile Include="MonoDevelop.Debugger\LocalsPad.cs" />
     <Compile Include="MonoDevelop.Debugger\ObjectValuePad.cs" />
@@ -393,4 +444,7 @@
     <Folder Include="MonoDevelop.Debugger.Converters\" />
     <Folder Include="icons\mac\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
index 882cc7d5b5..9ccdb54b71 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
@@ -36,6 +36,7 @@ using Xwt;
 using Xwt.Drawing;
 using System.Linq;
 using System.IO;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.Debugger
 {
@@ -419,8 +420,8 @@ namespace MonoDevelop.Debugger
 				    IdeApp.Workbench.ActiveDocument.Editor != null &&
 				    IdeApp.Workbench.ActiveDocument.FileName != FilePath.Null) {
 					breakpointLocation.Update (IdeApp.Workbench.ActiveDocument.FileName,
-						IdeApp.Workbench.ActiveDocument.Editor.Caret.Line,
-						IdeApp.Workbench.ActiveDocument.Editor.Caret.Column);
+						IdeApp.Workbench.ActiveDocument.Editor.CaretLine,
+						IdeApp.Workbench.ActiveDocument.Editor.CaretColumn);
 					entryLocationFile.Text = breakpointLocation.ToString ();
 					stopOnLocation.Active = true;
 				}
@@ -688,18 +689,23 @@ namespace MonoDevelop.Debugger
 		{
 			classes.Add ("System.Exception");
 			if (IdeApp.ProjectOperations.CurrentSelectedProject != null) {
-				var dom = TypeSystemService.GetCompilation (IdeApp.ProjectOperations.CurrentSelectedProject);
-				foreach (var t in dom.FindType (typeof (Exception)).GetSubTypeDefinitions ())
-					classes.Add (t.ReflectionName);
+				var compilation = TypeSystemService.GetCompilationAsync (IdeApp.ProjectOperations.CurrentSelectedProject).Result;
+				var exceptionClass = compilation.GetTypeByMetadataName ("System.Exception");
+				foreach (var t in compilation.GlobalNamespace.GetAllTypes ().Where ((arg) => arg.IsDerivedFromClass (exceptionClass))) {
+					classes.Add (t.GetFullMetadataName ());
+				}
 			} else {
-				// no need to unload this assembly context, it's not cached.
-				var unresolvedAssembly = TypeSystemService.LoadAssemblyContext (Runtime.SystemAssemblyService.CurrentRuntime, MonoDevelop.Core.Assemblies.TargetFramework.Default, typeof(Uri).Assembly.Location);
-				var mscorlib = TypeSystemService.LoadAssemblyContext (Runtime.SystemAssemblyService.CurrentRuntime, MonoDevelop.Core.Assemblies.TargetFramework.Default, typeof(object).Assembly.Location);
-				if (unresolvedAssembly != null && mscorlib != null) {
-					var dom = new ICSharpCode.NRefactory.TypeSystem.Implementation.SimpleCompilation (unresolvedAssembly, mscorlib);
-					foreach (var t in dom.FindType (typeof (Exception)).GetSubTypeDefinitions ())
-						classes.Add (t.ReflectionName);
+				//no need to unload this assembly context, it's not cached.
+				var dummyProjectId = Microsoft.CodeAnalysis.ProjectId.CreateNewId ("GetExceptionsProject");
+				var compilation = Microsoft.CodeAnalysis.CSharp.CSharpCompilation.Create ("GetExceptions")
+										   .AddReferences (MetadataReferenceCache.LoadReference (dummyProjectId, System.Reflection.Assembly.GetAssembly (typeof(object)).Location))//corlib
+										   .AddReferences (MetadataReferenceCache.LoadReference (dummyProjectId, System.Reflection.Assembly.GetAssembly (typeof(Uri)).Location));//System.dll
+
+				var exceptionClass = compilation.GetTypeByMetadataName ("System.Exception");
+				foreach (var t in compilation.GlobalNamespace.GetAllTypes ().Where ((arg) => arg.IsDerivedFromClass (exceptionClass))) {
+					classes.Add (t.GetFullMetadataName ());
 				}
+				MetadataReferenceCache.RemoveReferences (dummyProjectId);
 			}
 			entryExceptionType.SetCodeCompletionList (classes.ToList ());
 		}
@@ -824,4 +830,4 @@ namespace MonoDevelop.Debugger
 			base.Dispose (disposing);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs
index 8c7b73fb48..7dcc9a33f1 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs
@@ -349,13 +349,13 @@ namespace MonoDevelop.Debugger
 			Breakpoint bp;
 
 			lock (breakpoints)
-				bp = breakpoints.Toggle (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.Caret.Line, IdeApp.Workbench.ActiveDocument.Editor.Caret.Column);
+				bp = breakpoints.Toggle (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.CaretLine, IdeApp.Workbench.ActiveDocument.Editor.CaretColumn);
 			
 			// If the breakpoint could not be inserted in the caret location, move the caret
 			// to the real line of the breakpoint, so that if the Toggle command is run again,
 			// this breakpoint will be removed
-			if (bp != null && bp.Line != IdeApp.Workbench.ActiveDocument.Editor.Caret.Line)
-				IdeApp.Workbench.ActiveDocument.Editor.Caret.Line = bp.Line;
+			if (bp != null && bp.Line != IdeApp.Workbench.ActiveDocument.Editor.CaretLine)
+				IdeApp.Workbench.ActiveDocument.Editor.CaretLine = bp.Line;
 		}
 		
 		protected override void Update (CommandInfo info)
@@ -367,7 +367,7 @@ namespace MonoDevelop.Debugger
 					!DebuggingService.Breakpoints.IsReadOnly;
 		}
 	}
-	
+
 	class EnableDisableBreakpointHandler: CommandHandler
 	{
 		protected override void Run ()
@@ -375,7 +375,7 @@ namespace MonoDevelop.Debugger
 			var breakpoints = DebuggingService.Breakpoints;
 
 			lock (breakpoints) {
-				foreach (var bp in breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.Caret.Line))
+				foreach (var bp in breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.CaretLine))
 					bp.Enabled = !bp.Enabled;
 			}
 		}
@@ -390,7 +390,7 @@ namespace MonoDevelop.Debugger
 			    IdeApp.Workbench.ActiveDocument.FileName != FilePath.Null &&
 			    !breakpoints.IsReadOnly) {
 				lock (breakpoints)
-					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.Caret.Line).Count > 0;
+					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.CaretLine).Count > 0;
 			} else {
 				info.Enabled = false;
 			}
@@ -450,7 +450,7 @@ namespace MonoDevelop.Debugger
 			lock (breakpoints) {
 				IEnumerable<Breakpoint> brs = breakpoints.GetBreakpointsAtFileLine (
 					IdeApp.Workbench.ActiveDocument.FileName,
-					IdeApp.Workbench.ActiveDocument.Editor.Caret.Line);
+					IdeApp.Workbench.ActiveDocument.Editor.CaretLine);
 
 				List<Breakpoint> list = new List<Breakpoint> (brs);
 				foreach (Breakpoint bp in list)
@@ -468,7 +468,7 @@ namespace MonoDevelop.Debugger
 			    IdeApp.Workbench.ActiveDocument.FileName != FilePath.Null &&
 			    !breakpoints.IsReadOnly) {
 				lock (breakpoints)
-					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.Caret.Line).Count > 0;
+					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.CaretLine).Count > 0;
 			} else {
 				info.Enabled = false;
 			}
@@ -553,11 +553,11 @@ namespace MonoDevelop.Debugger
 			var doc = IdeApp.Workbench.ActiveDocument;
 
 			if (DebuggingService.IsPaused) {
-				DebuggingService.RunToCursor (doc.FileName, doc.Editor.Caret.Line, doc.Editor.Caret.Column);
+				DebuggingService.RunToCursor (doc.FileName, doc.Editor.CaretLine, doc.Editor.CaretColumn);
 				return;
 			}
 
-			var bp = new RunToCursorBreakpoint (doc.FileName, doc.Editor.Caret.Line, doc.Editor.Caret.Column);
+			var bp = new RunToCursorBreakpoint (doc.FileName, doc.Editor.CaretLine, doc.Editor.CaretColumn);
 			DebuggingService.Breakpoints.Add (bp);
 			DebugHandler.BuildAndDebug ();
 		}
@@ -597,7 +597,7 @@ namespace MonoDevelop.Debugger
 			lock (breakpoints) {
 				brs = breakpoints.GetBreakpointsAtFileLine (
 					IdeApp.Workbench.ActiveDocument.FileName,
-					IdeApp.Workbench.ActiveDocument.Editor.Caret.Line);
+					IdeApp.Workbench.ActiveDocument.Editor.CaretLine);
 			}
 
 			if (brs.Count > 0) {
@@ -616,7 +616,7 @@ namespace MonoDevelop.Debugger
 			    IdeApp.Workbench.ActiveDocument.FileName != FilePath.Null &&
 			    !breakpoints.IsReadOnly) {
 				lock (breakpoints)
-					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.Caret.Line).Count > 0;
+					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.CaretLine).Count > 0;
 			} else {
 				info.Enabled = false;
 			}
@@ -684,7 +684,7 @@ namespace MonoDevelop.Debugger
 			var doc = IdeApp.Workbench.ActiveDocument;
 
 			try {
-				DebuggingService.SetNextStatement (doc.FileName, doc.Editor.Caret.Line, doc.Editor.Caret.Column);
+				DebuggingService.SetNextStatement (doc.FileName, doc.Editor.CaretLine, doc.Editor.CaretColumn);
 			} catch (Exception e) {
 				if (e is NotSupportedException || e.InnerException is NotSupportedException) {
 					MessageService.ShowError ("Unable to set the next statement to this location.");
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerConsoleView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerConsoleView.cs
index 31e929b165..05f9b96ebc 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerConsoleView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerConsoleView.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using MonoDevelop.Ide;
 using MonoDevelop.Components;
 using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Debugger
 {
@@ -272,7 +273,7 @@ namespace MonoDevelop.Debugger
 				text = text.Substring (Math.Max (0, Math.Min (ctx.TriggerOffset, text.Length)));
 
 			CompletionWindowManager.UpdateWordSelection (text);
-			CompletionWindowManager.PostProcessKeyEvent (key, keyChar, modifier);
+			CompletionWindowManager.PostProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier));
 			PopupCompletion ();
 		}
 
@@ -290,7 +291,7 @@ namespace MonoDevelop.Debugger
 			}
 
 			if (currentCompletionData != null) {
-				if ((keyHandled = CompletionWindowManager.PreProcessKeyEvent (key, keyChar, modifier)))
+				if ((keyHandled = CompletionWindowManager.PreProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier))))
 					return true;
 			}
 
@@ -329,6 +330,9 @@ namespace MonoDevelop.Debugger
 
 		int Position {
 			get { return Cursor.Offset - TokenBegin.Offset; }
+			set { 
+				throw new NotSupportedException ();
+			}
 		}
 
 		#region ICompletionWidget implementation
@@ -368,6 +372,15 @@ namespace MonoDevelop.Debugger
 			get {
 				return Position;
 			}
+			set {
+				Position = value;
+			}
+		}
+
+		double ICompletionWidget.ZoomLevel {
+			get {
+				return 1;
+			}
 		}
 
 		char ICompletionWidget.GetChar (int offset)
@@ -448,6 +461,10 @@ namespace MonoDevelop.Debugger
 			}
 		}
 
+		void ICompletionWidget.AddSkipChar (int cursorPosition, char c)
+		{
+			// ignore
+		}
 		#endregion
 
 		void OnCustomOutputPadFontChanged (object sender, EventArgs e)
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
index 08cf37d334..e6a38ca471 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -38,8 +38,6 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Projects;
 using MonoDevelop.Debugger.Viewers;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
 
 /*
  * Some places we should be doing some error handling we used to toss
@@ -48,6 +46,7 @@ using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TextEditing;
 using System.Linq;
 using System.Threading.Tasks;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.Debugger
 {
@@ -328,19 +327,23 @@ namespace MonoDevelop.Debugger
 
 			MessageService.ShowCustomDialog (dlg);
 		}
-		
+
 		public static void ShowExceptionCaughtDialog ()
 		{
 			var ops = session.EvaluationOptions.Clone ();
 			ops.MemberEvaluationTimeout = 0;
 			ops.EvaluationTimeout = 0;
 			ops.EllipsizeStrings = false;
-			
+
 			var val = CurrentFrame.GetException (ops);
 			if (val != null) {
 				HideExceptionCaughtDialog ();
 				exceptionDialog = new ExceptionCaughtMessage (val, CurrentFrame.SourceLocation.FileName, CurrentFrame.SourceLocation.Line, CurrentFrame.SourceLocation.Column);
-				exceptionDialog.ShowButton ();
+				if (CurrentFrame.SourceLocation.FileName != null) {
+					exceptionDialog.ShowButton ();
+				} else {
+					exceptionDialog.ShowDialog ();
+				}
 				exceptionDialog.Closed += (o, args) => exceptionDialog = null;
 			}
 		}
@@ -1077,13 +1080,18 @@ namespace MonoDevelop.Debugger
 			if (doc != null) {
 				ITextEditorResolver textEditorResolver = doc.GetContent <ITextEditorResolver> ();
 				if (textEditorResolver != null) {
-					var rr = textEditorResolver.GetLanguageItem (doc.Editor.Document.LocationToOffset (location.Line, 1), identifier);
-					var ns = rr as NamespaceResolveResult;
+					var rr = textEditorResolver.GetLanguageItem (doc.Editor.LocationToOffset (location.Line, 1), identifier);
+					var ns = rr as Microsoft.CodeAnalysis.INamespaceSymbol;
 					if (ns != null)
-						return ns.NamespaceName;
-					var result = rr as TypeResolveResult;
-					if (result != null && !result.IsError && !(result.Type.Kind == TypeKind.Dynamic && result.Type.FullName == "dynamic"))
-						return result.Type.FullName;
+						return ns.GetFullName ();
+					var result = rr as Microsoft.CodeAnalysis.INamedTypeSymbol;
+					if (result != null && !(result.TypeKind == Microsoft.CodeAnalysis.TypeKind.Dynamic && result.GetFullName () == "dynamic")) {
+						return result.ToDisplayString (new Microsoft.CodeAnalysis.SymbolDisplayFormat (
+							typeQualificationStyle: Microsoft.CodeAnalysis.SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+							miscellaneousOptions:
+							Microsoft.CodeAnalysis.SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+							Microsoft.CodeAnalysis.SymbolDisplayMiscellaneousOptions.UseSpecialTypes));
+					}
 				}
 			}
 			return null;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
index 90973bb76f..a180c96070 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
@@ -35,10 +35,8 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Commands;
-using TextEditor = Mono.TextEditor.TextEditor;
-using Mono.TextEditor;
 using Mono.Debugging.Client;
-using Mono.TextEditor.Highlighting;
+using MonoDevelop.Ide.Editor;
 using Gtk;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide;
@@ -56,10 +54,10 @@ namespace MonoDevelop.Debugger
 		int lastLine;
 		Dictionary<string,int> addressLines = new Dictionary<string,int> ();
 		bool autoRefill;
-		CurrentDebugLineTextMarker currentDebugLineMarker;
+		ICurrentDebugLineTextMarker currentDebugLineMarker;
 		bool dragging;
 		FilePath currentFile;
-		AsmLineMarker asmMarker = new AsmLineMarker ();
+		ITextLineMarker asmMarker;
 		
 		List<AssemblyLine> cachedLines = new List<AssemblyLine> ();
 		string cachedLinesAddrSpace;
@@ -70,12 +68,11 @@ namespace MonoDevelop.Debugger
 		{
 			ContentName = GettextCatalog.GetString ("Disassembly");
 			sw = new Gtk.ScrolledWindow ();
-			editor = new TextEditor ();
-			editor.Document.ReadOnly = true;
-			
-			editor.Options = new CommonTextEditorOptions {
-				ShowLineNumberMargin = false,
-			};
+			editor = TextEditorFactory.CreateNewEditor ();
+			editor.IsReadOnly = true;
+			asmMarker = TextMarkerFactory.CreateAsmLineMarker (editor);
+
+			editor.Options = DefaultSourceEditorOptions.PlainEditor;
 			
 			sw.Add (editor);
 			sw.HscrollbarPolicy = Gtk.PolicyType.Automatic;
@@ -89,26 +86,26 @@ namespace MonoDevelop.Debugger
 			
 			sw.Sensitive = false;
 			
-			currentDebugLineMarker = new CurrentDebugLineTextMarker (editor);
+			currentDebugLineMarker = TextMarkerFactory.CreateCurrentDebugLineTextMarker (editor);
 			DebuggingService.StoppedEvent += OnStop;
 		}
-		
 
-		OverlayMessageWindow messageOverlayWindow;
+		HBox messageOverlayContent;
 
 		void ShowLoadSourceFile (StackFrame sf)
 		{
-			if (messageOverlayWindow != null) {
-				messageOverlayWindow.Destroy ();
-				messageOverlayWindow = null;
+			if (messageOverlayContent != null) {
+				editor.RemoveOverlay (messageOverlayContent);
+				messageOverlayContent = null;
 			}
-			messageOverlayWindow = new OverlayMessageWindow ();
+			messageOverlayContent = new HBox ();
 
 			var hbox = new HBox ();
 			hbox.Spacing = 8;
 			var label = new Label (string.Format ("{0} not found. Find source file at alternative location.", Path.GetFileName (sf.SourceLocation.FileName)));
 			hbox.TooltipText = sf.SourceLocation.FileName;
-			var color = (HslColor)editor.ColorStyle.NotificationText.Foreground;
+
+			var color = (HslColor)editor.Options.GetColorStyle ().NotificationText.Foreground;
 			label.ModifyFg (StateType.Normal, color);
 
 			int w, h;
@@ -119,13 +116,10 @@ namespace MonoDevelop.Debugger
 			openButton.WidthRequest = 60;
 			hbox.PackEnd (openButton, false, false, 0); 
 
-			var container = new HBox ();
 			const int containerPadding = 8;
-			container.PackStart (hbox, true, true, containerPadding); 
-			messageOverlayWindow.Child = container; 
-			messageOverlayWindow.ShowOverlay (editor);
+			messageOverlayContent.PackStart (hbox, true, true, containerPadding);
+			editor.AddOverlay (messageOverlayContent,() => openButton.SizeRequest ().Width + w + hbox.Spacing * 5 + containerPadding * 2);
 
-			messageOverlayWindow.SizeFunc = () => openButton.SizeRequest ().Width + w + hbox.Spacing * 5 + containerPadding * 2;
 			openButton.Clicked += delegate {
 				var dlg = new OpenFileDialog (GettextCatalog.GetString ("File to Open"), Gtk.FileChooserAction.Open) {
 					TransientFor = IdeApp.Workbench.RootWindow,
@@ -167,7 +161,7 @@ namespace MonoDevelop.Debugger
 			}
 		}
 		
-		public override void Load (string fileName)
+		public override void Load (FileOpenInformation fileOpenInformation)
 		{
 		}
 
@@ -181,12 +175,12 @@ namespace MonoDevelop.Debugger
 		{
 			autoRefill = false;
 			
-			editor.Document.RemoveMarker (currentDebugLineMarker);
+			editor.RemoveMarker (currentDebugLineMarker);
 			
 			if (DebuggingService.CurrentFrame == null) {
-				if (messageOverlayWindow != null) {
-					messageOverlayWindow.Destroy ();
-					messageOverlayWindow = null;
+				if (messageOverlayContent != null) {
+					editor.RemoveOverlay (messageOverlayContent);
+					messageOverlayContent = null;
 				}
 				sw.Sensitive = false;
 				return;
@@ -197,9 +191,9 @@ namespace MonoDevelop.Debugger
 			if (!string.IsNullOrWhiteSpace (sf.SourceLocation.FileName) && sf.SourceLocation.Line != -1 && sf.SourceLocation.FileHash != null) {
 				ShowLoadSourceFile (sf);
 			} else {
-				if (messageOverlayWindow != null) {
-					messageOverlayWindow.Destroy ();
-					messageOverlayWindow = null;
+				if (messageOverlayContent != null) {
+					editor.RemoveOverlay (messageOverlayContent);
+					messageOverlayContent = null;
 				}
 			}
 			if (!string.IsNullOrEmpty (sf.SourceLocation.FileName) && File.Exists (sf.SourceLocation.FileName))
@@ -223,7 +217,7 @@ namespace MonoDevelop.Debugger
 				}
 				currentFile = sf.SourceLocation.FileName;
 				addressLines.Clear ();
-				editor.Document.Text = string.Empty;
+				editor.Text = string.Empty;
 				StreamReader sr = new StreamReader (sf.SourceLocation.FileName);
 				string line;
 				int sourceLine = 1;
@@ -239,9 +233,9 @@ namespace MonoDevelop.Debugger
 					}
 					sourceLine++;
 				}
-				editor.Document.Text = sb.ToString ();
+				editor.Text = sb.ToString ();
 				foreach (int li in asmLineNums)
-					editor.Document.AddMarker (li, asmMarker);
+					editor.AddMarker (li, asmMarker);
 			}
 			int aline;
 			if (!addressLines.TryGetValue (GetAddrId (sf.Address, sf.AddressSpace), out aline))
@@ -287,8 +281,8 @@ namespace MonoDevelop.Debugger
 			firstLine = -150;
 			lastLine = 150;
 			
-			editor.Document.MimeType = "text/plain";
-			editor.Document.Text = string.Empty;
+			editor.MimeType = "text/plain";
+			editor.Text = string.Empty;
 			InsertLines (0, firstLine, lastLine, out firstLine, out lastLine);
 			
 			autoRefill = true;
@@ -298,19 +292,18 @@ namespace MonoDevelop.Debugger
 		
 		void UpdateCurrentLineMarker (bool moveCaret)
 		{
-			editor.Document.RemoveMarker (currentDebugLineMarker);
+			editor.RemoveMarker (currentDebugLineMarker);
 			StackFrame sf = DebuggingService.CurrentFrame;
 			int line;
 			if (addressLines.TryGetValue (GetAddrId (sf.Address, sf.AddressSpace), out line)) {
-				editor.Document.AddMarker (line, currentDebugLineMarker);
+				editor.AddMarker (line, currentDebugLineMarker);
 				if (moveCaret) {
-					editor.Caret.Line = line;
+					editor.CaretLine = line;
 					GLib.Timeout.Add (100, delegate {
 						editor.CenterToCaret ();
 						return false;
 					});
 				}
-				editor.QueueDraw ();
 			}
 		}
 		
@@ -332,8 +325,9 @@ namespace MonoDevelop.Debugger
 			if (!autoRefill || dragging)
 				return;
 			
-			DocumentLocation loc = editor.PointToLocation (0, 0);
-			DocumentLocation loc2 = editor.PointToLocation (0, editor.Allocation.Height);
+			var loc = editor.PointToLocation (0, 0);
+			Gtk.Widget widget = editor;
+			var loc2 = editor.PointToLocation (0, widget.Allocation.Height);
 			//bool moveCaret = editor.Caret.Line >= loc.Line && editor.Caret.Line <= loc2.Line;
 			
 			if (firstLine != int.MinValue && loc.Line < FillMarginLines) {
@@ -348,17 +342,17 @@ namespace MonoDevelop.Debugger
 				addressLines = newLines;
 				
 				//if (moveCaret)
-					editor.Caret.Line += num;
+					editor.CaretLine += num;
 				
 				double hinc = num * editor.LineHeight;
 				sw.Vadjustment.Value += hinc;
 				
 				UpdateCurrentLineMarker (false);
 			}
-			if (lastLine != int.MinValue && loc2.Line >= editor.Document.LineCount - FillMarginLines) {
-				int num = (loc2.Line - (editor.Document.LineCount - FillMarginLines) + 1) * 2;
+			if (lastLine != int.MinValue && loc2.Line >= editor.LineCount - FillMarginLines) {
+				int num = (loc2.Line - (editor.LineCount - FillMarginLines) + 1) * 2;
 				int newFirst;
-				InsertLines (editor.Document.TextLength, lastLine + 1, lastLine + num, out newFirst, out lastLine);
+				InsertLines (editor.Length, lastLine + 1, lastLine + num, out newFirst, out lastLine);
 			}
 		}
 		
@@ -383,15 +377,14 @@ namespace MonoDevelop.Debugger
 			lines.RemoveRange (j + 1, lines.Count - j - 1);
 			
 			int lineCount = 0;
-			int editorLine = editor.GetTextEditorData ().OffsetToLineNumber (offset);
+			int editorLine = editor.OffsetToLineNumber (offset);
 			foreach (AssemblyLine li in lines) {
 				if (li.IsOutOfRange)
 					continue;
 				InsertAssemblerLine (sb, editorLine++, li);
 				lineCount++;
 			}
-			editor.Insert (offset, sb.ToString ());
-			editor.Document.CommitUpdateAll ();
+			editor.InsertText (offset, sb.ToString ());
 			if (offset == 0)
 				this.cachedLines.InsertRange (0, lines);
 			else
@@ -403,13 +396,13 @@ namespace MonoDevelop.Debugger
 		{
 			addressLines.Clear ();
 			currentFile = null;
-			if (messageOverlayWindow != null) {
-				messageOverlayWindow.Destroy ();
-				messageOverlayWindow = null;
+			if (messageOverlayContent != null) {
+				editor.RemoveOverlay (messageOverlayContent);
+				messageOverlayContent = null;
 			}
 			sw.Sensitive = false;
 			autoRefill = false;
-			editor.Document.Text = string.Empty;
+			editor.Text = string.Empty;
 			cachedLines.Clear ();
 		}
 		
@@ -453,7 +446,7 @@ namespace MonoDevelop.Debugger
 
 		void IClipboardHandler.Copy ()
 		{
-			editor.RunAction (ClipboardActions.Copy);
+			editor.EditorActionHost.ClipboardCopy ();
 		}
 
 		void IClipboardHandler.Paste ()
@@ -468,7 +461,7 @@ namespace MonoDevelop.Debugger
 
 		void IClipboardHandler.SelectAll ()
 		{
-			editor.RunAction (SelectionActions.SelectAll);
+			editor.EditorActionHost.SelectAll ();
 		}
 
 		bool IClipboardHandler.EnableCut {
@@ -476,7 +469,7 @@ namespace MonoDevelop.Debugger
 		}
 
 		bool IClipboardHandler.EnableCopy {
-			get { return !editor.SelectionRange.IsEmpty; }
+			get { return !editor.IsSomethingSelected; }
 		}
 
 		bool IClipboardHandler.EnablePaste {
@@ -493,107 +486,4 @@ namespace MonoDevelop.Debugger
 
 		#endregion
 	}
-	
-	class AsmLineMarker: TextLineMarker
-	{
-		public override ChunkStyle GetStyle (ChunkStyle baseStyle)
-		{
-			ChunkStyle st = new ChunkStyle (baseStyle);
-			st.Foreground = new Cairo.Color (125, 125, 125);
-			return st;
-		}
-	}
-
-	//Copy pasted from SourceEditor
-	class OverlayMessageWindow : Gtk.EventBox
-	{
-		const int border = 8;
-
-		public Func<int> SizeFunc;
-
-		TextEditor textEditor;
-
-		public OverlayMessageWindow ()
-		{
-			AppPaintable = true;
-		}
-
-		public void ShowOverlay (TextEditor textEditor)
-		{
-			this.textEditor = textEditor;
-			this.ShowAll ();
-			textEditor.AddTopLevelWidget (this, 0, 0);
-			textEditor.SizeAllocated += HandleSizeAllocated;
-			var child = (TextEditor.EditorContainerChild)textEditor [this];
-			child.FixedPosition = true;
-		}
-
-		protected override void OnDestroyed ()
-		{
-			base.OnDestroyed ();
-			if (textEditor != null) {
-				textEditor.SizeAllocated -= HandleSizeAllocated;
-				textEditor = null;
-			}
-		}
-
-		protected override void OnSizeRequested (ref Requisition requisition)
-		{
-			base.OnSizeRequested (ref requisition);
-
-			if (wRequest > 0) {
-				requisition.Width = wRequest;
-			}
-		}
-
-		protected override void OnSizeAllocated (Gdk.Rectangle allocation)
-		{
-			base.OnSizeAllocated (allocation);
-			Resize (allocation);
-		}
-
-		int wRequest = -1;
-
-		void HandleSizeAllocated (object o, Gtk.SizeAllocatedArgs args)
-		{
-			if (SizeFunc != null) {
-				var req = Math.Min (SizeFunc (), textEditor.Allocation.Width - border * 2);
-				if (req != wRequest) {
-					wRequest = req;
-					QueueResize ();
-				}
-			} else {
-				if (Allocation.Width > textEditor.Allocation.Width - border * 2) {
-					if (textEditor.Allocation.Width - border * 2 > 0) {
-						QueueResize ();
-					}
-				}
-			}
-			Resize (Allocation);
-		}
-
-		void Resize (Gdk.Rectangle alloc)
-		{
-			textEditor.MoveTopLevelWidget (this, (textEditor.Allocation.Width - alloc.Width) / 2, textEditor.Allocation.Height - alloc.Height - 8);
-		}
-
-		protected override bool OnExposeEvent (Gdk.EventExpose evnt)
-		{
-			using (var cr = CairoHelper.Create (evnt.Window)) {
-				cr.LineWidth = 1;
-				cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
-				cr.SetSourceColor (textEditor.ColorStyle.NotificationText.Background);
-				cr.Fill ();
-				cr.RoundedRectangle (0, 0, Allocation.Width, Allocation.Height, 3);
-				cr.SetSourceColor (textEditor.ColorStyle.NotificationText.Background);
-				cr.FillPreserve ();
-
-				cr.SetSourceColor (textEditor.ColorStyle.NotificationBorder.Color);
-				cr.Stroke ();
-			}
-
-			return base.OnExposeEvent (evnt);
-		}
-
-	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
index 5804f75548..0d9bd5d71d 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
@@ -38,7 +38,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Components;
 using MonoDevelop.Ide.TextEditing;
 using MonoDevelop.Ide.Gui.Content;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor.Extension;
 using MonoDevelop.Ide.Fonts;
 
 namespace MonoDevelop.Debugger
@@ -232,6 +232,7 @@ namespace MonoDevelop.Debugger
 			OnlyShowMyCodeCheckbox = new CheckButton (GettextCatalog.GetString ("_Only show my code."));
 			OnlyShowMyCodeCheckbox.Toggled += OnlyShowMyCodeToggled;
 			OnlyShowMyCodeCheckbox.Show ();
+			OnlyShowMyCodeCheckbox.Active = DebuggingService.GetUserOptions ().ProjectAssembliesOnly;
 
 			var alignment = new Alignment (0.0f, 0.5f, 0.0f, 0.0f) { Child = OnlyShowMyCodeCheckbox };
 			alignment.Show ();
@@ -782,17 +783,17 @@ namespace MonoDevelop.Debugger
 
 	class ExceptionCaughtTextEditorExtension: TextEditorExtension
 	{
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			if (key == Gdk.Key.Escape && DebuggingService.ExceptionCaughtMessage != null &&
+			if (descriptor.SpecialKey == SpecialKey.Escape && DebuggingService.ExceptionCaughtMessage != null &&
 			    !DebuggingService.ExceptionCaughtMessage.IsMinimized &&
-			    DebuggingService.ExceptionCaughtMessage.File.CanonicalPath == Document.FileName.CanonicalPath) {
+				DebuggingService.ExceptionCaughtMessage.File.CanonicalPath == new FilePath(DocumentContext.Name).CanonicalPath) {
 
 				DebuggingService.ExceptionCaughtMessage.ShowMiniButton ();
 				return true;
 			}
 
-			return base.KeyPress (key, keyChar, modifier);
+			return base.KeyPress (descriptor);
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExpressionEvaluatorDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExpressionEvaluatorDialog.cs
index a8371ccab2..b8942c4c32 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExpressionEvaluatorDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExpressionEvaluatorDialog.cs
@@ -28,6 +28,7 @@
 using System;
 using MonoDevelop.Ide.CodeCompletion;
 using Gtk;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Debugger
 {
@@ -111,7 +112,7 @@ namespace MonoDevelop.Debugger
 
 			string text = ctx == null ? entry.Text : entry.Text.Substring (Math.Max (0, Math.Min (ctx.TriggerOffset, entry.Text.Length)));
 			CompletionWindowManager.UpdateWordSelection (text);
-			CompletionWindowManager.PostProcessKeyEvent (key, keyChar, modifier);
+			CompletionWindowManager.PostProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier));
 			PopupCompletion ((Entry) sender);
 		}
 
@@ -130,7 +131,7 @@ namespace MonoDevelop.Debugger
 			}
 
 			if (currentCompletionData != null)
-				args.RetVal = keyHandled = CompletionWindowManager.PreProcessKeyEvent (key, keyChar, modifier);
+				args.RetVal = keyHandled = CompletionWindowManager.PreProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier));
 		}
 
 		void OnEditFocusOut (object sender, FocusOutEventArgs args)
@@ -185,6 +186,9 @@ namespace MonoDevelop.Debugger
 			get {
 				return entry.Position;
 			}
+			set {
+				entry.Position = value;
+			}
 		}
 		
 		char ICompletionWidget.GetChar (int offset)
@@ -257,6 +261,17 @@ namespace MonoDevelop.Debugger
 				return entry.Style;
 			}
 		}
+
+		void ICompletionWidget.AddSkipChar (int cursorPosition, char c)
+		{
+			// ignore
+		}
+
+		double ICompletionWidget.ZoomLevel {
+			get {
+				return 1;
+			}
+		}
 		#endregion 
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerExpressionResolver.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerExpressionResolver.cs
index 5844aa54ae..a2009111f0 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerExpressionResolver.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerExpressionResolver.cs
@@ -26,13 +26,33 @@
 
 using System;
 
-using Mono.TextEditor;
 using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+using System.Threading;
 
 namespace MonoDevelop.Debugger
 {
+	public struct DebugDataTipInfo
+	{
+		public readonly TextSpan Span;
+		public readonly string Text;
+
+		public DebugDataTipInfo (TextSpan span, string text)
+		{
+			this.Span = span;
+			this.Text = text;
+		}
+
+		public bool IsDefault
+		{
+			get { return Span.Length == 0 && Span.Start == 0 && Text == null; }
+		}
+	}
+
 	public interface IDebuggerExpressionResolver
 	{
-		string ResolveExpression (TextEditorData editor, Document doc, int offset, out int startOffset);
+		Task<DebugDataTipInfo> ResolveExpressionAsync (IReadonlyTextDocument editor, DocumentContext doc, int offset, CancellationToken cancellationToken);
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
index 089d5c20c9..875021a41b 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
@@ -39,10 +39,9 @@ using MonoDevelop.Ide;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Commands;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor.Extension;
 using System.Linq;
 
-
 namespace MonoDevelop.Debugger
 {
 	[System.ComponentModel.ToolboxItem (true)]
@@ -1107,8 +1106,8 @@ namespace MonoDevelop.Debugger
 				if (oldValue != null && strval != oldValue)
 					nameColor = valueColor = modifiedColor;
 			}
-			
-			strval = strval.Replace (Environment.NewLine, " ");
+
+			strval = strval.Replace ("\r\n", " ").Replace ("\n", " ");
 
 			bool hasChildren = val.HasChildren;
 			string icon = GetIcon (val.Flags);
@@ -1428,7 +1427,7 @@ namespace MonoDevelop.Debugger
 			if (!wasHandled) {
 				string text = ctx == null ? editEntry.Text : editEntry.Text.Substring (Math.Max (0, Math.Min (ctx.TriggerOffset, editEntry.Text.Length)));
 				CompletionWindowManager.UpdateWordSelection (text);
-				CompletionWindowManager.PostProcessKeyEvent (key, keyChar, modifierState);
+				CompletionWindowManager.PostProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifierState));
 				PopupCompletion ((Entry) sender);
 			}
 		}
@@ -1450,7 +1449,7 @@ namespace MonoDevelop.Debugger
 			keyValue = args.Event.KeyValue;
 
 			if (currentCompletionData != null) {
-				wasHandled  = CompletionWindowManager.PreProcessKeyEvent (key, keyChar, modifierState);
+				wasHandled  = CompletionWindowManager.PreProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifierState));
 				args.RetVal = wasHandled;
 			}
 		}
@@ -2112,7 +2111,13 @@ namespace MonoDevelop.Debugger
 				return ((ICompletionWidget)this).CreateCodeCompletionContext (editEntry.Position);
 			}
 		}
-		
+
+		public double ZoomLevel {
+			get {
+				return 1;
+			}
+		}
+
 		public event EventHandler CompletionContextChanged;
 
 		protected virtual void OnCompletionContextChanged (EventArgs e)
@@ -2147,6 +2152,9 @@ namespace MonoDevelop.Debugger
 			get {
 				return editEntry.Position;
 			}
+			set {
+				editEntry.Position = value;
+			}
 		}
 		
 		char ICompletionWidget.GetChar (int offset)
@@ -2217,6 +2225,11 @@ namespace MonoDevelop.Debugger
 				return editEntry.Style;
 			}
 		}
+
+		void ICompletionWidget.AddSkipChar (int cursorPosition, char c)
+		{
+			// ignore
+		}
 		#endregion 
 
 		ObjectValue[] GetValues (string[] names)
@@ -2266,8 +2279,9 @@ namespace MonoDevelop.Debugger
 		}
 	}
 	
-	class DebugCompletionDataList: List<ICSharpCode.NRefactory.Completion.ICompletionData>, ICompletionDataList
+	class DebugCompletionDataList: List<MonoDevelop.Ide.CodeCompletion.CompletionData>, ICompletionDataList
 	{
+		public int TriggerWordLength { get; set; }
 		public bool IsSorted { get; set; }
 		public DebugCompletionDataList (Mono.Debugging.Client.CompletionData data)
 		{
@@ -2317,7 +2331,7 @@ namespace MonoDevelop.Debugger
 		public event EventHandler CompletionListClosed;
 	}
 	
-	class DebugCompletionData : MonoDevelop.Ide.CodeCompletion.CompletionData
+	class DebugCompletionData : MonoDevelop.Ide.CodeCompletion.CompletionData, ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData
 	{
 		readonly CompletionItem item;
 		
@@ -2343,5 +2357,42 @@ namespace MonoDevelop.Debugger
 				return item.Name;
 			}
 		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler keyHandler;
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionKeyHandler ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData.KeyHandler {
+			get {
+				return keyHandler;
+			}
+		}
+
+		void ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData.AddOverload (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData data)
+		{
+			base.AddOverload ((MonoDevelop.Ide.CodeCompletion.CompletionData)data);
+		}
+
+		IEnumerable<ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData> ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData.OverloadedData {
+			get {
+				return OverloadedData.OfType<ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData> ();
+			}
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.ICompletionCategory ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData.CompletionCategory { 
+			get {
+				return (ICSharpCode.NRefactory6.CSharp.Completion.ICompletionCategory)base.CompletionCategory;
+			} 
+			set {
+				base.CompletionCategory = (CompletionCategory)value;
+			} 
+		}
+
+		ICSharpCode.NRefactory6.CSharp.Completion.DisplayFlags ICSharpCode.NRefactory6.CSharp.Completion.ICompletionData.DisplayFlags { 
+			get {
+				return (ICSharpCode.NRefactory6.CSharp.Completion.DisplayFlags)base.DisplayFlags;
+			}
+			set {
+				base.DisplayFlags = (DisplayFlags)value;
+			}
+		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TextEntryWithCodeCompletion.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TextEntryWithCodeCompletion.cs
index 8d78436425..b581c8a87f 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TextEntryWithCodeCompletion.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TextEntryWithCodeCompletion.cs
@@ -27,6 +27,7 @@ using System;
 using Xwt;
 using MonoDevelop.Ide.CodeCompletion;
 using System.Collections.Generic;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Debugger
 {
@@ -73,7 +74,7 @@ namespace MonoDevelop.Debugger
 			}
 
 			if (list != null)
-				args.RetVal = keyHandled = CompletionWindowManager.PreProcessKeyEvent (key, keyChar, modifier);
+				args.RetVal = keyHandled = CompletionWindowManager.PreProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier));
 		}
 
 		void HandleKeyReleaseEvent (object o, Gtk.KeyReleaseEventArgs args)
@@ -83,7 +84,7 @@ namespace MonoDevelop.Debugger
 
 			string text = ctx == null ? Text : Text.Substring (Math.Max (0, Math.Min (ctx.TriggerOffset, Text.Length)));
 			CompletionWindowManager.UpdateWordSelection (text);
-			CompletionWindowManager.PostProcessKeyEvent (key, keyChar, modifier);
+			CompletionWindowManager.PostProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier));
 			PopupCompletion ();
 		}
 
@@ -116,19 +117,19 @@ namespace MonoDevelop.Debugger
 		{
 			#region ICompletionKeyHandler implementation
 
-			public bool PreProcessKey (CompletionListWindow listWindow, Gdk.Key key, char keyChar, Gdk.ModifierType modifier, out KeyActions keyAction)
+			public bool PreProcessKey (CompletionListWindow listWindow, KeyDescriptor descriptor, out KeyActions keyAction)
 			{
 				keyAction = KeyActions.None;
-				if (keyChar == '.') {
+				if (descriptor.KeyChar == '.') {
 					return true;
 				}
 				return false;
 			}
 
-			public bool PostProcessKey (CompletionListWindow listWindow, Gdk.Key key, char keyChar, Gdk.ModifierType modifier, out KeyActions keyAction)
+			public bool PostProcessKey (CompletionListWindow listWindow, KeyDescriptor descriptor, out KeyActions keyAction)
 			{
 				keyAction = KeyActions.None;
-				if (keyChar == '.') {
+				if (descriptor.KeyChar == '.') {
 					return true;
 				}
 				return false;
@@ -150,6 +151,11 @@ namespace MonoDevelop.Debugger
 			return Text.Substring (startOffset, endOffset - startOffset);
 		}
 
+		public void AddSkipChar (int cursorPosition, char c)
+		{
+			// ignore
+		}
+
 		public char GetChar (int offset)
 		{
 			if (offset >= Text.Length)
@@ -214,6 +220,9 @@ namespace MonoDevelop.Debugger
 			get {
 				return gtkEntry.Position;
 			}
+			set {
+				gtkEntry.Position = value;
+			}
 		}
 
 		public int TextLength {
@@ -234,6 +243,11 @@ namespace MonoDevelop.Debugger
 			}
 		}
 
+		double ICompletionWidget.ZoomLevel {
+			get {
+				return 1;
+			}
+		}
 		#endregion
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/packages.config b/main/src/addins/MonoDevelop.Debugger/packages.config
new file mode 100644
index 0000000000..b2c4c974c7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/packages.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs
index f4e140d29e..356dcaf632 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs
@@ -28,6 +28,7 @@
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.DesignerSupport.Projects
 {
@@ -42,9 +43,9 @@ namespace MonoDevelop.DesignerSupport.Projects
 		{
 			// Return the ProjectFile object of the file being edited
 			
-			if (Document.HasProject) {
-				string file = Document.FileName;
-				return Document.Project.Files.GetFile (file);
+			if (DocumentContext.HasProject) {
+				string file = DocumentContext.Name;
+				return DocumentContext.Project.Files.GetFile (file);
 			}
 			else
 				return null;
@@ -61,8 +62,8 @@ namespace MonoDevelop.DesignerSupport.Projects
 
 		public void OnChanged (object obj)
 		{
-			if (Document.HasProject)
-				IdeApp.ProjectOperations.SaveAsync (Document.Project);
+			if (DocumentContext.HasProject)
+				IdeApp.ProjectOperations.SaveAsync (DocumentContext.Project);
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs
index bb48770836..5f2514e67b 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs
@@ -29,6 +29,8 @@
 using System;
 using MonoDevelop.Ide.CodeTemplates;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.DesignerSupport.Toolbox
 {
@@ -40,11 +42,9 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 
 		public System.Collections.Generic.IEnumerable<ItemToolboxNode> GetDynamicItems (IToolboxConsumer consumer)
 		{
-			
-			MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor editor 
-				= consumer as MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor;
+			var editor = consumer as IReadonlyTextDocument;
 			if (editor != null) {
-				foreach (CodeTemplate ct in CodeTemplateService.GetCodeTemplatesForFile (editor.Name)) {
+				foreach (CodeTemplate ct in CodeTemplateService.GetCodeTemplatesForFile (editor.FileName)) {
 					if (ct.CodeTemplateContext != CodeTemplateContext.Standard)
 						continue;
 					yield return new TemplateToolboxNode (ct) {
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs
index 49db886ca0..b7ab61e131 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs
@@ -38,7 +38,6 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Components.Docking;
 using MonoDevelop.Ide;
-using Mono.TextEditor;
 using MonoDevelop.Components;
 
 namespace MonoDevelop.DesignerSupport.Toolbox
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
index 65a771c0ef..19c9b6819e 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
@@ -32,7 +32,6 @@ using System.Collections.ObjectModel;
 using Gtk;
 using Pango;
 using Gdk;
-using Mono.TextEditor;
 using MonoDevelop.Ide;
 using MonoDevelop.Components;
 
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
index 47bd4434ec..da0c3b2c3f 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
@@ -115,7 +115,6 @@
 
 	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
 		<Class class = "MonoDevelop.DesignerSupport.Projects.PropertyPadTextEditorExtension" />
-		<Class class = "MonoDevelop.DesignerSupport.ClassOutlineTextEditorExtension" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/DesignerSupport/ToolboxProviders">
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
index 39b8165b52..178a232392 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
@@ -63,6 +63,22 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -75,26 +91,11 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -105,6 +106,11 @@
       <Name>Xwt</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\ItemToolboxNode.cs" />
@@ -143,7 +149,6 @@
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\CodeTemplateToolboxProvider.cs" />
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\CecilToolboxItemLoader.cs" />
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\CecilTypeResolver.cs" />
-    <Compile Include="MonoDevelop.DesignerSupport\ClassOutlineTextEditorExtension.cs" />
     <Compile Include="MonoDevelop.DesignerSupport\CodeBehind.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\TemplateToolboxNode.cs" />
@@ -159,10 +164,6 @@
     <Compile Include="MonoDevelop.DesignerSupport\IPropertyPadProvider.cs" />
     <Compile Include="MonoDevelop.DesignerSupport\CodeBehindWriter.cs" />
     <Compile Include="MonoDevelop.DesignerSupport\SwitchBetweenRelatedFilesCommand.cs" />
-    <Compile Include="MonoDevelop.DesignerSupport\ClassOutlineNodeComparer.cs" />
-    <Compile Include="MonoDevelop.DesignerSupport\ClassOutlineSortingPreferencesDialog.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog.cs" />
-    <Compile Include="MonoDevelop.DesignerSupport\ClassOutlineSettings.cs" />
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\IToolboxCustomizer.cs" />
     <Compile Include="AddinInfo.cs" />
     <Compile Include="MonoDevelop.DesignerSupport.Projects\ImplicitFrameworkAssemblyReferenceDescriptor.cs" />
@@ -201,6 +202,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs
index 86d068d441..48b58c7fb4 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs
@@ -29,19 +29,19 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+// TODO: Roslyn port. (Maybe move to the ASP.NET binding).
 using System;
 using System.CodeDom;
 using System.Reflection;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis;
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using System.Linq;
-using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.DesignerSupport
 {
@@ -51,165 +51,165 @@ namespace MonoDevelop.DesignerSupport
 	{
 		//TODO: currently case-sensitive, so some languages may not like this
 		const bool ignoreCase = false;
-		
-		public static IUnresolvedMember GetCompatibleMemberInClass (ICompilation ctx, ITypeDefinition cls, CodeTypeMember member)
-		{
-			// TODO Type system conversion
-//			//check for identical property names
-//			foreach (var prop in cls.Properties) {
-//				if (string.Compare (prop.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
-//					string rt = prop.ReturnType.ReflectionName;
-//					EnsureClassExists (ctx, rt, GetValidRegion (prop));
-//					CodeMemberProperty memProp = member as CodeMemberProperty;
-//					if (memProp == null || !IsTypeCompatible (ctx, rt, memProp.Type.BaseType))
-//						throw new MemberExistsException (cls.FullName, MemberType.Property, member, GetValidRegion (prop), cls.Region.FileName);
-//					return prop;
-//				}
-//			}
-//				
-//			//check for identical method names
-//			foreach (var meth in cls.Methods) {
-//				if (string.Compare (meth.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
-//					string rt = meth.ReturnType.ReflectionName;
-//					EnsureClassExists (ctx, rt, GetValidRegion (meth));
-//					CodeMemberMethod memMeth = member as CodeMemberMethod;
-//					if (memMeth == null || !IsTypeCompatible (ctx, rt, memMeth.ReturnType.BaseType))
-//						throw new MemberExistsException (cls.FullName, MemberType.Method, member, GetValidRegion (meth), cls.Region.FileName);
-//					return meth;
-//				}
-//			}
+
+//		public static IUnresolvedMember GetCompatibleMemberInClass (ICompilation ctx, ITypeDefinition cls, CodeTypeMember member)
+//		{
+//			// TODO Type system conversion
+////			//check for identical property names
+////			foreach (var prop in cls.Properties) {
+////				if (string.Compare (prop.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
+////					string rt = prop.ReturnType.ReflectionName;
+////					EnsureClassExists (ctx, rt, GetValidRegion (prop));
+////					CodeMemberProperty memProp = member as CodeMemberProperty;
+////					if (memProp == null || !IsTypeCompatible (ctx, rt, memProp.Type.BaseType))
+////						throw new MemberExistsException (cls.FullName, MemberType.Property, member, GetValidRegion (prop), cls.Region.FileName);
+////					return prop;
+////				}
+////			}
+////				
+////			//check for identical method names
+////			foreach (var meth in cls.Methods) {
+////				if (string.Compare (meth.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
+////					string rt = meth.ReturnType.ReflectionName;
+////					EnsureClassExists (ctx, rt, GetValidRegion (meth));
+////					CodeMemberMethod memMeth = member as CodeMemberMethod;
+////					if (memMeth == null || !IsTypeCompatible (ctx, rt, memMeth.ReturnType.BaseType))
+////						throw new MemberExistsException (cls.FullName, MemberType.Method, member, GetValidRegion (meth), cls.Region.FileName);
+////					return meth;
+////				}
+////			}
+////			
+////			//check for identical event names
+////			foreach (var ev in cls.Events) {
+////				if (string.Compare (ev.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
+////					string rt = ev.ReturnType.ReflectionName;
+////					EnsureClassExists (ctx, rt, GetValidRegion (ev));
+////					CodeMemberEvent memEv = member as CodeMemberEvent;
+////					if (memEv == null || !IsTypeCompatible (ctx, rt, memEv.Type.BaseType))
+////						throw new MemberExistsException (cls.FullName, MemberType.Event, member, GetValidRegion (ev), cls.Region.FileName);
+////					return ev;
+////				}
+////			}
+////				
+////			//check for identical field names
+////			foreach (var field in cls.Fields) {
+////				if (string.Compare (field.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
+////					string rt = field.ReturnType.ReflectionName;
+////					EnsureClassExists (ctx, rt, GetValidRegion (field));
+////					CodeMemberField memField = member as CodeMemberField;
+////					if (memField == null || !IsTypeCompatible (ctx, rt, memField.Type.BaseType))
+////						throw new MemberExistsException (cls.FullName, MemberType.Field, member, GetValidRegion (field), cls.Region.FileName);
+////					return field;
+////				}
+////			}
+////			
+////			//walk down into base classes, if any
+////			foreach (var baseType in cls.GetAllBaseTypeDefinitions ()) {
+////				IMember mem = GetCompatibleMemberInClass (ctx, baseType, member);
+////				if (mem != null)
+////					return mem;
+////			}
 //			
-//			//check for identical event names
-//			foreach (var ev in cls.Events) {
-//				if (string.Compare (ev.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
-//					string rt = ev.ReturnType.ReflectionName;
-//					EnsureClassExists (ctx, rt, GetValidRegion (ev));
-//					CodeMemberEvent memEv = member as CodeMemberEvent;
-//					if (memEv == null || !IsTypeCompatible (ctx, rt, memEv.Type.BaseType))
-//						throw new MemberExistsException (cls.FullName, MemberType.Event, member, GetValidRegion (ev), cls.Region.FileName);
-//					return ev;
-//				}
-//			}
-//				
-//			//check for identical field names
-//			foreach (var field in cls.Fields) {
-//				if (string.Compare (field.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
-//					string rt = field.ReturnType.ReflectionName;
-//					EnsureClassExists (ctx, rt, GetValidRegion (field));
-//					CodeMemberField memField = member as CodeMemberField;
-//					if (memField == null || !IsTypeCompatible (ctx, rt, memField.Type.BaseType))
-//						throw new MemberExistsException (cls.FullName, MemberType.Field, member, GetValidRegion (field), cls.Region.FileName);
-//					return field;
-//				}
+//			//return null if no match
+//			return null;
+//		}
+//		
+//		static DomRegion GetValidRegion (IMember member)
+//		{
+//			if (member.BodyRegion.IsEmpty || member.DeclaringTypeDefinition.Region.FileName == FilePath.Null)
+//				return member.DeclaringTypeDefinition.Region;
+//			return member.BodyRegion;
+//		}
+//		
+//		static DomRegion GetValidRegion (IUnresolvedMember member)
+//		{
+//			if (member.BodyRegion.IsEmpty || member.DeclaringTypeDefinition.Region.FileName == FilePath.Null)
+//				return member.DeclaringTypeDefinition.Region;
+//			return member.BodyRegion;
+//		}
+//		
+//		static IType EnsureClassExists (ICompilation ctx, string className, DomRegion location)
+//		{
+//			string ns;
+//			string name;
+//			int idx = className.LastIndexOf (".");
+//			if (idx < 0) {
+//				ns = "";
+//				name = className;
+//			} else {
+//				ns = className.Substring (0, idx);
+//				name = className.Substring (idx + 1);
 //			}
-//			
-//			//walk down into base classes, if any
+//			var cls = ctx.MainAssembly.GetTypeDefinition (ns, name, 0);
+//			if (cls == null)
+//				throw new TypeNotFoundException (className, location, null);
+//			return cls;
+//		}
+//		
+//		static bool IsTypeCompatible (ICompilation ctx, string existingType, string checkType)
+//		{
+//			if (existingType == checkType)
+//				return true;
+//			IType cls = EnsureClassExists (ctx, checkType, DomRegion.Empty);
 //			foreach (var baseType in cls.GetAllBaseTypeDefinitions ()) {
-//				IMember mem = GetCompatibleMemberInClass (ctx, baseType, member);
-//				if (mem != null)
-//					return mem;
+//				if (IsTypeCompatible (ctx, existingType, baseType.FullName))
+//				    return true;
 //			}
-			
-			//return null if no match
-			return null;
-		}
-		
-		static DomRegion GetValidRegion (IMember member)
-		{
-			if (member.BodyRegion.IsEmpty || member.DeclaringTypeDefinition.Region.FileName == FilePath.Null)
-				return member.DeclaringTypeDefinition.Region;
-			return member.BodyRegion;
-		}
-		
-		static DomRegion GetValidRegion (IUnresolvedMember member)
-		{
-			if (member.BodyRegion.IsEmpty || member.DeclaringTypeDefinition.Region.FileName == FilePath.Null)
-				return member.DeclaringTypeDefinition.Region;
-			return member.BodyRegion;
-		}
-		
-		static IType EnsureClassExists (ICompilation ctx, string className, DomRegion location)
-		{
-			string ns;
-			string name;
-			int idx = className.LastIndexOf (".");
-			if (idx < 0) {
-				ns = "";
-				name = className;
-			} else {
-				ns = className.Substring (0, idx);
-				name = className.Substring (idx + 1);
-			}
-			var cls = ctx.MainAssembly.GetTypeDefinition (ns, name, 0);
-			if (cls == null)
-				throw new TypeNotFoundException (className, location, null);
-			return cls;
-		}
-		
-		static bool IsTypeCompatible (ICompilation ctx, string existingType, string checkType)
-		{
-			if (existingType == checkType)
-				return true;
-			IType cls = EnsureClassExists (ctx, checkType, DomRegion.Empty);
-			foreach (var baseType in cls.GetAllBaseTypeDefinitions ()) {
-				if (IsTypeCompatible (ctx, existingType, baseType.FullName))
-				    return true;
-			}
-			return false;
-		}
-		
-		public static INamedElement AddMemberToClass (Project project, ITypeDefinition cls, IUnresolvedTypeDefinition specificPartToAffect, CodeTypeMember member, bool throwIfExists)
-		{
-			bool isChildClass = false;
-			foreach (var c in cls.Parts)
-				if (c == specificPartToAffect)
-					isChildClass = true;
-			if (!isChildClass)
-				throw new ArgumentException ("Class specificPartToAffect is not a part of class cls");
-			
-			var dom = TypeSystemService.GetCompilation (project);
-			var existingMember = GetCompatibleMemberInClass (dom, cls, member);
-			
-			if (existingMember == null)
-				return CodeGenerationService.AddCodeDomMember (project, specificPartToAffect, member);
-			
-			
-			if (throwIfExists)
-				throw new MemberExistsException (cls.Name, member, MemberType.Method, existingMember.BodyRegion, cls.Region.FileName);
-			
-			return existingMember;
-		}
-		
-//		public static CodeRefactorer GetCodeGenerator (Project project)
-//		{			
-//			CodeRefactorer cr = new CodeRefactorer (project.ParentSolution);
-//			cr.TextFileProvider = MonoDevelop.Ide.TextFileProvider.Instance;
-//			return cr;
+//			return false;
+//		}
+//		
+//		public static void AddMemberToClass (Project project, INamedTypeSymbol cls, Location specificPartToAffect, CodeTypeMember member, bool throwIfExists)
+//		{
+//			bool isChildClass = false;
+//			foreach (var c in cls.Locations)
+//				if (c == specificPartToAffect)
+//					isChildClass = true;
+//			if (!isChildClass)
+//				throw new ArgumentException ("Class specificPartToAffect is not a part of class cls");
+//			
+//			var dom = TypeSystemService.GetCompilation (project);
+//			var existingMember = GetCompatibleMemberInClass (dom, cls, member);
+//			
+//			if (existingMember == null)
+//				return CodeGenerationService.AddCodeDomMember (project, specificPartToAffect, member);
+//			
+//			
+//			if (throwIfExists)
+//				throw new MemberExistsException (cls.Name, member, MemberType.Method, existingMember.BodyRegion, cls.Region.FileName);
+//			
+//			return existingMember;
 //		}
+//		
+////		public static CodeRefactorer GetCodeGenerator (Project project)
+////		{			
+////			CodeRefactorer cr = new CodeRefactorer (project.ParentSolution);
+////			cr.TextFileProvider = MonoDevelop.Ide.TextFileProvider.Instance;
+////			return cr;
+////		}
 		
-		public static IEnumerable<IMethod> GetCompatibleMethodsInClass (IType cls, IEvent eve)
+		public static IEnumerable<IMethodSymbol> GetCompatibleMethodsInClass (ITypeSymbol cls, IEventSymbol eve)
 		{
-			IMethod eveMeth = GetMethodSignature (eve);
+			IMethodSymbol eveMeth = GetMethodSignature (eve);
 			if (eveMeth == null)
-				return new IMethod[0];
+				return new IMethodSymbol[0];
 			return GetCompatibleMethodsInClass (cls, eveMeth);
 		}
 		
 		//TODO: check accessibility
-		public static IEnumerable<IMethod> GetCompatibleMethodsInClass (IType cls, IMethod matchMeth)
+		public static IEnumerable<IMethodSymbol> GetCompatibleMethodsInClass (ITypeSymbol cls, IMethodSymbol matchMeth)
 		{
-			IType[] pars = new IType[matchMeth.Parameters.Count];
-			List<IType>[] baseTypes = new List<IType>[matchMeth.Parameters.Count];
-			for (int i = 0; i < matchMeth.Parameters.Count; i++) {
+			ITypeSymbol[] pars = new ITypeSymbol[matchMeth.Parameters.Length];
+			List<ITypeSymbol>[] baseTypes = new List<ITypeSymbol>[matchMeth.Parameters.Length];
+			for (int i = 0; i < matchMeth.Parameters.Length; i++) {
 				pars[i] = matchMeth.Parameters[i].Type;
-				baseTypes[i] = new List<IType> (pars[i].GetAllBaseTypes ());
+				baseTypes[i] = new List<ITypeSymbol> (pars[i].GetBaseTypes ());
 			}
-			
+
 			var matchMethType = matchMeth.ReturnType;
 			
-			foreach (IMethod method in cls.GetMethods ()) {
-				if (method.IsPrivate || method.Parameters.Count != pars.Length || !method.ReturnType.Equals (matchMethType) 
-				    || method.IsInternal)
+			foreach (IMethodSymbol method in cls.GetAccessibleMembersInThisAndBaseTypes<IMethodSymbol> (cls)) {
+				if (method.DeclaredAccessibility == Accessibility.Private || method.Parameters.Length != pars.Length || !method.ReturnType.Equals (matchMethType) 
+					|| method.DeclaredAccessibility == Accessibility.Internal)
 					continue;
 				
 				bool allCompatible = true;
@@ -229,12 +229,12 @@ namespace MonoDevelop.DesignerSupport
 			}
 		}
 		
-		public static bool IdentifierExistsInClass (IType cls, string identifier)
+		public static bool IdentifierExistsInClass (ITypeSymbol cls, string identifier)
 		{
 			return cls.GetMembers ().Any (m => m.Name == identifier);
 		}
 		
-		public static string GenerateIdentifierUniqueInClass (IType cls, string trialIdentifier)
+		public static string GenerateIdentifierUniqueInClass (ITypeSymbol cls, string trialIdentifier)
 		{
 			string trialValue = trialIdentifier;
 			
@@ -249,156 +249,156 @@ namespace MonoDevelop.DesignerSupport
 			throw new Exception ("Tried identifiers up to " + trialValue + " and all already existed");
 		}
 		
-		static DomRegion GetRegion (INamedElement el)
-		{
-			if (el is IEntity)
-				return ((IEntity)el).BodyRegion;
-			return ((IUnresolvedEntity)el).BodyRegion;
-		}
-		//opens the code view with the desired method, creating it if it doesn't already exist
-		public static void CreateAndShowMember (Project project, ITypeDefinition cls, IUnresolvedTypeDefinition specificPartToAffect, CodeTypeMember member)
-		{
-			//only adds the method if it doesn't already exist
-			var mem = AddMemberToClass (project, cls, specificPartToAffect, member, false);
-			
-			//some tests in case code refactorer returns bad values
-			int beginline = specificPartToAffect.BodyRegion.BeginLine;
-			var region = GetRegion (mem);
-			if (!region.IsEmpty && region.BeginLine >= beginline && region.BeginLine <= specificPartToAffect.BodyRegion.EndLine)
-				beginline = region.BeginLine;
-			
-			//jump to the member or class
-			IdeApp.Workbench.OpenDocument (specificPartToAffect.Region.FileName, beginline, 1);
-		}
-		
-		public static System.CodeDom.CodeTypeMember ReflectionToCodeDomMember (MemberInfo memberInfo)
-		{
-			if (memberInfo is MethodInfo)
-				return ReflectionToCodeDomMethod ((MethodInfo) memberInfo);
-			
-			throw new NotImplementedException ();
-		}
-		
-		public static System.CodeDom.CodeMemberMethod ReflectionToCodeDomMethod (MethodInfo mi)
-		{
-			CodeMemberMethod newMethod = new CodeMemberMethod ();
-			newMethod.Name = mi.Name;
-			newMethod.ReturnType = new System.CodeDom.CodeTypeReference (mi.ReturnType.FullName);
-			
-			newMethod.Attributes = System.CodeDom.MemberAttributes.Private;
-			switch (mi.Attributes) {
-				case System.Reflection.MethodAttributes.Assembly:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.Assembly;
-					break;
-				case System.Reflection.MethodAttributes.FamANDAssem:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.FamilyAndAssembly;
-					break;
-				case System.Reflection.MethodAttributes.Family:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.Family;
-					break;
-				case System.Reflection.MethodAttributes.FamORAssem:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.FamilyAndAssembly;
-					break;
-				case System.Reflection.MethodAttributes.Public:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.Public;
-					break;
-				case System.Reflection.MethodAttributes.Static:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.Static;
-					break;
-			}
-			
-			ParameterInfo[] pinfos = mi.GetParameters ();
-			foreach (ParameterInfo pi in pinfos) {
-				CodeParameterDeclarationExpression newPar = new CodeParameterDeclarationExpression (pi.ParameterType.FullName, pi.Name);
-				if (pi.IsIn) newPar.Direction = FieldDirection.In;
-				else if (pi.IsOut) newPar.Direction = FieldDirection.Out;
-				newMethod.Parameters.Add (newPar);
-			}
-			
-			return newMethod;
-		}
+//		static DomRegion GetRegion (INamedElement el)
+//		{
+//			if (el is IEntity)
+//				return ((IEntity)el).BodyRegion;
+//			return ((IUnresolvedEntity)el).BodyRegion;
+//		}
+//		//opens the code view with the desired method, creating it if it doesn't already exist
+//		public static void CreateAndShowMember (Project project, ITypeDefinition cls, IUnresolvedTypeDefinition specificPartToAffect, CodeTypeMember member)
+//		{
+//			//only adds the method if it doesn't already exist
+//			var mem = AddMemberToClass (project, cls, specificPartToAffect, member, false);
+//			
+//			//some tests in case code refactorer returns bad values
+//			int beginline = specificPartToAffect.BodyRegion.BeginLine;
+//			var region = GetRegion (mem);
+//			if (!region.IsEmpty && region.BeginLine >= beginline && region.BeginLine <= specificPartToAffect.BodyRegion.EndLine)
+//				beginline = region.BeginLine;
+//			
+//			//jump to the member or class
+//			IdeApp.Workbench.OpenDocument (specificPartToAffect.Region.FileName, beginline, 1);
+//		}
+//		
+//		public static System.CodeDom.CodeTypeMember ReflectionToCodeDomMember (MemberInfo memberInfo)
+//		{
+//			if (memberInfo is MethodInfo)
+//				return ReflectionToCodeDomMethod ((MethodInfo) memberInfo);
+//			
+//			throw new NotImplementedException ();
+//		}
+//		
+//		public static System.CodeDom.CodeMemberMethod ReflectionToCodeDomMethod (MethodInfo mi)
+//		{
+//			CodeMemberMethod newMethod = new CodeMemberMethod ();
+//			newMethod.Name = mi.Name;
+//			newMethod.ReturnType = new System.CodeDom.CodeTypeReference (mi.ReturnType.FullName);
+//			
+//			newMethod.Attributes = System.CodeDom.MemberAttributes.Private;
+//			switch (mi.Attributes) {
+//				case System.Reflection.MethodAttributes.Assembly:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.Assembly;
+//					break;
+//				case System.Reflection.MethodAttributes.FamANDAssem:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.FamilyAndAssembly;
+//					break;
+//				case System.Reflection.MethodAttributes.Family:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.Family;
+//					break;
+//				case System.Reflection.MethodAttributes.FamORAssem:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.FamilyAndAssembly;
+//					break;
+//				case System.Reflection.MethodAttributes.Public:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.Public;
+//					break;
+//				case System.Reflection.MethodAttributes.Static:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.Static;
+//					break;
+//			}
+//			
+//			ParameterInfo[] pinfos = mi.GetParameters ();
+//			foreach (ParameterInfo pi in pinfos) {
+//				CodeParameterDeclarationExpression newPar = new CodeParameterDeclarationExpression (pi.ParameterType.FullName, pi.Name);
+//				if (pi.IsIn) newPar.Direction = FieldDirection.In;
+//				else if (pi.IsOut) newPar.Direction = FieldDirection.Out;
+//				newMethod.Parameters.Add (newPar);
+//			}
+//			
+//			return newMethod;
+//		}
 		
-		public static IMethod GetMethodSignature (IEvent ev)
+		public static IMethodSymbol GetMethodSignature (IEventSymbol ev)
 		{
-			if (ev.ReturnType == null)
+			if (ev.Type == null)
 				return null;
-			IType cls = ev.ReturnType;
-			if (cls.Kind == TypeKind.Unknown)
+			ITypeSymbol cls = ev.Type;
+			if (cls.TypeKind == TypeKind.Unknown)
 				return null;
-			foreach (var m in cls.GetMethods ())
+			foreach (var m in cls.GetAccessibleMembersInThisAndBaseTypes<IMethodSymbol> (cls))
 				if (m.Name == "Invoke")
 					return m;
 			return null;
 		}
 		
-		//TODO: handle generics
-		public static IUnresolvedMethod CodeDomToMDDomMethod (CodeMemberMethod method)
-		{
-			var meth = new DefaultUnresolvedMethod (null, method.Name);
-			meth.ReturnType = new DefaultUnresolvedTypeDefinition (method.ReturnType.BaseType);
-			
-			CodeDomModifiersToMDDom (meth, method.Attributes);
-			
-			foreach (CodeParameterDeclarationExpression dec in method.Parameters) {
-				var paramType = new DefaultUnresolvedTypeDefinition (dec.Type.BaseType);
-				var par = new  DefaultUnresolvedParameter (paramType, dec.Name);
-				if (dec.Direction == FieldDirection.Ref)
-					par.IsRef = true;
-				else if (dec.Direction == FieldDirection.Out)
-					par.IsOut = true;
-				meth.Parameters.Add (par);
-			}
-			
-			return meth;
-		}
-		
-		public static CodeMemberMethod MDDomToCodeDomMethod (IEvent eve)
+//		//TODO: handle generics
+//		public static IUnresolvedMethod CodeDomToMDDomMethod (CodeMemberMethod method)
+//		{
+//			var meth = new DefaultUnresolvedMethod (null, method.Name);
+//			meth.ReturnType = new DefaultUnresolvedTypeDefinition (method.ReturnType.BaseType);
+//			
+//			CodeDomModifiersToMDDom (meth, method.Attributes);
+//			
+//			foreach (CodeParameterDeclarationExpression dec in method.Parameters) {
+//				var paramType = new DefaultUnresolvedTypeDefinition (dec.Type.BaseType);
+//				var par = new  DefaultUnresolvedParameter (paramType, dec.Name);
+//				if (dec.Direction == FieldDirection.Ref)
+//					par.IsRef = true;
+//				else if (dec.Direction == FieldDirection.Out)
+//					par.IsOut = true;
+//				meth.Parameters.Add (par);
+//			}
+//			
+//			return meth;
+//		}
+
+		public static CodeMemberMethod MDDomToCodeDomMethod (IEventSymbol eve)
 		{
-			IMethod meth = GetMethodSignature (eve);
+			IMethodSymbol meth = GetMethodSignature (eve);
 			return meth != null ? MDDomToCodeDomMethod (meth) : null;
 		}
 		
-		static void CodeDomModifiersToMDDom (DefaultUnresolvedMethod method, MemberAttributes modifiers)
-		{
-			if ((modifiers & MemberAttributes.FamilyOrAssembly) != 0) {
-				method.Accessibility = Accessibility.ProtectedOrInternal;
-			}
-			else if ((modifiers & MemberAttributes.FamilyOrAssembly) != 0) {
-				method.Accessibility = Accessibility.ProtectedAndInternal;
-			}
-			else if ((modifiers & MemberAttributes.Family) != 0) {
-				method.Accessibility = Accessibility.Protected;
-			}
-			else if ((modifiers & MemberAttributes.Assembly) != 0) {
-				method.Accessibility = Accessibility.Internal;
-			}
-			else if ((modifiers & MemberAttributes.Public) != 0) {
-				method.Accessibility = Accessibility.Public;
-			}
-			else  if ((modifiers & MemberAttributes.Private) != 0) {
-				method.Accessibility = Accessibility.Private;
-			}
-			
-			if ((modifiers & MemberAttributes.Abstract) != 0) {
-				method.IsAbstract = true;
-			}
-			else if ((modifiers & MemberAttributes.Final) != 0) {
-				method.IsSealed = true;
-			}
-			else if ((modifiers & MemberAttributes.Static) != 0) {
-				method.IsStatic = true;
-			}
-			else if ((modifiers & MemberAttributes.Override) != 0) {
-				method.IsOverride = true;
-			}
-//			else if ((modifiers & MemberAttributes.Const) != 0) { // methods are never const.
-//				initialState = (initialState & ~ScopeMask) | Modifiers.Const;
+//		static void CodeDomModifiersToMDDom (DefaultUnresolvedMethod method, MemberAttributes modifiers)
+//		{
+//			if ((modifiers & MemberAttributes.FamilyOrAssembly) != 0) {
+//				method.Accessibility = Accessibility.ProtectedOrInternal;
 //			}
-		}
+//			else if ((modifiers & MemberAttributes.FamilyOrAssembly) != 0) {
+//				method.Accessibility = Accessibility.ProtectedAndInternal;
+//			}
+//			else if ((modifiers & MemberAttributes.Family) != 0) {
+//				method.Accessibility = Accessibility.Protected;
+//			}
+//			else if ((modifiers & MemberAttributes.Assembly) != 0) {
+//				method.Accessibility = Accessibility.Internal;
+//			}
+//			else if ((modifiers & MemberAttributes.Public) != 0) {
+//				method.Accessibility = Accessibility.Public;
+//			}
+//			else  if ((modifiers & MemberAttributes.Private) != 0) {
+//				method.Accessibility = Accessibility.Private;
+//			}
+//			
+//			if ((modifiers & MemberAttributes.Abstract) != 0) {
+//				method.IsAbstract = true;
+//			}
+//			else if ((modifiers & MemberAttributes.Final) != 0) {
+//				method.IsSealed = true;
+//			}
+//			else if ((modifiers & MemberAttributes.Static) != 0) {
+//				method.IsStatic = true;
+//			}
+//			else if ((modifiers & MemberAttributes.Override) != 0) {
+//				method.IsOverride = true;
+//			}
+////			else if ((modifiers & MemberAttributes.Const) != 0) { // methods are never const.
+////				initialState = (initialState & ~ScopeMask) | Modifiers.Const;
+////			}
+//		}
 		
-		static MemberAttributes ApplyMDDomModifiersToCodeDom (IEntity entity, MemberAttributes initialState)
+		static MemberAttributes ApplyMDDomModifiersToCodeDom (ISymbol entity, MemberAttributes initialState)
 		{
-			switch (entity.Accessibility) {
+			switch (entity.DeclaredAccessibility) {
 			case Accessibility.ProtectedOrInternal:
 				initialState = (initialState & ~MemberAttributes.AccessMask) | MemberAttributes.FamilyOrAssembly;
 				break;
@@ -429,11 +429,11 @@ namespace MonoDevelop.DesignerSupport
 			else if (entity.IsStatic) {
 				initialState = (initialState & ~MemberAttributes.ScopeMask) | MemberAttributes.Static;
 			}
-			else if (entity.IsShadowing) {
+			else if (entity.IsOverride) {
 				initialState = (initialState & ~MemberAttributes.ScopeMask) | MemberAttributes.Override;
 			}
-			if (entity is IField) {
-				var f = (IField)entity;
+			if (entity is IFieldSymbol) {
+				var f = (IFieldSymbol)entity;
 				if (f.IsReadOnly && f.IsStatic)
 					initialState = (initialState & ~MemberAttributes.ScopeMask) | MemberAttributes.Const;
 			}
@@ -442,19 +442,19 @@ namespace MonoDevelop.DesignerSupport
 		}
 		
 		
-		public static System.CodeDom.CodeMemberMethod MDDomToCodeDomMethod (IMethod mi)
+		public static System.CodeDom.CodeMemberMethod MDDomToCodeDomMethod (IMethodSymbol mi)
 		{
 			CodeMemberMethod newMethod = new CodeMemberMethod ();
 			newMethod.Name = mi.Name;
-			string returnType = mi.ReturnType.ReflectionName ?? "System.Void";
+			string returnType = mi.ReturnType.GetFullMetadataName () ?? "System.Void";
 			newMethod.ReturnType = new System.CodeDom.CodeTypeReference (returnType);
 			newMethod.Attributes = ApplyMDDomModifiersToCodeDom (mi, newMethod.Attributes);
 			
-			foreach (IParameter p in mi.Parameters) {
+			foreach (IParameterSymbol p in mi.Parameters) {
 				var newPar = new CodeParameterDeclarationExpression (returnType, p.Name);
-				if (p.IsRef)
+				if (p.RefKind == RefKind.Ref)
 					newPar.Direction = FieldDirection.Ref;
-				else if (p.IsOut)
+				else if (p.RefKind == RefKind.Out)
 					newPar.Direction = FieldDirection.Out;
 				else
 					newPar.Direction = FieldDirection.In;
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehind.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehind.cs
index 7ab9a0288d..02e18d5ef7 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehind.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehind.cs
@@ -29,10 +29,11 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Globalization;
 
+using Microsoft.CodeAnalysis;
 using MonoDevelop.Projects;
-using System.Globalization;
-using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
 
 namespace MonoDevelop.DesignerSupport
 {
@@ -102,30 +103,32 @@ namespace MonoDevelop.DesignerSupport
 			return null;
 		}
 		
-		public static IUnresolvedTypeDefinition GetDesignerClass (IType cls)
-		{
-			if (cls.GetDefinition ().Parts.Count == 1)
-				return null;
-			
-			string designerEnding = ".designer" + Path.GetExtension (cls.GetDefinition ().Region.FileName);
-			
-			foreach (var c in cls.GetDefinition ().Parts)
-				if (c.Region.FileName.EndsWith (designerEnding, StringComparison.OrdinalIgnoreCase))
-				    return c;
-			
-			return null;
-		}
-		
-		public static IUnresolvedTypeDefinition GetNonDesignerClass (IType cls)
+//		public static IUnresolvedTypeDefinition GetDesignerClass (IType cls)
+//		{
+//			if (cls.GetDefinition ().Parts.Count == 1)
+//				return null;
+//			
+//			string designerEnding = ".designer" + Path.GetExtension (cls.GetDefinition ().Region.FileName);
+//			
+//			foreach (var c in cls.GetDefinition ().Parts)
+//				if (c.Region.FileName.EndsWith (designerEnding, StringComparison.OrdinalIgnoreCase))
+//				    return c;
+//			
+//			return null;
+//		}
+
+		public static Location GetNonDesignerClassLocation (ITypeSymbol cls)
 		{
-			if (cls.GetDefinition ().Parts.Count == 1)
+			if (cls.Locations.Length == 1)
 				return null;
+
+			var foo = cls.ContainingType;
 			
-			string designerEnding = ".designer" + Path.GetExtension (cls.GetDefinition ().Region.FileName);
+			string designerEnding = ".designer" + Path.GetExtension (cls.Locations.First ().SourceTree.FilePath);
 			
-			foreach (var c in cls.GetDefinition ().Parts)
-				if (!c.Region.FileName.EndsWith (designerEnding, StringComparison.OrdinalIgnoreCase))
-				    return c;
+			foreach (var location in cls.Locations)
+				if (!location.SourceTree.FilePath.EndsWith (designerEnding, StringComparison.OrdinalIgnoreCase))
+					return location;
 			
 			return null;
 		}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindWriter.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindWriter.cs
index 891b6377e9..ca8035a582 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindWriter.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindWriter.cs
@@ -86,8 +86,8 @@ namespace MonoDevelop.DesignerSupport
 						return openFiles;
 					DispatchService.GuiSyncDispatch (delegate {
 						foreach (var doc in IdeApp.Workbench.Documents)
-						if (doc.GetContent<IEditableTextBuffer> () != null)
-							openFiles.Add (doc.FileName);
+							if (doc.Editor != null)
+								openFiles.Add (doc.FileName);
 					});
 				}
 				return openFiles;
@@ -170,7 +170,7 @@ namespace MonoDevelop.DesignerSupport
 						bool updated = false;
 						foreach (MonoDevelop.Ide.Gui.Document doc in IdeApp.Workbench.Documents) {
 							if (doc.FileName == item.Key) {
-								var textFile = doc.GetContent<MonoDevelop.Projects.Text.IEditableTextFile> ();
+								var textFile = doc.GetContent<MonoDevelop.Ide.Editor.TextEditor> ();
 								if (textFile == null)
 									continue;
 								
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ErrorInFileException.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ErrorInFileException.cs
index ca6f701e0c..7db1a0bbc0 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ErrorInFileException.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ErrorInFileException.cs
@@ -27,7 +27,7 @@
 //
 
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.DesignerSupport
 {
@@ -38,10 +38,10 @@ namespace MonoDevelop.DesignerSupport
 		int column = 0;
 		string fileName = null;
 		
-		public ErrorInFileException (DomRegion region, string fileName)
+		public ErrorInFileException (DocumentLocation region, string fileName)
 		{
-			this.line = region.BeginLine;
-			this.column = region.BeginColumn;
+			this.line = region.Line;
+			this.column = region.Column;
 			this.fileName = fileName;
 		}
 		
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MemberExistsException.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MemberExistsException.cs
index 7da3385ae6..d4d89d58b0 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MemberExistsException.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MemberExistsException.cs
@@ -1,128 +1,128 @@
+////
+//// MemberExistsException.cs: Thrown if identifier already exists when 
+////    binding CodeBehind members.
+////
+//// Authors:
+////   Michael Hutchinson <m.j.hutchinson@gmail.com>
+////
+//// Copyright (C) 2006 Michael Hutchinson
+////
+////
+//// This source code is licenced under The MIT License:
+////
+//// Permission is hereby granted, free of charge, to any person obtaining
+//// a copy of this software and associated documentation files (the
+//// "Software"), to deal in the Software without restriction, including
+//// without limitation the rights to use, copy, modify, merge, publish,
+//// distribute, sublicense, and/or sell copies of the Software, and to
+//// permit persons to whom the Software is furnished to do so, subject to
+//// the following conditions:
+//// 
+//// The above copyright notice and this permission notice shall be
+//// included in all copies or substantial portions of the Software.
+//// 
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+////
 //
-// MemberExistsException.cs: Thrown if identifier already exists when 
-//    binding CodeBehind members.
+//using System;
+//using ICSharpCode.NRefactory.TypeSystem;
 //
-// Authors:
-//   Michael Hutchinson <m.j.hutchinson@gmail.com>
-//
-// Copyright (C) 2006 Michael Hutchinson
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace MonoDevelop.DesignerSupport
-{	
-	public class MemberExistsException : ErrorInFileException
-	{
-		string className;
-		string memberName;
-		
-		MemberType existingMemberType = MemberType.Member;
-		MemberType newMemberType = MemberType.Member;
-		
-		public MemberExistsException (string className, string memberName)
-			: base (DomRegion.Empty, null)
-		{
-			this.className = className;
-			this.memberName = memberName;
-		}
-		
-		public MemberExistsException (string className, string memberName, MemberType existingMemberType, MemberType newMemberType, DomRegion errorLocation, string fileName)
-			: base (errorLocation, fileName)
-		{
-			this.className = className;
-			this.memberName = memberName;
-			this.existingMemberType = existingMemberType;
-			this.newMemberType = newMemberType;
-		}
-		
-		public MemberExistsException (string className, MemberType newMemberType, System.CodeDom.CodeTypeMember existingMember, DomRegion errorLocation, string fileName)
-			: this (className, existingMember.Name, newMemberType, GetMemberTypeFromCodeTypeMember (existingMember), errorLocation, fileName)
-		{
-		}
-		
-		public MemberExistsException (string className, System.CodeDom.CodeTypeMember newMember, MemberType existingMemberType, DomRegion errorLocation, string fileName)
-			: this (className, newMember.Name, GetMemberTypeFromCodeTypeMember (newMember), existingMemberType, errorLocation, fileName)
-		{
-		}
-		
-		protected static MemberType GetMemberTypeFromCodeTypeMember (System.CodeDom.CodeTypeMember mem)
-		{
-			if (mem is System.CodeDom.CodeMemberEvent)
-				return MemberType.Event;
-			else if (mem is System.CodeDom.CodeMemberProperty)
-				return MemberType.Property;
-			else if (mem is System.CodeDom.CodeMemberField)
-				return MemberType.Field;
-			else if (mem is System.CodeDom.CodeMemberMethod)
-				return MemberType.Method;
-			return MemberType.Member;
-		}
-		
-		public string ClassName {
-			get { return className; }
-			set { className = value; }
-		}
-		
-		public string MemberName {
-			get { return memberName; }
-			set { memberName = value; }
-		}
-		
-		public MemberType ExistingMemberType {
-			get { return existingMemberType; }
-			set { existingMemberType = value; }
-		}
-		
-		public MemberType NewMemberType {
-			get { return newMemberType; }
-			set { newMemberType = value; }
-		}
-		
-		public override string ToString ()
-		{
-			string str;
-			if (NewMemberType == ExistingMemberType)
-				str = MonoDevelop.Core.GettextCatalog.GetString ("Cannot add {0} '{1}' to class '{2}', " + 
-					"because there is already a {3} with that name with an incompatible return type.");
-			else
-				str = MonoDevelop.Core.GettextCatalog.GetString ("Cannot add {0} '{1}' to class '{2}', " + 
-					"because there is already a {3} with that name.");
-			
-			return string.Format (str, newMemberType.ToString ().ToLower (), memberName, className, 
-				existingMemberType.ToString ().ToLower ());
-		}
-	}
-	
-	public enum MemberType
-	{
-		Member,
-		Field,
-		Property,
-		Method,
-		Event
-	}
-}
+//namespace MonoDevelop.DesignerSupport
+//{	
+//	public class MemberExistsException : ErrorInFileException
+//	{
+//		string className;
+//		string memberName;
+//		
+//		MemberType existingMemberType = MemberType.Member;
+//		MemberType newMemberType = MemberType.Member;
+//		
+//		public MemberExistsException (string className, string memberName)
+//			: base (DomRegion.Empty, null)
+//		{
+//			this.className = className;
+//			this.memberName = memberName;
+//		}
+//		
+//		public MemberExistsException (string className, string memberName, MemberType existingMemberType, MemberType newMemberType, DomRegion errorLocation, string fileName)
+//			: base (errorLocation, fileName)
+//		{
+//			this.className = className;
+//			this.memberName = memberName;
+//			this.existingMemberType = existingMemberType;
+//			this.newMemberType = newMemberType;
+//		}
+//		
+//		public MemberExistsException (string className, MemberType newMemberType, System.CodeDom.CodeTypeMember existingMember, DomRegion errorLocation, string fileName)
+//			: this (className, existingMember.Name, newMemberType, GetMemberTypeFromCodeTypeMember (existingMember), errorLocation, fileName)
+//		{
+//		}
+//		
+//		public MemberExistsException (string className, System.CodeDom.CodeTypeMember newMember, MemberType existingMemberType, DomRegion errorLocation, string fileName)
+//			: this (className, newMember.Name, GetMemberTypeFromCodeTypeMember (newMember), existingMemberType, errorLocation, fileName)
+//		{
+//		}
+//		
+//		protected static MemberType GetMemberTypeFromCodeTypeMember (System.CodeDom.CodeTypeMember mem)
+//		{
+//			if (mem is System.CodeDom.CodeMemberEvent)
+//				return MemberType.Event;
+//			else if (mem is System.CodeDom.CodeMemberProperty)
+//				return MemberType.Property;
+//			else if (mem is System.CodeDom.CodeMemberField)
+//				return MemberType.Field;
+//			else if (mem is System.CodeDom.CodeMemberMethod)
+//				return MemberType.Method;
+//			return MemberType.Member;
+//		}
+//		
+//		public string ClassName {
+//			get { return className; }
+//			set { className = value; }
+//		}
+//		
+//		public string MemberName {
+//			get { return memberName; }
+//			set { memberName = value; }
+//		}
+//		
+//		public MemberType ExistingMemberType {
+//			get { return existingMemberType; }
+//			set { existingMemberType = value; }
+//		}
+//		
+//		public MemberType NewMemberType {
+//			get { return newMemberType; }
+//			set { newMemberType = value; }
+//		}
+//		
+//		public override string ToString ()
+//		{
+//			string str;
+//			if (NewMemberType == ExistingMemberType)
+//				str = MonoDevelop.Core.GettextCatalog.GetString ("Cannot add {0} '{1}' to class '{2}', " + 
+//					"because there is already a {3} with that name with an incompatible return type.");
+//			else
+//				str = MonoDevelop.Core.GettextCatalog.GetString ("Cannot add {0} '{1}' to class '{2}', " + 
+//					"because there is already a {3} with that name.");
+//			
+//			return string.Format (str, newMemberType.ToString ().ToLower (), memberName, className, 
+//				existingMemberType.ToString ().ToLower ());
+//		}
+//	}
+//	
+//	public enum MemberType
+//	{
+//		Member,
+//		Field,
+//		Property,
+//		Method,
+//		Event
+//	}
+//}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/TypeNotFoundException.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/TypeNotFoundException.cs
index eae3b3b743..1427f6a311 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/TypeNotFoundException.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/TypeNotFoundException.cs
@@ -28,7 +28,7 @@
 
 using System;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.DesignerSupport
 {
@@ -36,7 +36,7 @@ namespace MonoDevelop.DesignerSupport
 	{
 		string className;
 		
-		public TypeNotFoundException (string className, DomRegion location, string fileName)
+		public TypeNotFoundException (string className, DocumentLocation location, string fileName)
 			: base (location, fileName)
 		{
 			this.ClassName = className;
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs
index 3f047bb62b..a3a743e8b0 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs
@@ -102,10 +102,10 @@ namespace MonoDevelop.DesignerSupport
 			base.Dispose ();
 		}
 		
-		public override void Load (string fileName)
+		public override void Load (FileOpenInformation fileOpenInformation)
 		{
-			ContentName = fileName;
-			content.Load (fileName);
+			ContentName = fileOpenInformation.FileName;
+			content.Load (ContentName);
 		}
 		
 		public override void LoadNew (System.IO.Stream content, string mimeType)
@@ -117,9 +117,9 @@ namespace MonoDevelop.DesignerSupport
 			get { return contentBox; }
 		}
 		
-		public override void Save (string fileName)
+		public override void Save (FileSaveInformation fileSaveInformation)
 		{
-			content.Save (fileName);
+			content.Save (fileSaveInformation);
 		}
 		
 		public override bool IsDirty {
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic
index 37f2b3a0bf..a83bfa2211 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic
@@ -177,97 +177,4 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Dialog" id="MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog" design-size="424 367">
-    <property name="MemberName" />
-    <property name="Visible">False</property>
-    <property name="GeneratePublic">False</property>
-    <property name="Title" translatable="yes">Document Outline Preferences</property>
-    <property name="WindowPosition">CenterOnParent</property>
-    <property name="Modal">True</property>
-    <property name="DestroyWithParent">True</property>
-    <property name="Buttons">2</property>
-    <property name="HelpButton">False</property>
-    <child internal-child="VBox">
-      <widget class="Gtk.VBox" id="dialog1_VBox">
-        <property name="MemberName" />
-        <property name="BorderWidth">2</property>
-        <child>
-          <widget class="Gtk.VBox" id="vbox2">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <property name="BorderWidth">6</property>
-            <child>
-              <widget class="Gtk.Label" id="label">
-                <property name="MemberName" />
-                <property name="WidthRequest">400</property>
-                <property name="LabelProp" translatable="yes">Group sorting order when grouping is enabled:</property>
-                <property name="Wrap">True</property>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="MonoDevelop.Ide.Gui.Components.PriorityList" id="priorityList">
-                <property name="MemberName" />
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-    <child internal-child="ActionArea">
-      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
-        <property name="MemberName" />
-        <property name="Spacing">10</property>
-        <property name="BorderWidth">5</property>
-        <property name="Size">2</property>
-        <property name="LayoutStyle">End</property>
-        <child>
-          <widget class="Gtk.Button" id="buttonCancel">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-cancel</property>
-            <property name="ResponseId">-6</property>
-            <property name="label">gtk-cancel</property>
-          </widget>
-          <packing>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Button" id="buttonOk">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-ok</property>
-            <property name="ResponseId">-5</property>
-            <property name="label">gtk-ok</property>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
 </stetic-interface>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/packages.config b/main/src/addins/MonoDevelop.DesignerSupport/packages.config
new file mode 100644
index 0000000000..d3fca62c00
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj
index f97eff30ac..7e88624c8f 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj
@@ -49,6 +49,30 @@
     <Reference Include="Mono.Posix" />
     <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -114,16 +138,6 @@
       <Name>Mono.TextEditor</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
       <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
       <Name>MonoDevelop.SourceEditor</Name>
@@ -149,5 +163,13 @@
       <Name>Mono.Addins</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs
index d21033a71d..e83619fdf9 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs
@@ -28,9 +28,9 @@ using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
 using System.Collections.Generic;
 using System.Text;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
+using Microsoft.CodeAnalysis;
+using System.Linq;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.DocFood
 {
@@ -45,7 +45,7 @@ namespace MonoDevelop.DocFood
 		{
 			info.Enabled = IdeApp.Workbench.ActiveDocument != null && 
 				IdeApp.Workbench.ActiveDocument.Editor != null &&
-				IdeApp.Workbench.ActiveDocument.Editor.Document.MimeType == "text/x-csharp";
+				IdeApp.Workbench.ActiveDocument.Editor.MimeType == "text/x-csharp";
 			base.Update (info);
 		}
 		
@@ -61,77 +61,78 @@ namespace MonoDevelop.DocFood
 		{
 			info.Enabled = IdeApp.Workbench.ActiveDocument != null && 
 				IdeApp.Workbench.ActiveDocument.Editor != null &&
-				IdeApp.Workbench.ActiveDocument.Editor.Document.MimeType == "text/x-csharp";
+				IdeApp.Workbench.ActiveDocument.Editor.MimeType == "text/x-csharp";
 			base.Update (info);
 		}
 		
 		protected override void Run ()
 		{
-			var document = IdeApp.Workbench.ActiveDocument;
-			if (document == null)
-				return;
-			var unit = document.ParsedDocument;
-			if (unit == null)
-				return;
-			TextEditorData data = IdeApp.Workbench.ActiveDocument.Editor;
-			var types = new Stack<IUnresolvedTypeDefinition> (unit.TopLevelTypeDefinitions);
-			var docs = new List<KeyValuePair<int, string>> ();
-			while (types.Count > 0) {
-				var curType = types.Pop ();
-				foreach (var member in curType.Members) {
-					if (member is IUnresolvedTypeDefinition) {
-						types.Push ((IUnresolvedTypeDefinition)member);
-						continue;
-					}
-					if (!member.IsPublic) {
-						if (member.DeclaringTypeDefinition != null && member.DeclaringTypeDefinition.Kind != TypeKind.Interface)
-							continue;
-					}
-					if (!NeedsDocumentation (data, member))
-						continue;
-					int offset;
-					var ctx = (unit.ParsedFile as CSharpUnresolvedFile).GetTypeResolveContext (document.Compilation, member.Region.Begin);
-					var resolvedMember = member.CreateResolved (ctx);
-					string indent = GetIndent (data, resolvedMember, out offset);
-					string documentation = GenerateDocumentation (data, resolvedMember, indent);
-					if (documentation.Trim ().Length == 0)
-						continue;
-					docs.Add (new KeyValuePair <int, string> (offset, documentation));
-				}
-			}
-			docs.Sort ((a, b) => b.Key.CompareTo (a.Key));
-			using (var undo = data.OpenUndoGroup ()) {
-				docs.ForEach (doc => data.Insert (doc.Key, doc.Value));
-			}
+//			var document = IdeApp.Workbench.ActiveDocument;
+//			if (document == null)
+//				return;
+//			var unit = document.ParsedDocument;
+//			if (unit == null)
+//				return;
+//			TextEditorData data = IdeApp.Workbench.ActiveDocument.Editor;
+//			var types = new Stack<IUnresolvedTypeDefinition> (unit.TopLevelTypeDefinitions);
+//			var docs = new List<KeyValuePair<int, string>> ();
+//			while (types.Count > 0) {
+//				var curType = types.Pop ();
+//				foreach (var member in curType.Members) {
+//					if (member is IUnresolvedTypeDefinition) {
+//						types.Push ((IUnresolvedTypeDefinition)member);
+//						continue;
+//					}
+//					if (!member.IsPublic) {
+//						if (member.DeclaringTypeDefinition != null && member.DeclaringTypeDefinition.Kind != TypeKind.Interface)
+//							continue;
+//					}
+//					if (!NeedsDocumentation (data, member))
+//						continue;
+//					int offset;
+//					var ctx = (unit.ParsedFile as CSharpUnresolvedFile).GetTypeResolveContext (document.Compilation, member.Region.Begin);
+//					var resolvedMember = member.CreateResolved (ctx);
+//					string indent = GetIndent (data, resolvedMember, out offset);
+//					string documentation = GenerateDocumentation (data, resolvedMember, indent);
+//					if (documentation.Trim ().Length == 0)
+//						continue;
+//					docs.Add (new KeyValuePair <int, string> (offset, documentation));
+//				}
+//			}
+//			docs.Sort ((a, b) => b.Key.CompareTo (a.Key));
+//			using (var undo = data.OpenUndoGroup ()) {
+//				docs.ForEach (doc => data.Insert (doc.Key, doc.Value));
+//			}
 		}
 		
-		static bool NeedsDocumentation (TextEditorData data, IUnresolvedEntity member)
+		static bool NeedsDocumentation (IReadonlyTextDocument data, ISymbol member)
 		{
-			int lineNr = member.Region.BeginLine - 1;
-			DocumentLine line;
+			int lineNr = data.OffsetToLineNumber (member.Locations.First().SourceSpan.Start) - 1;
+			IDocumentLine line;
+
 			do {
-				line = data.Document.GetLine (lineNr--);
-			} while (lineNr > 0 && data.Document.GetLineIndent (line).Length == line.Length);
-			return !data.Document.GetTextAt (line).TrimStart ().StartsWith ("///", StringComparison.Ordinal);
+				line = data.GetLine (lineNr--);
+			} while (lineNr > 0 && data.GetLineIndent (line).Length == line.Length);
+			return !data.GetTextAt (line).TrimStart ().StartsWith ("///", StringComparison.Ordinal);
 		}
 		
-		static string GetIndent (TextEditorData data, IEntity member, out int offset)
+		static string GetIndent (IReadonlyTextDocument data, ISymbol member, out int offset)
 		{
-			DocumentLine line = data.Document.GetLine (member.Region.BeginLine);
+			var line = data.GetLineByOffset (member.Locations.First().SourceSpan.Start);
 			offset = line.Offset;
-			return data.Document.GetLineIndent (line);
+			return data.GetLineIndent (line);
 		}
 		
-		internal static string GenerateDocumentation (TextEditorData data, IEntity member, string indent)
+		internal static string GenerateDocumentation (IReadonlyTextDocument data, ISymbol member, string indent)
 		{
 			return GenerateDocumentation (data, member, indent, "/// ");
 		}
 		
-		internal static string GenerateDocumentation (TextEditorData data, IEntity member, string indent, string prefix)
+		internal static string GenerateDocumentation (IReadonlyTextDocument data, ISymbol member, string indent, string prefix)
 		{
 			StringBuilder result = new StringBuilder ();
 			
-			DocGenerator generator = new DocGenerator (data);
+			var generator = new DocGenerator (data);
 			generator.GenerateDoc (member);
 			
 			bool first = true;
@@ -217,7 +218,7 @@ namespace MonoDevelop.DocFood
 			return result.ToString ();
 		}
 		
-		internal static string GenerateEmptyDocumentation (TextEditorData data, IEntity member, string indent)
+		internal static string GenerateEmptyDocumentation (IReadonlyTextDocument data, ISymbol member, string indent)
 		{
 			StringBuilder result = new StringBuilder ();
 			
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs
index 8ab889cb73..19529874b4 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs
@@ -1,6 +1,6 @@
 // 
 // TextEditorExtension.cs
-//  
+//  =
 // Author:
 //       Mike Krüger <mkrueger@novell.com>
 // 
@@ -24,91 +24,83 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using MonoDevelop.Ide.Gui.Content;
-using Mono.TextEditor;
-using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.DocFood
 {
 	class DocFoodTextEditorExtension : TextEditorExtension
 	{
-		TextEditorData textEditorData {
-			get {
-				return Document.Editor;
-			}
-		}
-		
-		string GenerateDocumentation (IEntity member, string indent)
+		string GenerateDocumentation (ISymbol member, string indent)
 		{
-			string doc = DocumentBufferHandler.GenerateDocumentation (textEditorData, member, indent);
+			string doc = DocumentBufferHandler.GenerateDocumentation (Editor, member, indent);
 			int trimStart = (Math.Min (doc.Length - 1, indent.Length + "//".Length));
 			return doc.Substring (trimStart).TrimEnd ('\n', '\r');
 		}
 		
-		string GenerateEmptyDocumentation (IEntity member, string indent)
+		string GenerateEmptyDocumentation (ISymbol member, string indent)
 		{
-			string doc = DocumentBufferHandler.GenerateEmptyDocumentation (textEditorData, member, indent);
+			string doc = DocumentBufferHandler.GenerateEmptyDocumentation (Editor, member, indent);
 			int trimStart = (Math.Min (doc.Length - 1, indent.Length + "//".Length));
 			return doc.Substring (trimStart).TrimEnd ('\n', '\r');
 		}
 
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			if (keyChar != '/')
-				return base.KeyPress (key, keyChar, modifier);
+			if (descriptor.KeyChar != '/')
+				return base.KeyPress (descriptor);
 			
-			var line = textEditorData.Document.GetLine (textEditorData.Caret.Line);
-			string text = textEditorData.Document.GetTextAt (line.Offset, line.Length);
+			var line = Editor.GetLine (Editor.CaretLine);
+			string text = Editor.GetTextAt (line.Offset, line.Length);
 			
-			if (!text.EndsWith ("//"))
-				return base.KeyPress (key, keyChar, modifier);
+			if (!text.EndsWith ("//", StringComparison.Ordinal))
+				return base.KeyPress (descriptor);
 
 			// check if there is doc comment above or below.
 			var l = line.PreviousLine;
 			while (l != null && l.Length == 0)
 				l = l.PreviousLine;
-			if (l != null && textEditorData.GetTextAt (l).TrimStart ().StartsWith ("///"))
-				return base.KeyPress (key, keyChar, modifier);
+			if (l != null && Editor.GetTextAt (l).TrimStart ().StartsWith ("///", StringComparison.Ordinal))
+				return base.KeyPress (descriptor);
 
 			l = line.NextLine;
 			while (l != null && l.Length == 0)
 				l = l.NextLine;
-			if (l != null && textEditorData.GetTextAt (l).TrimStart ().StartsWith ("///"))
-				return base.KeyPress (key, keyChar, modifier);
+			if (l != null && Editor.GetTextAt (l).TrimStart ().StartsWith ("///", StringComparison.Ordinal))
+				return base.KeyPress (descriptor);
 
 			var member = GetMemberToDocument ();
 			if (member == null)
-				return base.KeyPress (key, keyChar, modifier);
+				return base.KeyPress (descriptor);
 			
-			string documentation = GenerateDocumentation (member, textEditorData.Document.GetLineIndent (line));
+			string documentation = GenerateDocumentation (member, Editor.GetLineIndent (line));
 			if (string.IsNullOrEmpty (documentation))
-				return base.KeyPress (key, keyChar, modifier);
+				return base.KeyPress (descriptor);
 			
-			string documentationEmpty = GenerateEmptyDocumentation (member, textEditorData.Document.GetLineIndent (line));
+			string documentationEmpty = GenerateEmptyDocumentation (member, Editor.GetLineIndent (line));
 			
-			int offset = textEditorData.Caret.Offset;
+			int offset = Editor.CaretOffset;
 			
 			int insertedLength;
 			
 			// Insert key (3rd undo step)
-			textEditorData.Insert (offset, "/");
-			
-			using (var undo = textEditorData.OpenUndoGroup ()) {
-				insertedLength = textEditorData.Replace (offset, 1, documentationEmpty);
+			Editor.InsertText (offset, "/");
+			using (var undo = Editor.OpenUndoGroup ()) {
+				documentationEmpty = Editor.FormatString (offset, documentationEmpty); 
+				insertedLength = documentationEmpty.Length;
+				Editor.ReplaceText (offset, 1, documentationEmpty);
 				// important to set the caret position here for the undo step
-				textEditorData.Caret.Offset = offset + insertedLength;
+				Editor.CaretOffset = offset + insertedLength;
 			}
 			
-			using (var undo = textEditorData.OpenUndoGroup ()) {
-				insertedLength = textEditorData.Replace (offset, insertedLength, documentation);
+			using (var undo = Editor.OpenUndoGroup ()) {
+				documentation = Editor.FormatString (offset, documentation); 
+				Editor.ReplaceText (offset, insertedLength, documentation);
+				insertedLength = documentation.Length;
 				if (SelectSummary (offset, insertedLength, documentation) == false)
-					textEditorData.Caret.Offset = offset + insertedLength;
+					Editor.CaretOffset = offset + insertedLength;
 			}
 			return false;
 		}
@@ -136,63 +128,58 @@ namespace MonoDevelop.DocFood
 
 			const string summaryStart = "<summary>";
 			const string summaryEnd = "</summary>";
-			int start = documentation.IndexOf (summaryStart);
-			int end = documentation.IndexOf (summaryEnd);
+			int start = documentation.IndexOf (summaryStart, StringComparison.Ordinal);
+			int end = documentation.IndexOf (summaryEnd, StringComparison.Ordinal);
 			if (start < 0 || end < 0)
 				return false;
 			start += summaryStart.Length;
 			string summaryText = documentation.Substring (start, end - start).Trim (new char[] {' ', '\t', '\r', '\n', '/'});
-			start = documentation.IndexOf (summaryText, start);
+			start = documentation.IndexOf (summaryText, start, StringComparison.Ordinal);
 			if (start < 0)
 				return false;
-			textEditorData.Caret.Offset = offset + start;
-			textEditorData.SetSelection (offset + start, offset + start + summaryText.Length);
+			Editor.CaretOffset = offset + start;
+			Editor.SetSelection (offset + start, offset + start + summaryText.Length);
 			return true;
 		}
 
 		bool IsEmptyBetweenLines (int start, int end)
 		{
 			for (int i = start + 1; i < end - 1; i++) {
-				DocumentLine lineSegment = textEditorData.GetLine (i);
+				var lineSegment = Editor.GetLine (i);
 				if (lineSegment == null)
 					break;
-				if (lineSegment.Length != textEditorData.GetLineIndent (lineSegment).Length)
+				if (lineSegment.Length != Editor.GetLineIndent (lineSegment).Length)
 					return false;
 				
 			}
 			return true;
 		}	
 		
-		IEntity GetMemberToDocument ()
+		ISymbol GetMemberToDocument ()
 		{
-			var parsedDocument = Document.UpdateParseDocument ();
-			
-			var type = parsedDocument.GetInnermostTypeDefinition (textEditorData.Caret.Location);
-			if (type == null) {
-				foreach (var t in parsedDocument.TopLevelTypeDefinitions) {
-					if (t.Region.BeginLine > textEditorData.Caret.Line) {
-						var ctx = (parsedDocument.ParsedFile as CSharpUnresolvedFile).GetTypeResolveContext (Document.Compilation, t.Region.Begin);
-						return t.Resolve (ctx).GetDefinition ();
-					}
-				}
+			var parsedDocument = DocumentContext.ParsedDocument;
+			if (parsedDocument == null)
 				return null;
-			}
-			
-			IEntity result = null;
-			foreach (var member in type.Members) {
-				if (member.Region.Begin > new TextLocation (textEditorData.Caret.Line, textEditorData.Caret.Column) && (result == null || member.Region.Begin < result.Region.Begin) && IsEmptyBetweenLines (textEditorData.Caret.Line, member.Region.BeginLine)) {
-					var ctx = (parsedDocument.ParsedFile as CSharpUnresolvedFile).GetTypeResolveContext (Document.Compilation, member.Region.Begin);
-					result = member.CreateResolved (ctx);
-				}
-			}
+			var semanticModel = parsedDocument.GetAst<SemanticModel> ();
+			if (semanticModel == null)
+				return null;
+			var caretOffset = Editor.CaretOffset;
+			var offset = caretOffset;
+			var root = semanticModel.SyntaxTree.GetRoot ();
 
-			foreach (var member in type.NestedTypes) {
-				if (member.Region.Begin > new TextLocation (textEditorData.Caret.Line, textEditorData.Caret.Column) && (result == null || member.Region.Begin < result.Region.Begin) && IsEmptyBetweenLines (textEditorData.Caret.Line, member.Region.BeginLine)) {
-					var ctx = (parsedDocument.ParsedFile as CSharpUnresolvedFile).GetTypeResolveContext (Document.Compilation, member.Region.Begin);
-					result = member.Resolve (ctx).GetDefinition ();
+			while (offset < Editor.Length) {
+				var node = root.FindNode (TextSpan.FromBounds (offset, offset));
+				if (node == null || node.SpanStart < caretOffset) {
+					offset++;
+					continue;
 				}
+
+				var declaredSymbol = semanticModel.GetDeclaredSymbol (node); 
+				if (declaredSymbol != null)
+					return declaredSymbol;
+				offset = node.FullSpan.End + 1;
 			}
-			return result;
+			return null;
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocGenerator.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocGenerator.cs
index 5f3d13dbbc..ab8843912e 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocGenerator.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocGenerator.cs
@@ -28,11 +28,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml;
-using Mono.TextEditor;
 using MonoDevelop.Core;
 using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.DocFood
 {
@@ -47,37 +48,38 @@ namespace MonoDevelop.DocFood
 			
 		}
 		
-		public DocGenerator (TextEditorData data)
+		public DocGenerator (IReadonlyTextDocument data)
 		{
 //			this.data = data;
 		}
 		
-		public static string GetBaseDocumentation (IEntity member)
+		public static string GetBaseDocumentation (ISymbol member)
 		{
-			if (member.DeclaringTypeDefinition == null)
+			if (member.ContainingType == null)
 				return null;
-			if (member is IMethod && (((IMethod)member).IsConstructor || ((IMethod)member).IsDestructor))
-				return null;
-			foreach (var type in member.DeclaringTypeDefinition.GetAllBaseTypeDefinitions ()) {
-				if (type.Equals (member.DeclaringTypeDefinition))
-					continue;
-				IMember documentMember = null;
-				foreach (var searchedMember in type.Members.Where (m => m.Name == member.Name)) {
-					if (searchedMember.SymbolKind == member.SymbolKind && searchedMember.Name == member.Name) {
-						if ((searchedMember is IParameterizedMember) && ((IParameterizedMember)searchedMember).Parameters.Count != ((IParameterizedMember)member).Parameters.Count)
-							continue;
-						if (searchedMember.Accessibility != member.Accessibility)
-							continue;
-						documentMember = searchedMember;
-						break;
-					}
-				}
-				if (documentMember != null) {
-					string documentation = AmbienceService.GetDocumentation (documentMember);
-					if (documentation != null)
-						return documentation;
-				}
-			}
+			// TODO: Roslyn port!
+//			if (member is IMethodSymbol && (((IMethodSymbol)member).IsConstructor || ((IMethodSymbol)member).IsDestructor))
+//				return null;
+//			foreach (var type in member.ContainingType.GetAllBaseTypeDefinitions ()) {
+//				if (type.Equals (member.ContainingType))
+//					continue;
+//				IMember documentMember = null;
+//				foreach (var searchedMember in type.Members.Where (m => m.Name == member.Name)) {
+//					if (searchedMember.SymbolKind == member.SymbolKind && searchedMember.Name == member.Name) {
+//						if ((searchedMember is IParameterizedMember) && ((IParameterizedMember)searchedMember).Parameters.Count != ((IParameterizedMember)member).Parameters.Count)
+//							continue;
+//						if (searchedMember.Accessibility != member.Accessibility)
+//							continue;
+//						documentMember = searchedMember;
+//						break;
+//					}
+//				}
+//				if (documentMember != null) {
+//					string documentation = AmbienceService.GetDocumentation (documentMember);
+//					if (documentation != null)
+//						return documentation;
+//				}
+//			}
 			return null;
 		}
 
@@ -124,34 +126,38 @@ namespace MonoDevelop.DocFood
 			}
 		}
 
-		public INamedElement member;
+		public ISymbol member;
 //		MemberVisitor visitor = new MemberVisitor ();
 		string currentType;
 		int wordCount;
 		
-		static string GetType (IEntity member)
+		static string GetType (ISymbol member)
 		{
-			switch (member.SymbolKind) {
+			switch (member.Kind) {
 			case SymbolKind.Event:
 				return "event";
 			case SymbolKind.Field:
 				return "field";
-			case SymbolKind.Constructor:
-				return "constructor";
-			case SymbolKind.Destructor:
-				return "destructor";
-			case SymbolKind.Operator:
-				return "operator";
 			case SymbolKind.Method:
+				switch (((IMethodSymbol)member).MethodKind) {
+				case MethodKind.StaticConstructor:
+				case MethodKind.Constructor:
+					return "constructor";
+				case MethodKind.Destructor:
+					return "destructor";
+				case MethodKind.UserDefinedOperator:
+				case MethodKind.BuiltinOperator:
+					return "operator";
+				}
 				return "method";
-//			case MemberType.Parameter:
-//				return "parameter";
-			case SymbolKind.Indexer:
-				return "indexer";
+			case SymbolKind.Parameter:
+				return "parameter";
 			case SymbolKind.Property:
+				if (((IPropertySymbol)member).IsIndexer)
+					return "indexer";
 				return "property";
-			case SymbolKind.TypeDefinition:
-				switch (((ITypeDefinition)member).Kind) {
+			case SymbolKind.NamedType:
+				switch (((INamedTypeSymbol)member).TypeKind) {
 				case TypeKind.Class:
 					return "class";
 				case TypeKind.Delegate:
@@ -228,14 +234,12 @@ namespace MonoDevelop.DocFood
 			return null;
 		}
 
-		static string GetName (object member)
+		static string GetName (ISymbol member)
 		{
-			if (member is IParameter)
-				return ((IParameter)member).Name;
-			return ((INamedElement)member).Name;
+			return member.Name;
 		}
 		
-		public bool EvaluateCondition (List<KeyValuePair<string, string>> conditions, object member)
+		public bool EvaluateCondition (List<KeyValuePair<string, string>> conditions, ISymbol member)
 		{
 			foreach (var condition in conditions) {
 				bool result = false;
@@ -245,42 +249,38 @@ namespace MonoDevelop.DocFood
 						result |= val == currentType;
 						break;
 					case "modifier":
-						if (member is IMember) {
-							if (val.ToUpperInvariant () == "STATIC"){
-								result |= ((IMember)member).IsStatic;
-							} else {
-								try {
-									var mod = (Accessibility)Enum.Parse (typeof(Accessibility), val);
-									result |=  ((IMember)member).Accessibility == mod;
-								} catch (Exception) {
-								}
+						if (val.ToUpperInvariant () == "STATIC"){
+							result |= member.IsStatic;
+						} else {
+							try {
+								var mod = (Accessibility)Enum.Parse (typeof(Accessibility), val);
+								result |=  member.DeclaredAccessibility == mod;
+							} catch (Exception) {
 							}
 						}
 						break;
 					case "paramCount":
-						if (member is IParameterizedMember)
-							result |= Int32.Parse (val) == ((IParameterizedMember)member).Parameters.Count;
+						var parameters = member.GetParameters ();
+						result |= Int32.Parse (val) == parameters.Length;
 						break;
 					case "parameter":
-						if (!(member is IParameterizedMember))
-							break;
+						parameters = member.GetParameters ();
 						string[] par = val.Split(':');
 						int idx = Int32.Parse (par[0]);
 						string name = par[1];
-						result |= idx < ((IParameterizedMember)member).Parameters.Count && name == ((IParameterizedMember)member).Parameters[idx].Name;
+						result |= idx < parameters.Length && name == parameters[idx].Name;
 						break;
 					case "returns":
-						if (member is IParameter) {
-							result |= val == ((IParameter)member).Type.ToString ();
+						if (member is IParameterSymbol) {
+							result |= val == ((IParameterSymbol)member).Type.ToString ();
 							break;
 						}
-						if ((member as IMember) == null)
-							break;
-						result |= val == ((IMember)member).ReturnType.ToString ();
+
+						result |= val == member.GetReturnType ().ToString ();
 						break;
 					case "name":
-						IMethod method = member as IMethod;
-						if (method != null && method.IsSynthetic) {
+						var method = member as IMethodSymbol;
+						if (method != null && method.MethodKind == MethodKind.UserDefinedOperator) {
 							string op = GetOperator (method.Name);
 							if (op != null) {
 								result |= val == op;
@@ -293,12 +293,12 @@ namespace MonoDevelop.DocFood
 					case "endsWith":
 						if (member == null)
 							break;
-						result |= GetName (member).EndsWith (val);
+						result |= GetName (member).EndsWith (val, StringComparison.Ordinal);
 						break;
 					case "startsWith":
 						if (member == null)
 							break;
-						result |= GetName (member).StartsWith (val);
+						result |= GetName (member).StartsWith (val, StringComparison.Ordinal);
 						break;
 					case "startsWithWord":
 						if (member == null)
@@ -319,7 +319,7 @@ namespace MonoDevelop.DocFood
 		}
 		
 		internal string curName;
-		public void GenerateDoc (IEntity member)
+		public void GenerateDoc (ISymbol member)
 		{
 			Init (member);
 			
@@ -327,9 +327,9 @@ namespace MonoDevelop.DocFood
 			this.currentType = GetType (member);
 			DocConfig.Instance.Rules.ForEach (r => r.Run (this, member));
 			
-			if (member is IParameterizedMember) {
+			if (member is IPropertySymbol || member is IMethodSymbol) {
 				this.currentType = "parameter";
-				foreach (var p in ((IParameterizedMember)member).Parameters) {
+				foreach (var p in member.GetParameters ()) {
 					curName = p.Name;
 					this.member = member;
 					SplitWords (p, p.Name);
@@ -337,8 +337,8 @@ namespace MonoDevelop.DocFood
 				}
 			}
 			
-			if (member is IMethod) {
-				IMethod method = (IMethod)member;
+			if (member is IMethodSymbol) {
+				var method = (IMethodSymbol)member;
 				int count = 1;
 				foreach (var param in method.TypeParameters) {
 					this.currentType = "typeparam";
@@ -398,7 +398,7 @@ namespace MonoDevelop.DocFood
 //			}
 		}
 
-		void Init (IEntity member)
+		void Init (ISymbol member)
 		{
 			if (member == null)
 				throw new ArgumentNullException ("member");
@@ -414,9 +414,9 @@ namespace MonoDevelop.DocFood
 			foreach (var macro in DocConfig.Instance.Macros) {
 				tags.Add (macro.Key, macro.Value);
 			}
-			if (member.DeclaringTypeDefinition != null) {
-				tags ["DeclaringType"] = "<see cref=\"" + member.DeclaringTypeDefinition.ReflectionName + "\"/>";
-				switch (member.DeclaringTypeDefinition.Kind) {
+			if (member.ContainingType != null) {
+				tags ["DeclaringType"] = "<see cref=\"" + member.ContainingType.GetDocumentationCommentId () + "\"/>";
+				switch (member.ContainingType.TypeKind) {
 				case TypeKind.Class:
 					tags ["DeclaringTypeKind"] = "class";
 					break;
@@ -434,13 +434,14 @@ namespace MonoDevelop.DocFood
 					break;
 				}
 			}
-			if (member is IMember)
-				tags ["ReturnType"] = ((IMember)member).ReturnType != null ? "<see cref=\"" + ((IMember)member).ReturnType + "\"/>" : "";
+			var returnType = member.GetReturnType ();
+			tags ["ReturnType"] = returnType != null ? "<see cref=\"" + returnType.GetDocumentationCommentId () + "\"/>" : "";
 			tags ["Member"] = "<see cref=\"" + member.Name + "\"/>";
 
 			
-			if (member is IParameterizedMember) {
-				List<string> parameterNames = new List<string> (from p in ((IParameterizedMember)member).Parameters select p.Name);
+			if (member is IPropertySymbol || member is IMethodSymbol) {
+				var parameters = member.GetParameters ();
+				var parameterNames = new List<string> (from p in parameters select p.Name);
 				tags ["ParameterSentence"] = string.Join (" ", parameterNames.ToArray ());
 				StringBuilder paramList = new StringBuilder ();
 				for (int i = 0; i < parameterNames.Count; i++) {
@@ -454,25 +455,25 @@ namespace MonoDevelop.DocFood
 					paramList.Append (parameterNames [i]);
 				}
 				tags ["ParameterList"] = paramList.ToString ();
-				for (int i = 0; i < ((IParameterizedMember)member).Parameters.Count; i++) {
-					tags ["Parameter" + i + ".Type"] = ((IParameterizedMember)member).Parameters [i].Type != null ? "<see cref=\"" + ((IParameterizedMember)member).Parameters [i].Type + "\"/>" : "";
-					tags ["Parameter" + i + ".Name"] = "<c>" + ((IParameterizedMember)member).Parameters [i].Name + "</c>";
+				for (int i = 0; i < parameters.Length; i++) {
+					tags ["Parameter" + i + ".Type"] = parameters [i].Type != null ? "<see cref=\"" + parameters [i].Type + "\"/>" : "";
+					tags ["Parameter" + i + ".Name"] = "<c>" + parameters [i].Name + "</c>";
 				}
 				
-				var property = member as IProperty;
+				var property = member as IPropertySymbol;
 				if (property != null) {
-					var hasPublicGetter = property.Getter != null && property.Getter.Accessibility != Accessibility.Private;
-					var hasPublicSetter = property.Setter != null && property.Setter.Accessibility != Accessibility.Private;
+					var hasPublicGetter = property.GetMethod != null && property.GetMethod.DeclaredAccessibility != Accessibility.Private;
+					var hasPublicSetter = property.SetMethod != null && property.SetMethod.DeclaredAccessibility != Accessibility.Private;
 
-					if (property.CanGet && property.CanSet && hasPublicGetter && hasPublicSetter) {
+					if (property.GetMethod != null && property.SetMethod != null && hasPublicGetter && hasPublicSetter) {
 						tags ["AccessText"] = "Gets or sets";
-					} else if (property.CanGet && hasPublicGetter) {
+					} else if (property.GetMethod != null && hasPublicGetter) {
 						tags ["AccessText"] = "Gets";
 					} else if (hasPublicSetter) {
 						tags ["AccessText"] = "Sets";
-					} else if (property.CanGet && property.CanSet) {
+					} else if (property.GetMethod != null && property.SetMethod != null) {
 						tags ["AccessText"] = "Gets or sets";
-					} else if (property.CanGet) {
+					} else if (property.GetMethod != null) {
 						tags ["AccessText"] = "Gets";
 					} else {
 						tags ["AccessText"] = "Sets";
@@ -919,7 +920,7 @@ namespace MonoDevelop.DocFood
 			
 			int theIndex = 0;
 			int ofTheIndex = 0;
-			if (obj is IMethod) {
+			if (obj is IMethodSymbol) {
 				theIndex = ofTheIndex = 1;
 			}
 			
@@ -936,7 +937,7 @@ namespace MonoDevelop.DocFood
 			} 
 
 			tags["FirstAsVerbPastParticiple"] = GetPastParticipleVerb (words[0]);
-			if (obj is IMethod && words.Count > 1) {
+			if (obj is IMethodSymbol && words.Count > 1) {
 				if (words[0].EndsWith("s")) {
 					words[0] += "es";
 				} else if (words[0].EndsWith("y")) {
@@ -957,8 +958,10 @@ namespace MonoDevelop.DocFood
 		
 		public void Set (string name, string parameterName, string doc)
 		{
-			if (name.StartsWith ("param") && name.Length > "param".Length) {
-				parameterName = ((IParameterizedMember)member).Parameters[int.Parse (name.Substring("param".Length))].Name;
+			if (name.StartsWith ("param", StringComparison.Ordinal) && name.Length > "param".Length) {
+				var parameters = member.GetParameters ();
+				var idx = int.Parse (name.Substring ("param".Length));
+				parameterName = idx < parameters.Length ? parameters [idx].Name : "unknown";
 				name = "param";
 			}
 			Section newSection = new Section (name);
@@ -981,7 +984,7 @@ namespace MonoDevelop.DocFood
 		}
 		
 		#region implemented abstract members of MonoDevelop.Projects.Text.DocGenerator
-		public override string GenerateDocumentation (IMember member, string linePrefix)
+		public override string GenerateDocumentation (ISymbol member, string linePrefix)
 		{
 			return DocumentBufferHandler.GenerateDocumentation (null, member, "", linePrefix);
 		}
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfNotStatement.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfNotStatement.cs
index 4112858c7a..08dfc750f7 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfNotStatement.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfNotStatement.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 using System;
 using System.Xml;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.DocFood
 {
@@ -32,7 +33,7 @@ namespace MonoDevelop.DocFood
 	{
 		public const string XmlTag = "IfNot";
 		
-		public override void Run (DocGenerator generator, object member)
+		public override void Run (DocGenerator generator, ISymbol member)
 		{
 			if (!generator.EvaluateCondition (Attributes, member))
 				Children.ForEach (child => child.Run (generator, member));
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfStatement.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfStatement.cs
index d9c30a53df..022242e8b9 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfStatement.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfStatement.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 using System;
 using System.Xml;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.DocFood
 {
@@ -32,7 +33,7 @@ namespace MonoDevelop.DocFood
 	{
 		public const string XmlTag = "If";
 		
-		public override void Run (DocGenerator generator, object member)
+		public override void Run (DocGenerator generator, ISymbol member)
 		{
 			if (generator.EvaluateCondition (Attributes, member))
 				Children.ForEach (child => child.Run (generator, member));
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/MemberVisitor.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/MemberVisitor.cs
index 74afb6872e..d3e79c295a 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/MemberVisitor.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/MemberVisitor.cs
@@ -24,22 +24,21 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.CSharp;
 using System.Collections.Generic;
 
 namespace MonoDevelop.DocFood
 {
-	class MemberVisitor : DepthFirstAstVisitor<object, object>
-	{
-		public List<AstType> Exceptions = new List<AstType> ();
-		
-		public override object VisitThrowStatement (ThrowStatement throwStatement, object data)
-		{
-			var oce = throwStatement.Expression as ObjectCreateExpression;
-			if (oce != null)
-				Exceptions.Add (oce.Type);
-			return null;
-		}
-	}
+//	class MemberVisitor : DepthFirstAstVisitor<object, object>
+//	{
+//		public List<AstType> Exceptions = new List<AstType> ();
+//		
+//		public override object VisitThrowStatement (ThrowStatement throwStatement, object data)
+//		{ 
+//			var oce = throwStatement.Expression as ObjectCreateExpression;
+//			if (oce != null)
+//				Exceptions.Add (oce.Type);
+//			return null;
+//		}
+//	}
 }
 
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Node.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Node.cs
index cb67dfea17..0897c0e43b 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Node.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Node.cs
@@ -27,6 +27,7 @@ using System;
 using System.Collections.Generic;
 using System.Xml;
 using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.DocFood
 {
@@ -39,12 +40,12 @@ namespace MonoDevelop.DocFood
 		
 		public List<Node> Children = new List<Node> ();
 		
-		public Node ()
+		protected Node ()
 		{
 			Attributes = new List<KeyValuePair<string, string>> ();
 		}
 		
-		public abstract void Run (DocGenerator generator, object member);
+		public abstract void Run (DocGenerator generator, ISymbol member);
 		
 		public void SetAttribute (string name, string value)
 		{
@@ -63,7 +64,7 @@ namespace MonoDevelop.DocFood
 		
 		public static List<Node> ReadNodeList (XmlReader reader, string tag)
 		{
-			List<Node> result = new List<Node> ();
+			var result = new List<Node> ();
 			XmlReadHelper.ReadList (reader, tag, delegate () {
 				switch (reader.LocalName) {
 				case Section.XmlTag:
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Section.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Section.cs
index 75ef11856f..0fbf9c19f4 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Section.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Section.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.Xml;
 using MonoDevelop.Core;
 using System.Linq;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.DocFood
 {
@@ -54,7 +55,7 @@ namespace MonoDevelop.DocFood
 			this.Name = name;
 		}
 		
-		public override void Run (DocGenerator generator, object member)
+		public override void Run (DocGenerator generator, ISymbol member)
 		{
 			string str = StringParserService.Parse (Documentation, generator.tags).Trim ();
 			if (!char.IsUpper (str[0]))
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/SwitchStatement.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/SwitchStatement.cs
index 3170e35215..e50140d17d 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/SwitchStatement.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/SwitchStatement.cs
@@ -27,6 +27,9 @@ using System;
 using System.Collections.Generic;
 using System.Xml;
 using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+
+
 namespace MonoDevelop.DocFood
 {
 	class SwitchStatement : Node
@@ -43,7 +46,7 @@ namespace MonoDevelop.DocFood
 			CaseSections = new List<Node> ();
 		}
 		
-		public override void Run (DocGenerator generator, object member)
+		public override void Run (DocGenerator generator, ISymbol member)
 		{
 			if (!generator.EvaluateCondition (Attributes, member))
 				return;
@@ -73,7 +76,7 @@ namespace MonoDevelop.DocFood
 		
 		public static SwitchStatement Read (XmlReader reader)
 		{
-			SwitchStatement result = new SwitchStatement ();
+			var result = new SwitchStatement ();
 			if (reader.MoveToFirstAttribute ()) {
 				do {
 					result.SetAttribute (reader.LocalName, reader.Value);
@@ -94,11 +97,11 @@ namespace MonoDevelop.DocFood
 			return result;
 		}
 		
-		public class CaseStatement : Node
+		class CaseStatement : Node
 		{
 			public const string XmlTag = "Case";
 			
-			public override void Run (DocGenerator generator, object member)
+			public override void Run (DocGenerator generator, ISymbol member)
 			{
 				if (generator.EvaluateCondition (Attributes, member))
 					Children.ForEach (child => child.Run (generator, member));
diff --git a/main/src/addins/MonoDevelop.DocFood/packages.config b/main/src/addins/MonoDevelop.DocFood/packages.config
new file mode 100644
index 0000000000..f8f771207f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DocFood/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs
index a8b406d6fd..cc9aef04b0 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs
@@ -52,8 +52,9 @@ namespace MonoDevelop.Gettext.Editor
 			};
 		}
 		
-		public override void Load (string fileName)

+		public override void Load (FileOpenInformation fileOpenInformation)

 		{
+			var fileName = fileOpenInformation.FileName;
 //			using (IProgressMonitor mon = IdeApp.Workbench.ProgressMonitors.GetLoadProgressMonitor (true)) {
 			catalog.Load (null, fileName);
 //			}
@@ -65,11 +66,11 @@ namespace MonoDevelop.Gettext.Editor
 			this.IsDirty = false;
 		}
 		
-		public override void Save (string fileName)

+		public override void Save (FileSaveInformation fileSaveInformation)

 		{
 			OnBeforeSave (EventArgs.Empty);
-			catalog.Save (fileName);
-			ContentName = fileName;
+			catalog.Save (fileSaveInformation.FileName);
+			ContentName = fileSaveInformation.FileName;
 			IsDirty = false;

 		}
 		
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
index 21de4f4562..40930f4b0d 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
@@ -38,12 +38,13 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Tasks;
 using MonoDevelop.Gettext.Editor;
-using Mono.TextEditor;
 using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Ide;
 using System.ComponentModel;
 using System.Threading;
 using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Gettext
 {
@@ -55,9 +56,8 @@ namespace MonoDevelop.Gettext
 		ListStore foundInStore;
 		Catalog catalog;
 		string  poFileName;
-		Mono.TextEditor.TextEditorOptions options = new Mono.TextEditor.TextEditorOptions ();
-		Mono.TextEditor.TextEditor texteditorOriginal = new Mono.TextEditor.TextEditor ();
-		Mono.TextEditor.TextEditor texteditorPlural = new Mono.TextEditor.TextEditor ();
+		TextEditor texteditorOriginal = TextEditorFactory.CreateNewEditor ();
+		TextEditor texteditorPlural = TextEditorFactory.CreateNewEditor ();
 		
 		static List<POEditorWidget> widgets = new List<POEditorWidget> (); 
 		
@@ -239,22 +239,17 @@ namespace MonoDevelop.Gettext
 			widgets.Add (this);
 			
 			checkbuttonWhiteSpaces.Toggled += CheckbuttonWhiteSpacesToggled;
-			options.ShowLineNumberMargin = false;
-			options.ShowFoldMargin = false;
-			options.ShowIconMargin = false;
-			options.ColorScheme = IdeApp.Preferences.ColorScheme;
-			options.FontName = PropertyService.Get<string> ("FontName");
-			
+
 			this.scrolledwindowOriginal.Child = this.texteditorOriginal;
 			this.scrolledwindowPlural.Child = this.texteditorPlural;
-			this.texteditorOriginal.Show ();
-			this.texteditorPlural.Show ();
-			texteditorOriginal.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Insensitive));
-			texteditorPlural.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Insensitive));
-			this.texteditorOriginal.Options = options;
-			this.texteditorPlural.Options = options;
-			this.texteditorOriginal.Document.ReadOnly = true;
-			this.texteditorPlural.Document.ReadOnly = true;
+			this.scrolledwindowOriginal.Child.Show ();
+			this.scrolledwindowPlural.Child.Show ();
+			scrolledwindowOriginal.Child.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Insensitive));
+			scrolledwindowPlural.Child.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Insensitive));
+			this.texteditorOriginal.Options = DefaultSourceEditorOptions.PlainEditor;
+			this.texteditorPlural.Options = DefaultSourceEditorOptions.PlainEditor;
+			this.texteditorOriginal.IsReadOnly = true;
+			this.texteditorPlural.IsReadOnly = true;
 		}
 
 		void HandleCellRendFuzzyToggled (object sender, ToggledArgs args)
@@ -299,13 +294,6 @@ namespace MonoDevelop.Gettext
 		
 		void CheckbuttonWhiteSpacesToggled (object sender, EventArgs e)
 		{
-			texteditorOriginal.QueueDraw ();
-			texteditorPlural.QueueDraw ();
-			for (int i = this.notebookTranslated.NPages - 1; i >= 0; i--) {
-				Mono.TextEditor.TextEditor view = GetTextView (i);
-				if (view != null)
-					view.QueueDraw ();
-			}
 		}
 		
 		#region Options
@@ -467,13 +455,10 @@ namespace MonoDevelop.Gettext
 			this.Catalog = newCatalog;
 			UpdateTasks ();
 		}
-		
-		Mono.TextEditor.TextEditor GetTextView (int index)
+		List<TextEditor> notebookTranslatedEditors = new List<TextEditor> ();
+		TextEditor GetTextView (int index)
 		{
-			ScrolledWindow window = this.notebookTranslated.GetNthPage (index) as ScrolledWindow;
-			if (window != null)
-				return window.Child as Mono.TextEditor.TextEditor;
-			return null;
+			return notebookTranslatedEditors[index];
 		}
 		
 		void ClearTextview ()
@@ -485,24 +470,23 @@ namespace MonoDevelop.Gettext
 		void AddTextview (int index)
 		{
 			ScrolledWindow window = new ScrolledWindow ();
-			Mono.TextEditor.TextEditor textView = new Mono.TextEditor.TextEditor ();
+			var textView = TextEditorFactory.CreateNewEditor ();
 			window.Child = textView;
-			textView.Options = options;
-			textView.Document.TextReplaced += delegate {
+			textView.TextChanged += delegate {
 				if (this.isUpdating)
 					return;
 				try {
 					if (this.currentEntry != null) {
-						string escapedText = textView.Document.Text;
+						string escapedText = textView.Text;
 						string oldText     = this.currentEntry.GetTranslation (index);
 						this.currentEntry.SetTranslation (escapedText, index);
 						AddChange (this.currentEntry, oldText, escapedText, index);
 					}
 					IdeApp.Workbench.StatusBar.ShowReady ();
-					textView.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Normal));
+					window.Child.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Normal));
 				} catch (System.Exception e) {
 					IdeApp.Workbench.StatusBar.ShowError (e.Message);
-					textView.ModifyBase (Gtk.StateType.Normal, errorColor);
+					window.Child.ModifyBase (Gtk.StateType.Normal, errorColor);
 				}
 				treeviewEntries.QueueDraw ();
 				UpdateProgressBar ();
@@ -513,6 +497,7 @@ namespace MonoDevelop.Gettext
 			label.Text = this.Catalog.PluralFormsDescriptions [index];
 			window.ShowAll ();
 			this.notebookTranslated.AppendPage (window, label);
+			notebookTranslatedEditors.Add (textView);
 		}
 		
 		void ShowPopup (EventButton evt)
@@ -601,14 +586,15 @@ namespace MonoDevelop.Gettext
 		void RemoveTextViewsFrom (int index)
 		{
 			for (int i = this.notebookTranslated.NPages - 1; i >= index; i--) {
-				Mono.TextEditor.TextEditor view = GetTextView (i);
+				var view = GetTextView (i);
 				if (view == null)
 					continue;
 //				if (gtkSpellSet.ContainsKey (view)) {
 //					GtkSpell.Detach (view);
 //					gtkSpellSet.Remove (view);
 //				}
-				this.notebookTranslated.RemovePage (i);
+				notebookTranslated.RemovePage (i);
+				notebookTranslatedEditors.RemoveAt (i); 
 			}
 		}
 		
@@ -617,9 +603,9 @@ namespace MonoDevelop.Gettext
 			this.isUpdating = true;
 			try {
 				currentEntry = entry;
-				this.texteditorOriginal.Caret.Location = new DocumentLocation (1, 1);
-				this.texteditorOriginal.Document.Text = entry != null ? entry.String : "";
-				this.texteditorOriginal.VAdjustment.Value = this.texteditorOriginal.HAdjustment.Value = 0;
+				this.texteditorOriginal.CaretLocation = new DocumentLocation (1, 1);
+				this.texteditorOriginal.Text = entry != null ? entry.String : "";
+				//this.texteditorOriginal.VAdjustment.Value = this.texteditorOriginal.HAdjustment.Value = 0;
 				
 //				if (GtkSpell.IsSupported && !gtkSpellSet.ContainsKey (this.textviewOriginal)) {
 //					GtkSpell.Attach (this.textviewOriginal, "en");
@@ -630,9 +616,9 @@ namespace MonoDevelop.Gettext
 				this.notebookTranslated.ShowTabs = entry != null && entry.HasPlural;
 				
 				if (entry != null && entry.HasPlural) {
-					this.texteditorPlural.Caret.Location = new DocumentLocation (1, 1);
-					this.texteditorPlural.Document.Text = entry.PluralString;
-					this.texteditorPlural.VAdjustment.Value = this.texteditorPlural.HAdjustment.Value = 0;
+					this.texteditorPlural.CaretLocation = new DocumentLocation (1, 1);
+					this.texteditorPlural.Text = entry.PluralString;
+					//this.texteditorPlural.VAdjustment.Value = this.texteditorPlural.HAdjustment.Value = 0;
 //					if (GtkSpell.IsSupported && !gtkSpellSet.ContainsKey (this.textviewOriginalPlural)) {
 //						GtkSpell.Attach (this.textviewOriginalPlural, "en");
 //						this.gtkSpellSet[this.textviewOriginalPlural] = true;
@@ -649,14 +635,12 @@ namespace MonoDevelop.Gettext
 					}
 					
 					for (int i = 0; i < entry.NumberOfTranslations; i++) {
-						Mono.TextEditor.TextEditor textView = GetTextView (i);
+						var textView = GetTextView (i);
 						if (textView == null)
 							continue;
 						textView.ClearSelection ();
-						textView.Document.Text = entry != null ?  entry.GetTranslation (i) : "";
-						textView.Caret.Offset = textView.Document.Text.Length;
-						textView.VAdjustment.Value = textView.HAdjustment.Value = 0;
-						textView.Document.CommitUpdateAll ();
+						textView.Text = entry != null ?  entry.GetTranslation (i) : "";
+						EditActions.MoveCaretToDocumentEnd (textView);
 					}
 					
 					foreach (string reference in entry.References) {
@@ -810,7 +794,7 @@ namespace MonoDevelop.Gettext
 		}
 		
 		string filter = "";
-		Regex  regex = new Regex ("");
+		System.Text.RegularExpressions.Regex  regex = new System.Text.RegularExpressions.Regex ("");
 		
 		void UpdateFromCatalog ()
 		{
@@ -822,7 +806,7 @@ namespace MonoDevelop.Gettext
 					RegexOptions options = RegexOptions.Compiled;
 					if (!IsCaseSensitive)
 						options |= RegexOptions.IgnoreCase;
-					regex = new Regex (filter, options);
+					regex = new System.Text.RegularExpressions.Regex (filter, options);
 				} catch (Exception e) {
 					IdeApp.Workbench.StatusBar.ShowError (e.Message);
 					this.searchEntryFilter.Entry.ModifyBase (StateType.Normal, errorColor);
@@ -1110,7 +1094,7 @@ namespace MonoDevelop.Gettext
 		{
 			public override bool EntryFails (CatalogEntry entry)
 			{
-				foreach (System.Text.RegularExpressions.Match match in Regex.Matches (entry.String, @"\{.\}", RegexOptions.None))  {
+				foreach (System.Text.RegularExpressions.Match match in System.Text.RegularExpressions.Regex.Matches (entry.String, @"\{.\}", RegexOptions.None))  {
 					if (!entry.GetTranslation (0).Contains (match.Value)) 
 						return true;
 				}
@@ -1119,7 +1103,7 @@ namespace MonoDevelop.Gettext
 			
 			public override string FailReason (CatalogEntry entry)
 			{
-				foreach (System.Text.RegularExpressions.Match match in Regex.Matches (entry.String, @"\{.\}", RegexOptions.None))  {
+				foreach (System.Text.RegularExpressions.Match match in System.Text.RegularExpressions.Regex.Matches (entry.String, @"\{.\}", RegexOptions.None))  {
 					if (!entry.GetTranslation (0).Contains (match.Value)) 
 						return GettextCatalog.GetString ("Original string '{0}' contains '{1}', translation doesn't.", entry.String, match.Value);
 				}
@@ -1223,9 +1207,9 @@ namespace MonoDevelop.Gettext
 			{
 				widget.inUndoOperation = true;
 				widget.SelectEntry (Entry);
-				Mono.TextEditor.TextEditor textView = widget.GetTextView (Index);
+				var textView = widget.GetTextView (Index);
 				if (textView != null)
-					textView.Document.Text = OldText;
+					textView.Text = OldText;
 				widget.inUndoOperation = false;
 			}
 			
@@ -1233,9 +1217,9 @@ namespace MonoDevelop.Gettext
 			{
 				widget.inUndoOperation = true;
 				widget.SelectEntry (Entry);
-				Mono.TextEditor.TextEditor textView = widget.GetTextView (Index);
+				var textView = widget.GetTextView (Index);
 				if (textView != null)
-					textView.Document.Text = Text;
+					textView.Text = Text;
 				widget.inUndoOperation = false;
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
index 2908218adb..a3a9952db6 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
@@ -59,6 +59,22 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -86,16 +102,6 @@
       <Name>MonoDevelop.Deployment</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -209,6 +215,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
diff --git a/main/src/addins/MonoDevelop.Gettext/packages.config b/main/src/addins/MonoDevelop.Gettext/packages.config
new file mode 100644
index 0000000000..d3fca62c00
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
index 137995ff14..c201ac0063 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
@@ -32,10 +32,10 @@ using Gtk;
 using Gdk;
 using Glade;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Components;
-
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.GtkCore.Dialogs
 {
@@ -45,7 +45,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 		[Glade.Widget] protected Gtk.TreeView treeClasses;
 		ListStore store;
 		
-		public SelectRenamedClassDialog (IEnumerable<IType> classes)
+		public SelectRenamedClassDialog (IEnumerable<INamedTypeSymbol> classes)
 		{
 			XML glade = new XML (null, "gui.glade", "SelectRenamedClassDialog", null);
 			glade.Autoconnect (this);
@@ -67,7 +67,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 			
 			foreach (var cls in classes) {
 				var pic = ImageService.GetIcon (cls.GetStockIcon ());
-				store.AppendValues (pic, cls.FullName);
+				store.AppendValues (pic, cls.GetFullName ());
 			}
 		}
 		
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs
index 55fc6c38e0..b122cf3de6 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs
@@ -35,9 +35,16 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Projects;
 using MonoDevelop.GtkCore.Dialogs;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Linq;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Refactoring;
 
 
 namespace MonoDevelop.GtkCore.GuiBuilder
@@ -54,7 +61,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			get { return true; }
 		}
 		
-		public bool CanHandle (FilePath fileName, string mimeType, Project ownerProject)
+		public bool CanHandle (FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject)
 		{
 			if (excludeThis)
 				return false;
@@ -74,7 +81,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			return db != null;
 		}
 		
-		public IViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
+		public IViewContent CreateContent (FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject)
 		{
 			excludeThis = true;
 			var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject);
@@ -88,14 +95,14 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		
 		Stetic.ActionGroupInfo GetActionGroup (string file)
 		{
-			Project project = IdeApp.Workspace.GetProjectsContainingFile (file).FirstOrDefault ();
+			var project = IdeApp.Workspace.GetProjectsContainingFile (file).FirstOrDefault ();
 			if (!GtkDesignInfo.HasDesignedObjects (project))
 				return null;
 				
 			return GtkDesignInfo.FromProject (project).GuiBuilderProject.GetActionGroupForFile (file);
 		}
 		
-		internal static string BindToClass (Project project, Stetic.ActionGroupInfo group)
+		internal static string BindToClass (MonoDevelop.Projects.Project project, Stetic.ActionGroupInfo group)
 		{
 			GuiBuilderProject gproject = GtkDesignInfo.FromProject (project).GuiBuilderProject;
 			string file = gproject.GetSourceCodeFile (group);
@@ -106,9 +113,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			
 			ArrayList list = new ArrayList ();
 			var ctx = gproject.GetParserContext ();
-			foreach (var cls in ctx.MainAssembly.GetAllTypeDefinitions ())
+			foreach (var cls in ctx.GetAllTypesInMainAssembly ())
 				if (IsValidClass (cls))
-					list.Add (cls.FullName);
+					list.Add (cls.GetFullName ());
 		
 			// Ask what to do
 			
@@ -125,44 +132,63 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			return gproject.GetSourceCodeFile (group);
 		}
 		
-		static IUnresolvedTypeDefinition CreateClass (Project project, Stetic.ActionGroupComponent group, string name, string namspace, string folder)
+		static ITypeSymbol CreateClass (MonoDevelop.Projects.Project project, Stetic.ActionGroupComponent group, string name, string namspace, string folder)
 		{
 			string fullName = namspace.Length > 0 ? namspace + "." + name : name;
 			
-			var type = new CodeTypeDeclaration ();
-			type.Name = name;
-			type.IsClass = true;
-			type.BaseTypes.Add (new CodeTypeReference ("Gtk.ActionGroup"));
+			var type = SyntaxFactory.ClassDeclaration (name)
+				.AddBaseListTypes (SyntaxFactory.SimpleBaseType (SyntaxFactory.ParseTypeName ("Gtk.ActionGroup")));
 			
 			// Generate the constructor. It contains the call that builds the widget.
+			var members = new SyntaxList<MemberDeclarationSyntax> ();
 			
-			var ctor = new CodeConstructor ();
-			ctor.Attributes = MemberAttributes.Public | MemberAttributes.Final;
-			ctor.BaseConstructorArgs.Add (new CodePrimitiveExpression (fullName));
-			
-			var call = new CodeMethodInvokeExpression (
-				new CodeMethodReferenceExpression (
-					new CodeTypeReferenceExpression ("Stetic.Gui"),
-					"Build"
-				),
-				new CodeThisReferenceExpression (),
-				new CodeTypeOfExpression (fullName)
+			var ctor = SyntaxFactory.ConstructorDeclaration (
+				new SyntaxList<AttributeListSyntax> (),
+				SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.PublicKeyword)),
+				SyntaxFactory.Identifier (name),
+				SyntaxFactory.ParameterList (),
+				SyntaxFactory.ConstructorInitializer (SyntaxKind.BaseKeyword, SyntaxFactory.ArgumentList (new SeparatedSyntaxList<ArgumentSyntax> { SyntaxFactory.Argument (SyntaxFactory.ParseExpression (fullName)) } )),
+				SyntaxFactory.Block (
+					SyntaxFactory.ExpressionStatement (
+						SyntaxFactory.InvocationExpression (
+							SyntaxFactory.ParseExpression ("Stetic.Gui.Build"),
+							SyntaxFactory.ArgumentList (
+								new SeparatedSyntaxList<ArgumentSyntax> {
+									SyntaxFactory.Argument (SyntaxFactory.ThisExpression ()),
+									SyntaxFactory.Argument (SyntaxFactory.ParseExpression (fullName))
+								}
+							)
+						) 
+					)
+				)
 			);
-			ctor.Statements.Add (call);
-			type.Members.Add (ctor);
+			
+			type = type.AddMembers (ctor);
 			
 			// Add signal handlers
 			foreach (Stetic.ActionComponent action in group.GetActions ()) {
 				foreach (Stetic.Signal signal in action.GetSignals ()) {
-					CodeMemberMethod met = new CodeMemberMethod ();
-					met.Name = signal.Handler;
-					met.Attributes = MemberAttributes.Family;
-					met.ReturnType = new CodeTypeReference (signal.SignalDescriptor.HandlerReturnTypeName);
 					
-					foreach (Stetic.ParameterDescriptor pinfo in signal.SignalDescriptor.HandlerParameters)
-						met.Parameters.Add (new CodeParameterDeclarationExpression (pinfo.TypeName, pinfo.Name));
+					var parameters = new SeparatedSyntaxList<ParameterSyntax> ();
+					foreach (var p in signal.SignalDescriptor.HandlerParameters) {
+						parameters = parameters.Add (SyntaxFactory.Parameter (new SyntaxList<AttributeListSyntax> (), SyntaxFactory.TokenList (), SyntaxFactory.ParseTypeName (p.TypeName), SyntaxFactory.Identifier (p.Name), null)); 
+					}
+					
+					var met = SyntaxFactory.MethodDeclaration (
+				          new SyntaxList<AttributeListSyntax> (),
+				          SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.ProtectedKeyword)),
+				          SyntaxFactory.ParseTypeName (signal.SignalDescriptor.HandlerReturnTypeName),
+				          null,
+				          SyntaxFactory.Identifier (signal.Handler),
+				          null,
+				          SyntaxFactory.ParameterList (parameters),
+				          new SyntaxList<TypeParameterConstraintClauseSyntax> (),
+				          SyntaxFactory.Block (),
+				          null
+			          );
+					
 						
-					type.Members.Add (met);
+					type = type.AddMembers (met);
 				}
 			}
 			
@@ -170,17 +196,13 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			return CodeGenerationService.AddType ((DotNetProject)project, folder, namspace, type);
 		}
 		
-		internal static bool IsValidClass (IType cls)
+		internal static bool IsValidClass (ITypeSymbol cls)
 		{
-			foreach (var bt in cls.DirectBaseTypes) {
-				if (bt.ReflectionName == "Gtk.ActionGroup")
-					return true;
-				
-				var baseCls = bt;
-				if (baseCls != null && IsValidClass (baseCls))
-					return true;
-			}
-			return false;
+			if (cls.SpecialType == SpecialType.System_Object)
+				return false;
+			if (cls.BaseType.GetFullName () == "Gtk.ActionGroup")
+				return true;
+			return IsValidClass (cls.BaseType);
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
index f0d9cb95e6..3e16e11f17 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
@@ -27,7 +27,7 @@
 //
 
 using System;
-using System.Collections;
+using System.Linq;
 
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
@@ -35,7 +35,8 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Commands;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.DesignerSupport;
-using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide;
 
 
 namespace MonoDevelop.GtkCore.GuiBuilder
@@ -139,15 +140,15 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			codeBinder.TargetObject = designer.RootComponent;
 		}
 		
-		public override void Save (string fileName)
+		public override void Save (FileSaveInformation fileSaveInformation)
 		{
 			string oldBuildFile = GuiBuilderService.GetBuildCodeFileName (project.Project, groupInfo.Name);
 			
-			base.Save (fileName);
+			base.Save (fileSaveInformation);
 			if (designer == null)
 				return;
 
-			codeBinder.UpdateBindings (fileName);
+			codeBinder.UpdateBindings (fileSaveInformation.FileName);
 			
 			designer.Save ();
 			
@@ -179,12 +180,10 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		public override void JumpToSignalHandler (Stetic.Signal signal)
 		{
 			var cls = codeBinder.GetClass ();
-			foreach (var met in cls.Methods) {
-				if (met.Name == signal.Handler) {
-					ShowPage (1);
-					JumpTo (met.Region.BeginLine, met.Region.BeginColumn);
-					break;
-				}
+			var met = cls.GetMembers (signal.Handler).OfType<IMethodSymbol> ().FirstOrDefault ();
+			if (met != null) { 
+				ShowPage (1);
+				IdeApp.ProjectOperations.JumpToDeclaration (met);
 			}
 		}
 		
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs
index 15ad4bc0ca..8c5d0a5462 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs
@@ -30,32 +30,31 @@ using Gtk;
 using System;
 using System.Collections;
 using System.CodeDom;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
 	internal class ClassUtils
 	{
-		public static IField FindWidgetField (ITypeDefinition cls, string name)
+		public static IFieldSymbol FindWidgetField (ITypeSymbol cls, string name)
 		{
-			foreach (IField field in cls.Fields) {
+			foreach (var field in cls.GetMembers ().OfType<IFieldSymbol> ()) {
 				if (name == GetWidgetFieldName (field))
 					return field;
 			}
 			return null;
 		}
 		
-		public static string GetWidgetFieldName (IField field)
+		public static string GetWidgetFieldName (IFieldSymbol field)
 		{
-			foreach (IAttribute att in field.Attributes)	{
-				var type = att.AttributeType;
-				if (type.ReflectionName == "Glade.Widget" || type.ReflectionName == "Widget" || type.ReflectionName == "Glade.WidgetAttribute" || type.ReflectionName == "WidgetAttribute") {
-					var pArgs = att.PositionalArguments;
-					if (pArgs != null && pArgs.Count > 0) {
-						var exp = pArgs[0] as ConstantResolveResult;
+			foreach (AttributeData att in field.GetAttributes ())	{
+				var type = att.AttributeClass;
+				if (type.Name == "Widget" ||  type.Name == "WidgetAttribute") {
+					var pArgs = att.ConstructorArguments;
+					if (pArgs != null && pArgs.Length > 0) {
+						var exp = pArgs[0].Value;
 						if (exp != null)
-							return exp.ConstantValue.ToString ();
+							return exp.ToString ();
 					} else {
 						return field.Name;
 					}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
index 7e4e54a0b6..6e49af37e2 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
@@ -37,10 +37,16 @@ using MonoDevelop.Projects.Text;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.GtkCore.Dialogs;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Ide.FindInFiles;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Refactoring;
+using System.Xml.XPath;
+using System.IO;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
@@ -55,12 +61,12 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 	{
 		ITextFileProvider textFileProvider;
 		Stetic.Component targetObject;
-		Project project;
+		MonoDevelop.Projects.Project project;
 		GuiBuilderProject gproject;
 		string className;
 		string classFile;
 		
-		public CodeBinder (Project project, ITextFileProvider textFileProvider, Stetic.Component targetObject)
+		public CodeBinder (MonoDevelop.Projects.Project project, ITextFileProvider textFileProvider, Stetic.Component targetObject)
 		{
 			this.project = project;
 			this.textFileProvider = textFileProvider;
@@ -77,8 +83,8 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				if (targetObject != null) {
 					var cls = gproject.FindClass (GetClassName (targetObject));
 					if (cls != null) {
-						className = cls.FullName;
-						classFile = cls.Region.FileName;
+						className = cls.GetFullName ();
+						classFile = cls.Locations.First ().SourceTree.FilePath;
 					}
 				}
 			}
@@ -89,20 +95,17 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		{
 			if (targetObject == null)
 				return;
-			
-			var doc = TypeSystemService.ParseFile (project, fileName);
+			FileService.NotifyFileChanged (fileName);
 			classFile = fileName;
 			
-			if (doc != null) {
-				var cls = GetClass ();
+			var cls = GetClass ();
+			if (cls != null) {
 				UpdateBindings (targetObject, cls);
-			
-				if (cls != null)
-					targetObject.GeneratePublic = cls.IsPublic;
+				targetObject.GeneratePublic = cls.DeclaredAccessibility == Accessibility.Public;
 			}
 		}
 		
-		void UpdateBindings (Stetic.Component obj, IUnresolvedTypeDefinition cls)
+		void UpdateBindings (Stetic.Component obj, ITypeSymbol cls)
 		{
 			if (targetObject == null || cls == null)
 				return;
@@ -113,9 +116,8 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			if (objectSignals != null) {
 				Stetic.Signal[] signals = new Stetic.Signal [objectSignals.Count];
 				objectSignals.CopyTo (signals, 0);
-				var resolved = cls.Resolve (project);
 				foreach (Stetic.Signal signal in signals) {
-					if (FindSignalHandler (resolved, signal) == null) {
+					if (FindSignalHandler (cls, signal) == null) {
 						obj.RemoveSignal (signal);
 					}
 				}
@@ -127,14 +129,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				UpdateBindings (ob, cls);
 		}
 		
-		IMethod FindSignalHandler (IType cls, Stetic.Signal signal)
+		static IMethodSymbol FindSignalHandler (ITypeSymbol cls, Stetic.Signal signal)
 		{
-			foreach (var met in cls.GetMethods ()) {
-				if (met.Name == signal.Handler) {
-					return met;
-				}
-			}
-			return null;
+			return cls.GetMembers (signal.Handler).OfType<IMethodSymbol> ().FirstOrDefault ();
 		}
 
 		public void UpdateField (Stetic.Component obj, string oldName)
@@ -152,7 +149,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				return;
 			
 			if (cls != null) {
-				var f = ClassUtils.FindWidgetField (cls.Resolve (project).GetDefinition (), oldName);
+				var f = ClassUtils.FindWidgetField (cls, oldName);
 				if (f != null) {
 					MonoDevelop.Refactoring.Rename.RenameRefactoring.Rename (f, newName);
 				}
@@ -168,20 +165,35 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			var cls = GetClass ();
 			if (cls == null)
 				return;
-			
-			if (FindSignalHandler (cls.Resolve (project), signal) != null)
+
+			if (FindSignalHandler (cls, signal) != null)
 				return;
-			
-			var met = new DefaultUnresolvedMethod (cls, signal.Handler) {
-				Accessibility = Accessibility.Protected,
-				ReturnType = ReflectionHelper.ParseReflectionName (signal.SignalDescriptor.HandlerReturnTypeName)
-			};
+
+			var met = SyntaxFactory.MethodDeclaration (SyntaxFactory.ParseTypeName (signal.SignalDescriptor.HandlerReturnTypeName),
+			                                           signal.Handler)
+								   .WithBody (SyntaxFactory.Block ())
+								   .AddModifiers (SyntaxFactory.Token (SyntaxKind.ProtectedKeyword));
+
+			var parameters = new List<ParameterSyntax> ();
 			foreach (Stetic.ParameterDescriptor pinfo in signal.SignalDescriptor.HandlerParameters)
-				met.Parameters.Add (new DefaultUnresolvedParameter (ReflectionHelper.ParseReflectionName (pinfo.TypeName), pinfo.Name));
-			var resolvedCls = cls.Resolve (project).GetDefinition ();
-			CodeGenerationService.AddNewMember (resolvedCls, cls, met);
+				parameters.Add (SyntaxFactory.Parameter (new SyntaxList<AttributeListSyntax> (), new SyntaxTokenList (), SyntaxFactory.ParseTypeName (pinfo.TypeName), SyntaxFactory.Identifier (pinfo.Name), null));
+			met = met.AddParameterListParameters (parameters.ToArray ());
+
+			CodeGenerationService.AddNewMember (project, cls, GetSourceLocation (cls), met);
 		}
-		
+
+		static Location GetSourceLocation (INamedTypeSymbol cls)
+		{
+			foreach (var loc in cls.Locations) {
+				if (loc.IsInSource) {
+					if (!Path.GetDirectoryName (loc.SourceTree.FilePath).EndsWith ("gtk-gui", FilePath.PathComparison))
+						return loc;
+				}
+			}
+			
+			return cls.Locations.First ();
+		}
+
 		public void UpdateSignal (Stetic.Signal oldSignal, Stetic.Signal newSignal)
 		{
 			if (targetObject == null)
@@ -193,7 +205,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			var cls = GetClass ();
 			if (cls == null)
 				return;
-			IMethod met = FindSignalHandler (cls.Resolve (project), oldSignal);
+			var met = FindSignalHandler (cls, oldSignal);
 			if (met == null)
 				return;
 			MonoDevelop.Refactoring.Rename.RenameRefactoring.Rename (met, newSignal.Handler);
@@ -208,40 +220,45 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			string name = GetMemberName (obj);
 			var cls = GetClass ();
 			
-			if (FindField (cls.Resolve (project), name) != null)
+			if (FindField (cls, name) != null)
 				return;
 
-			Document doc = IdeApp.Workbench.OpenDocument (cls.Region.FileName, true);
+			var location = GetSourceLocation(cls);
+			var doc = IdeApp.Workbench.OpenDocument (location.SourceTree.FilePath, project, true);
 			
-			IEditableTextFile editor = doc.GetContent<IEditableTextFile> ();
+			var editor = doc.Editor;
 			if (editor != null) {
-				var resolvedCls = cls.Resolve (project).GetDefinition ();
-				CodeGenerationService.AddNewMember (resolvedCls, cls, GetFieldCode (cls, obj, name));
+				CodeGenerationService.AddNewMember (project, cls, cls.Locations.First (), GetFieldCode (cls, obj, name));
 			}
 		}
 		
-		IUnresolvedField GetFieldCode (IUnresolvedTypeDefinition cls, Stetic.Component obj, string name)
+		FieldDeclarationSyntax GetFieldCode (ITypeSymbol cls, Stetic.Component obj, string name)
 		{
-			return new DefaultUnresolvedField (cls, name) {
-				ReturnType = ReflectionHelper.ParseReflectionName (obj.Type.ClassName),
-				Accessibility = Accessibility.Protected
-		};
-	}
+			return SyntaxFactory.FieldDeclaration (
+				SyntaxFactory.VariableDeclaration (
+					SyntaxFactory.ParseTypeName (obj.Type.ClassName),
+					new SeparatedSyntaxList<VariableDeclaratorSyntax> {
+						SyntaxFactory.VariableDeclarator (name)
+					}
+				)
+			).AddModifiers (SyntaxFactory.Token (SyntaxKind.ProtectedKeyword));
+		}
+	
 		
-		IField FindField (IType cls, string name)
+		static IFieldSymbol FindField (ITypeSymbol cls, string name)
 		{
-			foreach (IField field in cls.GetFields ())
-				if (field.Name == name)
-					return field;
-			return null;
+			return cls
+				.GetMembers (name)
+				.OfType<IFieldSymbol> ()
+				.FirstOrDefault ();
 		}
 		
-		public IUnresolvedTypeDefinition GetClass ()
+		public INamedTypeSymbol GetClass ()
 		{
 			return GetClass (true);
 		}
 		
-		public IUnresolvedTypeDefinition GetClass (bool getUserClass)
+		public INamedTypeSymbol GetClass (bool getUserClass)
 		{
 			if (targetObject == null)
 				return null;
@@ -251,62 +268,59 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				return cls;
 				
 			// The class name may have changed. Try to guess the new name.
-			
-			var matches = new List<IUnresolvedTypeDefinition> ();
-			ParsedDocument unit = null;
-			var ctx = gproject.GetParserContext ();
-			var doc = TypeSystemService.ParseFile (project, classFile);
-			if (doc != null) {
-				unit = doc;
-				foreach (var fcls in unit.TopLevelTypeDefinitions) {
-					if (IsValidClass (fcls.Resolve (project), targetObject))
-						matches.Add (fcls);
-				}
-			}
-			
-			// If found the class, just return it
-			if (matches.Count == 1) {
-				cls = matches [0];
-				className = cls.FullName;
-				targetObject.Name = className;
-				gproject.SaveWindow (true, targetObject.Name);
-				return cls;
-			}
-			
-			// If not found, warn the user.
-			
-			if (unit != null && unit.TopLevelTypeDefinitions.Count > 0) {
-				using (SelectRenamedClassDialog dialog = new SelectRenamedClassDialog (unit.TopLevelTypeDefinitions.Select (c => c.Resolve (project)))) {
-					if (dialog.Run ()) {
-						className = dialog.SelectedClass;
-						if (className == null)
-							return null;
-						else {
-							targetObject.Name = className;
-							gproject.SaveWindow (true, targetObject.Name);
-							return gproject.FindClass (className);
-						}
-					}
-				}
-			} else {
-				MessageService.ShowError (GettextCatalog.GetString ("The class bound to the component '{0}' could not be found. This may be due to syntax errors in the source code file.", GetObjectName(targetObject)));
-			}
+//			TODO (roslyn port) - is that really required ? 
+//			var matches = new List<INamedTypeSymbol> ();
+//			ParsedDocument unit = null;
+//			var ctx = gproject.GetParserContext ();
+//			var doc = TypeSystemService.ParseFile (project, classFile);
+//			if (doc != null) {
+//				unit = doc;
+//				foreach (var fcls in unit.TopLevelTypeDefinitions) {
+//					if (IsValidClass (fcls, targetObject))
+//						matches.Add (fcls);
+//				}
+//			}
+//			
+//			// If found the class, just return it
+//			if (matches.Count == 1) {
+//				cls = matches [0];
+//				className = cls.GetFullName ();
+//				targetObject.Name = className;
+//				gproject.SaveWindow (true, targetObject.Name);
+//				return cls;
+//			}
+//			
+//			// If not found, warn the user.
+//			
+//			if (unit != null && unit.TopLevelTypeDefinitions.Count > 0) {
+//				using (var dialog = new SelectRenamedClassDialog (unit.TopLevelTypeDefinitions.Select (c => c.Resolve (project)))) {
+//					if (dialog.Run ()) {
+//						className = dialog.SelectedClass;
+//						if (className == null)
+//							return null;
+//						else {
+//							targetObject.Name = className;
+//							gproject.SaveWindow (true, targetObject.Name);
+//							return gproject.FindClass (className);
+//						}
+//					}
+//				}
+//			} else {
+//				MessageService.ShowError (GettextCatalog.GetString ("The class bound to the component '{0}' could not be found. This may be due to syntax errors in the source code file.", GetObjectName(targetObject)));
+//			}
 			
 			return null;
 		}
 		
-		static bool IsValidClass (IType cls, Stetic.Component obj)
+		static bool IsValidClass (ITypeSymbol cls, Stetic.Component obj)
 		{
+			if (cls.BaseType.SpecialType == SpecialType.System_Object)
+				return false;
 			string typeName = obj.Type.ClassName;
 			
-			foreach (var bt in cls.DirectBaseTypes) {
-				if (bt.FullName == typeName)
-					return true;
-				
-				if (IsValidClass (bt, obj))
-					return true;
-			}
-			return false;
+			if (cls.BaseType.GetFullName () == typeName)
+				return true;
+			return IsValidClass (cls.BaseType, obj);
 		}
 		
 		internal static string GetClassName (Stetic.Component obj)
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
index 551760fe69..c08d33c374 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
@@ -36,6 +36,7 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
 using System.Collections.Generic;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
@@ -171,19 +172,19 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			base.Dispose ();
 		}
 		
-		public override void Load (string fileName)
+		public override void Load (FileOpenInformation fileOpenInformation)
 		{
-			ContentName = fileName;
-			content.Load (fileName);
+			ContentName = fileOpenInformation.FileName;
+			content.Load (ContentName);
 		}
 		
 		public override Gtk.Widget Control {
 			get { return control; }
 		}
 		
-		public override void Save (string fileName)
+		public override void Save (FileSaveInformation fileSaveInformation)
 		{
-			content.Save (fileName);
+			content.Save (fileSaveInformation);
 		}
 		
 		public override bool IsDirty {
@@ -246,10 +247,10 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 
 		public void JumpTo (int line, int column)
 		{
-			IEditableTextBuffer ip = (IEditableTextBuffer) content.GetContent (typeof(IEditableTextBuffer));
+			var ip = (TextEditor) content.GetContent (typeof(TextEditor));
 			if (ip != null) {
 				ShowPage (0);
-				ip.SetCaretTo (line, column);
+				ip.SetCaretLocation (line, column);
 			}
 		}
 	}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs
index 603b0beccb..a5a71f065d 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs
@@ -30,6 +30,11 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using System;
+using ICSharpCode.NRefactory6.CSharp;
 
 
 namespace MonoDevelop.GtkCore.GuiBuilder
@@ -54,7 +59,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			if (fileName.IsNullOrEmpty)
 				return false;
 			
-			if (GetWindow (fileName) == null)
+			if (GetWindow (fileName, ownerProject) == null)
 				return false;
 			
 			excludeThis = true;
@@ -68,37 +73,41 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			excludeThis = true;
 			var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject);
 			var content = db.CreateContent (fileName, mimeType, ownerProject);
-			GuiBuilderView view = new GuiBuilderView (content, GetWindow (fileName));
+			var window = GetWindow (fileName, ownerProject);
+			if (window == null)
+				throw new InvalidOperationException ("GetWindow == null");
+			GuiBuilderView view = new GuiBuilderView (content, window);
 			excludeThis = false;
 			return view;
 		}
 		
-		internal static GuiBuilderWindow GetWindow (string file)
+		internal static GuiBuilderWindow GetWindow (string file, Project project)
 		{
 			if (!IdeApp.Workspace.IsOpen)
 				return null;
-
-			Project project = null;
-			foreach (Project p in IdeApp.Workspace.GetAllProjects ()) {
-				if (p.IsFileInProject (file)) {
-					project = p;
-					break;
-				}
-			}
-			
 			if (!GtkDesignInfo.HasDesignedObjects (project))
 				return null;
-
 			GtkDesignInfo info = GtkDesignInfo.FromProject (project);
 			if (file.StartsWith (info.GtkGuiFolder))
 				return null;
-			
-			var doc = TypeSystemService.ParseFile (project, file);
+			var docId = TypeSystemService.GetDocumentId (project, file);
+			if (docId == null)
+				return null;
+			var doc = TypeSystemService.GetCodeAnysisDocument (docId);
 			if (doc == null)
 				return null;
-
-			foreach (var t in doc.TopLevelTypeDefinitions) {
-				GuiBuilderWindow win = info.GuiBuilderProject.GetWindowForClass (t.FullName);
+			Microsoft.CodeAnalysis.SemanticModel semanticModel;
+			try {
+				semanticModel = doc.GetSemanticModelAsync ().Result;
+			} catch {
+				return null;
+			}
+			if (semanticModel == null)
+				return null;
+			var root = semanticModel.SyntaxTree.GetRoot ();
+			foreach (var classDeclaration in root.DescendantNodesAndSelf (child => !(child is BaseTypeDeclarationSyntax)).OfType<ClassDeclarationSyntax> ()) {
+				var c = semanticModel.GetDeclaredSymbol (classDeclaration);
+				GuiBuilderWindow win = info.GuiBuilderProject.GetWindowForClass (c.ToDisplayString (Microsoft.CodeAnalysis.SymbolDisplayFormat.CSharpErrorMessageFormat));
 				if (win != null)
 					return win;
 			}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
index e14826584a..719c4c3a08 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
@@ -37,9 +37,12 @@ using System.CodeDom.Compiler;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using System.Linq;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
@@ -337,16 +340,23 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		void OnFileAdded (object sender, ProjectFileEventArgs e)
 		{
 			foreach (ProjectFileEventInfo args in e) {
-				var doc = TypeSystemService.ParseFile (args.Project, args.ProjectFile.Name);
+				var docId = TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name);
+				if (docId == null)
+					continue;
+				var doc = TypeSystemService.GetCodeAnysisDocument (docId);
 				if (doc == null)
 					continue;
 	
 				string dir = Path.Combine (Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "stetic"), "deleted-designs");
 				if (!Directory.Exists (dir) || Directory.GetFiles (dir).Length == 0)
 					continue;
-	
-				foreach (var t in doc.TopLevelTypeDefinitions) {
-					string path = Path.Combine (dir, t.FullName + ".xml");
+				var semanticModel = doc.GetSemanticModelAsync ().Result;
+				if (semanticModel == null)
+					continue;
+
+				foreach (var classDeclaration in semanticModel.SyntaxTree.GetRoot ().DescendantNodesAndSelf (child => !(child is BaseTypeDeclarationSyntax)).OfType<ClassDeclarationSyntax> ()) {
+					var c = semanticModel.GetDeclaredSymbol (classDeclaration);
+					string path = Path.Combine (dir, c.ToDisplayString (Microsoft.CodeAnalysis.SymbolDisplayFormat.CSharpErrorMessageFormat) + ".xml");
 					if (!System.IO.File.Exists (path))
 						continue;
 					XmlDocument xmldoc = new XmlDocument ();
@@ -362,12 +372,21 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			ArrayList toDelete = new ArrayList ();
 
 			foreach (ProjectFileEventInfo args in e) {
-				var doc = TypeSystemService.ParseFile (args.Project, args.ProjectFile.Name);
+
+				var docId = TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name);
+				if (docId == null)
+					continue;
+				var doc = TypeSystemService.GetCodeAnysisDocument (docId);
 				if (doc == null)
 					continue;
+				var semanticModel = doc.GetSemanticModelAsync ().Result;
+				if (semanticModel == null)
+					continue;
+
 	
-				foreach (var t in doc.TopLevelTypeDefinitions) {
-					GuiBuilderWindow win = GetWindowForClass (t.FullName);
+				foreach (var classDeclaration in semanticModel.SyntaxTree.GetRoot ().DescendantNodesAndSelf (child => !(child is BaseTypeDeclarationSyntax)).OfType<ClassDeclarationSyntax> ()) {
+					var c = semanticModel.GetDeclaredSymbol (classDeclaration);
+					GuiBuilderWindow win = GetWindowForClass (c.ToDisplayString (Microsoft.CodeAnalysis.SymbolDisplayFormat.MinimallyQualifiedFormat));
 					if (win != null)
 						toDelete.Add (win);
 				}
@@ -444,8 +463,8 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				}
 			}
 			return null;
-		}

-

+		}
+
 		public GuiBuilderWindow GetWindowForFile (FilePath fileName)
 		{
 			if (Windows != null) {
@@ -466,8 +485,8 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				}
 			}
 			return null;
-		}

-

+		}
+
 		public Stetic.ActionGroupInfo GetActionGroupForFile (FilePath fileName)
 		{
 			foreach (Stetic.ActionGroupInfo group in SteticProject.ActionGroups) {
@@ -480,67 +499,70 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		public Stetic.ActionGroupInfo GetActionGroup (string name)
 		{
 			return SteticProject.GetActionGroup (name);
-		}

-

+		}
+
 		public FilePath GetSourceCodeFile (Stetic.ProjectItemInfo obj)
 		{
 			return GetSourceCodeFile (obj, true);
-		}

-

+		}
+
 		public FilePath GetSourceCodeFile (Stetic.ProjectItemInfo obj, bool getUserClass)
 		{
 			var cls = GetClass (obj, getUserClass);
 			if (cls != null)
-				return cls.Region.FileName;
+				return cls.Locations.First ().SourceTree.FilePath;
 			return null;
 		}
 		
-		IUnresolvedTypeDefinition GetClass (Stetic.ProjectItemInfo obj, bool getUserClass)
+		INamedTypeSymbol GetClass (Stetic.ProjectItemInfo obj, bool getUserClass)
 		{
 			string name = CodeBinder.GetClassName (obj);
 			return FindClass (name, getUserClass);
 		}
 		
-		public IUnresolvedTypeDefinition FindClass (string className)
+		public INamedTypeSymbol FindClass (string className)
 		{
 			return FindClass (className, true);
 		}
 		
-		public IUnresolvedTypeDefinition FindClass (string className, bool getUserClass)
-		{

+		public INamedTypeSymbol FindClass (string className, bool getUserClass)
+		{
 			FilePath gui_folder = GtkDesignInfo.FromProject (project).GtkGuiFolder;
 			var ctx = GetParserContext ();
 			if (ctx == null)
 				return null;
-			var classes = ctx.MainAssembly.GetAllTypeDefinitions ();
-			if (classes == null)
-				return null;
-			foreach (var cls in classes) {
-				if (cls.FullName == className) {
+			foreach (var cls in ctx.GetAllTypesInMainAssembly ()) {
+				if (cls.GetFullName() == className) {
 					if (getUserClass) {
 						// Return this class only if it is declared outside the gtk-gui
 						// folder. Generated partial classes will be ignored.
-						foreach (var part in cls.Parts) {
-							if (!string.IsNullOrEmpty (part.Region.FileName) && !((FilePath)cls.Region.FileName).IsChildPathOf (gui_folder)) {
-								return part;
+						foreach (var part in cls.Locations) {
+							var filePath = part.SourceTree.FilePath;
+							if (!string.IsNullOrEmpty (filePath) && !((FilePath)filePath).IsChildPathOf (gui_folder)) {
+								return cls;
 							}
 						}
 						continue;
 					}
-					if (getUserClass && !string.IsNullOrEmpty (cls.Region.FileName) && ((FilePath)cls.Region.FileName).IsChildPathOf (gui_folder))
+					if (getUserClass && !string.IsNullOrEmpty (cls.Locations.First ().SourceTree.FilePath) && ((FilePath)cls.Locations.First ().SourceTree.FilePath).IsChildPathOf (gui_folder))
 						continue;
-					return cls.Parts.First ();
+					return cls;
 				}
 			}
 			return null;
 		}
 		
-		public ICompilation GetParserContext ()
+		public Compilation GetParserContext ()
 		{
-			var dom = TypeSystemService.GetCompilation (Project);
+			System.Threading.Tasks.Task<Compilation> task;
+			do {
+				task = TypeSystemService.GetCompilationAsync (Project);
+				task.Wait (500);
+			} while (!task.IsCompleted);
+
+			var dom = task.Result;
 			if (dom != null && needsUpdate) {
 				needsUpdate = false;
-//				dom.ForceUpdate ();
 			}
 			return dom;
 		}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
index f7f544a6ff..c248010c56 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
@@ -43,6 +43,7 @@ using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.TypeSystem;
 using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
 
 
 namespace MonoDevelop.GtkCore.GuiBuilder
@@ -324,7 +325,6 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				component = item.Component;
 			
 			CodeCompileUnit cu = new CodeCompileUnit ();
-			
 			if (project.UsePartialTypes) {
 				CodeNamespace cns = new CodeNamespace (ns);
 				cu.Namespaces.Add (cns);
@@ -334,6 +334,11 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				type.Attributes = MemberAttributes.Public;
 				type.TypeAttributes = System.Reflection.TypeAttributes.Public;
 				cns.Types.Add (type);
+				type.Members.Add (
+					new CodeMemberMethod () {
+						Name = "Build"
+					}
+				);
 				
 				foreach (Stetic.ObjectBindInfo binfo in component.GetObjectBindInfo ()) {
 					// When a component is being renamed, we have to generate the 
@@ -370,10 +375,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				text = fileStream.ToString ();
 				text = FormatGeneratedFile (fileName, text, project, provider);
 			}
-			
 			if (saveToFile)
 				File.WriteAllText (fileName, text);
-			TypeSystemService.ParseFile (project, fileName);
+			TypeSystemService.NotifyFileChange (fileName, text);
 //			
 //			if (ProjectDomService.HasDom (project)) {
 //				// Only update the parser database if the project is actually loaded in the IDE.
@@ -587,7 +591,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		
 		static string StripHeaderAndBlankLines (string text, CodeDomProvider provider)
 		{
-			Mono.TextEditor.TextDocument doc = new Mono.TextEditor.TextDocument ();
+			var doc = TextEditorFactory.CreateNewDocument ();
 			doc.Text = text;
 			int realStartLine = 0;
 			for (int i = 1; i <= doc.LineCount; i++) {
@@ -605,11 +609,11 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			if (provider is Microsoft.CSharp.CSharpCodeProvider) {
 				bool previousWasBlank = false;
 				for (int i = 1; i <= doc.LineCount; i++) {
-					Mono.TextEditor.DocumentLine line = doc.GetLine (i);
+					var line = doc.GetLine (i);
 					bool isBlank, isBracket;
 					CheckLine (doc, line, out isBlank, out isBracket);
 					if (isBlank && previousWasBlank && line.LengthIncludingDelimiter > 0) {
-						doc.Remove (line.Offset, line.LengthIncludingDelimiter);
+						doc.RemoveText (line.Offset, line.LengthIncludingDelimiter);
 						i--;
 					}
 					previousWasBlank = isBlank || isBracket;
@@ -617,10 +621,10 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			}
 			
 			int offset = doc.GetLine (realStartLine).Offset;
-			return doc.GetTextAt (offset, doc.TextLength - offset);
+			return doc.GetTextAt (offset, doc.Length - offset);
 		}
 
-		static void CheckLine (Mono.TextEditor.TextDocument doc, Mono.TextEditor.DocumentLine line, out bool isBlank, out bool isBracket)
+		static void CheckLine (IReadonlyTextDocument doc, IDocumentLine line, out bool isBlank, out bool isBracket)
 		{
 			isBlank = true;
 			isBracket = false;
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
index 0a33c84717..9193618b35 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
@@ -28,6 +28,7 @@
 
 
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using System.ComponentModel;
 
@@ -43,6 +44,7 @@ using MonoDevelop.DesignerSupport;
 using Gtk;
 using Gdk;
 using MonoDevelop.Ide;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
@@ -90,7 +92,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			}
 		}
 		
-		void ISupportsProjectReload.Update (Project project)
+		void ISupportsProjectReload.Update (MonoDevelop.Projects.Project project)
 		{
 			if (gproject != null && gproject.Project == project)
 				return;
@@ -101,7 +103,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			CloseDesigner ();
 			CloseProject ();
 			if (project != null) {
-				GuiBuilderWindow w = GuiBuilderDisplayBinding.GetWindow (this.ContentName);
+				GuiBuilderWindow w = GuiBuilderDisplayBinding.GetWindow (this.ContentName, project);
 				if (w != null) {
 					AttachWindow (w);
 					if (designerStatus != null)
@@ -325,16 +327,16 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			codeBinder.UpdateSignal (args.OldSignal, args.Signal);
 		}
 		
-		public override void Save (string fileName)
+		public override void Save (FileSaveInformation fileSaveInformation)
 		{
-			base.Save (fileName);
+			base.Save (fileSaveInformation);
 			
 			if (designer == null)
 				return;
 			
 			string oldBuildFile = GuiBuilderService.GetBuildCodeFileName (gproject.Project, window.RootWidget.Name);
 			
-			codeBinder.UpdateBindings (fileName);
+			codeBinder.UpdateBindings (fileSaveInformation.FileName);
 			if (!ErrorMode) {
 				if (designer != null)
 					designer.Save ();
@@ -369,12 +371,13 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			var cls = codeBinder.GetClass ();
 			if (cls == null)
 				return;
-			foreach (var met in cls.Methods) {
-				if (met.Name == signal.Handler) {
-					ShowPage (0);
-					JumpTo (met.Region.BeginLine, met.Region.BeginColumn);
-					break;
-				}
+			var met = cls
+				.GetMembers (signal.Handler)
+				.OfType<IMethodSymbol> ()
+				.FirstOrDefault ();
+			if (met != null) {
+				ShowPage (0);
+				IdeApp.ProjectOperations.JumpToDeclaration (met);
 			}
 		}
 		
@@ -490,7 +493,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			if (node.Reference == null)
 				return;
 			
-			ProjectReference pref;
+			MonoDevelop.Projects.ProjectReference pref;
 			
 			// If the class name includes an assembly name it means that the
 			// widget is implemented in another assembly, not in the one that
@@ -506,16 +509,16 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				if (asm == null)
 					return;
 				if (gproject.Project.AssemblyContext.GetPackagesFromFullName (asm).Length > 0) {
-					pref = new ProjectReference (ReferenceType.Package, asm);
+					pref = new MonoDevelop.Projects.ProjectReference (ReferenceType.Package, asm);
 				} else {
 					asm = gproject.Project.AssemblyContext.GetAssemblyLocation (asm, gproject.Project.TargetFramework);
-					pref = new ProjectReference (ReferenceType.Assembly, asm);
+					pref = new MonoDevelop.Projects.ProjectReference (ReferenceType.Assembly, asm);
 				}
 			}
 			else
-				pref = new ProjectReference (node.ReferenceType, node.Reference);
+				pref = new MonoDevelop.Projects.ProjectReference (node.ReferenceType, node.Reference);
 			
-			foreach (ProjectReference pr in gproject.Project.References) {
+			foreach (var pr in gproject.Project.References) {
 				if (pr.Reference == pref.Reference)
 					return;
 			}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
index 6b16de95e7..d3f30ee9e0 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
@@ -37,7 +37,10 @@ using MonoDevelop.Projects;
 using MonoDevelop.Projects.Text;
 using MonoDevelop.GtkCore.Dialogs;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
@@ -107,9 +110,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			// Find the classes that could be bound to this design
 			var ctx = fproject.GetParserContext ();
 			ArrayList list = new ArrayList ();
-			foreach (var cls in ctx.MainAssembly.GetAllTypeDefinitions ()) {
+			foreach (var cls in ctx.GetAllTypesInMainAssembly ()) {
 				if (IsValidClass (cls))
-					list.Add (cls.FullName);
+					list.Add (cls.GetFullName ());
 			}
 		
 			// Ask what to do
@@ -224,27 +227,23 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			}
 		}
 		
-		internal bool IsValidClass (IType cls)
+		internal bool IsValidClass (ITypeSymbol cls)
 		{
-			foreach (var bt in cls.DirectBaseTypes) {
-				if (bt.ReflectionName == rootWidget.Component.Type.ClassName)
-					return true;
-				
-				var baseCls = bt;
-				if (baseCls != null && IsValidClass (baseCls))
-					return true;
-			}
-			return false;
+			if (cls.SpecialType == Microsoft.CodeAnalysis.SpecialType.System_Object)
+				return false;
+			if (cls.BaseType.GetFullName () == rootWidget.Component.Type.ClassName)
+				return true;
+			return IsValidClass (cls.BaseType);
 		}
 	}
 	
 	class OpenDocumentFileProvider: ITextFileProvider
-	{

-		public IEditableTextFile GetEditableTextFile (FilePath filePath)
+	{
+		public ITextDocument GetEditableTextFile (FilePath filePath)
 		{
-			foreach (Document doc in IdeApp.Workbench.Documents) {
+			foreach (var doc in IdeApp.Workbench.Documents) {
 				if (doc.FileName == filePath) {
-					IEditableTextFile ef = doc.GetContent<IEditableTextFile> ();
+					var ef = doc.Editor;
 					if (ef != null) return ef;
 				}
 			}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj
index 6e4960f5ff..d59b56aa8b 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj
@@ -61,6 +61,38 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -93,11 +125,6 @@
       <Name>libsteticui</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
       <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
       <Name>MonoDevelop.Refactoring</Name>
@@ -108,11 +135,6 @@
       <Name>Mono.Cecil</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -123,11 +145,32 @@
       <Name>Xwt</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
+      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
+      <Name>Mono.TextEditor</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\CSharpBinding\CSharpBinding.csproj">
+      <Project>{07CC7654-27D6-421D-A64C-0FFA40456FA2}</Project>
+      <Name>CSharpBinding</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
+      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
     <None Include="icons\window.png" />
     <None Include="icons\dialog.png" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MonoDevelop.GtkCore.addin.xml">
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs
index 14f8981c79..1a9d592dfb 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs
@@ -33,9 +33,11 @@ using System.CodeDom;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
-
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Refactoring;
 
 namespace MonoDevelop.GtkCore
 {
@@ -143,7 +145,7 @@ namespace MonoDevelop.GtkCore
 			StringCollection tb_names = new StringCollection ();
 			foreach (var cls in parser.GetToolboxItems().Values) {
 				UpdateClass (parser, stetic, cls, null);
-				tb_names.Add (cls.FullName);
+				tb_names.Add (cls.GetFullName ());
 			}
 
 			List<XmlElement> toDelete = new List<XmlElement> ();
@@ -160,9 +162,9 @@ namespace MonoDevelop.GtkCore
 			Save ();
 		}
 
-		void UpdateClass (WidgetParser parser, Stetic.Project stetic, ITypeDefinition widgetClass, ITypeDefinition wrapperClass)
+		void UpdateClass (WidgetParser parser, Stetic.Project stetic, ITypeSymbol widgetClass, ITypeSymbol wrapperClass)
 		{
-			string typeName = widgetClass.FullName;
+			string typeName = widgetClass.GetFullName();
 			string basetypeName = GetBaseType (parser, widgetClass, stetic);
 			XmlElement objectElem = (XmlElement) SelectSingleNode ("objects/object[@type='" + typeName + "']");
 			
@@ -171,14 +173,14 @@ namespace MonoDevelop.GtkCore
 				// The widget class is not yet in the XML file. Create an element for it.
 				objectElem = CreateElement ("object");
 				objectElem.SetAttribute ("type", typeName);
-				string category = parser.GetCategory (widgetClass);
+				string category = widgetClass.GetComponentCategory();
 				if (category == String.Empty)
 					objectElem.SetAttribute ("palette-category", "General");
 				else
 					objectElem.SetAttribute ("palette-category", category);
 				objectElem.SetAttribute ("allow-children", "false");
 				if (wrapperClass != null)
-					objectElem.SetAttribute ("wrapper", wrapperClass.FullName);
+					objectElem.SetAttribute ("wrapper", wrapperClass.GetFullName());
 				
 				// By default add a reference to Gtk.Widget properties and events
 				XmlElement itemGroups = objectElem.OwnerDocument.CreateElement ("itemgroups");
@@ -194,7 +196,7 @@ namespace MonoDevelop.GtkCore
 			UpdateObject (parser, basetypeName, objectElem, widgetClass, wrapperClass);
 		}
 		
-		string GetBaseType (WidgetParser parser, ITypeDefinition widgetClass, Stetic.Project stetic)
+		string GetBaseType (WidgetParser parser, ITypeSymbol widgetClass, Stetic.Project stetic)
 		{
 			string[] types = stetic.GetWidgetTypes ();
 			Hashtable typesHash = new Hashtable ();
@@ -205,9 +207,9 @@ namespace MonoDevelop.GtkCore
 			return ret ?? "Gtk.Widget";
 		}
 		
-		void UpdateObject (WidgetParser parser, string topType, XmlElement objectElem, ITypeDefinition widgetClass, ITypeDefinition wrapperClass)
+		void UpdateObject (WidgetParser parser, string topType, XmlElement objectElem, ITypeSymbol widgetClass, ITypeSymbol wrapperClass)
 		{
-			if (widgetClass.IsPublic)
+			if (widgetClass.DeclaredAccessibility == Accessibility.Public)
 				objectElem.RemoveAttribute ("internal");
 			else
 				objectElem.SetAttribute ("internal", "true");
@@ -219,10 +221,10 @@ namespace MonoDevelop.GtkCore
 			if (wrapperClass != null)
 				parser.CollectMembers (wrapperClass, false, null, properties, events);
 			
-			foreach (IProperty prop in properties.Values)
+			foreach (IPropertySymbol prop in properties.Values)
 				MergeProperty (parser, objectElem, prop);
 			
-			foreach (IEvent ev in events.Values)
+			foreach (IEventSymbol ev in events.Values)
 				MergeEvent (parser, objectElem, ev);
 			
 			// Remove old properties
@@ -246,7 +248,7 @@ namespace MonoDevelop.GtkCore
 			}
 		}
 		
-		void MergeProperty (WidgetParser parser, XmlElement objectElem, IProperty prop)
+		void MergeProperty (WidgetParser parser, XmlElement objectElem, IPropertySymbol prop)
 		{
 			XmlElement itemGroups = objectElem ["itemgroups"];
 			if (itemGroups == null) {
@@ -254,8 +256,8 @@ namespace MonoDevelop.GtkCore
 				objectElem.AppendChild (itemGroups);
 			}
 			
-			string cat = parser.GetCategory (prop);
-			XmlElement itemGroup = GetItemGroup (prop.DeclaringType, itemGroups, cat, "Properties");
+			string cat = prop.GetComponentCategory ();
+			XmlElement itemGroup = GetItemGroup (prop.ContainingType, itemGroups, cat, "Properties");
 			
 			XmlElement propElem = (XmlElement) itemGroup.SelectSingleNode ("property[@name='" + prop.Name + "']");
 			if (propElem == null) {
@@ -265,7 +267,7 @@ namespace MonoDevelop.GtkCore
 			}
 		}
 		
-		void MergeEvent (WidgetParser parser, XmlElement objectElem, IEvent evnt)
+		void MergeEvent (WidgetParser parser, XmlElement objectElem, IEventSymbol evnt)
 		{
 			XmlElement itemGroups = objectElem ["signals"];
 			if (itemGroups == null) {
@@ -273,8 +275,8 @@ namespace MonoDevelop.GtkCore
 				objectElem.AppendChild (itemGroups);
 			}
 			
-			string cat = parser.GetCategory (evnt);
-			XmlElement itemGroup = GetItemGroup (evnt.DeclaringType, itemGroups, cat, "Signals");
+			string cat = evnt.GetComponentCategory ();
+			XmlElement itemGroup = GetItemGroup (evnt.ContainingType, itemGroups, cat, "Signals");
 			
 			XmlElement signalElem = (XmlElement) itemGroup.SelectSingleNode ("signal[@name='" + evnt.Name + "']");
 			if (signalElem == null) {
@@ -284,7 +286,7 @@ namespace MonoDevelop.GtkCore
 			}
 		}
 		
-		XmlElement GetItemGroup (IType cls, XmlElement itemGroups, string cat, string groupName)
+		XmlElement GetItemGroup (ITypeSymbol cls, XmlElement itemGroups, string cat, string groupName)
 		{
 			XmlElement itemGroup;
 			
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
index e9642c0d0e..898b68a8cc 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
@@ -92,8 +92,8 @@ namespace MonoDevelop.GtkCore
 			string fileName = fileTemplate.GetFileName (policyParent, project, language, directory, name);
 			fileTemplate.AddToProject (policyParent, project, language, directory, name);
 
-			TypeSystemService.ParseFile (project, fileName);
-			
+			FileService.NotifyFileChanged (fileName);
+
 			DotNetProject netProject = project as DotNetProject;
 			string ns = netProject != null ? netProject.GetDefaultNamespace (fileName) : "";
 			string cname = Path.GetFileNameWithoutExtension (fileName);
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
index 71d2d8d953..4a8a594040 100755..100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
@@ -33,193 +33,99 @@ using System.CodeDom;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.GtkCore
 {
 
 	public class WidgetParser
 	{
-		ICompilation ctx;
+		Compilation ctx;
 
-		public ICompilation Ctx {
+		public Compilation Ctx {
 			get {
 				return ctx;
 			}
 		}
 		
-		public WidgetParser (ICompilation ctx)
+		public WidgetParser (Compilation ctx)
 		{
 			this.ctx = ctx;
 		}
 		
-		public Dictionary<string, ITypeDefinition> GetToolboxItems ()
+		static bool IsWidget(INamedTypeSymbol type)
 		{
-			Dictionary<string, ITypeDefinition> tb_items = new Dictionary<string, ITypeDefinition> ();
+			if (type.SpecialType == SpecialType.System_Object)
+				return false;
+			if (type.GetFullName () == "Gtk.Widget")
+				return true;
+			
+			return IsWidget (type.BaseType);
+		}
+		
+		public Dictionary<string, INamedTypeSymbol> GetToolboxItems ()
+		{
+			var tb_items = new Dictionary<string, INamedTypeSymbol> ();
 
-			var wt = ctx.FindType (new FullTypeName ("Gtk.Widget"));
-			if (wt != null && !(wt is UnknownType)) {
-				foreach (var t in wt.GetSubTypeDefinitions ()) {
-					if (IsToolboxWidget (t))
-						tb_items [t.FullName] = t;
-				}
+			foreach (var t in ctx.GetAllTypesInMainAssembly ()) {
+				if (t.IsToolboxItem() && IsWidget(t))
+					tb_items [t.GetFullName ()] = t;
 			}
 			
 			return tb_items;
 		}
 
-		public void CollectMembers (ITypeDefinition cls, bool inherited, string topType, ListDictionary properties, ListDictionary events)
+		public void CollectMembers (ITypeSymbol cls, bool inherited, string topType, ListDictionary properties, ListDictionary events)
 		{
-			if (cls.FullName == topType)
+			if (cls.GetFullName () == topType)
 				return;
 
-			foreach (IProperty prop in cls.Properties)
+			foreach (var prop in cls.GetMembers ().OfType<IPropertySymbol> ())
 				if (IsBrowsable (prop))
 					properties [prop.Name] = prop;
 
-			foreach (IEvent ev in cls.Events)
+			foreach (var ev in cls.GetMembers ().OfType<IEventSymbol> ())
 				if (IsBrowsable (ev))
 					events [ev.Name] = ev;
 					
 			if (inherited) {
-				foreach (var bcls in cls.DirectBaseTypes) {
-					if (bcls.GetDefinition () != null && bcls.Kind != TypeKind.Class)
-						CollectMembers (bcls.GetDefinition (), true, topType, properties, events);
-				}
+				CollectMembers (cls.BaseType, true, topType, properties, events);
 			}
 		}
 		
-		public string GetBaseType (ITypeDefinition cls, Hashtable knownTypes)
+		public string GetBaseType (ITypeSymbol cls, Hashtable knownTypes)
 		{
-			foreach (var bt in cls.DirectBaseTypes) {
-				string name = bt.ReflectionName;
-				if (knownTypes.Contains (name))
-					return name;
-			}
-
-			foreach (var bcls in cls.DirectBaseTypes) {
-				if (bcls.GetDefinition () != null) {
-					string ret = GetBaseType (bcls.GetDefinition (), knownTypes);
-					if (ret != null)
-						return ret;
-				}
-			}
-			return null;
+			if (cls.SpecialType == SpecialType.System_Object)
+				return null;
+			if (knownTypes.Contains (cls.BaseType.GetFullName ()))
+				return cls.BaseType.GetFullName ();
+			return GetBaseType (cls.BaseType, knownTypes);
 		}
 		
-		public string GetCategory (IEntity decoration)
-		{
-//			foreach (IAttributeSection section in decoration.Attributes) {
-				foreach (IAttribute at in decoration.Attributes) {
-					var type = at.AttributeType;
-					switch (type.ReflectionName) {
-					case "Category":
-					case "CategoryAttribute":
-					case "System.ComponentModel.Category":
-					case "System.ComponentModel.CategoryAttribute":
-						break;
-					default:
-						continue;
-					}
-					var pargs = at.PositionalArguments;
-					if (pargs != null && pargs.Count > 0) {
-						var val = pargs[0] as ConstantResolveResult;
-						if (val != null && val.ConstantValue is string)
-							return val.ConstantValue.ToString ();
-					}
-				}
-	//	}
-			return "";
-		}
 		
-		public ITypeDefinition GetClass (string classname)
+		public INamedTypeSymbol GetClass (string classname)
 		{
-			string name, ns;
-			int idx =classname.LastIndexOf ('.');
-			if (idx >= 0){
-				ns = classname.Substring (0, idx);
-				name = classname.Substring (idx + 1);
-			} else {
-				ns = "";
-				name = classname;
-			}
-			return ctx.MainAssembly.GetTypeDefinition (ns, name, 0);
+			return ctx.GetTypeByMetadataName (classname);
 		}
 
-		public bool IsBrowsable (IMember member)
+		public bool IsBrowsable (ISymbol member)
 		{
-			if (!member.IsPublic)
+			if (member.DeclaredAccessibility != Accessibility.Public)
 				return false;
 
-			IProperty prop = member as IProperty;
+			var prop = member as IPropertySymbol;
 			if (prop != null) {
-				if (!prop.CanGet || !prop.CanSet)
+				if (prop.GetMethod == null || prop.SetMethod == null)
 					return false;
-				if (Array.IndexOf (supported_types, prop.ReturnType.ReflectionName) == -1)
+				if (Array.IndexOf (supported_types, prop.Type.GetFullName ()) == -1)
 					return false;
 			}
 
-	//		foreach (IAttributeSection section in member.Attributes) {
-				foreach (IAttribute at in member.Attributes) {
-					var type = at.AttributeType;
-					switch (type.ReflectionName) {
-					case "Browsable":
-					case "BrowsableAttribute":
-					case "System.ComponentModel.Browsable":
-					case "System.ComponentModel.BrowsableAttribute":
-						break;
-					default:
-						continue;
-					}
-					var pargs = at.PositionalArguments;
-					if (pargs != null && pargs.Count > 0) {
-						var val = pargs[0] as ConstantResolveResult;
-						if (val.ConstantValue is bool) {
-							return (bool) val.ConstantValue;
-						}
-					}
-				}
-		//	}
-			return true;
-		}
-		
-		public bool IsToolboxWidget (ITypeDefinition cls)
-		{
-			if (!cls.IsPublic)
-				return false;
-
-			foreach (IAttribute at in cls.Attributes) {
-				var type = at.AttributeType;
-				switch (type.ReflectionName) {
-				case "ToolboxItem":
-				case "ToolboxItemAttribute":
-				case "System.ComponentModel.ToolboxItem":
-				case "System.ComponentModel.ToolboxItemAttribute":
-					break;
-				default:
-					continue;
-				}
-				var pargs = at.PositionalArguments;
-				if (pargs != null && pargs.Count > 0) {
-					var val = pargs[0] as ConstantResolveResult;
-					if (val.ConstantValue == null)
-						return false;
-					else if (val.ConstantValue is bool)
-						return (bool) val.ConstantValue;
-					else 
-						return val.ConstantValue != null;
-				}
-			}
-
-			foreach (var bcls in cls.DirectBaseTypes) {
-				if (bcls.GetDefinition () != null && bcls.Kind != TypeKind.Interface)
-					return IsToolboxWidget (bcls.GetDefinition ());
-			}
-
-			return false;
+			return member.IsDesignerBrowsable ();
 		}
 		
 		static string[] supported_types = new string[] {
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorCell.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorCell.cs
index faec75ffc3..b6a0db429e 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorCell.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorCell.cs
@@ -33,7 +33,7 @@ namespace Stetic
 			editors[typeof (float)] = typeof (Stetic.Editor.FloatRange);
 			editors[typeof (double)] = typeof (Stetic.Editor.FloatRange);
 			editors[typeof (char)] = typeof (Stetic.Editor.Char);
-			editors[typeof (string)] = typeof (Stetic.Editor.TextEditor);
+			editors[typeof (string)] = typeof (Stetic.Editor.PropertyTextEditor);
 			editors[typeof (DateTime)] = typeof (Stetic.Editor.DateTimeEditorCell);
 			editors[typeof (TimeSpan)] = typeof (Stetic.Editor.TimeSpanEditorCell);
 			editors[typeof (string[])] = typeof (Stetic.Editor.StringArray);
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TextEditor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/PropertyTextEditor.cs
index d2c135a2a6..6f8c996c11 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TextEditor.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/PropertyTextEditor.cs
@@ -5,14 +5,14 @@ using Gdk;
 
 namespace Stetic.Editor
 {
-	public class TextEditor: Gtk.HBox, IPropertyEditor
+	public class PropertyTextEditor: Gtk.HBox, IPropertyEditor
 	{
 		protected Gtk.Entry entry;
 		protected Gtk.Button button;
 		PropertyDescriptor prop;
 		object obj;
 		
-		public TextEditor()
+		public PropertyTextEditor()
 		{
 			Spacing = 3;
 			entry = new Entry ();
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Text.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Text.cs
index 667ccb2537..4bb92de628 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Text.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Text.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Stetic.Editor 
 {
-	public class Text : TextEditor 
+	public class Text : PropertyTextEditor 
 	{
 		public Text ()
 		{
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj b/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj
index eb1701a30e..3f8982f8ca 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj
@@ -111,7 +111,6 @@
     <Compile Include="editor\StringArray.cs" />
     <Compile Include="editor\Text.cs" />
     <Compile Include="editor\TextBox.cs" />
-    <Compile Include="editor\TextEditor.cs" />
     <Compile Include="editor\TextEditorDialog.cs" />
     <Compile Include="editor\ThemedIcon.cs" />
     <Compile Include="editor\ThemedIconList.cs" />
@@ -224,6 +223,7 @@
     <Compile Include="TopLevelWindow.cs" />
     <Compile Include="wrapper\NotifyWorkaround.cs" />
     <Compile Include="editor\GtkWorkarounds.cs" />
+    <Compile Include="editor\PropertyTextEditor.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="stetic.glade">
diff --git a/main/src/addins/MonoDevelop.GtkCore/packages.config b/main/src/addins/MonoDevelop.GtkCore/packages.config
new file mode 100644
index 0000000000..12fcbf164a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.GtkCore/packages.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj
index 90f243d1ab..62f6447fdc 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj
@@ -93,11 +93,6 @@
     <Folder Include="MonoDevelop.HexEditor\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
       <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
       <Name>MonoDevelop.Core</Name>
@@ -108,11 +103,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
@@ -133,11 +123,6 @@
       <Name>MonoDevelop.AssemblyBrowser</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\CSharpBinding\CSharpBinding.csproj">
       <Project>{07CC7654-27D6-421D-A64C-0FFA40456FA2}</Project>
       <Name>CSharpBinding</Name>
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs
index b4f8bc4820..44fc7fac18 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs
@@ -32,6 +32,7 @@ using Mono.MHex.Data;
 using MonoDevelop.Ide.Gui.Content;
 using Xwt;
 using MonoDevelop.Ide.Fonts;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.HexEditor
 {
@@ -50,7 +51,7 @@ namespace MonoDevelop.HexEditor
 		{
 			hexEditor.HexEditorStyle = new MonoDevelopHexEditorStyle (hexEditor);
 			SetOptions ();
-			MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance.Changed += delegate {
+			DefaultSourceEditorOptions.Instance.Changed += delegate {
 				SetOptions ();
 			};
 			hexEditor.HexEditorData.Replaced += delegate {
@@ -67,15 +68,16 @@ namespace MonoDevelop.HexEditor
 			hexEditor.Repaint ();
 		}
 		
-		public override void Save (string fileName)
+		public override void Save (FileSaveInformation fileSaveInformation)
 		{
-			File.WriteAllBytes (fileName, hexEditor.HexEditorData.Bytes);
-			ContentName = fileName;
+			File.WriteAllBytes (fileSaveInformation.FileName, hexEditor.HexEditorData.Bytes);
+			ContentName = fileSaveInformation.FileName;
 			this.IsDirty = false;
 		}
 		
-		public override void Load (string fileName)
+		public override void Load (FileOpenInformation fileOpenInformation)
 		{
+			var fileName = fileOpenInformation.FileName;
 			using (Stream stream = File.OpenRead (fileName)) { 
 				hexEditor.HexEditorData.Buffer = ArrayBuffer.Load (stream);
 			}
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs
index e63dee04d6..7897809fdd 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs
@@ -33,6 +33,7 @@ using MonoDevelop.Debugger;
 using MonoDevelop.Core;
 
 using Mono.MHex.Data;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.HexEditor
 {
@@ -82,7 +83,7 @@ namespace MonoDevelop.HexEditor
 
 		void SetHexEditorOptions ()
 		{
-			hexEditor.Options.FontName = MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance.FontName;
+			hexEditor.Options.FontName = DefaultSourceEditorOptions.Instance.FontName;
 			hexEditor.PurgeLayoutCaches ();
 			hexEditor.Repaint ();
 		}
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs
index 24d4bb1105..10ec8b0986 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs
@@ -25,13 +25,13 @@
 // THE SOFTWARE.
 
 using System;
-using Mono.TextEditor.Highlighting;
 using Mono.MHex.Rendering;
 using Xwt;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
-using Mono.TextEditor;
 using Xwt.Drawing;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
 
 namespace MonoDevelop.HexEditor
 {
diff --git a/main/src/addins/MonoDevelop.PackageManagement/AddinInfo.cs b/main/src/addins/MonoDevelop.PackageManagement/AddinInfo.cs
index 4e583304c7..31d414ff3a 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/AddinInfo.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/AddinInfo.cs
@@ -14,3 +14,4 @@ using Mono.Addins.Description;
 [assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]

 [assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]

 [assembly:AddinDependency ("DesignerSupport", MonoDevelop.BuildInfo.Version)]

+[assembly:AddinDependency ("Refactoring", MonoDevelop.BuildInfo.Version)]

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Refactoring/PackageCodeDiagnosticProvider.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Refactoring/PackageCodeDiagnosticProvider.cs
new file mode 100644
index 0000000000..7601ee0c01
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Refactoring/PackageCodeDiagnosticProvider.cs
@@ -0,0 +1,104 @@
+//
+// PackageCodeDiagnosticProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.CodeIssues;
+using ICSharpCode.PackageManagement;
+using MonoDevelop.Projects;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.PackageManagement.Refactoring
+{
+	sealed class PackageCodeDiagnosticProvider : CodeDiagnosticProvider
+	{
+		static readonly Dictionary<Project, AnalyzersFromAssembly> diagnosticCache = new Dictionary<Project, AnalyzersFromAssembly> ();
+
+		static PackageCodeDiagnosticProvider ()
+		{
+			IdeApp.Workspace.SolutionUnloaded += delegate {
+				diagnosticCache.Clear ();
+			};
+			IdeApp.Workspace.ActiveConfigurationChanged += delegate {
+				diagnosticCache.Clear ();
+			};
+		}
+
+		public async override Task<IEnumerable<CodeDiagnosticFixDescriptor>> GetCodeFixDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var diags = await GetProjectDiagnosticsAsync (document.Project, language, cancellationToken).ConfigureAwait (false);
+			return diags.Fixes;
+		}
+
+		public async override Task<IEnumerable<CodeDiagnosticDescriptor>> GetCodeDiagnosticDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var diags = await GetProjectDiagnosticsAsync (document.Project, language, cancellationToken).ConfigureAwait (false);
+			return diags.Analyzers;
+		}
+
+		public async override Task<IEnumerable<MonoDevelop.CodeActions.CodeRefactoringDescriptor>> GetCodeRefactoringDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken)
+		{
+			var diags = await GetProjectDiagnosticsAsync (document.Project, language, cancellationToken).ConfigureAwait (false);
+			return diags.Refactorings;
+		}
+
+		static Task<AnalyzersFromAssembly> GetProjectDiagnosticsAsync (Project project, string language, CancellationToken cancellationToken)
+		{
+			if (project == null)
+				return Task.FromResult (AnalyzersFromAssembly.Empty);
+			AnalyzersFromAssembly result;
+			if (diagnosticCache.TryGetValue(project, out result)) 
+				return Task.FromResult (result);
+
+			result = new AnalyzersFromAssembly ();
+
+			var dotNetProject = project as DotNetProject;
+			if (dotNetProject != null) {
+				var proxy = new DotNetProjectProxy (dotNetProject);
+				if (proxy.HasPackages ()) {
+					var packagesPath = new SolutionPackageRepositoryPath (proxy, PackageManagementServices.Options);
+					foreach (var file in Directory.EnumerateFiles (packagesPath.PackageRepositoryPath, "*.dll", SearchOption.AllDirectories)) {
+						cancellationToken.ThrowIfCancellationRequested ();
+						try {
+							var asm = Assembly.LoadFrom (file);
+							result.AddAssembly (asm);
+						} catch (Exception) {
+						}
+					}
+				}
+			}
+			diagnosticCache[project] = result;
+			return Task.FromResult (result);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/CheckForUpdatesProgressMonitorTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/CheckForUpdatesProgressMonitorTests.cs
index 489d298278..56abc52484 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/CheckForUpdatesProgressMonitorTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/CheckForUpdatesProgressMonitorTests.cs
@@ -97,7 +97,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			progressMonitor.ReportError (exception);

 

 			fakeProgressMonitor.AssertMessageIsLogged ("Error");

-			Assert.AreEqual (GettextCatalog.GetString ("Could not check for package updates. Please see Package Console for details."), fakeProgressMonitor.ReportedErrorMessage);

+			Assert.AreEqual (GettextCatalog.GetString ("Could not check for package updates."), fakeProgressMonitor.ReportedErrorMessage);

 			Assert.IsTrue (progressMonitor.IsPackageConsoleShown);

 		}

 

@@ -142,7 +142,7 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			progressMonitor.ReportSuccess (false);

 

-			Assert.AreEqual (GettextCatalog.GetString ("No updates found but warnings were reported. Please see Package Console for details."), fakeProgressMonitor.ReportedWarningMessage);

+			Assert.AreEqual (GettextCatalog.GetString ("No updates found but warnings were reported."), fakeProgressMonitor.ReportedWarningMessage);

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageCompatibilityRunnerTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageCompatibilityRunnerTests.cs
index bac4f74987..d8b6e7e655 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageCompatibilityRunnerTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageCompatibilityRunnerTests.cs
@@ -372,7 +372,7 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			Run ();

 

-			Assert.AreEqual ("Incompatible packages found. Please see Package Console for details.", progressMonitor.ReportedErrorMessage);

+			Assert.AreEqual ("Incompatible packages found.", progressMonitor.ReportedErrorMessage);

 			Assert.IsTrue (runner.PackageConsoleIsShown);

 		}

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesInSolutionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesInSolutionTests.cs
index 2da38bedfe..ddad9015f9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesInSolutionTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesInSolutionTests.cs
@@ -468,7 +468,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			task.Result = null;

 			task.ExecuteContinueWith ();

 

-			Assert.AreEqual (GettextCatalog.GetString ("Could not check for package updates. Please see Package Console for details."), progressMonitorFactory.ProgressMonitor.ReportedErrorMessage);

+			Assert.AreEqual (GettextCatalog.GetString ("Could not check for package updates."), progressMonitorFactory.ProgressMonitor.ReportedErrorMessage);

 			Assert.IsTrue (checkForUpdatesTaskRunner.ProgressMonitorCreated.IsPackageConsoleShown);

 			progressMonitorFactory.ProgressMonitor.AssertMessageIsLogged ("Inner exception error message");

 			Assert.IsTrue (progressMonitorFactory.ProgressMonitor.IsDisposed);

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
index 31165890d4..ce21fe4d43 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
@@ -149,4 +149,8 @@
 	<Extension path="/MonoDevelop/ProjectModel/ProjectModelExtensions">

 		<Class class="MonoDevelop.PackageManagement.PackageManagementMSBuildExtension" />

 	</Extension>

+

+	<Extension path="/MonoDevelop/Refactoring/CodeDiagnosticProvider">

+		<Class class="MonoDevelop.PackageManagement.Refactoring.PackageCodeDiagnosticProvider" />

+	</Extension>

 </ExtensionModel>

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
index 814e2943d8..50d0ebf3bb 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
@@ -367,6 +367,7 @@
     <Compile Include="MonoDevelop.PackageManagement\CheckForUpdatesProgressMonitor.cs" />
     <Compile Include="MonoDevelop.PackageManagement\CheckForUpdatesTaskRunner.cs" />
     <Compile Include="MonoDevelop.PackageManagement\CheckForUpdatesTask.cs" />
+    <Compile Include="MonoDevelop.PackageManagement.Refactoring\PackageCodeDiagnosticProvider.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ProjectReloadedEventArgs.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -408,11 +409,6 @@
       <Name>MonoDevelop.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
-      <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
-      <Name>MonoDevelop.Ide</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -433,6 +429,16 @@
       <Name>ICSharpCode.NRefactory</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
+      <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
+      <Name>MonoDevelop.Ide</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
+      <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
+      <Name>MonoDevelop.Refactoring</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="MonoDevelop.PackageManagement.NodeBuilders\" />
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs
index aced2f1bd1..8346634154 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs
@@ -150,7 +150,7 @@ namespace MonoDevelop.PackageManagement
 		{

 			checker.GenerateReport (progressMonitor.Log);

 			if (checker.AnyIncompatiblePackages ()) {

-				progressMonitor.ReportError (GettextCatalog.GetString ("Incompatible packages found. Please see Package Console for details."), null);

+				progressMonitor.ReportError (GettextCatalog.GetString ("Incompatible packages found."), null);

 			} else {

 				progressMonitor.ReportWarning (progressMessage.Warning);

 			}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs
index 4bb1638193..1f4a2103cd 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs
@@ -209,10 +209,11 @@ namespace MonoDevelop.PackageManagement
 

 		protected virtual void ReconnectAssemblyReferences (IPackageManagementProject project)

 		{

-			var projectWrapper = TypeSystemService.GetProjectContentWrapper (project.DotNetProject);

-			if (projectWrapper != null) {

-				projectWrapper.ReconnectAssemblyReferences ();

-			}

+			// TODO : Roslyn port ? 

+//			var projectWrapper = TypeSystemService.GetProjectContentWrapper (project.DotNetProject);

+//			if (projectWrapper != null) {

+//				projectWrapper.ReconnectAssemblyReferences ();

+//			}

 		}

 

 		void PackageInstalled (object sender, ParentPackageOperationEventArgs e)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoreRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoreRunner.cs
index 5435f0728a..5effda7107 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoreRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoreRunner.cs
@@ -156,10 +156,11 @@ namespace MonoDevelop.PackageManagement
 

 		void ReconnectAssemblyReferences (DotNetProject dotNetProject)

 		{

-			var projectWrapper = TypeSystemService.GetProjectContentWrapper (dotNetProject);

-			if (projectWrapper != null) {

-				projectWrapper.ReconnectAssemblyReferences ();

-			}

+			// TODO: Roslyn port ?

+//			var projectWrapper = TypeSystemService.GetProjectContentWrapper (dotNetProject);

+//			if (projectWrapper != null) {

+//				projectWrapper.ReconnectAssemblyReferences ();

+//			}

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessageFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessageFactory.cs
index ae73cdb840..6bc99bf3f8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessageFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessageFactory.cs
@@ -38,8 +38,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Adding {0}...", packageId),

 				GetString ("{0} successfully added.", packageId),

-				GetString ("Could not add {0}. Please see Package Console for details.", packageId),

-				GetString ("{0} added with warnings. Please see Package Console for details.", packageId)

+				GetString ("Could not add {0}.", packageId),

+				GetString ("{0} added with warnings.", packageId)

 			);

 		}

 

@@ -48,8 +48,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Adding packages..."),

 				GetString ("Packages successfully added."),

-				GetString ("Could not add packages. Please see Package Console for details."),

-				GetString ("Packages added with warnings. Please see Package Console for details.")

+				GetString ("Could not add packages."),

+				GetString ("Packages added with warnings.")

 			);

 		}

 

@@ -58,8 +58,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Adding {0} packages...", count),

 				GetString ("{0} packages successfully added.", count),

-				GetString ("Could not add packages. Please see Package Console for details."),

-				GetString ("{0} packages added with warnings. Please see Package Console for details.", count)

+				GetString ("Could not add packages."),

+				GetString ("{0} packages added with warnings.", count)

 			);

 		}

 

@@ -68,8 +68,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Updating packages in solution..."),

 				GetString ("Packages successfully updated."),

-				GetString ("Could not update packages. Please see Package Console for details."),

-				GetString ("Packages updated with warnings. Please see Package Console for details.")

+				GetString ("Could not update packages."),

+				GetString ("Packages updated with warnings.")

 			);

 		}

 

@@ -79,7 +79,7 @@ namespace MonoDevelop.PackageManagement
 			return new UpdatePackagesProgressMonitorStatusMessage (

 				projects,

 				GetString ("Packages are up to date."),

-				GetString ("No updates found but warnings were reported. Please see Package Console for details."),

+				GetString ("No updates found but warnings were reported."),

 				message);

 		}

 

@@ -88,8 +88,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Updating {0} packages in project...", count),

 				GetString ("{0} packages successfully updated.", count),

-				GetString ("Could not update packages. Please see Package Console for details."),

-				GetString ("{0} packages updated with warnings. Please see Package Console for details.", count)

+				GetString ("Could not update packages."),

+				GetString ("{0} packages updated with warnings.", count)

 			);

 		}

 

@@ -99,7 +99,7 @@ namespace MonoDevelop.PackageManagement
 			return new UpdatePackagesProgressMonitorStatusMessage (

 				project,

 				GetString ("Packages are up to date."),

-				GetString ("No updates found but warnings were reported. Please see Package Console for details."),

+				GetString ("No updates found but warnings were reported."),

 				message);

 		}

 

@@ -108,8 +108,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Updating packages in project..."),

 				GetString ("Packages successfully updated."),

-				GetString ("Could not update packages. Please see Package Console for details."),

-				GetString ("Packages updated with warnings. Please see Package Console for details.")

+				GetString ("Could not update packages."),

+				GetString ("Packages updated with warnings.")

 			);

 		}

 

@@ -118,8 +118,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Updating {0}...", packageId),

 				GetString ("{0} successfully updated.", packageId),

-				GetString ("Could not update {0}. Please see Package Console for details.", packageId),

-				GetString ("{0} updated with warnings. Please see Package Console for details.", packageId)

+				GetString ("Could not update {0}.", packageId),

+				GetString ("{0} updated with warnings.", packageId)

 			);

 		}

 

@@ -129,7 +129,7 @@ namespace MonoDevelop.PackageManagement
 			return new UpdatePackagesProgressMonitorStatusMessage (

 				project,

 				GetString ("{0} is up to date.", packageId),

-				GetString ("No update found but warnings were reported. Please see Package Console for details."),

+				GetString ("No update found but warnings were reported."),

 				message);

 		}

 

@@ -138,8 +138,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Removing {0}...", packageId),

 				GetString ("{0} successfully removed.", packageId),

-				GetString ("Could not remove {0}. Please see Package Console for details.", packageId),

-				GetString ("{0} removed with warnings. Please see Package Console for details.", packageId)

+				GetString ("Could not remove {0}.", packageId),

+				GetString ("{0} removed with warnings.", packageId)

 			);

 		}

 

@@ -148,8 +148,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Restoring packages for solution..."),

 				GetString ("Packages successfully restored."),

-				GetString ("Could not restore packages. Please see Package Console for details."),

-				GetString ("Packages restored with warnings. Please see Package Console for details.")

+				GetString ("Could not restore packages."),

+				GetString ("Packages restored with warnings.")

 			);

 		}

 

@@ -158,8 +158,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Restoring packages before update..."),

 				GetString ("Packages successfully restored."),

-				GetString ("Could not restore packages. Please see Package Console for details."),

-				GetString ("Packages restored with warnings. Please see Package Console for details.")

+				GetString ("Could not restore packages."),

+				GetString ("Packages restored with warnings.")

 			);

 		}

 

@@ -168,8 +168,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Restoring packages for project..."),

 				GetString ("Packages successfully restored."),

-				GetString ("Could not restore packages. Please see Package Console for details."),

-				GetString ("Packages restored with warnings. Please see Package Console for details.")

+				GetString ("Could not restore packages."),

+				GetString ("Packages restored with warnings.")

 			);

 		}

 

@@ -178,8 +178,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Checking package compatibility with new target framework..."),

 				GetString ("Packages are compatible."),

-				GetString ("Could not check package compatibility. Please see Package Console for details."),

-				GetString ("Package retargeting required. Please see Package Console for details.")

+				GetString ("Could not check package compatibility."),

+				GetString ("Package retargeting required.")

 			);

 		}

 

@@ -188,8 +188,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Retargeting {0}...", packageId),

 				GetString ("{0} successfully retargeted.", packageId),

-				GetString ("Could not retarget {0}. Please see Package Console for details.", packageId),

-				GetString ("{0} retargeted with warnings. Please see Package Console for details.", packageId)

+				GetString ("Could not retarget {0}.", packageId),

+				GetString ("{0} retargeted with warnings.", packageId)

 			);

 		}

 

@@ -198,8 +198,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Retargeting {0} packages...", count),

 				GetString ("{0} packages successfully retargeted.", count),

-				GetString ("Could not retarget packages. Please see Package Console for details."),

-				GetString ("{0} packages retargeted with warnings. Please see Package Console for details.", count)

+				GetString ("Could not retarget packages."),

+				GetString ("{0} packages retargeted with warnings.", count)

 			);

 		}

 

@@ -208,8 +208,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Retargeting packages..."),

 				GetString ("Packages successfully retargeted."),

-				GetString ("Could not retarget packages. Please see Package Console for details."),

-				GetString ("Packages retarget with warnings. Please see Package Console for details.")

+				GetString ("Could not retarget packages."),

+				GetString ("Packages retarget with warnings.")

 			);

 		}

 

@@ -218,8 +218,8 @@ namespace MonoDevelop.PackageManagement
 			return new ProgressMonitorStatusMessage (

 				GetString ("Checking for package updates..."),

 				GetString ("Packages are up to date."),

-				GetString ("Could not check for package updates. Please see Package Console for details."),

-				GetString ("No updates found but warnings were reported. Please see Package Console for details."));

+				GetString ("Could not check for package updates."),

+				GetString ("No updates found but warnings were reported."));

 		}

 

 		static string GetString (string phrase)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesDataSource.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesDataSource.cs
index 3887262942..25fd06cde4 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesDataSource.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesDataSource.cs
@@ -31,6 +31,8 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.CodeCompletion;

 using Xwt.Drawing;

 using ICSharpCode.PackageManagement;

+using ICSharpCode.NRefactory.Utils;

+using MonoDevelop.Core.Text;

 

 namespace MonoDevelop.PackageManagement

 {

@@ -68,9 +70,14 @@ namespace MonoDevelop.PackageManagement
 			return 0;

 		}

 

-		DomRegion ISearchDataSource.GetRegion (int item)

+		ISegment ISearchDataSource.GetRegion (int item)

 		{

-			return DomRegion.Empty;

+			return MonoDevelop.Core.Text.TextSegment.Invalid;

+		}

+

+		string ISearchDataSource.GetFileName (int item)

+		{

+			return null;

 		}

 

 		bool ISearchDataSource.CanActivate (int item)

diff --git a/main/src/addins/MonoDevelop.Refactoring/AssemblyInfo.cs b/main/src/addins/MonoDevelop.Refactoring/AssemblyInfo.cs
index c787015813..120f59415c 100644
--- a/main/src/addins/MonoDevelop.Refactoring/AssemblyInfo.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/AssemblyInfo.cs
@@ -7,3 +7,5 @@ using System.Reflection;
 [assembly: AssemblyDescription ("Provides refactoring support to MonoDevelop")]
 [assembly: AssemblyVersion ("2.6")]
 [assembly: AssemblyCopyright ("X11")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("MonoDevelop.CSharpBinding")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("MonoDevelop.PackageManagement")]
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
index 392aacd522..ecdfdee5d3 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
@@ -32,18 +32,15 @@ using MonoDevelop.Ide.Gui;
 using System.Collections.Generic;
 using Gtk;
 using MonoDevelop.AnalysisCore.Gui;
-using MonoDevelop.SourceEditor;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.AnalysisCore.Fixes;
 using MonoDevelop.Ide;
 using MonoDevelop.CodeIssues;
-using ICSharpCode.NRefactory.Refactoring;
 using MonoDevelop.CodeActions;
 using System.Threading;
 using System.IO;
 using MonoDevelop.Refactoring;
 using MonoDevelop.Ide.Gui.Dialogs;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AnalysisCore
 {
@@ -70,32 +67,32 @@ namespace MonoDevelop.AnalysisCore
 				return;
 			}
 			var fixes = codeActionExtension.GetCurrentFixes ();
-			info.Enabled = fixes.Any ();
+			info.Enabled = !fixes.IsEmpty;
 		}
 		
 		protected override void Run ()
 		{
-			var doc = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
-			var view = doc.GetContent<MonoDevelop.SourceEditor.SourceEditorView> ();
-			if (view == null) {
-				LoggingService.LogWarning ("ShowFixesHandler could not find a SourceEditorView");
-				return;
-			}
-			var widget = view.TextEditor;
-			var pt = view.DocumentToScreenLocation (doc.Editor.Caret.Location);
-			
-			var ces = new CommandEntrySet ();
-			ces.AddItem (AnalysisCommands.FixOperations);
-			var menu = MonoDevelop.Ide.IdeApp.CommandService.CreateMenu (ces);
-			
-			menu.Popup (null, null, delegate (Menu mn, out int x, out int y, out bool push_in) {
-				x = pt.X;
-				y = pt.Y;
-				push_in = true;
-				//if the menu would be off the bottom of the screen, "drop" it upwards
-				if (y + mn.Requisition.Height > widget.Screen.Height)
-					y -= mn.Requisition.Height + (int)widget.LineHeight;
-			}, 0, Global.CurrentEventTime);
+//			var doc = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
+//			var view = doc.GetContent<MonoDevelop.SourceEditor.SourceEditorView> ();
+//			if (view == null) {
+//				LoggingService.LogWarning ("ShowFixesHandler could not find a SourceEditorView");
+//				return;
+//			}
+//			var widget = view.TextEditor;
+//			var pt = view.DocumentToScreenLocation (doc.Editor.Caret.Location);
+//			
+//			var ces = new CommandEntrySet ();
+//			ces.AddItem (AnalysisCommands.FixOperations);
+//			var menu = MonoDevelop.Ide.IdeApp.CommandService.CreateMenu (ces);
+//			
+//			menu.Popup (null, null, delegate (Menu mn, out int x, out int y, out bool push_in) {
+//				x = pt.X;
+//				y = pt.Y;
+//				push_in = true;
+//				//if the menu would be off the bottom of the screen, "drop" it upwards
+//				if (y + mn.Requisition.Height > widget.Screen.Height)
+//					y -= mn.Requisition.Height + (int)widget.LineHeight;
+//			}, 0, Global.CurrentEventTime);
 		}
 	}
 	
@@ -103,11 +100,11 @@ namespace MonoDevelop.AnalysisCore
 	{
 		protected override void Update (CommandArrayInfo info)
 		{
-			MonoDevelop.Ide.Gui.Document document;
-			IList<FixableResult> results;
-			if (!GetFixes (out document, out results))
-				return;
-			PopulateInfos (info, document, results);
+//			MonoDevelop.Ide.Gui.Document document;
+//			IList<FixableResult> results;
+//			if (!GetFixes (out document, out results))
+//				return;
+//			PopulateInfos (info, document, results);
 		}
 		
 		protected override void Run (object dataItem)
@@ -125,47 +122,47 @@ namespace MonoDevelop.AnalysisCore
 				action.Fix (); 
 				return;
 			}
-			var ca = dataItem as CodeAction;
-			if (ca != null) {
-				var doc = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
-
-				var context = doc.ParsedDocument.CreateRefactoringContext != null ? doc.ParsedDocument.CreateRefactoringContext (doc, default(CancellationToken)) : null;
-				using (var script = context.CreateScript ()) {
-					ca.Run (context, script);
-				}
-				return;
-			}
-
-
-		}
-		
-		public static bool GetFixes (out Document document, out IList<FixableResult> results)
-		{
-			results = null;
-			document = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
-			if (document == null)
-				return false;
-			
-			var ext = document.GetContent<ResultsEditorExtension> ();
-			if (ext == null)
-				return false;
-			
-			var list = ext.GetResultsAtOffset (document.Editor.Caret.Offset).OfType<FixableResult> ().ToList ();
-			list.Sort (ResultCompareImportanceDesc);
-			results = list;
+//			var ca = dataItem as CodeAction;
+//			if (ca != null) {
+//				var doc = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
+//
+//				var context = doc.ParsedDocument.CreateRefactoringContext != null ? doc.ParsedDocument.CreateRefactoringContext (doc, default(CancellationToken)) : null;
+//				using (var script = context.CreateScript ()) {
+//					ca.Run (context, script);
+//				}
+//				return;
+//			}
 
-			if (results.Count > 0)
-				return true;
 
-			var codeActionExtension = document.GetContent <CodeActionEditorExtension> ();
-			if (codeActionExtension != null) {
-				var fixes = codeActionExtension.GetCurrentFixes ();
-				if (fixes != null)
-					return fixes.Any (CodeActionEditorExtension.IsAnalysisOrErrorFix);
-			} 
-			return false;
 		}
 		
+//		public static bool GetFixes (out MonoDevelop.Ide.Gui.Document document, out IList<FixableResult> results)
+//		{
+//			results = null;
+//			document = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
+//			if (document == null)
+//				return false;
+//			
+//			var ext = document.GetContent<ResultsEditorExtension> ();
+//			if (ext == null)
+//				return false;
+//			
+//			var list = ext.GetResultsAtOffset (document.Editor.CaretOffset).OfType<FixableResult> ().ToList ();
+//			list.Sort (ResultCompareImportanceDesc);
+//			results = list;
+//
+//			if (results.Count > 0)
+//				return true;
+//
+//			var codeActionExtension = document.GetContent <CodeActionEditorExtension> ();
+//			if (codeActionExtension != null) {
+//				var fixes = codeActionExtension.GetCurrentFixes ();
+//				if (fixes != null)
+//					return !fixes.IsEmpty;
+//			} 
+//			return false;
+//		}
+//		
 		static int ResultCompareImportanceDesc (Result r1, Result r2)
 		{
 			int c = ((int)r1.Level).CompareTo ((int)r2.Level);
@@ -174,113 +171,113 @@ namespace MonoDevelop.AnalysisCore
 			return string.Compare (r1.Message, r2.Message, StringComparison.Ordinal);
 		}
 		
-		public static void PopulateInfos (CommandArrayInfo infos, Document doc, IEnumerable<FixableResult> results)
-		{
-			//FIXME: ellipsize long messages
-			int mnemonic = 1;
-
-			var codeActionExtension = doc.GetContent <CodeActionEditorExtension> ();
-			var fixes = codeActionExtension.GetCurrentFixes ();
-			if (fixes != null) {
-				foreach (var _fix in fixes.Where (CodeActionEditorExtension.IsAnalysisOrErrorFix)) {
-					var fix = _fix;
-					if (fix is AnalysisContextActionProvider.AnalysisCodeAction)
-						continue;
-					var escapedLabel = fix.Title.Replace ("_", "__");
-					var label = (mnemonic <= 10)
-						? "_" + (mnemonic++ % 10).ToString () + " " + escapedLabel
-							: "  " + escapedLabel;
-					infos.Add (label, fix);
-				}
-			}
-
-			foreach (var result in results) {
-				bool firstAction = true;
-				foreach (var action in GetActions (doc, result)) {
-					if (firstAction) {
-						//FIXME: make this header item insensitive but not greyed out
-						infos.Add (new CommandInfo (result.Message.Replace ("_", "__"), false, false) {
-							Icon = GetIcon (result.Level)
-						}, null);
-						firstAction = false;
-					}
-					var escapedLabel = action.Label.Replace ("_", "__");
-					var label = (mnemonic <= 10)
-						? "_" + (mnemonic++ % 10).ToString () + " " + escapedLabel
-						: "  " + escapedLabel;
-					infos.Add (label, action);
-				}
-				if (result.HasOptionsDialog) {
-					var declSet = new CommandInfoSet ();
-					declSet.Text = GettextCatalog.GetString ("_Options for \"{0}\"", result.OptionsTitle);
-
-					bool hasBatchFix = false;
-					foreach (var fix in result.Fixes.OfType<IAnalysisFixAction> ().Where (f => f.SupportsBatchFix)) {
-						hasBatchFix = true;
-						var title = string.Format (GettextCatalog.GetString ("Apply in file: {0}"), fix.Label);
-						declSet.CommandInfos.Add (title, new System.Action(fix.BatchFix));
-					}
-					if (hasBatchFix)
-						declSet.CommandInfos.AddSeparator ();
-
-					var ir = result as InspectorResults;
-					if (ir != null) {
-						var inspector = ir.Inspector;
-
-						if (inspector.CanSuppressWithAttribute) {
-							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Suppress with attribute"), new System.Action(delegate {
-								inspector.SuppressWithAttribute (doc, ir.Region); 
-							}));
-						}
-
-						if (inspector.CanDisableWithPragma) {
-							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Suppress with #pragma"), new System.Action(delegate {
-								inspector.DisableWithPragma (doc, ir.Region); 
-							}));
-						}
-
-						if (inspector.CanDisableOnce) {
-							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Disable Once"), new System.Action(delegate {
-								inspector.DisableOnce (doc, ir.Region); 
-							}));
-						}
-
-						if (inspector.CanDisableAndRestore) {
-							declSet.CommandInfos.Add (GettextCatalog.GetString ("Disable _and Restore"), new System.Action(delegate {
-								inspector.DisableAndRestore (doc, ir.Region); 
-							}));
-						}
-					}
-
-					declSet.CommandInfos.Add (GettextCatalog.GetString ("_Configure Rule"), result);
-
-					infos.Add (declSet);
-				}
-			}
-		}
-		
-		public static IEnumerable<IAnalysisFixAction> GetActions (Document doc, FixableResult result)
-		{
-			foreach (var fix in result.Fixes)
-				foreach (var handler in AnalysisExtensions.GetFixHandlers (fix.FixType))
-					foreach (var action in handler.GetFixes (doc, fix))
-						yield return action;
-
-		}
-		
-		static string GetIcon (Severity severity)
-		{
-			switch (severity) {
-			case Severity.Error:
-				return Ide.Gui.Stock.Error;
-			case Severity.Warning:
-				return Ide.Gui.Stock.Warning;
-			case Severity.Hint:
-				return Ide.Gui.Stock.Information;
-			default:
-				return null;
-			}
-		}
+//		public static void PopulateInfos (CommandArrayInfo infos, MonoDevelop.Ide.Gui.Document doc, IEnumerable<FixableResult> results)
+//		{
+////			//FIXME: ellipsize long messages
+////			int mnemonic = 1;
+////
+////			var codeActionExtension = doc.GetContent <CodeActionEditorExtension> ();
+////			var fixes = codeActionExtension.GetCurrentFixes ();
+////			if (fixes != null) {
+////				foreach (var _fix in fixes.Where (CodeActionEditorExtension.IsAnalysisOrErrorFix)) {
+////					var fix = _fix;
+////					if (fix is AnalysisContextActionProvider.AnalysisCodeAction)
+////						continue;
+////					var escapedLabel = fix.Title.Replace ("_", "__");
+////					var label = (mnemonic <= 10)
+////						? "_" + (mnemonic++ % 10).ToString () + " " + escapedLabel
+////							: "  " + escapedLabel;
+////					infos.Add (label, fix);
+////				}
+////			}
+////
+////			foreach (var result in results) {
+////				bool firstAction = true;
+////				foreach (var action in GetActions (doc, result)) {
+////					if (firstAction) {
+////						//FIXME: make this header item insensitive but not greyed out
+////						infos.Add (new CommandInfo (result.Message.Replace ("_", "__"), false, false) {
+////							Icon = GetIcon (result.Level)
+////						}, null);
+////						firstAction = false;
+////					}
+////					var escapedLabel = action.Label.Replace ("_", "__");
+////					var label = (mnemonic <= 10)
+////						? "_" + (mnemonic++ % 10).ToString () + " " + escapedLabel
+////						: "  " + escapedLabel;
+////					infos.Add (label, action);
+////				}
+////				if (result.HasOptionsDialog) {
+////					var declSet = new CommandInfoSet ();
+////					declSet.Text = GettextCatalog.GetString ("_Options for \"{0}\"", result.OptionsTitle);
+////
+////					bool hasBatchFix = false;
+////					foreach (var fix in result.Fixes.OfType<IAnalysisFixAction> ().Where (f => f.SupportsBatchFix)) {
+////						hasBatchFix = true;
+////						var title = string.Format (GettextCatalog.GetString ("Apply in file: {0}"), fix.Label);
+////						declSet.CommandInfos.Add (title, new System.Action(fix.BatchFix));
+////					}
+////					if (hasBatchFix)
+////						declSet.CommandInfos.AddSeparator ();
+////
+////					var ir = result as InspectorResults;
+////					if (ir != null) {
+////						var inspector = ir.Inspector;
+////
+////						if (inspector.CanSuppressWithAttribute) {
+////							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Suppress with attribute"), new System.Action(delegate {
+////								inspector.SuppressWithAttribute (doc, ir.Region); 
+////							}));
+////						}
+////
+////						if (inspector.CanDisableWithPragma) {
+////							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Suppress with #pragma"), new System.Action(delegate {
+////								inspector.DisableWithPragma (doc, ir.Region); 
+////							}));
+////						}
+////
+////						if (inspector.CanDisableOnce) {
+////							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Disable Once"), new System.Action(delegate {
+////								inspector.DisableOnce (doc, ir.Region); 
+////							}));
+////						}
+////
+////						if (inspector.CanDisableAndRestore) {
+////							declSet.CommandInfos.Add (GettextCatalog.GetString ("Disable _and Restore"), new System.Action(delegate {
+////								inspector.DisableAndRestore (doc, ir.Region); 
+////							}));
+////						}
+////					}
+////
+////					declSet.CommandInfos.Add (GettextCatalog.GetString ("_Configure Rule"), result);
+////
+////					infos.Add (declSet);
+////				}
+////			}
+//		}
+//		
+//		public static IEnumerable<IAnalysisFixAction> GetActions (MonoDevelop.Ide.Gui.Document doc, FixableResult result)
+//		{
+//			foreach (var fix in result.Fixes)
+//				foreach (var handler in AnalysisExtensions.GetFixHandlers (fix.FixType))
+//					foreach (var action in handler.GetFixes (doc.Editor, doc, fix))
+//						yield return action;
+//
+//		}
+//
+//		static string GetIcon (Severity severity)
+//		{
+//			switch (severity) {
+//			case Severity.Error:
+//				return Ide.Gui.Stock.Error;
+//			case Severity.Warning:
+//				return Ide.Gui.Stock.Warning;
+//			case Severity.Hint:
+//				return Ide.Gui.Stock.Information;
+//			default:
+//				return null;
+//			}
+//		}
 	}
 
 	class ExportRulesHandler : CommandHandler
@@ -294,19 +291,19 @@ namespace MonoDevelop.AnalysisCore
 			if (!dlg.Run ())
 				return;
 
-			Dictionary<BaseCodeIssueProvider, Severity> severities = new Dictionary<BaseCodeIssueProvider, Severity> ();
+			Dictionary<CodeDiagnosticDescriptor, DiagnosticSeverity?> severities = new Dictionary<CodeDiagnosticDescriptor, DiagnosticSeverity?> ();
 
-			foreach (var node in RefactoringService.GetInspectors (lang)) {
-				severities [node] = node.GetSeverity ();
-				if (node.HasSubIssues) {
-					foreach (var subIssue in node.SubIssues) {
-						severities [subIssue] = subIssue.GetSeverity ();
-					}
-				}
+			foreach (var node in BuiltInCodeDiagnosticProvider.GetBuiltInCodeDiagnosticDecsriptorsAsync (CodeRefactoringService.MimeTypeToLanguage(lang), true).Result) {
+				severities [node] = node.DiagnosticSeverity;
+//				if (node.GetProvider ().SupportedDiagnostics.Length > 1) {
+//					foreach (var subIssue in node.GetProvider ().SupportedDiagnostics) {
+//						severities [subIssue] = node.GetSeverity (subIssue);
+//					}
+//				}
 			}
 
-			var grouped = severities.Keys.OfType<CodeIssueProvider> ()
-				.GroupBy (node => node.Category)
+			var grouped = severities.Keys.OfType<CodeDiagnosticDescriptor> ()
+				.GroupBy (node => node.GetProvider ().SupportedDiagnostics.First ().Category)
 				.OrderBy (g => g.Key, StringComparer.Ordinal);
 
 			using (var sw = new StreamWriter (dlg.SelectedFile)) {
@@ -315,33 +312,31 @@ namespace MonoDevelop.AnalysisCore
 					sw.WriteLine ("<h2>" + g.Key + "</h2>");
 					sw.WriteLine ("<table border='1'>");
 
-					foreach (var node in g.OrderBy (n => n.Title, StringComparer.Ordinal)) {
-						var title = node.Title;
-						var desc = node.Description != title ? node.Description : "";
-						sw.WriteLine ("<tr><td>" + title + "</td><td>" + desc + "</td><td>" + node.GetSeverity () + "</td></tr>");
-						if (node.HasSubIssues) {
-							foreach (var subIssue in node.SubIssues) {
-								title = subIssue.Title;
-								desc = subIssue.Description != title ? subIssue.Description : "";
-								sw.WriteLine ("<tr><td> - " + title + "</td><td>" + desc + "</td><td>" + subIssue.GetSeverity () + "</td></tr>");
+					foreach (var node in g.OrderBy (n => n.Name, StringComparer.Ordinal)) {
+						var title = node.Name;
+						var desc = node.GetProvider ().SupportedDiagnostics.First ().Description.ToString () != title ? node.GetProvider ().SupportedDiagnostics.First ().Description : "";
+						sw.WriteLine ("<tr><td>" + title + "</td><td>" + desc + "</td><td>" + node.DiagnosticSeverity + "</td></tr>");
+						if (node.GetProvider ().SupportedDiagnostics.Length > 1) {
+							foreach (var subIssue in node.GetProvider ().SupportedDiagnostics) {
+								title = subIssue.Description.ToString ();
+								desc = subIssue.Description.ToString () != title ? subIssue.Description : "";
+								sw.WriteLine ("<tr><td> - " + title + "</td><td>" + desc + "</td><td>" + node.GetSeverity (subIssue) + "</td></tr>");
 							}
 						}
 					}
 					sw.WriteLine ("</table>");
 				}
 
-				Dictionary<CodeActionProvider, bool> providerStates = new Dictionary<CodeActionProvider, bool> ();
-				string disabledNodes = PropertyService.Get ("ContextActions." + lang, "");
-				foreach (var node in RefactoringService.ContextAddinNodes.Where (n => n.MimeType == lang)) {
-					providerStates [node] = disabledNodes.IndexOf (node.IdString, StringComparison.Ordinal) < 0;
+				var providerStates = new Dictionary<CodeRefactoringDescriptor, bool> ();
+				foreach (var node in BuiltInCodeDiagnosticProvider.GetBuiltInCodeRefactoringDescriptorsAsync (CodeRefactoringService.MimeTypeToLanguage(lang), true).Result) {
+					providerStates [node] = node.IsEnabled;
 				}
 
 				sw.WriteLine ("<h1>Code Actions</h1>");
 				sw.WriteLine ("<table border='1'>");
-				var sortedAndFiltered = providerStates.Keys.OrderBy (n => n.Title, StringComparer.Ordinal);
+				var sortedAndFiltered = providerStates.Keys.OrderBy (n => n.Name, StringComparer.Ordinal);
 				foreach (var node in sortedAndFiltered) {
-					var desc = node.Title != node.Description ? node.Description : "";
-					sw.WriteLine ("<tr><td>" + node.Title + "</td><td>" + desc + "</td></tr>");
+					sw.WriteLine ("<tr><td>" + node.IdString + "</td><td>" + node.Name + "</td></tr>");
 				}
 				sw.WriteLine ("</table>");
 			}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisOptions.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisOptions.cs
index cedc34ccd3..97bd15dce7 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisOptions.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisOptions.cs
@@ -26,14 +26,15 @@
 
 using System;
 using MonoDevelop.Core;
-using MonoDevelop.SourceEditor.QuickTasks;
 
 namespace MonoDevelop.AnalysisCore
 {
 	public static class AnalysisOptions
 	{
+		public readonly static PropertyWrapper<bool> EnableFancyFeatures = new PropertyWrapper<bool> ("MonoDevelop.AnalysisCore.AnalysisEnabled", false);
+
 		public static PropertyWrapper<bool> AnalysisEnabled {
-			get { return QuickTaskStrip.EnableFancyFeatures; }
+			get { return EnableFancyFeatures; }
 		}
 
 		public readonly static PropertyWrapper<bool> EnableUnitTestEditorIntegration = new PropertyWrapper<bool> ("Testing.EnableUnitTestEditorIntegration", false);
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/FixableResult.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/FixableResult.cs
index 7aaf76620f..ca3ca05b3e 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/FixableResult.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/FixableResult.cs
@@ -26,26 +26,23 @@
 
 using System;
 using System.Collections.Generic;
-using MonoDevelop.SourceEditor;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Refactoring;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AnalysisCore
 {
-	public class FixableResult : Result
-	{
-		public FixableResult (DomRegion region, string message, Severity level,
-			IssueMarker mark, params IAnalysisFix[] fixes)
-			: base (region, message, level, mark)
-		{
-			this.Fixes = fixes;
-		}
-		
-		public IAnalysisFix[] Fixes { get; protected set; }
-	}
+//	public class FixableResult : Result
+//	{
+//		public FixableResult (TextSpan region, string message, DiagnosticSeverity level,
+//			IssueMarker mark, params IAnalysisFix[] fixes)
+//			: base (region, message, level, mark)
+//		{
+//			this.Fixes = fixes;
+//		}
+//		
+//		public IAnalysisFix[] Fixes { get; protected set; }
+//	}
 	
 	//FIXME: should this really use MonoDevelop.Ide.Gui.Document? Fixes could be more generic.
 	public interface IAnalysisFix
@@ -55,14 +52,14 @@ namespace MonoDevelop.AnalysisCore
 	
 	public interface IFixHandler
 	{
-		IEnumerable<IAnalysisFixAction> GetFixes (MonoDevelop.Ide.Gui.Document doc, object fix);
+		IEnumerable<IAnalysisFixAction> GetFixes (TextEditor editor, DocumentContext doc, object fix);
 	}
 	
 	public interface IAnalysisFixAction
 	{
 		string Label { get; }
 		bool SupportsBatchFix { get; }
-		DocumentRegion DocumentRegion { get; }
+		TextSpan DocumentRegion { get; }
 		string IdString { get; }
 		void Fix ();
 		void BatchFix ();
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs
index 021445d57b..ca7bd317f0 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs
@@ -25,63 +25,30 @@
 // THE SOFTWARE.
 using System;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.CodeIssues;
 using MonoDevelop.Ide;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Refactoring;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AnalysisCore.Fixes
 {
-	public class InspectorResults : GenericResults
-	{
-		public BaseCodeIssueProvider Inspector { get; private set; }
-
-		public InspectorResults (BaseCodeIssueProvider inspector, DomRegion region, string message, Severity level, IssueMarker mark, params GenericFix[] fixes)
-			: base (region, message, level, mark, fixes)
-		{
-			this.Inspector = inspector;
-		}
-
-		public override bool HasOptionsDialog { get { return true; } }
-		public override string OptionsTitle { get { return GetTitle (Inspector); } }
-		public override void ShowResultOptionsDialog ()
-		{
-			IdeApp.Workbench.ShowGlobalPreferencesDialog (null, "C#", dialog => {
-				var panel = dialog.GetPanel<CodeIssuePanel> ("C#");
-				if (panel == null)
-					return;
-				panel.Widget.SelectCodeIssue (Inspector.IdString);
-			});
-		}
-
-		public static string GetTitle (BaseCodeIssueProvider inspector)
-		{
-			if (inspector.Parent == null)
-				return inspector.Title;
-			return inspector.Parent.Title + " -> " + inspector.Title;
-		}
-
-
-	}
-
-	public class GenericResults : FixableResult
-	{
-		public GenericResults (DomRegion region, string message, Severity level,
-			IssueMarker mark, params GenericFix[] fixes)
-			: base (region, message, level, mark)
-		{
-			this.Fixes = fixes;
-		}
-	}
+//	public class GenericResults : FixableResult
+//	{
+//		public GenericResults (TextSpan region, string message, DiagnosticSeverity level,
+//			IssueMarker mark, params GenericFix[] fixes)
+//			: base (region, message, level, mark)
+//		{
+//			this.Fixes = fixes;
+//		}
+//	}
 	
 	public class GenericFix : IAnalysisFix, IAnalysisFixAction
 	{
 		Action fix;
 		Action batchFix;
 		string label;
-		public DocumentRegion DocumentRegion { get; set; }
+		public TextSpan DocumentRegion { get; set; }
 		public string IdString { get; set; }
 
 		public GenericFix (string label, Action fix, Action batchFix = null)
@@ -130,7 +97,7 @@ namespace MonoDevelop.AnalysisCore.Fixes
 	public class GenericFixHandler : IFixHandler
 	{
 		#region IFixHandler implementation
-		public IEnumerable<IAnalysisFixAction> GetFixes (MonoDevelop.Ide.Gui.Document doc, object fix)
+		public IEnumerable<IAnalysisFixAction> GetFixes (TextEditor editor, DocumentContext context, object fix)
 		{
 			yield return (GenericFix)fix;
 		}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
index baa31de769..142643b508 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
@@ -27,13 +27,10 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Refactoring;
 using MonoDevelop.Refactoring.Rename;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using Mono.TextEditor;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AnalysisCore.Fixes
 {
@@ -42,14 +39,14 @@ namespace MonoDevelop.AnalysisCore.Fixes
 		public string NewName { get; private set; }
 		public string OldName { get; private set; }
 		public string IdString { get; set; }
-		public IEntity Item { get; private set; }
-		
-		public RenameMemberFix (IEntity item, string oldName, string newName)
-		{
-			this.OldName = oldName;
-			this.NewName = newName;
-			this.Item = item;
-		}
+//		public IEntity Item { get; private set; }
+//		
+//		public RenameMemberFix (IEntity item, string oldName, string newName)
+//		{
+//			this.OldName = oldName;
+//			this.NewName = newName;
+//			this.Item = item;
+//		}
 		
 		public string FixType { get { return "RenameMember"; } }
 	}
@@ -58,23 +55,22 @@ namespace MonoDevelop.AnalysisCore.Fixes
 	{
 		//FIXME: why is this invalid on the parseddocuments loaded when the doc is first loaded?
 		//maybe the item's type's SourceProject is null?
-		public IEnumerable<IAnalysisFixAction> GetFixes (MonoDevelop.Ide.Gui.Document doc, object fix)
+		public IEnumerable<IAnalysisFixAction> GetFixes (TextEditor editor, DocumentContext doc, object fix)
 		{
 			var renameFix = (RenameMemberFix)fix;
 			var refactoring = new RenameRefactoring ();
-			var options = new RefactoringOptions (doc) {
-				SelectedItem = renameFix.Item,
+			var options = new RefactoringOptions (editor, doc) {
+			//	SelectedItem = renameFix.Item,
 			};
 			
-			if (renameFix.Item == null) {
-				ResolveResult resolveResult;
-				
-				options.SelectedItem = CurrentRefactoryOperationsHandler.GetItem (options.Document, out resolveResult);
-			}
-			
-			if (!refactoring.IsValid (options))
-				yield break;
-			
+//			if (renameFix.Item == null) {
+//				ResolveResult resolveResult;
+//				options.SelectedItem = CurrentRefactoryOperationsHandler.GetItem (options.Editor, options.DocumentContext, out resolveResult);
+//			}
+//			
+//			if (!refactoring.IsValid (options))
+//				yield break;
+//			
 			var prop = new RenameRefactoring.RenameProperties () {
 				NewName = renameFix.NewName,
 			};
@@ -113,24 +109,24 @@ namespace MonoDevelop.AnalysisCore.Fixes
 			public RenameRefactoring.RenameProperties Properties;
 			public bool Preview;
 			public string Label { get; set; }
-			public DocumentRegion DocumentRegion { get; set; }
+			public TextSpan DocumentRegion { get; set; }
 			public string IdString { get; set; }
 
 			public void Fix ()
 			{
 				if (string.IsNullOrEmpty (Properties.NewName)) {
-					Refactoring.Run (Options);
+					//Refactoring.RunInplace (Options);
 					return;
 				}
 				
-				//FIXME: performchanges should probably use a monitor too, as it can be slow
-				var changes = Refactoring.PerformChanges (Options, Properties);
-				if (Preview) {
-					MessageService.ShowCustomDialog (new RefactoringPreviewDialog (changes));
-				} else {
-					var monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor ("Rename", null);
-					RefactoringService.AcceptChanges (monitor, changes);
-				}
+//				//FIXME: performchanges should probably use a monitor too, as it can be slow
+//				var changes = Refactoring.PerformChanges (Options, Properties);
+//				if (Preview) {
+//					MessageService.ShowCustomDialog (new RefactoringPreviewDialog (changes));
+//				} else {
+//					var monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor ("Rename", null);
+//					RefactoringService.AcceptChanges (monitor, changes);
+//				}
 			}
 			
 			public bool SupportsBatchFix {
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultMarker.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultMarker.cs
index 332f0061cf..43ddf40ef4 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultMarker.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultMarker.cs
@@ -24,15 +24,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using Mono.TextEditor;
-using MonoDevelop.SourceEditor;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Refactoring;
 using System.Collections.Generic;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AnalysisCore.Gui
 {
+/*
 	class ResultMarker : UnderlineTextSegmentMarker
 	{
 		readonly Result result;
@@ -42,17 +40,9 @@ namespace MonoDevelop.AnalysisCore.Gui
 			this.result = result;
 		}
 		
-		static bool IsOneLine (Result result)
-		{
-			return result.Region.BeginLine == result.Region.EndLine;
-		}
-		
 		public Result Result { get { return result; } }
 		
 		//utility for debugging
-		public int Line { get { return result.Region.BeginLine; } }
-		public int ColStart { get { return IsOneLine (result)? (result.Region.BeginColumn) : 0; } }
-		public int ColEnd   { get { return IsOneLine (result)? (result.Region.EndColumn) : 0; } }
 		public string Message { get { return result.Message; } }
 		
 		static Cairo.Color GetColor (TextEditor editor, Result result)
@@ -214,4 +204,5 @@ namespace MonoDevelop.AnalysisCore.Gui
 		}
 		#endregion
 	}
+*/
 }
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs
index e826f51f45..b5d18d54d1 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs
@@ -25,11 +25,10 @@
 // THE SOFTWARE.

 

 using System;

-using Mono.TextEditor;

-using MonoDevelop.SourceEditor;

 using System.Text;

 using System.Collections.Generic;

 using MonoDevelop.Ide.TypeSystem;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AnalysisCore.Gui

 {

@@ -39,57 +38,59 @@ namespace MonoDevelop.AnalysisCore.Gui
 		{

 		}

 

-		public override TooltipItem GetItem (TextEditor editor, int offset)

+		public override TooltipItem GetItem (TextEditor editor, DocumentContext ctx, int offset)

 		{

-			//get the ResultsEditorExtension from the editor

-			var ed =  editor as ExtensibleTextEditor;

-			if (ed == null)

-				return null;

-			var ext = ed.Extension;

-			while (ext != null && !(ext is ResultsEditorExtension))

-				ext = ext.Next;

-			if (ext == null)

-				return null;

-			var resExt = (ResultsEditorExtension) ext;

-			

-			//get the results from the extension

-			var results = resExt.GetResultsAtOffset (offset);

-			if (results == null || results.Count == 0)

-				return null;

-			

-			return new TooltipItem (results, editor.Document.GetLineByOffset (offset));

+//			//get the ResultsEditorExtension from the editor

+//			var ed =  editor as ExtensibleTextEditor;

+//			if (ed == null)

+//				return null;

+//			var ext = ed.Extension;

+//			while (ext != null && !(ext is ResultsEditorExtension))

+//				ext = ext.Next;

+//			if (ext == null)

+//				return null;

+//			var resExt = (ResultsEditorExtension) ext;

+//			

+//			//get the results from the extension

+//			var results = resExt.GetResultsAtOffset (offset);

+//			if (results == null || results.Count == 0)

+//				return null;

+//			

+//			return new TooltipItem (results, editor.GetLineByOffset (offset));

+			return null;

 		}

 

-		protected override Gtk.Window CreateTooltipWindow (TextEditor editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)

+		public override MonoDevelop.Components.Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Gdk.ModifierType modifierState)

 		{

-			//create a message string from all the results

-			var results = (IList<Result>)item.Item;

-			var sb = new StringBuilder ();

-			bool first = false;

-			foreach (var r in results) {

-				if (!first)

-					first = true;

-				else

-					sb.AppendLine ();

-				sb.Append (r.Level.ToString ());

-				sb.Append (": ");

-				sb.Append (AmbienceService.EscapeText (r.Message));

-			}

-

-			//FIXME: use a nicer, more specialized tooltip window, with results formatting and hints about 

-			// commands and stuff

-			var win = new LanguageItemWindow ((ExtensibleTextEditor) editor, modifierState, null, sb.ToString (), null);

-			if (win.IsEmpty)

-				return null;

-			return win;

+//			//create a message string from all the results

+//			var results = (IList<Result>)item.Item;

+//			var sb = new StringBuilder ();

+//			bool first = false;

+//			foreach (var r in results) {

+//				if (!first)

+//					first = true;

+//				else

+//					sb.AppendLine ();

+//				sb.Append (r.Level.ToString ());

+//				sb.Append (": ");

+//				sb.Append (AmbienceService.EscapeText (r.Message));

+//			}

+//

+//			//FIXME: use a nicer, more specialized tooltip window, with results formatting and hints about 

+//			// commands and stuff

+//			var win = new LanguageItemWindow ((ExtensibleTextEditor) editor, modifierState, null, sb.ToString (), null);

+//			if (win.IsEmpty)

+//				return null;

+//			return win;

+			return null;

 		}

 

-		protected override void GetRequiredPosition (TextEditor editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)

-		{

-			var win = (LanguageItemWindow) tipWindow;

-			requiredWidth = win.SetMaxWidth (win.Screen.Width);

-			xalign = 0.5;

-		}

+//		protected override void GetRequiredPosition (ITextEditor editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)

+//		{

+//			var win = (LanguageItemWindow) tipWindow;

+//			requiredWidth = win.SetMaxWidth (win.Screen.Width);

+//			xalign = 0.5;

+//		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
index 4806feac47..0f9e33ae9d 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
@@ -30,20 +30,35 @@ using MonoDevelop.Ide.Gui.Content;
 using System.Threading;
 using System.Threading.Tasks;
 using System.IO;
-using Mono.TextEditor;
 using System.Linq;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Refactoring;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
 using MonoDevelop.CodeIssues;
 
 namespace MonoDevelop.AnalysisCore.Gui
 {
+	class AnalysisDocument
+	{
+		public TextEditor Editor { get; private set; }
+		public DocumentLocation CaretLocation { get; private set; }
+		public DocumentContext DocumentContext { get; private set; }
+
+		public AnalysisDocument (TextEditor editor, DocumentContext documentContext)
+		{
+			this.Editor = editor;
+			this.CaretLocation = editor.CaretLocation;
+			this.DocumentContext = documentContext;
+		}
+	}
+
 	public class ResultsEditorExtension : TextEditorExtension, IQuickTaskProvider
 	{
 		bool disposed;
 		
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 
@@ -61,12 +76,11 @@ namespace MonoDevelop.AnalysisCore.Gui
 			if (disposed) 
 				return;
 			enabled = false;
-			Document.DocumentParsed -= OnDocumentParsed;
-			CancelUpdateTimout ();
+			DocumentContext.DocumentParsed -= OnDocumentParsed;
 			CancelTask ();
 			AnalysisOptions.AnalysisEnabled.Changed -= AnalysisOptionsChanged;
 			while (markers.Count > 0)
-				Document.Editor.Document.RemoveMarker (markers.Dequeue ());
+				Editor.RemoveMarker (markers.Dequeue ());
 			tasks.Clear ();
 			disposed = true;
 		}
@@ -90,20 +104,16 @@ namespace MonoDevelop.AnalysisCore.Gui
 			if (enabled)
 				return;
 			enabled = true;
-			Document.DocumentParsed += OnDocumentParsed;
-			if (Document.ParsedDocument != null)
+			DocumentContext.DocumentParsed += OnDocumentParsed;
+			if (DocumentContext.ParsedDocument != null)
 				OnDocumentParsed (null, null);
 		}
 
 		void CancelTask ()
 		{
-			if (src != null) {
-				src.Cancel ();
-				try {
-					oldTask.Wait ();
-				} catch (TaskCanceledException) {
-				} catch (AggregateException ex) {
-					ex.Handle (e => e is TaskCanceledException);
+			lock (updateLock) {
+				if (src != null) {
+					src.Cancel ();
 				}
 			}
 		}
@@ -113,7 +123,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 			if (!enabled)
 				return;
 			enabled = false;
-			Document.DocumentParsed -= OnDocumentParsed;
+			DocumentContext.DocumentParsed -= OnDocumentParsed;
 			CancelTask ();
 			new ResultsUpdater (this, new Result[0], CancellationToken.None).Update ();
 		}
@@ -125,21 +135,28 @@ namespace MonoDevelop.AnalysisCore.Gui
 
 		void OnDocumentParsed (object sender, EventArgs args)
 		{
-			if (!QuickTaskStrip.EnableFancyFeatures)
+			if (!AnalysisOptions.EnableFancyFeatures)
 				return;
 			CancelUpdateTimout ();
-			var doc = Document.ParsedDocument;
+			var doc = DocumentContext.ParsedDocument;
 			if (doc == null)
 				return;
+			var ad = new AnalysisDocument (Editor, DocumentContext);
 			updateTimeout = GLib.Timeout.Add (250, delegate {
 				lock (updateLock) {
 					CancelTask ();
 					src = new CancellationTokenSource ();
 					var token = src.Token;
 					oldTask = Task.Run (() => {
-						var result = CodeAnalysisRunner.Check (Document, doc, token);
-						var updater = new ResultsUpdater (this, result, token);
-						updater.Update ();
+						try {
+							var result = CodeDiagnosticRunner.Check (ad, token);
+							if (token.IsCancellationRequested)
+								return;
+							var updater = new ResultsUpdater (this, result, token);
+							updater.Update ();
+						} catch (OperationCanceledException) {
+						} catch (AggregateException) {
+						}
 					});
 					updateTimeout = 0;
 					return false;
@@ -155,6 +172,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 			}
 		}
 
+
 		class ResultsUpdater 
 		{
 			readonly ResultsEditorExtension ext;
@@ -178,12 +196,28 @@ namespace MonoDevelop.AnalysisCore.Gui
 			
 			public void Update ()
 			{
-				if (!QuickTaskStrip.EnableFancyFeatures || cancellationToken.IsCancellationRequested)
+				if (!AnalysisOptions.EnableFancyFeatures || cancellationToken.IsCancellationRequested)
 					return;
 				ext.tasks.Clear ();
 				GLib.Idle.Add (IdleHandler);
 			}
-			
+
+			static Cairo.Color GetColor (TextEditor editor, Result result)
+			{
+				switch (result.Level) {
+				case DiagnosticSeverity.Hidden:
+					return DefaultSourceEditorOptions.Instance.GetColorStyle ().PlainText.Background;
+				case DiagnosticSeverity.Error:
+					return DefaultSourceEditorOptions.Instance.GetColorStyle ().UnderlineError.Color;
+				case DiagnosticSeverity.Warning:
+					return DefaultSourceEditorOptions.Instance.GetColorStyle ().UnderlineWarning.Color;
+				case DiagnosticSeverity.Info:
+					return DefaultSourceEditorOptions.Instance.GetColorStyle ().UnderlineSuggestion.Color;
+				default:
+					throw new System.ArgumentOutOfRangeException ();
+				}
+			}
+
 			//this runs as a glib idle handler so it can add/remove text editor markers
 			//in order to to block the GUI thread, we batch them in UPDATE_COUNT
 			bool IdleHandler ()
@@ -191,13 +225,13 @@ namespace MonoDevelop.AnalysisCore.Gui
 				if (cancellationToken.IsCancellationRequested)
 					return false;
 				var editor = ext.Editor;
-				if (editor == null || editor.Document == null)
+				if (editor == null)
 					return false;
 				//clear the old results out at the same rate we add in the new ones
 				for (int i = 0; oldMarkers > 0 && i < UPDATE_COUNT; i++) {
 					if (cancellationToken.IsCancellationRequested)
 						return false;
-					editor.Document.RemoveMarker (ext.markers.Dequeue ());
+					editor.RemoveMarker (ext.markers.Dequeue ());
 					oldMarkers--;
 				}
 				//add in the new markers
@@ -209,27 +243,30 @@ namespace MonoDevelop.AnalysisCore.Gui
 					if (cancellationToken.IsCancellationRequested)
 						return false;
 					var currentResult = (Result)enumerator.Current;
-
 					if (currentResult.InspectionMark != IssueMarker.None) {
-						int start = editor.LocationToOffset (currentResult.Region.Begin);
-						int end = editor.LocationToOffset (currentResult.Region.End);
+						int start = currentResult.Region.Start;
+						int end = currentResult.Region.End;
 						if (start >= end)
 							continue;
 						if (currentResult.InspectionMark == IssueMarker.GrayOut) {
-							var marker = new GrayOutMarker (currentResult, TextSegment.FromBounds (start, end));
+							var marker = TextMarkerFactory.CreateGenericTextSegmentMarker (editor, TextSegmentMarkerEffect.GrayOut, TextSegment.FromBounds (start, end));
 							marker.IsVisible = currentResult.Underline;
-							editor.Document.AddMarker (marker);
+							marker.Tag = currentResult;
+							editor.AddMarker (marker);
 							ext.markers.Enqueue (marker);
-							editor.Parent.TextViewMargin.RemoveCachedLine (editor.GetLineByOffset (start));
-							editor.Parent.QueueDraw ();
+//							editor.Parent.TextViewMargin.RemoveCachedLine (editor.GetLineByOffset (start));
+//							editor.Parent.QueueDraw ();
 						} else {
-							var marker = new ResultMarker (currentResult, TextSegment.FromBounds (start, end));
+							var effect = currentResult.InspectionMark == IssueMarker.DottedLine ? TextSegmentMarkerEffect.DottedLine : TextSegmentMarkerEffect.WavedLine;
+							var marker = TextMarkerFactory.CreateGenericTextSegmentMarker (editor, effect, TextSegment.FromBounds (start, end));
+							marker.Color = GetColor (editor, currentResult);
 							marker.IsVisible = currentResult.Underline;
-							editor.Document.AddMarker (marker);
+							marker.Tag = currentResult;
+							editor.AddMarker (marker);
 							ext.markers.Enqueue (marker);
 						}
 					}
-					ext.tasks.Add (new QuickTask (currentResult.Message, currentResult.Region.Begin, currentResult.Level));
+					ext.tasks.Add (new QuickTask (currentResult.Message, currentResult.Region.Start, currentResult.Level));
 				}
 				
 				return true;
@@ -237,7 +274,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 		}
 		
 		//all markers known to be in the editor
-		Queue<ResultMarker> markers = new Queue<ResultMarker> ();
+		Queue<IGenericTextSegmentMarker> markers = new Queue<IGenericTextSegmentMarker> ();
 		
 		const int UPDATE_COUNT = 20;
 		
@@ -247,19 +284,19 @@ namespace MonoDevelop.AnalysisCore.Gui
 //			var line = Editor.GetLineByOffset (offset);
 			
 			var list = new List<Result> ();
-			foreach (var marker in Editor.Document.GetTextSegmentMarkersAt (offset)) {
+			foreach (var marker in Editor.GetTextSegmentMarkersAt (offset)) {
 				if (token.IsCancellationRequested)
 					break;
-				var resultMarker = marker as ResultMarker;
-				if (resultMarker != null)
-					list.Add (resultMarker.Result);
+				var resultMarker = marker as IGenericTextSegmentMarker;
+				if (resultMarker != null && resultMarker.Tag is Result)
+					list.Add (resultMarker.Tag as Result);
 			}
 			return list;
 		}
 		
 		public IEnumerable<Result> GetResults ()
 		{
-			return markers.Select (m => m.Result);
+			return markers.Select (m => m.Tag).OfType<Result> ();
 		}
 
 		#region IQuickTaskProvider implementation
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/IssueMarker.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/IssueMarker.cs
new file mode 100644
index 0000000000..8713caf62d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/IssueMarker.cs
@@ -0,0 +1,55 @@
+//
+// IssueMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.AnalysisCore
+{
+	/// <summary>
+	/// The issue marker is used to set how an issue should be marked inside the text editor.
+	/// </summary>
+	public enum IssueMarker
+	{
+		/// <summary>
+		/// The issue is not shown inside the text editor. (But in the task bar)
+		/// </summary>
+		None,
+
+		/// <summary>
+		/// The region is marked as underline in the severity color.
+		/// </summary>
+		WavedLine,
+
+		/// <summary>
+		/// The region is marked as dotted line in the severity color.
+		/// </summary>
+		DottedLine,
+
+		/// <summary>
+		/// The text is grayed out.
+		/// </summary>
+		GrayOut
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Result.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Result.cs
index 0e89e12711..7ed4a24101 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Result.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Result.cs
@@ -25,25 +25,22 @@
 // THE SOFTWARE.
 
 using System;
-using ICSharpCode.NRefactory.Refactoring;
 using MonoDevelop.AnalysisCore.Extensions;
-using MonoDevelop.SourceEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.CSharp;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AnalysisCore
 {
 	public class Result
 	{
-		public Result (DomRegion region, string message, bool underLine = true)
+		public Result (TextSpan region, string message, bool underLine = true)
 		{
 			this.Region = region;
 			this.Message = message;
 			this.Underline = underLine;
 		}
 		
-		public Result (DomRegion region, string message, Severity level, IssueMarker inspectionMark, bool underline = true)
+		public Result (TextSpan region, string message, DiagnosticSeverity level, IssueMarker inspectionMark, bool underline = true)
 		{
 			this.Region = region;
 			this.Message = message;
@@ -52,7 +49,7 @@ namespace MonoDevelop.AnalysisCore
 			this.Underline = underline;
 		}
 		 
-		public void SetSeverity (Severity level, IssueMarker inspectionMark)
+		public void SetSeverity (DiagnosticSeverity level, IssueMarker inspectionMark)
 		{
 			this.Level = level;
 			this.InspectionMark = inspectionMark;
@@ -66,9 +63,9 @@ namespace MonoDevelop.AnalysisCore
 		}
 		
 		public string Message { get; private set; }
-		public Severity Level { get; private set; }
+		public DiagnosticSeverity Level { get; private set; }
 		public IssueMarker InspectionMark { get; private set; }
-		public DomRegion Region { get; private set; }
+		public TextSpan Region { get; private set; }
 		
 		public bool Underline { get; private set; }
 		
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Rules/Adaptors.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Rules/Adaptors.cs
deleted file mode 100644
index eaf8c6a3af..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Rules/Adaptors.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// 
-// Adaptors.cs
-//  
-// Author:
-//       Michael Hutchinson <mhutchinson@novell.com>
-// 
-// Copyright (c) 2010 Novell, Inc.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using MonoDevelop.AnalysisCore.Fixes;
-using MonoDevelop.Ide.Gui;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace MonoDevelop.AnalysisCore.Rules
-{
-	public static class Adapters
-	{
-		public static IUnresolvedFile GetCompilationUnit (Document input)
-		{
-			return input.ParsedDocument.ParsedFile;
-		}
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/AnalysisCodeAction.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/AnalysisCodeAction.cs
deleted file mode 100644
index 5641aecb60..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/AnalysisCodeAction.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// 
-// AnalysisQuickFix.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.AnalysisCore;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory;
-using System.Threading;
-using MonoDevelop.Ide;
-using MonoDevelop.CodeIssues;
-using MonoDevelop.AnalysisCore.Fixes;
-using Mono.TextEditor;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.CodeActions
-{
-	class AnalysisContextActionProvider : CodeActionProvider
-	{
-		public Result Result {
-			get;
-			private set;
-		}
-		
-		public IAnalysisFixAction Action {
-			get;
-			private set;
-		}
-		
-		public AnalysisContextActionProvider (Result result, IAnalysisFixAction action)
-		{
-			Result = result;
-			Action = action;
-			Description = result.Message;
-		}
-		
-		public override System.Collections.Generic.IEnumerable<CodeAction> GetActions (MonoDevelop.Ide.Gui.Document document, object refactoringContext, TextLocation loc, CancellationToken cancellationToken)
-		{
-			yield return new AnalysisCodeAction (Action, Result) {
-				DocumentRegion = Action.DocumentRegion
-			};
-		}
-
-		internal class AnalysisCodeAction : CodeAction
-		{
-			public IAnalysisFixAction Action {
-				get;
-				private set;
-			}
-			public Result Result {
-				get;
-				private set;
-			}
-
-			public AnalysisCodeAction (IAnalysisFixAction action, Result result)
-			{
-				Action = action;
-				Title = action.Label;
-				Result = result;
-				IdString = action.IdString;
-			}
-	
-			public override void Run (IRefactoringContext context, object script)
-			{
-				Action.Fix ();
-			}
-			
-			public override bool SupportsBatchRunning {
-				get {
-					return Action.SupportsBatchFix;
-				}
-			}
-			
-			public override void BatchRun (MonoDevelop.Ide.Gui.Document document, TextLocation loc)
-			{
-				Action.BatchFix ();
-			}
-
-			public void ShowOptions (object sender, EventArgs e)
-			{
-				var inspectorResults = Result as InspectorResults;
-				if (inspectorResults != null)
-					inspectorResults.ShowResultOptionsDialog ();
-			}
-
-			public void HideCodeIssue (object sender, EventArgs e)
-			{
-				var inspectorResults = Result as InspectorResults;
-				if (inspectorResults != null)
-					inspectorResults.Inspector.SetIsEnabled (false);
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeAction.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeAction.cs
deleted file mode 100644
index 0aef83200c..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeAction.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// 
-// Result.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory;
-using System;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.Refactoring;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.CodeActions
-{
-	/// <summary>
-	/// A code action represents a menu entry that does edit operation in one document.
-	/// </summary>
-	public abstract class CodeAction
-	{
-		/// <summary>
-		/// Gets or sets the menu item text.
-		/// </summary>
-		public string Title { get; set; }
-
-		/// <summary>
-		/// Gets or sets the id string. The id is used to identify a specific code action.
-		/// </summary>
-		public string IdString { get; set; }
-
-		/// <summary>
-		/// The region of the code action.
-		/// </summary>
-		public DocumentRegion DocumentRegion { get; set; }
-		
-		/// <summary>
-		/// Gets or sets the type of the inspector that is the source of this action.
-		/// </summary>
-		/// <value>The type of the inspector.</value>
-		public Type InspectorType { get; set; }
-		
-		/// <summary>
-		/// Gets or sets the sibling key.
-		/// </summary>
-		/// <value>The sibling key.</value>
-		public object SiblingKey { get; set; }
-
-		/// <summary>
-		/// Gets or sets the severity of the code action.
-		/// </summary>
-		/// <value>The severity.</value>
-		public Severity Severity { get; set; }
-
-		protected CodeAction ()
-		{
-			IdString = GetType ().FullName;
-		}
-
-		/// <summary>
-		/// Performs the specified code action in document at loc.
-		/// </summary>
-		public abstract void Run (IRefactoringContext context, object script);
-
-		/// <summary>
-		/// True if <see cref="BatchRun"/> can be used on the current instance.
-		/// </summary>
-		/// <value><c>true</c> if supports batch running; otherwise, <c>false</c>.</value>
-		public virtual bool SupportsBatchRunning {
-			get{
-				return false;
-			}
-		}
-		
-		public virtual void BatchRun (MonoDevelop.Ide.Gui.Document document, TextLocation loc)
-		{
-			if (!SupportsBatchRunning) {
-				throw new InvalidOperationException ("Batch running is not supported.");
-			}
-		}
-	}
-
-	public class DefaultCodeAction : CodeAction
-	{
-		public Action<RefactoringContext, Script> act;
-
-		public DefaultCodeAction (string title, Action<RefactoringContext, Script> act)
-		{
-			Title = title;
-			this.act = act;
-		}
-
-		public override void Run (IRefactoringContext context, object script)
-		{
-			act ((RefactoringContext)context, (Script)script);
-		}
-	}
-
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionAddinNode.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionAddinNode.cs
deleted file mode 100644
index 11b7701fbd..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionAddinNode.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// 
-// ContextActionCodon.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using Mono.Addins;
-
-namespace MonoDevelop.CodeActions
-{
-	public class CodeActionAddinNode : TypeExtensionNode
-	{
-		[NodeAttribute ("mimeType", Required=true, Description="The mime type of this action.")]
-		string mimeType = null;
-		
-		public string MimeType {
-			get {
-				return mimeType;
-			}
-		}
-		
-		[NodeAttribute ("_title", Required=true, Localizable=true, Description="The title of this action.")]
-		string title = null;
-		
-		public string Title {
-			get {
-				return title;
-			}
-		}
-		
-		[NodeAttribute ("_description", Required=true, Localizable=true,  Description="The description of this action.")]
-		string description = null;
-		
-		public string Description {
-			get {
-				return description;
-			}
-		}
-		
-		CodeActionProvider action;
-		public CodeActionProvider Action {
-			get {
-				if (action == null) {
-					action = (CodeActionProvider)CreateInstance ();
-					action.Title = title;
-					action.Description = description;
-					action.MimeType = MimeType;
-				}
-				
-				return action;
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionContainer.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionContainer.cs
new file mode 100644
index 0000000000..bf2ce53f55
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionContainer.cs
@@ -0,0 +1,119 @@
+//
+// CodeActionContainer.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.CodeActions;
+using System;
+using MonoDevelop.CodeIssues;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using System.Collections;
+
+namespace MonoDevelop.CodeActions
+{
+	class CodeActionContainer
+	{
+		public static readonly CodeActionContainer Empty = new CodeActionContainer();
+
+		public bool IsEmpty {
+			get {
+				return CodeFixActions.Count + CodeRefactoringActions.Count == 0;
+			}
+		}
+
+		IReadOnlyList<ValidCodeDiagnosticAction> codeFixActions;
+		public IReadOnlyList<ValidCodeDiagnosticAction> CodeFixActions {
+			get {
+				return codeFixActions ?? new ValidCodeDiagnosticAction[0];
+			}
+			private set {
+				codeFixActions = value;
+			}
+		}
+
+		IReadOnlyList<ValidCodeAction> codeRefactoringActions;
+
+		public IReadOnlyList<ValidCodeAction> CodeRefactoringActions {
+			get {
+				return codeRefactoringActions ?? new ValidCodeAction[0];
+			}
+			private set {
+				codeRefactoringActions = value;
+			}
+		}
+
+		public IEnumerable<ValidCodeAction> AllValidCodeActions {
+			get {
+				return CodeRefactoringActions.Concat (CodeFixActions);
+			}
+		}
+
+		IReadOnlyList<Diagnostic> diagnosticsAtCaret;
+		public IReadOnlyList<Diagnostic> DiagnosticsAtCaret {
+			get {
+				return diagnosticsAtCaret ?? new Diagnostic[0];
+			}
+			private set {
+				diagnosticsAtCaret = value.Distinct (new DiagnosticComparer()).ToList ();
+			}
+		}
+
+		class DiagnosticComparer : IEqualityComparer<Diagnostic>
+		{
+			bool IEqualityComparer<Diagnostic>.Equals (Diagnostic x, Diagnostic y)
+			{
+				if (x.Id != null && y.Id != null)
+					return x.Id == y.Id;
+				return x.Equals (y);
+			}
+
+			int IEqualityComparer<Diagnostic>.GetHashCode (Diagnostic obj)
+			{
+				return obj.Id != null ? obj.Id.GetHashCode () : obj.GetHashCode ();
+			}
+		}
+
+		CodeActionContainer ()
+		{
+			CodeFixActions = new List<ValidCodeDiagnosticAction> ();
+			CodeRefactoringActions = new List<ValidCodeAction> ();
+			DiagnosticsAtCaret = new List<Diagnostic> ();
+		}
+
+		internal CodeActionContainer (List<ValidCodeDiagnosticAction> codeDiagnosticActions, List<ValidCodeAction> codeRefactoringActions, List<Diagnostic> diagnosticsAtCaret)
+		{
+			if (codeDiagnosticActions == null)
+				throw new ArgumentNullException ("codeDiagnosticActions");
+			if (codeRefactoringActions == null)
+				throw new ArgumentNullException ("codeRefactoringActions");
+			if (diagnosticsAtCaret == null)
+				throw new ArgumentNullException ("diagnosticsAtCaret");
+			CodeFixActions = codeDiagnosticActions;
+			CodeRefactoringActions = codeRefactoringActions;
+			DiagnosticsAtCaret = diagnosticsAtCaret;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
index 8cbdfbf6dc..b2077a0d16 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
@@ -24,26 +24,32 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using MonoDevelop.Ide.Gui.Content;
 using Gtk;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Components.Commands;
-using MonoDevelop.SourceEditor.QuickTasks;
 using System.Linq;
 using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory;
 using System.Threading;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Semantics;
-using MonoDevelop.AnalysisCore.Fixes;
-using ICSharpCode.NRefactory.Refactoring;
-using MonoDevelop.Ide.Gui;
+using Microsoft.CodeAnalysis.CodeFixes;
+using MonoDevelop.CodeIssues;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
+using Microsoft.CodeAnalysis.CodeActions;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using MonoDevelop.AnalysisCore;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor.Extension;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.CodeActions
 {
-	class CodeActionEditorExtension : TextEditorExtension 
+	class CodeActionEditorExtension : TextEditorExtension
 	{
 		uint quickFixTimeout;
 
@@ -52,11 +58,6 @@ namespace MonoDevelop.CodeActions
 		uint menuCloseTimeoutId;
 		FixMenuDescriptor codeActionMenu;
 
-		public IEnumerable<CodeAction> Fixes {
-			get;
-			private set;
-		}
-
 		static CodeActionEditorExtension ()
 		{
 			var usages = PropertyService.Get<Properties> ("CodeActionUsages", new Properties ());
@@ -67,6 +68,7 @@ namespace MonoDevelop.CodeActions
 
 		void CancelSmartTagPopupTimeout ()
 		{
+
 			if (smartTagPopupTimeoutId != 0) {
 				GLib.Source.Remove (smartTagPopupTimeoutId);
 				smartTagPopupTimeoutId = 0;
@@ -80,27 +82,28 @@ namespace MonoDevelop.CodeActions
 				menuCloseTimeoutId = 0;
 			}
 		}
-		
+
 		void RemoveWidget ()
 		{
 			if (currentSmartTag != null) {
-				document.Editor.Document.RemoveMarker (currentSmartTag);
+				Editor.RemoveMarker (currentSmartTag);
 				currentSmartTag = null;
-				currentSmartTagBegin = DocumentLocation.Empty;
+				currentSmartTagBegin = -1;
 			}
 			CancelSmartTagPopupTimeout ();
-
 		}
-		
+
 		public override void Dispose ()
 		{
 			CancelMenuCloseTimer ();
 			CancelQuickFixTimer ();
-			document.Editor.SelectionChanged -= HandleSelectionChanged;
-			document.DocumentParsed -= HandleDocumentDocumentParsed;
-			document.Editor.Parent.BeginHover -= HandleBeginHover;
+			Editor.CaretPositionChanged -= HandleCaretPositionChanged;
+			Editor.SelectionChanged -= HandleSelectionChanged;
+			DocumentContext.DocumentParsed -= HandleDocumentDocumentParsed;
+			Editor.BeginMouseHover -= HandleBeginHover;
+			Editor.TextChanged -= Editor_TextChanged;
+			Editor.EndAtomicUndoOperation -= Editor_EndAtomicUndoOperation;
 			RemoveWidget ();
-			Fixes = null;
 			base.Dispose ();
 		}
 
@@ -108,6 +111,8 @@ namespace MonoDevelop.CodeActions
 
 		static void ConfirmUsage (string id)
 		{
+			if (id == null)
+				return;
 			if (!CodeActionUsages.ContainsKey (id)) {
 				CodeActionUsages [id] = 1;
 			} else {
@@ -120,70 +125,137 @@ namespace MonoDevelop.CodeActions
 		internal static int GetUsage (string id)
 		{
 			int result;
-			if (!CodeActionUsages.TryGetValue (id, out result)) 
+			if (id == null || !CodeActionUsages.TryGetValue (id, out result))
 				return 0;
 			return result;
 		}
 
 		public void CancelQuickFixTimer ()
 		{
-			if (quickFixCancellationTokenSource != null)
-				quickFixCancellationTokenSource.Cancel ();
-			if (quickFixTimeout != 0) {
-				GLib.Source.Remove (quickFixTimeout);
-				quickFixTimeout = 0;
-			}
+			quickFixCancellationTokenSource.Cancel ();
+			quickFixCancellationTokenSource = new CancellationTokenSource ();
+			smartTagTask = null;
 		}
 
-		CancellationTokenSource quickFixCancellationTokenSource;
+		Task<CodeActionContainer> smartTagTask;
+		CancellationTokenSource quickFixCancellationTokenSource = new CancellationTokenSource ();
 
-		public override void CursorPositionChanged ()
+		void HandleCaretPositionChanged (object sender, EventArgs e)
 		{
+			if (Editor.IsInAtomicUndo)
+				return;
 			CancelQuickFixTimer ();
-			if (QuickTaskStrip.EnableFancyFeatures &&  Document.ParsedDocument != null && !Debugger.DebuggingService.IsDebugging) {
-				quickFixCancellationTokenSource = new CancellationTokenSource ();
+			if (AnalysisOptions.EnableFancyFeatures && DocumentContext.ParsedDocument != null && !Debugger.DebuggingService.IsDebugging) {
 				var token = quickFixCancellationTokenSource.Token;
-				quickFixTimeout = GLib.Timeout.Add (100, delegate {
-					var loc = Document.Editor.Caret.Location;
-					RefactoringService.QueueQuickFixAnalysis (Document, loc, token, delegate(List<CodeAction> fixes) {
-						if (!fixes.Any ()) {
-							ICSharpCode.NRefactory.Semantics.ResolveResult resolveResult;
-							AstNode node;
-							if (ResolveCommandHandler.ResolveAt (document, out resolveResult, out node, token)) {
-								var possibleNamespaces = ResolveCommandHandler.GetPossibleNamespaces (document, node, ref resolveResult);
-								if (!possibleNamespaces.Any ()) {
-									if (currentSmartTag != null)
-										Application.Invoke (delegate { RemoveWidget (); });
-									return;
+				var curOffset = Editor.CaretOffset;
+				foreach (var fix in GetCurrentFixes ().AllValidCodeActions) {
+					if (!fix.ValidSegment.Contains (curOffset)) {
+						RemoveWidget ();
+						break;
+					}
+				}
+
+				var loc = Editor.CaretOffset;
+				var ad = DocumentContext.AnalysisDocument;
+				if (ad == null) {
+					return;
+				}
+
+				TextSpan span;
+
+				if (Editor.IsSomethingSelected) {
+					var selectionRange = Editor.SelectionRange;
+					span = selectionRange.Offset >= 0 ? TextSpan.FromBounds (selectionRange.Offset, selectionRange.EndOffset) : TextSpan.FromBounds (loc, loc);
+				} else {
+					span = TextSpan.FromBounds (loc, loc);
+				}
+
+				var diagnosticsAtCaret =
+					Editor.GetTextSegmentMarkersAt (Editor.CaretOffset)
+						.OfType<IGenericTextSegmentMarker> ()
+						.Select (rm => rm.Tag)
+						.OfType<DiagnosticResult> ()
+						.Select (dr => dr.Diagnostic)
+						.ToList ();
+
+				var errorList = Editor
+					.GetTextSegmentMarkersAt (Editor.CaretOffset)
+					.OfType<IErrorMarker> ()
+					.Where (rm => !string.IsNullOrEmpty (rm.Error.Id)).ToList ();
+				int editorLength = Editor.Length;
+
+				smartTagTask = Task.Run (async delegate {
+					try {
+						var codeIssueFixes = new List<ValidCodeDiagnosticAction> ();
+						var diagnosticIds = diagnosticsAtCaret.Select (diagnostic => diagnostic.Id).Concat (errorList.Select (rm => rm.Error.Id)).ToImmutableArray<string> ();
+						foreach (var cfp in CodeRefactoringService.GetCodeFixesAsync (DocumentContext, CodeRefactoringService.MimeTypeToLanguage (Editor.MimeType)).Result) {
+							if (token.IsCancellationRequested)
+								return CodeActionContainer.Empty;
+							var provider = cfp.GetCodeFixProvider ();
+							if (!provider.FixableDiagnosticIds.Any (diagnosticIds.Contains))
+								continue;
+							try {
+								var groupedDiagnostics = diagnosticsAtCaret
+									.Concat (errorList.Select (em => em.Error.Tag)
+									.OfType<Diagnostic> ())
+									.GroupBy (d => d.Location.SourceSpan);
+								foreach (var g in groupedDiagnostics) {
+									var diagnosticSpan = g.Key;
+
+									var validDiagnostics = g.Where (d => provider.FixableDiagnosticIds.Contains (d.Id)).ToImmutableArray ();
+									if (validDiagnostics.Length == 0)
+										continue;
+									await provider.RegisterCodeFixesAsync (new CodeFixContext(ad, diagnosticSpan, validDiagnostics, (ca, d) => codeIssueFixes.Add (new ValidCodeDiagnosticAction (cfp, ca, diagnosticSpan)), token));
+
+									// TODO: Is that right ? Currently it doesn't really make sense to run one code fix provider on several overlapping diagnostics at the same location
+									//       However the generate constructor one has that case and if I run it twice the same code action is generated twice. So there is a dupe check problem there.
+									// Work around for now is to only take the first diagnostic batch.
+									break;
 								}
-							} else {
-								if (currentSmartTag != null)
-									Application.Invoke (delegate { RemoveWidget (); });
-								return;
+							} catch (OperationCanceledException) {
+								return CodeActionContainer.Empty;
+							} catch (AggregateException ae) {
+								ae.Flatten ().Handle (aex => aex is OperationCanceledException);
+								return CodeActionContainer.Empty;
+							} catch (Exception ex) {
+								LoggingService.LogError ("Error while getting refactorings from code fix provider " + cfp.Name, ex);
+								continue;
 							}
 						}
+						var codeActions = new List<ValidCodeAction> ();
+						foreach (var action in CodeRefactoringService.GetValidActionsAsync (Editor, DocumentContext, span, token).Result) {
+							codeActions.Add (action);
+						}
+						var codeActionContainer = new CodeActionContainer (codeIssueFixes, codeActions, diagnosticsAtCaret);
 						Application.Invoke (delegate {
 							if (token.IsCancellationRequested)
 								return;
-							CreateSmartTag (fixes, loc);
+							if (codeActionContainer.IsEmpty) {
+								RemoveWidget ();
+								return;
+							}
+							CreateSmartTag (codeActionContainer, loc);
 						});
-					});
-					quickFixTimeout = 0;
-					return false;
-				});
+						return codeActionContainer;
+
+					} catch (AggregateException ae) {
+						ae.Flatten ().Handle (aex => aex is OperationCanceledException);
+						return CodeActionContainer.Empty;
+					} catch (OperationCanceledException) {
+						return CodeActionContainer.Empty;
+					}
+				}, token);
 			} else {
 				RemoveWidget ();
 			}
-			base.CursorPositionChanged ();
 		}
 
-		internal static bool IsAnalysisOrErrorFix (CodeAction act)
+		internal static bool IsAnalysisOrErrorFix (Microsoft.CodeAnalysis.CodeActions.CodeAction act)
 		{
-			return act is AnalysisContextActionProvider.AnalysisCodeAction || act.Severity == Severity.Error;
-		} 
-			
+			return false;
+		}
 
-		class FixMenuEntry
+		internal class FixMenuEntry
 		{
 			public static readonly FixMenuEntry Separator = new FixMenuEntry ("-", null);
 			public readonly string Label;
@@ -197,12 +269,14 @@ namespace MonoDevelop.CodeActions
 			}
 		}
 
-		class FixMenuDescriptor : FixMenuEntry
+		internal class FixMenuDescriptor : FixMenuEntry
 		{
 			readonly List<FixMenuEntry> items = new List<FixMenuEntry> ();
 
-			public IReadOnlyList<FixMenuEntry> Items {
-				get {
+			public IReadOnlyList<FixMenuEntry> Items
+			{
+				get
+				{
 					return items;
 				}
 			}
@@ -217,93 +291,56 @@ namespace MonoDevelop.CodeActions
 
 			public void Add (FixMenuEntry entry)
 			{
-				items.Add (entry); 
+				items.Add (entry);
 			}
 
-			public object MotionNotifyEvent {
+			public object MotionNotifyEvent
+			{
 				get;
 				set;
 			}
 		}
 
+		internal static Action<TextEditor, DocumentContext, FixMenuDescriptor> AddPossibleNamespace;
+
 		void PopupQuickFixMenu (Gdk.EventButton evt, Action<FixMenuDescriptor> menuAction)
 		{
 			FixMenuDescriptor menu = new FixMenuDescriptor ();
 			var fixMenu = menu;
-			ResolveResult resolveResult;
-			ICSharpCode.NRefactory.CSharp.AstNode node;
+			//ResolveResult resolveResult;
+			//ICSharpCode.NRefactory.CSharp.AstNode node;
 			int items = 0;
-			if (ResolveCommandHandler.ResolveAt (document, out resolveResult, out node)) {
-				var possibleNamespaces = MonoDevelop.Refactoring.ResolveCommandHandler.GetPossibleNamespaces (
-					document,
-					node,
-					ref resolveResult
-				);
-
-				foreach (var t in possibleNamespaces.Where (tp => tp.OnlyAddReference)) {
-					menu.Add (new FixMenuEntry (t.GetImportText (), delegate {
-						new ResolveCommandHandler.AddImport (document, resolveResult, null, t.Reference, true, node).Run ();
-					}));
-					items++;
-				}
 
-				bool addUsing = !(resolveResult is AmbiguousTypeResolveResult);
-				if (addUsing) {
-					foreach (var t in possibleNamespaces.Where (tp => tp.IsAccessibleWithGlobalUsing)) {
-						string ns = t.Namespace;
-						var reference = t.Reference;
-						menu.Add (new FixMenuEntry (t.GetImportText (), 
-							delegate {
-								new ResolveCommandHandler.AddImport (document, resolveResult, ns, reference, true, node).Run ();
-							})
-						);
-						items++;
-					}
-				}
+//			if (AddPossibleNamespace != null) {
+//				AddPossibleNamespace (Editor, DocumentContext, menu);
+//				items = menu.Items.Count;
+//			}
 
-				bool resolveDirect = !(resolveResult is UnknownMemberResolveResult);
-				if (resolveDirect) {
-					foreach (var t in possibleNamespaces) {
-						string ns = t.Namespace;
-						var reference = t.Reference;
-						menu.Add (new FixMenuEntry (t.GetInsertNamespaceText (document.Editor.GetTextBetween (node.StartLocation, node.EndLocation)),
-							delegate {
-							new ResolveCommandHandler.AddImport (document, resolveResult, ns, reference, false, node).Run ();
-						}));
-						items++;
-					}
-				}
-
-				if (menu.Items.Any () && Fixes.Any ()) {
-					fixMenu = new FixMenuDescriptor (GettextCatalog.GetString ("Quick Fixes"));
-					menu.Add (fixMenu);
-					items++;
-				}
-			}
 			PopulateFixes (fixMenu, ref items);
+
 			if (items == 0) {
 				return;
 			}
-			document.Editor.SuppressTooltips = true;
-			document.Editor.Parent.HideTooltip ();
+//			document.Editor.SuppressTooltips = true;
+//			document.Editor.Parent.HideTooltip ();
 			if (menuAction != null)
 				menuAction (menu);
-			var container = document.Editor.Parent;
 
-			var p = container.LocationToPoint (currentSmartTagBegin);
+			var p = Editor.LocationToPoint (Editor.OffsetToLocation (currentSmartTagBegin));
+			Gtk.Widget widget = Editor;
 			var rect = new Gdk.Rectangle (
-				p.X + container.Allocation.X , 
-				p.Y + (int)document.Editor.LineHeight + container.Allocation.Y, 0, 0);
+				(int)p.X + widget.Allocation.X,
+				(int)p.Y + (int)Editor.LineHeight + widget.Allocation.Y, 0, 0);
 
-			ShowFixesMenu (document.Editor.Parent, rect, menu);
+			ShowFixesMenu (widget, rect, menu);
 		}
 
-		#if MAC
+#if MAC
 		class ClosingMenuDelegate : AppKit.NSMenuDelegate
 		{
-			readonly TextEditorData data;
+			readonly TextEditor data;
 
-			public ClosingMenuDelegate (TextEditorData editor_data)
+			public ClosingMenuDelegate (TextEditor editor_data)
 			{
 				data = editor_data;
 			}
@@ -314,10 +351,11 @@ namespace MonoDevelop.CodeActions
 
 			public override void MenuDidClose (AppKit.NSMenu menu)
 			{
-				data.SuppressTooltips = false;
+				// TODO: roslyn port ? (seems to be unused anyways btw.)
+				//data.SuppressTooltips = false;
 			}
 		}
-		#endif
+#endif
 
 		bool ShowFixesMenu (Gtk.Widget parent, Gdk.Rectangle evt, FixMenuDescriptor entrySet)
 		{
@@ -325,6 +363,7 @@ namespace MonoDevelop.CodeActions
 				return true;
 			try {
 				#if MAC
+				Gtk.Application.Invoke (delegate {
 				parent.GrabFocus ();
 				int x, y;
 				x = (int)evt.X;
@@ -332,7 +371,7 @@ namespace MonoDevelop.CodeActions
 				// Explicitly release the grab because the menu is shown on the mouse position, and the widget doesn't get the mouse release event
 				Gdk.Pointer.Ungrab (Gtk.Global.CurrentEventTime);
 				var menu = CreateNSMenu (entrySet);
-				menu.Delegate = new ClosingMenuDelegate (document.Editor);
+				menu.Delegate = new ClosingMenuDelegate (Editor);
 				var nsview = MonoDevelop.Components.Mac.GtkMacInterop.GetNSView (parent);
 				var toplevel = parent.Toplevel as Gtk.Window;
 				int trans_x, trans_y;
@@ -351,18 +390,20 @@ namespace MonoDevelop.CodeActions
 				null, 0, 0, 0);
 
 				AppKit.NSMenu.PopUpContextMenu (menu, tmp_event, nsview);
+				});
 				#else
 				var menu = CreateGtkMenu (entrySet);
 				menu.Events |= Gdk.EventMask.AllEventsMask;
 				menu.SelectFirst (true);
 
 				menu.Hidden += delegate {
-					document.Editor.SuppressTooltips = false;
+					// document.Editor.SuppressTooltips = false;
 				};
 				menu.ShowAll ();
 				menu.SelectFirst (true);
 				menu.MotionNotifyEvent += (o, args) => {
-					if (args.Event.Window == Editor.Parent.TextArea.GdkWindow) {
+					Gtk.Widget widget = Editor;
+					if (args.Event.Window == widget.GdkWindow) {
 						StartMenuCloseTimer ();
 					} else {
 						CancelMenuCloseTimer ();
@@ -376,7 +417,8 @@ namespace MonoDevelop.CodeActions
 			}
 			return true;
 		}
-		#if MAC
+
+#if MAC
 
 		AppKit.NSMenu CreateNSMenu (FixMenuDescriptor entrySet)
 		{
@@ -401,28 +443,28 @@ namespace MonoDevelop.CodeActions
 			}
 			return menu;
 		}
-		#endif
+#endif
 
 		static Menu CreateGtkMenu (FixMenuDescriptor entrySet)
 		{
 			var menu = new Menu ();
 			foreach (var item in entrySet.Items) {
 				if (item == FixMenuEntry.Separator) {
-					menu.Add (new SeparatorMenuItem ()); 
+					menu.Add (new SeparatorMenuItem ());
 					continue;
 				}
 				var subMenu = item as FixMenuDescriptor;
 				if (subMenu != null) {
 					var gtkSubMenu = new Gtk.MenuItem (item.Label);
 					gtkSubMenu.Submenu = CreateGtkMenu (subMenu);
-					menu.Add (gtkSubMenu); 
+					menu.Add (gtkSubMenu);
 					continue;
 				}
 				var menuItem = new Gtk.MenuItem (item.Label);
 				menuItem.Activated += delegate {
 					item.Action ();
 				};
-				menu.Add (menuItem); 
+				menu.Add (menuItem);
 			}
 			return menu;
 		}
@@ -431,275 +473,297 @@ namespace MonoDevelop.CodeActions
 		{
 			int mnemonic = 1;
 			bool gotImportantFix = false, addedSeparator = false;
-			var fixesAdded = new List<string> ();
-			foreach (var fix_ in Fixes.OrderByDescending (i => Tuple.Create (IsAnalysisOrErrorFix(i), (int)i.Severity, GetUsage (i.IdString)))) {
+			foreach (var fix_ in GetCurrentFixes ().CodeFixActions.OrderByDescending (i => Tuple.Create (IsAnalysisOrErrorFix (i.CodeAction), (int)0, GetUsage (i.CodeAction.EquivalenceKey)))) {
 				// filter out code actions that are already resolutions of a code issue
-				if (fixesAdded.Any (f => fix_.IdString.IndexOf (f, StringComparison.Ordinal) >= 0))
-					continue;
-				fixesAdded.Add (fix_.IdString);
-				if (IsAnalysisOrErrorFix (fix_))
+				if (IsAnalysisOrErrorFix (fix_.CodeAction))
 					gotImportantFix = true;
-				if (!addedSeparator && gotImportantFix && !IsAnalysisOrErrorFix(fix_)) {
+				if (!addedSeparator && gotImportantFix && !IsAnalysisOrErrorFix (fix_.CodeAction)) {
 					menu.Add (FixMenuEntry.Separator);
 					addedSeparator = true;
 				}
 
 				var fix = fix_;
-				var escapedLabel = fix.Title.Replace ("_", "__");
+				var escapedLabel = fix.CodeAction.Title.Replace ("_", "__");
 				var label = (mnemonic <= 10)
 					? "_" + (mnemonic++ % 10).ToString () + " " + escapedLabel
 					: "  " + escapedLabel;
 				var thisInstanceMenuItem = new FixMenuEntry (label, delegate {
-					new ContextActionRunner (fix, document, currentSmartTagBegin).Run (null, EventArgs.Empty);
-					ConfirmUsage (fix.IdString);
+					new ContextActionRunner (fix.CodeAction, Editor, DocumentContext).Run (null, EventArgs.Empty);
+					ConfirmUsage (fix.CodeAction.EquivalenceKey);
 				});
 				menu.Add (thisInstanceMenuItem);
 				items++;
 			}
 
 			bool first = true;
-			var settingsMenuFixes = Fixes
-				.OfType<AnalysisContextActionProvider.AnalysisCodeAction> ()
-				.Where (f => f.Result is InspectorResults)
-				.GroupBy (f => ((InspectorResults)f.Result).Inspector);
-			foreach (var analysisFixGroup_ in settingsMenuFixes) {
-				var analysisFixGroup = analysisFixGroup_;
-				var arbitraryFixInGroup = analysisFixGroup.First ();
-				var ir = (InspectorResults)arbitraryFixInGroup.Result;
-
+			foreach (var fix in GetCurrentFixes ().CodeRefactoringActions) {
 				if (first) {
-					menu.Add (FixMenuEntry.Separator);
+					if (items > 0)
+						menu.Add (FixMenuEntry.Separator);
 					first = false;
 				}
 
-				var subMenu = new FixMenuDescriptor ();
-				foreach (var analysisFix_ in analysisFixGroup) {
-					var analysisFix = analysisFix_;
-					if (analysisFix.SupportsBatchRunning) {
-						var batchRunMenuItem = new FixMenuEntry (
-							string.Format (GettextCatalog.GetString ("Apply in file: {0}"), analysisFix.Title), 
-							delegate {
-								ConfirmUsage (analysisFix.IdString);
-								new ContextActionRunner (analysisFix, document, this.currentSmartTagBegin).BatchRun (null, EventArgs.Empty);
-							}
-						);
-						subMenu.Add (batchRunMenuItem);
-						subMenu.Add (FixMenuEntry.Separator);
-					}
-				}
-
-				var inspector = ir.Inspector;
-				if (inspector.CanSuppressWithAttribute) {
-					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Suppress with attribute"),
-						delegate {
-							inspector.SuppressWithAttribute (document, arbitraryFixInGroup.DocumentRegion); 
-						});
-					subMenu.Add (menuItem);
-				}
+				var escapedLabel = fix.CodeAction.Title.Replace ("_", "__");
+				var label = (mnemonic <= 10)
+					? "_" + (mnemonic++ % 10).ToString () + " " + escapedLabel
+					: "  " + escapedLabel;
+				var thisInstanceMenuItem = new FixMenuEntry (label, delegate {
+					new ContextActionRunner (fix.CodeAction, Editor, DocumentContext).Run (null, EventArgs.Empty);
+					ConfirmUsage (fix.CodeAction.EquivalenceKey);
+				});
+				menu.Add (thisInstanceMenuItem);
+				items++;
+			}
 
-				if (inspector.CanDisableWithPragma) {
-					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Suppress with #pragma"),
-						delegate {
-							inspector.DisableWithPragma (document, arbitraryFixInGroup.DocumentRegion); 
-						});
-					subMenu.Add (menuItem);
-				}
+			first = false;
+			foreach (var fix_ in GetCurrentFixes ().DiagnosticsAtCaret) {
+				var fix = fix_;
+				var label = GettextCatalog.GetString ("_Options for \"{0}\"", fix.GetMessage ());
+				var subMenu = new FixMenuDescriptor (label);
 
-				if (inspector.CanDisableOnce) {
-					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Disable Once"),
-						delegate {
-							inspector.DisableOnce (document, arbitraryFixInGroup.DocumentRegion); 
-						});
-					subMenu.Add (menuItem);
+				CodeDiagnosticDescriptor descriptor = BuiltInCodeDiagnosticProvider.GetCodeDiagnosticDescriptor (fix.Id);
+				if (descriptor == null)
+					continue;
+				if (first) {
+					menu.Add (FixMenuEntry.Separator);
+					first = false;
 				}
-
-				if (inspector.CanDisableAndRestore) {
-					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("Disable _and Restore"),
+				//				if (inspector.CanSuppressWithAttribute) {
+				//					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Suppress with attribute"),
+				//						delegate {
+				//							
+				//							inspector.SuppressWithAttribute (Editor, DocumentContext, GetTextSpan (fix.Item2)); 
+				//						});
+				//					subMenu.Add (menuItem);
+				//				}
+
+				if (descriptor.CanDisableWithPragma) {
+					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Suppress with #pragma"),
 						delegate {
-							inspector.DisableAndRestore (document, arbitraryFixInGroup.DocumentRegion); 
+							descriptor.DisableWithPragma (Editor, DocumentContext, fix.Location.SourceSpan);
 						});
 					subMenu.Add (menuItem);
 				}
-				var label = GettextCatalog.GetString ("_Options for \"{0}\"", InspectorResults.GetTitle (ir.Inspector));
-				var subMenuItem = new FixMenuDescriptor (label);
 
 				var optionsMenuItem = new FixMenuEntry (GettextCatalog.GetString ("_Configure Rule"),
 					delegate {
-						arbitraryFixInGroup.ShowOptions (null, EventArgs.Empty);
+						IdeApp.Workbench.ShowGlobalPreferencesDialog (null, "C#", dialog => {
+							var panel = dialog.GetPanel<CodeIssuePanel> ("C#");
+							if (panel == null)
+								return;
+							panel.Widget.SelectCodeIssue (descriptor.IdString);
+						});
 					});
-				subMenuItem.Add (optionsMenuItem);
+				subMenu.Add (optionsMenuItem);
 
-				menu.Add (subMenuItem);
+				menu.Add (subMenu);
 				items++;
 			}
 		}
 
-
-		class ContextActionRunner
+		internal class ContextActionRunner
 		{
-			CodeAction act;
-			Document document;
-			TextLocation loc;
+			readonly CodeAction act;
+			TextEditor editor;
+			DocumentContext documentContext;
 
-			public ContextActionRunner (MonoDevelop.CodeActions.CodeAction act, MonoDevelop.Ide.Gui.Document document, ICSharpCode.NRefactory.TextLocation loc)
+			public ContextActionRunner (CodeAction act, TextEditor editor, DocumentContext documentContext)
 			{
+				this.editor = editor;
 				this.act = act;
-				this.document = document;
-				this.loc = loc;
+				this.documentContext = documentContext;
 			}
 
 			public void Run (object sender, EventArgs e)
 			{
-				var context = document.ParsedDocument.CreateRefactoringContext (document, CancellationToken.None);
-				RefactoringService.ApplyFix (act, context);
+				Run ();
 			}
 
-			public void BatchRun (object sender, EventArgs e)
+			internal async void Run ()
 			{
-				act.BatchRun (document, loc);
-			}
-		}
+				var token = default(CancellationToken);
+				var insertionAction = act as InsertionAction;
+				if (insertionAction != null) {
+					var insertion = await insertionAction.CreateInsertion (token).ConfigureAwait (false);
+
+					var document = IdeApp.Workbench.OpenDocument (insertion.Location.SourceTree.FilePath);
+					var parsedDocument = document.UpdateParseDocument ();
+					if (parsedDocument != null) {
+						var insertionPoints = InsertionPointService.GetInsertionPoints (
+							                     document.Editor,
+							                     parsedDocument,
+							                     insertion.Type,
+							                     insertion.Location
+						                     );
+
+						var options = new InsertionModeOptions (
+							             insertionAction.Title,
+							             insertionPoints,
+							             async point => {
+								if (!point.Success)
+									return;
 
-		class SmartTagMarker : TextSegmentMarker, IActionTextLineMarker
-		{
-			CodeActionEditorExtension codeActionEditorExtension;
-			internal List<CodeAction> fixes;
-			DocumentLocation loc;
+											 var node = Formatter.Format (insertion.Node, TypeSystemService.Workspace, document.GetOptionSet (), token);
 
-			public SmartTagMarker (int offset, CodeActionEditorExtension codeActionEditorExtension, List<CodeAction> fixes, DocumentLocation loc) : base (offset, 0)
-			{
-				this.codeActionEditorExtension = codeActionEditorExtension;
-				this.fixes = fixes;
-				this.loc = loc;
-			}
-
-			public SmartTagMarker (int offset) : base (offset, 0)
-			{
-			}
-			const double tagMarkerWidth = 8;
-			const double tagMarkerHeight = 2;
-			public override void Draw (TextEditor editor, Cairo.Context cr, Pango.Layout layout, bool selected, int startOffset, int endOffset, double y, double startXPos, double endXPos)
-			{
-				var line = editor.GetLine (loc.Line);
-				var x = editor.ColumnToX (line, loc.Column) - editor.HAdjustment.Value + editor.TextViewMargin.XOffset + editor.TextViewMargin.TextStartPosition;
+											 point.InsertionPoint.Insert (document.Editor, document, node.ToString ());
+											 // document = await Simplifier.ReduceAsync(document.AnalysisDocument, Simplifier.Annotation, cancellationToken: token).ConfigureAwait(false);
 
-				cr.Rectangle (Math.Floor (x) + 0.5, Math.Floor (y) + 0.5 + (line == editor.GetLineByOffset (startOffset) ? editor.LineHeight - tagMarkerHeight - 1 : 0), tagMarkerWidth * cr.LineWidth, tagMarkerHeight * cr.LineWidth);
+										 }
+									 );
 
-				if (HslColor.Brightness (editor.ColorStyle.PlainText.Background) < 0.5) {
-					cr.SetSourceRGBA (0.8, 0.8, 1, 0.9);
-				} else {
-					cr.SetSourceRGBA (0.2, 0.2, 1, 0.9);
+						document.Editor.StartInsertionMode (options);
+						return;
+					}
 				}
-				cr.Stroke ();
-			}
-
-			#region IActionTextLineMarker implementation
 
-			bool IActionTextLineMarker.MousePressed (TextEditor editor, MarginMouseEventArgs args)
-			{
-				return false;
+				var oldSolution = documentContext.AnalysisDocument.Project.Solution;
+				var updatedSolution = oldSolution;
+				foreach (var operation in act.GetOperationsAsync (token).Result) {
+					var applyChanges = operation as ApplyChangesOperation;
+					if (applyChanges == null) {
+						operation.Apply (documentContext.RoslynWorkspace, token);
+						continue;
+					}
+					if (updatedSolution == oldSolution) {
+						updatedSolution = applyChanges.ChangedSolution;
+					}
+					operation.Apply (documentContext.RoslynWorkspace, token);
+				}
+				TryStartRenameSession (documentContext.RoslynWorkspace, oldSolution, updatedSolution, token);
 			}
 
-			void IActionTextLineMarker.MouseHover (TextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result)
+			static IEnumerable<DocumentId> GetChangedDocuments (Solution newSolution, Solution oldSolution)
 			{
-				if (args.Button != 0)
-					return;
-				var line = editor.GetLine (loc.Line);
-				if (line == null)
-					return;
-				var x = editor.ColumnToX (line, loc.Column) - editor.HAdjustment.Value + editor.TextViewMargin.TextStartPosition;
-				var y = editor.LineToY (line.LineNumber + 1) - editor.VAdjustment.Value;
-				const double xAdditionalSpace = tagMarkerWidth;
-				if (args.X - x >= -xAdditionalSpace * editor.Options.Zoom && 
-					args.X - x < (tagMarkerWidth + xAdditionalSpace) * editor.Options.Zoom /*&& 
-				    args.Y - y < (editor.LineHeight / 2) * editor.Options.Zoom*/) {
-					result.Cursor = null;
-					Popup ();
-				} else {
-					codeActionEditorExtension.CancelSmartTagPopupTimeout ();
+				if (newSolution != null) {
+					var solutionChanges = newSolution.GetChanges (oldSolution);
+					foreach (var projectChanges in solutionChanges.GetProjectChanges ()) {
+						foreach (var documentId in projectChanges.GetChangedDocuments ()) {
+							yield return documentId;
+						}
+					}
 				}
 			}
 
-			public void Popup ()
+			async void TryStartRenameSession (Workspace workspace, Solution oldSolution, Solution newSolution, CancellationToken cancellationToken)
 			{
-				codeActionEditorExtension.smartTagPopupTimeoutId = GLib.Timeout.Add (menuTimeout, delegate {
-					codeActionEditorExtension.PopupQuickFixMenu (null, menu => {
-						codeActionEditorExtension.codeActionMenu = menu;
-					});
-					codeActionEditorExtension.smartTagPopupTimeoutId = 0;
-					return false;
-				});
+				var changedDocuments = GetChangedDocuments (newSolution, oldSolution);
+				foreach (var documentId in changedDocuments) {
+					var document = newSolution.GetDocument (documentId);
+					var root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+
+					SyntaxToken? renameTokenOpt = root.GetAnnotatedNodesAndTokens (RenameAnnotation.Kind)
+											 .Where (s => s.IsToken)
+											 .Select (s => s.AsToken ())
+					                         .Cast<SyntaxToken?> ()
+											 .FirstOrDefault ();
+
+					if (renameTokenOpt.HasValue) {
+						var latestDocument = workspace.CurrentSolution.GetDocument (documentId);
+						var latestModel = await latestDocument.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+						var latestRoot = await latestDocument.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+						Application.Invoke (delegate {
+							try {
+								var node = latestRoot.FindNode (renameTokenOpt.Value.Parent.Span, false, false);
+								if (node == null)
+									return;
+								var info = latestModel.GetSymbolInfo (node);
+								var sym = info.Symbol ?? latestModel.GetDeclaredSymbol (node);
+								if (sym != null) 
+									new MonoDevelop.Refactoring.Rename.RenameRefactoring ().Rename (sym);
+							} catch (Exception ex) {
+								LoggingService.LogError ("Error while renaming " + renameTokenOpt.Value.Parent, ex);
+							}
+						});
+						return;
+					}
+				}
 			}
-
-
-			#endregion
 		}
 
-		SmartTagMarker currentSmartTag;
-		DocumentLocation currentSmartTagBegin;
-		void CreateSmartTag (List<CodeAction> fixes, DocumentLocation loc)
+		ISmartTagMarker currentSmartTag;
+		int currentSmartTagBegin;
+
+		void CreateSmartTag (CodeActionContainer fixes, int offset)
 		{
-			Fixes = fixes;
-			if (!QuickTaskStrip.EnableFancyFeatures) {
+			if (!AnalysisOptions.EnableFancyFeatures || fixes.IsEmpty) {
 				RemoveWidget ();
 				return;
 			}
-			var editor = document.Editor;
-			if (editor == null || editor.Parent == null || !editor.Parent.IsRealized) {
+			var editor = Editor;
+			if (editor == null) {
 				RemoveWidget ();
 				return;
 			}
-			if (document.ParsedDocument == null || document.ParsedDocument.IsInvalid) {
+			if (DocumentContext.ParsedDocument == null || DocumentContext.ParsedDocument.IsInvalid) {
 				RemoveWidget ();
 				return;
 			}
 
-			var container = editor.Parent;
-			if (container == null) {
-				RemoveWidget ();
-				return;
-			}
+//			var container = editor.Parent;
+//			if (container == null) {
+//				RemoveWidget ();
+//				return;
+//			}
 			bool first = true;
-			DocumentLocation smartTagLocBegin = loc;
-			foreach (var fix in fixes) {
-				if (fix.DocumentRegion.IsEmpty)
+			var smartTagLocBegin = offset;
+			foreach (var fix in fixes.CodeFixActions.Concat (fixes.CodeRefactoringActions)) {
+				var textSpan = fix.ValidSegment;
+				if (textSpan.IsEmpty)
 					continue;
-				if (first || loc < fix.DocumentRegion.Begin) {
-					smartTagLocBegin = fix.DocumentRegion.Begin;
+				if (first || offset < textSpan.Start) {
+					smartTagLocBegin = textSpan.Start;
 				}
 				first = false;
 			}
-			if (smartTagLocBegin.Line != loc.Line)
-				smartTagLocBegin = new DocumentLocation (loc.Line, 1);
+//			if (smartTagLocBegin.Line != loc.Line)
+//				smartTagLocBegin = new DocumentLocation (loc.Line, 1);
 			// got no fix location -> try to search word start
-			if (first) {
-				int offset = document.Editor.LocationToOffset (smartTagLocBegin);
-				while (offset > 0) {
-					char ch = document.Editor.GetCharAt (offset - 1);
-					if (!char.IsLetterOrDigit (ch) && ch != '_')
-						break;
-					offset--;
-				}
-				smartTagLocBegin = document.Editor.OffsetToLocation (offset);
-			}
+//			if (first) {
+//				int offset = document.Editor.LocationToOffset (smartTagLocBegin);
+//				while (offset > 0) {
+//					char ch = document.Editor.GetCharAt (offset - 1);
+//					if (!char.IsLetterOrDigit (ch) && ch != '_')
+//						break;
+//					offset--;
+//				}
+//				smartTagLocBegin = document.Editor.OffsetToLocation (offset);
+//			}
 
 			if (currentSmartTag != null && currentSmartTagBegin == smartTagLocBegin) {
-				currentSmartTag.fixes = fixes;
 				return;
 			}
 			RemoveWidget ();
 			currentSmartTagBegin = smartTagLocBegin;
-			var line = document.Editor.GetLine (smartTagLocBegin.Line);
-			currentSmartTag = new SmartTagMarker ((line.NextLine ?? line).Offset, this, fixes, smartTagLocBegin);
-			document.Editor.Document.AddMarker (currentSmartTag);
+			var realLoc = Editor.OffsetToLocation (smartTagLocBegin);
+
+			currentSmartTag = TextMarkerFactory.CreateSmartTagMarker (Editor, smartTagLocBegin, realLoc);
+			currentSmartTag.Tag = fixes;
+			editor.AddMarker (currentSmartTag);
 		}
-		
-		public override void Initialize ()
+
+		protected override void Initialize ()
 		{
 			base.Initialize ();
-			document.DocumentParsed += HandleDocumentDocumentParsed;
-			document.Editor.SelectionChanged += HandleSelectionChanged;
-			document.Editor.Parent.BeginHover += HandleBeginHover;
+			DocumentContext.DocumentParsed += HandleDocumentDocumentParsed;
+			Editor.SelectionChanged += HandleSelectionChanged;
+			Editor.BeginMouseHover += HandleBeginHover;
+			Editor.CaretPositionChanged += HandleCaretPositionChanged;
+			Editor.TextChanged += Editor_TextChanged;
+			Editor.EndAtomicUndoOperation += Editor_EndAtomicUndoOperation;
+		}
+
+		void Editor_EndAtomicUndoOperation (object sender, EventArgs e)
+		{
+			RemoveWidget ();
+			HandleCaretPositionChanged (null, EventArgs.Empty);
+		}
+
+		void Editor_TextChanged (object sender, MonoDevelop.Core.Text.TextChangeEventArgs e)
+		{
+			if (Editor.IsInAtomicUndo)
+				return;
+			RemoveWidget ();
+			HandleCaretPositionChanged (null, EventArgs.Empty);
 		}
 
 		void HandleBeginHover (object sender, EventArgs e)
@@ -723,43 +787,54 @@ namespace MonoDevelop.CodeActions
 
 		void HandleSelectionChanged (object sender, EventArgs e)
 		{
-			CursorPositionChanged ();
+			HandleCaretPositionChanged (null, EventArgs.Empty);
 		}
-		
+
 		void HandleDocumentDocumentParsed (object sender, EventArgs e)
 		{
-			CursorPositionChanged ();
+			HandleCaretPositionChanged (null, EventArgs.Empty);
 		}
-		
+
 		[CommandUpdateHandler(RefactoryCommands.QuickFix)]
 		public void UpdateQuickFixCommand (CommandInfo ci)
 		{
-			if (QuickTaskStrip.EnableFancyFeatures) {
+			if (AnalysisOptions.EnableFancyFeatures) {
 				ci.Enabled = currentSmartTag != null;
 			} else {
 				ci.Enabled = true;
 			}
 		}
-		
+
+		void CurrentSmartTagPopup ()
+		{
+			CancelSmartTagPopupTimeout ();
+			smartTagPopupTimeoutId = GLib.Timeout.Add (menuTimeout, delegate {
+				PopupQuickFixMenu (null, menu => {
+					codeActionMenu = menu;
+				});
+				smartTagPopupTimeoutId = 0;
+				return false;
+			});
+		}
+
 		[CommandHandler(RefactoryCommands.QuickFix)]
 		void OnQuickFixCommand ()
 		{
-			if (!QuickTaskStrip.EnableFancyFeatures) {
-				Fixes = RefactoringService.GetValidActions (Document, Document.Editor.Caret.Location);
-				currentSmartTagBegin = Document.Editor.Caret.Location;
-				PopupQuickFixMenu (null, null); 
+			if (!AnalysisOptions.EnableFancyFeatures) {
+				//Fixes = RefactoringService.GetValidActions (Editor, DocumentContext, Editor.CaretLocation).Result;
+				currentSmartTagBegin = Editor.CaretOffset;
+				PopupQuickFixMenu (null, null);
 
 				return;
 			}
 			if (currentSmartTag == null)
 				return;
-			currentSmartTag.Popup ();
+			CurrentSmartTagPopup ();
 		}
 
-		static readonly List<CodeAction> emptyList = new List<CodeAction> ();
-		internal List<CodeAction> GetCurrentFixes ()
+		internal CodeActionContainer GetCurrentFixes ()
 		{
-			return currentSmartTag == null ? emptyList : currentSmartTag.fixes;
+			return smartTagTask == null ? CodeActionContainer.Empty : smartTagTask.Result;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs
index 66f132a1c5..c74d775caa 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs
@@ -32,6 +32,7 @@ using System.Text;
 using MonoDevelop.Refactoring;
 using System.Collections.Generic;
 using GLib;
+using MonoDevelop.CodeIssues;
 
 namespace MonoDevelop.CodeActions
 {
@@ -54,14 +55,14 @@ namespace MonoDevelop.CodeActions
 	{
 		readonly string mimeType;
 		
-		readonly TreeStore treeStore = new TreeStore (typeof(string), typeof(bool), typeof(CodeActionProvider), typeof(string));
-		readonly Dictionary<CodeActionProvider, bool> providerStates = new Dictionary<CodeActionProvider, bool> ();
+		readonly TreeStore treeStore = new TreeStore (typeof(string), typeof(bool), typeof(CodeRefactoringDescriptor));
+		readonly Dictionary<CodeRefactoringDescriptor, bool> providerStates = new Dictionary<CodeRefactoringDescriptor, bool> ();
 
 		void GetAllProviderStates ()
 		{
-			string disabledNodes = PropertyService.Get ("ContextActions." + mimeType, "");
-			foreach (var node in RefactoringService.ContextAddinNodes.Where (n => n.MimeType == mimeType)) {
-				providerStates [node] = disabledNodes.IndexOf (node.IdString, StringComparison.Ordinal) < 0;
+			var language = CodeRefactoringService.MimeTypeToLanguage (mimeType);
+			foreach (var node in BuiltInCodeDiagnosticProvider.GetBuiltInCodeRefactoringDescriptorsAsync (CodeRefactoringService.MimeTypeToLanguage(language), true).Result) {
+				providerStates [node] = node.IsEnabled;
 			}
 		}
 
@@ -94,7 +95,7 @@ namespace MonoDevelop.CodeActions
 				TreeIter iter;
 				if (!treeStore.GetIterFromString (out iter, args.Path)) 
 					return;
-				var provider = (CodeActionProvider)treeStore.GetValue (iter, 2);
+				var provider = (CodeRefactoringDescriptor)treeStore.GetValue (iter, 2);
 				providerStates [provider] = !providerStates [provider];
 				treeStore.SetValue (iter, 1, providerStates [provider]);
 			};
@@ -125,26 +126,20 @@ namespace MonoDevelop.CodeActions
 		{
 			treeStore.Clear ();
 			var sortedAndFiltered = providerStates.Keys
-				.Where (node => string.IsNullOrEmpty (filter) || node.Title.IndexOf (filter, StringComparison.OrdinalIgnoreCase) > 0)
-				.OrderBy (n => n.Title, StringComparer.Ordinal);
+				.Where (node => string.IsNullOrEmpty (filter) || node.Name.IndexOf (filter, StringComparison.OrdinalIgnoreCase) > 0)
+				.OrderBy (n => n.Name, StringComparer.Ordinal);
 			foreach (var node in sortedAndFiltered) {
-				var title = node.Title;
+				var title = node.Name;
 				MonoDevelop.CodeIssues.CodeIssuePanelWidget.MarkupSearchResult (filter, ref title);
-				treeStore.AppendValues (title, providerStates [node], node, node.Description);
+				treeStore.AppendValues (title, providerStates [node], node);
 			}
 		}
 
 		public void ApplyChanges ()
 		{
-			var sb = new StringBuilder ();
 			foreach (var kv in providerStates) {
-				if (kv.Value)
-					continue;
-				if (sb.Length > 0)
-					sb.Append (",");
-				sb.Append (kv.Key.IdString);
+				kv.Key.IsEnabled = kv.Value;
 			}
-			PropertyService.Set ("ContextActions." + mimeType, sb.ToString ());
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionProvider.cs
deleted file mode 100644
index 32c1c7d1ec..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionProvider.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// 
-// ContextActionProvider.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory;
-using System.Threading;
-using System.Collections.Generic;
-using System;
-
-namespace MonoDevelop.CodeActions
-{
-	/// <summary>
-	/// A code action provider is a factory that creates code actions for a document at a given location.
-	/// Note: There is only one code action provider generated therfore providers need to be state less.
-	/// </summary>
-	public abstract class CodeActionProvider
-	{
-		/// <summary>
-		/// Gets or sets the type of the MIME the provider is attached to.
-		/// </summary>
-		public string MimeType { get; set; }
-
-		/// <summary>
-		/// Gets or sets the category of the provider (used in the option panel).
-		/// </summary>
-		public string Category { get; set; }
-
-		/// <summary>
-		/// Gets or sets the title of the provider (used in the option panel).
-		/// </summary>
-		public string Title { get; set; }
-		
-		/// <summary>
-		/// Gets or sets the description of the provider (used in the option panel).
-		/// </summary>
-		public string Description { get; set; }
-
-		/// <summary>
-		/// Gets the identifier string used as property ID tag.
-		/// </summary>
-		public virtual string IdString {
-			get {
-				return GetType ().FullName;
-			}
-		}
-
-		/// <summary>
-		/// Gets all the code actions in document at given location.
-		/// </summary>
-		public abstract IEnumerable<CodeAction> GetActions (MonoDevelop.Ide.Gui.Document document, object refactoringContext, TextLocation loc, CancellationToken cancellationToken);
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringDescriptor.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringDescriptor.cs
new file mode 100644
index 0000000000..c845671203
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringDescriptor.cs
@@ -0,0 +1,101 @@
+//
+// CodeActionDescriptor.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using MonoDevelop.Core;
+using System.Linq;
+
+namespace MonoDevelop.CodeActions
+{
+	/// <summary>
+	/// This class wraps a roslyn <see cref="ICodeRefactoringProvider"/> and adds required meta data to it.
+	/// </summary>
+	class CodeRefactoringDescriptor
+	{
+		readonly Type codeActionType;
+		readonly ExportCodeRefactoringProviderAttribute attr;
+
+		CodeRefactoringProvider instance;
+
+		/// <summary>
+		/// Gets the identifier string.
+		/// </summary>
+		internal string IdString {
+			get {
+				return codeActionType.FullName;
+			}
+		}
+
+		/// <summary>
+		/// Gets the display name for this action.
+		/// </summary>
+		public string Name { get { return attr.Name; } }
+
+		/// <summary>
+		/// Gets the language for this action.
+		/// </summary>
+		public string Language { get { return attr.Languages.FirstOrDefault (); } }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether this code action is enabled by the user.
+		/// </summary>
+		/// <value><c>true</c> if this code action is enabled; otherwise, <c>false</c>.</value>
+		public bool IsEnabled {
+			get {
+				return PropertyService.Get ("CodeActions." + Language + "." + IdString, true);
+			}
+			set {
+				PropertyService.Set ("CodeActions." + Language + "." + IdString, value);
+			}
+		}
+
+		internal CodeRefactoringDescriptor (Type codeActionType, ExportCodeRefactoringProviderAttribute attr)
+		{
+			if (codeActionType == null)
+				throw new ArgumentNullException ("codeActionType");
+			if (attr == null)
+				throw new ArgumentNullException ("attr");
+			this.codeActionType = codeActionType;
+			this.attr = attr;
+		}
+
+		/// <summary>
+		/// Gets the roslyn code action provider.
+		/// </summary>
+		public CodeRefactoringProvider GetProvider ()
+		{
+			if (instance == null)
+				instance = (CodeRefactoringProvider)Activator.CreateInstance (codeActionType);
+			return instance;
+		}
+
+		public override string ToString ()
+		{
+			return string.Format ("[CodeActionDescriptor: IdString={0}, Name={1}, Language={2}]", IdString, Name, Language);
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringService.cs
new file mode 100644
index 0000000000..38b246031f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringService.cs
@@ -0,0 +1,157 @@
+//
+// CodeActionService.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeIssues;
+using Mono.Addins;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using MonoDevelop.Core.Text;
+using System.Linq;
+
+namespace MonoDevelop.CodeActions
+{
+	static class CodeRefactoringService
+	{
+		readonly static List<CodeDiagnosticProvider> providers = new List<CodeDiagnosticProvider> ();
+
+		static CodeRefactoringService ()
+		{	
+			providers.Add (new BuiltInCodeDiagnosticProvider ());
+
+			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/CodeDiagnosticProvider", delegate(object sender, ExtensionNodeEventArgs args) {
+				var node = (TypeExtensionNode)args.ExtensionNode;
+				switch (args.Change) {
+				case ExtensionChange.Add:
+					providers.Add ((CodeDiagnosticProvider)node.CreateInstance ());
+					break;
+				}
+			});
+		}
+
+		public async static Task<IEnumerable<CodeDiagnosticDescriptor>> GetCodeDiagnosticsAsync (DocumentContext documentContext, string language, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			var result = new List<CodeDiagnosticDescriptor> ();
+
+			foreach (var provider in providers) {
+				if (cancellationToken.IsCancellationRequested)
+					return Enumerable.Empty<CodeDiagnosticDescriptor> ();
+				result.AddRange (await provider.GetCodeDiagnosticDescriptorsAsync (documentContext, language, cancellationToken).ConfigureAwait (false));
+			}
+			return result;
+		}
+
+		public async static Task<IEnumerable<CodeDiagnosticFixDescriptor>> GetCodeFixesAsync (DocumentContext documentContext, string language, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			var result = new List<CodeDiagnosticFixDescriptor> ();
+			foreach (var provider in providers) {
+				result.AddRange (await provider.GetCodeFixDescriptorsAsync (documentContext, language, cancellationToken).ConfigureAwait (false));
+			}
+			return result;
+		}
+
+		public async static Task<IEnumerable<CodeRefactoringDescriptor>> GetCodeRefactoringsAsync (DocumentContext documentContext, string language, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			var result = new List<CodeRefactoringDescriptor> ();
+			foreach (var provider in providers) {
+				result.AddRange (await provider.GetCodeRefactoringDescriptorsAsync (documentContext, language, cancellationToken).ConfigureAwait (false));
+			}
+			return result;
+		}
+
+		public static async Task<IEnumerable<ValidCodeAction>> GetValidActionsAsync (TextEditor editor, DocumentContext doc, TextSpan span, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (doc == null)
+				throw new ArgumentNullException ("doc");
+			var parsedDocument = doc.ParsedDocument;
+			var actions = new List<ValidCodeAction> ();
+			if (parsedDocument == null)
+				return actions;
+			var model = parsedDocument.GetAst<SemanticModel> ();
+			if (model == null)
+				return actions;
+			var root = await model.SyntaxTree.GetRootAsync(cancellationToken).ConfigureAwait (false);
+			if (span.End > root.Span.End)
+				return actions;
+			TextSpan tokenSegment = span;
+			var token = root.FindToken (span.Start);
+			if (!token.IsMissing)
+				tokenSegment = token.Span;
+			try {
+				foreach (var descriptor in await GetCodeRefactoringsAsync (doc, MimeTypeToLanguage(editor.MimeType), cancellationToken).ConfigureAwait (false)) {
+					if (cancellationToken.IsCancellationRequested)
+						return Enumerable.Empty<ValidCodeAction> ();
+					try {
+						await descriptor.GetProvider ().ComputeRefactoringsAsync (
+							new CodeRefactoringContext (doc.AnalysisDocument, span, delegate (CodeAction ca) {
+								var nrca = ca as NRefactoryCodeAction;
+								var validSegment = tokenSegment;
+								if (nrca != null)
+									validSegment = nrca.TextSpan;
+								actions.Add (new ValidCodeAction (ca, validSegment));
+							}, cancellationToken)
+						).ConfigureAwait (false);
+					} catch (OperationCanceledException) {
+						if (cancellationToken.IsCancellationRequested)
+							return Enumerable.Empty<ValidCodeAction> ();
+					} catch (AggregateException) {
+						if (cancellationToken.IsCancellationRequested)
+							return Enumerable.Empty<ValidCodeAction> ();
+					} catch (Exception e) {
+						LoggingService.LogError ("Error while getting refactorings from " + descriptor.IdString, e); 
+						continue;
+					}
+				}
+			} catch (OperationCanceledException) {
+				if (cancellationToken.IsCancellationRequested)
+					return Enumerable.Empty<ValidCodeAction> ();
+			} catch (AggregateException) {
+				if (cancellationToken.IsCancellationRequested)
+					return Enumerable.Empty<ValidCodeAction> ();
+			}
+			return actions;
+		}
+
+		public static string MimeTypeToLanguage (string mimeType)
+		{
+			switch (mimeType) {
+			case "text/x-csharp":
+				return LanguageNames.CSharp;
+			}
+			return null;
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ICodeIssueProviderSource.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ValidCodeAction.cs
index 39ddd1a037..803cd429be 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ICodeIssueProviderSource.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ValidCodeAction.cs
@@ -1,21 +1,21 @@
-// 
-// ICodeIssueProviderSource.cs
-//  
+//
+// ValidCodeAction.cs
+//
 // Author:
 //       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,23 +23,25 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System.Collections.Generic;
-using System.Threading;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Projects;
-using Mono.TextEditor;
 
-namespace MonoDevelop.CodeIssues
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Text;
+
+namespace MonoDevelop.CodeActions
 {
 	/// <summary>
-	/// A code issue provider source provides a way for language backends to add a set of generated code issue providers.
+	/// Represents a code action that's valid at a specific segment.
 	/// </summary>
-	public interface ICodeIssueProviderSource
+	class ValidCodeAction
 	{
-		/// <summary>
-		/// Gets the providers.
-		/// </summary>
-		IEnumerable<CodeIssueProvider> GetProviders ();
-	}
-}
+		public CodeAction CodeAction { get; private set; }
 
+		public TextSpan ValidSegment { get; private set; }
+
+		public ValidCodeAction (CodeAction codeAction, TextSpan validSegment)
+		{
+			this.CodeAction = codeAction;
+			this.ValidSegment = validSegment;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ValidCodeDiagnosticAction.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ValidCodeDiagnosticAction.cs
new file mode 100644
index 0000000000..fb63ec19c8
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ValidCodeDiagnosticAction.cs
@@ -0,0 +1,52 @@
+//
+// ValidCodeDiagnosticAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis.CodeActions;
+using MonoDevelop.Core.Text;
+using MonoDevelop.CodeActions;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CodeIssues;
+using Microsoft.CodeAnalysis.Text;
+
+namespace MonoDevelop.CodeActions
+{
+	/// <summary>
+	/// Represents a code action that's valid at a specific segment that was created as a action for a specific code diagnostic.
+	/// </summary>
+	class ValidCodeDiagnosticAction : ValidCodeAction
+	{
+		public CodeDiagnosticFixDescriptor Diagnostic {
+			get;
+			private set;
+		}
+
+		public ValidCodeDiagnosticAction (CodeDiagnosticFixDescriptor diagnostic, CodeAction codeAction, TextSpan validSegment) : base (codeAction, validSegment)
+		{
+			this.Diagnostic = diagnostic;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalyzersFromAssembly.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalyzersFromAssembly.cs
new file mode 100644
index 0000000000..05331147ab
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalyzersFromAssembly.cs
@@ -0,0 +1,106 @@
+//
+// AnalyzersFromAssembly.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Threading;
+using MonoDevelop.CodeIssues;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.CodeFixes;
+using ICSharpCode.NRefactory6.CSharp.Refactoring;
+using MonoDevelop.Core;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeActions;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CodeIssues
+{
+	
+	class AnalyzersFromAssembly
+	{
+		public List<CodeDiagnosticDescriptor> Analyzers;
+		public List<CodeDiagnosticFixDescriptor> Fixes;
+		public List<CodeRefactoringDescriptor> Refactorings;
+
+		public readonly static AnalyzersFromAssembly Empty = new AnalyzersFromAssembly ();
+
+		public AnalyzersFromAssembly ()
+		{
+			Analyzers = new List<CodeDiagnosticDescriptor> ();
+			Fixes = new List<CodeDiagnosticFixDescriptor> ();
+			Refactorings = new List<CodeRefactoringDescriptor> ();
+		}
+
+		internal static AnalyzersFromAssembly CreateFrom (System.Reflection.Assembly asm, bool force = false)
+		{
+			var result = new AnalyzersFromAssembly ();
+			result.AddAssembly (asm, force);
+			return result;
+		}
+
+		internal void AddAssembly (System.Reflection.Assembly asm, bool force = false)
+		{
+			if (!force) {
+				var assemblyName = asm.GetName ().Name;
+				if (assemblyName == "MonoDevelop.AspNet" ||
+					assemblyName == "Microsoft.CodeAnalysis.CSharp" ||
+					assemblyName != "ICSharpCode.NRefactory6.CSharp.Refactoring" &&
+					!(asm.GetReferencedAssemblies ().Any (a => a.Name == diagnosticAnalyzerAssembly) && asm.GetReferencedAssemblies ().Any (a => a.Name == "MonoDevelop.Ide")))
+					return;
+			}
+			foreach (var type in asm.GetTypes ()) {
+				var analyzerAttr = (DiagnosticAnalyzerAttribute)type.GetCustomAttributes (typeof(DiagnosticAnalyzerAttribute), false).FirstOrDefault ();
+				if (analyzerAttr != null) {
+					var analyzer = (DiagnosticAnalyzer)Activator.CreateInstance (type);
+					foreach (var diag in analyzer.SupportedDiagnostics) {
+						try {
+							Analyzers.Add (new CodeDiagnosticDescriptor (diag, analyzerAttr.Languages, type));
+						} catch (Exception e) {
+							LoggingService.LogError ("error while adding diagnostic analyzer: " + diag.Id + " from assembly " + asm.FullName, e);
+						}
+					}
+				}
+
+				var codeFixAttr = (ExportCodeFixProviderAttribute)type.GetCustomAttributes (typeof(ExportCodeFixProviderAttribute), false).FirstOrDefault ();
+				if (codeFixAttr != null) {
+					Fixes.Add (new CodeDiagnosticFixDescriptor (type, codeFixAttr));
+				}
+
+				var exportAttr = type.GetCustomAttributes (typeof(ExportCodeRefactoringProviderAttribute), false).FirstOrDefault () as ExportCodeRefactoringProviderAttribute;
+				if (exportAttr != null) {
+					Refactorings.Add (new CodeRefactoringDescriptor (type, exportAttr)); 
+				}
+			}
+		}
+
+		readonly static string diagnosticAnalyzerAssembly = typeof (DiagnosticAnalyzerAttribute).Assembly.GetName ().Name;
+
+	}
+
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/BuiltInCodeDiagnosticProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/BuiltInCodeDiagnosticProvider.cs
new file mode 100644
index 0000000000..bd00becc7c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/BuiltInCodeDiagnosticProvider.cs
@@ -0,0 +1,111 @@
+//
+// BuiltInCodeDiagnosticProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Threading;
+using MonoDevelop.CodeIssues;
+using MonoDevelop.Core;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeActions;
+
+namespace MonoDevelop.CodeIssues
+{
+	
+	/// <summary>
+	/// Provides all IDE code diagnostics and fix provider.
+	/// (Scans the app domain for providers)
+	/// </summary>
+	class BuiltInCodeDiagnosticProvider : CodeDiagnosticProvider
+	{
+		readonly static Task<AnalyzersFromAssembly> builtInDiagnostics;
+
+		static BuiltInCodeDiagnosticProvider ()
+		{
+			builtInDiagnostics = Task.Run (() => {
+				var result = new AnalyzersFromAssembly ();
+				foreach (var asm in AppDomain.CurrentDomain.GetAssemblies()) {
+					try {
+						result.AddAssembly (asm);
+					} catch (Exception e) {
+						LoggingService.LogError ("error while loading diagnostics in " + asm.FullName, e);
+					}
+				}
+				return result;
+			});
+		}
+
+		internal static CodeDiagnosticDescriptor GetCodeDiagnosticDescriptor (string diagnosticId)
+		{
+			foreach (var builtInDescriptor in BuiltInCodeDiagnosticProvider.GetBuiltInCodeDiagnosticDecsriptorsAsync (null).Result) {
+				if (builtInDescriptor.GetProvider ().SupportedDiagnostics.Any (diagnostic => diagnosticId == diagnostic.Id))
+					return builtInDescriptor;
+			}
+			return null;
+		}
+
+		internal async static Task<IEnumerable<CodeDiagnosticDescriptor>> GetBuiltInCodeDiagnosticDecsriptorsAsync (string language, bool includeDisabledNodes = false, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			builtInDiagnostics.Wait (cancellationToken);
+			var diags = await builtInDiagnostics;
+			var builtInCodeDiagnostics = diags.Analyzers;
+			if (string.IsNullOrEmpty (language))
+				return includeDisabledNodes ? builtInCodeDiagnostics : builtInCodeDiagnostics.Where (act => act.IsEnabled);
+			return includeDisabledNodes ? builtInCodeDiagnostics.Where (ca => ca.Languages.Contains (language)) : builtInCodeDiagnostics.Where (ca => ca.Languages.Contains (language) && ca.IsEnabled);
+		}
+
+		public async static Task<IEnumerable<CodeDiagnosticFixDescriptor>> GetBuiltInCodeFixDescriptorsAsync (string language, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			var diags = await builtInDiagnostics.ConfigureAwait (false);
+			var builtInCodeFixes = diags.Fixes;
+			return string.IsNullOrEmpty (language) ? builtInCodeFixes : builtInCodeFixes.Where (cfp => cfp.Languages.Contains (language));
+		}
+
+		public async static Task<IEnumerable<CodeRefactoringDescriptor>> GetBuiltInCodeRefactoringDescriptorsAsync (string language, bool includeDisabledNodes = false, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			var diags = await builtInDiagnostics.ConfigureAwait (false);
+			var builtInCodeFixes = diags.Refactorings;
+			return string.IsNullOrEmpty (language) ? builtInCodeFixes : builtInCodeFixes.Where (cfp => cfp.Language.Contains (language));
+		}
+
+		public override Task<IEnumerable<CodeDiagnosticFixDescriptor>> GetCodeFixDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken)
+		{
+			return GetBuiltInCodeFixDescriptorsAsync (language, cancellationToken);
+		}
+
+		public override Task<IEnumerable<CodeDiagnosticDescriptor>> GetCodeDiagnosticDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken)
+		{
+			return GetBuiltInCodeDiagnosticDecsriptorsAsync (language, false, cancellationToken);
+		}
+
+		public override Task<IEnumerable<CodeRefactoringDescriptor>> GetCodeRefactoringDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			return GetBuiltInCodeRefactoringDescriptorsAsync (language, false, cancellationToken);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticDescriptor.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticDescriptor.cs
new file mode 100644
index 0000000000..547c068621
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticDescriptor.cs
@@ -0,0 +1,185 @@
+//
+// CodeIssueDescriptor.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis.Diagnostics;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CodeIssues
+{
+	class CodeDiagnosticDescriptor
+	{
+		readonly Type diagnosticAnalyzerType;
+		readonly Microsoft.CodeAnalysis.DiagnosticDescriptor descriptor;
+
+		DiagnosticAnalyzer instance;
+
+
+		/// <summary>
+		/// Gets the identifier string.
+		/// </summary>
+		internal string IdString {
+			get {
+				return diagnosticAnalyzerType.FullName;
+			}
+		}
+
+		public Type DiagnosticAnalyzerType {
+			get {
+				return diagnosticAnalyzerType;
+			}
+		}
+
+		/// <summary>
+		/// Gets the display name for this issue.
+		/// </summary>
+		public string Name { get; private set; }
+
+		/// <summary>
+		/// Gets the description of the issue provider (used in the option panel).
+		/// </summary>
+
+		/// <summary>
+		/// Gets the languages for this issue.
+		/// </summary>
+		public string[] Languages { get; private set; }
+
+		public DiagnosticSeverity? DiagnosticSeverity {
+			get {
+				DiagnosticSeverity? result = null;
+
+				foreach (var diagnostic in GetProvider ().SupportedDiagnostics) {
+					if (!result.HasValue)
+						result = GetSeverity(diagnostic);
+					if (result != GetSeverity(diagnostic))
+						return null;
+				}
+				return result;
+			}
+
+			set {
+				if (!value.HasValue)
+					return;
+				foreach (var diagnostic in GetProvider ().SupportedDiagnostics) {
+					SetSeverity (diagnostic, value.Value);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether this code action is enabled by the user.
+		/// </summary>
+		/// <value><c>true</c> if this code action is enabled; otherwise, <c>false</c>.</value>
+		public bool IsEnabled {
+			get {
+				foreach (var diagnostic in GetProvider ().SupportedDiagnostics) {
+					if (!GetIsEnabled (diagnostic))
+						return false;
+				}
+				return true;
+			}
+			set {
+				foreach (var diagnostic in GetProvider ().SupportedDiagnostics) {
+					SetIsEnabled (diagnostic, value);
+				}
+			}
+		}
+
+		internal DiagnosticSeverity GetSeverity (DiagnosticDescriptor diagnostic)
+		{
+			return PropertyService.Get ("CodeIssues." + Languages + "." + IdString + "." + diagnostic.Id + ".severity", diagnostic.DefaultSeverity);
+		}
+
+		internal void SetSeverity (DiagnosticDescriptor diagnostic, DiagnosticSeverity severity)
+		{
+			PropertyService.Set ("CodeIssues." + Languages + "." + IdString + "." + diagnostic.Id + ".severity", severity);
+		}
+
+		internal bool GetIsEnabled (DiagnosticDescriptor diagnostic)
+		{
+			return PropertyService.Get ("CodeIssues." + Languages + "." + IdString + "." + diagnostic.Id + ".enabled", true);
+		}
+
+		internal void SetIsEnabled (DiagnosticDescriptor diagnostic, bool value)
+		{
+			PropertyService.Set ("CodeIssues." + Languages + "." + IdString + "." + diagnostic.Id + ".enabled", value);
+		}
+
+		internal CodeDiagnosticDescriptor (Microsoft.CodeAnalysis.DiagnosticDescriptor descriptor, string[] languages, Type codeIssueType)
+		{
+			if (descriptor == null)
+				throw new ArgumentNullException ("descriptor");
+			if (languages == null)
+				throw new ArgumentNullException ("languages");
+			if (codeIssueType == null)
+				throw new ArgumentNullException ("codeIssueType");
+			Name = descriptor.Title.ToString () ?? "unnamed";
+			Languages = languages;
+			this.descriptor = descriptor;
+			this.diagnosticAnalyzerType = codeIssueType;
+		}
+
+		/// <summary>
+		/// Gets the roslyn code action provider.
+		/// </summary>
+		public DiagnosticAnalyzer GetProvider ()
+		{
+			if (instance == null)
+				instance = (DiagnosticAnalyzer)Activator.CreateInstance(diagnosticAnalyzerType);
+
+			return instance;
+		}
+
+		public override string ToString ()
+		{
+			return string.Format ("[CodeIssueDescriptor: IdString={0}, Name={1}, Language={2}]", IdString, Name, Languages);
+		}
+
+		public bool CanDisableWithPragma { get { return !string.IsNullOrEmpty (descriptor.Id); } }
+
+		const string analysisDisableTag = "Analysis ";
+
+		public void DisableWithPragma (TextEditor editor, DocumentContext context, TextSpan span)
+		{
+			using (editor.OpenUndoGroup ()) {
+				var start = editor.OffsetToLocation (span.Start);
+				var end = editor.OffsetToLocation (span.End);
+				editor.InsertText (
+					editor.LocationToOffset (end.Line + 1, 1),
+					editor.GetVirtualIndentationString (end.Line) + "#pragma warning restore " + descriptor.Id + editor.EolMarker
+				); 
+				editor.InsertText (
+					editor.LocationToOffset (start.Line, 1),
+					editor.GetVirtualIndentationString (start.Line) + "#pragma warning disable " + descriptor.Id + editor.EolMarker
+				); 
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticFixDescriptor.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticFixDescriptor.cs
new file mode 100644
index 0000000000..7f26e14572
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticFixDescriptor.cs
@@ -0,0 +1,89 @@
+//
+// CodeFixDescriptor.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Diagnostics;
+using System.Linq;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CodeIssues
+{
+	class CodeDiagnosticFixDescriptor
+	{
+		readonly Type codeFixProviderType;
+		readonly ExportCodeFixProviderAttribute attribute;
+		CodeFixProvider instance;
+
+		public string Name {
+			get {
+				return attribute.Name;
+			}
+		}
+
+		public string[] Languages {
+			get {
+				return attribute.Languages;
+			}
+		}
+
+		internal CodeDiagnosticFixDescriptor (Type codeFixProviderType, ExportCodeFixProviderAttribute attribute)
+		{
+			if (codeFixProviderType == null)
+				throw new ArgumentNullException ("codeFixProviderType");
+			if (attribute == null)
+				throw new ArgumentNullException ("attribute");
+			this.codeFixProviderType = codeFixProviderType;
+			this.attribute = attribute;
+		}
+		
+		public CodeFixProvider GetCodeFixProvider ()
+		{
+			if (instance == null) {
+				try {
+					instance = (CodeFixProvider)Activator.CreateInstance (codeFixProviderType);
+				} catch (InvalidCastException e) {
+					LoggingService.LogError (codeFixProviderType + " can't be cast to CodeFixProvider.");
+					throw;
+				}
+			}
+
+			return instance;
+		}
+
+		public CodeDiagnosticDescriptor GetCodeDiagnosticDescriptor (string language)
+		{
+			var fixableIds = GetCodeFixProvider ().FixableDiagnosticIds.ToList ();
+
+			foreach (var descriptor in BuiltInCodeDiagnosticProvider.GetBuiltInCodeDiagnosticDecsriptorsAsync (language).Result) {
+				if (descriptor.GetProvider ().SupportedDiagnostics.Any (diagnostic => fixableIds.Contains (diagnostic.Id)))
+					return descriptor;
+
+			}
+			return null;
+
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticProvider.cs
new file mode 100644
index 0000000000..3cb3dd1da5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticProvider.cs
@@ -0,0 +1,45 @@
+//
+// CodeDiagnosticProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Threading;
+using MonoDevelop.CodeIssues;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeActions;
+
+namespace MonoDevelop.CodeIssues
+{
+	/// <summary>
+	/// The code diagnostic provider gives a list of code diagnostic & fix providers from an arbitrary source.
+	/// </summary>
+	abstract class CodeDiagnosticProvider 
+	{
+		public abstract Task<IEnumerable<CodeDiagnosticDescriptor>> GetCodeDiagnosticDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default (CancellationToken));
+		public abstract Task<IEnumerable<CodeDiagnosticFixDescriptor>> GetCodeFixDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default (CancellationToken));
+		public abstract Task<IEnumerable<CodeRefactoringDescriptor>> GetCodeRefactoringDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default (CancellationToken));
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs
new file mode 100644
index 0000000000..233ae1fc6f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs
@@ -0,0 +1,108 @@
+// 
+// CodeAnalysisRunner.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//#define PROFILE
+using System;
+using System.Linq;
+using MonoDevelop.AnalysisCore;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Gui;
+using System.Threading;
+using MonoDevelop.CodeIssues;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.CodeFixes;
+using MonoDevelop.CodeActions;
+using MonoDevelop.Core;
+using MonoDevelop.AnalysisCore.Gui;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.CodeIssues
+{
+	static class CodeDiagnosticRunner
+	{
+		public static IEnumerable<Result> Check (AnalysisDocument analysisDocument, CancellationToken cancellationToken)
+		{
+			var input = analysisDocument.DocumentContext;
+			if (!AnalysisOptions.EnableFancyFeatures || input.Project == null || !input.IsCompileableInProject || input.AnalysisDocument == null)
+				return Enumerable.Empty<Result> ();
+			try {
+				var model = input.ParsedDocument.GetAst<SemanticModel> ();
+				if (model == null)
+					return Enumerable.Empty<Result> ();
+				var compilation = model.Compilation;
+				var language = CodeRefactoringService.MimeTypeToLanguage (analysisDocument.Editor.MimeType);
+
+				var providers = new List<DiagnosticAnalyzer> ();
+				var alreadyAdded = new HashSet<Type>();
+				var diagnostics = CodeRefactoringService.GetCodeDiagnosticsAsync (analysisDocument.DocumentContext, language, cancellationToken);
+				foreach (var diagnostic in diagnostics.Result) {
+					if (alreadyAdded.Contains (diagnostic.DiagnosticAnalyzerType))
+						continue;
+					alreadyAdded.Add (diagnostic.DiagnosticAnalyzerType);
+					var provider = diagnostic.GetProvider ();
+					providers.Add (provider);
+				}
+				if (providers.Count == 0 || cancellationToken.IsCancellationRequested)
+					return Enumerable.Empty<Result> ();
+				var localCompilation = CSharpCompilation.Create (
+					compilation.AssemblyName, 
+					new[] { model.SyntaxTree }, 
+					compilation.References, 
+					(CSharpCompilationOptions)compilation.Options
+				);
+
+				CompilationWithAnalyzers compilationWithAnalyzer;
+				try {
+					compilationWithAnalyzer = localCompilation.WithAnalyzers (System.Collections.Immutable.ImmutableArray<DiagnosticAnalyzer>.Empty.AddRange (providers), null, cancellationToken); 
+				} catch (Exception) {
+					return Enumerable.Empty<Result> ();
+				}
+
+				if (input.ParsedDocument == null || cancellationToken.IsCancellationRequested)
+					return Enumerable.Empty<Result> ();
+				var diagnosticList = new List<Diagnostic> ();
+				diagnosticList.AddRange (compilationWithAnalyzer.GetAnalyzerDiagnosticsAsync ().Result);
+				return diagnosticList
+					.Where (d => !d.Id.StartsWith("CS", StringComparison.Ordinal))
+					.Select (diagnostic => {
+						var res = new DiagnosticResult(diagnostic);
+						// var line = analysisDocument.Editor.GetLineByOffset (res.Region.Start);
+						// Console.WriteLine (diagnostic.Id + "/" + res.Region +"/" + analysisDocument.Editor.GetTextAt (line));
+						return res;
+					});
+			} catch (OperationCanceledException) {
+				return Enumerable.Empty<Result> ();
+			}  catch (AggregateException ae) {
+				ae.Flatten ().Handle (ix => ix is OperationCanceledException);
+				return Enumerable.Empty<Result> ();
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while running diagnostics.", e); 
+				return Enumerable.Empty<Result> ();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssue.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssue.cs
deleted file mode 100644
index 846f4dc678..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssue.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// 
-// CodeIssue.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using Mono.TextEditor;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace MonoDevelop.CodeIssues
-{
-	/// <summary>
-	/// A code issue marks an issue inside a text editor. An issue is a description shown in the tooltip and
-	/// (optionally) a set of code actions to solve the issue.
-	/// </summary>
-	public class CodeIssue
-	{
-		/// <summary>
-		/// Gets or sets the description shown in the tooltip.
-		/// </summary>
-		public string Description {
-			get;
-			private set;
-		}
-		
-		/// <summary>
-		/// Gets or sets the region of the issue.
-		/// </summary>
-		public DomRegion Region {
-			get;
-			private set;
-		}
-
-		
-
-		/// <summary>
-		/// Gets or sets a value indicating how this issue should be marked inside the text editor.
-		/// Note: There is only one code issue provider generated therfore providers need to be state less.
-		/// </summary>
-		public IssueMarker IssueMarker { get; private set; }
-
-
-		/// <summary>
-		/// Gets or sets the code actions to solve the issue.
-		/// </summary>
-		public IEnumerable<MonoDevelop.CodeActions.CodeAction> Actions {
-			get;
-			private set;
-		}
-		
-		public string InspectorIdString {
-			get;
-			private set;
-		}
-
-		/// <summary>
-		/// Gets or sets the code action providers for this issue.
-		/// </summary>
-		public IList<Type> ActionProvider {
-			get;
-			set;
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MonoDevelop.CodeIssues.CodeIssue"/> class.
-		/// </summary>
-		public CodeIssue (IssueMarker issueMarker, string description, string fileName, DocumentLocation start, DocumentLocation end, string inspectorIdString, IEnumerable<MonoDevelop.CodeActions.CodeAction>  actions = null) : this (issueMarker, description, new DomRegion (fileName, start, end), inspectorIdString, actions)
-		{
-		}
-		
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MonoDevelop.CodeIssues.CodeIssue"/> class.
-		/// </summary>
-		public CodeIssue (IssueMarker issueMarker, string description, DomRegion region, string inspectorIdString, IEnumerable<MonoDevelop.CodeActions.CodeAction>  actions = null)
-		{
-			IssueMarker = issueMarker;
-			Description = description;
-			Region = region;
-			Actions = actions;
-			InspectorIdString = inspectorIdString;
-		}
-
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueAddinNode.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueAddinNode.cs
deleted file mode 100644
index d8aee4e498..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueAddinNode.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// 
-// InspectorAddinNode.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.SourceEditor;
-using Mono.Addins;
-using MonoDevelop.Core;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace MonoDevelop.CodeIssues
-{
-	public class CodeIssueAddinNode : TypeExtensionNode
-	{
-		[NodeAttribute ("mimeType", Required=true, Description="The mime type of this action.")]
-		string mimeType = null;
-		public string MimeType {
-			get {
-				return mimeType;
-			}
-		}
-
-		[NodeAttribute ("severity", Required=true, Localizable=false,  Description="The severity of this action.")]
-		Severity severity;
-		public Severity Severity {
-			get {
-				return severity;
-			}
-		}
-
-		CodeIssueProvider inspector;
-		public CodeIssueProvider Inspector {
-			get {
-				if (inspector == null) {
-					inspector = (CodeIssueProvider)CreateInstance ();
-					inspector.DefaultSeverity = severity;
-					inspector.SetMimeType (MimeType);
-				}
-				return inspector;
-			}
-		}
-		
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs
index 241f9281f6..b9d01f4337 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs
@@ -28,14 +28,14 @@ using MonoDevelop.Ide.Gui.Dialogs;
 using Gtk;
 using MonoDevelop.Core;
 using System.Linq;
-using MonoDevelop.SourceEditor;
 using MonoDevelop.Refactoring;
 using System.Collections.Generic;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Refactoring;
 using GLib;
 using MonoDevelop.Components;
 using Gdk;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeActions;
+using Microsoft.CodeAnalysis;
 using MonoDevelop.SourceEditor.QuickTasks;
 
 namespace MonoDevelop.CodeIssues
@@ -73,19 +73,21 @@ namespace MonoDevelop.CodeIssues
 	partial class CodeIssuePanelWidget : Bin
 	{
 		readonly string mimeType;
-		readonly TreeStore treeStore = new TreeStore (typeof(string), typeof(BaseCodeIssueProvider), typeof (string));
-		readonly Dictionary<BaseCodeIssueProvider, Severity> severities = new Dictionary<BaseCodeIssueProvider, Severity> ();
-		readonly Dictionary<BaseCodeIssueProvider, bool> enableState = new Dictionary<BaseCodeIssueProvider, bool> ();
+		readonly TreeStore treeStore = new TreeStore (typeof(string), typeof(Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>), typeof (string));
+		readonly Dictionary<Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>, DiagnosticSeverity?> severities = new Dictionary<Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>, DiagnosticSeverity?> ();
+		readonly Dictionary<Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>, bool> enableState = new Dictionary<Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>, bool> ();
 
 		void GetAllSeverities ()
 		{
-			foreach (var node in RefactoringService.GetInspectors (mimeType)) {
-				severities [node] = node.GetSeverity ();
-				enableState [node] = node.GetIsEnabled ();
-				if (node.HasSubIssues) {
-					foreach (var subIssue in node.SubIssues) {
-						severities [subIssue] = subIssue.GetSeverity ();
-						enableState [subIssue] = subIssue.GetIsEnabled ();
+			foreach (var node in BuiltInCodeDiagnosticProvider.GetBuiltInCodeDiagnosticDecsriptorsAsync (CodeRefactoringService.MimeTypeToLanguage (mimeType), true).Result) {
+				var root = new Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor> (node, null);
+				severities [root] = node.DiagnosticSeverity;
+				enableState [root] = node.IsEnabled;
+				if (node.GetProvider ().SupportedDiagnostics.Length > 1) {
+					foreach (var subIssue in node.GetProvider ().SupportedDiagnostics) {
+						var sub = new Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor> (node, subIssue);
+						severities [sub] = node.GetSeverity (subIssue);
+						enableState [sub] = node.GetIsEnabled (subIssue);
 					}
 				}
 			}
@@ -102,8 +104,8 @@ namespace MonoDevelop.CodeIssues
 		bool SelectCodeIssue (string idString, TreeIter iter)
 		{
 			do {
-				var provider = treeStore.GetValue (iter, 1) as BaseCodeIssueProvider; 
-				if (provider != null && provider.IdString == idString) {
+				var provider = (Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>)treeStore.GetValue (iter, 1);
+				if (provider != null && idString  == provider.Item1.IdString) {
 					treeviewInspections.ExpandToPath (treeStore.GetPath (iter));
 					treeviewInspections.Selection.SelectIter (iter);
 					return true;
@@ -120,33 +122,30 @@ namespace MonoDevelop.CodeIssues
 			return false;
 		}
 
-		static string GetDescription (Severity severity)
+		static string GetDescription (DiagnosticSeverity severity)
 		{
 			switch (severity) {
-			case Severity.None:
+			case DiagnosticSeverity.Hidden:
 				return GettextCatalog.GetString ("Do not show");
-			case Severity.Error:
+			case DiagnosticSeverity.Error:
 				return GettextCatalog.GetString ("Error");
-			case Severity.Warning:
+			case DiagnosticSeverity.Warning:
 				return GettextCatalog.GetString ("Warning");
-			case Severity.Hint:
-				return GettextCatalog.GetString ("Hint");
-			case Severity.Suggestion:
-				return GettextCatalog.GetString ("Suggestion");
+			case DiagnosticSeverity.Info:
+				return GettextCatalog.GetString ("Info");
 			default:
 				throw new ArgumentOutOfRangeException ();
 			}
 		}
 
-		Xwt.Drawing.Image GetIcon (Severity severity)
+		Xwt.Drawing.Image GetIcon (DiagnosticSeverity severity)
 		{
 			switch (severity) {
-			case Severity.Error:
+			case DiagnosticSeverity.Error:
 				return QuickTaskOverviewMode.ErrorImage;
-			case Severity.Warning:
+			case DiagnosticSeverity.Warning:
 				return QuickTaskOverviewMode.WarningImage;
-			case Severity.Hint:
-			case Severity.Suggestion:
+			case DiagnosticSeverity.Info:
 				return QuickTaskOverviewMode.SuggestionImage;
 			default:
 				return QuickTaskOverviewMode.OkImage;
@@ -157,25 +156,24 @@ namespace MonoDevelop.CodeIssues
 		{
 			categories.Clear ();
 			treeStore.Clear ();
-
-			var grouped = severities.Keys.OfType<CodeIssueProvider> ()
-				.Where (node => string.IsNullOrEmpty (filter) || node.Title.IndexOf (filter, StringComparison.OrdinalIgnoreCase) > 0)
-				.GroupBy (node => node.Category)
+			var grouped = severities.Keys
+				.Where (node => node.Item2 == null && (string.IsNullOrEmpty (filter) || node.Item1.Name.IndexOf (filter, StringComparison.OrdinalIgnoreCase) > 0))
+				.GroupBy (node => node.Item1.GetProvider ().SupportedDiagnostics.First ().Category)
 				.OrderBy (g => g.Key, StringComparer.Ordinal);
 
 			foreach (var g in grouped) {
 				TreeIter categoryIter = treeStore.AppendValues ("<b>" + g.Key + "</b>", null, null);
 				categories [g.Key] = categoryIter;
 
-				foreach (var node in g.OrderBy (n => n.Title, StringComparer.Ordinal)) {
-					var title = node.Title;
+				foreach (var node in g.OrderBy (n => n.Item1.Name, StringComparer.Ordinal)) {
+					var title = node.Item1.Name;
 					MarkupSearchResult (filter, ref title);
-					var nodeIter = treeStore.AppendValues (categoryIter, title, node, node.Description);
-					if (node.HasSubIssues) {
-						foreach (var subIssue in node.SubIssues) {
-							title = subIssue.Title;
+					var nodeIter = treeStore.AppendValues (categoryIter, title, node, node.Item1.Name);
+					if (node.Item1.GetProvider ().SupportedDiagnostics.Length > 1) {
+						foreach (var subIssue in node.Item1.GetProvider ().SupportedDiagnostics) {
+							title = subIssue.Description.ToString ();
 							MarkupSearchResult (filter, ref title);
-							treeStore.AppendValues (nodeIter, title, subIssue, subIssue.Description);
+							treeStore.AppendValues (nodeIter, title, new Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor> (node.Item1, subIssue), subIssue.Description);
 						}
 					}
 				}
@@ -241,7 +239,7 @@ namespace MonoDevelop.CodeIssues
 			toggleRenderer.Toggled += delegate(object o, ToggledArgs args) {
 				TreeIter iter;
 				if (treeStore.GetIterFromString (out iter, args.Path)) {
-					var provider = (BaseCodeIssueProvider)treeStore.GetValue (iter, 1);
+					var provider = (Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>)treeStore.GetValue (iter, 1);
 					enableState[provider] = !enableState[provider];
 				}
 			};
@@ -251,7 +249,7 @@ namespace MonoDevelop.CodeIssues
 			titleCol.PackStart (toggleRenderer, false);
 			titleCol.Sizing = TreeViewColumnSizing.Autosize;
 			titleCol.SetCellDataFunc (toggleRenderer, delegate (TreeViewColumn treeColumn, CellRenderer cell, TreeModel model, TreeIter iter) {
-				var provider = (BaseCodeIssueProvider)model.GetValue (iter, 1);
+				var provider = (Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>)treeStore.GetValue (iter, 1);
 				if (provider == null) {
 					toggleRenderer.Visible = false;
 					return;
@@ -284,12 +282,11 @@ namespace MonoDevelop.CodeIssues
 			col.MinWidth = 100;
 			col.Expand = false;
 
-			var comboBoxStore = new ListStore (typeof(string), typeof(Severity));
+			var comboBoxStore = new ListStore (typeof(string), typeof(DiagnosticSeverity));
 //			comboBoxStore.AppendValues (GetDescription (Severity.None), Severity.None);
-			comboBoxStore.AppendValues (GetDescription (Severity.Error), Severity.Error);
-			comboBoxStore.AppendValues (GetDescription (Severity.Warning), Severity.Warning);
-			comboBoxStore.AppendValues (GetDescription (Severity.Hint), Severity.Hint);
-			comboBoxStore.AppendValues (GetDescription (Severity.Suggestion), Severity.Suggestion);
+			comboBoxStore.AppendValues (GetDescription (DiagnosticSeverity.Error), DiagnosticSeverity.Error);
+			comboBoxStore.AppendValues (GetDescription (DiagnosticSeverity.Warning), DiagnosticSeverity.Warning);
+			comboBoxStore.AppendValues (GetDescription (DiagnosticSeverity.Info), DiagnosticSeverity.Info);
 			comboRenderer.Model = comboBoxStore;
 			comboRenderer.Mode = CellRendererMode.Activatable;
 			comboRenderer.TextColumn = 0;
@@ -307,8 +304,8 @@ namespace MonoDevelop.CodeIssues
 					return;
 				do {
 					if ((string)comboBoxStore.GetValue (storeIter, 0) == args.NewText) {
-						var provider = (BaseCodeIssueProvider)treeStore.GetValue (iter, 1);
-						var severity = (Severity)comboBoxStore.GetValue (storeIter, 1);
+						var provider = (Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>)treeStore.GetValue (iter, 1);
+						var severity = (DiagnosticSeverity)comboBoxStore.GetValue (storeIter, 1);
 						severities[provider] = severity;
 						return;
 					}
@@ -316,15 +313,19 @@ namespace MonoDevelop.CodeIssues
 			};
 			
 			col.SetCellDataFunc (comboRenderer, delegate (TreeViewColumn treeColumn, CellRenderer cell, TreeModel model, TreeIter iter) {
-				var provider = (BaseCodeIssueProvider)model.GetValue (iter, 1);
+				var provider = (Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>)treeStore.GetValue (iter, 1);
 				if (provider == null) {
 					comboRenderer.Visible = false;
 					return;
 				}
 				var severity = severities[provider];
+				if (!severity.HasValue) {
+					comboRenderer.Visible = false;
+					return;
+				}
 				comboRenderer.Visible = true;
-				comboRenderer.Text = GetDescription (severity);
-				comboRenderer.Icon = GetIcon (severity);
+				comboRenderer.Text = GetDescription (severity.Value);
+				comboRenderer.Icon = GetIcon (severity.Value);
 			});
 			treeviewInspections.HeadersVisible = false;
 			treeviewInspections.Model = treeStore;
@@ -342,10 +343,25 @@ namespace MonoDevelop.CodeIssues
 
 		public void ApplyChanges ()
 		{
-			foreach (var kv in severities)
-				kv.Key.SetSeverity (kv.Value);
-			foreach (var kv in enableState)
-				kv.Key.SetIsEnabled (kv.Value);
+			foreach (var kv in severities) {
+				var userSeverity = kv.Value;
+				if (!userSeverity.HasValue)
+					continue;
+				if (kv.Key.Item2 == null) {
+					kv.Key.Item1.DiagnosticSeverity = userSeverity;
+					continue;
+				}
+				kv.Key.Item1.SetSeverity (kv.Key.Item2, userSeverity.Value);
+			}
+
+			foreach (var kv in enableState) {
+				var userIsEnabled = kv.Value;
+				if (kv.Key.Item2 == null) {
+					kv.Key.Item1.IsEnabled = userIsEnabled;
+					continue;
+				}
+				kv.Key.Item1.SetIsEnabled (kv.Key.Item2, userIsEnabled);
+			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueProvider.cs
deleted file mode 100644
index d9a2abe2ef..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueProvider.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-// 
-// IInspector.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Threading;
-using MonoDevelop.Core;
-using ICSharpCode.NRefactory.Refactoring;
-using Mono.TextEditor;
-using System;
-
-namespace MonoDevelop.CodeIssues
-{
-	public abstract class BaseCodeIssueProvider
-	{
-		public virtual CodeIssueProvider Parent {
-			get {
-				return null;
-			}
-		}
-		/// <summary>
-		/// Gets or sets the type of the MIME the provider is attached to.
-		/// </summary>
-		public abstract string MimeType {
-			get;
-		}
-
-		/// <summary>
-		/// Gets or sets the title of the issue provider (used in the option panel).
-		/// </summary>
-		public string Title { get; set; }
-
-		/// <summary>
-		/// Gets or sets the description of the issue provider (used in the option panel).
-		/// </summary>
-		public string Description { get; set; }
-
-		
-		/// <summary>
-		/// Gets the identifier string used as property ID tag.
-		/// </summary>
-		public virtual string IdString {
-			get {
-				return "refactoring.codeissues." + MimeType + "." + GetType ().FullName;
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the default severity. Note that GetSeverity () should be called to get the valid value inside the IDE.
-		/// </summary>
-		public Severity DefaultSeverity { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether this issue is enabled. Note that GetIsEnabled () should be called to get the valid value inside the IDE.
-		/// </summary>
-		/// <value><c>true</c> if this instance is enabled; otherwise, <c>false</c>.</value>
-		public bool IsEnabledByDefault { get; set; }
-
-		/// <summary>
-		/// Gets the current (user defined) severity.
-		/// </summary>
-		protected Severity severity;
-
-		public Severity GetSeverity ()
-		{
-			return severity;
-		}
-
-		/// <summary>
-		/// Sets the user defined severity.
-		/// </summary>
-		public void SetSeverity (Severity severity)
-		{
-			if (this.severity == severity)
-				return;
-			this.severity = severity;
-			PropertyService.Set (IdString, severity);
-		}
-
-
-		protected bool isEnabled;
-		
-		public bool GetIsEnabled ()
-		{
-			return isEnabled;
-		}
-		
-		/// <summary>
-		/// Sets the user defined severity.
-		/// </summary>
-		public void SetIsEnabled (bool isEnabled)
-		{
-			if (this.isEnabled == isEnabled)
-				return;
-			this.isEnabled = isEnabled;
-			PropertyService.Set (IdString + ".isEnabled", isEnabled);
-		}
-
-		protected void UpdateSeverity ()
-		{
-			severity = PropertyService.Get<Severity> (IdString, DefaultSeverity);
-			isEnabled = PropertyService.Get<bool> (IdString+ ".isEnabled", IsEnabledByDefault);
-		}
-
-		/// <summary>
-		/// Gets all the code issues inside a document.
-		/// </summary>
-		public abstract IEnumerable<CodeIssue> GetIssues (object refactoringContext, CancellationToken cancellationToken);
-
-		public virtual bool CanDisableOnce { get { return false; } }
-
-		public virtual bool CanDisableAndRestore { get { return false; } }
-
-		public virtual bool CanDisableWithPragma { get { return false; } }
-
-		public virtual bool CanSuppressWithAttribute { get { return false; } }
-
-		public virtual void DisableOnce (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			throw new NotSupportedException ();
-		}
-
-		public virtual void DisableAndRestore (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			throw new NotSupportedException ();
-		}
-
-		public virtual void DisableWithPragma (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			throw new NotSupportedException ();
-		}
-
-		public virtual void SuppressWithAttribute (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			throw new NotSupportedException ();
-		}
-	}
-
-
-	/// <summary>
-	/// A code issue provider is a factory that creates code issues of a given document.
-	/// </summary>
-	public abstract class CodeIssueProvider : BaseCodeIssueProvider
-	{
-		string mimeType;
-		public override string MimeType {
-			get {
-				return mimeType;
-			}
-		}
-
-		public void SetMimeType (string mimeType)
-		{
-			this.mimeType = mimeType;
-			UpdateSeverity ();
-		}
-
-		/// <summary>
-		/// Gets or sets the category of the issue provider (used in the option panel).
-		/// </summary>
-		public string Category { get; set; }
-
-		/// <summary>
-		/// If true this issue has sub issues.
-		/// </summary>
-		public abstract bool HasSubIssues { get; }
-
-		/// <summary>
-		/// Gets the sub issues of this issue. If HasSubIssus == false an InvalidOperationException is thrown.
-		/// </summary>
-		public virtual IEnumerable<BaseCodeIssueProvider> SubIssues { get { throw new InvalidOperationException (); } }
-
-		/// <summary>
-		/// Gets the effective set of providers. The effective set of providers
-		/// is either the sub issues (if it has sub issues) or simply itself (otherwise).
-		/// </summary>
-		/// <returns>The effective provider set.</returns>
-		public IEnumerable<BaseCodeIssueProvider> GetEffectiveProviderSet()
-		{
-			if (HasSubIssues)
-				return SubIssues;
-			return new[] { this };
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DiagnosticResult.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DiagnosticResult.cs
new file mode 100644
index 0000000000..f14a822101
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DiagnosticResult.cs
@@ -0,0 +1,77 @@
+// 
+// CodeAnalysisRunner.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//#define PROFILE
+using System;
+using MonoDevelop.AnalysisCore;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+
+namespace MonoDevelop.CodeIssues
+{
+	class DiagnosticResult : Result
+	{
+		readonly Diagnostic diagnostic;
+
+		public Diagnostic Diagnostic {
+			get {
+				return diagnostic;
+			}
+		}
+
+		public DiagnosticResult (Diagnostic diagnostic) : base (GetSpan (diagnostic), diagnostic.GetMessage ())
+		{
+			if (diagnostic == null)
+				throw new ArgumentNullException ("diagnostic");
+			this.diagnostic = diagnostic;
+
+			SetSeverity (diagnostic.Severity, GetIssueMarker ()); 
+		}
+
+		static TextSpan GetSpan (Diagnostic diagnostic)
+		{
+			int start = diagnostic.Location.SourceSpan.Start;
+			int end = diagnostic.Location.SourceSpan.End;
+
+			foreach (var loc in diagnostic.AdditionalLocations) {
+				start = Math.Min (start, loc.SourceSpan.Start);
+				end = Math.Max (start, loc.SourceSpan.End);
+			}
+
+			return TextSpan.FromBounds (start, end);
+		}
+
+		IssueMarker GetIssueMarker ()
+		{
+			if (diagnostic.Descriptor.Category == DiagnosticAnalyzerCategories.RedundanciesInCode || diagnostic.Descriptor.Category == DiagnosticAnalyzerCategories.RedundanciesInDeclarations)
+				return IssueMarker.GrayOut;
+			if (diagnostic.Severity == DiagnosticSeverity.Info)
+				return IssueMarker.DottedLine;
+			return IssueMarker.WavedLine;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AbstractGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AbstractGroupingProvider.cs
index 3f7cd390c7..3f7cd390c7 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AbstractGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AbstractGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ActionSummary.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ActionSummary.cs
index 42eda56ce6..7a560e69fd 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ActionSummary.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ActionSummary.cs
@@ -23,11 +23,10 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CodeIssues
 {
-
 	public class ActionSummary
 	{
 		/// <summary>
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalysisState.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AnalysisState.cs
index 221e11d819..221e11d819 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalysisState.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AnalysisState.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalysisStateChangeEventArgs.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AnalysisStateChangeEventArgs.cs
index 7531189f08..7531189f08 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalysisStateChangeEventArgs.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AnalysisStateChangeEventArgs.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/BatchFixer.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs
index a0d4cf4cde..c4c6491f05 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/BatchFixer.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs
@@ -36,9 +36,9 @@ using System.Threading;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor.Utils;
 using System.Text;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.CodeIssues
 {
@@ -77,10 +77,8 @@ namespace MonoDevelop.CodeIssues
 				var fileSummaries = issueSummaries.Where (summary => summary.File == file);
 				var inspectorIds = new HashSet<string> (fileSummaries.Select (summary => summary.InspectorIdString));
 				
-				bool hadBom;
-				Encoding encoding;
 				bool isOpen;
-				var data = TextFileProvider.Instance.GetTextEditorData (file.FilePath, out hadBom, out encoding, out isOpen);
+				var data = TextFileProvider.Instance.GetTextEditorData (file.FilePath, out isOpen);
 				IRefactoringContext refactoringContext;
 				var realActions = GetIssues (data, file, inspectorIds, out refactoringContext).SelectMany (issue => issue.Actions).ToList ();
 				if (realActions.Count == 0 || refactoringContext == null)
@@ -94,44 +92,44 @@ namespace MonoDevelop.CodeIssues
 				
 				if (!isOpen) {
 					// If the file is open we leave it to the user to explicitly save the file
-					TextFileUtility.WriteText (file.Name, data.Text, encoding, hadBom);
+					data.Save ();
 				}
 			});
 			return appliedActions;
 		}
 
-		static IList<CodeIssue> GetIssues (TextEditorData data, ProjectFile file, ISet<string> inspectorIds, out IRefactoringContext refactoringContext)
+		static IList<CodeIssue> GetIssues (ITextDocument data, ProjectFile file, ISet<string> inspectorIds, out IRefactoringContext refactoringContext)
 		{
 			var issues = new List<CodeIssue> ();
-			
-			var document = TypeSystemService.ParseFile (file.Project, data);
-			if (document == null) {
+//			
+//			var document = TypeSystemService.ParseFile (file.Project, data);
+//			if (document == null) {
 				refactoringContext = null;
-				return issues;
-			}
-
-			var content = TypeSystemService.GetProjectContext (file.Project);
-			var compilation  = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation ();
-			var resolver = new CSharpAstResolver (compilation, document.GetAst<SyntaxTree> (), document.ParsedFile as ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpUnresolvedFile);
-			
-			refactoringContext = document.CreateRefactoringContextWithEditor (data, resolver, CancellationToken.None);
-			var context = refactoringContext;
-			foreach (var provider in GetInspectors (data, inspectorIds)) {
-				var severity = provider.GetSeverity ();
-				if (severity == Severity.None || !provider.GetIsEnabled ())
-					continue;
-				try {
-					lock (issues) {
-						issues.AddRange (provider.GetIssues (context, CancellationToken.None));
-					}
-				} catch (Exception ex) {
-					LoggingService.LogError ("Error while running code issue on: " + data.FileName, ex);
-				}
-			}
+//				return issues;
+//			}
+//
+//			var content = TypeSystemService.GetProjectContext (file.Project);
+//			var compilation  = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation ();
+//			var resolver = new CSharpAstResolver (compilation, document.GetAst<SyntaxTree> (), document.ParsedFile as ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpUnresolvedFile);
+//			
+//			refactoringContext = document.CreateRefactoringContextWithEditor (data, resolver, CancellationToken.None);
+//			var context = refactoringContext;
+//			foreach (var provider in GetInspectors (data, inspectorIds)) {
+//				var severity = provider.GetSeverity ();
+//				if (severity == Severity.None || !provider.GetIsEnabled ())
+//					continue;
+//				try {
+//					lock (issues) {
+//						issues.AddRange (provider.GetIssues (context, CancellationToken.None));
+//					}
+//				} catch (Exception ex) {
+//					LoggingService.LogError ("Error while running code issue on: " + data.FileName, ex);
+//				}
+//			}
 			return issues;
 		}
 
-		static IList<CodeIssueProvider> GetInspectors (TextEditorData editor, ICollection<string> inspectorIds)
+		static IList<CodeIssueProvider> GetInspectors (IReadonlyTextDocument editor, ICollection<string> inspectorIds)
 		{
 			var inspectors = RefactoringService.GetInspectors (editor.MimeType).ToList ();
 			return inspectors
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CategoryGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CategoryGroupingProvider.cs
index bb7094f20d..bb7094f20d 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CategoryGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CategoryGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisBatchRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs
index 8463822b85..a2e9b91a5e 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisBatchRunner.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs
@@ -39,125 +39,125 @@ using ICSharpCode.NRefactory.Refactoring;
 using MonoDevelop.Core;
 using System.Collections.Concurrent;
 using ICSharpCode.NRefactory.TypeSystem;
-using Mono.TextEditor;
 using MonoDevelop.Core.Instrumentation;
 using MonoDevelop.Refactoring;
 using System.Collections.Generic;
-using MonoDevelop.Core;

-

-namespace MonoDevelop.CodeIssues

-{

-	public class CodeAnalysisBatchRunner

-	{

-		private readonly object _lock = new object ();

-

-		private int workerCount;

-

-		private readonly AnalysisJobQueue jobQueue = new AnalysisJobQueue ();

-

-		public IJobContext QueueJob (IAnalysisJob job)

-		{

-			jobQueue.Add (job);

-			EnsureRunning ();

-			return new JobContext (job, jobQueue, this);

-		}

-

-		private void EnsureRunning ()

-		{

-			for (; Interlocked.Add (ref workerCount, 1) < Environment.ProcessorCount;) {

-				new Thread (() => {

-					try {

-						ProcessQueue ();

-					}

-					finally {

-						Interlocked.Add (ref workerCount, -1);

-					}

-				}).Start ();

-			}

-		}

-

-		private void ProcessQueue ()

-		{

-			while (true) {

-				try {

-					using (var slice = GetSlice ()) {

-						if (slice == null)

-							// TODO: Do something smarter if the queue is empty

-							return;

-						AnalyzeFile (slice, slice.GetJobs ().SelectMany (job => job.GetIssueProviders (slice.File)));

-					}

-				} catch (Exception e) {

-					LoggingService.LogInternalError (e);

-				}

-			}

-		}

-

-		private JobSlice GetSlice ()

-		{

-			lock (_lock) {

-				return jobQueue.Dequeue (1).FirstOrDefault ();

-			}

-		}

-

-		void AnalyzeFile (JobSlice item, IEnumerable<BaseCodeIssueProvider> codeIssueProviders)
-		{
-			var file = item.File;
+using MonoDevelop.Core;
 
-			if (file.BuildAction != BuildAction.Compile)
-				return;
+namespace MonoDevelop.CodeIssues
+{
+	public class CodeAnalysisBatchRunner
+	{
+		private readonly object _lock = new object ();
 
-			if (!(file.Project is DotNetProject))
-				return;
+		private int workerCount;
 
-			TextEditorData editor;
-			try {
-				editor = TextFileProvider.Instance.GetReadOnlyTextEditorData (file.FilePath);
-			} catch (FileNotFoundException) {
-				// Swallow exception and ignore this file
-				return;
-			}
-			var document = TypeSystemService.ParseFile (file.Project, editor);
-			if (document == null)
-				return;
+		private readonly AnalysisJobQueue jobQueue = new AnalysisJobQueue ();
 
-			var content = TypeSystemService.GetProjectContext (file.Project);
-			var compilation = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation ();
+		public IJobContext QueueJob (IAnalysisJob job)
+		{
+			jobQueue.Add (job);
+			EnsureRunning ();
+			return new JobContext (job, jobQueue, this);
+		}
 
-			CSharpAstResolver resolver;
-			using (var timer = ExtensionMethods.ResolveCounter.BeginTiming ()) {
-				resolver = new CSharpAstResolver (compilation, document.GetAst<SyntaxTree> (), document.ParsedFile as ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpUnresolvedFile);
-				try {
-					resolver.ApplyNavigator (new ExtensionMethods.ConstantModeResolveVisitorNavigator (ResolveVisitorNavigationMode.Resolve, null));
-				} catch (Exception e) {
-					LoggingService.LogError ("Error while applying navigator", e);
-				}
+		private void EnsureRunning ()
+		{
+			for (; Interlocked.Add (ref workerCount, 1) < Environment.ProcessorCount;) {
+				new Thread (() => {
+					try {
+						ProcessQueue ();
+					}
+					finally {
+						Interlocked.Add (ref workerCount, -1);
+					}
+				}).Start ();
 			}
-			var context = document.CreateRefactoringContextWithEditor (editor, resolver, CancellationToken.None);
+		}
 
-			foreach (var provider in codeIssueProviders) {
-				if (item.CancellationToken.IsCancellationRequested)
-					break;
-				IList<IAnalysisJob> jobs;
-				lock (_lock)
-					jobs = item.GetJobs ().ToList ();
-				var jobsForProvider = jobs.Where (j => j.GetIssueProviders (file).Contains (provider)).ToList();
+		private void ProcessQueue ()
+		{
+			while (true) {
 				try {
-					var issues = provider.GetIssues (context, CancellationToken.None).ToList ();
-					foreach (var job in jobsForProvider) {
-						// Call AddResult even if issues.Count == 0, to enable a job implementation to keep
-						// track of progress information.
-						job.AddResult (file, provider, issues);
+					using (var slice = GetSlice ()) {
+						if (slice == null)
+							// TODO: Do something smarter if the queue is empty
+							return;
+						AnalyzeFile (slice, slice.GetJobs ().SelectMany (job => job.GetIssueProviders (slice.File)));
 					}
-				} catch (OperationCanceledException) {
-					// The operation was cancelled, no-op as the user-visible parts are
-					// handled elsewhere
 				} catch (Exception e) {
-					foreach (var job in jobsForProvider) {
-						job.AddError (file, provider);
-					}
+					LoggingService.LogError ("Unhandled exception", e);
+					MessageService.ShowException (e);
 				}
 			}
 		}
+
+		private JobSlice GetSlice ()
+		{
+			lock (_lock) {
+				return jobQueue.Dequeue (1).FirstOrDefault ();
+			}
+		}
+
+		void AnalyzeFile (JobSlice item, IEnumerable<BaseCodeIssueProvider> codeIssueProviders)
+		{
+//			var file = item.File;
+//
+//			if (file.BuildAction != BuildAction.Compile)
+//				return;
+//
+//			if (!(file.Project is DotNetProject))
+//				return;
+//
+//			TextEditorData editor;
+//			try {
+//				editor = TextFileProvider.Instance.GetReadOnlyTextEditorData (file.FilePath);
+//			} catch (FileNotFoundException) {
+//				// Swallow exception and ignore this file
+//				return;
+//			}
+//			var document = TypeSystemService.ParseFile (file.Project, editor);
+//			if (document == null)
+//				return;
+//
+//			var content = TypeSystemService.GetProjectContext (file.Project);
+//			var compilation = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation ();
+//
+//			CSharpAstResolver resolver;
+//			using (var timer = ExtensionMethods.ResolveCounter.BeginTiming ()) {
+//				resolver = new CSharpAstResolver (compilation, document.GetAst<SyntaxTree> (), document.ParsedFile as ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpUnresolvedFile);
+//				try {
+//					resolver.ApplyNavigator (new ExtensionMethods.ConstantModeResolveVisitorNavigator (ResolveVisitorNavigationMode.Resolve, null));
+//				} catch (Exception e) {
+//					LoggingService.LogError ("Error while applying navigator", e);
+//				}
+//			}
+//			var context = document.CreateRefactoringContextWithEditor (editor, resolver, CancellationToken.None);
+//
+//			foreach (var provider in codeIssueProviders) {
+//				if (item.CancellationToken.IsCancellationRequested)
+//					break;
+//				IList<IAnalysisJob> jobs;
+//				lock (_lock)
+//					jobs = item.GetJobs ().ToList ();
+//				var jobsForProvider = jobs.Where (j => j.GetIssueProviders (file).Contains (provider)).ToList();
+//				try {
+//					var issues = provider.GetIssues (context, CancellationToken.None).ToList ();
+//					foreach (var job in jobsForProvider) {
+//						// Call AddResult even if issues.Count == 0, to enable a job implementation to keep
+//						// track of progress information.
+//						job.AddResult (file, provider, issues);
+//					}
+//				} catch (OperationCanceledException) {
+//					// The operation was cancelled, no-op as the user-visible parts are
+//					// handled elsewhere
+//				} catch (Exception e) {
+//					foreach (var job in jobsForProvider) {
+//						job.AddError (file, provider);
+//					}
+//				}
+//			}
+		}
 	}
 }
 
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeIssuePad.cs
index c875894512..c875894512 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeIssuePad.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ExactIssueMatcher.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ExactIssueMatcher.cs
index 3f1db8df72..3f1db8df72 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ExactIssueMatcher.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ExactIssueMatcher.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/FileGroupingProvider.cs
index a92561d2d6..aa1d64d7cf 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/FileGroupingProvider.cs
@@ -1,46 +1,46 @@
-//

-// FileGroupingProvider.cs

-//

-// Author:

-//       Marius Ungureanu <marius.ungureanu@xamarin.com>

-//

-// Copyright (c) 2013 Marius Ungureanu

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-using MonoDevelop.Projects;

-using MonoDevelop.Core;

-

-namespace MonoDevelop.CodeIssues

-{

-	[GroupingDescription("File")]

-	public class FileGroupingProvider : AbstractGroupingProvider<ProjectFile>

-	{

-		#region implemented abstract members of AbstractGroupingProvider

-		protected override ProjectFile GetGroupingKey (IssueSummary issue)

-		{

-			return issue.File;

-		}

-		protected override string GetGroupName (IssueSummary issue)

-		{

-			return issue.File.FilePath.ToRelative (issue.Project.BaseDirectory);

-		}

-		#endregion

-	}

-}

-

+//
+// FileGroupingProvider.cs
+//
+// Author:
+//       Marius Ungureanu <marius.ungureanu@xamarin.com>
+//
+// Copyright (c) 2013 Marius Ungureanu
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Projects;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CodeIssues
+{
+	[GroupingDescription("File")]
+	public class FileGroupingProvider : AbstractGroupingProvider<ProjectFile>
+	{
+		#region implemented abstract members of AbstractGroupingProvider
+		protected override ProjectFile GetGroupingKey (IssueSummary issue)
+		{
+			return issue.File;
+		}
+		protected override string GetGroupName (IssueSummary issue)
+		{
+			return issue.File.FilePath.ToRelative (issue.Project.BaseDirectory);
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingDescriptionAttribute.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingDescriptionAttribute.cs
index 720084149e..720084149e 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingDescriptionAttribute.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingDescriptionAttribute.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingProviderChainControl.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingProviderChainControl.cs
index 3449d7b24b..3449d7b24b 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingProviderChainControl.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingProviderChainControl.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingProviderEventArgs.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingProviderEventArgs.cs
index f9eee0fc87..f9eee0fc87 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingProviderEventArgs.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingProviderEventArgs.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IActionMatcher.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IActionMatcher.cs
index 8e732f596a..8e732f596a 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IActionMatcher.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IActionMatcher.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IGroupingProvider.cs
index 19b0001bf4..19b0001bf4 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IIssueSummarySink.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IIssueSummarySink.cs
index af1cb51c0c..af1cb51c0c 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IIssueSummarySink.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IIssueSummarySink.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IIssueTreeNode.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IIssueTreeNode.cs
index 68cf43ef50..68cf43ef50 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IIssueTreeNode.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IIssueTreeNode.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueGroup.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueGroup.cs
index 10e261b7fc..10e261b7fc 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueGroup.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueGroup.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueGroupEventArgs.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueGroupEventArgs.cs
index 42787d4560..42787d4560 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueGroupEventArgs.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueGroupEventArgs.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueMatch.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueMatch.cs
index fbdaafcd57..fbdaafcd57 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueMatch.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueMatch.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueSummary.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueSummary.cs
index bb022e92a8..5e7c4d201c 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueSummary.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueSummary.cs
@@ -53,10 +53,10 @@ namespace MonoDevelop.CodeIssues
 				InspectorIdString = codeIssue.InspectorIdString
 			};
 			issueSummary.Actions = codeIssue.Actions.Select (a => new ActionSummary {
-				Batchable = a.SupportsBatchRunning,
-				SiblingKey = a.SiblingKey,
-				Title = a.Title,
-				Region = a.DocumentRegion,
+//				Batchable = a.SupportsBatchRunning,
+//				SiblingKey = a.SiblingKey,
+//				Title = a.,
+//				Region = a.DocumentRegion,
 				IssueSummary = issueSummary
 			}).ToList ();
 			return issueSummary;
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueTreeNodeEventArgs.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueTreeNodeEventArgs.cs
index 37d663f252..37d663f252 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueTreeNodeEventArgs.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueTreeNodeEventArgs.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/NullGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/NullGroupingProvider.cs
index 677d9989c6..677d9989c6 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/NullGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/NullGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProjectGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ProjectGroupingProvider.cs
index 7ca19ba063..7ca19ba063 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProjectGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ProjectGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProviderGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ProviderGroupingProvider.cs
index 7cdf46e461..7cdf46e461 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProviderGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ProviderGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/AnalysisJobQueue.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/AnalysisJobQueue.cs
index cdb3182fbb..cdb3182fbb 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/AnalysisJobQueue.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/AnalysisJobQueue.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/CodeIssueEventArgs.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/CodeIssueEventArgs.cs
index 53e3a29f8b..53e3a29f8b 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/CodeIssueEventArgs.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/CodeIssueEventArgs.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/IAnalysisJob.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/IAnalysisJob.cs
index 0ab2553b4f..0ab2553b4f 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/IAnalysisJob.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/IAnalysisJob.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/IJobContext.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/IJobContext.cs
index 4027081b81..4027081b81 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/IJobContext.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/IJobContext.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobContext.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobContext.cs
index e15c83c88e..e15c83c88e 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobContext.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobContext.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobSlice.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobSlice.cs
index 7802e21ada..7802e21ada 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobSlice.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobSlice.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobStatus.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobStatus.cs
index 02ca3eb1fd..02ca3eb1fd 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobStatus.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobStatus.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/ProgressMonitorWrapperJob.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/ProgressMonitorWrapperJob.cs
index b1eea307cf..b1eea307cf 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/ProgressMonitorWrapperJob.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/ProgressMonitorWrapperJob.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/SimpleAnalysisJob.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs
index 15878be01b..15878be01b 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/SimpleAnalysisJob.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/SeverityGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/SeverityGroupingProvider.cs
index dc129bb35e..dc129bb35e 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/SeverityGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/SeverityGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/SolutionAnalysisJob.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/SolutionAnalysisJob.cs
index 785c037dcd..785c037dcd 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/SolutionAnalysisJob.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/SolutionAnalysisJob.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameHandler.cs
deleted file mode 100644
index 1b965f684d..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameHandler.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// 
-// RenameHandler.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace MonoDevelop.Refactoring.Rename
-{
-	public class RenameHandler : AbstractRefactoringCommandHandler
-	{
-		protected override void Update (RefactoringOptions options, CommandInfo info)
-		{
-			var renameRefactoring = new RenameRefactoring ();
-			if (!renameRefactoring.IsValid (options))
-				info.Bypass = true;
-		}
-
-		protected override void Run (RefactoringOptions options)
-		{
-			var renameRefactoring = new RenameRefactoring ();
-			if (renameRefactoring.IsValid (options))
-				renameRefactoring.Run (options);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
index cb6bf8acef..b7ebeae5d1 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
@@ -32,116 +32,111 @@ using MonoDevelop.Core;
 using System.Collections.Generic;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.ProgressMonitoring;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.Refactoring.Rename
 {
 	public partial class RenameItemDialog : Gtk.Dialog
 	{
-		RenameRefactoring rename;
-		RefactoringOptions options;
-		
-		public RenameItemDialog (RefactoringOptions options, RenameRefactoring rename)
+		Func<RenameRefactoring.RenameProperties, IList<Change>> rename;
+
+		public RenameItemDialog (string title, string currentName, Func<RenameRefactoring.RenameProperties, IList<Change>> renameOperation)
 		{
-			this.options = options;
-			this.rename = rename;
-			if (options.SelectedItem is IMethod && ((IMethod)options.SelectedItem).IsConstructor) {
-				options.SelectedItem = ((IMethod)options.SelectedItem).DeclaringType;
-			}
 			this.Build ();
-			includeOverloadsCheckbox.Active = true;
-			includeOverloadsCheckbox.Visible = false;
-			if (options.SelectedItem is IType) {
+			Init (title, currentName, renameOperation);
+		}
 
-				var t = (IType)options.SelectedItem;
-				if (t.Kind == TypeKind.TypeParameter) {
-					this.Title = GettextCatalog.GetString ("Rename Type Parameter");
+		public RenameItemDialog (ISymbol symbol, RenameRefactoring rename)
+		{
+			this.Build ();
+
+			string title;
+			if (symbol is ITypeSymbol) {
+
+				var t = (ITypeSymbol)symbol;
+				if (t.TypeKind == TypeKind.TypeParameter) {
+					title = GettextCatalog.GetString ("Rename Type Parameter");
 					entry.Text = t.Name;
 
 				} else {
-					var typeDefinition = (t).GetDefinition ();
-					if (typeDefinition.DeclaringType == null) {
+					var typeDefinition = t;
+					if (typeDefinition.ContainingType == null) {
 						// not supported for inner types
 						this.renameFileFlag.Visible = true;
-						this.renameFileFlag.Active = options.Document != null ? options.Document.FileName.FileNameWithoutExtension.Contains (typeDefinition.Name) : false;
+						this.renameFileFlag.Active = t.Locations.First ().SourceTree.FilePath.Contains (typeDefinition.Name);
 					} else {
 						this.renameFileFlag.Active = false;
 					}
-					if (typeDefinition.Kind == TypeKind.Interface)
-						this.Title = GettextCatalog.GetString ("Rename Interface");
+					if (typeDefinition.TypeKind == TypeKind.Interface)
+						title = GettextCatalog.GetString ("Rename Interface");
+					else if (typeDefinition.TypeKind == TypeKind.Delegate)
+						title = GettextCatalog.GetString ("Rename Delegate");
+					else if (typeDefinition.TypeKind == TypeKind.Enum)
+						title = GettextCatalog.GetString ("Rename Enum");
+					else if (typeDefinition.TypeKind == TypeKind.Struct)
+						title = GettextCatalog.GetString ("Rename Struct");
 					else
-						this.Title = GettextCatalog.GetString ("Rename Class");
+						title = GettextCatalog.GetString ("Rename Class");
 				}
 				//				this.fileName = type.GetDefinition ().Region.FileName;
-			} else if (options.SelectedItem is IField) {
-				this.Title = GettextCatalog.GetString ("Rename Field");
-			} else if (options.SelectedItem is IProperty) {
-				if (((IProperty)options.SelectedItem).IsIndexer) {
-					this.Title = GettextCatalog.GetString ("Rename Indexer");
+			} else if (symbol.Kind == SymbolKind.Field) {
+				title = GettextCatalog.GetString ("Rename Field");
+			} else if (symbol.Kind == SymbolKind.Property) {
+				title = GettextCatalog.GetString ("Rename Property");
+			} else if (symbol.Kind == SymbolKind.Event) {
+				title = GettextCatalog.GetString ("Rename Event");
+			} else if (symbol.Kind == SymbolKind.Method) { 
+				var m = (IMethodSymbol)symbol;
+				if (m.MethodKind == MethodKind.Constructor ||
+					m.MethodKind == MethodKind.StaticConstructor ||
+					m.MethodKind == MethodKind.Destructor) {
+					title = GettextCatalog.GetString ("Rename Class");
 				} else {
-					this.Title = GettextCatalog.GetString ("Rename Property");
+					title = GettextCatalog.GetString ("Rename Method");
+					includeOverloadsCheckbox.Visible = m.ContainingType.GetMembers (m.Name).Length > 1;
 				}
-			} else if (options.SelectedItem is IEvent) {
-				this.Title = GettextCatalog.GetString ("Rename Event");
-			} else if (options.SelectedItem is IMethod) { 
-				var m = (IMethod)options.SelectedItem;
-				if (m.IsConstructor || m.IsDestructor) {
-					this.Title = GettextCatalog.GetString ("Rename Class");
-				} else {
-					this.Title = GettextCatalog.GetString ("Rename Method");
-					includeOverloadsCheckbox.Visible = m.DeclaringType.GetMethods (x => x.Name == m.Name).Count () > 1;
-				}
-			} else if (options.SelectedItem is IParameter) {
-				this.Title = GettextCatalog.GetString ("Rename Parameter");
-			} else if (options.SelectedItem is IVariable) {
-				this.Title = GettextCatalog.GetString ("Rename Variable");
-			} else if (options.SelectedItem is ITypeParameter) {
-				this.Title = GettextCatalog.GetString ("Rename Type Parameter");
-			}  else if (options.SelectedItem is INamespace) {
-				this.Title = GettextCatalog.GetString ("Rename namespace");
+			} else if (symbol.Kind == SymbolKind.Parameter) {
+				title = GettextCatalog.GetString ("Rename Parameter");
+			} else if (symbol.Kind == SymbolKind.Local) {
+				title = GettextCatalog.GetString ("Rename Variable");
+			} else if (symbol.Kind == SymbolKind.TypeParameter) {
+				title = GettextCatalog.GetString ("Rename Type Parameter");
+			} else if (symbol.Kind == SymbolKind.Namespace) {
+				title = GettextCatalog.GetString ("Rename Namespace");
+			} else if (symbol.Kind == SymbolKind.Label) {
+				title = GettextCatalog.GetString ("Rename Label");
 			} else {
-				this.Title = GettextCatalog.GetString ("Rename Item");
-			}
-			
-			if (options.SelectedItem is IEntity) {
-				var member = (IEntity)options.SelectedItem;
-				if (member.SymbolKind == SymbolKind.Constructor || member.SymbolKind == SymbolKind.Destructor) {
-					entry.Text = member.DeclaringType.Name;
-				} else {
-					entry.Text = member.Name;
-				}
-				//				fileName = member.Region.FileName;
-			} else if (options.SelectedItem is IType) {
-				var lvar = (IType)options.SelectedItem;
-				entry.Text = lvar.Name;
-				//				this.fileName = lvar.Region.FileName;
-			} else if (options.SelectedItem is ITypeParameter) {
-				var lvar = (ITypeParameter)options.SelectedItem;
-				entry.Text = lvar.Name;
-				//				this.fileName = lvar.Region.FileName;
-			} else if (options.SelectedItem is IVariable) {
-				var lvar = (IVariable)options.SelectedItem;
-				entry.Text = lvar.Name;
-				//				this.fileName = lvar.Region.FileName;
-			} else if (options.SelectedItem is INamespace) {
-				var lvar = (INamespace)options.SelectedItem;
-				entry.Text = lvar.FullName;
-				//				this.fileName = lvar.Region.FileName;
+				title = GettextCatalog.GetString ("Rename Item");
 			}
+
+
+			Init (title, symbol.Name, prop => rename.PerformChanges (symbol, prop));
+
+		}
+
+		void Init (string title, string currenName, Func<RenameRefactoring.RenameProperties, IList<Change>> rename)
+		{
+			this.Title = title;
+			this.rename = rename;
+
+			includeOverloadsCheckbox.Active = true;
+			includeOverloadsCheckbox.Visible = false;
+			entry.Text = currenName;
 			entry.SelectRegion (0, -1);
-			
+
 			buttonPreview.Sensitive = buttonOk.Sensitive = false;
 			entry.Changed += OnEntryChanged;
 			entry.Activated += OnEntryActivated;
-			
+
 			buttonOk.Clicked += OnOKClicked;
 			buttonPreview.Clicked += OnPreviewClicked;
 			entry.Changed += delegate { buttonPreview.Sensitive = buttonOk.Sensitive = ValidateName (); };
 			ValidateName ();
 		}
 
+
 		bool ValidateName ()
 		{
 			return true; // TODO: Name validation.
@@ -186,8 +181,8 @@ namespace MonoDevelop.Refactoring.Rename
 		{
 			var properties = Properties;
 			((Widget)this).Destroy ();
-			List<Change> changes = rename.PerformChanges (options, properties);
-			ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor (this.Title, null);
+			var changes = this.rename (properties);
+			ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor (Title, null);
 			RefactoringService.AcceptChanges (monitor, changes);
 		}
 		
@@ -195,7 +190,7 @@ namespace MonoDevelop.Refactoring.Rename
 		{
 			var properties = Properties;
 			((Widget)this).Destroy ();
-			List<Change> changes = rename.PerformChanges (options, properties);
+			var changes = this.rename (properties);
 			MessageService.ShowCustomDialog (new RefactoringPreviewDialog (changes));
 		}
 	}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
index 51d2bc74ff..7a490e8f36 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
@@ -27,222 +27,133 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using System.Text;
 using MonoDevelop.Ide;
 using System.Linq;
-using Mono.TextEditor.PopupWindow;
 using MonoDevelop.Ide.FindInFiles;
 using MonoDevelop.Ide.ProgressMonitoring;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using MonoDevelop.Core.ProgressMonitoring;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.FindSymbols;
+using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Ide.Gui;
-
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Rename;
 
 namespace MonoDevelop.Refactoring.Rename
 {
-	public class RenameRefactoring : RefactoringOperation
+	public class RenameRefactoring
 	{
-		public override string AccelKey {
-			get {
-				var key = IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.EditCommands.Rename).AccelKey;
-				return key == null ? null : key.Replace ("dead_circumflex", "^");
-			}
-		}
-		
-		public RenameRefactoring ()
+		public static bool Rename (ISymbol symbol, string newName)
 		{
-			Name = "Rename";
-		}
-		
-		public override bool IsValid (RefactoringOptions options)
-		{
-			if (options.SelectedItem is IVariable || options.SelectedItem is IParameter)
-				return true;
-			if (options.SelectedItem is INamespace) {
-				var ns = (INamespace)options.SelectedItem;
-				return ns.Types.Any (type => !string.IsNullOrEmpty (type.Region.FileName));
-			}
-			if (options.SelectedItem is ITypeDefinition)
-				return !string.IsNullOrEmpty (((ITypeDefinition)options.SelectedItem).Region.FileName);
-			if (options.SelectedItem is IType && ((IType)options.SelectedItem).Kind == TypeKind.TypeParameter)
-				return !string.IsNullOrEmpty (((ITypeParameter)options.SelectedItem).Region.FileName);
-
-			var member = options.SelectedItem as IMember;
-			if (member != null) {
-				if (member.SymbolKind == SymbolKind.Operator)
-					return false;
-				var cls = member.DeclaringTypeDefinition;
-				return cls != null;
-			}
-			return false;
-		}
+			if (symbol == null)
+				throw new ArgumentNullException ("symbol");
+			if (newName == null)
+				throw new ArgumentNullException ("newName");
+			try {
+				var result = new RenameRefactoring ().PerformChanges (symbol, new RenameProperties () { NewName = newName });
 
-		public static void Rename (IEntity entity, string newName)
-		{
-			if (newName == null) {
-				var options = new RefactoringOptions () {
-					SelectedItem = entity
-				};
-				new RenameRefactoring ().Run (options);
-				return;
-			}
-			using (var monitor = new ProgressMonitor ()) {
-				var col = ReferenceFinder.FindReferences (entity, true, monitor);
-				
-				List<Change> result = new List<Change> ();
-				foreach (var memberRef in col) {
-					var change = new TextReplaceChange ();
-					change.FileName = memberRef.FileName;
-					change.Offset = memberRef.Offset;
-					change.RemovedChars = memberRef.Length;
-					change.InsertedText = newName;
-					change.Description = string.Format (GettextCatalog.GetString ("Replace '{0}' with '{1}'"), memberRef.GetName (), newName);
-					result.Add (change);
-				}
-				if (result.Count > 0) {
-					RefactoringService.AcceptChanges (monitor, result);
+				using (var monitor = new ProgressMonitor ()) {
+					if (result.Count > 0) {
+						RefactoringService.AcceptChanges (monitor, result);
+					}
 				}
+				return true;
+			} catch (AggregateException ae) {
+				foreach (var inner in ae.Flatten ().InnerExceptions)
+					LoggingService.LogError ("Exception while rename.", inner);
+				return false;
+			} catch (Exception e) {
+				LoggingService.LogError ("Exception while rename.", e);
+				return false;
 			}
 		}
 
-		public static void RenameVariable (IVariable variable, string newName)
+		static void Rollback (TextEditor editor, List<MonoDevelop.Core.Text.TextChangeEventArgs> textChanges)
 		{
-			using (var monitor = new ProgressMonitor ()) {
-				var col = ReferenceFinder.FindReferences (variable, true, monitor);
-				
-				List<Change> result = new List<Change> ();
-				foreach (var memberRef in col) {
-					var change = new TextReplaceChange ();
-					change.FileName = memberRef.FileName;
-					change.Offset = memberRef.Offset;
-					change.RemovedChars = memberRef.Length;
-					change.InsertedText = newName;
-					change.Description = string.Format (GettextCatalog.GetString ("Replace '{0}' with '{1}'"), memberRef.GetName (), newName);
-					result.Add (change);
-				}
-				if (result.Count > 0) {
-					RefactoringService.AcceptChanges (monitor, result);
-				}
+			for (int i = textChanges.Count - 1; i >= 0; i--) {
+				var v = textChanges [i];
+				editor.ReplaceText (v.Offset, v.InsertionLength, v.RemovedText);
 			}
 		}
 
-		public static void RenameTypeParameter (ITypeParameter typeParameter, string newName)
+		public void Rename (ISymbol symbol)
 		{
-			if (newName == null) {
-				var options = new RefactoringOptions () {
-					SelectedItem = typeParameter
-				};
-				new RenameRefactoring ().Run (options);
+
+			var solution = IdeApp.ProjectOperations.CurrentSelectedSolution;
+			var ws = TypeSystemService.GetWorkspace (solution);
+
+			var currentSolution = ws.CurrentSolution;
+			var newSolution = Renamer.RenameSymbolAsync (currentSolution, symbol, "_" + symbol.Name + "_", ws.Options).Result;
+			var projectChanges = currentSolution.GetChanges (newSolution).GetProjectChanges ().ToList ();
+
+			if (projectChanges.Count != 1) {
+				MessageService.ShowCustomDialog (new RenameItemDialog (symbol, this));
 				return;
 			}
 
-			using (var monitor = new ProgressMonitor ()) {
-				var col = ReferenceFinder.FindReferences (typeParameter, true, monitor);
-				
-				List<Change> result = new List<Change> ();
-				foreach (var memberRef in col) {
-					var change = new TextReplaceChange ();
-					change.FileName = memberRef.FileName;
-					change.Offset = memberRef.Offset;
-					change.RemovedChars = memberRef.Length;
-					change.InsertedText = newName;
-					change.Description = string.Format (GettextCatalog.GetString ("Replace '{0}' with '{1}'"), memberRef.GetName (), newName);
-					result.Add (change);
-				}
-				if (result.Count > 0) {
-					RefactoringService.AcceptChanges (monitor, result);
-				}
+			var projectChange = projectChanges [0];
+			var changes = projectChange.GetChangedDocuments ().ToList ();
+			if (changes.Count != 1) {
+				MessageService.ShowCustomDialog (new RenameItemDialog (symbol, this));
+				return;
 			}
-		}
-
-		public static void RenameNamespace (INamespace ns, string newName)
-		{
-			using (var monitor = new ProgressMonitor ()) {
-				var col = ReferenceFinder.FindReferences (ns, true, monitor);
+			var doc = IdeApp.Workbench.ActiveDocument;
+			var editor = doc.Editor;
+			
+			var links = new List<TextLink> ();
+			var link = new TextLink ("name");
 
-				List<Change> result = new List<Change> ();
-				foreach (var memberRef in col) {
-					var change = new TextReplaceChange ();
-					change.FileName = memberRef.FileName;
-					change.Offset = memberRef.Offset;
-					change.RemovedChars = memberRef.Length;
-					change.InsertedText = newName;
-					change.Description = string.Format (GettextCatalog.GetString ("Replace '{0}' with '{1}'"), memberRef.GetName (), newName);
-					result.Add (change);
-				}
-				if (result.Count > 0) {
-					RefactoringService.AcceptChanges (monitor, result);
+			var cd = changes [0];
+			var oldDoc = projectChange.OldProject.GetDocument (cd);
+			var newDoc = projectChange.NewProject.GetDocument (cd);
+			var oldVersion = editor.Version;
+			foreach (var textChange in oldDoc.GetTextChangesAsync (newDoc).Result) {
+				var segment = new TextSegment (textChange.Span.Start, textChange.Span.Length);
+				if (segment.Offset <= editor.CaretOffset && editor.CaretOffset <= segment.EndOffset) {
+					link.Links.Insert (0, segment); 
+				} else {
+					link.AddLink (segment);
 				}
 			}
-		}
-
-
-		public override string GetMenuDescription (RefactoringOptions options)
-		{
-			return IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.EditCommands.Rename).Text;
-		}
-		
-		public override void Run (RefactoringOptions options)
-		{
-			if (options.SelectedItem is IVariable) {
-				var field = options.SelectedItem as IField;
-				if (field != null && (field.Accessibility != Accessibility.Private || field.DeclaringTypeDefinition != null && field.DeclaringTypeDefinition.Parts.Count > 1)) {
-					MessageService.ShowCustomDialog (new RenameItemDialog (options, this));
+			
+			links.Add (link);
+			editor.StartTextLinkMode (new TextLinkModeOptions (links, args => {
+				if (!args.Success)
 					return;
-				}
 
-				var par = options.SelectedItem as IParameter;
-				if (par != null && par.Owner != null && (par.Owner.Accessibility != Accessibility.Private || par.Owner.DeclaringTypeDefinition != null && par.Owner.DeclaringTypeDefinition.Parts.Count > 1)) {
-					MessageService.ShowCustomDialog (new RenameItemDialog (options, this));
+				var version = editor.Version;
+				var span = symbol.Locations.First ().SourceSpan;
+				var newName = link.CurrentText;
+				var textChanges = version.GetChangesTo (oldVersion).ToList ();
+				foreach (var v in textChanges) {
+					editor.ReplaceText (v.Offset, v.RemovalLength, v.InsertedText);
+				}
+				var parsedDocument = doc.UpdateParseDocument ();
+				if (parsedDocument == null) {
+					Rollback (editor, textChanges);
 					return;
 				}
-
-				var col = ReferenceFinder.FindReferences (options.SelectedItem, true);
-				if (col == null)
-					return;
-				var data = options.Document != null ? options.GetTextEditorData () : IdeApp.Workbench.ActiveDocument.Editor;
-				var editor = data.Parent;
-				if (editor == null) {
-					MessageService.ShowCustomDialog (new RenameItemDialog (options, this));
+				var model = parsedDocument.GetAst<SemanticModel> ();
+				if (model == null) {
+					Rollback (editor, textChanges);
 					return;
 				}
-				
-				var links = new List<TextLink> ();
-				var link = new TextLink ("name");
-				int baseOffset = Int32.MaxValue;
-				foreach (var r in col) {
-					baseOffset = Math.Min (baseOffset, r.Offset);
-				}
-				foreach (MemberReference r in col) {
-					var segment = new TextSegment (r.Offset - baseOffset, r.Length);
-					if (segment.Offset <= data.Caret.Offset - baseOffset && data.Caret.Offset - baseOffset <= segment.EndOffset) {
-						link.Links.Insert (0, segment); 
-					} else {
-						link.AddLink (segment);
-					}
+				var node = model.SyntaxTree.GetRoot ().FindNode (span);
+				if (node == null) {
+					Rollback (editor, textChanges);
+					return;
 				}
-				
-				links.Add (link);
-				if (editor.CurrentMode is TextLinkEditMode)
-					((TextLinkEditMode)editor.CurrentMode).ExitTextLinkMode ();
-				TextLinkEditMode tle = new TextLinkEditMode (editor, baseOffset, links);
-				tle.SetCaretPosition = false;
-				tle.SelectPrimaryLink = true;
-				if (tle.ShouldStartTextLinkMode) {
-					tle.Cancel += delegate {
-						if (tle.HasChangedText)
-							editor.Document.Undo ();
-					};
-					tle.OldMode = data.CurrentMode;
-					tle.StartMode ();
-					data.CurrentMode = tle;
+				var sym = model.GetDeclaredSymbol (node);
+				if (sym == null) {
+					Rollback (editor, textChanges);
+					return;
 				}
-			} else {
-				MessageService.ShowCustomDialog (new RenameItemDialog (options, this));
-			}
+				if (!Rename (sym, newName))
+					Rollback (editor, textChanges);
+			}));
 		}
 		
 		public class RenameProperties
@@ -263,64 +174,66 @@ namespace MonoDevelop.Refactoring.Rename
 			}
 		}
 		
-		public override List<Change> PerformChanges (RefactoringOptions options, object prop)
+		public List<Change> PerformChanges (ISymbol symbol, RenameProperties properties)
 		{
-			RenameProperties properties = (RenameProperties)prop;
-			List<Change> result = new List<Change> ();
-			IEnumerable<MemberReference> col = null;
-			using (var monitor = new MessageDialogProgressMonitor (true, false, false, true)) {
-				col = ReferenceFinder.FindReferences (options.SelectedItem, properties.IncludeOverloads, monitor);
-				if (col == null)
-					return result;
-					
-				if (properties.RenameFile && options.SelectedItem is IType) {
-					var cls = ((IType)options.SelectedItem).GetDefinition ();
-					int currentPart = 1;
-					var alreadyRenamed = new HashSet<string> ();
-					foreach (var part in cls.Parts) {
-						if (alreadyRenamed.Contains (part.Region.FileName))
-							continue;
-						alreadyRenamed.Add (part.Region.FileName);
-							
-						string oldFileName = System.IO.Path.GetFileNameWithoutExtension (part.Region.FileName);
-						string newFileName;
-						var newName = properties.NewName;
-						if (string.IsNullOrEmpty (oldFileName) || string.IsNullOrEmpty (newName))
-							continue;
-						if (oldFileName.ToUpper () == newName.ToUpper () || oldFileName.ToUpper ().EndsWith ("." + newName.ToUpper (), StringComparison.Ordinal))
-							continue;
-						int idx = oldFileName.IndexOf (cls.Name, StringComparison.Ordinal);
-						if (idx >= 0) {
-							newFileName = oldFileName.Substring (0, idx) + newName + oldFileName.Substring (idx + cls.Name.Length);
-						} else {
-							newFileName = currentPart != 1 ? newName + currentPart : newName;
-							currentPart++;
-						}
-							
-						int t = 0;
-						while (System.IO.File.Exists (GetFullFileName (newFileName, part.Region.FileName, t))) {
-							t++;
-						}
-						result.Add (new RenameFileChange (part.Region.FileName, GetFullFileName (newFileName, part.Region.FileName, t)));
+			var solution = IdeApp.ProjectOperations.CurrentSelectedSolution;
+			var ws = TypeSystemService.GetWorkspace (solution);
+
+			var newSolution = Renamer.RenameSymbolAsync (ws.CurrentSolution, symbol, properties.NewName, ws.Options).Result;
+			var result = new List<Change> ();
+
+			foreach (var change in ws.CurrentSolution.GetChanges (newSolution).GetProjectChanges ()) {
+				foreach (var changedDocument in change.GetChangedDocuments ()) {
+					var oldDoc = change.OldProject.GetDocument (changedDocument);
+					var newDoc = change.NewProject.GetDocument (changedDocument);
+
+					foreach (var textChange in oldDoc.GetTextChangesAsync (newDoc).Result.OrderByDescending(ts => ts.Span.Start)) {
+						var trChange = new TextReplaceChange ();
+						trChange.FileName = oldDoc.FilePath;
+						trChange.Offset = textChange.Span.Start;
+						trChange.RemovedChars = textChange.Span.Length;
+						trChange.InsertedText = textChange.NewText;
+						trChange.Description = string.Format (GettextCatalog.GetString ("Replace '{0}' with '{1}'"), symbol.Name, properties.NewName);
+						result.Add (trChange);
 					}
 				}
-				
-				foreach (var memberRef in col) {
-					TextReplaceChange change = new TextReplaceChange ();
-					change.FileName = memberRef.FileName;
-					change.Offset = memberRef.Offset;
-					change.RemovedChars = memberRef.Length;
-					change.InsertedText = properties.NewName;
-					change.Description = string.Format (GettextCatalog.GetString ("Replace '{0}' with '{1}'"), memberRef.GetName (), properties.NewName);
-					result.Add (change);
+			}
+
+			if (properties.RenameFile && symbol.Kind == SymbolKind.NamedType) {
+				int currentPart = 1;
+				var alreadyRenamed = new HashSet<string> ();
+				foreach (var part in symbol.Locations) {
+					var filePath = part.SourceTree.FilePath;
+					if (alreadyRenamed.Contains (filePath))
+						continue;
+					alreadyRenamed.Add (filePath);
+
+					string oldFileName = System.IO.Path.GetFileNameWithoutExtension (filePath);
+					string newFileName;
+					if (oldFileName.ToUpper () == properties.NewName.ToUpper () || oldFileName.ToUpper ().EndsWith ("." + properties.NewName.ToUpper (), StringComparison.Ordinal))
+						continue;
+					int idx = oldFileName.IndexOf (symbol.Name, StringComparison.Ordinal);
+					if (idx >= 0) {
+						newFileName = oldFileName.Substring (0, idx) + properties.NewName + oldFileName.Substring (idx + symbol.Name.Length);
+					} else {
+						newFileName = currentPart != 1 ? properties.NewName + currentPart : properties.NewName;
+						currentPart++;
+					}
+
+					int t = 0;
+					while (System.IO.File.Exists (GetFullFileName (newFileName, filePath, t))) {
+						t++;
+					}
+					result.Add (new RenameFileChange (filePath, GetFullFileName (newFileName, filePath, t)));
 				}
 			}
+
 			return result;
 		}
 		
 		static string GetFullFileName (string fileName, string oldFullFileName, int tryCount)
 		{
-			StringBuilder name = new StringBuilder (fileName);
+			var name = new StringBuilder (fileName);
 			if (tryCount > 0) {
 				name.Append ("_");
 				name.Append (tryCount.ToString ());
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameTextEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameTextEditorExtension.cs
deleted file mode 100644
index c2e6e44360..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameTextEditorExtension.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// 
-// RenameTextEditorExtension.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.Ide.Commands;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.Refactoring.Rename
-{
-	public class RenameTextEditorExtension : TextEditorExtension
-	{
-		[CommandUpdateHandler(EditCommands.Rename)]
-		public void RenameCommand_Update(CommandInfo ci)
-		{
-			new RenameHandler ().UpdateCommandInfo (ci);
-		}
-
-		[CommandHandler (EditCommands.Rename)]
-		public void RenameCommand ()
-		{
-			new RenameHandler ().Start (base.Editor);
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
index 8151d80966..92ded99638 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
@@ -12,21 +12,9 @@
 	<ExtensionPoint path = "/MonoDevelop/Refactoring/ASTProvider" name = "ASTProviders">
 		<ExtensionNode name="Class"/>
 	</ExtensionPoint>
-	
-	<ExtensionPoint path = "/MonoDevelop/Refactoring/CodeActions" name = "CodeAction">
-		<ExtensionNode name="Action" type ="MonoDevelop.CodeActions.CodeActionAddinNode"/>
-	</ExtensionPoint>
-	
-	<ExtensionPoint path = "/MonoDevelop/Refactoring/CodeActionSource" name = "CodeActionSource">
-		<ExtensionNode name="Source"/>
-	</ExtensionPoint>
-	
-	<ExtensionPoint path = "/MonoDevelop/Refactoring/CodeIssues" name = "CodeIssue">
-		<ExtensionNode name="CodeIssue" type ="MonoDevelop.CodeIssues.CodeIssueAddinNode"/>
-	</ExtensionPoint>
-	
-	<ExtensionPoint path = "/MonoDevelop/Refactoring/CodeIssueSource" name = "CodeIssueSource">
-		<ExtensionNode name="Source"/>
+
+	<ExtensionPoint path = "/MonoDevelop/Refactoring/CodeDiagnosticProvider" name = "Code Diagnostic Provider">
+		<ExtensionNode name="Class"/>
 	</ExtensionPoint>
 
 	<ExtensionNodeSet id="MonoDevelop.AnalysisCore.Rules">
@@ -70,44 +58,26 @@
 	
 	<!-- RefactoryCommands -->
 	<Extension path = "/MonoDevelop/Ide/Commands">
-	
+
 		<Category _name = "Code Navigation" id = "CodeNavigation">
-		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration"
-					defaultHandler = "MonoDevelop.Refactoring.GotoDeclarationHandler"
-					_label = "_Go to Declaration" 
-					shortcut = "F12"
-					macShortcut = "Meta|D"/>
 		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.FindReferences"
-					defaultHandler = "MonoDevelop.Refactoring.FindReferencesHandler"
 					_label = "_Find References" 
 					shortcut = "Shift|F12"
 					macShortcut = "Shift|Meta|R"/>
 		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.FindAllReferences"
-					defaultHandler = "MonoDevelop.Refactoring.FindAllReferencesHandler"
 					_label = "_Find References of All Overloads" />
 		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.FindDerivedClasses"
-					defaultHandler = "MonoDevelop.Refactoring.FindDerivedClassesHandler"
 					_label = "Find _Derived Symbols" />
 		</Category>
 		
 		<Category _name = "Refactoring" id = "Refactoring">
-		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.Resolve"
-				defaultHandler = "MonoDevelop.Refactoring.ResolveCommandHandler"
-				type="array"
-				_label = "Resolve"/> 
-		
-		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.CurrentRefactoryOperations"
-				defaultHandler = "MonoDevelop.Refactoring.CurrentRefactoryOperationsHandler"
-				type="array"
-				_label = "Refactory Operations" /> 
-		
+
 		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.QuickFix"
 					_label = "Quick Fix..."
 					shortcut = "Alt|Return"
 					macShortcut = "Alt|Return" />
 		
 		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.ImportSymbol"
-					defaultHandler = "MonoDevelop.Refactoring.ImportSymbolHandler"
 					_label = "Import Symbol..."
 					shortcut = "Control|Alt|space"
 					macShortcut = "Control|Alt|space" />
@@ -120,20 +90,7 @@
 		</Category>
 	</Extension>
 	
-	<Extension path = "/MonoDevelop/SourceEditor2/ContextMenu/Editor">
-		<CommandItem id = "MonoDevelop.Refactoring.RefactoryCommands.Resolve" insertbefore="MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations"/>
-		
-		<ItemSet id = "Fix" _label = "Fix" autohide="true"
-			insertafter="MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations" insertbefore="MonoDevelop.Debugger.DebugCommands.ExpressionEvaluator">
-			<CommandItem id = "MonoDevelop.AnalysisCore.AnalysisCommands.FixOperations" />
-		</ItemSet>
-		
-		
-		<CommandItem id = "MonoDevelop.Refactoring.RefactoryCommands.CurrentRefactoryOperations" insertafter="MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations" insertbefore="MonoDevelop.Debugger.DebugCommands.ExpressionEvaluator"/>
-	</Extension>
-	
 	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
-		<Class class = "MonoDevelop.Refactoring.Rename.RenameTextEditorExtension" />
 		<Class class = "MonoDevelop.CodeActions.CodeActionEditorExtension" />
 	</Extension>
 	
@@ -145,9 +102,6 @@
 	<!-- Quick fix commands -->
 
 	<Extension path = "/MonoDevelop/Ide/Commands/Refactoring">
-		<Command id = "MonoDevelop.AnalysisCore.AnalysisCommands.FixOperations" type="array" 
-			defaultHandler="MonoDevelop.AnalysisCore.FixOperationsHandler"
-			_label = "Fixes" />
 		<Command id = "MonoDevelop.AnalysisCore.AnalysisCommands.ShowFixes"
 			defaultHandler="MonoDevelop.AnalysisCore.ShowFixesHandler"
 			_label = "Show Fixes"
@@ -170,13 +124,13 @@
 	<!-- Extensions to the addin points defined by this addin -->
 	
 	<Extension path = "/MonoDevelop/AnalysisCore/Types">
-		<Type name="Document" class="MonoDevelop.Ide.Gui.Document" />
+		<Type name="AnalysisDocument" class="MonoDevelop.AnalysisCore.Gui.AnalysisDocument" />
 		<Type name="CompilationUnit" class="MonoDevelop.Projects.Dom.ICompilationUnit" />
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/AnalysisCore/Rules">
 		<Adaptor func="MonoDevelop.AnalysisCore.Rules.Adapters.GetCompilationUnit"
-			input="Document" output="CompilationUnit" />
+			input="AnalysisDocument" output="CompilationUnit" />
 		<Category _name="Design Guidelines" id="Design">
 <!--			<Rule _name="Naming Conventions" input="CompilationUnit" 
 				func="MonoDevelop.AnalysisCore.Rules.NamingConventions.ClassNaming" />-->
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
index d47fae2ad7..291163ce86 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
@@ -74,6 +74,67 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Composition.AttributedModel">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Composition.Convention">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Composition.Hosting">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Composition.Runtime">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Composition.TypedParts">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
       <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
       <Private>False</Private>
@@ -95,86 +156,40 @@
     <Compile Include="MonoDevelop.AnalysisCore\AnalysisOptions.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\AnalysisService.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\FixableResult.cs" />
-    <Compile Include="MonoDevelop.AnalysisCore\Rules\Adaptors.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\Result.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\RuleTree.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\RuleTreeType.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\Fixes\GenericFix.cs" />
     <Compile Include="MonoDevelop.Refactoring\RefactoringService.cs" />
-    <Compile Include="MonoDevelop.Refactoring\RefactoryCommands.cs" />
-    <Compile Include="MonoDevelop.Refactoring\RefactoringOperation.cs" />
     <Compile Include="MonoDevelop.Refactoring\Change.cs" />
-    <Compile Include="MonoDevelop.Refactoring\GotoDeclarationHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring\FindReferencesHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring.Rename\RenameTextEditorExtension.cs" />
     <Compile Include="MonoDevelop.Refactoring.Rename\RenameRefactoring.cs" />
     <Compile Include="MonoDevelop.Refactoring.Rename\RenameItemDialog.cs" />
-    <Compile Include="MonoDevelop.Refactoring.Rename\RenameHandler.cs" />
     <Compile Include="gtk-gui\MonoDevelop.Refactoring.Rename.RenameItemDialog.cs" />
-    <Compile Include="MonoDevelop.Refactoring\AbstractRefactoringCommandHandler.cs" />
     <Compile Include="MonoDevelop.Refactoring\RefactoringOptions.cs" />
     <Compile Include="MonoDevelop.Refactoring\RefactoringPreviewDialog.cs" />
     <Compile Include="gtk-gui\MonoDevelop.Refactoring.RefactoringPreviewDialog.cs" />
-    <Compile Include="MonoDevelop.Refactoring\FindDerivedClassesHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring\ImportSymbolHandler.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeIssueProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeIssue.cs" />
     <Compile Include="MonoDevelop.CodeActions\CodeActionEditorExtension.cs" />
-    <Compile Include="MonoDevelop.CodeActions\CodeAction.cs" />
-    <Compile Include="MonoDevelop.CodeActions\CodeActionProvider.cs" />
-    <Compile Include="MonoDevelop.CodeActions\CodeActionAddinNode.cs" />
     <Compile Include="MonoDevelop.CodeActions\CodeActionPanelWidget.cs" />
-    <Compile Include="MonoDevelop.CodeActions\AnalysisCodeAction.cs" />
     <Compile Include="gtk-gui\MonoDevelop.CodeActions.ContextActionPanelWidget.cs" />
     <Compile Include="MonoDevelop.CodeIssues\CodeIssuePanelWidget.cs" />
     <Compile Include="gtk-gui\MonoDevelop.CodeIssues.CodeIssuePanelWidget.cs" />
-    <Compile Include="MonoDevelop.CodeActions\ICodeActionProviderSource.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\ICodeIssueProviderSource.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeAnalysisRunner.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\DefaultCodeIssueCategories.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeIssueAddinNode.cs" />
-    <Compile Include="MonoDevelop.Refactoring\ResolveCommandHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring\ExtensionMethods.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeIssuePad.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IssueSummary.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IssueGroup.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CategoryGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\GroupingProviderChainControl.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\GroupingDescriptionAttribute.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\NullGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IssueGroupEventArgs.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\GroupingProviderEventArgs.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\AbstractGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\ProviderGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\SeverityGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\AnalysisState.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\AnalysisStateChangeEventArgs.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeAnalysisBatchRunner.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IIssueTreeNode.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IIssueSummarySink.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IssueTreeNodeEventArgs.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\ActionSummary.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\BatchFixer.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IssueMatch.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\ExactIssueMatcher.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IActionMatcher.cs" />
     <Compile Include="AddinInfo.cs" />
-    <Compile Include="MonoDevelop.Refactoring\FindDerivedSymbolsHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring\FindMemberOverloadsHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring\FindExtensionMethodHandler.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\IAnalysisJob.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\AnalysisJobQueue.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\CodeIssueEventArgs.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\SolutionAnalysisJob.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\SimpleAnalysisJob.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\ProgressMonitorWrapperJob.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\JobContext.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\IJobContext.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\JobSlice.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\JobStatus.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\ProjectGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\FileGroupingProvider.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\DiagnosticResult.cs" />
+    <Compile Include="MonoDevelop.CodeActions\CodeRefactoringDescriptor.cs" />
+    <Compile Include="MonoDevelop.CodeActions\CodeRefactoringService.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\CodeDiagnosticDescriptor.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\CodeDiagnosticRunner.cs" />
+    <Compile Include="MonoDevelop.CodeActions\CodeActionContainer.cs" />
+    <Compile Include="MonoDevelop.AnalysisCore\IssueMarker.cs" />
+    <Compile Include="MonoDevelop.Refactoring\InsertionPointService.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\CodeDiagnosticProvider.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\BuiltInCodeDiagnosticProvider.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\AnalyzersFromAssembly.cs" />
+    <Compile Include="MonoDevelop.CodeActions\ValidCodeAction.cs" />
+    <Compile Include="MonoDevelop.CodeActions\ValidCodeDiagnosticAction.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\CodeDiagnosticFixDescriptor.cs" />
+    <Compile Include="MonoDevelop.Refactoring\Commands.cs" />
+    <Compile Include="MonoDevelop.Refactoring\RefactoringSymbolInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="MonoDevelop.Refactoring\" />
@@ -182,7 +197,8 @@
     <Folder Include="MonoDevelop.AnalysisCore\" />
     <Folder Include="MonoDevelop.CodeIssues\" />
     <Folder Include="MonoDevelop.CodeActions\" />
-    <Folder Include="MonoDevelop.CodeIssues\Runner\" />
+    <Folder Include="MonoDevelop.AnalysisCore\Rules\" />
+    <Folder Include="MonoDevelop.CodeIssues\Pad\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MonoDevelop.Refactoring.addin.xml">
@@ -223,31 +239,11 @@
       <Name>MonoDevelop.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
       <Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
       <Name>MonoDevelop.DesignerSupport</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
@@ -268,15 +264,65 @@
       <Name>Mono.Debugging</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory6.CSharp.Refactoring.csproj">
+      <Project>{C465A5DC-AD28-49A2-89C0-F81838814A7E}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp.Refactoring</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
+      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
+      <Name>MonoDevelop.SourceEditor</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <None Include="MonoDevelop.AnalysisCore\README.txt" />
     <None Include="MonoDevelop.AnalysisCore\TODO.txt" />
     <None Include="MonoDevelop.Refactoring\QuickFixHandler.cs" />
-    <None Include="MonoDevelop.Refactoring\EncapsulateFieldDialog.cs" />
-    <None Include="MonoDevelop.Refactoring\OverridesImplementsDialog.cs" />
     <None Include="gtk-gui\MonoDevelop.Refactoring.OverridesImplementsDialog.cs" />
     <None Include="gtk-gui\MonoDevelop.Refactoring.EncapsulateFieldDialog.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\AnalysisJobQueue.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\CodeIssueEventArgs.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\IAnalysisJob.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\IJobContext.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\JobContext.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\JobSlice.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\JobStatus.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\ProgressMonitorWrapperJob.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\SimpleAnalysisJob.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\CodeIssuePad.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\ExactIssueMatcher.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IActionMatcher.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IssueMatch.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\SolutionAnalysisJob.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\CodeAnalysisBatchRunner.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\BatchFixer.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\AbstractGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\FileGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\GroupingDescriptionAttribute.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\GroupingProviderChainControl.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\GroupingProviderEventArgs.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IIssueSummarySink.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IIssueTreeNode.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IssueGroup.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IssueGroupEventArgs.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IssueSummary.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IssueTreeNodeEventArgs.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\NullGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\ProjectGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\ProviderGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\SeverityGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\ActionSummary.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\AnalysisState.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\AnalysisStateChangeEventArgs.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\CategoryGroupingProvider.cs" />
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs
deleted file mode 100644
index cf29ac7626..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// 
-// AbstractRefactoringCommandHandler.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-
-namespace MonoDevelop.Refactoring
-{
-	public abstract class AbstractRefactoringCommandHandler : CommandHandler
-	{
-		protected abstract void Run (RefactoringOptions options);
-
-		protected virtual void Update (RefactoringOptions options, CommandInfo info)
-		{
-		}
-
-		public void UpdateCommandInfo (CommandInfo info)
-		{
-			Update (info);
-		}
-
-		public void Start (object data)
-		{
-			Run (data);
-		}
-
-		RefactoringOptions CreateOptions ()
-		{
-			Document doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null)
-				return null;
-			
-			ResolveResult result;
-			var item = CurrentRefactoryOperationsHandler.GetItem (doc, out result);
-			
-			return new RefactoringOptions (doc) {
-				ResolveResult = result,
-				SelectedItem = item
-			};
-		}
-
-		protected override void Update (CommandInfo info)
-		{
-			base.Update (info);
-			
-			var options = CreateOptions ();
-			if (options != null) {
-				Update (options, info);
-			} else {
-				info.Bypass = true;
-			}
-		}
-
-		protected override void Run (object data)
-		{
-			var options = CreateOptions ();
-			if (options != null)
-				Run (options);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs
index 3b09f630f7..ca05849af7 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs
@@ -28,11 +28,10 @@ using System;
 using System.IO;
 using System.Collections.Generic;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Text;
-using Mono.TextEditor;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Refactoring
 {
@@ -84,26 +83,23 @@ namespace MonoDevelop.Refactoring
 			set;
 		}
 		
-		static List<TextEditorData> textEditorDatas = new List<TextEditorData> ();
+		static List<TextEditor> textEditorDatas = new List<TextEditor> ();
 		static List<IDisposable> undoGroups = new List<IDisposable> ();
 		
 		public static void FinishRefactoringOperation ()
 		{
-			foreach (TextEditorData data in textEditorDatas) {
-				data.Document.CommitUpdateAll ();
-			}
 			textEditorDatas.Clear ();
 			undoGroups.ForEach (grp => grp.Dispose ());
 			undoGroups.Clear ();
 		}
 		
-		internal static TextEditorData GetTextEditorData (string fileName)
+		internal static TextEditor GetTextEditorData (string fileName)
 		{
 			if (IdeApp.Workbench == null)
 				return null;
 			foreach (var doc in IdeApp.Workbench.Documents) {
 				if (doc.FileName == fileName) {
-					TextEditorData result = doc.Editor;
+					var result = doc.Editor;
 					if (result != null) {
 						textEditorDatas.Add (result);
 						undoGroups.Add (result.OpenUndoGroup ());
@@ -113,7 +109,7 @@ namespace MonoDevelop.Refactoring
 			}
 			return null;
 		}
-		protected virtual TextEditorData TextEditorData {
+		protected virtual TextEditor TextEditorData {
 			get {
 				return GetTextEditorData (FileName);
 			}
@@ -123,33 +119,16 @@ namespace MonoDevelop.Refactoring
 			if (rctx == null)
 				throw new InvalidOperationException ("Refactory context not available.");
 			
-			TextEditorData textEditorData = this.TextEditorData;
-			bool saveEditor = false;
-			bool hadBom = true;
-			System.Text.Encoding encoding = System.Text.Encoding.UTF8;
+			var textEditorData = this.TextEditorData;
 
 			if (textEditorData == null) {
 				bool open;
-				textEditorData = TextFileProvider.Instance.GetTextEditorData (FileName, out hadBom, out encoding, out open);
-				saveEditor = true;
-			}
-		
-			
-			int offset = textEditorData.Caret.Offset;
-			int charsInserted = textEditorData.Replace (Offset, RemovedChars, InsertedText);
-			if (MoveCaretToReplace) {
-				textEditorData.Caret.Offset = Offset + charsInserted;
+				var data = TextFileProvider.Instance.GetTextEditorData (FileName, out open);
+				data.ReplaceText (Offset, RemovedChars, InsertedText);
+				data.Save ();
 			} else {
-				if (Offset < offset) {
-					int rem = RemovedChars;
-					if (Offset + rem > offset)
-						rem = offset - Offset;
-					textEditorData.Caret.Offset = offset - rem + charsInserted;
-				}
+				textEditorData.ReplaceText (Offset, RemovedChars, InsertedText);
 			}
-			
-			if (saveEditor)
-				Mono.TextEditor.Utils.TextFileUtility.WriteText (FileName, textEditorData.Text, encoding, hadBom);
 		}
 		
 		public override string ToString ()
@@ -180,8 +159,8 @@ namespace MonoDevelop.Refactoring
 		public override void PerformChange (ProgressMonitor monitor, RefactoringOptions rctx)
 		{
 			File.WriteAllText (FileName, Content);
-			rctx.Document.Project.AddFile (FileName);
-			IdeApp.ProjectOperations.SaveAsync (rctx.Document.Project);
+			rctx.DocumentContext.Project.AddFile (FileName);
+			IdeApp.ProjectOperations.SaveAsync (rctx.DocumentContext.Project);
 		}
 	}
 	
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Commands.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Commands.cs
new file mode 100644
index 0000000000..856fcc63cd
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Commands.cs
@@ -0,0 +1,44 @@
+//
+// Commands.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Refactoring
+{
+
+	public enum RefactoryCommands
+	{
+		CurrentRefactoryOperations,
+		GotoDeclaration, // in 'referenced' in IdeViMode.cs as string
+		FindReferences,
+		FindAllReferences,
+		FindDerivedClasses,
+		DeclareLocal,
+		ImportSymbol,
+		QuickFix
+	}
+
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/EncapsulateFieldDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/EncapsulateFieldDialog.cs
deleted file mode 100644
index 7c806bbfcc..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/EncapsulateFieldDialog.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-// EncapsulateFieldDialog.cs
-//
-// Author:
-//   Jeffrey Stedfast  <fejj@novell.com>
-//   Ankit Jain  <jankit@novell.com>
-//
-// Copyright (c) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-
-using System;
-using System.Text;
-using System.CodeDom;
-
-using Gtk;
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Parser;
-using MonoDevelop.Projects.CodeGeneration;
-using MonoDevelop.Ide;
-using Mono.TextEditor;
-using System.Linq;
-using System.Collections.Generic;
-using Mono.TextEditor.PopupWindow;
-
-namespace MonoDevelop.Refactoring {
-
-	public partial class EncapsulateFieldDialog : Gtk.Dialog
-	{
-		IType declaringType;
-		ListStore store;
-		ListStore visibilityStore;
-		MonoDevelop.Ide.Gui.Document editor;
-		
-		private const int colCheckedIndex = 0;
-		private const int colFieldNameIndex = 1;
-		private const int colPropertyNameIndex = 2;
-		private const int colVisibilityIndex = 3;
-		private const int colReadOnlyIndex = 4;
-		private const int colFieldIndex = 5;
-
-		public EncapsulateFieldDialog (MonoDevelop.Ide.Gui.Document editor, ITypeResolveContext ctx, IType declaringType)
-			: this (editor, declaringType, null)
-		{}
-
-		public EncapsulateFieldDialog (MonoDevelop.Ide.Gui.Document editor, ITypeResolveContext ctx, IField field)
-			: this (editor, field.DeclaringType, field)
-		{}
-
-		private EncapsulateFieldDialog (MonoDevelop.Ide.Gui.Document editor, IType declaringType, IField field)
-		{
-			this.editor = editor;
-			this.declaringType = declaringType;
-			this.Build ();
-
-			Title = GettextCatalog.GetString ("Encapsulate Fields");
-			buttonOk.Sensitive = true;
-			store = new ListStore (typeof (bool), typeof(string), typeof (string), typeof (string), typeof (bool), typeof (IField));
-			visibilityStore = new ListStore (typeof (string));
-
-			// Column #1
-			CellRendererToggle cbRenderer = new CellRendererToggle ();
-			cbRenderer.Activatable = true;
-			cbRenderer.Toggled += OnSelectedToggled;
-			TreeViewColumn cbCol = new TreeViewColumn ();
-			cbCol.Title = "";
-			cbCol.PackStart (cbRenderer, false);
-			cbCol.AddAttribute (cbRenderer, "active", colCheckedIndex);
-			treeview.AppendColumn (cbCol);
-
-			// Column #2
-			CellRendererText fieldRenderer = new CellRendererText ();
-			fieldRenderer.Weight = (int) Pango.Weight.Bold;
-			TreeViewColumn fieldCol = new TreeViewColumn ();
-			fieldCol.Title = GettextCatalog.GetString ("Field");
-			fieldCol.Expand = true;
-			fieldCol.PackStart (fieldRenderer, true);
-			fieldCol.AddAttribute (fieldRenderer, "text", colFieldNameIndex);
-			treeview.AppendColumn (fieldCol);
-
-			// Column #3
-			CellRendererText propertyRenderer = new CellRendererText ();
-			propertyRenderer.Editable = true;
-			propertyRenderer.Edited += new EditedHandler (OnPropertyEdited);
-			TreeViewColumn propertyCol = new TreeViewColumn ();
-			propertyCol.Title = GettextCatalog.GetString ("Property");
-			propertyCol.Expand = true;
-			propertyCol.PackStart (propertyRenderer, true);
-			propertyCol.AddAttribute (propertyRenderer, "text", colPropertyNameIndex);
-			propertyCol.SetCellDataFunc (propertyRenderer, new TreeCellDataFunc (RenderPropertyName));
-			treeview.AppendColumn (propertyCol);
-
-			// Column #4
-			CellRendererCombo visiComboRenderer = new CellRendererCombo ();
-			visiComboRenderer.Model = visibilityStore;
-			visiComboRenderer.Editable = true;
-			visiComboRenderer.Edited += new EditedHandler (OnVisibilityEdited);
-			visiComboRenderer.HasEntry = false;
-			visiComboRenderer.TextColumn = 0;
-
-			TreeViewColumn visiCol = new TreeViewColumn ();
-			visiCol.Title = GettextCatalog.GetString ("Visibility");
-			visiCol.PackStart (visiComboRenderer, false);
-			visiCol.AddAttribute (visiComboRenderer, "text", colVisibilityIndex);
-			treeview.AppendColumn (visiCol);
-
-			// Column #5
-			CellRendererToggle roRenderer = new CellRendererToggle ();
-			roRenderer.Activatable = true;
-			roRenderer.Xalign = 0.0f;
-			roRenderer.Toggled += new ToggledHandler (OnReadOnlyToggled);
-			TreeViewColumn roCol = new TreeViewColumn ();
-			roCol.Title = GettextCatalog.GetString ("Read only");
-			roCol.PackStart (roRenderer, false);
-			roCol.AddAttribute (roRenderer, "active", colReadOnlyIndex);
-			treeview.AppendColumn (roCol);
-
-			visibilityStore.AppendValues ("Public");
-			visibilityStore.AppendValues ("Private");
-			visibilityStore.AppendValues ("Protected");
-			visibilityStore.AppendValues ("Internal");
-
-			treeview.Model = store;
-
-			foreach (IField ifield in declaringType.Fields) {
-				bool enabled = field != null && (field.Name == ifield.Name);
-				string propertyName = GeneratePropertyName (ifield.Name);
-				store.AppendValues (enabled, ifield.Name, propertyName,
-				                    "Public", ifield.IsReadonly || ifield.IsLiteral, ifield);
-
-				if (enabled)
-					CheckAndUpdateConflictMessage (propertyName, false);
-			}
-
-			store.SetSortColumnId (colFieldNameIndex, SortType.Ascending);
-			buttonSelectAll.Clicked += OnSelectAllClicked;
-			buttonUnselectAll.Clicked += OnUnselectAllClicked;
-			buttonOk.Clicked += OnOKClicked;
-			buttonCancel.Clicked += OnCancelClicked;
-
-			UpdateOKButton ();
-		}
-
-		string GeneratePropertyName (string fieldName)
-		{
-			StringBuilder builder = new StringBuilder (fieldName.Length);
-			bool upper = true;
-			int i = 0;
-
-			// Field names are commonly prefixed with "m" or "m_" by devs from c++ land.
-			if (fieldName[0] == 'm' && fieldName.Length > 1 &&
-			    (fieldName[1] == '_' || Char.IsUpper (fieldName[1])))
-				i++;
-
-			while (i < fieldName.Length) {
-				if (fieldName[i] == '_') {
-					// strip _'s and uppercase the next letter
-					upper = true;
-				} else if (Char.IsLetter (fieldName[i])) {
-					builder.Append (upper ? Char.ToUpper (fieldName[i]) : fieldName[i]);
-					upper = false;
-				} else {
-					builder.Append (fieldName[i]);
-				}
-
-				i++;
-			}
-
-			return builder.ToString ();
-		}
-
-		void OnPropertyEdited (object sender, EditedArgs args)
-		{
-			TreeIter iter;
-			if (!store.GetIterFromString (out iter, args.Path))
-				return;
-
-			store.SetValue (iter, colPropertyNameIndex, args.NewText);
-			if (!CheckAndUpdateConflictMessage (iter, true))
-				// unselect this field
-				store.SetValue (iter, colCheckedIndex, false);
-
-			UpdateOKButton ();
-		}
-
-		void RenderPropertyName (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
-		{
-			bool selected = (bool) store.GetValue (iter, colCheckedIndex);
-			string propertyName = (string) store.GetValue (iter, colPropertyNameIndex);
-			string error;
-
-			CellRendererText cellRendererText = (CellRendererText) cell;
-			if (!selected || IsValidPropertyName (propertyName, out error))
-				cellRendererText.Foreground = "black";
-			else
-				cellRendererText.Foreground = "red";
-
-			cellRendererText.Text = propertyName;
-		}
-
-		// @clearOnValid: clear the message label if propertyName is valid
-		bool CheckAndUpdateConflictMessage (TreeIter iter, bool clearOnValid)
-		{
-			return CheckAndUpdateConflictMessage ((string) store.GetValue (iter, colPropertyNameIndex), 
-			                                      clearOnValid);
-		}
-
-		// @clearOnValid: clear the message label if propertyName is valid
-		bool CheckAndUpdateConflictMessage (string name, bool clearOnValid)
-		{
-			string error;
-			if (IsValidPropertyName (name, out error)) {
-				if (clearOnValid)
-					SetErrorMessage (null);
-				return true;
-			} else {
-				SetErrorMessage (error);
-				return false;
-			}
-		}
-
-		void SetErrorMessage (string message)
-		{
-			if (String.IsNullOrEmpty (message)) {
-				labelError.Text = String.Empty;
-				imageError.Clear ();
-			} else {
-				labelError.Text = message;
-				imageError.SetFromStock (MonoDevelop.Ide.Gui.Stock.Error, IconSize.Menu);
-			}
-		}
-
-		bool IsValidPropertyName (string name, out string error_msg)
-		{
-			// Don't allow the user to click OK unless there is a new name
-			if (name.Length == 0) {
-				error_msg = GettextCatalog.GetString ("Property name must be non-empty.");
-				return false;
-			}
-			foreach (IMember member in declaringType.Members) {
-				if (member.Name == name) {
-					error_msg = GettextCatalog.GetString ("Property name conflicts with an existing member name.");
-					return false;
-				}
-			}
-			error_msg = String.Empty;
-			return true;
-		}
-
-		private void OnVisibilityEdited (object sender, EditedArgs args)
-		{
-			TreeIter iter;
-			if (store.GetIterFromString (out iter, args.Path))
-				store.SetValue (iter, colVisibilityIndex, args.NewText);
-		}
-
-		private void OnSelectedToggled (object o, ToggledArgs args)
-		{
-			TreeIter iter;
-			if (!store.GetIterFromString (out iter, args.Path))
-				return;
-
-			bool old_value = (bool) store.GetValue (iter, colCheckedIndex);
-			store.SetValue (iter, colCheckedIndex, !old_value);
-
-			if (old_value)
-				SetErrorMessage (null);
-			else
-				CheckAndUpdateConflictMessage (iter, true);
-			UpdateOKButton ();
-		}
-
-		void UpdateOKButton ()
-		{
-			TreeIter iter;
-			if (!store.GetIterFirst (out iter))
-				return;
-
-			bool atleast_one_selected = false;
-			do {
-				bool selected = (bool) store.GetValue (iter, colCheckedIndex);
-				if (!selected)
-					continue;
-
-				atleast_one_selected = true;
-
-				string propertyName = (string) store.GetValue (iter, colPropertyNameIndex);
-				string error;
-				if (!IsValidPropertyName (propertyName, out error)) {
-					buttonOk.Sensitive = false;
-					return;
-				}
-			} while (store.IterNext (ref iter));
-
-			buttonOk.Sensitive = atleast_one_selected;
-		}
-
-		private void OnReadOnlyToggled (object o, ToggledArgs args)
-		{
-			TreeIter iter;
-			if (store.GetIterFromString (out iter, args.Path)) {
-				IField ifield = (IField) store.GetValue (iter, colFieldIndex);
-				if (ifield.IsReadonly || ifield.IsLiteral)
-					return;
-
-				bool value = (bool) store.GetValue (iter, colReadOnlyIndex);
-				store.SetValue (iter, colReadOnlyIndex, !value);
-			}
-		}
-
-		void OnSelectAllClicked (object sender, EventArgs e)
-		{
-			SelectAll (true);
-		}
-
-		void OnUnselectAllClicked (object sender, EventArgs e)
-		{
-			SelectAll (false);
-			SetErrorMessage (null);
-		}
-
-		void SelectAll (bool select)
-		{
-			TreeIter iter;
-			if (!store.GetIterFirst (out iter))
-				return;
-
-			// clear any old error message
-			SetErrorMessage (null);
-
-			bool has_error = false;
-			do {
-				if (select && !CheckAndUpdateConflictMessage (iter, false))
-					has_error = true;
-				store.SetValue (iter, colCheckedIndex, select);
-			} while (store.IterNext (ref iter));
-
-			if (has_error)
-				SetErrorMessage (GettextCatalog.GetString ("One or more property names conflict with existing members of the class"));
-			UpdateOKButton ();
-		}
-
-		void OnCancelClicked (object sender, EventArgs e)
-		{
-			((Widget) this).Destroy ();
-		}
-		class FieldData {
-			public IField Field { get; set; }
-			public string PropertyName { get; set; }
-			public bool ReadOnly { get; set; }
-			public Modifiers Modifiers { get; set; }
-			
-			public FieldData (IField field, string propertyName, bool readOnly, Modifiers modifiers)
-			{
-				this.Field = field;
-				this.PropertyName = propertyName;
-				this.ReadOnly = readOnly;
-				this.Modifiers = modifiers;
-			}
-		}
-		
-		void OnOKClicked (object sender, EventArgs e)
-		{
-			TreeIter iter;
-			if (!store.GetIterFirst (out iter))
-				return;
-			
-			List<FieldData> data = new List<FieldData> ();
-			
-			do {
-				bool selected = (bool) store.GetValue (iter, colCheckedIndex);
-				if (!selected)
-					continue;
-
-				string propertyName = (string) store.GetValue (iter, colPropertyNameIndex);
-				string visibility = (string) store.GetValue (iter, colVisibilityIndex);
-				bool read_only = (bool) store.GetValue (iter, colReadOnlyIndex);
-				IField field = (IField) store.GetValue (iter, colFieldIndex);
-				Modifiers mod = Modifiers.None;
-				if (visibility.ToUpper () == "PUBLIC")
-					mod = Modifiers.Public;
-				if (visibility.ToUpper () == "PRIVATE")
-					mod = Modifiers.Private;
-				if (visibility.ToUpper () == "PROTECTED")
-					mod = Modifiers.Protected;
-				if (visibility.ToUpper () == "INTERNAL")
-					mod = Modifiers.Internal;
-				data.Add (new FieldData (field, propertyName, read_only, mod));
-			} while (store.IterNext (ref iter));
-			
-			var mode = new InsertionCursorEditMode (editor.Editor.Parent, CodeGenerationService.GetInsertionPoints (editor, declaringType));
-			var helpWindow = new ModeHelpWindow ();
-			helpWindow.Shown += (s, a) => DesktopService.RemoveWindowShadow (helpWindow);
-			helpWindow.TransientFor = IdeApp.Workbench.RootWindow;
-			helpWindow.TitleText = GettextCatalog.GetString ("<b>Encapsulate Field -- Targeting</b>");
-			helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Key</b>"), GettextCatalog.GetString ("<b>Behavior</b>")));
-			helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Up</b>"), GettextCatalog.GetString ("Move to <b>previous</b> target point.")));
-			helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Down</b>"), GettextCatalog.GetString ("Move to <b>next</b> target point.")));
-			helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Enter</b>"), GettextCatalog.GetString ("<b>Declare new property</b> at target point.")));
-			helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Esc</b>"), GettextCatalog.GetString ("<b>Cancel</b> this refactoring.")));
-			mode.HelpWindow = helpWindow;
-			mode.CurIndex = mode.InsertionPoints.Count - 1;
-			int idx = -1, i = 0;
-			TextLocation lTextLocation = TextLocation.Empty;
-			foreach (IMember member in declaringType.Members) {
-				if (lTextLocation != member.Location && data.Any (d => d.Field.Location == member.Location))
-					idx = i;
-				lTextLocation = member.Location;
-				i++;
-			}
-			if (idx >= 0)
-				mode.CurIndex = idx + 1;
-			mode.StartMode ();
-			mode.Exited += delegate(object s, InsertionCursorEventArgs args) {
-				if (args.Success) {
-					CodeGenerator generator =  CodeGenerator.CreateGenerator (editor.Editor.Document.MimeType, editor.Editor.TabsToSpaces, editor.Editor.Options.TabSize, editor.Editor.EolMarker);
-					StringBuilder code = new StringBuilder ();
-					for (int j = 0; j < data.Count; j++) {
-						if (j > 0) {
-							code.AppendLine ();
-							code.AppendLine ();
-						}
-						var f = data[j];
-						code.Append (generator.CreateFieldEncapsulation (declaringType, f.Field, f.PropertyName, f.Modifiers, f.ReadOnly));
-					}
-					args.InsertionPoint.Insert (editor.Editor, code.ToString ());
-				}
-			};
-			((Widget) this).Destroy ();
-		}
-
-		static MemberAttributes StringToMemberAttributes (string visibility)
-		{
-			switch (visibility) {
-			case "Public":
-				return MemberAttributes.Public;
-			case "Private":
-				return MemberAttributes.Private;
-			case "Protected":
-				return MemberAttributes.Family;
-			case "Internal":
-				return MemberAttributes.Assembly;
-			default:
-				throw new ArgumentException ("Unknown visibility : " + visibility);
-			}
-		}
-
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ExtensionMethods.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ExtensionMethods.cs
deleted file mode 100644
index cb52d45e37..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ExtensionMethods.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// ExtensionMethods.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide.Gui;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using System.Threading.Tasks;
-using MonoDevelop.Core;
-using System.Threading;
-using MonoDevelop.Core.Instrumentation;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.Refactoring
-{
-    public static class ExtensionMethods
-    {
-		class ResolverAnnotation
-		{
-			public CancellationTokenSource SharedTokenSource;
-			public Task<CSharpAstResolver> Task;
-			public CSharpUnresolvedFile ParsedFile;
-		}
-
-		public static TimerCounter ResolveCounter = InstrumentationService.CreateTimerCounter("Resolve document", "Parsing");
-
-		/// <summary>
-		/// Returns a full C# syntax tree resolver which is shared between semantic highlighting, source analysis and refactoring.
-		/// For code analysis tasks this should be used instead of generating an own resolver. Only exception is if a local resolving is done using a 
-		/// resolve navigator.
-		/// Note: The shared resolver is fully resolved.
-		/// </summary>
-		public static Task<CSharpAstResolver> GetSharedResolver (this Document document)
-		{
-			var parsedDocument = document.ParsedDocument;
-			if (parsedDocument == null || document.IsProjectContextInUpdate || document.Project != null && !(document.Project is DotNetProject))
-				return null;
-
-			var unit       = parsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (unit == null || parsedFile == null)
-				return null;
-			var compilation = document.Compilation;
-
-			var resolverAnnotation = document.Annotation<ResolverAnnotation> ();
-
-			if (resolverAnnotation != null) {
-				if (resolverAnnotation.ParsedFile == parsedFile)
-					return resolverAnnotation.Task;
-				if (resolverAnnotation.SharedTokenSource != null)
-					resolverAnnotation.SharedTokenSource.Cancel ();
-				document.RemoveAnnotations<ResolverAnnotation> ();
-			}
-
-			var tokenSource = new CancellationTokenSource ();
-			var token = tokenSource.Token;
-			var resolveTask = Task.Factory.StartNew (delegate {
-				try {
-					using (var timer = ResolveCounter.BeginTiming ()) {
-						var result = new CSharpAstResolver (compilation, unit, parsedFile);
-						result.ApplyNavigator (new ConstantModeResolveVisitorNavigator (ResolveVisitorNavigationMode.Resolve, null), token);
-						return result;
-					}
-				} catch (OperationCanceledException) {
-					return null;
-				} catch (Exception e) {
-					LoggingService.LogError ("Error while creating the resolver.", e);
-					return null;
-				}
-			}, token);
-
-			var wrapper = resolveTask.ContinueWith (t => {
-				if (t.IsCanceled)
-					return null;
-				if (t.IsFaulted) {
-					var ex = t.Exception.Flatten ().InnerException;
-					if (!(ex is TaskCanceledException))
-						LoggingService.LogWarning ("Exception while getting shared AST resolver.", ex);
-					return null;
-				}
-				return t.Result;
-			}, TaskContinuationOptions.ExecuteSynchronously);
-
-			document.AddAnnotation (new ResolverAnnotation {
-				Task = wrapper,
-				ParsedFile = parsedFile,
-				SharedTokenSource = tokenSource
-			});
-
-			return wrapper;
-		}
-
-		public sealed class ConstantModeResolveVisitorNavigator : IResolveVisitorNavigator
-		{
-			readonly ResolveVisitorNavigationMode mode;
-			readonly IResolveVisitorNavigator targetForResolveCalls;
-
-			public ConstantModeResolveVisitorNavigator(ResolveVisitorNavigationMode mode, IResolveVisitorNavigator targetForResolveCalls)
-			{
-				this.mode = mode;
-				this.targetForResolveCalls = targetForResolveCalls;
-			}
-
-			ResolveVisitorNavigationMode IResolveVisitorNavigator.Scan(AstNode node)
-			{
-				return mode;
-			}
-
-			void IResolveVisitorNavigator.Resolved(AstNode node, ResolveResult result)
-			{
-				if (targetForResolveCalls != null)
-					targetForResolveCalls.Resolved(node, result);
-			}
-
-			void IResolveVisitorNavigator.ProcessConversion(Expression expression, ResolveResult result, Conversion conversion, IType targetType)
-			{
-				if (targetForResolveCalls != null)
-					targetForResolveCalls.ProcessConversion(expression, result, conversion, targetType);
-			}
-		}
-
-    }
-}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs
deleted file mode 100644
index da9a514bbb..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-//
-// FindDerivedClassesHandler.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Refactoring;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using System.Collections.Generic;
-using System.Threading;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.FindInFiles;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Semantics;
-using System.Threading.Tasks;
-using System.Linq;
-using System.Collections.Concurrent;
-
-namespace MonoDevelop.Refactoring
-{
-	public class FindDerivedClassesHandler : CommandHandler
-	{
-		public static void FindDerivedClasses (ITypeDefinition cls)
-		{
-			FindDerivedSymbols (cls, null);
-		}
-
-		public static void FindDerivedMembers (IMember member)
-		{
-			var cls = member.DeclaringTypeDefinition;
-			if (cls == null)
-				return;
-			FindDerivedSymbols (cls, member);
-		}
-
-		static void FindDerivedSymbols (ITypeDefinition cls, IMember member)
-		{
-			var solution = IdeApp.ProjectOperations.CurrentSelectedSolution;
-			if (solution == null)
-				return;
-
-			var sourceProject = TypeSystemService.GetProject (cls);
-			if (sourceProject == null)
-				return;
-
-			var compilations = ReferenceFinder.GetAllReferencingProjects (solution, sourceProject)
-				.Select (TypeSystemService.GetCompilation).Where (c => c != null).ToList ();
-
-			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
-				var label = member == null
-					? GettextCatalog.GetString ("Searching for derived classes in solution...")
-					: GettextCatalog.GetString ("Searching for derived members in solution...");
-				monitor.BeginTask (label, compilations.Count);
-
-				Parallel.ForEach (compilations, comp => {
-					try {
-						SearchCompilation (monitor, comp, cls, member);
-					} catch (Exception ex) {
-						LoggingService.LogInternalError (ex);
-						monitor.ReportError ("Unhandled error while searching", ex);
-					}
-					monitor.Step (1);
-				});
-
-				monitor.EndTask ();
-			};
-		}
-
-		static void SearchCompilation (ISearchProgressMonitor monitor, ICompilation comp, ITypeDefinition cls, IMember member)
-		{
-			var importedType = comp.Import (cls);
-			if (importedType == null) {
-				return;
-			}
-
-			IMember impMember = null;
-			if (member != null) {
-				impMember = comp.Import (member);
-				if (impMember == null) {
-					return;
-				}
-			}
-
-			foreach (var derivedType in comp.MainAssembly.GetAllTypeDefinitions ()) {
-				if (!derivedType.IsDerivedFrom (importedType))
-					continue;
-				IEntity result;
-				if (member != null) {
-					result = FindDerivedMember (impMember, derivedType);
-					if (result == null)
-						continue;
-				}
-				else {
-					result = derivedType;
-				}
-				ReportResult (monitor, result);
-			}
-		}
-
-		static IMember FindDerivedMember (IMember importedMember, ITypeDefinition derivedType)
-		{
-			IMember derivedMember;
-			if (importedMember.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
-				derivedMember = derivedType.GetMembers (null, GetMemberOptions.IgnoreInheritedMembers)
-					.FirstOrDefault (m => m.ImplementedInterfaceMembers.Any (im => im.Region == importedMember.Region));
-			}
-			else {
-				derivedMember = InheritanceHelper.GetDerivedMember (importedMember, derivedType);
-			}
-			return derivedMember;
-		}
-
-		static void ReportResult (ISearchProgressMonitor monitor, IEntity result)
-		{
-			string filename = result.Region.FileName;
-			if (string.IsNullOrEmpty (filename))
-				return;
-
-			var textFile = TextFileProvider.Instance.GetTextEditorData (filename);
-			var start = textFile.LocationToOffset (result.Region.Begin);
-			textFile.SearchRequest.SearchPattern = result.Name;
-			var sr = textFile.SearchForward (start);
-			if (sr != null)
-				start = sr.Offset;
-
-			if (textFile.Parent == null)
-				textFile.Dispose ();
-
-			monitor.ReportResult (new MemberReference (result, result.Region, start, result.Name.Length));
-		}
-
-		protected override void Run (object data)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null)
-				return;
-
-			ResolveResult resolveResult;
-			var item = CurrentRefactoryOperationsHandler.GetItem (doc, out resolveResult);
-
-			var typeDef = item as ITypeDefinition;
-			if (typeDef != null && ((typeDef.Kind == TypeKind.Class && !typeDef.IsSealed) || typeDef.Kind == TypeKind.Interface)) {
-				FindDerivedClasses (typeDef);
-				return;
-			}
-
-			var member = item as IMember;
-			var handler = new FindDerivedSymbolsHandler (member);
-			if (handler.IsValid) {
-				handler.Run ();
-				return;
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindExtensionMethodHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindExtensionMethodHandler.cs
deleted file mode 100644
index 97e5441889..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindExtensionMethodHandler.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// FindExtensionMethodHandler.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.FindInFiles;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Analysis;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.Refactoring
-{
-	class FindExtensionMethodHandler 
-	{
-		//Ide.Gui.Document doc;
-		ITypeDefinition entity;
-
-		public FindExtensionMethodHandler (Ide.Gui.Document doc, ITypeDefinition entity)
-		{
-			//this.doc = doc;
-			this.entity = entity;
-		}
-
-		public void Run ()
-		{
-			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
-				foreach (var project in IdeApp.ProjectOperations.CurrentSelectedSolution.GetAllProjects ()) {
-					var comp = TypeSystemService.GetCompilation (project); 
-					foreach (var type in comp.MainAssembly.GetAllTypeDefinitions ()) {
-						if (!type.IsStatic)
-							continue;
-						foreach (var method in type.GetMethods (m => m.IsStatic)) {
-							if (!method.IsExtensionMethod)
-								continue;
-							IType[] ifTypes;
-							var typeDef = comp.Import (entity);
-							if (typeDef == null)
-								continue;
-							if (!CSharpResolver.IsEligibleExtensionMethod (typeDef, method, true, out ifTypes))
-								continue;
-
-							var tf = TextFileProvider.Instance.GetReadOnlyTextEditorData (method.Region.FileName);
-							var start = tf.LocationToOffset (method.Region.Begin); 
-							tf.SearchRequest.SearchPattern = method.Name;
-							var sr = tf.SearchForward (start); 
-							if (sr != null)
-								start = sr.Offset;
-							monitor.ReportResult (new MemberReference (method, method.Region, start, method.Name.Length));
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesHandler.cs
deleted file mode 100644
index 8e219e7e35..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesHandler.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// 
-// FindReferencesHandler.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Threading;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.FindInFiles;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.Semantics;
-
-namespace MonoDevelop.Refactoring
-{
-	public class FindReferencesHandler : CommandHandler
-	{
-		public static void FindRefs (object obj)
-		{
-			var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true);
-			var solution = IdeApp.ProjectOperations.CurrentSelectedSolution;
-			ThreadPool.QueueUserWorkItem (delegate {
-				try {
-					foreach (var mref in ReferenceFinder.FindReferences (solution, obj, false, ReferenceFinder.RefactoryScope.Unknown, monitor)) {
-						monitor.ReportResult (mref);
-					}
-				} catch (Exception ex) {
-					if (monitor != null)
-						monitor.ReportError ("Error finding references", ex);
-					else
-						LoggingService.LogError ("Error finding references", ex);
-				} finally {
-					if (monitor != null)
-						monitor.Dispose ();
-				}
-			});
-		}
-		protected override void Run (object data)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null)
-				return;
-			ResolveResult resolveResoult;
-			object item = CurrentRefactoryOperationsHandler.GetItem (doc, out resolveResoult);
-			if (item != null)
-				FindRefs (item);
-		}
-	}
-
-	public class FindAllReferencesHandler : CommandHandler
-	{
-		public static void FindRefs (object obj)
-		{
-			var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true);
-			var solution = IdeApp.ProjectOperations.CurrentSelectedSolution;
-			ThreadPool.QueueUserWorkItem (delegate {
-				try {
-					foreach (var mref in ReferenceFinder.FindReferences (solution, obj, true, ReferenceFinder.RefactoryScope.Unknown, monitor)) {
-						monitor.ReportResult (mref);
-					}
-				} catch (Exception ex) {
-					if (monitor != null)
-						monitor.ReportError ("Error finding references", ex);
-					else
-						LoggingService.LogError ("Error finding references", ex);
-				} finally {
-					if (monitor != null)
-						monitor.Dispose ();
-				}
-			});
-		}
-		protected override void Run (object data)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null)
-				return;
-			ResolveResult resolveResoult;
-			object item = CurrentRefactoryOperationsHandler.GetItem (doc, out resolveResoult);
-			if (item != null)
-				FindRefs (item);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/GotoDeclarationHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/GotoDeclarationHandler.cs
deleted file mode 100644
index 58bb8a4dd0..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/GotoDeclarationHandler.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// 
-// GotoDeclarationHandler.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Refactoring;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-
-namespace MonoDevelop.Refactoring
-{
-	public class GotoDeclarationHandler : CommandHandler
-	{
-		protected override void Run (object data)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null)
-				return;
-
-			ResolveResult resolveResoult;
-			object item = CurrentRefactoryOperationsHandler.GetItem (doc, out resolveResoult);
-			var entity = item as INamedElement;
-			if (entity != null) {
-				IdeApp.ProjectOperations.JumpToDeclaration (entity);
-			} else {
-				var v = item as IVariable;
-				if (v != null)
-					IdeApp.ProjectOperations.JumpToDeclaration (v);
-			}
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ImportSymbolHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ImportSymbolHandler.cs
deleted file mode 100644
index 1a2960a688..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ImportSymbolHandler.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-// 
-// RefactoryCommands.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Text;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.Gui.Dialogs;
-using MonoDevelop.Ide.FindInFiles;
-using MonoDevelop.Refactoring;
-using MonoDevelop.Ide;
-using System.Linq;
-using MonoDevelop.Ide.CodeCompletion;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-
-namespace MonoDevelop.Refactoring
-{
-	class GenerateNamespaceImport
-	{
-		public bool GenerateUsing { get; set; }
-		public bool InsertNamespace { get; set; }
-	}
-	
-	class ImportSymbolCache
-	{
-		Dictionary<string, GenerateNamespaceImport> cache = new Dictionary<string, GenerateNamespaceImport> ();
-		
-		public GenerateNamespaceImport GetResult (IUnresolvedFile unit, IType type, MonoDevelop.Ide.Gui.Document doc)
-		{
-			GenerateNamespaceImport result;
-			if (cache.TryGetValue (type.Namespace, out result))
-				return result;
-			result = new GenerateNamespaceImport ();
-			cache[type.Namespace] = result;
-			TextEditorData data = doc.Editor;
-			
-			result.InsertNamespace  = false;
-			var loc = new TextLocation (data.Caret.Line, data.Caret.Column);
-			foreach (var ns in RefactoringOptions.GetUsedNamespaces (doc, loc)) {
-				if (type.Namespace == ns) {
-					result.GenerateUsing = false;
-					return result;
-				}
-			}
-			
-			result.GenerateUsing = true;
-			string name = type.Name;
-			
-			foreach (string ns in RefactoringOptions.GetUsedNamespaces (doc, loc)) {
-				if (doc.Compilation.MainAssembly.GetTypeDefinition (ns, name, type.TypeParameterCount) != null) {
-					result.GenerateUsing = false;
-					result.InsertNamespace = true;
-					return result;
-				}
-			}
-			return result;
-		}
-	}
-		
-	class ImportSymbolCompletionData : CompletionData
-	{
-		IType type;
-		Ambience ambience;
-		ParsedDocument unit;
-		MonoDevelop.Ide.Gui.Document doc;
-		ImportSymbolCache cache;
-		
-		public IType Type {
-			get { return this.type; }
-		}
-		
-		public ImportSymbolCompletionData (MonoDevelop.Ide.Gui.Document doc, ImportSymbolCache cache, IType type)
-		{
-			this.doc = doc;
-			this.cache = cache;
-//			this.data = doc.Editor;
-			this.ambience = AmbienceService.GetAmbience (doc.Editor.MimeType);
-			this.type = type;
-			this.unit = doc.ParsedDocument;
-			this.DisplayFlags |= ICSharpCode.NRefactory.Completion.DisplayFlags.IsImportCompletion;
-		}
-		
-		bool initialized = false;
-		bool generateUsing, insertNamespace;
-		
-		void Initialize ()
-		{
-			if (initialized)
-				return;
-			initialized = true;
-			if (string.IsNullOrEmpty (type.Namespace)) 
-				return;
-			var result = cache.GetResult (unit.ParsedFile, type, doc);
-			generateUsing = result.GenerateUsing;
-			insertNamespace = result.InsertNamespace;
-		}
-		
-		#region IActionCompletionData implementation
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
-		{
-			Initialize ();
-			using (var undo = doc.Editor.OpenUndoGroup ()) {
-				string text = insertNamespace ? type.Namespace + "." + type.Name : type.Name;
-				if (text != GetCurrentWord (window)) {
-					if (window.WasShiftPressed && generateUsing) 
-						text = type.Namespace + "." + text;
-					window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, GetCurrentWord (window), text);
-				}
-				
-				if (!window.WasShiftPressed && generateUsing) {
-					var generator = CodeGenerator.CreateGenerator (doc);
-					if (generator != null) {
-						generator.AddGlobalNamespaceImport (doc, type.Namespace);
-						// reparse
-						doc.UpdateParseDocument ();
-					}
-				}
-			}
-			ka |= KeyActions.Ignore;
-		}
-		#endregion
-		
-		#region ICompletionData implementation
-		public override IconId Icon {
-			get {
-				return type.GetStockIcon ();
-			}
-		}
-		string displayText = null;
-		public override string DisplayText {
-			get {
-				if (displayText == null)
-					displayText = ambience.GetString (type, OutputFlags.IncludeGenerics);
-				return displayText;
-			}
-		}
-		
-		static string GetDefaultDisplaySelection (string description, bool isSelected)
-		{
-			if (!isSelected)
-				return "<span foreground=\"darkgray\">" + description + "</span>";
-			return description;
-		}
-
-		string displayDescription = null;
-		public override string GetDisplayDescription (bool isSelected)
-		{
-			if (displayDescription == null) {
-				Initialize ();
-				if (generateUsing || insertNamespace) {
-					displayDescription = string.Format (GettextCatalog.GetString ("(from '{0}')"), type.Namespace);
-				} else {
-					displayDescription = "";
-				}
-			}
-			return GetDefaultDisplaySelection (displayDescription, isSelected);
-		}
-
-		
-		public override string Description {
-			get {
-				Initialize ();
-				if (generateUsing)
-					return string.Format (GettextCatalog.GetString ("Add namespace import '{0}'"), type.Namespace);
-				return null;
-			}
-		}
-		
-		public override string CompletionText {
-			get {
-				return type.Name;
-			}
-		}
-		#endregion
-	}
-	
-	public class ImportSymbolHandler: CommandHandler
-	{	
-		protected override void Run ()
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null)
-				return;
-			ITextEditorExtension ext = doc.EditorExtension;
-			while (ext != null && !(ext is CompletionTextEditorExtension))
-				ext = ext.Next;
-			if (ext == null)
-				return;
-		
-			var dom = doc.Compilation;
-			ImportSymbolCache cache = new ImportSymbolCache ();
-			var lookup = new MemberLookup (null, doc.Compilation.MainAssembly);
-
-			List<ImportSymbolCompletionData> typeList = new List<ImportSymbolCompletionData> ();
-			foreach (var type in dom.GetTopLevelTypeDefinitons ()) {
-				if (!lookup.IsAccessible (type, false))
-					continue;
-				typeList.Add (new ImportSymbolCompletionData (doc, cache, type));
-			}
-			
-			typeList.Sort (delegate (ImportSymbolCompletionData left, ImportSymbolCompletionData right) {
-				return left.Type.Name.CompareTo (right.Type.Name);
-			});
-			
-			
-			CompletionDataList completionList = new CompletionDataList ();
-			completionList.IsSorted = true;
-			typeList.ForEach (cd => completionList.Add (cd));
-			
-			((CompletionTextEditorExtension)ext).ShowCompletion (completionList);
-		}
-	}
-}
-
-/*
-// 
-// RefactoryCommands.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Text;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.Gui.Dialogs;
-using MonoDevelop.Ide.FindInFiles;
-using MonoDevelop.Refactoring;
-using MonoDevelop.Ide;
-using System.Linq;
-using MonoDevelop.Ide.CodeCompletion;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.Refactoring
-{
-	class GenerateNamespaceImport
-	{
-		public bool GenerateUsing { get; set; }
-		public bool InsertNamespace { get; set; }
-	}
-	
-	class ImportSymbolCache
-	{
-		Dictionary<string, GenerateNamespaceImport> cache = new Dictionary<string, GenerateNamespaceImport> ();
-		
-		public GenerateNamespaceImport GetResult (IUnresolvedFile unit, string typeNamespace, string typeName, MonoDevelop.Ide.Gui.Document doc)
-		{
-			GenerateNamespaceImport result;
-			if (cache.TryGetValue (typeNamespace, out result))
-				return result;
-			result = new GenerateNamespaceImport ();
-			cache[typeNamespace] = result;
-			TextEditorData data = doc.Editor;
-			
-			result.InsertNamespace  = false;
-			var loc = new TextLocation (data.Caret.Line, data.Caret.Column);
-			foreach (var ns in RefactoringOptions.GetUsedNamespaces (doc, loc)) {
-				if (typeNamespace == ns) {
-					result.GenerateUsing = false;
-					return result;
-				}
-			}
-			
-			result.GenerateUsing = true;
-			string name = typeName;
-			
-			foreach (string ns in RefactoringOptions.GetUsedNamespaces (doc, loc)) {
-				if (doc.Compilation.MainAssembly.GetTypeDefinition (ns, name, 0) != null) {
-					result.GenerateUsing = false;
-					result.InsertNamespace = true;
-					return result;
-				}
-			}
-			return result;
-		}
-	}
-		
-	class ImportSymbolCompletionData : CompletionData
-	{
-		internal readonly string typeName;
-		ParsedDocument unit;
-		MonoDevelop.Ide.Gui.Document doc;
-		ImportSymbolCache cache;
-		TypeKind kind;
-		Lazy<FrameworkLookup.AssemblyLookup> lookup;
-		MonoDevelop.Projects.ProjectReference reference;
-		public ImportSymbolCompletionData (MonoDevelop.Ide.Gui.Document doc, ImportSymbolCache cache, string typeName, TypeKind kind, Lazy<FrameworkLookup.AssemblyLookup> lookup, MonoDevelop.Projects.ProjectReference reference)
-		{
-			this.doc = doc;
-			this.cache = cache;
-			this.unit = doc.ParsedDocument;
-			this.kind = kind;
-			this.typeName = typeName;
-			this.lookup = lookup;
-			this.reference = reference;
-		}
-		
-		bool initialized = false;
-		bool generateReference;
-		bool generateUsing;
-		bool insertNamespace;
-		
-		void Initialize ()
-		{
-			if (initialized)
-				return;
-			initialized = true;
-			var netProject = (DotNetProject)doc.Project;
-			generateReference = true;
-			foreach (var r in netProject.References) {
-				if (r.Equals (reference)) {
-					generateReference = false;
-					break;
-				}
-			}
-			var result = cache.GetResult (unit.ParsedFile, lookup.Value.Namespace, typeName, doc);
-			generateUsing = result.GenerateUsing;
-			insertNamespace = result.InsertNamespace;
-		}
-		
-		#region IActionCompletionData implementation
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
-		{
-			Initialize ();
-			string text = insertNamespace ? lookup.Value.Namespace + "." + typeName : typeName;
-			if (text != GetCurrentWord (window)) {
-				if (window.WasShiftPressed && generateReference) 
-					text = lookup.Value.Namespace + "." + text;
-				window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, GetCurrentWord (window), text);
-			}
-
-			if (generateReference) {
-				var project = doc.Project;
-				project.Items.Add (reference);
-				IdeApp.ProjectOperations.Save (project);
-			}
-
-			if (!window.WasShiftPressed && generateUsing) {
-				var generator = CodeGenerator.CreateGenerator (doc);
-				if (generator != null) {
-					generator.AddGlobalNamespaceImport (doc, lookup.Value.Namespace);
-					// reparse
-					doc.UpdateParseDocument ();
-				}
-			}
-		}
-		#endregion
-		
-		#region ICompletionData implementation
-		public override IconId Icon {
-			get {
-				switch (kind) {
-				case TypeKind.Delegate:
-					return MonoDevelop.Ide.Gui.Stock.Delegate;
-				case TypeKind.Struct:
-					return MonoDevelop.Ide.Gui.Stock.Struct;
-				case TypeKind.Interface:
-					return MonoDevelop.Ide.Gui.Stock.Interface;
-				case TypeKind.Enum:
-					return MonoDevelop.Ide.Gui.Stock.Enum;
-				default:
-					return MonoDevelop.Ide.Gui.Stock.Class;
-				}
-			}
-		}
-
-		public override string DisplayText {
-			get {
-				return typeName;
-			}
-		}
-		
-		string displayDescription = null;
-		public override string DisplayDescription {
-			get {
-				if (displayDescription == null) {
-					Initialize ();
-					if (generateReference) {
-						displayDescription = string.Format (GettextCatalog.GetString ("(reference '{0}')"), reference.Reference);
-					} else if (generateUsing) {
-						displayDescription = string.Format (GettextCatalog.GetString ("(from '{0}')"), lookup.Value.Namespace);
-					} else {
-						displayDescription = "";
-					}
-				}
-				return displayDescription;
-			}
-		}
-		
-		public override string Description {
-			get {
-				return DisplayDescription;
-			}
-		}
-		
-		public override string CompletionText {
-			get {
-				return typeName;
-			}
-		}
-		#endregion
-	}
-	
-	public class ImportSymbolHandler: CommandHandler
-	{	
-		protected override void Run ()
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null)
-				return;
-			ITextEditorExtension ext = doc.EditorExtension;
-			while (ext != null && !(ext is CompletionTextEditorExtension))
-				ext = ext.Next;
-			if (ext == null)
-				return;
-
-			var dom = doc.Compilation;
-			ImportSymbolCache cache = new ImportSymbolCache ();
-			List<ImportSymbolCompletionData> typeList = new List<ImportSymbolCompletionData> ();
-			Dictionary<string, MonoDevelop.Projects.ProjectReference> referenceCache = new Dictionary<string, MonoDevelop.Projects.ProjectReference> ();
-			var netProject = (DotNetProject)doc.Project;
-			foreach (var type in TypeSystemService.GetFrameworkLookup (netProject).GetAllTypes ()) {
-				var r = type.Item3.Value;
-				MonoDevelop.Projects.ProjectReference reference;
-				if (!referenceCache.TryGetValue (r.FullName, out reference)) {
-					var systemAssembly = netProject.AssemblyContext.GetAssemblyFromFullName (r.FullName, r.Package, netProject.TargetFramework);
-					if (systemAssembly == null) {
-						reference = null;
-					} else {
-						reference = new MonoDevelop.Projects.ProjectReference (systemAssembly);
-					}
-					referenceCache [r.FullName] = reference;
-				}
-				if (reference == null)
-					continue;
-				typeList.Add (new ImportSymbolCompletionData (doc, cache, type.Item2, type.Item1, type.Item3, reference));
-			}
-
-			typeList.Sort (delegate (ImportSymbolCompletionData left, ImportSymbolCompletionData right) {
-				return left.typeName.CompareTo (right.typeName);
-			});
-
-			
-			var completionList = new CompletionDataList ();
-			completionList.IsSorted = true;
-
-			typeList.ForEach (cd => completionList.Add (cd));
-
-			((CompletionTextEditorExtension)ext).ShowCompletion (completionList);
-		}
-	}
-}
- * */
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/InsertionPointService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/InsertionPointService.cs
new file mode 100644
index 0000000000..04409ab3af
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/InsertionPointService.cs
@@ -0,0 +1,253 @@
+//
+// InsertionPointService.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.Refactoring
+{
+	public static class InsertionPointService
+	{
+		public static List<InsertionPoint> GetInsertionPoints (IReadonlyTextDocument data, ParsedDocument parsedDocument, ITypeSymbol type, Location part)
+		{
+			if (data == null)
+				throw new ArgumentNullException (nameof (data));
+			if (parsedDocument == null)
+				throw new ArgumentNullException (nameof (parsedDocument));
+			if (type == null)
+				throw new ArgumentNullException (nameof (type));
+			if (!type.IsDefinedInSource ())
+				throw new ArgumentException ("The given type needs to be defined in source code.", nameof (type));
+
+			// update type from parsed document, since this is always newer.
+			//type = parsedDocument.GetInnermostTypeDefinition (type.GetLocation ()) ?? type;
+			List<InsertionPoint> result = new List<InsertionPoint> ();
+			int offset = part.SourceSpan.Start;
+			if (offset < 0)
+				return result;
+			while (offset < data.Length && data.GetCharAt (offset) != '{') {
+				offset++;
+			}
+			var realStartLocation = data.OffsetToLocation (offset);
+
+			result.Add (GetInsertionPosition (data, realStartLocation.Line, realStartLocation.Column));
+			result [0].LineBefore = NewLineInsertion.None;
+
+			var declaringType = type.DeclaringSyntaxReferences.FirstOrDefault (dsr => dsr.SyntaxTree.FilePath == part.SourceTree.FilePath && dsr.Span.Contains (part.SourceSpan));
+			if (declaringType == null)
+				return result;
+			foreach (var member in type.GetMembers ()) {
+				if (member.IsImplicitlyDeclared || !member.IsDefinedInSource())
+					continue;
+				

+				//var domLocation = member.BodyRegion.End;
+				foreach (var loc in member.DeclaringSyntaxReferences) {
+					if (loc.SyntaxTree.FilePath != part.SourceTree.FilePath || !declaringType.Span.Contains (part.SourceSpan))
+						continue;
+					var domLocation = data.OffsetToLocation (loc.Span.End);
+
+					if (domLocation.Line <= 0) {
+						var lineSegment = data.GetLineByOffset (loc.Span.Start);
+						if (lineSegment == null)
+							continue;
+						domLocation = new DocumentLocation (lineSegment.LineNumber, lineSegment.Length + 1);
+					}
+					result.Add (GetInsertionPosition (data, domLocation.Line, domLocation.Column));
+					break;
+				}
+			}
+
+			result [result.Count - 1].LineAfter = NewLineInsertion.None;
+			CheckStartPoint (data, result [0], result.Count == 1);
+			if (result.Count > 1) {
+				result.RemoveAt (result.Count - 1); 
+				NewLineInsertion insertLine;
+				var typeSyntaxReference = type.DeclaringSyntaxReferences.FirstOrDefault (r => r.Span.Contains (part.SourceSpan));
+
+				var lineBefore = data.GetLineByOffset (typeSyntaxReference.Span.End).PreviousLine;
+				if (lineBefore != null && lineBefore.Length == lineBefore.GetIndentation (data).Length) {
+					insertLine = NewLineInsertion.None;
+				} else {
+					insertLine = NewLineInsertion.Eol;
+				}
+				// search for line start
+				var line = data.GetLineByOffset (typeSyntaxReference.Span.End);
+				int col = typeSyntaxReference.Span.End - line.Offset;
+				if (line != null) {
+					var lineOffset = line.Offset;
+					col = Math.Min (line.Length, col);
+					while (lineOffset + col - 2 >= 0 && col > 1 && char.IsWhiteSpace (data.GetCharAt (lineOffset + col - 2)))
+						col--;
+				}
+				Console.WriteLine ("add 1");
+				result.Add (new InsertionPoint (new DocumentLocation (line.LineNumber, col), insertLine, NewLineInsertion.Eol));
+				CheckEndPoint (data, result [result.Count - 1], result.Count == 1);
+			}
+
+//			foreach (var region in parsedDocument.UserRegions.Where (r => type.BodyRegion.IsInside (r.Region.Begin))) {
+//				result.Add (new InsertionPoint (new DocumentLocation (region.Region.BeginLine + 1, 1), NewLineInsertion.Eol, NewLineInsertion.Eol));
+//				result.Add (new InsertionPoint (new DocumentLocation (region.Region.EndLine, 1), NewLineInsertion.Eol, NewLineInsertion.Eol));
+//				result.Add (new InsertionPoint (new DocumentLocation (region.Region.EndLine + 1, 1), NewLineInsertion.Eol, NewLineInsertion.Eol));
+//			}
+			result.Sort ((left, right) => left.Location.CompareTo (right.Location));
+			//			foreach (var res in result)
+			//				Console.WriteLine (res);
+			return result;
+		}
+
+		static void CheckEndPoint (IReadonlyTextDocument doc, InsertionPoint point, bool isStartPoint)
+		{
+			var line = doc.GetLine (point.Location.Line);
+			if (line == null)
+				return;
+
+			if (doc.GetLineIndent (line).Length + 1 < point.Location.Column)
+				point.LineBefore = NewLineInsertion.BlankLine;
+			if (point.Location.Column < line.Length + 1)
+				point.LineAfter = NewLineInsertion.Eol;
+		}
+
+		static void CheckStartPoint (IReadonlyTextDocument doc, InsertionPoint point, bool isEndPoint)
+		{
+			var line = doc.GetLine (point.Location.Line);
+			if (line == null)
+				return;
+			if (doc.GetLineIndent (line).Length + 1 == point.Location.Column) {
+				int lineNr = point.Location.Line;
+				while (lineNr > 1 && doc.GetLineIndent (lineNr - 1).Length == doc.GetLine (lineNr - 1).Length) {
+					lineNr--;
+				}
+				line = doc.GetLine (lineNr);
+				point.Location = new DocumentLocation (lineNr, doc.GetLineIndent (line).Length + 1);
+			}
+
+			if (doc.GetLineIndent (line).Length + 1 < point.Location.Column)
+				point.LineBefore = NewLineInsertion.Eol;
+			if (point.Location.Column < line.Length + 1)
+				point.LineAfter = isEndPoint ? NewLineInsertion.Eol : NewLineInsertion.BlankLine;
+		}
+
+		static InsertionPoint GetInsertionPosition (IReadonlyTextDocument doc, int line, int column)
+		{
+			int bodyEndOffset = doc.LocationToOffset (line, column) + 1;
+			var curLine = doc.GetLine (line);
+			if (curLine != null) {
+				if (bodyEndOffset < curLine.Offset + curLine.Length) {
+					// case1: positition is somewhere inside the start line
+					return new InsertionPoint (new DocumentLocation (line, column + 1), NewLineInsertion.Eol, NewLineInsertion.BlankLine);
+				}
+			}
+
+			// -> if position is at line end check next line
+			var nextLine = doc.GetLine (line + 1);
+			if (nextLine == null) // check for 1 line case.
+				return new InsertionPoint (new DocumentLocation (line, column + 1), NewLineInsertion.BlankLine, NewLineInsertion.BlankLine);
+
+			for (int i = nextLine.Offset; i < nextLine.EndOffset; i++) {
+				char ch = doc.GetCharAt (i);
+				if (!char.IsWhiteSpace (ch)) {
+					// case2: next line contains non ws chars.
+					return new InsertionPoint (new DocumentLocation (line + 1, 1), NewLineInsertion.Eol, NewLineInsertion.BlankLine);
+				}
+			}
+
+			var nextLine2 = doc.GetLine (line + 2);
+			if (nextLine2 != null) {
+				for (int i = nextLine2.Offset; i < nextLine2.EndOffset; i++) {
+					char ch = doc.GetCharAt (i);
+					if (!char.IsWhiteSpace (ch)) {
+						// case3: one blank line
+						return new InsertionPoint (new DocumentLocation (line + 1, 1), NewLineInsertion.Eol, NewLineInsertion.Eol);
+					}
+				}
+			}
+			// case4: more than 1 blank line
+			return new InsertionPoint (new DocumentLocation (line + 1, 1), NewLineInsertion.Eol, NewLineInsertion.None);
+		}
+
+		internal static InsertionPoint GetSuitableInsertionPoint (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part, SyntaxNode member)
+		{
+			switch (member.Kind ()) {
+			case SyntaxKind.FieldDeclaration:
+				return GetNewFieldPosition (data, points, cls, part);
+			case SyntaxKind.MethodDeclaration:
+			case SyntaxKind.ConstructorDeclaration:
+			case SyntaxKind.DestructorDeclaration:
+			case SyntaxKind.OperatorDeclaration:
+				return GetNewMethodPosition (data, points, cls, part);
+			case SyntaxKind.EventDeclaration:
+				return GetNewEventPosition (data, points, cls, part);
+			case SyntaxKind.PropertyDeclaration:
+				return GetNewPropertyPosition (data, points, cls, part);
+			}
+			throw new InvalidOperationException ("Invalid member type: " + member.Kind ());
+		}
+
+		static InsertionPoint GetNewFieldPosition (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part)
+		{
+			if (!cls.GetMembers ().OfType<IFieldSymbol> ().Any ()) 
+				return points.FirstOrDefault ();
+			var lastField = cls.GetMembers ().OfType<IFieldSymbol> ().Last ();
+			var begin = data.OffsetToLocation (lastField.Locations.First ().SourceSpan.Start);
+			return points.FirstOrDefault (p => p.Location > begin);
+		}
+
+		static InsertionPoint GetNewMethodPosition (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part)
+		{
+			if (!cls.GetMembers ().OfType<IMethodSymbol> ().Any ()) 
+				return GetNewPropertyPosition (data, points, cls, part);
+			var lastMethod = cls.GetMembers ().OfType<IMethodSymbol> ().Last ();
+			var begin = data.OffsetToLocation (lastMethod.Locations.First ().SourceSpan.Start);
+			return points.FirstOrDefault (p => p.Location > begin);
+		}
+
+		static InsertionPoint GetNewPropertyPosition (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part)
+		{
+			if (!cls.GetMembers ().OfType<IPropertySymbol> ().Any ()) 
+				return GetNewFieldPosition (data, points, cls, part);
+			var lastProperty = cls.GetMembers ().OfType<IPropertySymbol> ().Last ();
+			var begin = data.OffsetToLocation (lastProperty.Locations.First ().SourceSpan.Start);
+			return points.FirstOrDefault (p => p.Location > begin);
+		}
+
+		static InsertionPoint GetNewEventPosition (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part)
+		{
+			if (!cls.GetMembers ().OfType<IEventSymbol> ().Any ()) 
+				return GetNewMethodPosition (data, points, cls, part);
+			var lastEvent = cls.GetMembers ().OfType<IEventSymbol> ().Last ();
+			var begin = data.OffsetToLocation (lastEvent.Locations.First ().SourceSpan.Start);
+			return points.FirstOrDefault (p => p.Location > begin);
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/OverridesImplementsDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/OverridesImplementsDialog.cs
deleted file mode 100644
index bc8541afc5..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/OverridesImplementsDialog.cs
+++ /dev/null
@@ -1,400 +0,0 @@
-// OverridesImplementsDialog.cs
-//
-//Author:
-//    Ankit Jain  <jankit@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using System.Collections.Generic;
-
-using Gtk;
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects.CodeGeneration;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Output;
-using Ambience_ = MonoDevelop.Projects.Dom.Output.Ambience;
-using MonoDevelop.Ide;
-using System.Text;
-using Mono.TextEditor;
-using Mono.TextEditor.PopupWindow;
-
-
-namespace MonoDevelop.Refactoring
-{
-	partial class OverridesImplementsDialog : Gtk.Dialog
-	{
-		IType cls;
-		TreeStore store;
-		CodeRefactorer refactorer;
-		Ambience ambience;
-		MonoDevelop.Ide.Gui.Document editor;
-		
-		private const int colCheckedIndex = 0;
-		private const int colIconIndex = 1;
-		private const int colNameIndex = 2;
-		private const int colExplicitIndex = 3;
-		private const int colItemIndex = 4;
-
-/*		private const OutputFlags default_conversion_flags =
-			OutputFlags.ShowParameterNames |
-			OutputFlags.ShowGenericParameters |
-			OutputFlags.ShowReturnType |
-			OutputFlags.ShowParameters |
-			OutputFlags.UseIntrinsicTypeNames;*/
-		private const OutputFlags default_conversion_flags =
-			OutputFlags.IncludeParameters |
-			OutputFlags.IncludeParameterName |
-			OutputFlags.IncludeReturnType;
-
-		public OverridesImplementsDialog (MonoDevelop.Ide.Gui.Document editor, IType cls)
-		{
-			this.Build();
-			this.editor = editor;
-			this.cls = cls;
-
-			// FIXME: title
-			Title = GettextCatalog.GetString ("Override and/or implement members");
-
-			store = new TreeStore (typeof (bool), typeof (Gdk.Pixbuf), typeof (string), typeof (bool), typeof (IMember));
-
-			// Column #1
-			TreeViewColumn nameCol = new TreeViewColumn ();
-			nameCol.Title = GettextCatalog.GetString ("Name");
-			nameCol.Expand = true;
-			nameCol.Resizable = true;
-
-			CellRendererToggle cbRenderer = new CellRendererToggle ();
-			cbRenderer.Activatable = true;
-			cbRenderer.Toggled += OnSelectToggled;
-			nameCol.PackStart (cbRenderer, false);
-			nameCol.AddAttribute (cbRenderer, "active", colCheckedIndex);
-
-			CellRendererPixbuf iconRenderer = new CellRendererPixbuf ();
-			nameCol.PackStart (iconRenderer, false);
-			nameCol.AddAttribute (iconRenderer, "pixbuf", colIconIndex);
-
-			CellRendererText nameRenderer = new CellRendererText ();
-			nameRenderer.Ellipsize = Pango.EllipsizeMode.End;
-			nameCol.PackStart (nameRenderer, true);
-			nameCol.AddAttribute (nameRenderer, "text", colNameIndex);
-
-			treeview.AppendColumn (nameCol);
-
-			// Column #2
-			CellRendererToggle explicitRenderer = new CellRendererToggle ();
-			explicitRenderer.Activatable = true;
-			explicitRenderer.Xalign = 0.0f;
-			explicitRenderer.Toggled += OnExplicitToggled;
-			TreeViewColumn explicitCol = new TreeViewColumn ();
-			explicitCol.Title = GettextCatalog.GetString ("Explicit");
-			explicitCol.PackStart (explicitRenderer, true);
-			explicitCol.SetCellDataFunc (explicitRenderer, new TreeCellDataFunc (RenderExplicitCheckbox));
-			explicitCol.AddAttribute (explicitRenderer, "active", colExplicitIndex);
-			treeview.AppendColumn (explicitCol);
-
-			store.SetSortColumnId (colNameIndex, SortType.Ascending);
-			treeview.Model = store;
-
-			buttonCancel.Clicked += OnCancelClicked;
-			buttonOk.Clicked += OnOKClicked;
-			buttonSelectAll.Clicked += delegate { SelectAll (true); };
-			buttonUnselectAll.Clicked += delegate { SelectAll (false); };
-
-			refactorer = IdeApp.Workspace.GetCodeRefactorer (IdeApp.ProjectOperations.CurrentSelectedSolution);
-			ambience = AmbienceService.GetAmbienceForFile (cls.GetDefinition ().Region.FileName);
-			PopulateTreeView ();
-			UpdateOKButton ();
-		}
-
-		void PopulateTreeView ()
-		{
-			List<IMember> class_members = new List<IMember> ();
-			List<IMember> interface_members = new List<IMember> ();
-
-			refactorer.FindOverridables (cls, class_members, interface_members, false, true);
-
-			Dictionary<string, TreeIter> iter_cache = new Dictionary<string,TreeIter> ();
-			PopulateTreeView (class_members, iter_cache,
-					ImageService.GetPixbuf (MonoDevelop.Ide.Gui.Stock.Class, IconSize.Menu));
-			PopulateTreeView (interface_members, iter_cache,
-					ImageService.GetPixbuf (MonoDevelop.Ide.Gui.Stock.Interface, IconSize.Menu));
-		}
-
-		void PopulateTreeView (List<IMember> members, Dictionary<string, TreeIter> iter_cache, Gdk.Pixbuf parent_icon)
-		{
-			foreach (IMember member in members) {
-				TreeIter iter;
-				if (!iter_cache.TryGetValue (member.DeclaringType.FullName, out iter)) {
-					iter = store.AppendValues (false, parent_icon,
-			                                   GetDescriptionString (member.DeclaringType), false, member.DeclaringType);
-					iter_cache [member.DeclaringType.FullName] = iter;
-				}
-
-				store.AppendValues (iter, false,
-				                    ImageService.GetPixbuf (member.StockIcon, IconSize.Menu),
-				                    GetDescriptionString (member), false, member);
-			}
-		}
-
-#region Event handlers
-		void RenderExplicitCheckbox (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
-		{
-			CellRendererToggle cellToggle = (CellRendererToggle) cell;
-			IMember item = (IMember) store.GetValue (iter, colItemIndex);
-			bool parent_is_class = false;
-
-			// Don't show 'explicit' checkbox for Class/interface rows or class methods
-			TreeIter parentIter;
-			if (item is IMember && store.IterParent (out parentIter, iter)) {
-				IType parentClass = store.GetValue (parentIter, colItemIndex) as IType;
-				if (parentClass != null && parentClass.ClassType != ClassType.Interface)
-					parent_is_class = true;
-			}
-
-			if (parent_is_class || item is IType) {
-				cellToggle.Visible = false;
-			} else {
-				cellToggle.Visible = true;
-				cellToggle.Active = GetExplicit (iter);
-			}
-		}
-
-		void OnSelectToggled (object o, ToggledArgs args)
-		{
-			TreeIter iter;
-			if (!store.GetIterFromString (out iter, args.Path))
-				return;
-
-			bool old_value = GetChecked (iter);
-			store.SetValue (iter, colCheckedIndex, !old_value);
-
-			TreeIter parent;
-			if (store.IterParent (out parent, iter)) {
-				// Member(method/property/etc) row clicked
-				// Set the parent's 'checked' state according to the children's state
-				bool all_children_checked = true;
-				foreach (TreeIter child in GetAllNodes (parent, false)) {
-					if (!GetChecked (child)) {
-						all_children_checked = false;
-						break;
-					}
-				}
-
-				store.SetValue (parent, colCheckedIndex, all_children_checked);
-			} else {
-				// Mark children's state to match parent's checked state
-				foreach (TreeIter child in GetAllNodes (iter, false))
-					store.SetValue (child, colCheckedIndex, !old_value);
-			}
-			UpdateOKButton ();
-		}
-
-		void OnExplicitToggled (object o, ToggledArgs args)
-		{
-			TreeIter iter;
-			if (!store.GetIterFromString (out iter, args.Path))
-				return;
-
-			store.SetValue (iter, colExplicitIndex, !GetExplicit (iter));
-		}
-
-		void OnCancelClicked (object sender, EventArgs e)
-		{
-			((Widget) this).Destroy ();
-		}
-
-		void UpdateOKButton ()
-		{
-			bool atleast_one_checked = false;
-			foreach (TreeIter iter in GetAllNodes (TreeIter.Zero, true)) {
-				if (GetChecked (iter)) {
-					atleast_one_checked = true;
-					break;
-				}
-			}
-			buttonOk.Sensitive = atleast_one_checked;
-		}
-
-		void OnOKClicked (object sender, EventArgs e)
-		{
-			try {
-				StringBuilder code = new StringBuilder ();
-				CodeGenerator generator =  CodeGenerator.CreateGenerator (editor.Editor.Document.MimeType, editor.Editor.TabsToSpaces, editor.Editor.Options.TabSize, editor.Editor.EolMarker);
-				IType declaringType = editor.GetType (cls.Location.Line, cls.Location.Column) ?? cls;
-
-				foreach (KeyValuePair<IType, IEnumerable<TreeIter>> kvp in GetAllClasses ()) {
-					if (code.Length > 0) {
-						code.AppendLine ();
-						code.AppendLine ();
-					}
-				
-					//update the target class so that new members don't get inserted in weird locations
-					StringBuilder curImpl = new StringBuilder ();
-					foreach (var pair in YieldImpls (kvp)) {
-						if (curImpl.Length > 0) {
-							curImpl.AppendLine ();
-							curImpl.AppendLine ();
-						}
-						curImpl.Append (generator.CreateMemberImplementation (declaringType, pair.Key, pair.Value != null).Code);
-					}
-					if (kvp.Key.ClassType == ClassType.Interface) {
-						code.Append (generator.WrapInRegions (kvp.Key.Name + " implementation", curImpl.ToString ()));
-					} else {
-						code.Append (curImpl.ToString ());
-					}
-				}
-				
-				var mode = new InsertionCursorEditMode (editor.Editor.Parent, CodeGenerationService.GetInsertionPoints (editor, this.cls));
-				var helpWindow = new ModeHelpWindow ();
-				helpWindow.Shown += (s, a) => DesktopService.RemoveWindowShadow (helpWindow);
-				helpWindow.TransientFor = IdeApp.Workbench.RootWindow;
-				helpWindow.TitleText = GettextCatalog.GetString ("<b>Override -- Targeting</b>");
-				helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Key</b>"), GettextCatalog.GetString ("<b>Behavior</b>")));
-				helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Up</b>"), GettextCatalog.GetString ("Move to <b>previous</b> target point.")));
-				helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Down</b>"), GettextCatalog.GetString ("Move to <b>next</b> target point.")));
-				helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Enter</b>"), GettextCatalog.GetString ("<b>Declare overrides</b> at target point.")));
-				helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Esc</b>"), GettextCatalog.GetString ("<b>Cancel</b> this refactoring.")));
-				mode.HelpWindow = helpWindow;
-				mode.CurIndex = mode.InsertionPoints.Count - 1;
-				mode.StartMode ();
-				mode.Exited += delegate(object s, InsertionCursorEventArgs args) {
-					if (args.Success)
-						args.InsertionPoint.Insert (editor.Editor, code.ToString ());
-				};
-				
-			} finally {
-				((Widget) this).Destroy ();
-			}
-		}
-#endregion
-
-#region Helper methods
-		
-		IEnumerable<KeyValuePair<IType, IEnumerable<TreeIter>>> GetAllClasses ()
-		{
-			TreeIter iter;
-			if (!store.GetIterFirst (out iter))
-				yield break;
-			do {
-				TreeIter firstMember;
-				if (store.IterChildren (out firstMember, iter)) {
-					List<TreeIter> children = new List<TreeIter> (GetCheckedSiblings (firstMember));
-					if (children.Count > 0)
-						yield return new KeyValuePair<IType, IEnumerable<TreeIter>> (
-							(IType) store.GetValue (iter, colItemIndex),
-							children);
-				}
-			} while (store.IterNext (ref iter));
-		}
-		
-		IEnumerable<TreeIter> GetCheckedSiblings (TreeIter firstMember)
-		{
-			TreeIter iter = firstMember;
-			do {
-				if (GetChecked (iter)) {
-					yield return iter;
-				}
-			} while (store.IterNext (ref iter));
-		}
-		
-		IEnumerable<KeyValuePair<IMember, IReturnType>> YieldImpls (KeyValuePair<IType, IEnumerable<TreeIter>> kvp)
-		{
-			bool is_interface = kvp.Key.ClassType == ClassType.Interface;
-			IReturnType privateImplementationType = new DomReturnType (kvp.Key.FullName);
-			foreach (TreeIter memberIter in kvp.Value) {
-				yield return new KeyValuePair<IMember, IReturnType> (
-					GetIMember (memberIter),
-					(is_interface && GetExplicit (memberIter)) ? privateImplementationType : null);
-			}
-		}
-		
-		void SelectAll (bool select)
-		{
-			foreach (TreeIter iter in GetAllNodes (TreeIter.Zero, true))
-				store.SetValue (iter, colCheckedIndex, select);
-			UpdateOKButton ();
-		}
-
-		bool GetChecked (TreeIter iter)
-		{
-			return (bool) store.GetValue (iter, colCheckedIndex);
-		}
-		
-		IMember GetIMember (TreeIter iter)
-		{
-			return (IMember) store.GetValue (iter, colItemIndex);
-		}
-
-		bool GetExplicit (TreeIter iter)
-		{
-			return (bool) store.GetValue (iter, colExplicitIndex);
-		}
-
-		IEnumerable<TreeIter> GetAllNodes (TreeIter parent, bool iter_children)
-		{
-			TreeIter child;
-			if (parent.Equals (TreeIter.Zero)) {
-				if (!store.IterChildren (out child))
-					yield break;
-			} else if (!store.IterChildren (out child, parent)) {
-				yield break;
-			}
-
-			do {
-				yield return child;
-				if (iter_children && store.IterHasChild (child)) {
-					TreeIter iter;
-					if (store.IterChildren (out iter, child)) {
-						do {
-							yield return iter;
-						} while (store.IterNext (ref iter));
-					}
-				}
-			} while (store.IterNext (ref child));
-		}
-
-		string GetDescriptionString (IType klass)
-		{
-			return String.Format ("{0} ({1})", ambience.GetString (klass, default_conversion_flags), klass.Namespace);
-		}
-
-		string GetDescriptionString (IMember member)
-		{
-			string sig = null;
-			OutputFlags flags = default_conversion_flags & ~OutputFlags.IncludeReturnType;
-
-			sig = ambience.GetString (member, flags);
-
-			if (sig == null)
-				throw new InvalidOperationException (String.Format ("Unsupported language member type: {0}", member.GetType ()));
-
-			return sig + " : " + ambience.GetString (member.ReturnType, default_conversion_flags);
-		}
-
-#endregion
-
-	}
-
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOperation.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOperation.cs
deleted file mode 100644
index 444970df71..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOperation.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// 
-// RefactoringOperation.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace MonoDevelop.Refactoring
-{
-	public abstract class RefactoringOperation
-	{
-		public string Name {
-			get;
-			set;
-		}
-		
-		public bool IsBreakingAPI {
-			get;
-			set;
-		}
-		
-		public virtual string AccelKey {
-			get {
-				return "";
-			}
-		}
-		public virtual string GetMenuDescription (RefactoringOptions options)
-		{
-			return Name;
-		}
-		
-		public virtual bool IsValid (RefactoringOptions options)
-		{
-			return true;
-		}
-		
-		public virtual List<Change> PerformChanges (RefactoringOptions options, object properties)
-		{
-			throw new System.NotImplementedException ();
-		}
-
-		public virtual void Run (RefactoringOptions options)
-		{
-			var changes = PerformChanges (options, null);
-			var monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor (Name, null);
-			RefactoringService.AcceptChanges (monitor, changes);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
index f0f9af2e6b..b1532d9e50 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
@@ -28,36 +28,32 @@ using MonoDevelop.Ide.Gui;
  
 using System.Text;
 using MonoDevelop.Projects.Text;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.TypeSystem;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
+using MonoDevelop.Ide.Editor;
 using System.Threading.Tasks;
+using System.Collections.Immutable;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.Refactoring
 {
 	public class RefactoringOptions
 	{
-		readonly Task<CSharpAstResolver> resolver;
-
-		public Document Document {
+		public TextEditor Editor {
 			get;
 			private set;
 		}
-		
-		public object SelectedItem {
+
+		public DocumentContext DocumentContext {
 			get;
-			set;
+			private set;
 		}
-		
-		public ResolveResult ResolveResult {
+
+		public object SelectedItem {
 			get;
 			set;
 		}
@@ -70,43 +66,48 @@ namespace MonoDevelop.Refactoring
 		
 		public string MimeType {
 			get {
-				return DesktopService.GetMimeTypeForUri (Document.FileName);
+				return DesktopService.GetMimeTypeForUri (DocumentContext.Name);
 			}
 		}
 		
-		public TextLocation Location {
+		public DocumentLocation Location {
 			get {
-				return new TextLocation (Document.Editor.Caret.Line, Document.Editor.Caret.Column);
+				return Editor.CaretLocation;
 			}
 		}
-		//public readonly SyntaxTree Unit;
+
 
 		public RefactoringOptions ()
 		{
 		}
 
-		public RefactoringOptions (Document doc)
+		public RefactoringOptions (MonoDevelop.Ide.Gui.Document doc) : this(doc.Editor, doc)
 		{
-			this.Document = doc;
-			if (doc != null && doc.ParsedDocument != null) {
+		}
+
+		public RefactoringOptions (TextEditor editor, DocumentContext doc)
+		{
+			this.DocumentContext = doc;
+			this.Editor = editor;
+			/*if (doc != null && doc.ParsedDocument != null) {
 				var sharedResolver = doc.GetSharedResolver ();
 				if (sharedResolver == null)
 					return;
 				resolver = sharedResolver;
 				//Unit = resolver != null ? resolver.RootNode as SyntaxTree : null;
-			}
+			}*/
 		}
 
-		public Mono.TextEditor.TextEditorData GetTextEditorData ()
+		public TextEditor GetTextEditorData ()
 		{
-			return Document.Editor;
+			return Editor;
 		}
 		
-		public static string GetWhitespaces (Document document, int insertionOffset)
+		public static string GetWhitespaces (TextEditor editor, int insertionOffset)
 		{
 			StringBuilder result = new StringBuilder ();
-			for (int i = insertionOffset; i < document.Editor.Length; i++) {
-				char ch = document.Editor.GetCharAt (i);
+			for (int i = insertionOffset; i < editor.Length; i++) {
+				char ch = editor.GetCharAt (i);
 				if (ch == ' ' || ch == '\t') {
 					result.Append (ch);
 				} else {
@@ -115,96 +116,56 @@ namespace MonoDevelop.Refactoring
 			}
 			return result.ToString ();
 		}
-		
-		public string OutputNode (AstNode node)
-		{
-			using (var stringWriter = new System.IO.StringWriter ()) {
-				var formatter = new TextWriterTokenWriter (stringWriter);
-//				formatter.Indentation = indentLevel;
-				stringWriter.NewLine = Document.Editor.EolMarker;
-				
-				var visitor = new CSharpOutputVisitor (formatter, FormattingOptionsFactory.CreateMono ());
-				node.AcceptVisitor (visitor);
-				return stringWriter.ToString ();
-			}
-		}
-		
-		public CodeGenerator CreateCodeGenerator ()
-		{
-			var result = CodeGenerator.CreateGenerator (Document);
-			if (result == null)
-				LoggingService.LogError ("Generator can't be generated for : " + Document.Editor.MimeType);
-			return result;
-		}
-		
-		public static string GetIndent (Document document, IEntity member)
+
+		public static string GetIndent (TextEditor editor, Microsoft.CodeAnalysis.SyntaxNode member)
 		{
-			return GetWhitespaces (document, document.Editor.Document.LocationToOffset (member.Region.BeginLine, 1));
+			return GetWhitespaces (editor, member.SpanStart);
 		}
 		
 		public string GetWhitespaces (int insertionOffset)
 		{
-			return GetWhitespaces (Document, insertionOffset);
-		}
-		
-		public string GetIndent (IEntity member)
-		{
-			return GetIndent (Document, member);
-		}
-//		
-//		public IReturnType ShortenTypeName (IReturnType fullyQualifiedTypeName)
-//		{
-//			return Document.ParsedDocument.CompilationUnit.ShortenTypeName (fullyQualifiedTypeName, Document.Editor.Caret.Line, Document.Editor.Caret.Column);
-//		}
-//		
-//		public ParsedDocument ParseDocument ()
-//		{
-//			return ProjectDomService.Parse (Dom.Project, Document.FileName, Document.Editor.Text);
-//		}
-		
-		public List<string> GetUsedNamespaces ()
-		{
-			return GetUsedNamespaces (Document, Location);
-		}
-		
-		public static List<string> GetUsedNamespaces (Document doc, TextLocation loc)
-		{
-			var result = new List<string> ();
-			var pf = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (pf == null)
-				return result;
-			var scope = pf.GetUsingScope (loc);
-			if (scope == null)
-				return result;
-			var resolver = pf.GetResolver (doc.Compilation, loc);
-			for (var n = scope; n != null; n = n.Parent) {
-				result.Add (n.NamespaceName);
-				result.AddRange (n.Usings.Select (u => u.ResolveNamespace (resolver))
-					.Where (nr => nr != null)
-					.Select (nr => nr.FullName));
-			}
-			return result;
+			return GetWhitespaces (Editor, insertionOffset);
 		}
 		
-		public ResolveResult Resolve (AstNode node)
+		public Task<ImmutableArray<string>> GetUsedNamespacesAsync (CancellationToken cancellationToken = default (CancellationToken))
 		{
-			if (!resolver.IsCompleted)
-				resolver.Wait (2000);
-			if (!resolver.IsCompleted)
-				return null;
-			return resolver.Result.Resolve (node);
+			return GetUsedNamespacesAsync (Editor, DocumentContext,  Editor.LocationToOffset (Location));
 		}
 		
-		public AstType CreateShortType (IType fullType)
+		public static async Task<ImmutableArray<string>> GetUsedNamespacesAsync (TextEditor editor, DocumentContext doc, int offset, CancellationToken cancellationToken = default (CancellationToken))
 		{
-			var parsedFile = Document.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
+			if (editor == null)
+				throw new System.ArgumentNullException ("editor");
+			var parsedDocument = doc.ParsedDocument;
+			if (parsedDocument == null)
+				return ImmutableArray<string>.Empty;
+			var result = ImmutableArray<string>.Empty.ToBuilder ();
+			var sm = parsedDocument.GetAst<SemanticModel> (); 
+			var node = sm.SyntaxTree.GetRoot ().FindNode (TextSpan.FromBounds (offset, offset)); 
 			
-			var csResolver = parsedFile.GetResolver (Document.Compilation, Document.Editor.Caret.Location);
+			while (node != null) {
+				var cu = node as CompilationUnitSyntax;
+				if (cu != null) {
+					foreach (var u in cu.Usings) {
+						if (u.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.UsingDirective)
+							result.Add (u.Name.ToString ());
+					}
+				}
+				var ns = node as NamespaceDeclarationSyntax;
+				if (ns != null) {
+					var name = ns.Name.ToString ();
+					result.Add (name);
+					foreach (var u in ns.Usings) {
+						if (u.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.UsingDirective) 
+							result.Add (u.Name.ToString ());
+					}
+				}
+
+				node = node.Parent;
+			}
 			
-			var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver);
-			return builder.ConvertType (fullType);
+			return result.ToImmutable ();
 		}
-	
 		
 //		public List<string> GetResolveableNamespaces (RefactoringOptions options, out bool resolveDirect)
 //		{
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
index 0f98ee8010..fe722b16b4 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
@@ -30,10 +30,10 @@ using Gtk;
 using Gdk;
 
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 using MonoDevelop.Ide.Fonts;
 
 
@@ -48,9 +48,9 @@ namespace MonoDevelop.Refactoring
 		const int objColumn = 2;
 		const int statusVisibleColumn = 3;
 
-		List<Change> changes;
+		IList<Change> changes;
 
-		public RefactoringPreviewDialog (List<Change> changes)
+		public RefactoringPreviewDialog (IList<Change> changes)
 		{
 			this.Build ();
 			this.changes = changes;
@@ -107,9 +107,9 @@ namespace MonoDevelop.Refactoring
 				return;
 			}
 			
-			Mono.TextEditor.TextDocument doc = new Mono.TextEditor.TextDocument ();
-			doc.Text = Mono.TextEditor.Utils.TextFileUtility.ReadAllText (replaceChange.FileName);
-			DocumentLocation loc = doc.OffsetToLocation (replaceChange.Offset);
+			var doc = TextEditorFactory.CreateNewDocument ();
+			doc.Text = TextFileUtility.ReadAllText (replaceChange.FileName);
+			var loc = doc.OffsetToLocation (replaceChange.Offset);
 			
 			string text = string.Format (GettextCatalog.GetString ("(Line:{0}, Column:{1})"), loc.Line, loc.Column);
 			if (treeviewPreview.Selection.IterIsSelected (iter)) {
@@ -136,21 +136,21 @@ namespace MonoDevelop.Refactoring
 					return;
 			
 				var openDocument = IdeApp.Workbench.GetDocument (replaceChange.FileName);
-				Mono.TextEditor.TextDocument originalDocument = new Mono.TextEditor.TextDocument ();
+				var originalDocument = TextEditorFactory.CreateNewDocument ();
 				originalDocument.FileName = replaceChange.FileName;
 				if (openDocument == null) {
-					originalDocument.Text = Mono.TextEditor.Utils.TextFileUtility.ReadAllText (replaceChange.FileName);
+					originalDocument.Text = TextFileUtility.ReadAllText (replaceChange.FileName);
 				} else {
-					originalDocument.Text = openDocument.Editor.Document.Text;
+					originalDocument.Text = openDocument.Editor.Text;
 				}
 				
-				Mono.TextEditor.TextDocument changedDocument = new Mono.TextEditor.TextDocument ();
+				var changedDocument = TextEditorFactory.CreateNewDocument ();
 				changedDocument.FileName = replaceChange.FileName;
 				changedDocument.Text = originalDocument.Text;
 				
-				changedDocument.Replace (replaceChange.Offset, replaceChange.RemovedChars, replaceChange.InsertedText);
-				
-				string diffString = Mono.TextEditor.Utils.Diff.GetDiffString (originalDocument, changedDocument);
+				changedDocument.ReplaceText (replaceChange.Offset, replaceChange.RemovedChars, replaceChange.InsertedText);
+
+				string diffString = originalDocument.GetDiffAsString (changedDocument);
 				
 				cellRendererDiff.InitCell (treeviewPreview, true, diffString, replaceChange.FileName);
 			} catch (Exception e) {
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs
index d45cbe97cb..4f4009a77e 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs
@@ -33,106 +33,22 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using System.Linq;
 using MonoDevelop.AnalysisCore;
-using ICSharpCode.NRefactory;
 using System.Threading.Tasks;
 using System.Threading;
 using MonoDevelop.CodeActions;
 using MonoDevelop.CodeIssues;
-using Mono.TextEditor;
 using MonoDevelop.Ide.TypeSystem;
 using System.Diagnostics;
 using MonoDevelop.Core.Instrumentation;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Refactoring
 {
 	public static class RefactoringService
 	{
-		static readonly List<RefactoringOperation> refactorings = new List<RefactoringOperation>();
-		static readonly List<CodeActionProvider> contextActions = new List<CodeActionProvider> ();
-		static readonly List<CodeIssueProvider> inspectors = new List<CodeIssueProvider> ();
-		
-		public static IEnumerable<CodeActionProvider> ContextAddinNodes {
-			get {
-				return contextActions;
-			}
-		} 
-
-		public static void AddProvider (CodeActionProvider provider)
-		{
-			contextActions.Add (provider);
-		}
-		
-		public static void AddProvider (CodeIssueProvider provider)
-		{
-			inspectors.Add (provider);
-		}
-
-		public static List<CodeIssueProvider> Inspectors {
-			get {
-				return inspectors;
-			}
-		}
-
 		static RefactoringService ()
 		{
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/Refactorings", delegate(object sender, ExtensionNodeEventArgs args) {
-				switch (args.Change) {
-				case ExtensionChange.Add:
-					refactorings.Add ((RefactoringOperation)args.ExtensionObject);
-					break;
-				case ExtensionChange.Remove:
-					refactorings.Remove ((RefactoringOperation)args.ExtensionObject);
-					break;
-				}
-			});
 
-			
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/CodeActions", delegate(object sender, ExtensionNodeEventArgs args) {
-				switch (args.Change) {
-				case ExtensionChange.Add:
-					contextActions.Add (((CodeActionAddinNode)args.ExtensionNode).Action);
-					break;
-				case ExtensionChange.Remove:
-					contextActions.Remove (((CodeActionAddinNode)args.ExtensionNode).Action);
-					break;
-				}
-			});
-			
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/CodeActionSource", delegate(object sender, ExtensionNodeEventArgs args) {
-				switch (args.Change) {
-				case ExtensionChange.Add:
-					contextActions.AddRange (((ICodeActionProviderSource)args.ExtensionObject).GetProviders ());
-					break;
-				}
-			});
-			
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/CodeIssues", delegate(object sender, ExtensionNodeEventArgs args) {
-				switch (args.Change) {
-				case ExtensionChange.Add:
-					inspectors.Add (((CodeIssueAddinNode)args.ExtensionNode).Inspector);
-					break;
-				case ExtensionChange.Remove:
-					inspectors.Remove (((CodeIssueAddinNode)args.ExtensionNode).Inspector);
-					break;
-				}
-			});
-			
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/CodeIssueSource", delegate(object sender, ExtensionNodeEventArgs args) {
-				switch (args.Change) {
-				case ExtensionChange.Add:
-					var source = (ICodeIssueProviderSource)args.ExtensionObject;
-					var providers = source.GetProviders ();
-					inspectors.AddRange (providers);
-					break;
-				}
-			});
-			
-		}
-		
-		public static IEnumerable<RefactoringOperation> Refactorings {
-			get {
-				return refactorings;
-			}
 		}
 		
 		class RenameHandler 
@@ -156,14 +72,14 @@ namespace MonoDevelop.Refactoring
 			}
 		}
 		
-		public static void AcceptChanges (ProgressMonitor monitor, List<Change> changes)
+		public static void AcceptChanges (ProgressMonitor monitor, IList<Change> changes)
 		{
 			AcceptChanges (monitor, changes, MonoDevelop.Ide.TextFileProvider.Instance);
 		}
 		
-		public static void AcceptChanges (ProgressMonitor monitor, List<Change> changes, MonoDevelop.Projects.Text.ITextFileProvider fileProvider)
+		public static void AcceptChanges (ProgressMonitor monitor, IList<Change> changes, MonoDevelop.Ide.ITextFileProvider fileProvider)
 		{
-			var rctx = new RefactoringOptions (null);
+			var rctx = new RefactoringOptions (null, null);
 			var handler = new RenameHandler (changes);
 			FileService.FileRenamed += handler.FileRename;
 			var fileNames = new HashSet<FilePath> ();
@@ -193,145 +109,54 @@ namespace MonoDevelop.Refactoring
 			FileService.FileRenamed -= handler.FileRename;
 			TextReplaceChange.FinishRefactoringOperation ();
 		}
-		
-		public static IEnumerable<CodeIssueProvider> GetInspectors (string mimeType)
-		{
-			return inspectors.Where (i => i.MimeType == mimeType);
-		}
-
-		static Stopwatch validActionsWatch = new Stopwatch ();
-		static Stopwatch actionWatch = new Stopwatch ();
 
-		public static IEnumerable<CodeAction> GetValidActions (Document doc, TextLocation loc, CancellationToken cancellationToken = default (CancellationToken))
+//		public static void QueueQuickFixAnalysis (Document doc, TextLocation loc, CancellationToken token, Action<List<CodeAction>> callback)
+//		{
+//			var ext = doc.GetContent<MonoDevelop.AnalysisCore.Gui.ResultsEditorExtension> ();
+//			var issues = ext != null ? ext.GetResultsAtOffset (doc.Editor.LocationToOffset (loc), token).OrderBy (r => r.Level).ToList () : new List<Result> ();
+//
+//			ThreadPool.QueueUserWorkItem (delegate {
+//				try {
+//					var result = new List<CodeAction> ();
+//					foreach (var r in issues) {
+//						if (token.IsCancellationRequested)
+//							return;
+//						var fresult = r as FixableResult;
+//						if (fresult == null)
+//							continue;
+////						foreach (var action in FixOperationsHandler.GetActions (doc, fresult)) {
+////							result.Add (new AnalysisContextActionProvider.AnalysisCodeAction (action, r) {
+////								DocumentRegion = action.DocumentRegion
+////							});
+////						}
+//					}
+//					result.AddRange (GetValidActions (doc, loc).Result);
+//					callback (result);
+//				} catch (Exception ex) {
+//					LoggingService.LogError ("Error in analysis service", ex);
+//				}
+//			});
+//		}	
+
+		public static MonoDevelop.Ide.Editor.DocumentLocation GetCorrectResolveLocation (IReadonlyTextDocument editor, MonoDevelop.Ide.Editor.DocumentLocation location)
 		{
-			var editor = doc.Editor;
-			string disabledNodes = editor != null ? PropertyService.Get ("ContextActions." + editor.MimeType, "") ?? "" : "";
-			var result = new List<CodeAction> ();
-			var timer = InstrumentationService.CreateTimerCounter ("Source analysis background task", "Source analysis");
-			timer.BeginTiming ();
-			validActionsWatch.Restart ();
-			var timeTable = new Dictionary<CodeActionProvider, long> ();
-			try {
-				var parsedDocument = doc.ParsedDocument;
-				if (editor != null && parsedDocument != null && parsedDocument.CreateRefactoringContext != null) {
-					var ctx = parsedDocument.CreateRefactoringContext (doc, cancellationToken);
-					if (ctx != null) {
-						foreach (var provider in contextActions.Where (fix =>
-							fix.MimeType == editor.MimeType &&
-							disabledNodes.IndexOf (fix.IdString, StringComparison.Ordinal) < 0))
-						{
-							try {
-								actionWatch.Restart ();
-								result.AddRange (provider.GetActions (doc, ctx, loc, cancellationToken));
-								actionWatch.Stop ();
-								timeTable[provider] = actionWatch.ElapsedMilliseconds;
-							} catch (Exception ex) {
-								LoggingService.LogError ("Error in context action provider " + provider.Title, ex);
-							}
-						}
-					}
-				}
-			} catch (Exception ex) {
-				LoggingService.LogError ("Error in analysis service", ex);
-			} finally {
-				timer.EndTiming ();
-				validActionsWatch.Stop ();
-				if (validActionsWatch.ElapsedMilliseconds > 1000) {
-					LoggingService.LogWarning ("Warning slow edit action update."); 
-					foreach (var pair in timeTable) {
-						if (pair.Value > 50)
-							LoggingService.LogInfo ("ACTION '" + pair.Key.Title + "' took " + pair.Value +"ms"); 
-					}
-				}
-			}
-			return (IEnumerable<CodeAction>)result;
-		}
-
-		public static void QueueQuickFixAnalysis (Document doc, TextLocation loc, CancellationToken token, Action<List<CodeAction>> callback)
-		{
-			var ext = doc.GetContent<MonoDevelop.AnalysisCore.Gui.ResultsEditorExtension> ();
-			var issues = ext != null ? ext.GetResultsAtOffset (doc.Editor.LocationToOffset (loc), token).OrderBy (r => r.Level).ToList () : new List<Result> ();
-
-			ThreadPool.QueueUserWorkItem (delegate {
-				try {
-					var result = new List<CodeAction> ();
-					foreach (var r in issues) {
-						if (token.IsCancellationRequested)
-							return;
-						var fresult = r as FixableResult;
-						if (fresult == null)
-							continue;
-						foreach (var action in FixOperationsHandler.GetActions (doc, fresult)) {
-							result.Add (new AnalysisContextActionProvider.AnalysisCodeAction (action, r) {
-								DocumentRegion = action.DocumentRegion
-							});
-						}
-					}
-					result.AddRange (GetValidActions (doc, loc));
-					callback (result);
-				} catch (Exception ex) {
-					LoggingService.LogError ("Error in analysis service", ex);
-				}
-			});
-		}	
-
-		public static IList<CodeAction> ApplyFixes (IEnumerable<CodeAction> fixes, IRefactoringContext refactoringContext)
-		{
-			if (fixes == null)
-				throw new ArgumentNullException ("fixes");
-			if (refactoringContext == null)
-				throw new ArgumentNullException ("refactoringContext");
-			var allFixes = fixes as IList<CodeAction> ?? fixes.ToArray ();
-			if (allFixes.Count == 0)
-				return new List<CodeAction> ();
-				
-			var scriptProvider = refactoringContext as IRefactoringContext;
-			if (scriptProvider == null) {
-				return RunAll (allFixes, refactoringContext, null);
-			}
-			using (var script = scriptProvider.CreateScript ()) {
-				return RunAll (allFixes, refactoringContext, script);
-			}
-		}
-		
-		public static void ApplyFix (CodeAction action, IRefactoringContext context)
-		{
-			using(var script = context.CreateScript ()) {
-				action.Run (context, script);
-			}
-		}
-
-		static List<CodeAction> RunAll (IEnumerable<CodeAction> allFixes, IRefactoringContext refactoringContext, object script)
-		{
-			var appliedFixes = new List<CodeAction> ();
-			foreach (var fix in allFixes) {
-				fix.Run (refactoringContext, script);
-				appliedFixes.Add (fix);
-			}
-			return appliedFixes;
-		}
-
-		public static DocumentLocation GetCorrectResolveLocation (Document doc, DocumentLocation location)
-		{
-			if (doc == null)
-				return location;
-			var editor = doc.Editor;
 			if (editor == null || location.Column == 1)
 				return location;
 
-			if (editor.IsSomethingSelected)
-				return editor.MainSelection.Start;
-
+			/*if (editor is TextEditor) {
+				if (((TextEditor)editor).IsSomethingSelected)
+					return ((TextEditor)editor).SelectionRegion.Begin;
+			}*/
 			var line = editor.GetLine (location.Line);
 			if (line == null || location.Column > line.LengthIncludingDelimiter)
 				return location;
 			int offset = editor.LocationToOffset (location);
-			if (offset > 0 && !char.IsLetterOrDigit (doc.Editor.GetCharAt (offset)) && char.IsLetterOrDigit (doc.Editor.GetCharAt (offset - 1)))
-				return new DocumentLocation (location.Line, location.Column - 1);
+			if (offset > 0 && !char.IsLetterOrDigit (editor.GetCharAt (offset)) && char.IsLetterOrDigit (editor.GetCharAt (offset - 1)))
+				return new MonoDevelop.Ide.Editor.DocumentLocation (location.Line, location.Column - 1);
 			return location;
 		}
 
-		static readonly CodeAnalysisBatchRunner runner = new CodeAnalysisBatchRunner();
+		//static readonly CodeAnalysisBatchRunner runner = new CodeAnalysisBatchRunner();
 
 		/// <summary>
 		/// Queues a code analysis job.
@@ -340,11 +165,12 @@ namespace MonoDevelop.Refactoring
 		/// <param name="progressMessage">
 		/// The message used for a progress monitor, or null if no progress monitor should be used.
 		/// </param>
-		public static IJobContext QueueCodeIssueAnalysis(IAnalysisJob job, string progressMessage = null)
-		{
-			if (progressMessage != null)
-				job = new ProgressMonitorWrapperJob (job, progressMessage);
-			return runner.QueueJob (job);
-		}
+//		public static IJobContext QueueCodeIssueAnalysis(IAnalysisJob job, string progressMessage = null)
+//		{
+//			if (progressMessage != null)
+//				job = new ProgressMonitorWrapperJob (job, progressMessage);
+//			return runner.QueueJob (job);
+//			return null;
+//		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringSymbolInfo.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringSymbolInfo.cs
new file mode 100644
index 0000000000..2305f274a3
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringSymbolInfo.cs
@@ -0,0 +1,96 @@
+//
+// RefactoringSymbolInfo.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Ide;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using System.Threading;
+using System;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace MonoDevelop.Refactoring
+{
+
+	class RefactoringSymbolInfo
+	{
+		public readonly static RefactoringSymbolInfo Empty = new RefactoringSymbolInfo(new SymbolInfo());
+
+		SymbolInfo symbolInfo;
+
+		public ISymbol Symbol {
+			get {
+				return symbolInfo.Symbol;
+			}
+		}
+
+		public ImmutableArray<ISymbol> CandidateSymbols {
+			get {
+				return symbolInfo.CandidateSymbols;
+			}
+		}
+
+		public ISymbol DeclaredSymbol {
+			get;
+			internal set;
+		}
+
+		public RefactoringSymbolInfo (SymbolInfo symbolInfo)
+		{
+			this.symbolInfo = symbolInfo;
+		}
+
+		public static async Task<RefactoringSymbolInfo> GetSymbolInfoAsync (DocumentContext document, int offset, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			if (document.ParsedDocument == null)
+				return RefactoringSymbolInfo.Empty;
+			var unit = document.ParsedDocument.GetAst<SemanticModel> ();
+			if (unit != null) {
+				var root = await unit.SyntaxTree.GetRootAsync (cancellationToken).ConfigureAwait (false);
+				try {
+					var token = root.FindToken (offset);
+					if (!token.Span.IntersectsWith (offset))
+						return RefactoringSymbolInfo.Empty;
+					var symbol = unit.GetSymbolInfo (token.Parent);
+					return new RefactoringSymbolInfo (symbol) {
+						DeclaredSymbol = token.IsKind (SyntaxKind.IdentifierToken) ? unit.GetDeclaredSymbol (token.Parent) : null
+					};
+				} catch (Exception) {
+					return RefactoringSymbolInfo.Empty;
+				}
+			}
+			return RefactoringSymbolInfo.Empty;
+		}
+	}
+	
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
deleted file mode 100644
index 1dd79118c7..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
+++ /dev/null
@@ -1,441 +0,0 @@
-//
-// RefactoryCommands.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.FindInFiles;
-using MonoDevelop.Ide;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Semantics;
-using MonoDevelop.CodeActions;
-using MonoDevelop.SourceEditor.QuickTasks;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MonoDevelop.Refactoring
-{
-	public enum RefactoryCommands
-	{
-		CurrentRefactoryOperations,
-		GotoDeclaration, // in 'referenced' in IdeViMode.cs as string
-		FindReferences,
-		FindAllReferences,
-		FindDerivedClasses,
-		DeclareLocal,
-		RemoveUnusedImports,
-		SortImports,
-		RemoveSortImports,
-		ExtractMethod,
-		CreateMethod,
-		IntroduceConstant,
-		IntegrateTemporaryVariable,
-		ImportSymbol,
-		QuickFix,
-		Resolve
-	}
-	
-	public class CurrentRefactoryOperationsHandler : CommandHandler
-	{
-		protected override void Run (object data)
-		{
-			var del = (System.Action) data;
-			if (del != null)
-				del ();
-		}
-		
-		public static ResolveResult GetResolveResult (MonoDevelop.Ide.Gui.Document doc)
-		{
-			ITextEditorResolver textEditorResolver = doc.GetContent<ITextEditorResolver> ();
-			if (textEditorResolver != null)
-				return textEditorResolver.GetLanguageItem (doc.Editor.IsSomethingSelected ? doc.Editor.SelectionRange.Offset : doc.Editor.Caret.Offset);
-			return null;
-		}
-		
-		public static object GetItem (MonoDevelop.Ide.Gui.Document doc, out ResolveResult resolveResult)
-		{
-			resolveResult = GetResolveResult (doc);
-			if (resolveResult is LocalResolveResult) 
-				return ((LocalResolveResult)resolveResult).Variable;
-			if (resolveResult is MemberResolveResult)
-				return ((MemberResolveResult)resolveResult).Member;
-			if (resolveResult is MethodGroupResolveResult) {
-				var mg = ((MethodGroupResolveResult)resolveResult);
-				var method = mg.Methods.FirstOrDefault ();
-				if (method == null && mg.GetExtensionMethods ().Any ()) 
-					method = mg.GetExtensionMethods ().First ().FirstOrDefault ();
-				return method;
-			}
-			if (resolveResult is TypeResolveResult)
-				return resolveResult.Type;
-			if (resolveResult is NamespaceResolveResult)
-				return ((NamespaceResolveResult)resolveResult).Namespace;
-			if (resolveResult is OperatorResolveResult)
-				return ((OperatorResolveResult)resolveResult).UserDefinedOperatorMethod;
-			return null;
-		}
-
-		class JumpTo
-		{
-			object el;
-			
-			public JumpTo (object el)
-			{
-				this.el = el;
-			}
-			
-			public void Run ()
-			{
-				if (el is IUnresolvedEntity) {
-					var e = (IUnresolvedEntity)el;
-					IdeApp.Workbench.OpenDocument (e.Region.FileName, e.Region.BeginLine, e.Region.BeginColumn);
-					return;
-				} 
-				if (el is IVariable)
-					IdeApp.ProjectOperations.JumpToDeclaration ((IVariable)el);
-				if (el is INamedElement)
-					IdeApp.ProjectOperations.JumpToDeclaration ((INamedElement)el);
-			}
-		}
-
-		
-		class GotoBase 
-		{
-			IEntity item;
-			
-			public GotoBase (IEntity item)
-			{
-				this.item = item;
-			}
-			
-			public void Run ()
-			{
-				var cls = item as ITypeDefinition;
-				if (cls != null && cls.DirectBaseTypes != null) {
-					foreach (var bt in cls.DirectBaseTypes) {
-						var def = bt.GetDefinition ();
-						if (def != null && def.Kind != TypeKind.Interface) {
-							IdeApp.ProjectOperations.JumpToDeclaration (def); 
-							return;
-						}
-					}
-				}
-				
-				var method = item as IMember;
-				if (method != null) {
-					var baseMethod = InheritanceHelper.GetBaseMember (method); 
-					if (baseMethod != null) {
-						IdeApp.ProjectOperations.JumpToDeclaration (baseMethod); 
-					}
-					return;
-				}
-			}
-		}
-		
-		class FindRefs 
-		{
-			object obj;
-			bool allOverloads;
-			public FindRefs (object obj, bool all)
-			{
-				this.obj = obj;
-				this.allOverloads = all;
-			}
-			
-			public void Run ()
-			{
-				if (allOverloads) {
-					FindAllReferencesHandler.FindRefs (obj);
-				} else {
-					FindReferencesHandler.FindRefs (obj);
-				}
-			}
-		}
-		
-		class FindDerivedClasses
-		{
-			ITypeDefinition type;
-			
-			public FindDerivedClasses (ITypeDefinition type)
-			{
-				this.type = type;
-			}
-			
-			public void Run ()
-			{
-				FindDerivedClassesHandler.FindDerivedClasses (type);
-			}
-		}
-
-		class RefactoringDocumentInfo
-		{
-			public IEnumerable<CodeAction> validActions;
-			public MonoDevelop.Ide.TypeSystem.ParsedDocument lastDocument;
-
-			public override string ToString ()
-			{
-				return string.Format ("[RefactoringDocumentInfo: #validActions={0}, lastDocument={1}]", validActions != null ? validActions.Count ().ToString () : "null", lastDocument);
-			}
-		}
-
-
-		DocumentLocation lastLocation;
-
-		static bool HasOverloads (Solution solution, object item)
-		{
-			var member = item as IMember;
-			if (member != null && member.ImplementedInterfaceMembers.Any ())
-				return true;
-			var method = item as IMethod;
-			if (method == null)
-				return false;
-			return method.DeclaringType.GetMethods (m => m.Name == method.Name).Count () > 1;
-		}
-
-
-		protected override void Update (CommandArrayInfo ainfo)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null)
-				return;
-			
-			var parsedDocument = doc.ParsedDocument;
-			if (parsedDocument == null || parsedDocument.IsInvalid)
-				return;
-			
-			ResolveResult resolveResult;
-			object item = GetItem (doc, out resolveResult);
-			bool added = false;
-
-			var options = new RefactoringOptions (doc) {
-				ResolveResult = resolveResult,
-				SelectedItem = item
-			};
-			
-			var ciset = new CommandInfoSet ();
-			ciset.Text = GettextCatalog.GetString ("Refactor");
-
-			bool canRename;
-			if (item is IVariable || item is IParameter) {
-				canRename = true; 
-			} else if (item is ITypeDefinition) { 
-				canRename = !((ITypeDefinition)item).Region.IsEmpty;
-			} else if (item is IType) { 
-				canRename = ((IType)item).Kind == TypeKind.TypeParameter;
-			} else if (item is IMember) {
-				canRename = !((IMember)item).Region.IsEmpty;
-			} else if (item is INamespace) {
-				canRename = true;
-			} else {
-				canRename = false;
-			}
-			if (canRename) {
-				ciset.CommandInfos.Add (IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.EditCommands.Rename), new Action (delegate {
-					new MonoDevelop.Refactoring.Rename.RenameHandler ().Start (null);
-				}));
-				added = true;
-			}
-			
-			foreach (var refactoring in RefactoringService.Refactorings) {
-				if (refactoring.IsValid (options)) {
-					CommandInfo info = new CommandInfo (refactoring.GetMenuDescription (options));
-					info.AccelKey = refactoring.AccelKey;
-					ciset.CommandInfos.Add (info, new Action (new RefactoringOperationWrapper (refactoring, options).Operation));
-				}
-			}
-			var refactoringInfo = doc.Annotation<RefactoringDocumentInfo> ();
-			if (refactoringInfo == null) {
-				refactoringInfo = new RefactoringDocumentInfo ();
-				doc.AddAnnotation (refactoringInfo);
-			}
-			var loc = doc.Editor.Caret.Location;
-			bool first = true;
-			if (refactoringInfo.lastDocument != doc.ParsedDocument || loc != lastLocation) {
-				try {
-					refactoringInfo.validActions = RefactoringService.GetValidActions (doc, loc, new CancellationTokenSource (500).Token);
-				} catch (TaskCanceledException) {
-				} catch (AggregateException ae) {
-					ae.Flatten ().Handle (x => x is TaskCanceledException); 
-				}
-	
-				lastLocation = loc;
-				refactoringInfo.lastDocument = doc.ParsedDocument;
-			}
-			if (refactoringInfo.validActions != null && refactoringInfo.lastDocument != null && refactoringInfo.lastDocument.CreateRefactoringContext != null) {
-				var context = refactoringInfo.lastDocument.CreateRefactoringContext (doc, CancellationToken.None);
-
-				foreach (var fix_ in refactoringInfo.validActions.OrderByDescending (i => Tuple.Create (CodeActionEditorExtension.IsAnalysisOrErrorFix(i), (int)i.Severity, CodeActionEditorExtension.GetUsage (i.IdString)))) {
-					if (CodeActionEditorExtension.IsAnalysisOrErrorFix (fix_))
-						continue;
-					var fix = fix_;
-					if (first) {
-						first = false;
-						if (ciset.CommandInfos.Count > 0)
-							ciset.CommandInfos.AddSeparator ();
-					}
-
-					ciset.CommandInfos.Add (fix.Title, new Action (() => RefactoringService.ApplyFix (fix, context)));
-				}
-			}
-
-			if (ciset.CommandInfos.Count > 0) {
-				ainfo.Add (ciset, null);
-				added = true;
-			}
-			
-			if (IdeApp.ProjectOperations.CanJumpToDeclaration (item)) {
-				var type = item as IType;
-				if (type != null && type.GetDefinition ().Parts.Count > 1) {
-					var declSet = new CommandInfoSet ();
-					declSet.Text = GettextCatalog.GetString ("_Go to Declaration");
-					var ct = type.GetDefinition ();
-					foreach (var part in ct.Parts)
-						declSet.CommandInfos.Add (string.Format (GettextCatalog.GetString ("{0}, Line {1}"), FormatFileName (part.Region.FileName), part.Region.BeginLine), new System.Action (new JumpTo (part).Run));
-					ainfo.Add (declSet);
-				} else {
-					ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.GotoDeclaration), new System.Action (new JumpTo (item).Run));
-				}
-				added = true;
-			}
-
-			if (item is IMember) {
-				var member = (IMember)item;
-				if (member.IsOverride || member.ImplementedInterfaceMembers.Any ()) {
-					ainfo.Add (GettextCatalog.GetString ("Go to _Base Symbol"), new System.Action (new GotoBase (member).Run));
-					added = true;
-				}
-			}
-
-			if (!(item is IMethod && ((IMethod)item).SymbolKind == SymbolKind.Operator) && (item is IEntity || item is ITypeParameter || item is IVariable || item is INamespace)) {
-
-				ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindReferences), new System.Action (new FindRefs (item, false).Run));
-				if (doc.HasProject && HasOverloads (doc.Project.ParentSolution, item))
-					ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindAllReferences), new System.Action (new FindRefs (item, true).Run));
-				added = true;
-			}
-
-			if (item is IMember) {
-				var member = (IMember)item;
-				var handler = new FindDerivedSymbolsHandler (member);
-				if (handler.IsValid) {
-					var a = ainfo.Add (GettextCatalog.GetString ("Find Derived Symbols"), new Action (handler.Run));
-					a.AccelKey = IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindDerivedClasses).AccelKey;
-					added = true;
-				}
-			}
-			if (item is IMember) {
-				var member = (IMember)item;
-				if (member.SymbolKind == SymbolKind.Method || member.SymbolKind == SymbolKind.Indexer) {
-					var findMemberOverloadsHandler = new FindMemberOverloadsHandler (doc, member);
-					if (findMemberOverloadsHandler.IsValid) {
-						ainfo.Add (GettextCatalog.GetString ("Find Member Overloads"), new System.Action (findMemberOverloadsHandler.Run));
-						added = true;
-					}
-				}
-			}
-
-			if (item is ITypeDefinition) {
-				ITypeDefinition cls = (ITypeDefinition)item;
-				foreach (var bc in cls.DirectBaseTypes) {
-					if (bc != null && bc.GetDefinition () != null && bc.GetDefinition ().Kind != TypeKind.Interface/* TODO: && IdeApp.ProjectOperations.CanJumpToDeclaration (bc)*/) {
-						ainfo.Add (GettextCatalog.GetString ("Go to _Base"), new System.Action (new GotoBase ((ITypeDefinition)item).Run));
-						break;
-					}
-				}
-				if ((cls.Kind == TypeKind.Class && !cls.IsSealed) || cls.Kind == TypeKind.Interface) {
-					var label = cls.Kind != TypeKind.Interface ? GettextCatalog.GetString ("Find _derived classes") : GettextCatalog.GetString ("Find _implementor classes");
-					var a = ainfo.Add (label, new System.Action (new FindDerivedClasses (cls).Run));
-					a.AccelKey = IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindDerivedClasses).AccelKey;
-				}
-				ainfo.Add (GettextCatalog.GetString ("Find Extension Methods"), new System.Action (new FindExtensionMethodHandler (doc, cls).Run));
-				added = true;
-
-			}
-
-			if (added)
-				ainfo.AddSeparator ();
-		}
-		
-
-		class RefactoringOperationWrapper
-		{
-			RefactoringOperation refactoring;
-			RefactoringOptions options;
-			
-			public RefactoringOperationWrapper (RefactoringOperation refactoring, RefactoringOptions options)
-			{
-				this.refactoring = refactoring;
-				this.options = options;
-			}
-			
-			public void Operation ()
-			{
-				refactoring.Run (options);
-			}
-		}
-
-		bool IsModifiable (object member)
-		{
-			IType t = member as IType;
-			if (t != null) 
-				return t.GetDefinition ().Region.FileName == IdeApp.Workbench.ActiveDocument.FileName;
-			if (member is IMember)
-				return ((IMember)member).DeclaringTypeDefinition.Region.FileName == IdeApp.Workbench.ActiveDocument.FileName;
-			return false;
-		}
-
-		static string FormatFileName (string fileName)
-		{
-			if (fileName == null)
-				return null;
-			char[] seperators = { System.IO.Path.DirectorySeparatorChar, System.IO.Path.AltDirectorySeparatorChar };
-			int idx = fileName.LastIndexOfAny (seperators);
-			if (idx > 0) 
-				idx = fileName.LastIndexOfAny (seperators, idx - 1);
-			if (idx > 0) 
-				return "..." + fileName.Substring (idx);
-			return fileName;
-		}
-
-		public static bool ContainsAbstractMembers (IType cls)
-		{
-			if (cls == null)
-				return false;
-			return cls.GetMembers ().Any (m => m.IsAbstract);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs
deleted file mode 100644
index 97ab500655..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs
+++ /dev/null
@@ -1,578 +0,0 @@
-// 
-// ResolveCommand.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.Completion;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.TypeSystem;
-using System.Threading;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.Core.Assemblies;
-using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using MonoDevelop.Core.ProgressMonitoring;
-using ICSharpCode.NRefactory.Completion;
-
-namespace MonoDevelop.Refactoring
-{
-	public class ResolveCommandHandler : CommandHandler
-	{
-		public static bool ResolveAt (Document doc, out ResolveResult resolveResult, out AstNode node, CancellationToken token = default (CancellationToken))
-		{
-			if (doc == null)
-				throw new ArgumentNullException ("doc");
-			var editor = doc.Editor;
-			if (editor == null || editor.MimeType != "text/x-csharp") {
-				node = null;
-				resolveResult = null;
-				return false;
-			}
-			if (!InternalResolveAt (doc, out resolveResult, out node)) {
-				var location = RefactoringService.GetCorrectResolveLocation (doc, editor.Caret.Location);
-				resolveResult = GetHeuristicResult (doc, location, ref node);
-				if (resolveResult == null)
-					return false;
-			}
-			var oce = node as ObjectCreateExpression;
-			if (oce != null)
-				node = oce.Type;
-			return true;
-		}
-
-		static bool InternalResolveAt (Document doc, out ResolveResult resolveResult, out AstNode node, CancellationToken token = default (CancellationToken))
-		{
-			var parsedDocument = doc.ParsedDocument;
-			resolveResult = null;
-			node = null;
-			if (parsedDocument == null)
-				return false;
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (unit == null || parsedFile == null)
-				return false;
-			try {
-				var location = RefactoringService.GetCorrectResolveLocation (doc, doc.Editor.Caret.Location);
-				resolveResult = ResolveAtLocation.Resolve (doc.Compilation, parsedFile, unit, location, out node, token);
-				if (resolveResult == null || node is Statement)
-					return false;
-			} catch (OperationCanceledException) {
-				return false;
-			} catch (Exception e) {
-				Console.WriteLine ("Got resolver exception:" + e);
-				return false;
-			}
-			return true;
-		}
-
-		protected override void Update (CommandArrayInfo ainfo)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null)
-				return;
-
-			ResolveResult resolveResult;
-			AstNode node;
-			if (!ResolveAt (doc, out resolveResult, out node))
-				return;
-			var resolveMenu = new CommandInfoSet ();
-			resolveMenu.Text = GettextCatalog.GetString ("Resolve");
-			
-			var possibleNamespaces = GetPossibleNamespaces (doc, node, ref resolveResult);
-
-			foreach (var t in possibleNamespaces.Where (tp => tp.OnlyAddReference)) {
-				var reference = t.Reference;
-				var info = resolveMenu.CommandInfos.Add (
-					t.GetImportText (),
-					new System.Action (new AddImport (doc, resolveResult, null, reference, true, node).Run)
-					);
-				info.Icon = MonoDevelop.Ide.Gui.Stock.AddNamespace;
-			
-			}
-
-
-			bool addUsing = !(resolveResult is AmbiguousTypeResolveResult);
-			if (addUsing) {
-				foreach (var t in possibleNamespaces.Where (tp => tp.IsAccessibleWithGlobalUsing)) {
-					string ns = t.Namespace;
-					var reference = t.Reference;
-					var info = resolveMenu.CommandInfos.Add (
-						t.GetImportText (),
-						new System.Action (new AddImport (doc, resolveResult, ns, reference, true, node).Run)
-						);
-					info.Icon = MonoDevelop.Ide.Gui.Stock.AddNamespace;
-				}
-			}
-			
-			bool resolveDirect = !(resolveResult is UnknownMemberResolveResult);
-			if (resolveDirect) {
-				if (resolveMenu.CommandInfos.Count > 0)
-					resolveMenu.CommandInfos.AddSeparator ();
-				foreach (var t in possibleNamespaces) {
-					string ns = t.Namespace;
-					var reference = t.Reference;
-					resolveMenu.CommandInfos.Add (t.GetInsertNamespaceText (doc.Editor.GetTextBetween (node.StartLocation, node.EndLocation)), new System.Action (new AddImport (doc, resolveResult, ns, reference, false, node).Run));
-				}
-			}
-			
-			if (resolveMenu.CommandInfos.Count > 0)
-				ainfo.Insert (0, resolveMenu);
-		}
-
-		static string CreateStub (Document doc, int offset)
-		{
-			if (offset <= 0)
-				return "";
-			string text = doc.Editor.GetTextAt (0, Math.Min (doc.Editor.Length, offset));
-			var stub = new StringBuilder (text);
-			CSharpCompletionEngine.AppendMissingClosingBrackets (stub, false);
-			return stub.ToString ();
-		}
-
-		static ResolveResult GetHeuristicResult (Document doc, DocumentLocation location, ref AstNode node)
-		{
-			var editor = doc.Editor;
-			if (editor == null || editor.Caret == null)
-				return null;
-			int offset = editor.Caret.Offset;
-			bool wasLetter = false, wasWhitespaceAfterLetter = false;
-			while (offset < editor.Length) {
-				char ch = editor.GetCharAt (offset);
-				bool isLetter = char.IsLetterOrDigit (ch) || ch == '_';
-				bool isWhiteSpace = char.IsWhiteSpace (ch);
-				bool isValidPunc = ch == '.' || ch == '<' || ch == '>';
-
-				if (!(wasLetter && wasWhitespaceAfterLetter) && (isLetter || isWhiteSpace || isValidPunc)) {
-					if (isValidPunc) {
-						wasWhitespaceAfterLetter = false;
-						wasLetter = false;
-					}
-					offset++;
-				} else {
-					offset--;
-					while (offset > 1) {
-						ch = editor.GetCharAt (offset - 1);
-						if (!(ch == '.' || char.IsWhiteSpace (ch)))
-							break;
-						offset--;
-					}
-					break;
-				}
-
-				wasLetter |= isLetter;
-				if (wasLetter)
-					wasWhitespaceAfterLetter |= isWhiteSpace;
-			}
-
-			var unit = SyntaxTree.Parse (CreateStub (doc, offset), doc.FileName);
-
-			var parsedDocument = doc.ParsedDocument;
-			if (parsedDocument == null)
-				return null;
-			return ResolveAtLocation.Resolve (
-				doc.Compilation, 
-				parsedDocument.ParsedFile as CSharpUnresolvedFile,
-				unit,
-				location, 
-				out node);
-		}
-
-		public static List<PossibleNamespace> GetPossibleNamespaces (Document doc, AstNode node, ref ResolveResult resolveResult)
-		{
-			if (doc == null)
-				throw new ArgumentNullException ("doc");
-			if (node == null)
-				throw new ArgumentNullException ("node");
-			var location = RefactoringService.GetCorrectResolveLocation (doc, doc.Editor.Caret.Location);
-
-			if (resolveResult == null || resolveResult.Type.FullName == "System.Void")
-				resolveResult = GetHeuristicResult (doc, location, ref node) ?? resolveResult;
-			var foundNamespaces = GetPossibleNamespaces (doc, node, resolveResult, location);
-			
-			if (!(resolveResult is AmbiguousTypeResolveResult)) {
-				var usedNamespaces = RefactoringOptions.GetUsedNamespaces (doc, location);
-				foundNamespaces = foundNamespaces.Where (n => !usedNamespaces.Contains (n.Namespace));
-			}
-			var result = new List<PossibleNamespace> ();
-			foreach (var ns in foundNamespaces) {
-				if (result.Any (n => n.Namespace == ns.Namespace))
-					continue;
-				result.Add (ns); 
-			}
-			return result;
-		}
-
-		static int GetTypeParameterCount (AstNode node)
-		{
-			if (node is ObjectCreateExpression)
-				node = ((ObjectCreateExpression)node).Type;
-			if (node is SimpleType)
-				return ((SimpleType)node).TypeArguments.Count;
-			if (node is MemberType)
-				return ((MemberType)node).TypeArguments.Count;
-			if (node is IdentifierExpression)
-				return ((IdentifierExpression)node).TypeArguments.Count;
-			return 0;
-		}
-
-		public class PossibleNamespace
-		{
-			public string Namespace { get; private set; }
-			public bool IsAccessibleWithGlobalUsing { get; private set; }
-			public bool OnlyAddReference { get { return !IsAccessibleWithGlobalUsing && Reference != null; } }
-			public MonoDevelop.Projects.ProjectReference Reference { get; private set; }
-
-			public PossibleNamespace (string @namespace, bool isAccessibleWithGlobalUsing, MonoDevelop.Projects.ProjectReference reference = null)
-			{
-				this.Namespace = @namespace;
-				this.IsAccessibleWithGlobalUsing = isAccessibleWithGlobalUsing;
-				this.Reference = reference;
-			}
-
-			string GetLibraryName ()
-			{
-				var txt = Reference.Reference;
-				int idx = txt.IndexOf (',');
-				if (idx >= 0)
-					return txt.Substring (0, idx);
-				return txt;
-			}
-
-			public string GetImportText ()
-			{
-				if (OnlyAddReference)
-					return GettextCatalog.GetString (
-						"Reference '{0}'", 
-						GetLibraryName ().Replace ("_", "__"));
-				if (Reference != null) 
-						return GettextCatalog.GetString (
-							"Reference '{0}' and use '{1}'", 
-							GetLibraryName (),
-						string.Format ("using {0};", Namespace.Replace ("_", "__")));
-
-				return string.Format ("using {0};", Namespace.Replace ("_", "__"));
-			}
-
-			public string GetInsertNamespaceText (string member)
-			{
-				if (Reference != null) 
-					return GettextCatalog.GetString (
-						"Reference '{0}' and use '{1}'", 
-						GetLibraryName ().Replace ("_", "__"),
-						(Namespace + "." + member).Replace ("_", "__")
-					);
-				return (Namespace + "." + member).Replace ("_", "__");
-			}
-		}
-
-		internal static bool CanBeReferenced (Project project, SystemAssembly systemAssembly)
-		{
-			var netProject = project as DotNetProject;
-			if (netProject == null)
-				return false;
-			var result = netProject.TargetRuntime.AssemblyContext.GetAssemblyNameForVersion(systemAssembly.FullName, netProject.TargetFramework);
-			return !string.IsNullOrEmpty (result);
-		}
-
-		static bool CanReference (Document doc, MonoDevelop.Projects.ProjectReference projectReference)
-		{
-			var project = doc.Project as DotNetProject;
-			if (project == null || projectReference == null || project.ParentSolution == null)
-				return true;
-			switch (projectReference.ReferenceType) {
-			case ReferenceType.Project:
-				var referenceProject = projectReference.ResolveProject (project.ParentSolution) as DotNetProject;
-				if (referenceProject == null)
-					return true;
-				string reason;
-				return project.CanReferenceProject (referenceProject, out reason);
-			}
-			return true;
-
-		}
-
-		static IEnumerable<PossibleNamespace> GetPossibleNamespaces (Document doc, AstNode node, ResolveResult resolveResult, DocumentLocation location)
-		{
-			var unit = doc.ParsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
-				yield break;
-			var project = doc.Project;
-			if (project == null)
-				yield break;
-			int tc = GetTypeParameterCount (node);
-			var attribute = unit.GetNodeAt<ICSharpCode.NRefactory.CSharp.Attribute> (location);
-			bool isInsideAttributeType = attribute != null && attribute.Type.Contains (location);
-
-			var compilations = new List<Tuple<ICompilation, MonoDevelop.Projects.ProjectReference>> ();
-			compilations.Add (Tuple.Create (doc.Compilation, (MonoDevelop.Projects.ProjectReference)null));
-			var referencedItems = IdeApp.Workspace != null ? project.GetReferencedItems (IdeApp.Workspace.ActiveConfiguration).ToList () : (IEnumerable<SolutionFolderItem>) new SolutionFolderItem[0];
-			var solution = project != null ? project.ParentSolution : null;
-			if (solution != null) {
-				foreach (var curProject in solution.GetAllProjects ()) {
-					if (curProject == project || referencedItems.Contains (curProject))
-						continue;
-
-					var otherRefes = IdeApp.Workspace != null ? curProject.GetReferencedItems (IdeApp.Workspace.ActiveConfiguration).ToList () : (IEnumerable<SolutionFolderItem>) new SolutionFolderItem[0];
-					if (otherRefes.Contains (project))
-						continue;
-
-					var comp = TypeSystemService.GetCompilation (curProject);
-					if (comp == null)
-						continue;
-					compilations.Add (Tuple.Create (comp, new MonoDevelop.Projects.ProjectReference (curProject)));
-				}
-			}
-
-			var netProject = project as DotNetProject;
-			if (netProject == null) 
-				yield break;
-			FrameworkLookup frameworkLookup;
-			if (!TypeSystemService.TryGetFrameworkLookup (netProject, out frameworkLookup))
-				frameworkLookup = null;
-			if (frameworkLookup != null && resolveResult is UnknownMemberResolveResult) {
-				var umResult = (UnknownMemberResolveResult)resolveResult;
-				try {
-					foreach (var r in frameworkLookup.GetExtensionMethodLookups (umResult)) {
-						var systemAssembly = netProject.AssemblyContext.GetAssemblyFromFullName (r.FullName, r.Package, netProject.TargetFramework);
-						if (systemAssembly == null)
-							continue;
-						if (CanBeReferenced (doc.Project, systemAssembly))
-							compilations.Add (Tuple.Create (TypeSystemService.GetCompilation (systemAssembly, doc.Compilation), new MonoDevelop.Projects.ProjectReference (systemAssembly)));
-					}
-				} catch (Exception e) {
-					if (!TypeSystemService.RecreateFrameworkLookup (netProject))
-						LoggingService.LogError (string.Format ("Error while looking up extension method {0}", umResult.MemberName), e);
-				}
-			}
-			bool foundIdentifier = false;
-			var lookup = new MemberLookup (null, doc.Compilation.MainAssembly);
-			foreach (var comp in compilations) {
-				var compilation = comp.Item1;
-				var requiredReference = comp.Item2;
-				if (resolveResult is AmbiguousTypeResolveResult) {
-					if (compilation != doc.Compilation)
-						continue;
-					var aResult = resolveResult as AmbiguousTypeResolveResult;
-					var file = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-					var scope = file.GetUsingScope (location).Resolve (compilation);
-					while (scope != null) {
-						foreach (var u in scope.Usings) {
-							foreach (var typeDefinition in u.Types) {
-								if (typeDefinition.Name == aResult.Type.Name && 
-								    typeDefinition.TypeParameterCount == tc &&
-								    lookup.IsAccessible (typeDefinition, false)) {
-									if (CanReference(doc, requiredReference))
-										yield return new PossibleNamespace (typeDefinition.Namespace, true, requiredReference);
-								}
-							}
-						}
-						scope = scope.Parent;
-					}
-				}
-				var allTypes =  compilation == doc.Compilation ? compilation.GetAllTypeDefinitions () : compilation.MainAssembly.GetAllTypeDefinitions ();
-				if (resolveResult is UnknownIdentifierResolveResult) {
-					var uiResult = resolveResult as UnknownIdentifierResolveResult;
-					string possibleAttributeName = isInsideAttributeType ? uiResult.Identifier + "Attribute" : uiResult.Identifier;
-					foreach (var typeDefinition in allTypes) {
-						if ((typeDefinition.Name == possibleAttributeName || typeDefinition.Name == uiResult.Identifier) && typeDefinition.TypeParameterCount == tc &&
-						    lookup.IsAccessible (typeDefinition, false)) {
-							if (CanReference (doc, requiredReference)) {
-								if (typeDefinition.DeclaringTypeDefinition != null) {
-									var builder = new TypeSystemAstBuilder (new CSharpResolver (doc.Compilation));
-									foundIdentifier = true;
-									yield return new PossibleNamespace (builder.ConvertType (typeDefinition.DeclaringTypeDefinition).ToString (), false, requiredReference);
-								} else {
-									foundIdentifier = true;
-									yield return new PossibleNamespace (typeDefinition.Namespace, true, requiredReference);
-								}
-							}
-						}
-					}
-				}
-
-				if (resolveResult is UnknownMemberResolveResult) {
-					var umResult = (UnknownMemberResolveResult)resolveResult;
-					string possibleAttributeName = isInsideAttributeType ? umResult.MemberName + "Attribute" : umResult.MemberName;
-					foreach (var typeDefinition in allTypes.Where (t => t.HasExtensionMethods)) {
-						if (!lookup.IsAccessible (typeDefinition, false))
-							continue;
-						foreach (var method in typeDefinition.Methods.Where (m => m.IsExtensionMethod && (m.Name == possibleAttributeName || m.Name == umResult.MemberName))) {
-							if (!lookup.IsAccessible (method, false))
-								continue;
-							IType[] inferredTypes;
-							if (CSharpResolver.IsEligibleExtensionMethod (
-								compilation.Import (umResult.TargetType),
-								method,
-								true,
-								out inferredTypes
-							)) {
-								if (CanReference(doc, requiredReference))
-									yield return new PossibleNamespace (typeDefinition.Namespace, true, requiredReference);
-								goto skipType;
-							}
-						}
-						skipType:
-						;
-					}
-				}
-				
-				if (resolveResult is ErrorResolveResult) {
-					var identifier = unit != null ? unit.GetNodeAt<Identifier> (location) : null;
-					if (identifier != null) {
-						var uiResult = resolveResult as UnknownIdentifierResolveResult;
-						if (uiResult != null) {
-							string possibleAttributeName = isInsideAttributeType ? uiResult.Identifier + "Attribute" : uiResult.Identifier;
-							foreach (var typeDefinition in allTypes) {
-								if ((identifier.Name == possibleAttributeName || identifier.Name == uiResult.Identifier) && 
-									typeDefinition.TypeParameterCount == tc && 
-									lookup.IsAccessible (typeDefinition, false))
-									if (CanReference(doc, requiredReference))
-										yield return new PossibleNamespace (typeDefinition.Namespace, true, requiredReference);
-							}
-						}
-					}
-				}
-			}
-
-			// Try to search framework types
-			if (!foundIdentifier && frameworkLookup != null && resolveResult is UnknownIdentifierResolveResult && node is AstType) {
-				var uiResult = resolveResult as UnknownIdentifierResolveResult;
-				if (uiResult != null) {
-					var lookups = new List<Tuple<FrameworkLookup.AssemblyLookup, SystemAssembly>> ();
-					try {
-						foreach (var r in frameworkLookup.GetLookups (uiResult, tc, isInsideAttributeType)) {
-							var systemAssembly = netProject.AssemblyContext.GetAssemblyFromFullName (r.FullName, r.Package, netProject.TargetFramework);
-							if (systemAssembly == null)
-								continue;
-							if (CanBeReferenced (doc.Project, systemAssembly))
-								lookups.Add (Tuple.Create (r, systemAssembly));
-						}
-					} catch (Exception e) {
-						if (!TypeSystemService.RecreateFrameworkLookup (netProject))
-							LoggingService.LogError (string.Format ("Error while looking up identifier {0}", uiResult.Identifier), e);
-					}
-					foreach(var kv in lookups)
-						if (CanReference(doc, new MonoDevelop.Projects.ProjectReference (kv.Item2)))
-							yield return new PossibleNamespace (kv.Item1.Namespace, true, new MonoDevelop.Projects.ProjectReference (kv.Item2));
-
-				}
-			}
-			if (!foundIdentifier && frameworkLookup != null && resolveResult is UnknownMemberResolveResult) {
-				var uiResult = resolveResult as UnknownMemberResolveResult;
-				if (uiResult != null) {
-					var lookups = new List<Tuple<FrameworkLookup.AssemblyLookup, SystemAssembly>> ();
-					try {
-						foreach (var r in frameworkLookup.GetLookups (uiResult, node.ToString (), tc, isInsideAttributeType)) {
-							var systemAssembly = netProject.AssemblyContext.GetAssemblyFromFullName (r.FullName, r.Package, netProject.TargetFramework);
-							if (systemAssembly == null)
-								continue;
-							if (CanBeReferenced (doc.Project, systemAssembly))
-								lookups.Add (Tuple.Create (r, systemAssembly));
-						}
-					} catch (Exception e) {
-						if (!TypeSystemService.RecreateFrameworkLookup (netProject))
-							LoggingService.LogError (string.Format ("Error while looking up member resolve result {0}", node), e);
-					}
-					foreach(var kv in lookups)
-						if (CanReference(doc, new MonoDevelop.Projects.ProjectReference (kv.Item2)))
-							yield return new PossibleNamespace (kv.Item1.Namespace, true, new MonoDevelop.Projects.ProjectReference (kv.Item2));
-				}
-			}
-
-		}
-
-		internal class AddImport
-		{
-			readonly Document doc;
-			readonly ResolveResult resolveResult;
-			readonly string ns;
-			readonly bool addUsing;
-			readonly AstNode node;
-			readonly MonoDevelop.Projects.ProjectReference reference;
-
-			public AddImport (Document doc, ResolveResult resolveResult, string ns, MonoDevelop.Projects.ProjectReference reference, bool addUsing, AstNode node)
-			{
-				this.doc = doc;
-				this.resolveResult = resolveResult;
-				this.ns = ns;
-				this.reference = reference;
-				this.addUsing = addUsing;
-				this.node = node;
-			}
-			
-			public void Run ()
-			{
-				var loc = doc.Editor.Caret.Location;
-
-				if (reference != null) {
-					var project = doc.Project;
-					project.Items.Add (reference);
-					IdeApp.ProjectOperations.SaveAsync (project);
-				}
-
-				if (string.IsNullOrEmpty (ns))
-					return;
-
-				if (!addUsing) {
-//					var unit = doc.ParsedDocument.GetAst<SyntaxTree> ();
-					int offset = doc.Editor.LocationToOffset (node.StartLocation);
-					doc.Editor.Insert (offset, ns + ".");
-					doc.Editor.Document.CommitLineUpdate (loc.Line);
-					return;
-				}
-
-				var generator = doc.CreateCodeGenerator ();
-
-				if (resolveResult is NamespaceResolveResult) {
-					generator.AddLocalNamespaceImport (doc, ns, loc);
-				} else {
-					generator.AddGlobalNamespaceImport (doc, ns);
-				}
-			}
-		}
-		
-		protected override void Run (object data)
-		{
-			var del = (System.Action)data;
-			if (del != null)
-				del ();
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic
index 11b6e6c4d6..9f49f22dde 100644
--- a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic
@@ -6,9 +6,8 @@
   </configuration>
   <import>
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
-    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" />
+    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll" internal="true" />
   </import>
   <widget class="Gtk.Dialog" id="MonoDevelop.Refactoring.RefactoringPreviewDialog" design-size="400 300">
diff --git a/main/src/addins/MonoDevelop.Refactoring/packages.config b/main/src/addins/MonoDevelop.Refactoring/packages.config
new file mode 100644
index 0000000000..796aed48f4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/packages.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj
index 707c2c6c9a..785be8556a 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj
@@ -79,16 +79,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs
index 044f2705aa..482dbcaded 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs
@@ -57,7 +57,7 @@ namespace MonoDevelop.RegexToolkit
 			IsViewOnly = true;
 		}
 		
-		public override void Load (string fileName)
+		public override void Load (FileOpenInformation fileOpenInformation)
 		{
 			throw new System.NotImplementedException ();
 		}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs b/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs
index f9f893a74a..f4bee85833 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs
@@ -8,3 +8,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDescription ("Provides a text editor for the MonoDevelop based on Mono.TextEditor")]
 [assembly: AssemblyVersion ("2.6")]
 [assembly: InternalsVisibleTo("UnitTests")]
+[assembly: InternalsVisibleTo("MonoDevelop.VersionControl")]
+[assembly: InternalsVisibleTo("MonoDevelop.Refactoring")]
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs
index ccf1be8f63..0d4d9dfe23 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs
@@ -27,6 +27,7 @@ using System;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Dialogs;
 using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
@@ -53,7 +54,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			smartSemicolonPlaceCheckbutton.Active = DefaultSourceEditorOptions.Instance.SmartSemicolonPlacement;
 			
 			tabAsReindentCheckbutton.Active = DefaultSourceEditorOptions.Instance.TabIsReindent;
-			indentationCombobox.Active = (int)DefaultSourceEditorOptions.Instance.IndentStyle;
+			indentationCombobox.Active = Math.Min (2, (int)DefaultSourceEditorOptions.Instance.IndentStyle);
 			controlLeftRightCombobox.Active = (int)DefaultSourceEditorOptions.Instance.WordNavigationStyle;
 			useViModesCheck.Active = DefaultSourceEditorOptions.Instance.UseViModes;
 			checkbuttonOnTheFlyFormatting.Active = DefaultSourceEditorOptions.Instance.OnTheFlyFormatting;
@@ -76,7 +77,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			//DefaultSourceEditorOptions.Options.AutoInsertTemplates = this.autoInsertTemplateCheckbutton.Active;
 			DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket = autoInsertBraceCheckbutton.Active;
 			DefaultSourceEditorOptions.Instance.SmartSemicolonPlacement = smartSemicolonPlaceCheckbutton.Active;
-			DefaultSourceEditorOptions.Instance.IndentStyle = (IndentStyle)indentationCombobox.Active;
+			DefaultSourceEditorOptions.Instance.IndentStyle = (MonoDevelop.Ide.Editor.IndentStyle)indentationCombobox.Active;
 			DefaultSourceEditorOptions.Instance.TabIsReindent = tabAsReindentCheckbutton.Active;
 			DefaultSourceEditorOptions.Instance.WordNavigationStyle = (WordNavigationStyle)controlLeftRightCombobox.Active;
 			DefaultSourceEditorOptions.Instance.UseViModes = useViModesCheck.Active;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/ColorShemeEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/ColorShemeEditor.cs
index 889f8aa7a7..32ec419c67 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/ColorShemeEditor.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/ColorShemeEditor.cs
@@ -29,14 +29,15 @@ using Mono.TextEditor.Highlighting;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using Gtk;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
 	public partial class ColorShemeEditor : Gtk.Dialog
 	{
-		TextEditor textEditor;
+		MonoTextEditor textEditor;
 		ColorScheme colorSheme;
-		TreeStore colorStore = new Gtk.TreeStore (typeof (string), typeof(ColorScheme.PropertyDecsription), typeof(object));
+		TreeStore colorStore = new Gtk.TreeStore (typeof (string), typeof(ColorScheme.PropertyDescription), typeof(object));
 		string fileName;
 		HighlightingPanel panel;
 
@@ -44,8 +45,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		{
 			this.panel = panel;
 			this.Build ();
-			textEditor = new TextEditor ();
-			textEditor.Options = DefaultSourceEditorOptions.Instance;
+			textEditor = new MonoTextEditor ();
+			textEditor.Options = new StyledSourceEditorOptions (MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance);
 			this.scrolledwindowTextEditor.Child = textEditor;
 			textEditor.ShowAll ();
 			
@@ -70,7 +71,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		void SyntaxCellRenderer (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter)
 		{
 			var renderer = (Gtk.CellRendererText)cell;
-			var data = (ColorScheme.PropertyDecsription)colorStore.GetValue (iter, 1);
+			var data = (ColorScheme.PropertyDescription)colorStore.GetValue (iter, 1);
 			string markup = GLib.Markup.EscapeText (data.Attribute.Name);
 			renderer.Markup = markup;
 		}
@@ -83,7 +84,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			Gtk.TreeIter iter;
 			if (colorStore.GetIterFirst (out iter)) {
 				do {
-					var data = (ColorScheme.PropertyDecsription)colorStore.GetValue (iter, 1);
+					var data = (ColorScheme.PropertyDescription)colorStore.GetValue (iter, 1);
 					var style = colorStore.GetValue (iter, 2);
 					data.Info.SetValue (sheme, style, null);
 				} while (colorStore.IterNext (ref iter));
@@ -97,8 +98,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 				if (editor == null)
 					continue;
 				doc.UpdateParseDocument ();
-				editor.Parent.TextViewMargin.PurgeLayoutCache ();
-				editor.Document.CommitUpdateAll ();
+//				editor.Parent.TextViewMargin.PurgeLayoutCache ();
+//				editor.Document.CommitUpdateAll ();
 			}
 		
 		}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionAppearancePanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionAppearancePanel.cs
index c51e0406d2..6db697e4d4 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionAppearancePanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionAppearancePanel.cs
@@ -26,6 +26,7 @@
 using System;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
@@ -52,7 +53,6 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 
 		Gtk.Widget IOptionsPanel.CreatePanelWidget ()
 		{
-			spinbutton1.Value = CompletionTextEditorExtension.CompletionListRows;
 			filterByBrowsableCheckbutton.Active = CompletionTextEditorExtension.FilterCompletionListByEditorBrowsable;
 			normalOnlyRadiobutton.Active = !CompletionTextEditorExtension.IncludeEditorBrowsableAdvancedMembers;
 			includeAdvancedRadiobutton.Active = CompletionTextEditorExtension.IncludeEditorBrowsableAdvancedMembers;
@@ -72,7 +72,6 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 
 		void IOptionsPanel.ApplyChanges ()
 		{
-			CompletionTextEditorExtension.CompletionListRows.Value = spinbutton1.ValueAsInt;
 			CompletionTextEditorExtension.FilterCompletionListByEditorBrowsable.Value = filterByBrowsableCheckbutton.Active;
 			CompletionTextEditorExtension.IncludeEditorBrowsableAdvancedMembers.Value = includeAdvancedRadiobutton.Active;
 		}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs
index 175d8528ed..83f4b36617 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs
@@ -32,7 +32,7 @@ using System.Collections.Generic;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
-	public class CompletionCharactersPanel : VBox, IOptionsPanel
+	class CompletionCharactersPanel : VBox, IOptionsPanel
 	{
 		ListView list;
 		ListStore store;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs
index 5586c8edf8..ef5b6d050f 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs
@@ -26,6 +26,8 @@
 using System;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs
index 17a3c6a6cc..9763ea2637 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs
@@ -26,7 +26,8 @@
 using System;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Content; 
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor; 
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
@@ -58,7 +59,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		{
 			DefaultSourceEditorOptions.Instance.DefaultRegionsFolding = this.foldregionsCheckbutton.Active;
 			DefaultSourceEditorOptions.Instance.DefaultCommentFolding = this.foldCommentsCheckbutton.Active;
-			DefaultSourceEditorOptions.Instance.LineEndingConversion = (LineEndingConversion)this.comboboxLineEndings.Active;
+			DefaultSourceEditorOptions.Instance.LineEndingConversion = (MonoDevelop.Ide.Editor.LineEndingConversion)this.comboboxLineEndings.Active;
 			if (DefaultSourceEditorOptions.Instance.ShowFoldMargin != this.foldingCheckbutton.Active) {
 				DefaultSourceEditorOptions.Instance.ShowFoldMargin = this.foldingCheckbutton.Active;
 				HighlightingPanel.UpdateActiveDocument ();
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
index 350d80757c..d4f0847a22 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
@@ -32,6 +32,7 @@ using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui.Dialogs;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
@@ -47,8 +48,6 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			this.Build ();
 			styleTreeview.AppendColumn ("", new CellRendererText (), "markup", 0);
 			styleTreeview.Model = styleStore;
-			// ensure that custom styles are loaded.
-			new SourceEditorDisplayBinding ();
 			schemeName = DefaultSourceEditorOptions.Instance.ColorScheme;
 		}
 		
@@ -167,8 +166,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			var sheme = (ColorScheme)this.styleStore.GetValue (selectedIter, 1);
 			
 			string fileName = sheme.FileName;
-			
-			if (fileName != null && fileName.StartsWith (SourceEditorDisplayBinding.SyntaxModePath, StringComparison.Ordinal)) {
+
+			if (fileName != null && fileName.StartsWith (MonoDevelop.Ide.Editor.TextEditorDisplayBinding.SyntaxModePath, StringComparison.Ordinal)) {
 				Mono.TextEditor.Highlighting.SyntaxModeService.Remove (sheme);
 				File.Delete (fileName);
 				ShowStyles ();
@@ -204,7 +203,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			if (!dialog.Run ())
 				return;
 
-			string newFileName = SourceEditorDisplayBinding.SyntaxModePath.Combine (dialog.SelectedFile.FileName);
+			string newFileName = MonoDevelop.Ide.Editor.TextEditorDisplayBinding.SyntaxModePath.Combine (dialog.SelectedFile.FileName);
 
 			bool success = true;
 			try {
@@ -214,7 +213,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 				LoggingService.LogError ("Can't copy syntax mode file.", e);
 			}
 			if (success) {
-				SourceEditorDisplayBinding.LoadCustomStylesAndModes ();
+				MonoDevelop.Ide.Editor.TextEditorDisplayBinding.LoadCustomStylesAndModes ();
 				ShowStyles ();
 			}
 		}
@@ -227,11 +226,11 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		{
 			if (IdeApp.Workbench.ActiveDocument != null) {
 				IdeApp.Workbench.ActiveDocument.UpdateParseDocument ();
-				var editor = IdeApp.Workbench.ActiveDocument.Editor;
-				if (editor != null) {
-					editor.Parent.TextViewMargin.PurgeLayoutCache ();
-					editor.Parent.QueueDraw ();
-				}
+//				var editor = IdeApp.Workbench.ActiveDocument.Editor;
+//				if (editor != null) {
+//					editor.Parent.TextViewMargin.PurgeLayoutCache ();
+//					editor.Parent.QueueDraw ();
+//				}
 			}
 		}
 		
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs
index f983b9f003..ced732ecbc 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs
@@ -26,7 +26,7 @@
 using System;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Core;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.Ide;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs
index f4b3975f73..d5f965d4fb 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs
@@ -68,7 +68,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			style.Name = this.entryName.Text;
 			style.Description = this.entryDescription.Text;
 			style.BaseScheme = name;
-			string path = SourceEditorDisplayBinding.SyntaxModePath;
+			string path = MonoDevelop.Ide.Editor.TextEditorDisplayBinding.SyntaxModePath;
 			string baseName = style.Name.Replace (" ", "_");
 			
 			while (File.Exists (System.IO.Path.Combine (path, baseName + "Style.json"))) {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs
index c089b13afe..1d851cee49 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs
@@ -33,10 +33,11 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Components.Commands;
 using ICSharpCode.NRefactory;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.SourceEditor.QuickTasks
 {
-	public class QuickTaskMiniMapMode : HBox
+	class QuickTaskMiniMapMode : HBox
 	{
 		QuickTaskOverviewMode rightMap;
 
@@ -49,7 +50,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			PackStart (rightMap, true, true, 0);
 		}
 
-		public class Minimpap : QuickTaskOverviewMode
+		class Minimpap : QuickTaskOverviewMode
 		{
 			const double lineHeight = 2;
 
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
index c423ff5fae..e206c5c6c3 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
@@ -26,21 +26,21 @@
 
 using System;
 using Gtk;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using Gdk;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.Refactoring;
 using MonoDevelop.Ide;
 using System.Linq;
 using MonoDevelop.Components;
 using Mono.TextEditor.Theatrics;
+using MonoDevelop.Ide.Editor;
 using Xwt.Drawing;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.SourceEditor.QuickTasks
 {
-	public class QuickTaskOverviewMode : DrawingArea
+	class QuickTaskOverviewMode : DrawingArea
 	{
 		static Xwt.Drawing.Image searchImage = Xwt.Drawing.Image.FromResource ("issues-busy-16.png");
 		static Xwt.Drawing.Image okImage = Xwt.Drawing.Image.FromResource ("issues-ok-16.png");
@@ -78,14 +78,14 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		static readonly Cairo.Color win81SliderPrelight = new Cairo.Color (166/255d, 166/255d, 166/255d);
 		static readonly Cairo.Color win81SliderActive = new Cairo.Color (96/255d, 96/255d, 96/255d);
 
-		readonly int barPadding = Platform.IsWindows? 1 : 3;
+		readonly int barPadding = MonoDevelop.Core.Platform.IsWindows? 1 : 3;
 
 		readonly QuickTaskStrip parentStrip;
 		protected readonly Adjustment vadjustment;
 		
 		int caretLine = -1;
 		
-		public TextEditor TextEditor {
+		public Mono.TextEditor.MonoTextEditor TextEditor {
 			get;
 			private set;
 		}
@@ -141,7 +141,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			yPositionCache.Clear ();
 		}
 
-		void HandleLineUpdateFrom (object sender, HeightTree.HeightChangedEventArgs e)
+		void HandleLineUpdateFrom (object sender, Mono.TextEditor.HeightTree.HeightChangedEventArgs e)
 		{
 			yPositionCache.Clear ();
 		}
@@ -191,7 +191,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			return y < IndicatorHeight;
 		}
 		
-		internal CodeSegmentPreviewWindow previewWindow;
+		internal Mono.TextEditor.CodeSegmentPreviewWindow previewWindow;
 
 		protected override bool OnMotionNotifyEvent (EventMotion evnt)
 		{
@@ -217,7 +217,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 				if (start == null || end == null) {
 					return base.OnMotionNotifyEvent (evnt);
 				}
-				var showSegment = new TextSegment (start.Offset, end.Offset + end.Length - start.Offset);
+				var showSegment = new Mono.TextEditor.TextSegment (start.Offset, end.Offset + end.Length - start.Offset);
 				
 				if (previewWindow != null) {
 					previewWindow.SetSegment (showSegment, false);
@@ -303,22 +303,22 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			return false;
 		}
 
-		void CountTasks (out int errors, out int warnings, out int hints, out int suggestions)
+		void CountTasks (out int errors, out int warnings, out int infos, out int hidden)
 		{
-			errors = warnings = hints = suggestions = 0;
+			errors = warnings = infos = hidden = 0;
 			foreach (var task in AllTasks) {
 				switch (task.Severity) {
-				case Severity.Error:
+				case DiagnosticSeverity.Error:
 					errors++;
 					break;
-				case Severity.Warning:
+				case DiagnosticSeverity.Warning:
 					warnings++;
 					break;
-				case Severity.Hint:
-					hints++;
+				case DiagnosticSeverity.Info:
+					infos++;
 					break;
-				case Severity.Suggestion:
-					suggestions++;
+				case DiagnosticSeverity.Hidden:
+					hidden++;
 					break;
 				}
 			}
@@ -328,7 +328,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		{
 			QuickTask hoverTask = null;
 			foreach (var task in AllTasks) {
-				double ty = GetYPosition (task.Location.Line);
+				double ty = GetYPosition (TextEditor.OffsetToLineNumber (task.Location));
 				if (Math.Abs (ty - y) < 3) {
 					hoverTask = task;
 				}
@@ -347,10 +347,10 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		class PreviewPopup {
 			
 			QuickTaskOverviewMode strip;
-			TextSegment segment;
+			Mono.TextEditor.TextSegment segment;
 			int w, y;
 			
-			public PreviewPopup (QuickTaskOverviewMode strip, TextSegment segment, int w, int y)
+			public PreviewPopup (QuickTaskOverviewMode strip, Mono.TextEditor.TextSegment segment, int w, int y)
 			{
 				this.strip = strip;
 				this.segment = segment;
@@ -360,7 +360,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			
 			public bool Run ()
 			{
-				strip.previewWindow = new CodeSegmentPreviewWindow (strip.TextEditor, true, segment, w, -1, false);
+				strip.previewWindow = new Mono.TextEditor.CodeSegmentPreviewWindow (strip.TextEditor, true, segment, w, -1, false);
 				strip.previewWindow.WidthRequest = w;
 				strip.previewWindow.Show ();
 				strip.PositionPreviewWindow (y);
@@ -459,21 +459,19 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			return base.OnLeaveNotifyEvent (evnt);
 		}
 		
-		Cairo.Color GetBarColor (Severity severity)
+		Cairo.Color GetBarColor (DiagnosticSeverity severity)
 		{
 			var style = this.TextEditor.ColorStyle;
 			if (style == null)
 				return new Cairo.Color (0, 0, 0);
 			switch (severity) {
-			case Severity.Error:
+			case DiagnosticSeverity.Error:
 				return style.UnderlineError.Color;
-			case Severity.Warning:
+			case DiagnosticSeverity.Warning:
 				return style.UnderlineWarning.Color;
-			case Severity.Suggestion:
+			case DiagnosticSeverity.Info:
 				return style.UnderlineSuggestion.Color;
-			case Severity.Hint:
-				return style.UnderlineHint.Color;
-			case Severity.None:
+			case DiagnosticSeverity.Hidden:
 				return style.PlainText.Background;
 			default:
 				throw new ArgumentOutOfRangeException ();
@@ -482,7 +480,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 
 		protected virtual double IndicatorHeight  {
 			get {
-				return Platform.IsWindows ? Allocation.Width : 3 + 8 + 3;
+				return MonoDevelop.Core.Platform.IsWindows ? Allocation.Width : 3 + 8 + 3;
 			}
 		}
 		
@@ -551,14 +549,11 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 
 		void MoveToTask (QuickTask task)
 		{
-			if (task.Location.IsEmpty) {
-				Console.WriteLine ("empty:" + task.Description);
-			}
-			var loc = new DocumentLocation (
-				Math.Max (DocumentLocation.MinLine, task.Location.Line),
-				Math.Max (DocumentLocation.MinColumn, task.Location.Column)
-			);
-			TextEditor.Caret.Location = loc;
+//			var loc = new DocumentLocation (
+//				Math.Max (DocumentLocation.MinLine, task.Location.Line),
+//				Math.Max (DocumentLocation.MinColumn, task.Location.Column)
+//			);
+			TextEditor.Caret.Offset = task.Location;
 			TextEditor.CenterToCaret ();
 			TextEditor.StartCaretPulseAnimation ();
 			TextEditor.GrabFocus ();
@@ -575,18 +570,17 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			return QuickTaskStrip.HoverMode.NextMessage;
 		}
 
-		protected void DrawIndicator (Cairo.Context cr, Severity severity)
+		protected void DrawIndicator (Cairo.Context cr, DiagnosticSeverity severity)
 		{
 			Xwt.Drawing.Image image;
 			switch (severity) {
-			case Severity.Error:
+			case DiagnosticSeverity.Error:
 				image = errorImage;
 				break;
-			case Severity.Warning:
+			case DiagnosticSeverity.Warning:
 				image = warningImage;
 				break;
-			case Severity.Suggestion:
-			case Severity.Hint:
+			case DiagnosticSeverity.Info:
 				image = suggestionImage;
 				break;
 			default:
@@ -610,7 +604,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		protected override void OnSizeRequested (ref Requisition requisition)
 		{
 			base.OnSizeRequested (ref requisition);
-			requisition.Width = Platform.IsWindows? 17 : 15;
+			requisition.Width = MonoDevelop.Core.Platform.IsWindows? 17 : 15;
 		}
 		
 		double LineToY (int logicalLine)
@@ -653,16 +647,18 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			return y;
 		}
 
-		protected Severity DrawQuickTasks (Cairo.Context cr)
+		protected DiagnosticSeverity DrawQuickTasks (Cairo.Context cr)
 		{
-			Severity severity = Severity.None;
+			DiagnosticSeverity severity = DiagnosticSeverity.Hidden;
 
 			foreach (var usage in AllUsages) {
-				double y = GetYPosition (usage.Location.Line);
+				double y = GetYPosition (TextEditor.OffsetToLineNumber (usage.Offset));
 				var usageColor = TextEditor.ColorStyle.PlainText.Foreground;
 				usageColor.A = 0.4;
 				HslColor color;
-				if ((usage.UsageType & MonoDevelop.Ide.FindInFiles.ReferenceUsageType.Write) != 0) {
+				if ((usage.UsageType & MonoDevelop.Ide.FindInFiles.ReferenceUsageType.Declariton) != 0) {
+					color = TextEditor.ColorStyle.ChangingUsagesRectangle.Color;
+				} else if ((usage.UsageType & MonoDevelop.Ide.FindInFiles.ReferenceUsageType.Write) != 0) {
 					color = TextEditor.ColorStyle.ChangingUsagesRectangle.Color;
 				} else if ((usage.UsageType & MonoDevelop.Ide.FindInFiles.ReferenceUsageType.Read) != 0) {
 					color = TextEditor.ColorStyle.UsagesRectangle.Color;
@@ -680,21 +676,12 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			}
 
 			foreach (var task in AllTasks) {
-				double y = GetYPosition (task.Location.Line);
+				double y = GetYPosition (TextEditor.OffsetToLineNumber (task.Location));
 
 				cr.SetSourceColor (GetBarColor (task.Severity));
 				cr.Rectangle (0, Math.Round (y) - 1, Allocation.Width, 2);
 				cr.Fill ();
-
-				switch (task.Severity) {
-				case Severity.Error:
-					severity = Severity.Error;
-					break;
-				case Severity.Warning:
-					if (severity == Severity.None)
-						severity = Severity.Warning;
-					break;
-				}
+				severity = task.Severity;
 			}
 			return severity;
 		}
@@ -705,7 +692,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			cr.LineTo (0.5, Allocation.Height);
 			if (TextEditor.ColorStyle != null) {
 				var col = TextEditor.ColorStyle.PlainText.Background.ToXwtColor ();
-				if (!Platform.IsWindows) {
+				if (!MonoDevelop.Core.Platform.IsWindows) {
 					col.Light *= 0.88;
 				}
 				cr.SetSourceColor (col.ToCairoColor ());
@@ -723,11 +710,11 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		{
 			var alloc = Allocation;
 
-			x = Platform.IsWindows ? 0 : 1 + barPadding;
+			x = MonoDevelop.Core.Platform.IsWindows ? 0 : 1 + barPadding;
 			var adjUpper = vadjustment.Upper;
 			var allocH = alloc.Height - (int) IndicatorHeight;
 			y = IndicatorHeight + Math.Round (allocH * vadjustment.Value / adjUpper);
-			w = Platform.IsWindows ? alloc.Width : 8;
+			w = MonoDevelop.Core.Platform.IsWindows ? alloc.Width : 8;
 			const int minBarHeight = 16;
 			h = Math.Max (minBarHeight, Math.Round (allocH * (vadjustment.PageSize / adjUpper)) - barPadding - barPadding);
 		}
@@ -744,7 +731,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			double x, y, w, h;
 			GetBarDimensions (out x, out y, out w, out h);
 
-			if (Platform.IsWindows) {
+			if (MonoDevelop.Core.Platform.IsWindows) {
 				cr.Rectangle (x, y, w, h);
 			} else {
 				MonoDevelop.Components.CairoExtensions.RoundedRectangle (cr, x, y, w, h, 4);
@@ -753,7 +740,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			bool prelight = State == StateType.Prelight;
 
 			Cairo.Color c;
-			if (Platform.IsWindows) {
+			if (MonoDevelop.Core.Platform.IsWindows) {
 				c = prelight ? win81SliderPrelight : win81Slider;
 				//compute new color such that it will produce same color when blended with bg
 				c = AddAlpha (win81Background, c, 0.5d);
@@ -803,7 +790,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 				cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
 				
 				if (TextEditor.ColorStyle != null) {
-					if (Platform.IsWindows) {
+					if (MonoDevelop.Core.Platform.IsWindows) {
 						using (var pattern = new Cairo.SolidPattern (win81Background)) {
 							cr.SetSource (pattern);
 						}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs
index 052f69f046..9c5dfec002 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs
@@ -35,14 +35,17 @@ using MonoDevelop.Components.Commands;
 using ICSharpCode.NRefactory;
 using System.Linq;
 using ICSharpCode.NRefactory.Refactoring;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.SourceEditor.QuickTasks
 {
-	public class QuickTaskStrip : VBox
+	class QuickTaskStrip : VBox
 	{
 		// move that one to AnalysisOptions when the new features are enabled by default.
-		public readonly static PropertyWrapper<bool> EnableFancyFeatures = new PropertyWrapper<bool> ("MonoDevelop.AnalysisCore.AnalysisEnabled", false);
-		public readonly static bool MergeScrollBarAndQuickTasks = !Platform.IsMac;
+		public readonly static PropertyWrapper<bool> EnableFancyFeatures = new PropertyWrapper<bool> ("MonoDevelop.AnalysisCore.AnalysisEnabled", true);
+		public readonly static bool MergeScrollBarAndQuickTasks = !MonoDevelop.Core.Platform.IsMac;
 
 		static QuickTaskStrip ()
 		{
@@ -61,8 +64,8 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			}
 		}
 		
-		Mono.TextEditor.TextEditor textEditor;
-		public TextEditor TextEditor {
+		Mono.TextEditor.MonoTextEditor textEditor;
+		public Mono.TextEditor.MonoTextEditor TextEditor {
 			get {
 				return textEditor;
 			}
@@ -87,7 +90,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		}
 		
 		Dictionary<IQuickTaskProvider, List<QuickTask>> providerTasks = new Dictionary<IQuickTaskProvider, List<QuickTask>> ();
-		Dictionary<IUsageProvider, List<Usage>> providerUsages = new Dictionary<IUsageProvider, List<Usage>> ();
+		Dictionary<UsageProviderEditorExtension, List<Usage>> providerUsages = new Dictionary<UsageProviderEditorExtension, List<Usage>> ();
 
 		public IEnumerable<QuickTask> AllTasks {
 			get {
@@ -176,7 +179,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			OnTaskProviderUpdated (EventArgs.Empty);
 		}
 		
-		public void Update (IUsageProvider provider)
+		public void Update (UsageProviderEditorExtension provider)
 		{
 			if (providerTasks == null)
 				return;
@@ -255,13 +258,13 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		internal enum HoverMode { NextMessage, NextWarning, NextError }
 		internal QuickTask SearchNextTask (HoverMode mode)
 		{
-			var curLoc = (TextLocation)TextEditor.Caret.Location;
+			var curLoc = TextEditor.Caret.Offset;
 			QuickTask firstTask = null;
 			foreach (var task in AllTasks.OrderBy (t => t.Location) ) {
 				bool isNextTask = task.Location > curLoc;
 				if (mode == HoverMode.NextMessage ||
-					mode == HoverMode.NextWarning && task.Severity == Severity.Warning ||
-					mode == HoverMode.NextError && task.Severity == Severity.Error) {
+					mode == HoverMode.NextWarning && task.Severity == DiagnosticSeverity.Warning ||
+					mode == HoverMode.NextError && task.Severity == DiagnosticSeverity.Error) {
 					if (isNextTask)
 						return task;
 					if (firstTask == null)
@@ -273,13 +276,13 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 
 		internal QuickTask SearchPrevTask (HoverMode mode)
 		{
-			var curLoc = (TextLocation)TextEditor.Caret.Location;
+			var curLoc = TextEditor.Caret.Offset;
 			QuickTask firstTask = null;
 			foreach (var task in AllTasks.OrderByDescending (t => t.Location) ) {
 				bool isNextTask = task.Location < curLoc;
 				if (mode == HoverMode.NextMessage ||
-					mode == HoverMode.NextWarning && task.Severity == Severity.Warning ||
-					mode == HoverMode.NextError && task.Severity == Severity.Error) {
+					mode == HoverMode.NextWarning && task.Severity == DiagnosticSeverity.Warning ||
+					mode == HoverMode.NextError && task.Severity == DiagnosticSeverity.Error) {
 					if (isNextTask)
 						return task;
 					if (firstTask == null)
@@ -293,10 +296,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		{
 			if (quickTask == null)
 				return;
-			var line = quickTask.Location.Line;
-			if (line < 1 || line >= TextEditor.LineCount)
-				return;
-			TextEditor.Caret.Location = new TextLocation (line, Math.Max (1, quickTask.Location.Column));
+			TextEditor.Caret.Offset = quickTask.Location;
 			TextEditor.CenterToCaret ();
 			TextEditor.StartCaretPulseAnimation ();
 			TextEditor.GrabFocus ();
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/DocumentLineWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/DocumentLineWrapper.cs
new file mode 100644
index 0000000000..ea5db27406
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/DocumentLineWrapper.cs
@@ -0,0 +1,122 @@
+//
+// DocumentLineWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class DocumentLineWrapper : MonoDevelop.Ide.Editor.IDocumentLine
+	{
+		public Mono.TextEditor.DocumentLine Line {
+			get;
+			private set;
+		}
+
+		public DocumentLineWrapper (Mono.TextEditor.DocumentLine line)
+		{
+			if (line == null)
+				throw new ArgumentNullException ("line");
+			this.Line = line;
+		}
+
+		#region IDocumentLine implementation
+		int MonoDevelop.Ide.Editor.IDocumentLine.LengthIncludingDelimiter {
+			get {
+				return Line.LengthIncludingDelimiter;
+			}
+		}
+
+		int MonoDevelop.Ide.Editor.IDocumentLine.EndOffsetIncludingDelimiter {
+			get {
+				return Line.EndOffsetIncludingDelimiter;
+			}
+		}
+
+		MonoDevelop.Core.Text.ISegment MonoDevelop.Ide.Editor.IDocumentLine.SegmentIncludingDelimiter {
+			get {
+				return MonoDevelop.Core.Text.TextSegment.FromBounds (Line.Offset, Line.EndOffsetIncludingDelimiter);
+			}
+		}
+
+		MonoDevelop.Core.Text.UnicodeNewline MonoDevelop.Ide.Editor.IDocumentLine.UnicodeNewline {
+			get {
+				return (MonoDevelop.Core.Text.UnicodeNewline)Line.UnicodeNewline;
+			}
+		}
+
+		int MonoDevelop.Ide.Editor.IDocumentLine.DelimiterLength {
+			get {
+				return Line.DelimiterLength;
+			}
+		}
+
+		int MonoDevelop.Ide.Editor.IDocumentLine.LineNumber {
+			get {
+				return Line.LineNumber;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.IDocumentLine MonoDevelop.Ide.Editor.IDocumentLine.PreviousLine {
+			get {
+				var prev = Line.PreviousLine;
+				return prev != null ? new DocumentLineWrapper (prev) : null;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.IDocumentLine MonoDevelop.Ide.Editor.IDocumentLine.NextLine {
+			get {
+				var next = Line.NextLine;
+				return next != null ? new DocumentLineWrapper (next) : null;
+			}
+		}
+
+		bool MonoDevelop.Ide.Editor.IDocumentLine.IsDeleted {
+			get {
+				return false;
+			}
+		}
+		#endregion
+
+		#region ISegment implementation
+		int MonoDevelop.Core.Text.ISegment.Offset {
+			get {
+				return Line.Offset;
+			}
+		}
+
+		int MonoDevelop.Core.Text.ISegment.Length {
+			get {
+				return Line.Length;
+			}
+		}
+
+		int MonoDevelop.Core.Text.ISegment.EndOffset {
+			get {
+				return Line.EndOffset;
+			}
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/FoldSegmentWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/FoldSegmentWrapper.cs
new file mode 100644
index 0000000000..8d1ba6cf48
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/FoldSegmentWrapper.cs
@@ -0,0 +1,66 @@
+//
+// FoldSegmentWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class FoldSegmentWrapper : Mono.TextEditor.FoldSegment, IFoldSegment
+	{
+		bool IFoldSegment.IsCollapsed {
+			get {
+				return IsFolded;
+			}
+			set {
+				IsFolded = value;
+			}
+		}
+
+		string IFoldSegment.CollapsedText {
+			get {
+				return Description;
+			}
+			set {
+				Description = value;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.FoldingType IFoldSegment.FoldingType {
+			get {
+				return (MonoDevelop.Ide.Editor.FoldingType)base.FoldingType;
+			}
+			set {
+				base.FoldingType = (Mono.TextEditor.FoldingType)value;
+			}
+		}
+
+		public FoldSegmentWrapper (TextDocument doc, string description, int offset, int length, Mono.TextEditor.FoldingType foldingType) : base (doc, description, offset, length, foldingType)
+		{
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs
new file mode 100644
index 0000000000..21f09028b6
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs
@@ -0,0 +1,371 @@
+//
+// ITextDocumentWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using Mono.TextEditor;
+using System.IO;
+using MonoDevelop.Core;
+using MonoDevelop.Core.Text;
+using Atk;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class TextDocumentWrapper : ITextDocument
+	{
+		readonly TextDocument document;
+
+		public TextDocument Document {
+			get {
+				return document;
+			}
+		}
+
+		public TextDocumentWrapper (TextDocument document)
+		{
+			this.document = document;
+			this.document.TextReplaced += HandleTextReplaced;
+			this.document.TextReplacing += HandleTextReplacing;
+			this.document.LineChanged += delegate(object sender, Mono.TextEditor.LineEventArgs e) {
+				var handler = LineChanged;
+				if (handler != null)
+					handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
+			};
+
+			this.document.LineInserted += delegate(object sender, Mono.TextEditor.LineEventArgs e) {
+				var handler = LineInserted;
+				if (handler != null)
+					handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
+			};
+
+			this.document.LineRemoved += delegate(object sender, Mono.TextEditor.LineEventArgs e) {
+				var handler = LineRemoved;
+				if (handler != null)
+					handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
+			};
+		}
+
+		void HandleTextReplacing (object sender, DocumentChangeEventArgs e)
+		{
+			var handler = textChanging;
+			if (handler != null)
+				handler (this, new MonoDevelop.Core.Text.TextChangeEventArgs (e.Offset, e.RemovedText.Text, e.InsertedText.Text));
+		}
+
+		void HandleTextReplaced (object sender, DocumentChangeEventArgs e)
+		{
+			var handler = textChanged;
+			if (handler != null)
+				handler (this, new MonoDevelop.Core.Text.TextChangeEventArgs (e.Offset, e.RemovedText.Text, e.InsertedText.Text));
+		}
+		
+		#region ITextDocument implementation
+		event EventHandler<MonoDevelop.Core.Text.TextChangeEventArgs> textChanging;
+		event EventHandler<MonoDevelop.Core.Text.TextChangeEventArgs> ITextDocument.TextChanging {
+			add {
+				textChanging += value;
+			}
+			remove {
+				textChanging -= value;
+			}
+		}
+
+		event EventHandler<MonoDevelop.Core.Text.TextChangeEventArgs> textChanged;
+		event EventHandler<MonoDevelop.Core.Text.TextChangeEventArgs> ITextDocument.TextChanged {
+			add {
+				textChanged += value;
+			}
+			remove {
+				textChanged -= value;
+			}
+		}
+
+		void ITextDocument.InsertText (int offset, string text)
+		{
+			document.Insert (offset, text);
+		}
+
+		void ITextDocument.InsertText (int offset, MonoDevelop.Core.Text.ITextSource text)
+		{
+			document.Insert (offset, text.Text);
+		}
+
+		void ITextDocument.RemoveText (int offset, int length)
+		{
+			document.Remove (offset, length);
+		}
+
+		void ITextDocument.ReplaceText (int offset, int length, string value)
+		{
+			document.Replace (offset, length, value);
+		}
+
+		void ITextDocument.ReplaceText (int offset, int length, MonoDevelop.Core.Text.ITextSource value)
+		{
+			document.Replace (offset, length, value.Text);
+		}
+
+		IDisposable ITextDocument.OpenUndoGroup ()
+		{
+			return document.OpenUndoGroup ();
+		}
+
+		IReadonlyTextDocument ITextDocument.CreateDocumentSnapshot ()
+		{
+			return new ReadonlyDocumentSnapshot (document);
+		}
+
+		string ITextDocument.Text {
+			get {
+				return document.Text;
+			}
+			set {
+				document.Text = value;
+			}
+		}
+
+		bool ITextDocument.IsReadOnly {
+			get {
+				return document.ReadOnly;
+			}
+			set {
+				document.ReadOnly = value;
+			}
+		}
+
+		FilePath ITextDocument.FileName {
+			get {
+				return document.FileName;
+			}
+			set {
+				document.FileName = value;
+			}
+		}
+
+		event EventHandler ITextDocument.FileNameChanged {
+			add {
+				document.FileNameChanged += value;
+			}
+			remove {
+				document.FileNameChanged -= value;
+			}
+		}
+
+		string ITextDocument.MimeType {
+			get {
+				return document.MimeType;
+			}
+			set {
+				document.MimeType = value;
+			}
+		}
+
+		event EventHandler ITextDocument.MimeTypeChanged {
+			add {
+				document.MimeTypeChanged += value;
+			}
+			remove {
+				document.MimeTypeChanged -= value;
+			}
+		}
+
+
+
+		bool ITextDocument.UseBOM {
+			get {
+				return document.UseBom;
+			}
+			set {
+				document.UseBom = value;
+			}
+		}
+
+		System.Text.Encoding ITextDocument.Encoding {
+			get {
+				return document.Encoding;
+			}
+			set {
+				document.Encoding = value;
+			}
+		}
+
+		bool ITextDocument.IsInAtomicUndo {
+			get {
+				return document.IsInAtomicUndo;
+			}
+		}
+
+		char ITextDocument.this [int offset] {
+			get {
+				return document.GetCharAt (offset);
+			}
+			set {
+				document.Replace (offset, 1, value.ToString ());
+			}
+		}
+
+		char MonoDevelop.Core.Text.ITextSource.this [int offset] {
+			get {
+				return document.GetCharAt (offset);
+			}
+		}
+
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineChanged;
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineInserted;
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineRemoved;
+
+		#endregion
+
+		#region IReadonlyTextDocument implementation
+
+		int IReadonlyTextDocument.LocationToOffset (int line, int column)
+		{
+			return document.LocationToOffset (line, column);
+		}
+
+		MonoDevelop.Ide.Editor.DocumentLocation IReadonlyTextDocument.OffsetToLocation (int offset)
+		{
+			var loc = document.OffsetToLocation (offset);
+			return new MonoDevelop.Ide.Editor.DocumentLocation (loc.Line, loc.Column);
+		}
+
+		IDocumentLine IReadonlyTextDocument.GetLine (int lineNumber)
+		{
+			var line = document.GetLine (lineNumber);
+			return line != null ? new DocumentLineWrapper (line) : null;
+		}
+
+		IDocumentLine IReadonlyTextDocument.GetLineByOffset (int offset)
+		{
+			var line = document.GetLineByOffset (offset);
+			return line != null ? new DocumentLineWrapper (line) : null;
+		}
+
+		bool IReadonlyTextDocument.IsReadOnly {
+			get {
+				return document.ReadOnly;
+			}
+		}
+
+		FilePath IReadonlyTextDocument.FileName {
+			get {
+				return document.FileName;
+			}
+		}
+
+		string IReadonlyTextDocument.MimeType {
+			get {
+				return document.MimeType;
+			}
+		}
+
+		int IReadonlyTextDocument.LineCount {
+			get {
+				return document.LineCount;
+			}
+		}
+
+		#endregion
+
+		#region ITextSource implementation
+
+		string MonoDevelop.Core.Text.ITextSource.GetTextAt (int offset, int length)
+		{
+			return document.GetTextAt (offset, length);
+		}
+
+		MonoDevelop.Core.Text.ITextSourceVersion MonoDevelop.Core.Text.ITextSource.Version {
+			get {
+				return new TextSourceVersionWrapper (document.Version);
+			}
+		}
+
+		bool MonoDevelop.Core.Text.ITextSource.UseBOM {
+			get {
+				return document.UseBom;
+			}
+		}
+
+		System.Text.Encoding MonoDevelop.Core.Text.ITextSource.Encoding {
+			get {
+				return document.Encoding;
+			}
+		}
+
+		int MonoDevelop.Core.Text.ITextSource.Length {
+			get {
+				return document.TextLength;
+			}
+		}
+
+		string MonoDevelop.Core.Text.ITextSource.Text {
+			get {
+				return document.Text;
+			}
+		}
+
+		char MonoDevelop.Core.Text.ITextSource.GetCharAt (int offset)
+		{
+			return document.GetCharAt (offset);
+		}
+
+
+		TextReader MonoDevelop.Core.Text.ITextSource.CreateReader ()
+		{
+			return document.CreateReader ();
+		}
+
+		TextReader MonoDevelop.Core.Text.ITextSource.CreateReader (int offset, int length)
+		{
+			return document.CreateReader (offset, length);
+		}
+
+		void MonoDevelop.Core.Text.ITextSource.WriteTextTo (TextWriter writer)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			writer.Write (document.Text);
+		}
+
+		void MonoDevelop.Core.Text.ITextSource.WriteTextTo (TextWriter writer, int offset, int length)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			writer.Write (document.GetTextAt (offset, length));
+		}
+
+		ITextSource ITextSource.CreateSnapshot ()
+		{
+			return new RopeTextSource (document.CloneRope (), document.Encoding, document.UseBom, new TextSourceVersionWrapper (document.Version));
+		}
+
+		ITextSource ITextSource.CreateSnapshot (int offset, int length)
+		{
+			return new RopeTextSource (document.CloneRope (offset, length), document.Encoding, document.UseBom);
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/IndentationTrackerWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/IndentationTrackerWrapper.cs
new file mode 100644
index 0000000000..1331ffc936
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/IndentationTrackerWrapper.cs
@@ -0,0 +1,77 @@
+// IndentationTrackerWrapper.cs
+//
+// Author:
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class IndentationTrackerWrapper : Mono.TextEditor.IIndentationTracker
+	{
+		readonly IReadonlyTextDocument document;
+		readonly MonoDevelop.Ide.Editor.Extension.IndentationTracker indentationTracker;
+
+		readonly Mono.TextEditor.TextEditorData textEditorData;
+
+		public IndentationTrackerWrapper (Mono.TextEditor.TextEditorData textEditorData, IReadonlyTextDocument document, MonoDevelop.Ide.Editor.Extension.IndentationTracker indentationTracker)
+		{
+			if (textEditorData == null)
+				throw new System.ArgumentNullException ("textEditorData");
+			if (document == null)
+				throw new System.ArgumentNullException ("document");
+			if (indentationTracker == null)
+				throw new System.ArgumentNullException ("indentationTracker");
+			this.textEditorData = textEditorData;
+			this.document = document;
+			this.indentationTracker = indentationTracker;
+		}
+
+		#region IIndentationTracker implementation
+		string Mono.TextEditor.IIndentationTracker.GetIndentationString (int offset)
+		{
+			return indentationTracker.GetIndentationString (document.OffsetToLineNumber (offset));
+		}
+
+		string Mono.TextEditor.IIndentationTracker.GetIndentationString (int lineNumber, int column)
+		{
+			return indentationTracker.GetIndentationString (lineNumber);
+		}
+
+		static int CountIndent (string str)
+		{
+			// '\t' == 1 - virtual indent is here the character indent not the visual one.
+			return str.Length;
+		}
+
+		int Mono.TextEditor.IIndentationTracker.GetVirtualIndentationColumn (int offset)
+		{
+			return 1 + CountIndent(((Mono.TextEditor.IIndentationTracker)this).GetIndentationString (offset));
+		}
+
+		int Mono.TextEditor.IIndentationTracker.GetVirtualIndentationColumn (int lineNumber, int column)
+		{
+			return 1 + CountIndent(((Mono.TextEditor.IIndentationTracker)this).GetIndentationString (lineNumber, column));
+		}
+		#endregion
+	}
+}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ReadonlyDocumentSnapshot.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ReadonlyDocumentSnapshot.cs
new file mode 100644
index 0000000000..45584f18ad
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ReadonlyDocumentSnapshot.cs
@@ -0,0 +1,179 @@
+//
+// ReadonlyDocumentSnapshot.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using Mono.TextEditor.Utils;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class ReadonlyDocumentSnapshot : IReadonlyTextDocument
+	{
+		readonly Mono.TextEditor.TextDocument snapshot;
+		readonly MonoDevelop.Core.Text.ITextSourceVersion version;
+
+		public ReadonlyDocumentSnapshot (Mono.TextEditor.TextDocument textDocument)
+		{
+			snapshot = textDocument.CreateDocumentSnapshot ();
+			version = new TextSourceVersionWrapper (textDocument.Version);
+		}
+
+		#region IReadonlyTextDocument implementation
+
+		int IReadonlyTextDocument.LocationToOffset (int line, int column)
+		{
+			return snapshot.LocationToOffset (line, column);
+		}
+
+		DocumentLocation IReadonlyTextDocument.OffsetToLocation (int offset)
+		{
+			var loc = snapshot.OffsetToLocation (offset);
+			return new MonoDevelop.Ide.Editor.DocumentLocation (loc.Line, loc.Column);
+		}
+
+		IDocumentLine IReadonlyTextDocument.GetLine (int lineNumber)
+		{
+			var line = snapshot.GetLine (lineNumber);
+			return line != null ? new DocumentLineWrapper (line) : null;
+		}
+
+		IDocumentLine IReadonlyTextDocument.GetLineByOffset (int offset)
+		{
+			var line = snapshot.GetLineByOffset (offset);
+			return line != null ? new DocumentLineWrapper (line) : null;
+		}
+
+		bool IReadonlyTextDocument.IsReadOnly {
+			get {
+				return true;
+			}
+		}
+
+		MonoDevelop.Core.FilePath IReadonlyTextDocument.FileName {
+			get {
+				return snapshot.FileName;
+			}
+		}
+
+		string IReadonlyTextDocument.MimeType {
+			get {
+				return snapshot.MimeType;
+			}
+		}
+
+		int IReadonlyTextDocument.LineCount {
+			get {
+				return snapshot.LineCount;
+			}
+		}
+
+		#endregion
+
+		#region ITextSource implementation
+
+		char MonoDevelop.Core.Text.ITextSource.GetCharAt (int offset)
+		{
+			return snapshot.GetCharAt (offset);
+		}
+
+		char MonoDevelop.Core.Text.ITextSource.this [int offset] {
+			get {
+				return snapshot.GetCharAt (offset);
+			}
+		}
+
+		string MonoDevelop.Core.Text.ITextSource.GetTextAt (int offset, int length)
+		{
+			return snapshot.GetTextAt (offset, length);
+		}
+
+		System.IO.TextReader MonoDevelop.Core.Text.ITextSource.CreateReader ()
+		{
+			return snapshot.CreateReader ();
+		}
+
+		System.IO.TextReader MonoDevelop.Core.Text.ITextSource.CreateReader (int offset, int length)
+		{
+			return snapshot.CreateReader (offset, length);
+		}
+
+		void MonoDevelop.Core.Text.ITextSource.WriteTextTo (System.IO.TextWriter writer)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			writer.Write (snapshot.Text);
+		}
+
+		void MonoDevelop.Core.Text.ITextSource.WriteTextTo (System.IO.TextWriter writer, int offset, int length)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			writer.Write (snapshot.GetTextAt (offset, length));
+		}
+
+		MonoDevelop.Core.Text.ITextSource MonoDevelop.Core.Text.ITextSource.CreateSnapshot ()
+		{
+			return this;
+		}
+
+		MonoDevelop.Core.Text.ITextSource MonoDevelop.Core.Text.ITextSource.CreateSnapshot (int offset, int length)
+		{
+			return new RopeTextSource (snapshot.CloneRope (offset, length), snapshot.Encoding, snapshot.UseBom);
+		}
+
+		MonoDevelop.Core.Text.ITextSourceVersion MonoDevelop.Core.Text.ITextSource.Version {
+			get {
+				return version;
+			}
+		}
+
+		bool MonoDevelop.Core.Text.ITextSource.UseBOM {
+			get {
+				return snapshot.UseBom;
+			}
+		}
+
+		System.Text.Encoding MonoDevelop.Core.Text.ITextSource.Encoding {
+			get {
+				return snapshot.Encoding;
+			}
+		}
+
+		int MonoDevelop.Core.Text.ITextSource.Length {
+			get {
+				return snapshot.TextLength;
+			}
+		}
+
+		string MonoDevelop.Core.Text.ITextSource.Text {
+			get {
+				return snapshot.Text;
+			}
+		}
+
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/RopeTextSource.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/RopeTextSource.cs
new file mode 100644
index 0000000000..808ada5224
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/RopeTextSource.cs
@@ -0,0 +1,126 @@
+//
+// RopeTextSource.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using Mono.TextEditor.Utils;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class RopeTextSource : ITextSource
+	{
+		readonly Rope<char> rope;
+		readonly ITextSourceVersion version;
+
+		public RopeTextSource (Mono.TextEditor.Utils.Rope<char> rope, System.Text.Encoding encoding, bool useBom, ITextSourceVersion version = null)
+		{
+			if (rope == null)
+				throw new ArgumentNullException ("rope");
+			this.rope = rope;
+			this.encoding = encoding;
+			UseBOM = useBom;
+			this.version = version;
+		}
+
+		#region ITextSource implementation
+		char ITextSource.GetCharAt (int offset)
+		{
+			return rope [offset];
+		}
+
+		char ITextSource.this [int offset] {
+			get {
+				return rope [offset];
+			}
+		}
+
+		string ITextSource.GetTextAt (int offset, int length)
+		{
+			return rope.ToString (offset, length);
+		}
+
+		System.IO.TextReader ITextSource.CreateReader ()
+		{
+			return new RopeTextReader (rope);
+		}
+
+		System.IO.TextReader ITextSource.CreateReader (int offset, int length)
+		{
+			return new RopeTextReader (rope.GetRange (offset, length));
+		}
+
+		void ITextSource.WriteTextTo (System.IO.TextWriter writer)
+		{
+			rope.WriteTo (writer, 0, rope.Length);
+		}
+
+		void ITextSource.WriteTextTo (System.IO.TextWriter writer, int offset, int length)
+		{
+			rope.WriteTo (writer, offset, length);
+		}
+
+		ITextSource ITextSource.CreateSnapshot ()
+		{
+			return this;
+		}
+
+		ITextSource ITextSource.CreateSnapshot (int offset, int length)
+		{
+			return new RopeTextSource (rope.GetRange (offset, length), Encoding, UseBOM);
+		}
+
+		ITextSourceVersion ITextSource.Version {
+			get {
+				return version;
+			}
+		}
+
+		public bool UseBOM {
+			get;
+			private set;
+		}
+
+		System.Text.Encoding encoding;
+		public System.Text.Encoding Encoding {
+			get {
+				return encoding ?? System.Text.Encoding.UTF8;
+			}
+		}
+
+		int ITextSource.Length {
+			get {
+				return rope.Length;
+			}
+		}
+
+		string ITextSource.Text {
+			get {
+				return rope.ToString ();
+			}
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryCodeIssueSource.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/SelectionSurroundingProviderWrapper.cs
index 678b3d4a66..516a662f6b 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryCodeIssueSource.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/SelectionSurroundingProviderWrapper.cs
@@ -1,21 +1,21 @@
-// 
-// NRefactoryCodeIssueSource.cs
-//  
+//
+// SelectionSurroundingProviderWrapper.cs
+//
 // Author:
 //       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,33 +24,34 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using MonoDevelop.CodeIssues;
-using System.Collections.Generic;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using ICSharpCode.NRefactory;
-using MonoDevelop.Ide.TypeSystem;
 using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide;
-using MonoDevelop.Projects;
+using MonoDevelop.SourceEditor.Wrappers;
 
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
+namespace MonoDevelop.SourceEditor.Wrappers
 {
-	class NRefactoryCodeIssueSource : ICodeIssueProviderSource
+	class SelectionSurroundingProviderWrapper : ISelectionSurroundingProvider
 	{
-		#region ICodeIssueProviderSource implementation
-		public IEnumerable<CodeIssueProvider> GetProviders ()
+		readonly MonoDevelop.Ide.Editor.Extension.SelectionSurroundingProvider surroundingProvider;
+
+		public SelectionSurroundingProviderWrapper (MonoDevelop.Ide.Editor.Extension.SelectionSurroundingProvider surroundingProvider)
+		{
+			if (surroundingProvider == null)
+				throw new ArgumentNullException ("surroundingProvider");
+			this.surroundingProvider = surroundingProvider;
+		}
+
+		#region ISelectionSurroundingProvider implementation
+
+		bool ISelectionSurroundingProvider.GetSelectionSurroundings (TextEditorData textEditorData, uint unicodeKey, out string start, out string end)
 		{
-			foreach (var t in typeof (ICSharpCode.NRefactory.CSharp.Refactoring.AbstractAndVirtualConversionAction).Assembly.GetTypes ()) {
-				var attr = t.GetCustomAttributes (typeof(ICSharpCode.NRefactory.CSharp.IssueDescriptionAttribute), false);
-				if (attr == null || attr.Length != 1)
-					continue;
-				yield return new NRefactoryIssueProvider (
-					(ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssueProvider)Activator.CreateInstance (t),
-					(ICSharpCode.NRefactory.CSharp.IssueDescriptionAttribute)attr [0]);
-			}
+			return surroundingProvider.GetSelectionSurroundings (unicodeKey, out start, out end);
 		}
+
+		void ISelectionSurroundingProvider.HandleSpecialSelectionKey (TextEditorData textEditorData, uint unicodeKey)
+		{
+			surroundingProvider.HandleSpecialSelectionKey (unicodeKey);
+		}
+
 		#endregion
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/SemanticHighlightingSyntaxMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/SemanticHighlightingSyntaxMode.cs
new file mode 100644
index 0000000000..230fea5ab5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/SemanticHighlightingSyntaxMode.cs
@@ -0,0 +1,187 @@
+//
+// SemanticHighlightingSyntaxMode.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor.Highlighting;
+using MonoDevelop.Ide.Editor.Highlighting;
+using Mono.TextEditor;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Editor;
+using System.Linq;
+using Gtk;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	sealed class SemanticHighlightingSyntaxMode : SyntaxMode
+	{
+		readonly ExtensibleTextEditor editor;
+		readonly SyntaxMode syntaxMode;
+		readonly SemanticHighlighting semanticHighlighting;
+
+		public override TextDocument Document {
+			get {
+				return syntaxMode.Document;
+			}
+			set {
+				syntaxMode.Document = value;
+			}
+		}
+
+		internal class StyledTreeSegment : Mono.TextEditor.TreeSegment
+		{
+			public string Style {
+				get;
+				private set;
+			}
+
+			public StyledTreeSegment (int offset, int length, string style) : base (offset, length)
+			{
+				Style = style;
+			}
+		}
+
+		class HighlightingSegmentTree : Mono.TextEditor.SegmentTree<StyledTreeSegment>
+		{
+			public bool GetStyle (Chunk chunk, ref int endOffset, out string style)
+			{
+				var segment = GetSegmentsAt (chunk.Offset).FirstOrDefault ();
+				if (segment == null) {
+					style = null;
+					return false;
+				}
+				endOffset = segment.EndOffset;
+				style = segment.Style;
+				return true;
+			}
+
+			public void AddStyle (MonoDevelop.Core.Text.ISegment segment, string style)
+			{
+				if (IsDirty)
+					return;
+				Add (new StyledTreeSegment (segment.Offset, segment.Length, style));
+			}
+		}
+
+		Dictionary<DocumentLine, HighlightingSegmentTree> lineSegments = new Dictionary<DocumentLine, HighlightingSegmentTree> ();
+
+		public SemanticHighlightingSyntaxMode (ExtensibleTextEditor editor, ISyntaxMode syntaxMode, SemanticHighlighting semanticHighlighting)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (syntaxMode == null)
+				throw new ArgumentNullException ("syntaxMode");
+			if (semanticHighlighting == null)
+				throw new ArgumentNullException ("semanticHighlighting");
+			this.editor = editor;
+			this.semanticHighlighting = semanticHighlighting;
+			this.syntaxMode = syntaxMode as SyntaxMode;
+			semanticHighlighting.SemanticHighlightingUpdated += delegate {
+				Application.Invoke (delegate {
+					foreach (var kv in lineSegments) {
+						try {
+							kv.Value.RemoveListener ();
+						} catch (Exception) {
+						}
+					}
+					lineSegments.Clear ();
+
+					var margin = editor.TextViewMargin;
+					margin.PurgeLayoutCache ();
+					editor.QueueDraw ();
+				});
+			};
+		}
+
+		public override SpanParser CreateSpanParser (Mono.TextEditor.DocumentLine line, CloneableStack<Span> spanStack)
+		{
+			return syntaxMode.CreateSpanParser (line, spanStack);
+		}
+
+		public override ChunkParser CreateChunkParser (SpanParser spanParser, Mono.TextEditor.Highlighting.ColorScheme style, DocumentLine line)
+		{
+			return new CSharpChunkParser (this, spanParser, style, line);
+		}
+
+		class CSharpChunkParser : ChunkParser
+		{
+			SemanticHighlightingSyntaxMode semanticMode;
+
+			int lineNumber;
+			public CSharpChunkParser (SemanticHighlightingSyntaxMode semanticMode, SpanParser spanParser, Mono.TextEditor.Highlighting.ColorScheme style, DocumentLine line) : base (semanticMode, spanParser, style, line)
+			{
+				lineNumber = line.LineNumber;
+				this.semanticMode = semanticMode;
+			}
+
+			protected override void AddRealChunk (Chunk chunk)
+			{
+				if (!DefaultSourceEditorOptions.Instance.EnableSemanticHighlighting) {
+					base.AddRealChunk (chunk);
+					return;
+				}
+				int endLoc = -1;
+				string semanticStyle = null;
+
+				try {
+					HighlightingSegmentTree tree;
+					if (!semanticMode.lineSegments.TryGetValue (line, out tree)) {
+						tree = new HighlightingSegmentTree ();
+						tree.InstallListener (semanticMode.Document); 
+						foreach (var seg in semanticMode.semanticHighlighting.GetColoredSegments (new MonoDevelop.Core.Text.TextSegment (line.Offset, line.Length))) {
+							tree.AddStyle (seg, seg.ColorStyleKey);
+						}
+						semanticMode.lineSegments[line] = tree;
+					}
+					string style;
+					if (tree.GetStyle (chunk, ref endLoc, out style)) {
+						semanticStyle = style;
+					}
+				} catch (Exception e) {
+					Console.WriteLine ("Error in semantic highlighting: " + e);
+				}
+
+				if (semanticStyle != null) {
+					if (endLoc < chunk.EndOffset) {
+						base.AddRealChunk (new Chunk (chunk.Offset, endLoc - chunk.Offset, semanticStyle));
+						base.AddRealChunk (new Chunk (endLoc, chunk.EndOffset - endLoc, chunk.Style));
+						return;
+					}
+					chunk.Style = semanticStyle;
+				}
+
+				base.AddRealChunk (chunk);
+			}
+
+			protected override string GetStyle (Chunk chunk)
+			{
+				/*if (spanParser.CurRule.Name == "Comment") {
+					if (tags.Contains (doc.GetTextAt (chunk))) 
+						return "Comment Tag";
+				}*/
+				return base.GetStyle (chunk);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextChangeEventArgsWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextChangeEventArgsWrapper.cs
new file mode 100644
index 0000000000..754bb26cad
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextChangeEventArgsWrapper.cs
@@ -0,0 +1,37 @@
+//
+// TextSourceVersionWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class TextChangeEventArgsWrapper : TextChangeEventArgs
+	{
+		public TextChangeEventArgsWrapper (ICSharpCode.NRefactory.Editor.TextChangeEventArgs change) : base (change.Offset, change.RemovedText.Text, change.InsertedText.Text)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextPasteHandlerWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextPasteHandlerWrapper.cs
new file mode 100644
index 0000000000..765e39f7a2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextPasteHandlerWrapper.cs
@@ -0,0 +1,68 @@
+// SourceEditorView.cs
+//
+// Author:
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class TextPasteHandlerWrapper : ICSharpCode.NRefactory.Editor.ITextPasteHandler, IDisposable
+	{
+		readonly MonoDevelop.Ide.Editor.Extension.TextPasteHandler textPasteHandler;
+		readonly Mono.TextEditor.TextEditorData data;
+
+		public TextPasteHandlerWrapper (Mono.TextEditor.TextEditorData data, MonoDevelop.Ide.Editor.Extension.TextPasteHandler textPasteHandler)
+		{
+			this.data = data;
+			this.textPasteHandler = textPasteHandler;
+			data.Paste += HandlePaste;
+		}
+
+		void HandlePaste (int insertionOffset, string text, int insertedChars)
+		{
+			textPasteHandler.PostFomatPastedText (insertionOffset, insertedChars);
+		}
+
+		#region IDisposable implementation
+
+		public void Dispose ()
+		{
+			data.Paste -= HandlePaste;
+		}
+
+		#endregion
+
+		#region ITextPasteHandler implementation
+
+		string ICSharpCode.NRefactory.Editor.ITextPasteHandler.FormatPlainText (int offset, string text, byte[] copyData)
+		{
+			return textPasteHandler.FormatPlainText (offset, text, copyData);
+		}
+
+		byte[] ICSharpCode.NRefactory.Editor.ITextPasteHandler.GetCopyData (ICSharpCode.NRefactory.Editor.ISegment segment)
+		{
+			return textPasteHandler.GetCopyData (segment.Offset, segment.Length);
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextSourceVersionWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextSourceVersionWrapper.cs
new file mode 100644
index 0000000000..f185268b4d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextSourceVersionWrapper.cs
@@ -0,0 +1,71 @@
+//
+// TextSourceVersionWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class TextSourceVersionWrapper : ITextSourceVersion
+	{
+		readonly ICSharpCode.NRefactory.Editor.ITextSourceVersion version;
+
+		public TextSourceVersionWrapper (ICSharpCode.NRefactory.Editor.ITextSourceVersion version)
+		{
+			if (version == null)
+				throw new ArgumentNullException ("version");
+			this.version = version;
+		}
+
+		#region ITextSourceVersion implementation
+
+		bool ITextSourceVersion.BelongsToSameDocumentAs (ITextSourceVersion other)
+		{
+			var otherWrapper = other as TextSourceVersionWrapper;
+			return otherWrapper != null && version.BelongsToSameDocumentAs (otherWrapper.version);
+		}
+
+		int ITextSourceVersion.CompareAge (ITextSourceVersion other)
+		{
+			var otherWrapper = (TextSourceVersionWrapper)other;
+			return version.CompareAge (otherWrapper.version);
+		}
+
+		System.Collections.Generic.IEnumerable<TextChangeEventArgs> ITextSourceVersion.GetChangesTo (ITextSourceVersion other)
+		{
+			var otherWrapper = (TextSourceVersionWrapper)other;
+			foreach (var change in version.GetChangesTo (otherWrapper.version))
+				yield return new TextChangeEventArgsWrapper (change);
+		}
+
+		int ITextSourceVersion.MoveOffsetTo (ITextSourceVersion other, int oldOffset)
+		{
+			var otherWrapper = (TextSourceVersionWrapper)other;
+			return version.MoveOffsetTo (otherWrapper.version, oldOffset);
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TooltipProviderWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TooltipProviderWrapper.cs
new file mode 100644
index 0000000000..bae8352c41
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TooltipProviderWrapper.cs
@@ -0,0 +1,117 @@
+//
+// TooltipProviderWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class TooltipProviderWrapper : TooltipProvider
+	{
+		readonly MonoDevelop.Ide.Editor.TooltipProvider provider;
+		TooltipItem lastWrappedItem;
+		Ide.Editor.TooltipItem lastUnwrappedItem;
+
+		public MonoDevelop.Ide.Editor.TooltipProvider OriginalProvider {
+			get {
+				return provider;
+			}
+		}
+
+		public TooltipProviderWrapper (MonoDevelop.Ide.Editor.TooltipProvider provider)
+		{
+			if (provider == null)
+				throw new ArgumentNullException ("provider");
+			this.provider = provider;
+		}
+
+		#region implemented abstract members of TooltipProvider
+
+		static MonoDevelop.Ide.Editor.TextEditor WrapEditor (MonoTextEditor editor)
+		{
+			foreach (var doc in IdeApp.Workbench.Documents) {
+				if (doc.FileName == editor.FileName)
+					return doc.Editor;
+			}
+			return null;
+		}
+
+		public override TooltipItem GetItem (MonoTextEditor editor, int offset)
+		{
+			var item = provider.GetItem (WrapEditor (editor), IdeApp.Workbench.ActiveDocument, offset);
+			if (item == null)
+				return null;
+			if (lastUnwrappedItem != null) {
+				if (lastUnwrappedItem.Offset == item.Offset && lastUnwrappedItem.Length == item.Length) {
+					return lastWrappedItem;
+				}
+			}
+			lastUnwrappedItem = item;
+			return lastWrappedItem = new TooltipItem (item.Item, item.Offset, item.Length);
+		}
+
+		public override bool IsInteractive (MonoTextEditor editor, Gtk.Window tipWindow)
+		{
+			var wrappedEditor = WrapEditor (editor);
+			if (wrappedEditor == null)
+				return false;
+			return provider.IsInteractive (wrappedEditor, tipWindow);
+		}
+
+		public override Gtk.Window CreateTooltipWindow (MonoTextEditor editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)
+		{
+			var wrappedEditor = WrapEditor (editor);
+			if (wrappedEditor == null)
+				return null;
+			var control = provider.CreateTooltipWindow (wrappedEditor, IdeApp.Workbench.ActiveDocument, new MonoDevelop.Ide.Editor.TooltipItem (item.Item, item.ItemSegment.Offset, item.ItemSegment.Length), offset, modifierState);
+			if (control == null)
+				return null;
+			return (Gtk.Window)control;
+		}
+
+		protected override void GetRequiredPosition (MonoTextEditor editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)
+		{
+			var wrappedEditor = WrapEditor (editor);
+			if (wrappedEditor == null) {
+				requiredWidth = 0;
+				xalign = 0;
+				return;
+			}
+			provider.GetRequiredPosition (wrappedEditor, tipWindow, out requiredWidth, out xalign);
+		}
+
+		public override Gtk.Window ShowTooltipWindow (MonoTextEditor editor, Gtk.Window tipWindow, int offset, Gdk.ModifierType modifierState, int mouseX, int mouseY, TooltipItem item)
+		{
+			var wrappedEditor = WrapEditor (editor);
+			if (wrappedEditor == null) {
+				return tipWindow;
+			}
+			provider.ShowTooltipWindow (wrappedEditor, tipWindow, new MonoDevelop.Ide.Editor.TooltipItem (item.Item, item.ItemSegment.Offset, item.ItemSegment.Length), modifierState, mouseX, mouseY);
+			return tipWindow;
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
index 2bae84f1f8..8c13a84ff1 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
@@ -38,29 +38,6 @@
 		<ExtensionNode name="Class" />
 	</ExtensionPoint>
 
-	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/TooltipProviders" name = "Tooltip providers">
-		<Description>Tooltip providers. Classes must implement ITooltipProvider.</Description>
-		<ExtensionNode name="Class" />
-		<ConditionType id="FileType" type="MonoDevelop.Ide.Extensions.FileTypeCondition">
-			<Description>Type of the file being edited.</Description>
-		</ConditionType>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/SyntaxModes" name = "Text editor syntax modes">
-		<Description>Syntax modes</Description>
-		<ExtensionNode name="Templates" type="MonoDevelop.SourceEditor.Extension.TemplateCodon"/>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/Styles" name = "Text editor styles">
-		<Description>Styles</Description>
-		<ExtensionNode name="Templates" type="MonoDevelop.SourceEditor.Extension.TemplateCodon"/>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/CustomModes" name = "Text editor custom syntax modes">
-		<Description>Styles</Description>
-		<ExtensionNode name="SyntaxMode" type="MonoDevelop.SourceEditor.SyntaxModeCodon"/>
-	</ExtensionPoint>
-
 	<!-- Extensions -->
 	<Extension path = "/MonoDevelop/SourceEditor2/TooltipProviders">
 		<Class id="Debug" class="MonoDevelop.SourceEditor.DebugValueTooltipProvider" />
@@ -97,30 +74,6 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/Commands/TextEditor">
-		<Command id = "MonoDevelop.SourceEditor.SourceEditorCommands.DynamicAbbrev"
-				defaultHandler = "MonoDevelop.SourceEditor.DynamicAbbrevHandler"
-				_label = "Dynamic abbrev"
-				_description = "Cycles completing the current word from matching words in all open files"
-				macShortcut = "Ctrl|/"
-				shortcut = "Alt|/" />
-		<Command id = "MonoDevelop.SourceEditor.SourceEditorCommands.PulseCaret"
-				_label = "Find caret"
-				_description = "Animates the text editor caret to help find it"
-				shortcut = "Ctrl||"
-				macShortcut = "Meta||" />
-		<Command id = "MonoDevelop.SourceEditor.SourceEditorCommands.ToggleErrorTextMarker"
-				_label = "Toggle message bubble"
-				_description = "Toggles message bubble on/off"/>
-		
-		<Command id = "MonoDevelop.SourceEditor.MessageBubbleCommands.HideIssues"
-				defaultHandler = "MonoDevelop.SourceEditor.HideIssuesHandler"
-				_label = "_Hide Issues"/>
-
-		<Command id = "MonoDevelop.SourceEditor.MessageBubbleCommands.ToggleIssues"
-				defaultHandler = "MonoDevelop.SourceEditor.ToggleIssuesHandler"
-				_label = "Toggle Issues"
-				type="array"/>
-
 		<Command id = "MonoDevelop.SourceEditor.QuickTasks.ScrollbarCommand.Top"
 				_label = "_Top"/>
 		<Command id = "MonoDevelop.SourceEditor.QuickTasks.ScrollbarCommand.Bottom"
@@ -137,13 +90,6 @@
 				type="radio"/>
 	</Extension>
 
-	<Extension path = "/MonoDevelop/Ide/DisplayBindings">
-		<DisplayBinding
-			id = "TextEditor"
-			insertafter ="DefaultDisplayBinding"
-			class = "MonoDevelop.SourceEditor.SourceEditorDisplayBinding" />
-	</Extension>
-
 	<Extension path = "/MonoDevelop/SourceEditor2/ContextMenu/Editor">
 		<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations" />
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.ExpressionEvaluator" />
@@ -189,7 +135,7 @@
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.DisableAllBreakpoints" />
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.ClearAllBreakpoints" />
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.ShowBreakpointProperties" />
-		<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.ToggleErrorTextMarker" />
+		<CommandItem id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.Toggle" />
 	</Extension>
 
 	<Extension path="/MonoDevelop/Ide/GlobalOptionsDialog/TextEditor">
@@ -204,15 +150,6 @@
 		<Section id="SyntaxHighlighting" _label="Syntax Highlighting" fill="true" class="MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel" icon="md-prefs-syntax-highlighting" />
 	</Extension>
 
-	<Extension path = "/MonoDevelop/Ide/MainMenu/View">
-		<ItemSet id = "MessageBubbles" _label = "_Message Bubbles" insertafter="MonoDevelop.Ide.Commands.ViewCommands.ViewList" insertbefore="ViewSeparator3">
-			<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.ToggleErrorTextMarker" />
-			<CommandItem id = "MonoDevelop.SourceEditor.MessageBubbleCommands.HideIssues" />
-			<SeparatorItem id = "Separator1" />
-			<CommandItem id = "MonoDevelop.SourceEditor.MessageBubbleCommands.ToggleIssues" />
-		</ItemSet>
-	</Extension>
-	
 	<Extension path = "/MonoDevelop/Ide/MainMenu/Search">
 		<ItemSet id = "Inspect" _label = "Inspect" insertafter="MonoDevelop.Ide.Commands.ViewCommands.ShowNext" insertbefore="Separator3">
 			<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.NextIssue" />
@@ -222,6 +159,10 @@
 		</ItemSet>
 	</Extension>
 
+	<Extension path = "/MonoDevelop/SourceEditor2/EditorFactory">
+		<Class id = "SourceEditor" class="MonoDevelop.SourceEditor.EditorFactory" />
+	</Extension>
+
 	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
 		<Class fileExtensions = ".json" class = "MonoDevelop.SourceEditor.JSon.JSonTextEditorExtension" />
 	</Extension>
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
index 6030f79e7e..0e0287a4d7 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
@@ -9,8 +9,9 @@
     <OutputType>Library</OutputType>
     <RootNamespace>MonoDevelop.SourceEditor</RootNamespace>
     <AssemblyOriginatorKeyFile>.</AssemblyOriginatorKeyFile>
+    <AssemblyName>MonoDevelop.SourceEditor</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <AssemblyName>MonoDevelop.SourceEditor2</AssemblyName>
+    <AssemblyName>MonoDevelop.SourceEditor</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -67,11 +68,6 @@
       <Name>MonoDevelop.Debugger</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
@@ -97,6 +93,16 @@
       <Name>ICSharpCode.NRefactory.CSharp</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
+      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
+      <Name>Mono.TextEditor</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -119,6 +125,22 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -126,8 +148,6 @@
     <Compile Include="MonoDevelop.SourceEditor\EditActions.cs" />
     <Compile Include="MonoDevelop.SourceEditor\ExtensibleTextEditor.cs" />
     <Compile Include="MonoDevelop.SourceEditor\LanguageItemWindow.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\SourceEditorDisplayBinding.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\SourceEditorOptions.cs" />
     <Compile Include="MonoDevelop.SourceEditor\SourceEditorView.cs" />
     <Compile Include="MonoDevelop.SourceEditor\SourceEditorWidget.cs" />
     <Compile Include="MonoDevelop.SourceEditor.OptionPanels\BehaviorPanel.cs" />
@@ -141,8 +161,6 @@
     <Compile Include="MonoDevelop.SourceEditor\CompileErrorTooltipProvider.cs" />
     <Compile Include="MonoDevelop.SourceEditor\DebugValueWindow.cs" />
     <Compile Include="MonoDevelop.SourceEditor\DebugValueTooltipProvider.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.Extension\TemplateCodon.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.Extension\TemplateExtensionNodeLoader.cs" />
     <Compile Include="MonoDevelop.SourceEditor\IdeViMode.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs" />
@@ -150,18 +168,11 @@
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.GotoLineNumberWidget.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\StyledSourceEditorOptions.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\ISourceEditorOptions.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\AutoSave.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\SyntaxModeCodon.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\SyntaxModeService.cs" />
     <Compile Include="MonoDevelop.SourceEditor\Counters.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\DynamicAbbrevHandler.cs" />
     <Compile Include="MonoDevelop.SourceEditor\PinnedWatchWidget.cs" />
     <Compile Include="MonoDevelop.SourceEditor\SourceEditorPrintOperation.cs" />
     <Compile Include="MonoDevelop.SourceEditor\PrintSettingsWidget.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.PrintSettingsWidget.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\MessageBubbleCommands.cs" />
     <Compile Include="MonoDevelop.SourceEditor\MessageBubbleTextMarker.cs" />
     <Compile Include="MonoDevelop.SourceEditor\MessageBubbleCache.cs" />
     <Compile Include="MonoDevelop.SourceEditor.OptionPanels\ColorShemeEditor.cs" />
@@ -171,11 +182,8 @@
     <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskStrip.cs" />
     <Compile Include="MonoDevelop.SourceEditor.QuickTasks\ScrollbarCommand.cs" />
     <Compile Include="MonoDevelop.SourceEditor.QuickTasks\ScrollBarMode.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\IQuickTaskProvider.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTask.cs" />
     <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskMiniMapMode.cs" />
     <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\IUsageProvider.cs" />
     <Compile Include="MonoDevelop.SourceEditor\FileRegistry.cs" />
     <Compile Include="MonoDevelop.SourceEditor\SearchAndReplaceOptions.cs" />
     <Compile Include="MonoDevelop.SourceEditor\ErrorText.cs" />
@@ -187,10 +195,32 @@
     <Compile Include="MonoDevelop.SourceEditor.OptionPanels\CompletionCharactersPanel.cs" />
     <Compile Include="MonoDevelop.SourceEditor\OverlayMessageWindow.cs" />
     <Compile Include="MonoDevelop.SourceEditor\HoverCloseButton.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.JSon\JSonIndentationTracker.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.JSon\JSonIndentEngine.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.JSon\JSonTextEditorExtension.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\AbstractUsagesExtension.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\DocumentLineWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\ITextDocumentWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UsageSegmentMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\DebugTextMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\EditorFactory.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\TextSourceVersionWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\TextChangeEventArgsWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\TextPasteHandlerWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\SelectionSurroundingProviderWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\IndentationTrackerWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\WavedLineMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\GrayOutMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\SmartTagMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UrlTextLineMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\AsmLineMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\LinkMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\ListDataProviderWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\TooltipProviderWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UnitTestMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\FoldSegmentWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\StyledSourceEditorOptions.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\RopeTextSource.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\SemanticHighlightingSyntaxMode.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\ReadonlyDocumentSnapshot.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\ErrorMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\SyntaxModeLoader.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
@@ -291,5 +321,10 @@
   <ItemGroup>
     <Folder Include="MonoDevelop.SourceEditor\" />
     <Folder Include="MonoDevelop.SourceEditor.QuickTasks\" />
+    <Folder Include="MonoDevelop.SourceEditor.Wrappers\" />
+    <Folder Include="MonoDevelop.SourceEditor\TextMarker\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs
index 245f4d7a50..2eb68774ed 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs
@@ -251,7 +251,7 @@ namespace MonoDevelop.SourceEditor
 			OnUsagesUpdated (EventArgs.Empty);
 		}
 
-		public class UsageMarker : TextLineMarker
+		class UsageMarker : TextLineMarker
 		{
 			List<UsageSegment> usages = new List<UsageSegment> ();
 
@@ -324,7 +324,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 
-		public class UsageSegment
+		class UsageSegment
 		{
 			public readonly ReferenceUsageType UsageType;
 			public readonly TextSegment TextSegment;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs
index 45dc49b306..9e90b4c685 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs
@@ -26,24 +26,25 @@
 //
 
 using System;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.SourceEditor
 {
-	
-	
-	public class CompileErrorTooltipProvider: TooltipProvider
+	class CompileErrorTooltipProvider: TooltipProvider
 	{
-		
-		public CompileErrorTooltipProvider()
+		internal static ExtensibleTextEditor GetExtensibleTextEditor (TextEditor editor)
 		{
+			var view = editor.GetContent<SourceEditorView> ();
+			if (view == null)
+				return null;
+			return view.TextEditor;
 		}
 
 		#region ITooltipProvider implementation 
-		
-		public override TooltipItem GetItem (Mono.TextEditor.TextEditor editor, int offset)
+		public override TooltipItem GetItem (TextEditor editor, DocumentContext ctx, int offset)
 		{
-			var ed = editor as ExtensibleTextEditor;
+			var ed = GetExtensibleTextEditor (editor);
 			if (ed == null)
 				return null;
 
@@ -51,25 +52,23 @@ namespace MonoDevelop.SourceEditor
 			if (string.IsNullOrEmpty (errorInformation))
 				return null;
 
-			return new TooltipItem (errorInformation, editor.Document.GetLineByOffset (offset));
+			return new TooltipItem (errorInformation, editor.GetLineByOffset (offset));
 		}
-		
-		protected override Gtk.Window CreateTooltipWindow (Mono.TextEditor.TextEditor editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)
+
+		public override Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Gdk.ModifierType modifierState)
 		{
-			LanguageItemWindow result = new LanguageItemWindow ((ExtensibleTextEditor) editor, modifierState, null, (string)item.Item, null);
+			var result = new LanguageItemWindow (GetExtensibleTextEditor (editor), modifierState, null, (string)item.Item, null);
 			if (result.IsEmpty)
 				return null;
 			return result;
 		}
 		
-		protected override void GetRequiredPosition (Mono.TextEditor.TextEditor editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)
+		public override void GetRequiredPosition (TextEditor editor, Control tipWindow, out int requiredWidth, out double xalign)
 		{
-			LanguageItemWindow win = (LanguageItemWindow) tipWindow;
+			var win = (LanguageItemWindow) tipWindow;
 			requiredWidth = win.SetMaxWidth (win.Screen.Width);
 			xalign = 0.5;
 		}
-
 		#endregion 
-		
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/Counters.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/Counters.cs
index 5d26f8797e..e55ef141ff 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/Counters.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/Counters.cs
@@ -34,6 +34,5 @@ namespace MonoDevelop.SourceEditor
 		public static Counter EditorsInMemory = InstrumentationService.CreateCounter ("Editors in Memory", "Text Editor");
 		public static Counter SourceViewsInMemory = InstrumentationService.CreateCounter ("Source Views in Memory", "Text Editor");
 		public static Counter LoadedEditors = InstrumentationService.CreateCounter ("Loaded Editors", "Text Editor");
-		public static Counter AutoSavedFiles = InstrumentationService.CreateCounter ("Autosaved Files", "Text Editor");
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs
index 41fd96c87d..8f73a75308 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs
@@ -29,17 +29,22 @@
 using System;
 using System.Collections.Generic;
 
-using Mono.TextEditor;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Debugger;
 using MonoDevelop.Components;
 using Mono.Debugging.Client;
-using TextEditor = Mono.TextEditor.TextEditor;
+
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.CSharp.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class DebugValueTooltipProvider: TooltipProvider, IDisposable
+	class DebugValueTooltipProvider: TooltipProvider, IDisposable
 	{
 		Dictionary<string,ObjectValue> cachedValues = new Dictionary<string,ObjectValue> ();
 		DebugValueWindow tooltip;
@@ -74,9 +79,10 @@ namespace MonoDevelop.SourceEditor
 
 		#region ITooltipProvider implementation
 
-		public override TooltipItem GetItem (TextEditor editor, int offset)
+
+		public override TooltipItem GetItem (TextEditor editor, DocumentContext ctx, int offset)
 		{
-			if (offset >= editor.Document.TextLength)
+			if (offset >= editor.Length)
 				return null;
 
 			if (!DebuggingService.IsDebugging || DebuggingService.IsRunning)
@@ -86,7 +92,9 @@ namespace MonoDevelop.SourceEditor
 			if (frame == null)
 				return null;
 
-			var ed = (ExtensibleTextEditor) editor;
+			var ed = CompileErrorTooltipProvider.GetExtensibleTextEditor (editor);
+			if (ed == null)
+				return null;
 			string expression = null;
 			int startOffset;
 
@@ -94,20 +102,22 @@ namespace MonoDevelop.SourceEditor
 				startOffset = ed.SelectionRange.Offset;
 				expression = ed.SelectedText;
 			} else {
-				var doc = IdeApp.Workbench.ActiveDocument;
+				var doc = ctx;
 				if (doc == null || doc.ParsedDocument == null)
 					return null;
 
 				var resolver = doc.GetContent<IDebuggerExpressionResolver> ();
-				var data = editor.GetTextEditorData ();
+				var data = doc.GetContent<SourceEditorView> ();
 
 				if (resolver != null) {
-					expression = resolver.ResolveExpression (data, doc, offset, out startOffset);
+					var result = resolver.ResolveExpressionAsync (editor, doc, offset, default(System.Threading.CancellationToken)).Result;
+					expression = result.Text;
+					startOffset = result.Span.Start;
 				} else {
-					int endOffset = data.FindCurrentWordEnd (offset);
-					startOffset = data.FindCurrentWordStart (offset);
+					int endOffset = data.GetTextEditorData ().FindCurrentWordEnd (offset);
+					startOffset = data.GetTextEditorData ().FindCurrentWordStart (offset);
 
-					expression = data.GetTextAt (startOffset, endOffset - startOffset);
+					expression = editor.GetTextAt (startOffset, endOffset - startOffset);
 				}
 			}
 			
@@ -131,26 +141,29 @@ namespace MonoDevelop.SourceEditor
 			
 			return new TooltipItem (val, startOffset, expression.Length);
 		}
-			
-		public override Gtk.Window ShowTooltipWindow (TextEditor editor, int offset, Gdk.ModifierType modifierState, int mouseX, int mouseY, TooltipItem item)
+
+		public override Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Gdk.ModifierType modifierState)
 		{
-			var location = editor.OffsetToLocation (item.ItemSegment.Offset);
+			return new DebugValueWindow (editor, offset, DebuggingService.CurrentFrame, (ObjectValue) item.Item, null);
+		}
+
+		public override void ShowTooltipWindow (TextEditor editor, Control tipWindow, TooltipItem item, Gdk.ModifierType modifierState, int mouseX, int mouseY)
+		{
+			var location = editor.OffsetToLocation (item.Offset);
 			var point = editor.LocationToPoint (location);
 			int lineHeight = (int) editor.LineHeight;
-			int y = point.Y;
+			int y = (int)point.Y;
 
 			// find the top of the line that the mouse is hovering over
 			while (y + lineHeight < mouseY)
 				y += lineHeight;
 
 			var caret = new Gdk.Rectangle (mouseX, y, 1, lineHeight);
-			tooltip = new DebugValueWindow (editor, offset, DebuggingService.CurrentFrame, (ObjectValue) item.Item, null);
+			tooltip = (DebugValueWindow)tipWindow;
 			tooltip.ShowPopup (editor, caret, PopupPosition.TopLeft);
-
-			return tooltip;
 		}
 
-		public override bool IsInteractive (TextEditor editor, Gtk.Window tipWindow)
+		public override bool IsInteractive (TextEditor editor, Control tipWindow)
 		{
 			return DebuggingService.IsDebugging;
 		}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
index 8af679e42c..9bb7863700 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
@@ -34,10 +34,11 @@ using Gtk;
 using Mono.TextEditor;
 using Gdk;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class BaseWindow : Gtk.Window
+	class BaseWindow : Gtk.Window
 	{
 		public BaseWindow () : base(Gtk.WindowType.Toplevel)
 		{
@@ -64,21 +65,21 @@ namespace MonoDevelop.SourceEditor
 		}
 	}
 	
-	public class DebugValueWindow : PopoverWindow
+	class DebugValueWindow : PopoverWindow
 	{
 		ObjectValueTreeView tree;
 		ScrolledWindow sw;
 //		PinWindow pinWindow;
 //		TreeIter currentPinIter;
 		
-		public DebugValueWindow (Mono.TextEditor.TextEditor editor, int offset, StackFrame frame, ObjectValue value, PinnedWatch watch): base (Gtk.WindowType.Toplevel)
+		public DebugValueWindow (TextEditor editor, int offset, StackFrame frame, ObjectValue value, PinnedWatch watch): base (Gtk.WindowType.Toplevel)
 		{
 			this.TypeHint = WindowTypeHint.PopupMenu;
 			this.AllowShrink = false;
 			this.AllowGrow = false;
 			this.Decorated = false;
 
-			TransientFor = (Gtk.Window) editor.Toplevel;
+			TransientFor = (Gtk.Window) ((Gtk.Widget)editor).Toplevel;
 			
 			// Avoid getting the focus when the window is shown. We'll get it when the mouse enters the window
 			AcceptFocus = false;
@@ -99,9 +100,9 @@ namespace MonoDevelop.SourceEditor
 			tree.AllowPinning = true;
 			tree.RootPinAlwaysVisible = true;
 			tree.PinnedWatch = watch;
-			DocumentLocation location = editor.Document.OffsetToLocation (offset);
+			var location = editor.OffsetToLocation (offset);
 			tree.PinnedWatchLine = location.Line;
-			tree.PinnedWatchFile = ((ExtensibleTextEditor)editor).View.ContentName;
+			tree.PinnedWatchFile = editor.FileName;
 			
 			tree.AddValue (value);
 			tree.Selection.UnselectAll ();
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs
index f126440083..bda75e6a0a 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs
@@ -29,7 +29,7 @@ using System.Linq;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class TabAction
+	class TabAction
 	{
 		ExtensibleTextEditor editor;
 		
@@ -72,7 +72,7 @@ namespace MonoDevelop.SourceEditor
 		
 		static void RemoveCharBeforCaret (TextEditorData data)
 		{
-			if (!data.IsSomethingSelected && ((ISourceEditorOptions)data.Options).AutoInsertMatchingBracket) {
+			if (!data.IsSomethingSelected && MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket) {
 				if (data.Caret.Offset > 0) {
 					var line = data.GetLine (data.Caret.Line);
 					var stack = line.StartSpan.Clone();
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditorFactory.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditorFactory.cs
new file mode 100644
index 0000000000..eba8185a7d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditorFactory.cs
@@ -0,0 +1,87 @@
+//
+// EditorFactory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.SourceEditor.Wrappers;
+using Mono.TextEditor;
+using Mono.TextEditor.Highlighting;
+
+namespace MonoDevelop.SourceEditor
+{
+	sealed class EditorFactory : ITextEditorFactory
+	{
+
+		#region ITextEditorFactory implementation
+
+		ITextDocument ITextEditorFactory.CreateNewDocument ()
+		{
+			return new TextDocumentWrapper (new TextDocument ());
+		}
+
+		ITextDocument ITextEditorFactory.CreateNewDocument (MonoDevelop.Core.Text.ITextSource textSource, string fileName, string mimeType)
+		{
+			return new TextDocumentWrapper (new TextDocument (textSource.Text) {
+				Encoding = textSource.Encoding,
+				UseBom = textSource.UseBOM,
+				MimeType = mimeType,
+				FileName = fileName
+			});
+		}
+
+		IReadonlyTextDocument ITextEditorFactory.CreateNewReadonlyDocument (MonoDevelop.Core.Text.ITextSource textSource, string fileName, string mimeType)
+		{
+			return new TextDocumentWrapper (new TextDocument (textSource.Text) {
+				Encoding = textSource.Encoding,
+				UseBom = textSource.UseBOM,
+				ReadOnly = true,
+				MimeType = mimeType,
+				FileName = fileName
+			});
+		}
+
+		ITextEditorImpl ITextEditorFactory.CreateNewEditor ()
+		{
+			return new SourceEditorView ();
+		}
+
+		ITextEditorImpl ITextEditorFactory.CreateNewEditor (IReadonlyTextDocument document)
+		{
+			return new SourceEditorView (document);
+		}
+
+		string[] ITextEditorFactory.GetSyntaxProperties (string mimeType, string name)
+		{
+			var mode = SyntaxModeService.GetSyntaxMode (null, mimeType);
+			if (mode == null)
+				return null;
+			System.Collections.Generic.List<string> value;
+			if (!mode.Properties.TryGetValue (name, out value))
+				return null;
+			return value.ToArray ();
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs
index 44fb24dce2..53219debb7 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs
@@ -38,7 +38,7 @@ using MonoDevelop.Components;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class ErrorText
+	class ErrorText
 	{
 		public TaskListEntry Task { get; set; }
 		public bool IsError { get; set; }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
index 165ddd148b..b32501488e 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
@@ -41,15 +41,18 @@ using Mono.Addins;
 using MonoDevelop.Projects.Text;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.CodeFormatting;
-using MonoDevelop.SourceEditor.Extension;
 using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.Semantics;
 using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.SourceEditor.Wrappers;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class ExtensibleTextEditor : Mono.TextEditor.TextEditor
+	class ExtensibleTextEditor : Mono.TextEditor.MonoTextEditor
 	{
 		internal object MemoryProbe = Counters.EditorsInMemory.CreateMemoryProbe ();
 		
@@ -57,20 +60,79 @@ namespace MonoDevelop.SourceEditor
 		ExtensionContext extensionContext;
 		Adjustment cachedHAdjustment, cachedVAdjustment;
 		
-		public ITextEditorExtension Extension {
-			get;
-			set;
+		TextEditorExtension editorExtension;
+		bool needToAddLastExtension;
+
+		public TextEditorExtension EditorExtension {
+			get {
+				return editorExtension;
+			}
+			set {
+				editorExtension = value;
+				needToAddLastExtension = true;
+			}
 		}
-		
-		public new ISourceEditorOptions Options {
-			get { return (ISourceEditorOptions)base.Options; }
+
+		SemanticHighlighting semanticHighlighting;
+		public SemanticHighlighting SemanticHighlighting {
+			get {
+				return semanticHighlighting;
+			}
+			set {
+				semanticHighlighting = value;
+				UpdateSemanticHighlighting ();
+			}
+		}
+
+		void UpdateSemanticHighlighting ()
+		{
+			if (Document.SyntaxMode is SemanticHighlightingSyntaxMode)
+				return;
+			if (semanticHighlighting == null) {
+				Document.MimeType = Document.MimeType;
+				return;
+			}
+			Document.SyntaxMode = new SemanticHighlightingSyntaxMode (this, Document.SyntaxMode, semanticHighlighting);
+		}
+
+		static Gdk.ModifierType ConvertModifiers (ModifierKeys s)
+		{
+			Gdk.ModifierType m = Gdk.ModifierType.None;
+			if ((s & ModifierKeys.Shift) != 0)
+				m |= Gdk.ModifierType.ShiftMask;
+			if ((s & ModifierKeys.Control) != 0)
+				m |= Gdk.ModifierType.ControlMask;
+			if ((s & ModifierKeys.Alt) != 0)
+				m |= Gdk.ModifierType.Mod1Mask;
+			if ((s & ModifierKeys.Command) != 0)
+				m |= Gdk.ModifierType.Mod2Mask;
+			return m;
+		}
+
+		class LastEditorExtension : TextEditorExtension
+		{
+			readonly ExtensibleTextEditor ext;
+			public LastEditorExtension (ExtensibleTextEditor ext)
+			{
+				if (ext == null)
+					throw new ArgumentNullException ("ext");
+				this.ext = ext;
+			}
+			
+			public override bool KeyPress (KeyDescriptor descriptor)
+			{
+				ext.SimulateKeyPress ((Gdk.Key)descriptor.SpecialKey, (uint)descriptor.KeyChar, ConvertModifiers (descriptor.ModifierKeys));
+				if (descriptor.SpecialKey == SpecialKey.Escape)
+					return true;
+				return false;
+			}
 		}
 
 		static ExtensibleTextEditor ()
 		{
 			var icon = Xwt.Drawing.Image.FromResource ("gutter-bookmark-15.png");
 
-			BookmarkMarker.DrawBookmarkFunc = delegate(TextEditor editor, Cairo.Context cr, DocumentLine lineSegment, double x, double y, double width, double height) {
+			BookmarkMarker.DrawBookmarkFunc = delegate(Mono.TextEditor.MonoTextEditor editor, Cairo.Context cr, DocumentLine lineSegment, double x, double y, double width, double height) {
 				if (!lineSegment.IsBookmarked)
 					return;
 				cr.DrawImage (
@@ -83,14 +145,14 @@ namespace MonoDevelop.SourceEditor
 
 		}
 		
-		public ExtensibleTextEditor (SourceEditorView view, ISourceEditorOptions options, Mono.TextEditor.TextDocument doc) : base(doc, options)
+		public ExtensibleTextEditor (SourceEditorView view, Mono.TextEditor.ITextEditorOptions options, Mono.TextEditor.TextDocument doc) : base(doc, options)
 		{
 			Initialize (view);
 		}
 
 		public ExtensibleTextEditor (SourceEditorView view)
 		{
-			base.Options = new StyledSourceEditorOptions (view.Project, null);
+			base.Options = new StyledSourceEditorOptions (DefaultSourceEditorOptions.Instance);
 			Initialize (view);
 		}
 		
@@ -101,17 +163,11 @@ namespace MonoDevelop.SourceEditor
 		void Initialize (SourceEditorView view)
 		{
 			this.view = view;
-			Caret.PositionChanged += delegate {
-				if (Extension != null) {
-					try {
-						Extension.CursorPositionChanged ();
-					} catch (Exception ex) {
-						ReportExtensionError (ex);
-					}
-				}
-			};
-			
+
 			Document.TextReplaced += HandleSkipCharsOnReplace;
+			Document.SyntaxModeChanged += delegate {
+				UpdateSemanticHighlighting ();
+			};
 
 			UpdateEditMode ();
 			this.DoPopupMenu = ShowPopup;
@@ -133,21 +189,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 		
-		public ExtensionContext ExtensionContext {
-			get {
-				return extensionContext;
-			}
-			set {
-				if (extensionContext != null) {
-					extensionContext.RemoveExtensionNodeHandler ("MonoDevelop/SourceEditor2/TooltipProviders", OnTooltipProviderChanged);
-					ClearTooltipProviders ();
-				}
-				extensionContext = value;
-				if (extensionContext != null)
-					extensionContext.AddExtensionNodeHandler ("MonoDevelop/SourceEditor2/TooltipProviders", OnTooltipProviderChanged);
-			}
-		}
-		
+
 		static bool? testNewViMode = null;
 		static bool TestNewViMode {
 			get {
@@ -159,7 +201,7 @@ namespace MonoDevelop.SourceEditor
 		
 		void UpdateEditMode ()
 		{
-			if (Options.UseViModes) {
+			if (MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.UseViModes) {
 				if (TestNewViMode) {
 					if (!(CurrentMode is NewIdeViMode))
 					CurrentMode = new NewIdeViMode (this);
@@ -170,8 +212,8 @@ namespace MonoDevelop.SourceEditor
 			} else {
 		//		if (!(CurrentMode is SimpleEditMode)){
 					SimpleEditMode simpleMode = new SimpleEditMode ();
-					simpleMode.KeyBindings [EditMode.GetKeyCode (Gdk.Key.Tab)] = new TabAction (this).Action;
-					simpleMode.KeyBindings [EditMode.GetKeyCode (Gdk.Key.BackSpace)] = EditActions.AdvancedBackspace;
+					simpleMode.KeyBindings [Mono.TextEditor.EditMode.GetKeyCode (Gdk.Key.Tab)] = new TabAction (this).Action;
+					simpleMode.KeyBindings [Mono.TextEditor.EditMode.GetKeyCode (Gdk.Key.BackSpace)] = EditActions.AdvancedBackspace;
 					CurrentMode = simpleMode;
 		//		}
 			}
@@ -190,8 +232,7 @@ namespace MonoDevelop.SourceEditor
 		protected override void OnDestroyed ()
 		{
 			UnregisterAdjustments ();
-			Extension = null;
-			ExtensionContext = null;
+			extensionContext = null;
 			view = null;
 			base.OnDestroyed ();
 			if (Options != null) {
@@ -199,23 +240,7 @@ namespace MonoDevelop.SourceEditor
 				base.Options = null;
 			}
 		}
-		
-		void OnTooltipProviderChanged (object s, ExtensionNodeEventArgs a)
-		{
-			TooltipProvider provider;
-			try {
-				provider = (TooltipProvider) a.ExtensionObject;
-			} catch (Exception e) {
-				LoggingService.LogError ("Can't create tooltip provider:"+ a.ExtensionNode, e);
-				return;
-			}
-			if (a.Change == ExtensionChange.Add) {
-				AddTooltipProvider (provider);
-			} else {
-				RemoveTooltipProvider (provider);
-			}
-		}
-		
+
 		public void FireOptionsChange ()
 		{
 			this.OptionsChanged (null, null);
@@ -255,7 +280,14 @@ namespace MonoDevelop.SourceEditor
 		{
 			isInKeyStroke = true;
 			try {
-				return Extension.KeyPress (key, (char)ch, state);
+				if (needToAddLastExtension) {
+					var ext = EditorExtension;
+					while (ext.Next != null)
+						ext = ext.Next;
+					ext.Next = new LastEditorExtension (this);
+					needToAddLastExtension = false;
+				}
+				return EditorExtension.KeyPress (KeyDescriptor.FromGtk (key, (char)ch, state));
 			} catch (Exception ex) {
 				ReportExtensionError (ex);
 			} finally {
@@ -320,7 +352,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			bool result = true;
 			if (key == Gdk.Key.Escape) {
-				bool b = Extension != null ? ExtensionKeyPress (key, ch, state) : base.OnIMProcessedKeyPressEvent (key, ch, state);
+				bool b = EditorExtension != null ? ExtensionKeyPress (key, ch, state) : base.OnIMProcessedKeyPressEvent (key, ch, state);
 				if (b) {
 					view.SourceEditorWidget.RemoveSearchWidget ();
 					return true;
@@ -385,7 +417,7 @@ namespace MonoDevelop.SourceEditor
 			char insertionChar = '\0';
 			bool insertMatchingBracket = false;
 			IDisposable undoGroup = null;
-			if (skipChar == null && Options.AutoInsertMatchingBracket && braceIndex >= 0 && !IsSomethingSelected) {
+			if (skipChar == null && MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket && braceIndex >= 0 && !IsSomethingSelected) {
 				if (!inStringOrComment) {
 					char closingBrace = closingBrackets [braceIndex];
 					char openingBrace = openBrackets [braceIndex];
@@ -421,8 +453,8 @@ namespace MonoDevelop.SourceEditor
 				Caret.IsInInsertMode = false;
 				skipChars.Remove (skipChar);
 			}
-			if (Extension != null) {
-				if (!DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep) {
+			if (EditorExtension != null) {
+				if (!MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep) {
 					using (var undo = Document.OpenUndoGroup ()) {
 						if (ExtensionKeyPress (key, ch, state))
 							result = base.OnIMProcessedKeyPressEvent (key, ch, state);
@@ -465,31 +497,23 @@ namespace MonoDevelop.SourceEditor
 		
 		internal string GetErrorInformationAt (int offset)
 		{
-			DocumentLocation location = Document.OffsetToLocation (offset);
+			var location = Document.OffsetToLocation (offset);
 			DocumentLine line = Document.GetLine (location.Line);
 			if (line == null)
 				return null;
-			var error = line.Markers.FirstOrDefault (m => m is ErrorMarker) as ErrorMarker;
+
+			var error = Document.GetTextSegmentMarkersAt (offset).OfType<ErrorMarker> ().FirstOrDefault ();
 			
 			if (error != null) {
-				if (error.Info.ErrorType == ErrorType.Warning)
+				if (error.Error.ErrorType == MonoDevelop.Ide.TypeSystem.ErrorType.Warning)
 					return GettextCatalog.GetString ("<b>Parser Warning</b>: {0}",
-					                                 GLib.Markup.EscapeText (error.Info.Message));
+						GLib.Markup.EscapeText (error.Error.Message));
 				return GettextCatalog.GetString ("<b>Parser Error</b>: {0}",
-				                                 GLib.Markup.EscapeText (error.Info.Message));
+					GLib.Markup.EscapeText (error.Error.Message));
 			}
 			return null;
 		}
 		
-		internal ParsedDocument ParsedDocument {
-			get {
-				var doc = IdeApp.Workbench.ActiveDocument;
-				if (doc != null) 
-					return doc.ParsedDocument;
-				return null;
-			}
-		}
-		
 		public MonoDevelop.Projects.Project Project {
 			get {
 				var doc = IdeApp.Workbench.ActiveDocument;
@@ -501,10 +525,10 @@ namespace MonoDevelop.SourceEditor
 		
 		int           oldOffset = -1;
 
-		public ResolveResult GetLanguageItem (int offset, out DomRegion region)
+		public Microsoft.CodeAnalysis.ISymbol GetLanguageItem (int offset, out MonoDevelop.Ide.Editor.DocumentRegion region)
 		{
 			oldOffset = offset;
-			region = DomRegion.Empty;
+			region = MonoDevelop.Ide.Editor.DocumentRegion.Empty;
 
 			if (textEditorResolverProvider != null) {
 				return textEditorResolverProvider.GetLanguageItem (view.WorkbenchWindow.Document, offset, out region);
@@ -516,7 +540,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			if (IsSomethingSelected) {
 				var result = GetLanguageItem (Caret.Offset, Document.GetTextAt (SelectionRange));
-				if (result != null && !result.IsError)
+				if (result != null)
 					return CodeTemplateContext.InExpression;
 			}
 			return CodeTemplateContext.Standard;
@@ -529,7 +553,7 @@ namespace MonoDevelop.SourceEditor
 			internal set { this.textEditorResolverProvider = value; }
 		}
 		
-		public ResolveResult GetLanguageItem (int offset, string expression)
+		public Microsoft.CodeAnalysis.ISymbol GetLanguageItem (int offset, string expression)
 		{
 			oldOffset = offset;
 			
@@ -580,7 +604,7 @@ namespace MonoDevelop.SourceEditor
 			ParameterInformationWindowManager.HideWindow (null, view);
 			HideTooltip ();
 			const string menuPath = "/MonoDevelop/SourceEditor2/ContextMenu/Editor";
-			var ctx = ExtensionContext ?? AddinManager.AddinEngine;
+			var ctx = view.WorkbenchWindow?.ExtensionContext ?? AddinManager.AddinEngine;
 
 			CommandEntrySet cset = IdeApp.CommandService.CreateCommandEntrySet (ctx, menuPath);
 
@@ -649,7 +673,7 @@ namespace MonoDevelop.SourceEditor
 			string word = GetWordBeforeCaret ();
 			foreach (CodeTemplate template in CodeTemplateService.GetCodeTemplates (Document.MimeType)) {
 				if (template.Shortcut == word) {
-					InsertTemplate (template, view.WorkbenchWindow.Document);
+					InsertTemplate (template, view.WorkbenchWindow.Document.Editor, view.WorkbenchWindow.Document);
 					return true;
 				}
 			}
@@ -657,13 +681,16 @@ namespace MonoDevelop.SourceEditor
 		}
 		
 
-		internal void InsertTemplate (CodeTemplate template, MonoDevelop.Ide.Gui.Document document)
+		internal void InsertTemplate (CodeTemplate template, MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext context)
 		{
-			using (var undo = Document.OpenUndoGroup ()) {
-				var result = template.InsertTemplateContents (document);
-
-				var links = result.TextLinks;
+			using (var undo = editor.OpenUndoGroup ()) {
+				var result = template.InsertTemplateContents (editor, context);
 
+				var links = result.TextLinks.Select (l => new Mono.TextEditor.TextLink (l.Name) {
+					Links = l.Links.Select (s => new TextSegment (s.Offset, s.Length)).ToList (),
+					IsEditable = l.IsEditable,
+					IsIdentifier = l.IsIdentifier
+				}).ToList ();
 				var tle = new TextLinkEditMode (this, result.InsertPosition, links);
 				tle.TextLinkMode = TextLinkMode.General;
 				if (tle.ShouldStartTextLinkMode) {
@@ -1006,7 +1033,7 @@ namespace MonoDevelop.SourceEditor
 			RunAction (SelectionActions.MovePageUp);
 		}
 		
-		[CommandHandler (MonoDevelop.SourceEditor.SourceEditorCommands.PulseCaret)]
+		[CommandHandler (MonoDevelop.Ide.Commands.TextEditorCommands.PulseCaret)]
 		internal void OnPulseCaretCommand ()
 		{
 			StartCaretPulseAnimation ();
@@ -1037,18 +1064,6 @@ namespace MonoDevelop.SourceEditor
 				RunAction (Mono.TextEditor.Vi.ViActions.Join);
 			}
 		}
-
-		[CommandHandler (MonoDevelop.Ide.Commands.EditCommands.SortSelectedLines)]
-		void SortSelectedLines ()
-		{
-			RunAction (MiscActions.SortSelectedLines);
-		}
-
-		[CommandUpdateHandler (MonoDevelop.Ide.Commands.EditCommands.SortSelectedLines)]
-		void UpdateSortSelectedLines (CommandInfo ci)
-		{
-			ci.Enabled = GetTextEditorData ().IsMultiLineSelection;
-		}
 #endregion
 	
 	}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/FileRegistry.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/FileRegistry.cs
index e069c63271..44a5eecce6 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/FileRegistry.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/FileRegistry.cs
@@ -31,6 +31,7 @@ using MonoDevelop.Core;
 using Services = MonoDevelop.Projects.Services;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor
 {
@@ -42,7 +43,6 @@ namespace MonoDevelop.SourceEditor
 	{
 		readonly static List<SourceEditorView> openFiles = new List<SourceEditorView> ();
 		readonly static FileSystemWatcher fileSystemWatcher;
-		readonly static StringComparison fileNameComparer = Platform.IsWindows ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
 
 		public static bool SuspendFileWatch {
 			get;
@@ -84,7 +84,7 @@ namespace MonoDevelop.SourceEditor
 			bool foundOneChange = false;
 			foreach (var file in e) {
 				foreach (var view in openFiles) {
-					if (SkipView (view) || !string.Equals (view.ContentName, file.FileName, fileNameComparer))
+					if (SkipView (view) || !string.Equals (view.ContentName, file.FileName, FilePath.PathComparison))
 						continue;
 					if (!view.IsDirty/* && (IdeApp.Workbench.AutoReloadDocuments || file.AutoReload)*/)
 						view.SourceEditorWidget.Reload ();
@@ -129,7 +129,7 @@ namespace MonoDevelop.SourceEditor
 			foreach (var view in openFiles) {
 				if (SkipView (view))
 					continue;
-				if (string.Equals (view.ContentName, fileName, fileNameComparer)) {
+				if (string.Equals (view.ContentName, fileName, FilePath.PathComparison)) {
 					if (view.LastSaveTimeUtc == File.GetLastWriteTimeUtc (fileName))
 						continue;
 					if (!view.IsDirty/* && IdeApp.Workbench.AutoReloadDocuments*/)
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs
index b19f1e26ad..a8ad10acd7 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs
@@ -35,7 +35,7 @@ namespace MonoDevelop.SourceEditor
 {
 	public partial class GotoLineNumberWidget : Gtk.Bin
 	{
-		readonly TextEditor textEditor;
+		readonly MonoTextEditor textEditor;
 		readonly Widget frame;
 
 		double vSave, hSave;
@@ -45,7 +45,7 @@ namespace MonoDevelop.SourceEditor
 		void HandleViewTextEditorhandleSizeAllocated (object o, SizeAllocatedArgs args)
 		{
 			int newX = textEditor.Allocation.Width - this.Allocation.Width - 8;
-			var containerChild = ((TextEditor.EditorContainerChild)textEditor [frame]);
+			var containerChild = ((MonoTextEditor.EditorContainerChild)textEditor [frame]);
 			if (newX != containerChild.X) {
 				this.entryLineNumber.WidthRequest = textEditor.Allocation.Width / 4;
 				containerChild.X = newX;
@@ -58,7 +58,7 @@ namespace MonoDevelop.SourceEditor
 			Destroy ();
 		}
 
-		public GotoLineNumberWidget (TextEditor textEditor, Widget frame)
+		public GotoLineNumberWidget (MonoTextEditor textEditor, Widget frame)
 		{
 			this.textEditor = textEditor;
 			this.frame = frame;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs
index 0284769bc6..e63b93c8d3 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs
@@ -29,7 +29,7 @@ using Gdk;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class HoverCloseButton : EventBox
+	class HoverCloseButton : EventBox
 	{
 		bool hovered;
 
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ISourceEditorOptions.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ISourceEditorOptions.cs
deleted file mode 100644
index db013b102d..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ISourceEditorOptions.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// ISourceEditorOptions.cs
-// 
-// Author:
-//       Michael Hutchinson <mhutchinson@novell.com>
-//
-// Copyright (c) 2009 Novell, Inc. (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-
-using Pango;
-
-using Mono.TextEditor;
-using Mono.TextEditor.Highlighting;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.CodeCompletion;
-
-namespace MonoDevelop.SourceEditor
-{
-	public enum EditorFontType {
-		// Default Monospace font as set in the user's GNOME font properties
-		DefaultMonospace,
-		
-		// Default Sans font as set in the user's GNOME font properties
-		DefaultSans,
-		
-		// Custom font, will need to get the FontName property for more specifics
-		UserSpecified
-	}
-
-	public interface ISourceEditorOptions : Mono.TextEditor.ITextEditorOptions
-	{
-		
-		bool EnableAutoCodeCompletion {get; }
-		bool DefaultRegionsFolding {get; }
-		bool DefaultCommentFolding {get; }
-		bool EnableSemanticHighlighting {get; }
-		//public bool AutoInsertTemplates {get; }
-		bool TabIsReindent {get; }
-		bool AutoInsertMatchingBracket {get; }
-		bool UnderlineErrors {get; }
-		EditorFontType EditorFontType {get; }
-		bool UseViModes {get; }
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/IdeViMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/IdeViMode.cs
index d7dcbada63..5905336f38 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/IdeViMode.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/IdeViMode.cs
@@ -34,7 +34,7 @@ using MonoDevelop.Ide;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class NewIdeViMode : Mono.TextEditor.Vi.NewViEditMode
+	class NewIdeViMode : Mono.TextEditor.Vi.NewViEditMode
 	{
 		public NewIdeViMode (ExtensibleTextEditor editor)
 		{
@@ -48,7 +48,7 @@ namespace MonoDevelop.SourceEditor
 		}
 	}
 	
-	public class IdeViMode : Mono.TextEditor.Vi.ViEditMode
+	class IdeViMode : Mono.TextEditor.Vi.ViEditMode
 	{
 		new ExtensibleTextEditor editor;
 		TabAction tabAction;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs
index 10172f1446..f659b77a2b 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs
@@ -39,7 +39,7 @@ using ICSharpCode.NRefactory.Semantics;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class LanguageItemWindow: MonoDevelop.Components.TooltipWindow
+	class LanguageItemWindow: MonoDevelop.Components.TooltipWindow
 	{
 		public bool IsEmpty { get; set; }
 		
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeService.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ListDataProviderWrapper.cs
index 1f57d22a7e..34d0b8fa5f 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeService.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ListDataProviderWrapper.cs
@@ -1,21 +1,20 @@
-// 
-// SyntaxModeService.cs
-//  
+// SourceEditorView.cs
+//
 // Author:
 //   Mike Krüger <mkrueger@novell.com>
 //
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,36 +22,42 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
-using System;
-using Mono.TextEditor.Highlighting;
-using Mono.Addins;
-
+using Mono.TextEditor.PopupWindow;
 
 namespace MonoDevelop.SourceEditor
 {
-	public static class SyntaxModeService
+	class ListDataProviderWrapper : IListDataProvider<string>
 	{
-		static SyntaxModeService ()
+		MonoDevelop.Ide.CodeTemplates.IListDataProvider<string> dataProvider;
+
+		public ListDataProviderWrapper (MonoDevelop.Ide.CodeTemplates.IListDataProvider<string> dataProvider)
+		{
+			this.dataProvider = dataProvider;
+		}
+
+		#region IListDataProvider implementation
+		Xwt.Drawing.Image IListDataProvider<string>.GetIcon (int index)
 		{
-//			Console.WriteLine ("SETUP SMS");
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/SourceEditor2/CustomModes", delegate(object sender, ExtensionNodeEventArgs args) {
-				SyntaxModeCodon syntaxModeCodon = (SyntaxModeCodon)args.ExtensionNode;
-				switch (args.Change) {
-				case ExtensionChange.Add:
-//					Console.WriteLine ("INstall:" + syntaxModeCodon.MimeTypes);
-					Mono.TextEditor.Highlighting.SyntaxModeService.InstallSyntaxMode (syntaxModeCodon.MimeTypes, new SyntaxModeProvider (d => {
-						var result = syntaxModeCodon.SyntaxMode;
-						result.Document = d;
-						return result;
-					}));
-					break;
-				}
-			});
+			return dataProvider.GetIcon (index);
 		}
-		
-		public static void EnsureLoad ()
+
+		string IListDataProvider<string>.GetText (int index)
 		{
+			return dataProvider.GetText (index);
+		}
+
+		int IListDataProvider<string>.Count {
+			get {
+				return dataProvider.Count;
+			}
+		}
+
+		string IListDataProvider<string>.this [int index] {
+			get {
+				return dataProvider[index];
+			}
 		}
+		#endregion
 	}
+
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs
index 1aab3dd990..7d9f239948 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs
@@ -35,7 +35,7 @@ using MonoDevelop.Ide;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class MarkerOperationsHandler : CommandHandler
+	class MarkerOperationsHandler : CommandHandler
 	{
 		protected override void Run (object data)
 		{
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
index c7f1464e68..5ace0ccd36 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
@@ -43,7 +43,7 @@ namespace MonoDevelop.SourceEditor
 		internal Dictionary<string, LayoutDescriptor> textWidthDictionary = new Dictionary<string, LayoutDescriptor> ();
 		internal Dictionary<DocumentLine, double> lineWidthDictionary = new Dictionary<DocumentLine, double> ();
 		
-		internal TextEditor editor;
+		internal MonoTextEditor editor;
 
 		internal Pango.FontDescription fontDescription;
 		internal Pango.FontDescription tooltipFontDescription;
@@ -51,7 +51,7 @@ namespace MonoDevelop.SourceEditor
 
 		public MessageBubbleTextMarker CurrentSelectedTextMarker;
 
-		public MessageBubbleCache (TextEditor editor)
+		public MessageBubbleCache (MonoTextEditor editor)
 		{
 			this.editor = editor;
 			errorPixbuf = Xwt.Drawing.Image.FromResource ("gutter-error-15.png");
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs
index d92e322486..6facc36d75 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs
@@ -34,24 +34,25 @@ using MonoDevelop.Ide;
 using System.Text.RegularExpressions;
 using Mono.TextEditor.Highlighting;
 using MonoDevelop.Ide.Fonts;
-using MonoDevelop.Components;
 using Gtk;
+using MonoDevelop.Components;
+using MonoDevelop.SourceEditor.Wrappers;
 
 namespace MonoDevelop.SourceEditor
 {
-	class MessageBubbleTextMarker : MarginMarker, IDisposable, IActionTextLineMarker
+	class MessageBubbleTextMarker : MarginMarker, IDisposable, IActionTextLineMarker, MonoDevelop.Ide.Editor.IMessageBubbleLineMarker
 	{
 		readonly MessageBubbleCache cache;
 		
 		internal const int border = 4;
 		
-		TextEditor editor {
+		MonoTextEditor editor {
 			get { return cache.editor;}
 		}
 
 		public override bool IsVisible {
 			get { return !task.Completed; }
-			set { task.Completed = !value; }
+			set { task.Completed = !value; editor.QueueDraw (); }
 		}
 
 		public bool UseVirtualLines { get; set; }
@@ -62,12 +63,13 @@ namespace MonoDevelop.SourceEditor
 		}
 
 		TaskListEntry task;
+		TaskListEntry primaryTask;
 		DocumentLine lineSegment;
 //		int editorAllocHeight = -1;
 //		int lastLineLength = -1;
 		internal double lastHeight = 0;
 
-		public double GetLineHeight (TextEditor editor)
+		public double GetLineHeight (MonoTextEditor editor)
 		{
 			return editor.LineHeight;
 			/*
@@ -96,8 +98,10 @@ namespace MonoDevelop.SourceEditor
 			return height;*/
 		}
 
-		public void SetPrimaryError (string text)
+		public void SetPrimaryError (TaskListEntry task)
 		{
+			this.primaryTask = task;
+			var text = task.Description;
 			EnsureLayoutCreated (editor);
 			
 			var match = mcsErrorFormat.Match (text);
@@ -143,6 +147,15 @@ namespace MonoDevelop.SourceEditor
 
 		string initialText;
 		bool isError;
+
+		public MessageBubbleTextMarker (MessageBubbleCache cache)
+		{
+			if (cache == null)
+				throw new ArgumentNullException ("cache");
+			this.cache = cache;
+			this.IsVisible = true;
+		}
+
 		internal MessageBubbleTextMarker (MessageBubbleCache cache, TaskListEntry task, DocumentLine lineSegment, bool isError, string errorMessage)
 		{
 			if (cache == null)
@@ -160,13 +173,16 @@ namespace MonoDevelop.SourceEditor
 		static System.Text.RegularExpressions.Regex mcsErrorFormat = new System.Text.RegularExpressions.Regex ("(.+)\\(CS\\d+\\)\\Z");
 		public void AddError (TaskListEntry task, bool isError, string errorMessage)
 		{
+			if (this.task == null) {
+				this.task = task;
+			}
 			var match = mcsErrorFormat.Match (errorMessage);
 			if (match.Success)
 				errorMessage = match.Groups [1].Value;
 			errors.Add (new ErrorText (task, isError, errorMessage));
 			DisposeLayout ();
 		}
-		
+
 		public void DisposeLayout ()
 		{
 			layouts = null;
@@ -271,7 +287,7 @@ namespace MonoDevelop.SourceEditor
 			get { return layouts; }
 		}
 		
-		internal void EnsureLayoutCreated (TextEditor editor)
+		internal void EnsureLayoutCreated (MonoTextEditor editor)
 		{
 			if (layouts != null)
 				return;
@@ -332,12 +348,12 @@ namespace MonoDevelop.SourceEditor
 		}
 
 		#region IActionTextMarker implementation
-		public bool MousePressed (TextEditor editor, MarginMouseEventArgs args)
+		public bool MousePressed (MonoTextEditor editor, MarginMouseEventArgs args)
 		{
 			return false;
 		}
 
-		public void MouseHover (TextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result)
+		public void MouseHover (MonoTextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result)
 		{
 			if (!IsVisible)
 				return;
@@ -355,12 +371,12 @@ namespace MonoDevelop.SourceEditor
 		double bubbleWidth;
 		bool bubbleIsReduced;
 		
-		public override void Draw (TextEditor editor, Cairo.Context g, double y, LineMetrics metrics)
+		public override void Draw (MonoTextEditor editor, Cairo.Context g, LineMetrics metrics)
 		{
 
 		}
 
-		public override void DrawAfterEol (TextEditor textEditor, Cairo.Context g, double y, EndOfLineMetrics metrics)
+		public override void DrawAfterEol (MonoTextEditor textEditor, Cairo.Context g, EndOfLineMetrics metrics)
 		{
 			if (!IsVisible)
 				return;
@@ -374,6 +390,7 @@ namespace MonoDevelop.SourceEditor
 			var sx = metrics.TextRenderEndPosition;
 			var width = LayoutWidth + errorCounterWidth + editor.LineHeight;
 			var drawLayout = layouts[0].Layout;
+			var y = metrics.LineYRenderStartPosition;
 			bool customLayout = true; //sx + width > editor.Allocation.Width;
 			bool hideText = false;
 			bubbleIsReduced = customLayout;
@@ -494,7 +511,7 @@ namespace MonoDevelop.SourceEditor
 			return margin is IconMargin;
 		}
 
-		void DrawIconMarginBackground (TextEditor ed, Cairo.Context cr, MarginDrawMetrics metrics)
+		void DrawIconMarginBackground (MonoTextEditor ed, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 			cr.Rectangle (metrics.X, metrics.Y, metrics.Width, metrics.Height);
 			cr.SetSourceColor (IconMarginColor.Color);
@@ -510,7 +527,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 
-		public override void DrawForeground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		public override void DrawForeground (MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 			var tx = Math.Round (metrics.X + (metrics.Width - cache.errorPixbuf.Width) / 2) - 1;
 			var ty = Math.Floor (metrics.Y + (metrics.Height - cache.errorPixbuf.Height) / 2);
@@ -521,7 +538,7 @@ namespace MonoDevelop.SourceEditor
 			cr.Restore ();
 		}
 
-		public override bool DrawBackground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		public override bool DrawBackground (MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 			if (metrics.Margin is FoldMarkerMargin || metrics.Margin is GutterMargin || metrics.Margin is ActionMargin)
 				return DrawMarginBackground (editor, metrics.Margin, cr, metrics.Area, lineSegment, metrics.LineNumber, metrics.X, metrics.Y, metrics.Height);
@@ -532,7 +549,7 @@ namespace MonoDevelop.SourceEditor
 			return false;
 		}
 
-		bool DrawMarginBackground (TextEditor e, Margin margin, Cairo.Context cr, Cairo.Rectangle area, DocumentLine documentLine, long line, double x, double y, double lineHeight)
+		bool DrawMarginBackground (MonoTextEditor e, Margin margin, Cairo.Context cr, Cairo.Rectangle area, DocumentLine documentLine, long line, double x, double y, double lineHeight)
 		{
 			if (cache.CurrentSelectedTextMarker != null && cache.CurrentSelectedTextMarker != this)
 				return false;
@@ -547,7 +564,7 @@ namespace MonoDevelop.SourceEditor
 
 		#region text background
 
-		public override bool DrawBackground (TextEditor editor, Cairo.Context g, double y, LineMetrics metrics)
+		public override bool DrawBackground (MonoTextEditor editor, Cairo.Context g, LineMetrics metrics)
 		{
 			if (!IsVisible)
 				return false;
@@ -569,7 +586,7 @@ namespace MonoDevelop.SourceEditor
 
 			int active = editor.Document.GetTextAt (lineSegment) == initialText ? 0 : 1;
 			bool highlighted = active == 0 && isCaretInLine;
-
+			var y = metrics.LineYRenderStartPosition;
 			// draw background
 			if (!markerShouldDrawnAsHidden) {
 				DrawRectangle (g, x, y, right, editor.LineHeight);
@@ -627,7 +644,7 @@ namespace MonoDevelop.SourceEditor
 			return true;
 		}
 
-		void DrawErrorMarkers (TextEditor editor, Cairo.Context g, LineMetrics metrics, double y)
+		void DrawErrorMarkers (MonoTextEditor editor, Cairo.Context g, LineMetrics metrics, double y)
 		{
 			uint curIndex = 0, byteIndex = 0;
 
@@ -652,5 +669,38 @@ namespace MonoDevelop.SourceEditor
 		}
 
 		#endregion
+
+		MonoDevelop.Ide.Editor.IDocumentLine MonoDevelop.Ide.Editor.ITextLineMarker.Line {
+			get {
+				return new DocumentLineWrapper (LineSegment);
+			}
+		}
+
+		void MonoDevelop.Ide.Editor.IMessageBubbleLineMarker.AddTask (TaskListEntry task)
+		{
+			AddError (task, task.Severity == TaskSeverity.Error, task.Description);
+		}
+
+		TaskListEntry MonoDevelop.Ide.Editor.IMessageBubbleLineMarker.PrimaryTask {
+			get {
+				return primaryTask;
+			}
+			set {
+				SetPrimaryError (task);
+			}
+		}
+
+		int MonoDevelop.Ide.Editor.IMessageBubbleLineMarker.TaskCount {
+			get {
+				return errors.Count;
+			}
+		}
+
+		IEnumerable<TaskListEntry> MonoDevelop.Ide.Editor.IMessageBubbleLineMarker.Tasks {
+			get {
+				return errors.Select (e => e.Task);
+			}
+		}
+
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs
index 0d9afdeea5..13752b4b1c 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs
@@ -31,7 +31,7 @@ using Gdk;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class OverlayMessageWindow : Gtk.EventBox
+	class OverlayMessageWindow : Gtk.EventBox
 	{
 		const int border = 8;
 
@@ -50,7 +50,7 @@ namespace MonoDevelop.SourceEditor
 			this.ShowAll (); 
 			textEditor.AddTopLevelWidget (this, 0, 0); 
 			textEditor.SizeAllocated += HandleSizeAllocated;
-			var child = (TextEditor.EditorContainerChild)textEditor [this];
+			var child = (MonoTextEditor.EditorContainerChild)textEditor [this];
 			child.FixedPosition = true;
 		}
 
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs
index c53fa61362..343a2e43d5 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs
@@ -37,12 +37,12 @@ using Gtk;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class PinnedWatchWidget : Gtk.EventBox
+	class PinnedWatchWidget : Gtk.EventBox
 	{
 		readonly ObjectValueTreeView valueTree;
 		ObjectValue objectValue;
 
-		TextEditor Editor {
+		MonoTextEditor Editor {
 			get; set;
 		}
 		
@@ -70,7 +70,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 		
-		public PinnedWatchWidget (TextEditor editor, PinnedWatch watch)
+		public PinnedWatchWidget (MonoTextEditor editor, PinnedWatch watch)
 		{
 			objectValue = watch.Value;
 			Editor = editor;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs
index cb6cedc56f..3bcb5c7387 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs
@@ -54,7 +54,7 @@ namespace MonoDevelop.SourceEditor
 			set;
 		}
 
-		readonly TextEditor textEditor;
+		readonly MonoTextEditor textEditor;
 		readonly Widget frame;
 		bool isReplaceMode = true;
 		Widget[] replaceWidgets;
@@ -101,7 +101,7 @@ namespace MonoDevelop.SourceEditor
 			if (frame == null || textEditor == null)
 				return;
 			int newX = textEditor.Allocation.Width - Allocation.Width - 8;
-			TextEditor.EditorContainerChild containerChild = ((TextEditor.EditorContainerChild)textEditor [frame]);
+			MonoTextEditor.EditorContainerChild containerChild = ((MonoTextEditor.EditorContainerChild)textEditor [frame]);
 			if (newX != containerChild.X) {
 				searchEntry.WidthRequest = textEditor.Allocation.Width / 3;
 				containerChild.X = newX;
@@ -118,7 +118,7 @@ namespace MonoDevelop.SourceEditor
 			return "(" + nextShortcut + ")";
 		}
 		
-		public SearchAndReplaceWidget (TextEditor textEditor, Widget frame)
+		public SearchAndReplaceWidget (MonoTextEditor textEditor, Widget frame)
 		{
 			if (textEditor == null)
 				throw new ArgumentNullException ("textEditor");
@@ -827,7 +827,7 @@ But I leave it in in the case I've missed something. Mike
 			textEditor.SearchPattern = searchPattern;
 		}
 
-		public static SearchResult FindNext (TextEditor textEditor)
+		public static SearchResult FindNext (MonoTextEditor textEditor)
 		{
 			textEditor.SearchPattern = SearchAndReplaceOptions.SearchPattern;
 			SearchResult result = textEditor.FindNext (true);
@@ -848,7 +848,7 @@ But I leave it in in the case I've missed something. Mike
 			return result;
 		}
 
-		public static SearchResult FindPrevious (TextEditor textEditor)
+		public static SearchResult FindPrevious (MonoTextEditor textEditor)
 		{
 			textEditor.SearchPattern = SearchAndReplaceOptions.SearchPattern;
 			SearchResult result = textEditor.FindPrevious (true);
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorCommands.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorCommands.cs
index 847f0e93a1..53776a244b 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorCommands.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorCommands.cs
@@ -33,9 +33,6 @@ namespace MonoDevelop.SourceEditor
 	public enum SourceEditorCommands
 	{
 		MarkerOperations,
-		DynamicAbbrev,
-		PulseCaret,
-		ToggleErrorTextMarker,
 
 		NextIssue,
 		PrevIssue,
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
deleted file mode 100644
index 67208ec589..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
+++ /dev/null
@@ -1,682 +0,0 @@
-// SourceEditorOptions.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-
-using Mono.TextEditor;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Fonts;
-
-namespace MonoDevelop.SourceEditor
-{
-	[Obsolete ("Use WordNavigationStyle")]
-	public enum ControlLeftRightMode
-	{
-		MonoDevelop,
-		Emacs,
-		SharpDevelop
-	}
-
-	public enum WordNavigationStyle
-	{
-		Unix,
-		Windows
-	}
-	
-	public enum LineEndingConversion {
-		Ask,
-		LeaveAsIs,
-		ConvertAlways
-	}
-	
-	public class DefaultSourceEditorOptions : TextEditorOptions, ISourceEditorOptions
-	{
-		static DefaultSourceEditorOptions instance;
-		//static TextStylePolicy defaultPolicy;
-		static bool inited;
-		
-		public static DefaultSourceEditorOptions Instance {
-			get { return instance; }
-		}
-		
-		static DefaultSourceEditorOptions ()
-		{
-			Init ();
-		}
-		
-		public static void Init ()
-		{
-			if (inited)
-				return;
-			inited = true;
-			
-			TextStylePolicy policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> ("text/plain");
-			instance = new DefaultSourceEditorOptions (policy);
-			MonoDevelop.Projects.Policies.PolicyService.DefaultPolicies.PolicyChanged += instance.HandlePolicyChanged;
-		}
-
-		void HandlePolicyChanged (object sender, MonoDevelop.Projects.Policies.PolicyChangedEventArgs args)
-		{
-			TextStylePolicy pol = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> ("text/plain");
-			UpdateStylePolicy (pol);
-		}
-		
-		DefaultSourceEditorOptions (MonoDevelop.Ide.Gui.Content.TextStylePolicy currentPolicy)
-		{
-			LoadAllPrefs ();
-			UpdateStylePolicy (currentPolicy);
-			PropertyService.PropertyChanged += UpdatePreferences;
-			FontService.RegisterFontChangedCallback ("Editor", UpdateFont);
-			FontService.RegisterFontChangedCallback ("Pad", UpdateFont);
-			
-		}
-		
-		public override void Dispose()
-		{
-			PropertyService.PropertyChanged -= UpdatePreferences;
-			FontService.RemoveCallback (UpdateFont);
-		}
-		
-		void UpdateFont ()
-		{
-			base.FontName = FontName;
-			base.GutterFontName = GutterFontName;
-			this.OnChanged (EventArgs.Empty);
-		
-		}
-		
-		void UpdateStylePolicy (MonoDevelop.Ide.Gui.Content.TextStylePolicy currentPolicy)
-		{
-			this.defaultEolMarker = TextStylePolicy.GetEolMarker (currentPolicy.EolMarker);
-			
-			base.TabsToSpaces          = currentPolicy.TabsToSpaces; // PropertyService.Get ("TabsToSpaces", false);
-			base.IndentationSize       = currentPolicy.TabWidth; //PropertyService.Get ("TabIndent", 4);
-			base.RulerColumn           = currentPolicy.FileWidth; //PropertyService.Get ("RulerColumn", 80);
-			base.AllowTabsAfterNonTabs = !currentPolicy.NoTabsAfterNonTabs; //PropertyService.Get ("AllowTabsAfterNonTabs", true);
-			base.RemoveTrailingWhitespaces = currentPolicy.RemoveTrailingWhitespace; //PropertyService.Get ("RemoveTrailingWhitespaces", true);
-		}
-		
-		// Need to be picky about only updating individual properties when they change.
-		// The old approach called LoadAllPrefs on any prefs event, which sometimes caused 
-		// massive change event storms.
-		void UpdatePreferences (object sender, PropertyChangedEventArgs args)
-		{
-			try {
-				switch (args.Key) {
-				case "TabIsReindent": 
-					this.TabIsReindent = (bool)args.NewValue;
-					break;
-				case "AutoInsertMatchingBracket":
-					this.AutoInsertMatchingBracket = (bool)args.NewValue;
-					break;
-				case "UnderlineErrors":
-					this.UnderlineErrors = (bool)args.NewValue;
-					break;
-				case "IndentStyle":
-					if (args.NewValue == null) {
-						LoggingService.LogWarning ("tried to set indent style == null");
-					} else if (!(args.NewValue is IndentStyle)) {
-						LoggingService.LogWarning ("tried to set indent style to " + args.NewValue + " which isn't from type IndentStyle instead it is from:" + args.NewValue.GetType ());
-						this.IndentStyle = (IndentStyle)Enum.Parse (typeof(IndentStyle), args.NewValue.ToString ());
-					} else 
-						this.IndentStyle = (IndentStyle)args.NewValue;
-					break;
-				case "ShowLineNumberMargin":
-					base.ShowLineNumberMargin = (bool)args.NewValue;
-					break;
-				case "ShowFoldMargin":
-					base.ShowFoldMargin = (bool)args.NewValue;
-					break;
-				case "HighlightCaretLine":
-					base.HighlightCaretLine = (bool)args.NewValue;
-					break;
-				case "HighlightMatchingBracket":
-					base.HighlightMatchingBracket = (bool)args.NewValue;
-					break;
-				case "ShowRuler":
-					base.ShowRuler = (bool)args.NewValue;
-					break;
-				case "FontName":
-					base.FontName = (string)args.NewValue;
-					break;
-				case "GutterFontName":
-					base.GutterFontName = (string)args.NewValue;
-					break;
-				case "ColorScheme":
-					base.ColorScheme = (string)args.NewValue;
-					break;
-				case "DefaultRegionsFolding":
-					this.DefaultRegionsFolding = (bool)args.NewValue;
-					break;
-				case "DefaultCommentFolding":
-					this.DefaultCommentFolding = (bool)args.NewValue;
-					break;
-				case "UseViModes":
-					this.UseViModes = (bool)args.NewValue;
-					break;
-				case "OnTheFlyFormatting":
-					this.OnTheFlyFormatting = (bool)args.NewValue;
-					break;
-				case "WordNavigationStyle":
-					this.WordNavigationStyle = (WordNavigationStyle)args.NewValue;
-					break;
-				case "EnableAnimations":
-					base.EnableAnimations = (bool)args.NewValue;
-					break;
-				case "DrawIndentationMarkers":
-					base.DrawIndentationMarkers = (bool)args.NewValue;
-					break;
-				case "EnableQuickDiff":
-					base.EnableQuickDiff = (bool)args.NewValue;
-					break;
-				case "GenerateFormattingUndoStep":
-					base.GenerateFormattingUndoStep = (bool)args.NewValue;
-					break;
-				}
-			} catch (Exception ex) {
-				LoggingService.LogError ("SourceEditorOptions error with property value for '" + (args.Key ?? "") + "'", ex);
-			}
-		}
-		
-		void LoadAllPrefs ()
-		{
-			this.tabIsReindent = PropertyService.Get ("TabIsReindent", false);
-			//			this.autoInsertTemplates        = PropertyService.Get ("AutoInsertTemplates", false);
-			this.autoInsertMatchingBracket = PropertyService.Get ("AutoInsertMatchingBracket", false);
-			this.smartSemicolonPlacement = PropertyService.Get ("SmartSemicolonPlacement", false);
-			this.underlineErrors = PropertyService.Get ("UnderlineErrors", true);
-			this.indentStyle = PropertyService.Get ("IndentStyle", IndentStyle.Smart);
-			base.ShowLineNumberMargin = PropertyService.Get ("ShowLineNumberMargin", true);
-			base.ShowFoldMargin = PropertyService.Get ("ShowFoldMargin", false);
-			base.HighlightCaretLine = PropertyService.Get ("HighlightCaretLine", false);
-			base.HighlightMatchingBracket = PropertyService.Get ("HighlightMatchingBracket", true);
-			base.ShowRuler = PropertyService.Get ("ShowRuler", false);
-			base.FontName = PropertyService.Get ("FontName", "Mono 10");
-			base.GutterFontName = PropertyService.Get ("GutterFontName", "");
-			base.ColorScheme = PropertyService.Get ("ColorScheme", "Default");
-			this.defaultRegionsFolding = PropertyService.Get ("DefaultRegionsFolding", false);
-			this.defaultCommentFolding = PropertyService.Get ("DefaultCommentFolding", true);
-			this.useViModes = PropertyService.Get ("UseViModes", false);
-			this.onTheFlyFormatting = PropertyService.Get ("OnTheFlyFormatting", true);
-
-			WordNavigationStyle defaultWordNavigation = WordNavigationStyle.Unix;
-			if (Platform.IsWindows || PropertyService.Get ("ControlLeftRightMode", (string)null) == "SharpDevelop") {
-				defaultWordNavigation = WordNavigationStyle.Windows;
-			}
-			this.WordNavigationStyle = PropertyService.Get ("WordNavigationStyle", defaultWordNavigation);
-
-			base.EnableAnimations = PropertyService.Get ("EnableAnimations", true);
-			this.EnableHighlightUsages = PropertyService.Get ("EnableHighlightUsages", false);
-			base.DrawIndentationMarkers = PropertyService.Get ("DrawIndentationMarkers", false);
-			this.lineEndingConversion = PropertyService.Get ("LineEndingConversion", LineEndingConversion.Ask);
-			base.GenerateFormattingUndoStep = PropertyService.Get ("GenerateFormattingUndoStep", false);
-			base.ShowWhitespaces = PropertyService.Get ("ShowWhitespaces", Mono.TextEditor.ShowWhitespaces.Never);
-			base.IncludeWhitespaces = PropertyService.Get ("IncludeWhitespaces", Mono.TextEditor.IncludeWhitespaces.All);
-			base.WrapLines = PropertyService.Get ("WrapLines", false);
-			base.EnableQuickDiff = PropertyService.Get ("EnableQuickDiff", false);
-		}
-		
-		#region new options
-		
-		public bool EnableAutoCodeCompletion {
-			get { return CompletionTextEditorExtension.EnableAutoCodeCompletion; }
-			set { CompletionTextEditorExtension.EnableAutoCodeCompletion.Set (value); }
-		}
-		
-		bool defaultRegionsFolding;
-		public bool DefaultRegionsFolding {
-			get {
-				return defaultRegionsFolding;
-			}
-			set {
-				if (value != this.defaultRegionsFolding) {
-					this.defaultRegionsFolding = value;
-					PropertyService.Set ("DefaultRegionsFolding", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		bool defaultCommentFolding;
-		public bool DefaultCommentFolding {
-			get {
-				return defaultCommentFolding;
-			}
-			set {
-				if (value != this.defaultCommentFolding) {
-					this.defaultCommentFolding = value;
-					PropertyService.Set ("DefaultCommentFolding", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		public bool EnableSemanticHighlighting {
-			get {
-				return true;
-			}
-		}
-		/*
-		bool autoInsertTemplates;
-		public bool AutoInsertTemplates {
-			get {
-				return autoInsertTemplates;
-			}
-			set {
-				if (value != this.autoInsertTemplates) {
-					this.autoInsertTemplates = value;
-					PropertyService.Set ("AutoInsertTemplates", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}*/
-		
-		bool tabIsReindent;
-		public bool TabIsReindent {
-			get {
-				return tabIsReindent;
-			}
-			set {
-				if (value != this.tabIsReindent) {
-					this.tabIsReindent = value;
-					PropertyService.Set ("TabIsReindent", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		bool autoInsertMatchingBracket;
-		public bool AutoInsertMatchingBracket {
-			get {
-				return autoInsertMatchingBracket;
-			}
-			set {
-				if (value != this.autoInsertMatchingBracket) {
-					this.autoInsertMatchingBracket = value;
-					PropertyService.Set ("AutoInsertMatchingBracket", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		bool smartSemicolonPlacement;
-		public bool SmartSemicolonPlacement {
-			get {
-				return smartSemicolonPlacement;
-			}
-			set {
-				if (value != this.smartSemicolonPlacement) {
-					this.smartSemicolonPlacement= value;
-					PropertyService.Set ("SmartSemicolonPlacement", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-
-		bool underlineErrors;
-		public bool UnderlineErrors {
-			get {
-				return underlineErrors; 
-			}
-			set {
-				if (value != this.underlineErrors) {
-					this.underlineErrors = value;
-					PropertyService.Set ("UnderlineErrors", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		IndentStyle indentStyle;
-		public override IndentStyle IndentStyle {
-			get {
-				return indentStyle;
-			}
-			set {
-				if (value != this.indentStyle) {
-					this.indentStyle = value;
-					PropertyService.Set ("IndentStyle", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		EditorFontType editorFontType;
-		public EditorFontType EditorFontType {
-			get {
-				return editorFontType;
-			}
-			set {
-				if (value != this.editorFontType) {
-					this.editorFontType = value;
-					PropertyService.Set ("EditorFontType", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		bool enableHighlightUsages;
-		public bool EnableHighlightUsages {
-			get {
-				return enableHighlightUsages;
-			}
-			set {
-				if (value != this.enableHighlightUsages) {
-					this.enableHighlightUsages = value;
-					PropertyService.Set ("EnableHighlightUsages", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		LineEndingConversion lineEndingConversion;
-		public LineEndingConversion LineEndingConversion {
-			get {
-				return lineEndingConversion;
-			}
-			set {
-				if (value != this.lineEndingConversion) {
-					this.lineEndingConversion = value;
-					PropertyService.Set ("LineEndingConversion", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-
-		#endregion
-		
-		bool useViModes = false;
-		public bool UseViModes {
-			get {
-				return useViModes;
-			}
-			set {
-				if (useViModes == value)
-					return;
-				useViModes = value;
-				PropertyService.Set ("UseViModes", value);
-				OnChanged (EventArgs.Empty);
-			}
-		}
-		
-		bool onTheFlyFormatting = false;
-		public bool OnTheFlyFormatting {
-			get {
-				return onTheFlyFormatting;
-			}
-			set {
-				if (onTheFlyFormatting == value)
-					return;
-				onTheFlyFormatting = value;
-				PropertyService.Set ("OnTheFlyFormatting", value);
-				OnChanged (EventArgs.Empty);
-			}
-		}
-		
-		#region old options
-		string defaultEolMarker;
-		public override string DefaultEolMarker {
-			get { return defaultEolMarker; }
-		}
-
-		WordNavigationStyle wordNavigationStyle = Platform.IsWindows
-			? WordNavigationStyle.Windows
-			: WordNavigationStyle.Unix;
-
-		[Obsolete("Use WordNavigationStyle")]
-		public ControlLeftRightMode ControlLeftRightMode {
-			get {
-				return WordNavigationStyle == WordNavigationStyle.Unix
-					? ControlLeftRightMode.MonoDevelop
-					: ControlLeftRightMode.SharpDevelop;
-			}
-			set {
-				switch (value) {
-				case ControlLeftRightMode.Emacs:
-				case ControlLeftRightMode.MonoDevelop:
-					WordNavigationStyle = WordNavigationStyle.Unix;
-					return;
-				default:
-					WordNavigationStyle = WordNavigationStyle.Windows;
-					return;
-				}
-			}
-		}
-
-		public WordNavigationStyle WordNavigationStyle {
-			get {
-				return wordNavigationStyle;
-			}
-			set {
-				if (wordNavigationStyle != value) {
-					wordNavigationStyle = value;
-					PropertyService.Set ("WordNavigationStyle", value);
-					SetWordFindStrategy ();
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		IWordFindStrategy wordFindStrategy = null;
-		public override IWordFindStrategy WordFindStrategy {
-			get {
-				if (wordFindStrategy == null)
-					SetWordFindStrategy ();
-				return this.wordFindStrategy;
-			}
-			set {
-				throw new System.NotImplementedException ();
-			}
-		}
-		
-		void SetWordFindStrategy ()
-		{
-			if (useViModes) {
-				wordFindStrategy = new Mono.TextEditor.Vi.ViWordFindStrategy ();
-				return;
-			}
-			
-			switch (WordNavigationStyle) {
-			case WordNavigationStyle.Windows:
-				wordFindStrategy = new SharpDevelopWordFindStrategy ();
-				break;
-			default:
-				wordFindStrategy = new EmacsWordFindStrategy ();
-				break;
-			}
-		}
-
-		public override bool AllowTabsAfterNonTabs {
-			set {
-				if (value != AllowTabsAfterNonTabs) {
-					PropertyService.Set ("AllowTabsAfterNonTabs", value);
-					base.AllowTabsAfterNonTabs = value;
-				}
-			}
-		}
-				
-		public override bool TabsToSpaces {
-			set {
-				PropertyService.Set ("TabsToSpaces", value);
-				base.TabsToSpaces = value;
-			}
-		}
-		
-		public override int IndentationSize {
-			set {
-				PropertyService.Set ("TabIndent", value);
-				base.IndentationSize = value;
-			}
-		}
-		
-		public override int TabSize {
-			get {
-				return IndentationSize;
-			}
-			set {
-				IndentationSize = value;
-			}
-		}
-		
-		public override bool RemoveTrailingWhitespaces {
-			set {
-				PropertyService.Set ("RemoveTrailingWhitespaces", value);
-				base.RemoveTrailingWhitespaces = value;
-			}
-		}
-
-		
-		public override bool ShowLineNumberMargin {
-			set {
-				PropertyService.Set ("ShowLineNumberMargin", value);
-				base.ShowLineNumberMargin = value;
-			}
-		}
-		
-		public override bool ShowFoldMargin {
-			set {
-				PropertyService.Set ("ShowFoldMargin", value);
-				base.ShowFoldMargin = value;
-			}
-		}
-		
-		public override bool HighlightCaretLine {
-			set {
-				PropertyService.Set ("HighlightCaretLine", value);
-				base.HighlightCaretLine = value;
-			}
-		}
-		
-		public override bool EnableSyntaxHighlighting {
-			get {
-				return true;
-			}
-			set {
-				// nothing
-			}
-		}
-		
-		public override bool HighlightMatchingBracket {
-			set {
-				PropertyService.Set ("HighlightMatchingBracket", value);
-				base.HighlightMatchingBracket = value;
-			}
-		}
-		
-		public override int RulerColumn {
-			set {
-				PropertyService.Set ("RulerColumn", value);
-				base.RulerColumn = value;
-			}
-		}
-		
-		public override bool ShowRuler {
-			set {
-				PropertyService.Set ("ShowRuler", value);
-				base.ShowRuler = value;
-			}
-		}
-		
-		public override bool EnableAnimations {
-			set {
-				PropertyService.Set ("EnableAnimations", value);
-				base.EnableAnimations = value;
-			}
-		}
-		
-		public override bool DrawIndentationMarkers {
-			set {
-				PropertyService.Set ("DrawIndentationMarkers", value);
-				base.DrawIndentationMarkers = value;
-			}
-		}
-
-		public override ShowWhitespaces ShowWhitespaces {
-			set {
-				PropertyService.Set ("ShowWhitespaces", value);
-				base.ShowWhitespaces = value;
-			}
-		}
-
-		public override IncludeWhitespaces IncludeWhitespaces {
-			set {
-				PropertyService.Set ("IncludeWhitespaces", value);
-				base.IncludeWhitespaces = value;
-			}
-		}
-
-		public override bool WrapLines {
-			set {
-				PropertyService.Set ("WrapLines", value);
-				base.WrapLines = value;
-			}
-		}
-
-		public override bool EnableQuickDiff {
-			set {
-				PropertyService.Set ("EnableQuickDiff", value);
-				base.EnableQuickDiff = value;
-			}
-		}
-
-		public override string FontName {
-			get {
-				return FontService.FilterFontName (FontService.GetUnderlyingFontName ("Editor"));
-			}
-			set {
-				throw new InvalidOperationException ("Set font through font service");
-			}
-		}
-		
-		public override string GutterFontName {
-			get {
-				return FontService.FilterFontName (FontService.GetUnderlyingFontName ("Editor"));
-			}
-			set {
-				throw new InvalidOperationException ("Set font through font service");
-			}
-		}
-		
-		public override string ColorScheme {
-			set {
-				string newColorScheme = !String.IsNullOrEmpty (value) ? value : "Default";
-				PropertyService.Set ("ColorScheme", newColorScheme);
-				base.ColorScheme =  newColorScheme;
-			}
-		}
-
-		public override bool GenerateFormattingUndoStep {
-			set {
-				PropertyService.Set ("GenerateFormattingUndoStep", value);
-				base.GenerateFormattingUndoStep = value;
-			}
-		}
-
-		#endregion
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs
index 2aeda98637..69f79fce32 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs
@@ -28,6 +28,7 @@ using Gtk;
 using Mono.TextEditor;
 using System.Text;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor
 {
@@ -284,7 +285,15 @@ namespace MonoDevelop.SourceEditor
 		
 		private SourceEditorPrintSettings ()
 		{
-			Font = DefaultSourceEditorOptions.Instance.Font;
+			try {
+				Font = Pango.FontDescription.FromString (DefaultSourceEditorOptions.Instance.FontName);
+			} catch {
+				Console.WriteLine ("Could not load font: {0}", DefaultSourceEditorOptions.Instance.FontName);
+			}
+			if (Font == null || String.IsNullOrEmpty (Font.Family))
+				Font = Pango.FontDescription.FromString (TextEditorOptions.DEFAULT_FONT);
+			//if (Font != null)
+			//	Font.Size = (int)(Font.Size * DefaultSourceEditorOptions.Instance.Zoom);
 			TabSize = DefaultSourceEditorOptions.Instance.TabSize;
 			HeaderFormat = "%F";
 			FooterFormat = GettextCatalog.GetString ("Page %N of %Q");
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
index 305bced3be..ec7e3fd5ad 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
@@ -55,13 +55,18 @@ using System.Text;
 using Mono.Addins;
 using MonoDevelop.Components;
 using Mono.TextEditor.Utils;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.SourceEditor.Wrappers;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor.Highlighting;
 
 namespace MonoDevelop.SourceEditor
 {	
-	public class SourceEditorView : AbstractViewContent, IExtensibleTextEditor, IBookmarkBuffer, IClipboardHandler, 
-		ICompletionWidget,  ISplittable, IFoldable, IToolboxDynamicProvider, IEncodedTextContent,
-		ICustomFilteringToolboxConsumer, IZoomable, ITextEditorResolver, Mono.TextEditor.ITextEditorDataProvider,
-		ICodeTemplateHandler, ICodeTemplateContextProvider, ISupportsProjectReload, IPrintable
+	partial class SourceEditorView : AbstractViewContent, IBookmarkBuffer, IClipboardHandler, ITextFile,
+		ICompletionWidget,  ISplittable, IFoldable, IToolboxDynamicProvider,
+		ICustomFilteringToolboxConsumer, IZoomable, ITextEditorResolver, ITextEditorDataProvider,
+		ICodeTemplateHandler, ICodeTemplateContextProvider, ISupportsProjectReload, IPrintable,
+	ITextEditorImpl, IEditorActionHost, ITextMarkerFactory, IUndoHandler
 	{
 		readonly SourceEditorWidget widget;
 		bool isDisposed = false;
@@ -79,10 +84,13 @@ namespace MonoDevelop.SourceEditor
 		bool writeAllowed;
 		bool writeAccessChecked;
 		
-		public Mono.TextEditor.TextDocument Document {
+		public TextDocument Document {
 			get {
 				return widget.TextEditor.Document;
 			}
+			set {
+				widget.TextEditor.Document = value;
+			}
 		}
 
 		public DateTime LastSaveTimeUtc {
@@ -93,7 +101,8 @@ namespace MonoDevelop.SourceEditor
 				lastSaveTimeUtc = value;
 			}
 		}		
-		public ExtensibleTextEditor TextEditor {
+
+		internal ExtensibleTextEditor TextEditor {
 			get {
 				return widget.TextEditor;
 			}
@@ -105,7 +114,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 		
-		public override Gtk.Widget Control {
+		public override Widget Control {
 			get {
 				return widget != null ? widget.Vbox : null;
 			}
@@ -116,42 +125,12 @@ namespace MonoDevelop.SourceEditor
 				return Document.LineCount;
 			}
 		}
-		
-		public override Project Project {
-			get {
-				return base.Project;
-			}
-			set {
-				if (value != base.Project)
-					((StyledSourceEditorOptions)SourceEditorWidget.TextEditor.Options).UpdateStyleParent (value, loadedMimeType);
-				base.Project = value;
-			}
-		}
 			
 		public override string TabPageLabel {
 			get { return GettextCatalog.GetString ("Source"); }
 		}
 		
-		uint autoSaveTimer = 0;
 
-		void InformAutoSave ()
-		{
-			RemoveAutoSaveTimer ();
-			autoSaveTimer = GLib.Timeout.Add (500, delegate {
-				AutoSave.InformAutoSaveThread (Document);
-				autoSaveTimer = 0;
-				return false;
-			});
-		}
-		
-		void RemoveAutoSaveTimer ()
-		{
-			if (autoSaveTimer == 0)
-				return;
-			GLib.Source.Remove (autoSaveTimer);
-			autoSaveTimer = 0;
-		}
-		
 		bool wasEdited = false;
 		uint removeMarkerTimeout;
 		Queue<MessageBubbleTextMarker> markersToRemove = new Queue<MessageBubbleTextMarker> ();
@@ -177,19 +156,27 @@ namespace MonoDevelop.SourceEditor
 			});
 		}
 
-		public SourceEditorView ()
+		public SourceEditorView (IReadonlyTextDocument document = null)
 		{
 			Counters.LoadedEditors++;
 
 			widget = new SourceEditorWidget (this);
-			widget.TextEditor.Document.SyntaxModeChanged += HandleSyntaxModeChanged;
+			if (document != null) {
+				var textDocument = document as TextDocument;
+				if (textDocument != null) {
+					widget.TextEditor.Document = textDocument;
+				} else {
+					widget.TextEditor.Document.Text = document.Text;
+				}
+			}
+
 			widget.TextEditor.Document.TextReplaced += HandleTextReplaced;
 			widget.TextEditor.Document.LineChanged += HandleLineChanged;
+			widget.TextEditor.Document.LineInserted += HandleLineChanged;
+			widget.TextEditor.Document.LineRemoved += HandleLineChanged;
 
 			widget.TextEditor.Document.BeginUndo += HandleBeginUndo; 
 			widget.TextEditor.Document.EndUndo += HandleEndUndo;
-			widget.TextEditor.Document.Undone += HandleUndone;
-			widget.TextEditor.Document.Redone += HandleUndone;
 
 			widget.TextEditor.Document.TextReplacing += OnTextReplacing;
 			widget.TextEditor.Document.TextReplaced += OnTextReplaced;
@@ -201,13 +188,13 @@ namespace MonoDevelop.SourceEditor
 			
 			widget.TextEditor.Caret.PositionChanged += HandlePositionChanged; 
 			widget.TextEditor.IconMargin.ButtonPressed += OnIconButtonPress;
-		
+
 			debugStackLineMarker = new DebugStackLineTextMarker (widget.TextEditor);
 			currentDebugLineMarker = new CurrentDebugLineTextMarker (widget.TextEditor);
 			
-			this.WorkbenchWindowChanged += HandleWorkbenchWindowChanged;
-			this.ContentNameChanged += delegate {
-				this.Document.FileName = this.ContentName;
+			WorkbenchWindowChanged += HandleWorkbenchWindowChanged;
+			ContentNameChanged += delegate {
+				Document.FileName = ContentName;
 				if (String.IsNullOrEmpty (ContentName) || !File.Exists (ContentName))
 					return;
 				
@@ -240,10 +227,14 @@ namespace MonoDevelop.SourceEditor
 			widget.TextEditor.Options.Changed += HandleWidgetTextEditorOptionsChanged;
 			IdeApp.Preferences.DefaultHideMessageBubblesChanged += HandleIdeAppPreferencesDefaultHideMessageBubblesChanged;
 			Document.AddAnnotation (this);
+			if (document != null) {
+				Document.MimeType = document.MimeType;
+				Document.FileName = document.FileName;
+			}
 			FileRegistry.Add (this);
 		}
 
-		void HandleLineChanged (object sender, LineEventArgs e)
+		void HandleLineChanged (object sender, Mono.TextEditor.LineEventArgs e)
 		{
 			UpdateBreakpoints ();
 			UpdateWidgetPositions ();
@@ -255,6 +246,9 @@ namespace MonoDevelop.SourceEditor
 					marker.GetLineHeight (widget.TextEditor);
 				}
 			}
+			var handler = LineChanged;
+			if (handler != null)
+				handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
 		}
 
 		void HandleTextReplaced (object sender, DocumentChangeEventArgs args)
@@ -265,9 +259,6 @@ namespace MonoDevelop.SourceEditor
 				if (widget.TextEditor.Document.IsInAtomicUndo) {
 					wasEdited = true;
 				}
-				else {
-					InformAutoSave ();
-				}
 			}
 
 			int startIndex = args.Offset;
@@ -279,37 +270,23 @@ namespace MonoDevelop.SourceEditor
 			ResetRemoveMarker ();
 		}
 
-		void HandleSyntaxModeChanged (object sender, SyntaxModeChangeEventArgs e)
-		{
-			var oldProvider = e.OldMode as IQuickTaskProvider;
-			if (oldProvider != null)
-				widget.RemoveQuickTaskProvider (oldProvider);
-			var newProvider = e.NewMode as IQuickTaskProvider;
-			if (newProvider != null)
-				widget.AddQuickTaskProvider (newProvider);
-		}
-
-
 		void HandleEndUndo (object sender, TextDocument.UndoOperationEventArgs e)
 		{
-			if (wasEdited)
-				InformAutoSave ();
+			OnEndUndo (EventArgs.Empty);
 		}
 
 		void HandleBeginUndo (object sender, EventArgs e)
 		{
 			wasEdited = false;
+			OnBeginUndo (EventArgs.Empty);
 		}
 
-		void HandleUndone (object sender, TextDocument.UndoOperationEventArgs e)
-		{
-			AutoSave.InformAutoSaveThread (Document);
-		}
 
 		void HandlePositionChanged (object sender, DocumentLocationEventArgs e)
 		{
 			OnCaretPositionSet (EventArgs.Empty);
 			FireCompletionContextChanged ();
+			OnCaretPositionChanged (EventArgs.Empty);
 		}
 
 		void HandleFileExtensionRemoved (object sender, FileExtensionEventArgs args)
@@ -326,7 +303,7 @@ namespace MonoDevelop.SourceEditor
 			AddFileExtension (args.Extension);
 		}
 
-		Dictionary<TopLevelWidgetExtension,Gtk.Widget> widgetExtensions = new Dictionary<TopLevelWidgetExtension, Widget> ();
+		Dictionary<TopLevelWidgetExtension,Widget> widgetExtensions = new Dictionary<TopLevelWidgetExtension, Widget> ();
 		Dictionary<FileExtension,Tuple<TextLineMarker,DocumentLine>> markerExtensions = new Dictionary<FileExtension, Tuple<TextLineMarker,DocumentLine>> ();
 
 		void LoadExtensions ()
@@ -360,22 +337,22 @@ namespace MonoDevelop.SourceEditor
 				if (line == null)
 					return;
 
-				var marker = lineExt.CreateMarker ();
+				var marker = (TextLineMarker)lineExt.CreateMarker ();
 				widget.TextEditor.Document.AddMarker (line, marker);
 				widget.TextEditor.QueueDraw ();
-				markerExtensions [extension] = new Tuple<TextLineMarker,DocumentLine> (marker, line);
+				markerExtensions [extension] = new Tuple<TextLineMarker, DocumentLine> (marker, line);
 			}
 		}
 
 		void HandleScrollToViewRequested (object sender, EventArgs e)
 		{
 			var widgetExtension = (TopLevelWidgetExtension)sender;
-			Gtk.Widget w;
+			Widget w;
 			if (widgetExtensions.TryGetValue (widgetExtension, out w)) {
 				int x, y;
 				widget.TextEditor.TextArea.GetTopLevelWidgetPosition (w, out x, out y);
 				var size = w.SizeRequest ();
-				Gtk.Application.Invoke (delegate {
+				Application.Invoke (delegate {
 					widget.TextEditor.ScrollTo (new Gdk.Rectangle (x, y, size.Width, size.Height));
 				});
 			}
@@ -385,7 +362,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			if (extension is TopLevelWidgetExtension) {
 				var widgetExtension = (TopLevelWidgetExtension)extension;
-				Gtk.Widget w;
+				Widget w;
 				if (!widgetExtensions.TryGetValue (widgetExtension, out w))
 					return;
 				widgetExtensions.Remove (widgetExtension);
@@ -417,7 +394,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 
-		bool CalcWidgetPosition (TopLevelWidgetExtension widgetExtension, Gtk.Widget w, out int x, out int y)
+		bool CalcWidgetPosition (TopLevelWidgetExtension widgetExtension, Widget w, out int x, out int y)
 		{
 			DocumentLine line = widget.TextEditor.Document.GetLine (widgetExtension.Line);
 			if (line == null) {
@@ -426,10 +403,10 @@ namespace MonoDevelop.SourceEditor
 			}
 
 			int lw, lh;
-			var wrapper = widget.TextEditor.TextViewMargin.GetLayout (line);
-			wrapper.Layout.GetPixelSize (out lw, out lh);
-			if (wrapper.IsUncached)
-				wrapper.Dispose ();
+			var tmpWrapper = widget.TextEditor.TextViewMargin.GetLayout (line);
+			tmpWrapper.Layout.GetPixelSize (out lw, out lh);
+			if (tmpWrapper.IsUncached)
+				tmpWrapper.Dispose ();
 			lh = (int) TextEditor.TextViewMargin.GetLineHeight (widgetExtension.Line);
 			x = (int)widget.TextEditor.TextViewMargin.XOffset + lw + 4;
 			y = (int)widget.TextEditor.LineToY (widgetExtension.Line);
@@ -487,9 +464,8 @@ namespace MonoDevelop.SourceEditor
 		void HandleWorkbenchWindowChanged (object sender, EventArgs e)
 		{
 			if (WorkbenchWindow != null) {
-				widget.TextEditor.ExtensionContext = WorkbenchWindow.ExtensionContext;
 				WorkbenchWindow.ActiveViewContentChanged += HandleActiveViewContentChanged;
-				this.WorkbenchWindowChanged -= HandleWorkbenchWindowChanged;
+				WorkbenchWindowChanged -= HandleWorkbenchWindowChanged;
 			}
 		}
 
@@ -509,7 +485,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			var task = e.Tasks != null ? e.Tasks.FirstOrDefault () : null;
 			var doc = Document;
-			if (task == null || doc == null || task.FileName != doc.FileName || this.TextEditor == null)
+			if (task == null || doc == null || task.FileName != doc.FileName || TextEditor == null)
 				return;
 			var lineSegment = doc.GetLine (task.Line);
 			if (lineSegment == null)
@@ -518,7 +494,7 @@ namespace MonoDevelop.SourceEditor
 			if (marker == null)
 				return;
 			
-			marker.SetPrimaryError (task.Description);
+			marker.SetPrimaryError (task);
 			
 			if (TextEditor != null && TextEditor.IsComposited) {
 				/*if (messageBubbleHighlightPopupWindow != null)
@@ -534,7 +510,7 @@ namespace MonoDevelop.SourceEditor
 		void HandleIdeAppPreferencesDefaultHideMessageBubblesChanged (object sender, PropertyChangedEventArgs e)
 		{
 			currentErrorMarkers.ForEach (marker => marker.IsVisible =  !IdeApp.Preferences.DefaultHideMessageBubbles);
-			this.TextEditor.QueueDraw ();
+			TextEditor.QueueDraw ();
 		}
 
 		void HandleIdeAppPreferencesShowMessageBubblesChanged (object sender, PropertyChangedEventArgs e)
@@ -544,7 +520,7 @@ namespace MonoDevelop.SourceEditor
 
 		void HandleErrorListPadTaskToggled (object sender, TaskEventArgs e)
 		{
-			this.TextEditor.QueueDraw ();
+			TextEditor.QueueDraw ();
 		}
 		
 		MessageBubbleCache messageBubbleCache;
@@ -593,7 +569,7 @@ namespace MonoDevelop.SourceEditor
 			//NRE and bring down MD
 			/*if (messageBubbleHighlightPopupWindow != null)
 				messageBubbleHighlightPopupWindow.Destroy ();*/
-			
+
 			currentErrorMarkers.ForEach (em => {
 				widget.Document.RemoveMarker (em);
 				em.Dispose ();
@@ -610,9 +586,9 @@ namespace MonoDevelop.SourceEditor
 			return text;
 		}
 		
-		public override void Save (string fileName)
+		public override void Save (FileSaveInformation fileSaveInformation)
 		{
-			Save (fileName, this.encoding);
+			Save (fileSaveInformation.FileName, fileSaveInformation.Encoding ?? encoding);
 		}
 
 		public void Save (string fileName, Encoding encoding)
@@ -620,9 +596,6 @@ namespace MonoDevelop.SourceEditor
 			if (widget.HasMessageBar)
 				return;
 			
-			if (!string.IsNullOrEmpty (ContentName))
-				AutoSave.RemoveAutoSaveFile (ContentName);
-
 			if (ContentName != fileName) {
 				FileService.RequestFileEdit ((FilePath) fileName);
 				writeAllowed = true;
@@ -630,7 +603,7 @@ namespace MonoDevelop.SourceEditor
 			}
 
 			if (warnOverwrite) {
-				if (fileName == ContentName) {
+				if (string.Equals (fileName, ContentName, FilePath.PathComparison)) {
 					string question = GettextCatalog.GetString (
 						"This file {0} has been changed outside of {1}. Are you sure you want to overwrite the file?",
 						fileName, BrandingService.ApplicationName
@@ -701,7 +674,7 @@ namespace MonoDevelop.SourceEditor
 	//						writeBom =!Mono.TextEditor.Utils.TextFileUtility.IsASCII (writeText);
 						}
 					}
-					Mono.TextEditor.Utils.TextFileUtility.WriteText (fileName, writeText, writeEncoding, writeBom);
+					TextFileUtility.WriteText (fileName, writeText, writeEncoding, writeBom);
 				} catch (InvalidEncodingException) {
 					var result = MessageService.AskQuestion (GettextCatalog.GetString ("Can't save file with current codepage."), 
 						GettextCatalog.GetString ("Some unicode characters in this file could not be saved with the current encoding.\nDo you want to resave this file as Unicode ?\nYou can choose another encoding in the 'save as' dialog."),
@@ -709,9 +682,9 @@ namespace MonoDevelop.SourceEditor
 						AlertButton.Cancel,
 						new AlertButton (GettextCatalog.GetString ("Save as Unicode")));
 					if (result != AlertButton.Cancel) {
-						this.hadBom = true;
+						hadBom = true;
 						this.encoding = Encoding.UTF8;
-						Mono.TextEditor.Utils.TextFileUtility.WriteText (fileName, Document.Text, encoding, hadBom);
+						TextFileUtility.WriteText (fileName, Document.Text, encoding, hadBom);
 					} else {
 						return;
 					}
@@ -737,17 +710,12 @@ namespace MonoDevelop.SourceEditor
 			ContentName = fileName; 
 			UpdateMimeType (fileName);
 			Document.SetNotDirtyState ();
-			this.IsDirty = false;
-		}
-		
-		public override void DiscardChanges ()
-		{
-			if (!string.IsNullOrEmpty (ContentName))
-				AutoSave.RemoveAutoSaveFile (ContentName);
+			IsDirty = false;
 		}
 		
-		public override void LoadNew (Stream content, string mimeType)
+		public void InformLoadComplete ()
 		{
+		/*
 			Document.MimeType = mimeType;
 			string text = null;
 			if (content != null) {
@@ -757,52 +725,18 @@ namespace MonoDevelop.SourceEditor
 			}
 			this.CreateDocumentParsedHandler ();
 			RunFirstTimeFoldUpdate (text);
+			*/
 			Document.InformLoadComplete ();
 		}
 		
-		public override void Load (string fileName)
+		public override void LoadNew (Stream content, string mimeType)
 		{
-			Load (fileName, null);
+			throw new NotSupportedException ("Moved to TextEditorViewContent.LoadNew.");
 		}
-
-		void RunFirstTimeFoldUpdate (string text)
+		
+		public override void Load (FileOpenInformation fileOpenInformation)
 		{
-			if (string.IsNullOrEmpty (text)) 
-				return;
-			ParsedDocument parsedDocument = null;
-
-			var foldingParser = TypeSystemService.GetFoldingParser (Document.MimeType);
-			if (foldingParser != null) {
-				parsedDocument = foldingParser.Parse (Document.FileName, text);
-			} else {
-				var normalParser = TypeSystemService.GetParser (Document.MimeType);
-				if (normalParser != null) {
-					using (var sr = new StringReader (text))
-						parsedDocument = normalParser.Parse (true, Document.FileName, sr, null);
-				}
-			}
-			if (parsedDocument != null) 
-				widget.UpdateParsedDocument (parsedDocument);
-		}
-
-		void CreateDocumentParsedHandler ()
-		{
-			this.WorkbenchWindowChanged += delegate {
-				if (WorkbenchWindow == null)
-					return;
-				WorkbenchWindow.DocumentChanged +=  delegate {
-					if (WorkbenchWindow.Document == null)
-						return;
-					foreach (var provider in WorkbenchWindow.Document.GetContents<IQuickTaskProvider> ()) {
-						widget.AddQuickTaskProvider (provider);
-					}
-					foreach (var provider in WorkbenchWindow.Document.GetContents<IUsageProvider> ()) {
-						widget.AddUsageTaskProvider (provider);
-					}
-					ownerDocument = WorkbenchWindow.Document;
-					ownerDocument.DocumentParsed += HandleDocumentParsed;
-				};
-			};
+			Load (fileOpenInformation.FileName, fileOpenInformation.Encoding);
 		}
 
 		MonoDevelop.Ide.Gui.Document ownerDocument;
@@ -813,11 +747,6 @@ namespace MonoDevelop.SourceEditor
 		protected virtual void HandleDocumentParsed (object sender, EventArgs e)
 		{
 			widget.UpdateParsedDocument (ownerDocument.ParsedDocument);
-		}		
-
-		void IEncodedTextContent.Load (string fileName, Encoding loadEncoding)
-		{
-			Load (fileName, loadEncoding);
 		}
 
 		protected virtual string ProcessLoadText (string text)
@@ -827,9 +756,8 @@ namespace MonoDevelop.SourceEditor
 
 		public void Load (string fileName, Encoding loadEncoding, bool reload = false)
 		{
-			// Handle the "reload" case.
-			if (ContentName == fileName)
-				AutoSave.RemoveAutoSaveFile (fileName);
+			widget.TextEditor.Document.TextReplaced -= OnTextReplaced;
+			
 			if (warnOverwrite) {
 				warnOverwrite = false;
 				widget.RemoveMessageBar ();
@@ -841,7 +769,7 @@ namespace MonoDevelop.SourceEditor
 			bool didLoadCleanly;
 			if (AutoSave.AutoSaveExists (fileName)) {
 				widget.ShowAutoSaveWarning (fileName);
-				this.encoding = loadEncoding;
+				encoding = loadEncoding;
 				didLoadCleanly = false;
 			}
 			else {
@@ -864,22 +792,22 @@ namespace MonoDevelop.SourceEditor
 				didLoadCleanly = true;
 			}
 			// TODO: Would be much easier if the view would be created after the containers.
-			CreateDocumentParsedHandler ();
 			ContentName = fileName;
 			lastSaveTimeUtc = File.GetLastWriteTimeUtc (ContentName);
-			RunFirstTimeFoldUpdate (text);
 			widget.TextEditor.Caret.Offset = 0;
 			UpdateExecutionLocation ();
 			UpdateBreakpoints ();
 			UpdatePinnedWatches ();
 			LoadExtensions ();
-			this.IsDirty = !didLoadCleanly;
+			IsDirty = !didLoadCleanly;
 			UpdateTasks (null, null);
 			widget.TextEditor.TextArea.SizeAllocated += HandleTextEditorVAdjustmentChanged;
 			if (didLoadCleanly) {
-				Document.InformLoadComplete ();
+				InformLoadComplete ();
 				widget.EnsureCorrectEolMarker (fileName);
 			}
+			
+			widget.TextEditor.Document.TextReplaced += OnTextReplaced;
 		}
 		
 		void HandleTextEditorVAdjustmentChanged (object sender, EventArgs e)
@@ -890,8 +818,8 @@ namespace MonoDevelop.SourceEditor
 
 		internal void LoadSettings ()
 		{
-			FileSettingsStore.Settings settings;
-			if (widget == null || string.IsNullOrEmpty (ContentName) || !FileSettingsStore.TryGetValue (ContentName, out settings))
+			MonoDevelop.Ide.Editor.FileSettingsStore.Settings settings;
+			if (widget == null || string.IsNullOrEmpty (ContentName) || !MonoDevelop.Ide.Editor.FileSettingsStore.TryGetValue (ContentName, out settings))
 				return;
 			
 			widget.TextEditor.Caret.Offset = settings.CaretOffset;
@@ -913,7 +841,7 @@ namespace MonoDevelop.SourceEditor
 //			}
 			if (string.IsNullOrEmpty (ContentName))
 				return;
-			FileSettingsStore.Store (ContentName, new FileSettingsStore.Settings () {
+			MonoDevelop.Ide.Editor.FileSettingsStore.Store (ContentName, new MonoDevelop.Ide.Editor.FileSettingsStore.Settings {
 				CaretOffset = widget.TextEditor.Caret.Offset,
 				vAdjustment = widget.TextEditor.VAdjustment.Value,
 				hAdjustment = widget.TextEditor.HAdjustment.Value//,
@@ -926,7 +854,7 @@ namespace MonoDevelop.SourceEditor
 		Encoding encoding;
 		bool hadBom = false;
 
-		internal void ReplaceContent (string fileName, string content, Encoding encoding)
+		internal void ReplaceContent (string fileName, string content, Encoding enc)
 		{
 			if (warnOverwrite) {
 				warnOverwrite = false;
@@ -939,18 +867,16 @@ namespace MonoDevelop.SourceEditor
 			Document.Replace (0, Document.TextLength, content);
 			Document.DiffTracker.Reset ();
 			inLoad = false;
-			this.encoding = encoding;
+			encoding = enc;
 			ContentName = fileName;
-			RunFirstTimeFoldUpdate (content);
-			CreateDocumentParsedHandler ();
 			UpdateExecutionLocation ();
 			UpdateBreakpoints ();
 			UpdatePinnedWatches ();
 			LoadExtensions ();
 			IsDirty = false;
-			Document.InformLoadComplete ();
+			InformLoadComplete ();
 		}
-		
+	
 		void UpdateMimeType (string fileName)
 		{
 			// Look for a mime type for which there is a syntax mode
@@ -966,7 +892,6 @@ namespace MonoDevelop.SourceEditor
 						}
 					}
 				}
-				((StyledSourceEditorOptions)SourceEditorWidget.TextEditor.Options).UpdateStyleParent (Project, loadedMimeType);
 			}
 		}
 		
@@ -976,13 +901,15 @@ namespace MonoDevelop.SourceEditor
 
 		public override void Dispose ()
 		{
+			if (isDisposed)
+				return;
+			isDisposed = true;
+			
 			ClearExtensions ();
 			FileRegistry.Remove (this);
-			RemoveAutoSaveTimer ();
-			
+
 			StoreSettings ();
 			
-			this.isDisposed = true;
 			Counters.LoadedEditors--;
 			
 		/*	if (messageBubbleHighlightPopupWindow != null)
@@ -996,13 +923,10 @@ namespace MonoDevelop.SourceEditor
 			
 			ClipbardRingUpdated -= UpdateClipboardRing;
 
-			widget.TextEditor.Document.SyntaxModeChanged -= HandleSyntaxModeChanged;
 			widget.TextEditor.Document.TextReplaced -= HandleTextReplaced;
 			widget.TextEditor.Document.LineChanged -= HandleLineChanged;
 			widget.TextEditor.Document.BeginUndo -= HandleBeginUndo; 
 			widget.TextEditor.Document.EndUndo -= HandleEndUndo;
-			widget.TextEditor.Document.Undone -= HandleUndone;
-			widget.TextEditor.Document.Redone -= HandleUndone;
 			widget.TextEditor.Caret.PositionChanged -= HandlePositionChanged; 
 			widget.TextEditor.IconMargin.ButtonPressed -= OnIconButtonPress;
 			widget.TextEditor.Document.TextReplacing -= OnTextReplacing;
@@ -1043,13 +967,6 @@ namespace MonoDevelop.SourceEditor
 
 			RemoveMarkerQueue ();
 		}
-		
-		public Ambience GetAmbience ()
-		{
-			string file = this.IsUntitled ? this.UntitledName : this.ContentName;
-			return AmbienceService.GetAmbienceForFile (file);
-		}
-		
 
 		bool CheckReadOnly (int line)
 		{
@@ -1069,9 +986,9 @@ namespace MonoDevelop.SourceEditor
 		
 		void OnTextReplaced (object s, DocumentChangeEventArgs a)
 		{
-			this.IsDirty = Document.IsDirty;
+			IsDirty = Document.IsDirty;
 			
-			DocumentLocation location = Document.OffsetToLocation (a.Offset);
+			var location = Document.OffsetToLocation (a.Offset);
 			
 			int i = 0, lines = 0;
 			while (i != -1 && i < oldReplaceText.Length) {
@@ -1198,10 +1115,10 @@ namespace MonoDevelop.SourceEditor
 			if (w.OffsetX < 0) {
 				w.OffsetY = (int)widget.TextEditor.LineToY (w.Line);
 				int lw, lh;
-				var wrapper = widget.TextEditor.TextViewMargin.GetLayout (line);
-				wrapper.Layout.GetPixelSize (out lw, out lh);
-				if (wrapper.IsUncached)
-					wrapper.Dispose ();
+				var tmpWrapper = widget.TextEditor.TextViewMargin.GetLayout (line);
+				tmpWrapper.Layout.GetPixelSize (out lw, out lh);
+				if (tmpWrapper.IsUncached)
+					tmpWrapper.Dispose ();
 				w.OffsetX = (int)widget.TextEditor.TextViewMargin.XOffset + lw + 4;
 			}
 			wi.Widget = new PinnedWatchWidget (widget.TextEditor, w);
@@ -1405,7 +1322,7 @@ namespace MonoDevelop.SourceEditor
 		
 		void OnIconButtonPress (object s, MarginMouseEventArgs args)
 		{
-			if (args.LineNumber < DocumentLocation.MinLine)
+			if (args.LineNumber < Mono.TextEditor.DocumentLocation.MinLine)
 				return;
 
 			if (args.TriggersContextMenu ()) {
@@ -1420,51 +1337,23 @@ namespace MonoDevelop.SourceEditor
 					WorkbenchWindow.ExtensionContext ?? AddinManager.AddinEngine,
 					"/MonoDevelop/SourceEditor2/IconContextMenu/Editor");
 			} else if (args.Button == 1) {
-				if (!string.IsNullOrEmpty (this.Document.FileName)) {
+				if (!string.IsNullOrEmpty (Document.FileName)) {
 					if (args.LineSegment != null) {
 						int column = TextEditor.Caret.Line == args.LineNumber ? TextEditor.Caret.Column : 1;
 
 						lock (breakpoints)
-							breakpoints.Toggle (this.Document.FileName, args.LineNumber, column);
+							breakpoints.Toggle (Document.FileName, args.LineNumber, column);
 					}
 				}
 			}
 		}
-		
-		#region IExtensibleTextEditor
-		public ITextEditorExtension Extension {
-			get;
-			set;
-		}
-		
-		ITextEditorExtension IExtensibleTextEditor.AttachExtension (ITextEditorExtension extension)
-		{
-			Extension = extension;
-			this.widget.TextEditor.Extension = extension;
-			return this.widget;
-		}
-		
-//		protected override void OnMoveCursor (MovementStep step, int count, bool extend_selection)
-//		{
-//			base.OnMoveCursor (step, count, extend_selection);
-//			if (extension != null)
-//				extension.CursorPositionChanged ();
-//		}
-		
-//		protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
-//		{
-//			if (extension != null)
-//				return extension.KeyPress (evnt.Key, evnt.State);
-//			return this.KeyPress (evnt.Key, evnt.State); 
-//		}		
-		#endregion
-		
+
 		#region IEditableTextBuffer
 		public bool EnableUndo {
 			get {
 				if (widget == null)
 					return false;
-				return /*this.TextEditor.PreeditOffset < 0 &&*/ this.Document.CanUndo && widget.EditorHasFocus;
+				return /*this.TextEditor.PreeditOffset < 0 &&*/ Document.CanUndo && widget.EditorHasFocus;
 			}
 		}
 		
@@ -1482,14 +1371,14 @@ namespace MonoDevelop.SourceEditor
 			}*/
 			if (MiscActions.CancelPreEditMode (TextEditor.GetTextEditorData ()))
 				return;
-			MiscActions.Undo (this.TextEditor.GetTextEditorData ());
+			MiscActions.Undo (TextEditor.GetTextEditorData ());
 		}
 		
 		public bool EnableRedo {
 			get {
 				if (widget == null)
 					return false;
-				return /*this.TextEditor.PreeditOffset < 0 && */ this.Document.CanRedo && widget.EditorHasFocus;
+				return /*this.TextEditor.PreeditOffset < 0 && */ Document.CanRedo && widget.EditorHasFocus;
 			}
 		}
 
@@ -1526,7 +1415,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			if (MiscActions.CancelPreEditMode (TextEditor.GetTextEditorData ()))
 				return;
-			MiscActions.Redo (this.TextEditor.GetTextEditorData ());
+			MiscActions.Redo (TextEditor.GetTextEditorData ());
 		}
 		
 		public IDisposable OpenUndoGroup ()
@@ -1553,8 +1442,7 @@ namespace MonoDevelop.SourceEditor
 		}
 
 		public event EventHandler CaretPositionSet;
-		public event EventHandler<TextChangedEventArgs> TextChanged;
-		
+
 		public bool HasInputFocus {
 			get { return TextEditor.HasFocus; }
 		}
@@ -1565,7 +1453,6 @@ namespace MonoDevelop.SourceEditor
 		}
 		#endregion
 		
-		#region ITextBuffer
 		public int CursorPosition { 
 			get {
 				return TextEditor.Caret.Offset;
@@ -1574,56 +1461,28 @@ namespace MonoDevelop.SourceEditor
 				TextEditor.Caret.Offset = value;
 			}
 		}
-
-		public int SelectionStartPosition { 
-			get {
-				if (!TextEditor.IsSomethingSelected)
-					return TextEditor.Caret.Offset;
-				return TextEditor.SelectionRange.Offset;
-			}
-		}
-
-		public int SelectionEndPosition { 
-			get {
-				if (!TextEditor.IsSomethingSelected)
-					return TextEditor.Caret.Offset;
-				return TextEditor.SelectionRange.EndOffset;
-			}
-		}
-		
-		public void Select (int startPosition, int endPosition)
-		{
-			TextEditor.SelectionRange = new TextSegment (startPosition, endPosition - startPosition);
-			TextEditor.ScrollToCaret ();
-		}
-		
-		public void ShowPosition (int position)
-		{
-			// TODO
-		}
-		#endregion
 		
 		#region ITextFile
 		public FilePath Name {
 			get { 
-				return this.ContentName ?? this.UntitledName; 
+				return ContentName ?? UntitledName; 
 			} 
 		}
 
 		public string Text {
 			get {
-				return this.widget.TextEditor.Document.Text;
+				return widget.TextEditor.Document.Text;
 			}
 			set {
 				this.IsDirty = true;
-				TextDocument document = this.widget.TextEditor.Document;
+				var document = this.widget.TextEditor.Document;
 				document.Replace (0, document.TextLength, value);
 			}
 		}
 		
 		public int Length { 
 			get {
-				return this.widget.TextEditor.Document.TextLength;
+				return widget.TextEditor.Document.TextLength;
 			}
 		}
 
@@ -1647,17 +1506,17 @@ namespace MonoDevelop.SourceEditor
 		
 		public char GetCharAt (int position)
 		{
-			return this.widget.TextEditor.Document.GetCharAt (position);
+			return widget.TextEditor.Document.GetCharAt (position);
 		}
 		
 		public int GetPositionFromLineColumn (int line, int column)
 		{
-			return this.widget.TextEditor.Document.LocationToOffset (new DocumentLocation (line, column));
+			return widget.TextEditor.Document.LocationToOffset (new Mono.TextEditor.DocumentLocation (line, column));
 		}
 
 		public void GetLineColumnFromPosition (int position, out int line, out int column)
 		{
-			DocumentLocation location = this.widget.TextEditor.Document.OffsetToLocation (position);
+			var location = widget.TextEditor.Document.OffsetToLocation (position);
 			line = location.Line;
 			column = location.Column;
 		}
@@ -1666,25 +1525,25 @@ namespace MonoDevelop.SourceEditor
 		#region IEditableTextFile
 		public int InsertText (int position, string text)
 		{
-			return this.widget.TextEditor.Insert (position, text);
+			return widget.TextEditor.Insert (position, text);
 		}
 
 		public void DeleteText (int position, int length)
 		{
-			this.widget.TextEditor.Remove (position, length);
+			widget.TextEditor.Remove (position, length);
 		}
 		#endregion 
 		
 		#region IBookmarkBuffer
 		DocumentLine GetLine (int position)
 		{
-			DocumentLocation location = Document.OffsetToLocation (position);
+			var location = Document.OffsetToLocation (position);
 			return Document.GetLine (location.Line);
 		}
 				
 		public void SetBookmarked (int position, bool mark)
 		{
-			DocumentLine line = GetLine (position);
+			var line = GetLine (position);
 			if (line != null && line.IsBookmarked != mark) {
 				int lineNumber = widget.TextEditor.Document.OffsetToLineNumber (line.Offset);
 				line.IsBookmarked = mark;
@@ -1695,8 +1554,8 @@ namespace MonoDevelop.SourceEditor
 		
 		public bool IsBookmarked (int position)
 		{
-			DocumentLine line = GetLine (position);
-			return line != null ? line.IsBookmarked : false;
+			var line = GetLine (position);
+			return line != null && line.IsBookmarked;
 		}
 		
 		public void PrevBookmark ()
@@ -1794,7 +1653,7 @@ namespace MonoDevelop.SourceEditor
 			get {
 				if (TextEditor.IsSomethingSelected) {
 					if (TextEditor.MainSelection.SelectionMode == Mono.TextEditor.SelectionMode.Block)
-						return System.Math.Abs (TextEditor.MainSelection.Anchor.Column - TextEditor.MainSelection.Lead.Column);
+						return Math.Abs (TextEditor.MainSelection.Anchor.Column - TextEditor.MainSelection.Lead.Column);
 					return TextEditor.SelectionRange.Length;
 				}
 				return 0;
@@ -1813,9 +1672,13 @@ namespace MonoDevelop.SourceEditor
 			get {
 				return TextEditor.Caret.Offset;
 			}
+			set {
+				TextEditor.Caret.Offset = value;
+				TextEditor.ScrollToCaret ();
+			}
 		}
 		
-		public Gtk.Style GtkStyle { 
+		public Style GtkStyle { 
 			get {
 				return widget.Vbox.Style.Copy ();
 			}
@@ -1838,7 +1701,7 @@ namespace MonoDevelop.SourceEditor
 			var loc = editor.Caret.Location;
 			result.TriggerLine = loc.Line;
 			result.TriggerLineOffset = loc.Column - 1;
-			var p = this.widget.TextEditor.LocationToPoint (loc);
+			var p = widget.TextEditor.LocationToPoint (loc);
 			int tx, ty;
 			editor.ParentWindow.GetOrigin (out tx, out ty);
 			tx += editor.Allocation.X + p.X;
@@ -1850,7 +1713,7 @@ namespace MonoDevelop.SourceEditor
 			return result;
 		}
 		
-		public Gdk.Point DocumentToScreenLocation (DocumentLocation location)
+		public Gdk.Point DocumentToScreenLocation (Mono.TextEditor.DocumentLocation location)
 		{
 			var p = widget.TextEditor.LocationToPoint (location);
 			int tx, ty;
@@ -1874,21 +1737,25 @@ namespace MonoDevelop.SourceEditor
 			return Document.GetTextBetween (min, max);
 		}
 		
-		public void SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word)
+		public void SetCompletionText (CodeCompletionContext ctx, string partialWord, string completeWord)
 		{
-			SetCompletionText (ctx, partial_word, complete_word, complete_word.Length);
+			if (ctx == null)
+				throw new ArgumentNullException ("ctx");
+			if (completeWord == null)
+				throw new ArgumentNullException ("completeWord");
+			SetCompletionText (ctx, partialWord, completeWord, completeWord.Length);
 		}
 
-		public static void SetCompletionText (TextEditorData data, CodeCompletionContext ctx, string partial_word, string complete_word, int wordOffset)
+		public static void SetCompletionText (TextEditorData data, CodeCompletionContext ctx, string partialWord, string completeWord, int wordOffset)
 		{
 			if (data == null || data.Document == null)
 				return;
 
 			int triggerOffset = ctx.TriggerOffset;
-			int length = String.IsNullOrEmpty (partial_word) ? 0 : partial_word.Length;
+			int length = String.IsNullOrEmpty (partialWord) ? 0 : partialWord.Length;
 
 			// for named arguments invoke(arg:<Expr>);
-			if (complete_word.EndsWith (":", StringComparison.Ordinal)) {
+			if (completeWord.EndsWith (":", StringComparison.Ordinal)) {
 				if (data.GetCharAt (triggerOffset + length) == ':')
 					length++;
 			}
@@ -1908,9 +1775,9 @@ namespace MonoDevelop.SourceEditor
 			}
 
 			// | in the completion text now marks the caret position
-			int idx = complete_word.IndexOf ('|');
+			int idx = completeWord.IndexOf ('|');
 			if (idx >= 0) {
-				complete_word = complete_word.Remove (idx, 1);
+				completeWord = completeWord.Remove (idx, 1);
 			}
 			
 			triggerOffset += data.EnsureCaretIsNotVirtual ();
@@ -1925,11 +1792,11 @@ namespace MonoDevelop.SourceEditor
 						if (lineSegment == null)
 							continue;
 						int offset = lineSegment.Offset + column;
-						data.Replace (offset, length, complete_word);
+						data.Replace (offset, length, completeWord);
 					}
-					int minColumn = System.Math.Min (data.MainSelection.Anchor.Column, data.MainSelection.Lead.Column);
+					int minColumn = Math.Min (data.MainSelection.Anchor.Column, data.MainSelection.Lead.Column);
 					data.MainSelection = data.MainSelection.WithRange (
-						new DocumentLocation (data.Caret.Line == minLine ? maxLine : minLine, minColumn),
+						new Mono.TextEditor.DocumentLocation (data.Caret.Line == minLine ? maxLine : minLine, minColumn),
 						data.Caret.Location
 					);
 
@@ -1937,7 +1804,7 @@ namespace MonoDevelop.SourceEditor
 					data.Caret.PreserveSelection = false;
 				}
 			} else {
-				data.Replace (triggerOffset, length, complete_word);
+				data.Replace (triggerOffset, length, completeWord);
 			}
 			
 			data.Document.CommitLineUpdate (data.Caret.Line);
@@ -1946,16 +1813,16 @@ namespace MonoDevelop.SourceEditor
 
 		}
 
-		public void SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word, int wordOffset)
+		public void SetCompletionText (CodeCompletionContext ctx, string partialWord, string completeWord, int wordOffset)
 		{
 			var data = GetTextEditorData ();
 			if (data == null)
 				return;
 			using (var undo = data.OpenUndoGroup ()) {
-				SetCompletionText (data, ctx, partial_word, complete_word, wordOffset);
+				SetCompletionText (data, ctx, partialWord, completeWord, wordOffset);
 				var formatter = CodeFormatterService.GetFormatter (data.MimeType);
-				if (formatter != null && complete_word.IndexOfAny (new [] {' ', '\t', '{', '}'}) > 0 && formatter.SupportsOnTheFlyFormatting) {
-					formatter.OnTheFlyFormat (WorkbenchWindow.Document, ctx.TriggerOffset, ctx.TriggerOffset + complete_word.Length);
+				if (formatter != null && completeWord.IndexOfAny (new [] {' ', '\t', '{', '}'}) > 0 && formatter.SupportsOnTheFlyFormatting) {
+					formatter.OnTheFlyFormat (WorkbenchWindow.Document, ctx.TriggerOffset, ctx.TriggerOffset + completeWord.Length);
 				}
 			}
 		}
@@ -1979,10 +1846,12 @@ namespace MonoDevelop.SourceEditor
 			if (TextEditor.IsSomethingSelected) {
 				expression = TextEditor.SelectedText;
 			} else {
-				DomRegion region;
+				MonoDevelop.Ide.Editor.DocumentRegion region;
 				var rr = TextEditor.GetLanguageItem (TextEditor.Caret.Offset, out region);
-				if (rr != null && !rr.IsError)
-					expression = TextEditor.GetTextBetween (region.Begin, region.End);
+				if (rr != null)
+					expression = TextEditor.GetTextBetween (
+						region.BeginLine, region.BeginColumn, 
+						region.EndLine, region.EndColumn);
 			}
 
 			DebuggingService.ShowExpressionEvaluator (expression);
@@ -2051,18 +1920,18 @@ namespace MonoDevelop.SourceEditor
 		{
 			bool toggle = true;
 
-			foreach (FoldSegment segment in Document.FoldSegments) {
-				if (segment.FoldingType == FoldingType.TypeMember || segment.FoldingType == FoldingType.Comment)
+			foreach (var segment in Document.FoldSegments) {
+				if (segment.FoldingType == Mono.TextEditor.FoldingType.TypeMember || segment.FoldingType == Mono.TextEditor.FoldingType.Comment)
 					if (segment.IsFolded)
 						toggle = false;
 			}
 
 
-			foreach (FoldSegment segment in Document.FoldSegments) {
-				if (segment.FoldingType == FoldingType.TypeDefinition) {
+			foreach (var segment in Document.FoldSegments) {
+				if (segment.FoldingType == Mono.TextEditor.FoldingType.TypeDefinition) {
 					segment.IsFolded = false;
 				}
-				if (segment.FoldingType == FoldingType.TypeMember || segment.FoldingType == FoldingType.Comment)
+				if (segment.FoldingType == Mono.TextEditor.FoldingType.TypeMember || segment.FoldingType == Mono.TextEditor.FoldingType.Comment)
 					segment.IsFolded = toggle;
 			}
 
@@ -2148,7 +2017,7 @@ namespace MonoDevelop.SourceEditor
 					item.Description += line;
 				}
 				item.Category = GettextCatalog.GetString ("Clipboard ring");
-				item.Icon = DesktopService.GetIconForFile ("a.txt", Gtk.IconSize.Menu);
+				item.Icon = DesktopService.GetIconForFile ("a.txt", IconSize.Menu);
 				item.Name = text.Length > 16 ? text.Substring (0, 16) + "..." : text;
 				item.Name = item.Name.Replace ("\t", "\\t");
 				item.Name = item.Name.Replace ("\n", "\\n");
@@ -2159,6 +2028,7 @@ namespace MonoDevelop.SourceEditor
 				if (ClipbardRingUpdated != null)
 					ClipbardRingUpdated (null, EventArgs.Empty);
 			};
+			SyntaxModeLoader.Init ();
 		}
 		
 		public void UpdateClipboardRing (object sender, EventArgs e)
@@ -2195,16 +2065,16 @@ namespace MonoDevelop.SourceEditor
 		{
 			var tn = item as ITextToolboxNode;
 			if (tn != null) {
-				tn.InsertAtCaret (base.WorkbenchWindow.Document);
+				tn.InsertAtCaret (WorkbenchWindow.Document);
 				TextEditor.GrabFocus ();
 			}
 		}
 		
 		#region dnd
-		Gtk.Widget customSource;
+		Widget customSource;
 		ItemToolboxNode dragItem;
 
-		void IToolboxConsumer.DragItem (ItemToolboxNode item, Gtk.Widget source, Gdk.DragContext ctx)
+		void IToolboxConsumer.DragItem (ItemToolboxNode item, Widget source, Gdk.DragContext ctx)
 		{
 			//FIXME: use the preview text
 			string text = GetDragPreviewText (item);
@@ -2242,7 +2112,7 @@ namespace MonoDevelop.SourceEditor
 				LoggingService.LogWarning ("Cannot use non-ITextToolboxNode toolbox items in the text editor.");
 				return null;
 			}
-			return tn.GetDragPreview (base.WorkbenchWindow.Document);
+			return tn.GetDragPreview (WorkbenchWindow.Document);
 		}
 		
 		System.ComponentModel.ToolboxItemFilterAttribute[] IToolboxConsumer.ToolboxFilterAttributes {
@@ -2261,10 +2131,10 @@ namespace MonoDevelop.SourceEditor
 			//int i = filename.LastIndexOf ('.');
 			//string ext = i < 0? null : filename.Substring (i + 1);
 			
-			return textNode.IsCompatibleWith (base.WorkbenchWindow.Document);
+			return textNode.IsCompatibleWith (WorkbenchWindow.Document);
 		}
 		
-		public Gtk.TargetEntry[] DragTargets { 
+		public TargetEntry[] DragTargets { 
 			get {
 				return ClipboardActions.CopyOperation.TargetEntries;
 			}
@@ -2285,48 +2155,48 @@ namespace MonoDevelop.SourceEditor
 		#region IZoomable
 		bool IZoomable.EnableZoomIn {
 			get {
-				return this.TextEditor.Options.CanZoomIn;
+				return TextEditor.Options.CanZoomIn;
 			}
 		}
 		
 		bool IZoomable.EnableZoomOut {
 			get {
-				return this.TextEditor.Options.CanZoomOut;
+				return TextEditor.Options.CanZoomOut;
 			}
 		}
 		
 		bool IZoomable.EnableZoomReset {
 			get {
-				return this.TextEditor.Options.CanResetZoom;
+				return TextEditor.Options.CanResetZoom;
 			}
 		}
 		
 		void IZoomable.ZoomIn ()
 		{
-			this.TextEditor.Options.ZoomIn ();
+			TextEditor.Options.ZoomIn ();
 		}
 		
 		void IZoomable.ZoomOut ()
 		{
-			this.TextEditor.Options.ZoomOut ();
+			TextEditor.Options.ZoomOut ();
 		}
 		
 		void IZoomable.ZoomReset ()
 		{
-			this.TextEditor.Options.ZoomReset ();
+			TextEditor.Options.ZoomReset ();
 		}
 
 		#region ITextEditorResolver implementation 
 		
-		public ResolveResult GetLanguageItem (int offset)
+		public Microsoft.CodeAnalysis.ISymbol GetLanguageItem (int offset)
 		{
-			DomRegion region;
-			return this.SourceEditorWidget.TextEditor.GetLanguageItem (offset, out region);
+			MonoDevelop.Ide.Editor.DocumentRegion region;
+			return SourceEditorWidget.TextEditor.GetLanguageItem (offset, out region);
 		}
 		
-		public ResolveResult GetLanguageItem (int offset, string expression)
+		public Microsoft.CodeAnalysis.ISymbol GetLanguageItem (int offset, string expression)
 		{
-			return this.SourceEditorWidget.TextEditor.GetLanguageItem (offset, expression);
+			return SourceEditorWidget.TextEditor.GetLanguageItem (offset, expression);
 		}
 		#endregion 
 		
@@ -2346,27 +2216,24 @@ namespace MonoDevelop.SourceEditor
 		#endregion
 		
 		#endregion
-		public Mono.TextEditor.TextEditorData GetTextEditorData ()
+		public TextEditorData GetTextEditorData ()
 		{
 			var editor = TextEditor;
 			if (editor == null)
 				return null;
 			return editor.GetTextEditorData ();
 		}
-		
-		public void InsertTemplate (CodeTemplate template, MonoDevelop.Ide.Gui.Document doc)
-		{
-			TextEditor.InsertTemplate (template, doc);
-		}
-		
-		[CommandHandler (TextEditorCommands.GotoMatchingBrace)]
-		protected void OnGotoMatchingBrace ()
+
+		public void InsertTemplate (CodeTemplate template, MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context)
 		{
-			TextEditor.RunAction (MiscActions.GotoMatchingBracket);
+			TextEditor.InsertTemplate (template, editor, context);
 		}
-		
+
 		void CorrectIndenting ()
 		{
+			var doc = ownerDocument.Editor;
+			if (doc == null)
+				return;
 			var formatter = CodeFormatterService.GetFormatter (Document.MimeType);
 			if (formatter == null || !formatter.SupportsCorrectingIndent)
 				return;
@@ -2380,52 +2247,22 @@ namespace MonoDevelop.SourceEditor
 					var version = TextEditor.Document.Version;
 					int max = selection.MaxLine;
 					for (int i = TextEditor.MainSelection.MinLine; i <= max; i++) {
-						formatter.CorrectIndenting (policies, editorData, i);
+						formatter.CorrectIndenting (policies, doc, i);
 					}
 					editorData.SetSelection (version.MoveOffsetTo (editorData.Document.Version, anchor), version.MoveOffsetTo (editorData.Document.Version, lead));
 				}
 			} else {
-				formatter.CorrectIndenting (policies, editorData, TextEditor.Caret.Line);
+				formatter.CorrectIndenting (policies, doc, TextEditor.Caret.Line);
 			}
 		}
 
-		[CommandUpdateHandler (TextEditorCommands.MoveBlockUp)]
-		[CommandUpdateHandler (TextEditorCommands.MoveBlockDown)]
-		void MoveBlockUpdateHandler (CommandInfo cinfo)
+		public override object GetContent (Type type)
 		{
-			cinfo.Enabled = widget.EditorHasFocus;
+			if (type.Equals (typeof(TextEditorData)))
+				return TextEditor.GetTextEditorData ();
+			return base.GetContent (type);
 		}
 
-		[CommandHandler (TextEditorCommands.MoveBlockUp)]
-		protected void OnMoveBlockUp ()
-		{
-			using (var undo = TextEditor.OpenUndoGroup ()) {
-				TextEditor.RunAction (MiscActions.MoveBlockUp);
-				CorrectIndenting ();
-			}
-		}
-		
-		[CommandHandler (TextEditorCommands.MoveBlockDown)]
-		protected void OnMoveBlockDown ()
-		{
-			using (var undo = TextEditor.OpenUndoGroup ()) {
-				TextEditor.RunAction (MiscActions.MoveBlockDown);
-				CorrectIndenting ();
-			}
-		}
-		
-		[CommandUpdateHandler (TextEditorCommands.ToggleBlockSelectionMode)]
-		protected void UpdateToggleBlockSelectionMode (CommandInfo cinfo)
-		{
-			cinfo.Enabled = TextEditor.IsSomethingSelected;
-		}
-		
-		[CommandHandler (TextEditorCommands.ToggleBlockSelectionMode)]
-		protected void OnToggleBlockSelectionMode ()
-		{
-			TextEditor.SelectionMode = TextEditor.SelectionMode == Mono.TextEditor.SelectionMode.Normal ? Mono.TextEditor.SelectionMode.Block : Mono.TextEditor.SelectionMode.Normal;
-			TextEditor.QueueDraw ();
-		}
 		
 		#region widget command handlers
 		[CommandHandler (SearchCommands.EmacsFindNext)]
@@ -2524,57 +2361,805 @@ namespace MonoDevelop.SourceEditor
 		{
 			widget.MonodocResolverUpdate (cinfo);
 		}
-		
-		[CommandUpdateHandler (EditCommands.ToggleCodeComment)]
-		internal void OnUpdateToggleComment (MonoDevelop.Components.Commands.CommandInfo info)
+
+		[CommandHandler (SourceEditorCommands.NextIssue)]
+		void NextIssue ()
 		{
-			widget.OnUpdateToggleComment (info);
+			widget.NextIssue ();
+		}	
+
+		[CommandHandler (SourceEditorCommands.PrevIssue)]
+		void PrevIssue ()
+		{
+			widget.PrevIssue ();
+		}
+
+		[CommandHandler (SourceEditorCommands.NextIssueError)]
+		void NextIssueError ()
+		{
+			widget.NextIssueError ();
+		}	
+
+		[CommandHandler (SourceEditorCommands.PrevIssueError)]
+		void PrevIssueError ()
+		{
+			widget.PrevIssueError ();
+		}
+		#endregion
+
+		TextDocumentWrapper wrapper;
+		IReadonlyTextDocument ITextEditorImpl.Document {
+			get {
+				if (wrapper == null)
+					wrapper = new TextDocumentWrapper (widget.TextEditor.Document);
+				return wrapper;
+			}
+			set {
+				wrapper = (TextDocumentWrapper)value;
+				widget.TextEditor.Document = wrapper.Document;
+			}
+		}
+
+		event EventHandler ITextEditorImpl.SelectionChanged {
+			add {
+				TextEditor.SelectionChanged += value;
+			}
+			remove {
+				TextEditor.SelectionChanged -= value;
+			}
+		}
+
+		event EventHandler ITextEditorImpl.BeginMouseHover {
+			add {
+				TextEditor.BeginHover += value;
+			}
+			remove {
+				TextEditor.BeginHover -= value;
+			}
+		}
+
+		event EventHandler ITextEditorImpl.VAdjustmentChanged {
+			add {
+				TextEditor.VAdjustment.ValueChanged += value;
+			}
+			remove {
+				TextEditor.VAdjustment.ValueChanged -= value;
+			}
+		}
+
+		event EventHandler ITextEditorImpl.HAdjustmentChanged {
+			add {
+				TextEditor.HAdjustment.ValueChanged += value;
+			}
+			remove {
+				TextEditor.HAdjustment.ValueChanged -= value;
+			}
+		}
+
+		public event EventHandler CaretPositionChanged;
+		bool hasCaretPositionChanged;
+		protected virtual void OnCaretPositionChanged (EventArgs e)
+		{
+			if (widget.TextEditor.Document.IsInAtomicUndo) {
+				hasCaretPositionChanged = true;
+				return;
+			}
+			var handler = CaretPositionChanged;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		public event EventHandler BeginAtomicUndoOperation;
+
+		protected virtual void OnBeginUndo (EventArgs e)
+		{
+			hasCaretPositionChanged = false;
+			var handler = BeginAtomicUndoOperation;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		public event EventHandler EndAtomicUndoOperation;
+
+		protected virtual void OnEndUndo (EventArgs e)
+		{
+			var handler = EndAtomicUndoOperation;
+			if (handler != null)
+				handler (this, e);
+			if (hasCaretPositionChanged) {
+				OnCaretPositionChanged (e);
+				hasCaretPositionChanged = false;
+			}
+		}
+
+		void ITextEditorImpl.SetSelection (int anchorOffset, int leadOffset)
+		{
+			TextEditor.SetSelection (anchorOffset, leadOffset);
+		}
+
+		void ITextEditorImpl.ClearSelection ()
+		{
+			TextEditor.ClearSelection ();
+		}
+
+		void ITextEditorImpl.CenterToCaret ()
+		{
+			TextEditor.CenterToCaret ();
+		}
+
+		void ITextEditorImpl.StartCaretPulseAnimation ()
+		{
+			TextEditor.StartCaretPulseAnimation ();
+		}
+
+		int ITextEditorImpl.EnsureCaretIsNotVirtual ()
+		{
+			return TextEditor.GetTextEditorData ().EnsureCaretIsNotVirtual ();
+		}
+
+		void ITextEditorImpl.FixVirtualIndentation ()
+		{
+			TextEditor.GetTextEditorData ().FixVirtualIndentation ();
+		}
+
+		object ITextEditorImpl.CreateNativeControl ()
+		{
+			return Control;
 		}
 
-		[CommandHandler (EditCommands.ToggleCodeComment)]
-		public void ToggleCodeComment ()
+		string ITextEditorImpl.FormatString (int offset, string code)
 		{
-			widget.ToggleCodeComment ();
+			return TextEditor.GetTextEditorData ().FormatString (offset, code);
 		}
 
-		[CommandUpdateHandler (EditCommands.AddCodeComment)]
-		internal void OnUpdateAddCodeComment (MonoDevelop.Components.Commands.CommandInfo info)
+		void ITextEditorImpl.StartInsertionMode (InsertionModeOptions insertionModeOptions)
 		{
-			widget.OnUpdateToggleComment (info);
+			var mode = new InsertionCursorEditMode (TextEditor, insertionModeOptions.InsertionPoints.Select (ip => new Mono.TextEditor.InsertionPoint ( 
+				new Mono.TextEditor.DocumentLocation (ip.Location.Line, ip.Location.Column),
+				(Mono.TextEditor.NewLineInsertion)ip.LineBefore,
+				(Mono.TextEditor.NewLineInsertion)ip.LineAfter
+			)).ToList ());
+			if (mode.InsertionPoints.Count == 0) {
+				return;
+			}
+			var helpWindow = new Mono.TextEditor.PopupWindow.InsertionCursorLayoutModeHelpWindow ();
+			helpWindow.TitleText = insertionModeOptions.Operation;
+			mode.HelpWindow = helpWindow;
+			mode.CurIndex = insertionModeOptions.FirstSelectedInsertionPoint;
+			mode.StartMode ();
+			mode.Exited += delegate(object s, Mono.TextEditor.InsertionCursorEventArgs iCArgs) {
+				insertionModeOptions.ModeExitedAction (new MonoDevelop.Ide.Editor.InsertionCursorEventArgs (iCArgs.Success, 
+					new MonoDevelop.Ide.Editor.InsertionPoint (
+						new MonoDevelop.Ide.Editor.DocumentLocation (iCArgs.InsertionPoint.Location.Line, iCArgs.InsertionPoint.Location.Column),
+						(MonoDevelop.Ide.Editor.NewLineInsertion)iCArgs.InsertionPoint.LineBefore,
+						(MonoDevelop.Ide.Editor.NewLineInsertion)iCArgs.InsertionPoint.LineAfter
+					)
+				));
+			};
 		}
 
-		[CommandHandler (EditCommands.AddCodeComment)]
-		public void AddCodeComment ()
+		void ITextEditorImpl.StartTextLinkMode (TextLinkModeOptions textLinkModeOptions)
 		{
-			widget.AddCodeComment ();
+			var convertedLinks = new List<Mono.TextEditor.TextLink> ();
+			foreach (var link in textLinkModeOptions.Links) {
+				var convertedLink = new Mono.TextEditor.TextLink (link.Name);
+				convertedLink.IsEditable = link.IsEditable;
+				convertedLink.IsIdentifier = link.IsIdentifier;
+				var func = link.GetStringFunc;
+				if (func != null) {
+					convertedLink.GetStringFunc = delegate(Func<string, string> arg) {
+						return new ListDataProviderWrapper (func (arg));
+					};
+				}
+				foreach (var segment in link.Links) {
+					convertedLink.AddLink (new Mono.TextEditor.TextSegment (segment.Offset, segment.Length)); 
+				}
+				convertedLinks.Add (convertedLink); 
+			}
+
+			var tle = new TextLinkEditMode (TextEditor, 0, convertedLinks);
+			tle.SetCaretPosition = false;
+			if (tle.ShouldStartTextLinkMode) {
+				tle.OldMode = TextEditor.CurrentMode;
+				if (textLinkModeOptions.ModeExitedAction != null) {
+					tle.Cancel += (sender, e) => textLinkModeOptions.ModeExitedAction (new TextLinkModeEventArgs (false));
+					tle.Exited += (sender, e) => {
+						for (int i = 0; i < convertedLinks.Count; i++) {
+							textLinkModeOptions.Links[i].CurrentText = convertedLinks[i].CurrentText;
+						}
+						textLinkModeOptions.ModeExitedAction (new TextLinkModeEventArgs (true));
+						
+					};
+				}
+				tle.StartMode ();
+				TextEditor.CurrentMode = tle;
+			}
 		}
 
-		[CommandUpdateHandler (EditCommands.RemoveCodeComment)]
-		internal void OnUpdateRemoveCodeComment (MonoDevelop.Components.Commands.CommandInfo info)
+		MonoDevelop.Ide.Editor.DocumentLocation ITextEditorImpl.PointToLocation (double xp, double yp, bool endAtEol)
 		{
-			widget.OnUpdateToggleComment (info);
+			var pt = TextEditor.PointToLocation (xp, yp);
+			return new MonoDevelop.Ide.Editor.DocumentLocation (pt.Line, pt.Column);
 		}
 
-		[CommandHandler (EditCommands.RemoveCodeComment)]
-		public void RemoveCodeComment ()
+		Xwt.Point ITextEditorImpl.LocationToPoint (int line, int column)
 		{
-			widget.RemoveCodeComment ();
+			var p = TextEditor.LocationToPoint (line, column);
+			return new Xwt.Point (p.X, p.Y);
 		}
 
-		[CommandUpdateHandler (SourceEditorCommands.ToggleErrorTextMarker)]
-		public void OnUpdateToggleErrorTextMarker (CommandInfo info)
+		void ITextEditorImpl.AddMarker (IDocumentLine line, ITextLineMarker lineMarker)
 		{
-			widget.OnUpdateToggleErrorTextMarker (info);
+			var textLineMarker = lineMarker as TextLineMarker;
+			if (textLineMarker == null)
+				throw new InvalidOperationException ("Tried to add an incompatible text marker. Use the MarkerHost to create compatible ones.");
+
+			if (lineMarker is IUnitTestMarker) {
+				var actionMargin = TextEditor.ActionMargin;
+				if (actionMargin != null) {
+					actionMargin.IsVisible = true;
+				}
+			}
+
+			TextEditor.Document.AddMarker (((DocumentLineWrapper)line).Line, textLineMarker);
+		}
+
+		void ITextEditorImpl.RemoveMarker (ITextLineMarker lineMarker)
+		{
+			var textLineMarker = lineMarker as TextLineMarker;
+			if (textLineMarker == null)
+				throw new InvalidOperationException ("Tried to add an incompatible text marker.");
+			TextEditor.Document.RemoveMarker (textLineMarker);
+		}
+
+		IEnumerable<ITextLineMarker> ITextEditorImpl.GetLineMarkers (IDocumentLine line)
+		{
+			return ((DocumentLineWrapper)line).Line.Markers.OfType<ITextLineMarker> ();
+		}
+
+		IEnumerable<ITextSegmentMarker> ITextEditorImpl.GetTextSegmentMarkersAt (MonoDevelop.Core.Text.ISegment segment)
+		{
+			return TextEditor.Document.GetTextSegmentMarkersAt (new TextSegment (segment.Offset, segment.Length)).OfType<ITextSegmentMarker> ();
+		}
+
+		IEnumerable<ITextSegmentMarker> ITextEditorImpl.GetTextSegmentMarkersAt (int offset)
+		{
+			return TextEditor.Document.GetTextSegmentMarkersAt (offset).OfType<ITextSegmentMarker> ();
+		}
+
+		void ITextEditorImpl.AddMarker (ITextSegmentMarker marker)
+		{
+			var textSegmentMarker = marker as TextSegmentMarker;
+			if (textSegmentMarker == null)
+				throw new InvalidOperationException ("Tried to add an incompatible text marker. Use the MarkerHost to create compatible ones.");
+			TextEditor.Document.AddMarker (textSegmentMarker);
+		}
+
+		bool ITextEditorImpl.RemoveMarker (ITextSegmentMarker marker)
+		{
+			var textSegmentMarker = marker as TextSegmentMarker;
+			if (textSegmentMarker == null)
+				throw new InvalidOperationException ("Tried to remove an incompatible text marker.");
+			return TextEditor.Document.RemoveMarker (textSegmentMarker);
+		}
+
+		IFoldSegment ITextEditorImpl.CreateFoldSegment (int offset, int length, bool isFolded = false)
+		{
+			return new FoldSegmentWrapper (TextEditor.Document, "...", offset, length, Mono.TextEditor.FoldingType.None) { IsFolded = isFolded };
+		}
+
+		void ITextEditorImpl.SetFoldings (IEnumerable<IFoldSegment> foldings)
+		{
+			TextEditor.Document.UpdateFoldSegments (foldings.Cast<FoldSegment> ().ToList ());
+		}
+
+		IEnumerable<IFoldSegment> ITextEditorImpl.GetFoldingsContaining (int offset)
+		{
+			return TextEditor.Document.GetFoldingsFromOffset (offset).Cast<IFoldSegment> ();
+		}
+
+		IEnumerable<IFoldSegment> ITextEditorImpl.GetFoldingsIn (int offset, int length)
+		{
+			return TextEditor.Document.GetFoldingContaining (offset, length).Cast<IFoldSegment> ();
+		}
+
+		MonoDevelop.Ide.Editor.ITextEditorOptions ITextEditorImpl.Options {
+			get {
+				return((StyledSourceEditorOptions)TextEditor.Options).OptionsCore;
+			}
+			set {
+				((StyledSourceEditorOptions)TextEditor.Options).OptionsCore = value;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.DocumentLocation ITextEditorImpl.CaretLocation {
+			get {
+				var loc = TextEditor.Caret.Location;
+				return new MonoDevelop.Ide.Editor.DocumentLocation (loc.Line, loc.Column);
+			}
+			set {
+				TextEditor.Caret.Location = new Mono.TextEditor.DocumentLocation (value.Line, value.Column);
+				TextEditor.ScrollToCaret ();
+			}
+		}
+
+		bool ITextEditorImpl.IsSomethingSelected {
+			get {
+				return TextEditor.IsSomethingSelected;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.SelectionMode ITextEditorImpl.SelectionMode {
+			get {
+				return (MonoDevelop.Ide.Editor.SelectionMode)TextEditor.SelectionMode;
+			}
+		}
+
+		MonoDevelop.Core.Text.ISegment ITextEditorImpl.SelectionRange {
+			get {
+				var range = TextEditor.SelectionRange;
+				return MonoDevelop.Core.Text.TextSegment.FromBounds (range.Offset, range.EndOffset);
+			}
+			set {
+				TextEditor.SelectionRange = new TextSegment (value.Offset, value.Length);
+			}
 		}
 		
-		[CommandHandler (SourceEditorCommands.ToggleErrorTextMarker)]
-		public void OnToggleErrorTextMarker ()
+		int ITextEditorImpl.SelectionAnchorOffset {
+			get {
+				return TextEditor.SelectionAnchor;
+			}
+			set {
+				TextEditor.SelectionAnchor = value;
+			}
+		}
+
+		int ITextEditorImpl.SelectionLeadOffset {
+			get {
+				return TextEditor.SelectionLead;
+			}
+			set {
+				TextEditor.SelectionLead = value;
+			}
+		}
+
+
+
+		MonoDevelop.Ide.Editor.DocumentRegion ITextEditorImpl.SelectionRegion {
+			get {
+				return new MonoDevelop.Ide.Editor.DocumentRegion (
+					TextEditor.MainSelection.Start.Line,
+					TextEditor.MainSelection.Start.Column,
+					TextEditor.MainSelection.End.Line,
+					TextEditor.MainSelection.End.Column
+				);
+			}
+			set {
+				TextEditor.MainSelection = new Mono.TextEditor.Selection (
+					value.BeginLine,
+					value.BeginColumn,
+					value.EndLine,
+					value.EndColumn
+				);
+			}
+		}
+
+		IEditorActionHost ITextEditorImpl.Actions {
+			get {
+				return this;
+			}
+		}
+
+		double ITextEditorImpl.LineHeight {
+			get {
+				return TextEditor.GetTextEditorData ().LineHeight;
+			}
+		}
+
+		ITextMarkerFactory ITextEditorImpl.TextMarkerFactory {
+			get {
+				return this;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.EditMode ITextEditorImpl.EditMode {
+			get {
+				if (TextEditor.CurrentMode is TextLinkEditMode)
+					return MonoDevelop.Ide.Editor.EditMode.TextLink;
+				if (TextEditor.CurrentMode is InsertionCursorEditMode)
+					return MonoDevelop.Ide.Editor.EditMode.CursorInsertion;
+				return MonoDevelop.Ide.Editor.EditMode.Edit;
+			}
+		}
+
+		string ITextEditorImpl.GetVirtualIndentationString (int lineNumber)
+		{
+			if (!TextEditor.GetTextEditorData ().HasIndentationTracker)
+				return TextEditor.GetLineIndent (lineNumber);
+			return TextEditor.GetTextEditorData ().IndentationTracker.GetIndentationString (lineNumber, 1);
+		}
+
+		void ITextEditorImpl.SetIndentationTracker (IndentationTracker indentationTracker)
+		{
+			TextEditor.GetTextEditorData ().IndentationTracker = indentationTracker != null ? new IndentationTrackerWrapper (TextEditor.GetTextEditorData (), wrapper, indentationTracker) : null;
+		}
+
+		void ITextEditorImpl.SetSelectionSurroundingProvider (SelectionSurroundingProvider surroundingProvider)
+		{
+			TextEditor.GetTextEditorData ().SelectionSurroundingProvider = surroundingProvider != null ? new SelectionSurroundingProviderWrapper (surroundingProvider) : null;
+		}
+		
+		void ITextEditorImpl.SetTextPasteHandler (TextPasteHandler textPasteHandler)
+		{
+			if (textPasteHandler == null) {
+				TextEditor.GetTextEditorData ().TextPasteHandler = null;
+				return;
+			}
+			var data = TextEditor.GetTextEditorData ();
+			if (data.TextPasteHandler != null)
+				((TextPasteHandlerWrapper)data.TextPasteHandler).Dispose ();
+			data.TextPasteHandler = new TextPasteHandlerWrapper (data, textPasteHandler);
+		}
+
+		public IList<SkipChar> SkipChars {
+			get {
+				return TextEditor.GetTextEditorData ().SkipChars.Select (sk => new SkipChar (sk.Offset, sk.Char)).ToList ();
+			}
+		}
+
+		public void AddSkipChar (int offset, char ch)
+		{
+			TextEditor.GetTextEditorData ().SetSkipChar (offset, ch);
+		}
+
+		void ITextEditorImpl.ScrollTo (int offset)
+		{
+			TextEditor.ScrollTo (offset); 
+		}
+
+		void ITextEditorImpl.CenterTo (int offset)
+		{
+			TextEditor.CenterTo (offset); 
+		}
+
+		void ITextEditorImpl.ClearTooltipProviders ()
+		{
+			TextEditor.ClearTooltipProviders ();
+		}
+
+		IEnumerable<MonoDevelop.Ide.Editor.TooltipProvider> ITextEditorImpl.TooltipProvider {
+			get {
+				foreach (var p in GetTextEditorData ().TooltipProviders) {
+					var wrapper = p as TooltipProviderWrapper;
+					if (wrapper == null)
+						continue;
+					yield return wrapper.OriginalProvider;
+				}
+			}
+		}
+
+		void ITextEditorImpl.AddTooltipProvider (MonoDevelop.Ide.Editor.TooltipProvider provider)
+		{
+			TextEditor.AddTooltipProvider (new TooltipProviderWrapper (provider));
+		}
+
+		void ITextEditorImpl.RemoveTooltipProvider (MonoDevelop.Ide.Editor.TooltipProvider provider)
+		{
+			foreach (var p in GetTextEditorData ().TooltipProviders) {
+				var wrapper = p as TooltipProviderWrapper;
+				if (wrapper == null)
+					continue;
+				if (wrapper.OriginalProvider == provider) {
+					TextEditor.RemoveTooltipProvider (p);
+					return;
+				}
+			}
+		}
+
+		Xwt.Point ITextEditorImpl.GetEditorWindowOrigin ()
+		{
+			int ox, oy;
+			TextEditor.GdkWindow.GetOrigin (out ox, out oy); 
+			return new Xwt.Point (ox, oy);
+		}
+
+		Xwt.Rectangle ITextEditorImpl.GetEditorAllocation ()
+		{
+			var alloc = TextEditor.Allocation;
+			return new Xwt.Rectangle (alloc.X, alloc.Y, alloc.Width, alloc.Height);
+		}
+
+
+		TextEditorExtension ITextEditorImpl.EditorExtension {
+			get {
+				return TextEditor.EditorExtension;
+			}
+			set {
+				TextEditor.EditorExtension = value;
+			}
+		}
+
+
+		SemanticHighlighting ITextEditorImpl.SemanticHighlighting {
+			get {
+				return TextEditor.SemanticHighlighting;
+			}
+			set {
+				TextEditor.SemanticHighlighting = value;
+			}
+		}
+
+		string ITextEditorImpl.GetPangoMarkup (int offset, int length)
+		{
+			return TextEditor.GetTextEditorData ().GetMarkup (offset, length, false);
+		}
+
+		void ITextEditorImpl.SetUsageTaskProviders (IEnumerable<UsageProviderEditorExtension> providers)
+		{
+			widget.ClearUsageTaskProvider ();
+			foreach (var p in providers) {
+				widget.AddUsageTaskProvider (p);
+			}
+		}
+
+		void ITextEditorImpl.SetQuickTaskProviders (IEnumerable<IQuickTaskProvider> providers)
+		{
+			widget.ClearQuickTaskProvider ();
+			foreach (var p in providers) {
+				widget.AddQuickTaskProvider (p);
+			}
+		}
+
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineChanged;
+
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineInserted;
+
+		void HandleLineInserted (object sender, Mono.TextEditor.LineEventArgs e)
+		{
+			var handler = LineInserted;
+			if (handler != null)
+				handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
+		}
+
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineRemoved;
+
+		void HandleLineRemoved (object sender, Mono.TextEditor.LineEventArgs e)
+		{
+			var handler = LineRemoved;
+			if (handler != null)
+				handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
+		}
+
+		public double ZoomLevel {
+			get { return TextEditor.Options.Zoom; }
+			set { TextEditor.Options.Zoom = value; } 
+		}
+		event EventHandler ITextEditorImpl.ZoomLevelChanged {
+			add {
+				TextEditor.Options.ZoomChanged += value;
+			}
+			remove {
+				TextEditor.Options.ZoomChanged += value;
+			}
+		}
+
+		public void AddOverlay (Control messageOverlayContent, Func<int> sizeFunc)
+		{
+			widget.AddOverlay (messageOverlayContent.GetNativeWidget<Widget> (), sizeFunc);
+		}
+
+		public void RemoveOverlay (Control messageOverlayContent)
+		{
+			widget.RemoveOverlay (messageOverlayContent.GetNativeWidget<Widget> ());
+		}
+
+		#region IEditorActionHost implementation
+
+		void IEditorActionHost.MoveCaretDown ()
+		{
+			CaretMoveActions.Down (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretUp ()
+		{
+			CaretMoveActions.Up (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretRight ()
+		{
+			CaretMoveActions.Right (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretLeft ()
+		{
+			CaretMoveActions.Left (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretToLineEnd ()
+		{
+			CaretMoveActions.LineEnd (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretToLineStart ()
 		{
-			widget.OnToggleErrorTextMarker ();
+			CaretMoveActions.LineHome (TextEditor.GetTextEditorData ());
 		}
 
-		[CommandHandler (EditCommands.IndentSelection)]
-		public void IndentSelection ()
+		void IEditorActionHost.MoveCaretToDocumentStart ()
+		{
+			CaretMoveActions.ToDocumentStart (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretToDocumentEnd ()
+		{
+			CaretMoveActions.ToDocumentEnd (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.Backspace ()
+		{
+			DeleteActions.Backspace (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.ClipboardCopy ()
+		{
+			ClipboardActions.Copy (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.ClipboardCut ()
+		{
+			ClipboardActions.Cut (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.ClipboardPaste ()
+		{
+			ClipboardActions.Paste (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.NewLine ()
+		{
+			MiscActions.InsertNewLine (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.SwitchCaretMode ()
+		{
+			TextEditor.RunAction (MiscActions.SwitchCaretMode);
+		}
+
+		void IEditorActionHost.InsertTab ()
+		{
+			TextEditor.RunAction (MiscActions.InsertTab);
+		}
+
+		void IEditorActionHost.RemoveTab ()
+		{
+			TextEditor.RunAction (MiscActions.RemoveTab);
+		}
+
+		void IEditorActionHost.InsertNewLine ()
+		{
+			TextEditor.RunAction (MiscActions.InsertNewLine);
+		}
+
+		void IEditorActionHost.DeletePreviousWord ()
+		{
+			TextEditor.RunAction (DeleteActions.PreviousWord);
+		}
+
+		void IEditorActionHost.DeleteNextWord ()
+		{
+			TextEditor.RunAction (DeleteActions.NextWord);
+		}
+
+		void IEditorActionHost.DeletePreviousSubword ()
+		{
+			TextEditor.RunAction (DeleteActions.PreviousSubword);
+		}
+
+		void IEditorActionHost.DeleteNextSubword ()
+		{
+			TextEditor.RunAction (DeleteActions.NextSubword);
+		}
+
+		void IEditorActionHost.StartCaretPulseAnimation ()
+		{
+			TextEditor.StartCaretPulseAnimation ();
+		}
+
+		void IEditorActionHost.RecenterEditor ()
+		{
+			TextEditor.RunAction (MiscActions.RecenterEditor);
+		}
+
+		void IEditorActionHost.JoinLines ()
+		{
+			using (var undo = Document.OpenUndoGroup ()) {
+				TextEditor.RunAction (Mono.TextEditor.Vi.ViActions.Join);
+			}
+		}
+
+		void IEditorActionHost.MoveNextSubWord ()
+		{ 
+			TextEditor.RunAction (SelectionActions.MoveNextSubword);
+		}
+
+		void IEditorActionHost.MovePrevSubWord ()
+		{
+			TextEditor.RunAction (SelectionActions.MovePreviousSubword);
+		}
+
+		void IEditorActionHost.MoveNextWord ()
+		{
+			TextEditor.RunAction (CaretMoveActions.NextWord);
+		}
+
+		void IEditorActionHost.MovePrevWord ()
+		{
+			TextEditor.RunAction (CaretMoveActions.PreviousWord);
+		}
+
+		void IEditorActionHost.PageUp ()
+		{
+			TextEditor.RunAction (CaretMoveActions.PageUp);
+		}
+
+		void IEditorActionHost.PageDown ()
+		{
+			TextEditor.RunAction (CaretMoveActions.PageDown);
+		}
+
+		void IEditorActionHost.DeleteCurrentLine ()
+		{
+			TextEditor.RunAction (DeleteActions.CaretLine);
+		}
+
+		void IEditorActionHost.DeleteCurrentLineToEnd ()
+		{
+			TextEditor.RunAction (DeleteActions.CaretLineToEnd);
+		}
+
+		void IEditorActionHost.ScrollLineUp ()
+		{
+			TextEditor.RunAction (ScrollActions.Up);
+		}
+
+		void IEditorActionHost.ScrollLineDown ()
+		{
+			TextEditor.RunAction (ScrollActions.Down);
+		}
+
+		void IEditorActionHost.ScrollPageUp ()
+		{
+			TextEditor.RunAction (ScrollActions.PageUp);
+		}
+
+		void IEditorActionHost.ScrollPageDown ()
+		{
+			TextEditor.RunAction (ScrollActions.PageDown);
+		}
+
+		void IEditorActionHost.MoveBlockUp ()
+		{
+			using (var undo = TextEditor.OpenUndoGroup ()) {
+				TextEditor.RunAction (MiscActions.MoveBlockUp);
+				CorrectIndenting ();
+			}
+		}
+
+		void IEditorActionHost.MoveBlockDown ()
+		{
+			using (var undo = TextEditor.OpenUndoGroup ()) {
+				TextEditor.RunAction (MiscActions.MoveBlockDown);
+				CorrectIndenting ();
+			}
+		}
+
+		void IEditorActionHost.ToggleBlockSelectionMode ()
+		{
+			TextEditor.SelectionMode = TextEditor.SelectionMode == Mono.TextEditor.SelectionMode.Normal ? Mono.TextEditor.SelectionMode.Block : Mono.TextEditor.SelectionMode.Normal;
+			TextEditor.QueueDraw ();
+		}
+
+		void IEditorActionHost.IndentSelection ()
 		{
 			if (widget.TextEditor.IsSomethingSelected) {
 				MiscActions.IndentSelection (widget.TextEditor.GetTextEditorData ());
@@ -2583,45 +3168,74 @@ namespace MonoDevelop.SourceEditor
 				widget.TextEditor.Insert (offset, widget.TextEditor.Options.IndentationString);
 			}
 		}
-		
-		[CommandHandler (EditCommands.UnIndentSelection)]
-		public void UnIndentSelection ()
+
+		void IEditorActionHost.UnIndentSelection ()
 		{
-			Mono.TextEditor.MiscActions.RemoveTab (widget.TextEditor.GetTextEditorData ());
+			MiscActions.RemoveTab (widget.TextEditor.GetTextEditorData ());
 		}
-		
-		[CommandHandler (EditCommands.InsertGuid)]
-		public void InsertGuid ()
+
+		#endregion
+	
+		 
+		#region ISegmentMarkerHost implementation
+
+		ITextSegmentMarker ITextMarkerFactory.CreateUsageMarker (MonoDevelop.Ide.Editor.TextEditor editor, Usage usage)
 		{
-			TextEditor.InsertAtCaret (Guid.NewGuid ().ToString ());
+			return new UsageSegmentMarker (usage);
 		}
 
-		[CommandHandler (SourceEditorCommands.NextIssue)]
-		void NextIssue ()
+		IUrlTextLineMarker ITextMarkerFactory.CreateUrlTextMarker (MonoDevelop.Ide.Editor.TextEditor editor, IDocumentLine line, string value, MonoDevelop.Ide.Editor.UrlType url, string syntax, int startCol, int endCol)
 		{
-			widget.NextIssue ();
-		}	
+			return new UrlTextLineMarker (TextEditor.Document, line, value, (Mono.TextEditor.UrlType)url, syntax, startCol, endCol);
+		}
 
-		[CommandHandler (SourceEditorCommands.PrevIssue)]
-		void PrevIssue ()
+		ICurrentDebugLineTextMarker ITextMarkerFactory.CreateCurrentDebugLineTextMarker (MonoDevelop.Ide.Editor.TextEditor editor)
 		{
-			widget.PrevIssue ();
+			return new CurrentDebugLineTextMarker (TextEditor);
 		}
 
-		[CommandHandler (SourceEditorCommands.NextIssueError)]
-		void NextIssueError ()
+		ITextLineMarker ITextMarkerFactory.CreateAsmLineMarker (MonoDevelop.Ide.Editor.TextEditor editor)
 		{
-			widget.NextIssueError ();
-		}	
+			return new AsmLineMarker ();
+		}
 
-		[CommandHandler (SourceEditorCommands.PrevIssueError)]
-		void PrevIssueError ()
+		IUnitTestMarker ITextMarkerFactory.CreateUnitTestMarker (MonoDevelop.Ide.Editor.TextEditor editor, UnitTestMarkerHost host, UnitTestLocation unitTestLocation)
 		{
-			widget.PrevIssueError ();
+			return new UnitTestMarker (TextEditor, host, unitTestLocation);
+		}
+
+		IMessageBubbleLineMarker ITextMarkerFactory.CreateMessageBubbleLineMarker (MonoDevelop.Ide.Editor.TextEditor editor)
+		{
+			return new MessageBubbleTextMarker (messageBubbleCache);
+		}
+
+		IGenericTextSegmentMarker ITextMarkerFactory.CreateGenericTextSegmentMarker (MonoDevelop.Ide.Editor.TextEditor editor, TextSegmentMarkerEffect effect, int offset, int length)
+		{
+			switch (effect) {
+			case TextSegmentMarkerEffect.DottedLine:
+			case TextSegmentMarkerEffect.WavedLine:
+				return new GenericUnderlineMarker (new TextSegment (offset, length), effect);
+			case TextSegmentMarkerEffect.GrayOut:
+				return new GrayOutMarker (new TextSegment (offset, length));
+			default:
+				throw new ArgumentOutOfRangeException ();
+			}
 		}
 
+		public ITextSegmentMarker CreateLinkMarker (MonoDevelop.Ide.Editor.TextEditor editor, int offset, int length, Action<LinkRequest> activateLink)
+		{
+			return new LinkMarker (offset, length, activateLink);
+		}
 
+		ISmartTagMarker ITextMarkerFactory.CreateSmartTagMarker (MonoDevelop.Ide.Editor.TextEditor editor, int offset, MonoDevelop.Ide.Editor.DocumentLocation realLocation)
+		{
+			return new SmartTagMarker (offset, realLocation);
+		}
 
+		IErrorMarker ITextMarkerFactory.CreateErrorMarker (MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.TypeSystem.Error info, int offset, int length)
+		{
+			return new ErrorMarker (info, offset, length);
+		}
 		#endregion
 
 
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
index 478144b7c9..e9dbb715cf 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
@@ -45,12 +45,14 @@ using MonoDevelop.Ide.TypeSystem;
 using Mono.TextEditor.Highlighting;
 using MonoDevelop.SourceEditor.QuickTasks;
 using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
 using MonoDevelop.Ide.Tasks;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.SourceEditor
 {
-	class SourceEditorWidget : ITextEditorExtension, IQuickTaskProvider
+	class SourceEditorWidget : IServiceProvider
 	{
 		SourceEditorView view;
 		DecoratedScrolledWindow mainsw;
@@ -65,8 +67,9 @@ namespace MonoDevelop.SourceEditor
 		
 //		bool shouldShowclassBrowser;
 //		bool canShowClassBrowser;
-		ISourceEditorOptions options {
+		Mono.TextEditor.ITextEditorOptions options {
 			get {
+				
 				return textEditor.Options;
 			}
 		}
@@ -92,13 +95,6 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 		
-		public Ambience Ambience {
-			get {
-				string fileName = view.IsUntitled ? view.UntitledName : view.ContentName;
-				return AmbienceService.GetAmbienceForFile (fileName);
-			}
-		}
-		
 		List<IQuickTaskProvider> quickTaskProvider = new List<IQuickTaskProvider> ();
 		public void AddQuickTaskProvider (IQuickTaskProvider provider)
 		{
@@ -108,6 +104,14 @@ namespace MonoDevelop.SourceEditor
 				secondsw.AddQuickTaskProvider (provider);
 		}
 
+		internal void ClearQuickTaskProvider ()
+		{
+			foreach (var provider in quickTaskProvider.ToArray ()) {
+				RemoveQuickTaskProvider (provider);
+			}
+			quickTaskProvider = new List<IQuickTaskProvider> ();
+		}
+
 		public void RemoveQuickTaskProvider (IQuickTaskProvider provider)
 		{
 			quickTaskProvider.Remove (provider);
@@ -117,44 +121,32 @@ namespace MonoDevelop.SourceEditor
 		}		
 
 		
-		List<IUsageProvider> usageProvider = new List<IUsageProvider> ();
-		public void AddUsageTaskProvider (IUsageProvider provider)
+		List<UsageProviderEditorExtension> usageProvider = new List<UsageProviderEditorExtension> ();
+
+		internal void ClearUsageTaskProvider()
 		{
-			usageProvider.Add (provider);
-			mainsw.AddUsageProvider (provider); 
-			if (secondsw != null)
-				secondsw.AddUsageProvider (provider);
-		}
-		
-		#region ITextEditorExtension
-		
-		ITextEditorExtension ITextEditorExtension.Next {
-			get {
-				return null;
+			foreach (var provider in usageProvider.ToArray ()) {
+				RemoveUsageTaskProvider (provider);
 			}
-		}
-		
-		object ITextEditorExtension.GetExtensionCommandTarget ()
-		{
-			return null;
-		}
+			usageProvider = new List<UsageProviderEditorExtension> ();
 
-		void ITextEditorExtension.TextChanged (int startIndex, int endIndex)
-		{
 		}
 
-		void ITextEditorExtension.CursorPositionChanged ()
+		public void AddUsageTaskProvider (UsageProviderEditorExtension provider)
 		{
+			usageProvider.Add (provider);
+			mainsw.AddUsageProvider (provider); 
+			if (secondsw != null)
+				secondsw.AddUsageProvider (provider);
 		}
 
-		bool ITextEditorExtension.KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		void RemoveUsageTaskProvider (UsageProviderEditorExtension provider)
 		{
-			this.TextEditor.SimulateKeyPress (key, (uint)keyChar, modifier);
-			if (key == Gdk.Key.Escape)
-				return true;
-			return false;
+			usageProvider.Remove (provider);
+			mainsw.RemoveUsageProvider (provider); 
+			if (secondsw != null)
+				secondsw.RemoveUsageProvider (provider);
 		}
-		#endregion
 		
 		public bool HasMessageBar {
 			get { return messageBar != null; }
@@ -195,7 +187,7 @@ namespace MonoDevelop.SourceEditor
 			return false;
 		}
 		
-		public class Border : Gtk.DrawingArea
+		class Border : Gtk.DrawingArea
 		{
 			protected override bool OnExposeEvent (Gdk.EventExpose evnt)
 			{
@@ -307,12 +299,21 @@ namespace MonoDevelop.SourceEditor
 					provider.TasksUpdated -= HandleTasksUpdated;
 			}	
 
+			public void AddUsageProvider (UsageProviderEditorExtension p)
+			{
+				p.UsagesUpdated += HandleUsagesUpdated;
+			}
 
-			public void AddUsageProvider (IUsageProvider p)
+			public void RemoveUsageProvider (UsageProviderEditorExtension p)
 			{
-				p.UsagesUpdated += (sender, e) => strip.Update (p);
+				p.UsagesUpdated -= HandleUsagesUpdated;
+			}	
+
+			void HandleUsagesUpdated (object sender, EventArgs e)
+			{
+				strip.Update ((UsageProviderEditorExtension)sender);
 			}
-			
+
 			protected override void OnDestroyed ()
 			{
 				if (scrolledWindow.Child != null)
@@ -329,7 +330,7 @@ namespace MonoDevelop.SourceEditor
 				args.RetVal = true;
 			}
 		
-			public void SetTextEditor (TextEditor container)
+			public void SetTextEditor (Mono.TextEditor.MonoTextEditor container)
 			{
 				scrolledWindow.Child = container;
 				this.strip.TextEditor = container;
@@ -341,14 +342,15 @@ namespace MonoDevelop.SourceEditor
 			
 			void OptionsChanged (object sender, EventArgs e)
 			{
-				TextEditor editor = (TextEditor)sender;
-				scrolledWindow.ModifyBg (StateType.Normal, (Mono.TextEditor.HslColor)editor.ColorStyle.PlainText.Background);
+				var editor = (Mono.TextEditor.MonoTextEditor)sender;
+				scrolledWindow.ModifyBg (StateType.Normal, (HslColor)editor.ColorStyle.PlainText.Background);
 			}
 			
 			void RemoveEvents ()
 			{
-				var container = scrolledWindow.Child as TextEditor;
+				var container = scrolledWindow.Child as Mono.TextEditor.MonoTextEditor;
 				if (container == null) {
+
 					LoggingService.LogError ("can't remove events from text editor container.");
 					return;
 				}
@@ -358,9 +360,9 @@ namespace MonoDevelop.SourceEditor
 				container.SelectionChanged -= parent.UpdateLineColOnEventHandler;
 			}
 			
-			public TextEditor RemoveTextEditor ()
+			public Mono.TextEditor.MonoTextEditor RemoveTextEditor ()
 			{
-				var child = scrolledWindow.Child as TextEditor;
+				var child = scrolledWindow.Child as Mono.TextEditor.MonoTextEditor;
 				if (child == null)
 					return null;
 				RemoveEvents ();
@@ -383,7 +385,8 @@ namespace MonoDevelop.SourceEditor
 				if (this.splittedTextEditor == null || !splittedTextEditor.TextArea.HasFocus)
 					OnLostFocus ();
 			};
-			IdeApp.FocusOut += (sender, e) => textEditor.TextArea.HideTooltip (false);
+			if (IdeApp.CommandService != null)
+				IdeApp.FocusOut += (sender, e) => textEditor.TextArea.HideTooltip (false);
 			mainsw = new DecoratedScrolledWindow (this);
 			mainsw.SetTextEditor (textEditor);
 			
@@ -405,13 +408,11 @@ namespace MonoDevelop.SourceEditor
 			};
 			vbox.Destroyed += delegate {
 				isDisposed = true;
-				RemoveErrorUndelinesResetTimerId ();
 				StopParseInfoThread ();
 				KillWidgets ();
 
-				foreach (var provider in quickTaskProvider.ToArray ()) {
-					RemoveQuickTaskProvider (provider);
-				}
+				ClearQuickTaskProvider ();
+				ClearUsageTaskProvider ();
 
 				this.lastActiveEditor = null;
 				this.splittedTextEditor = null;
@@ -421,6 +422,7 @@ namespace MonoDevelop.SourceEditor
 //				IdeApp.Workbench.StatusBar.ClearCaretState ();
 			};
 			vbox.ShowAll ();
+
 		}
 
 		void OnLostFocus ()
@@ -447,10 +449,9 @@ namespace MonoDevelop.SourceEditor
 		
 		public void Dispose ()
 		{
-			RemoveErrorUndelinesResetTimerId ();
 		}
 		
-		FoldSegment AddMarker (List<FoldSegment> foldSegments, string text, DomRegion region, FoldingType type)
+		Mono.TextEditor.FoldSegment AddMarker (List<Mono.TextEditor.FoldSegment> foldSegments, string text, DomRegion region, Mono.TextEditor.FoldingType type)
 		{
 			Document document = textEditorData.Document;
 			if (document == null || region.BeginLine <= 0 || region.EndLine <= 0 || region.BeginLine > document.LineCount || region.EndLine > document.LineCount)
@@ -459,110 +460,27 @@ namespace MonoDevelop.SourceEditor
 			int startOffset = document.LocationToOffset (region.BeginLine, region.BeginColumn);
 			int endOffset   = document.LocationToOffset (region.EndLine, region.EndColumn );
 			
-			FoldSegment result = new FoldSegment (document, text, startOffset, endOffset - startOffset, type);
+			var result = new Mono.TextEditor.FoldSegment (document, text, startOffset, endOffset - startOffset, type);
 			
 			foldSegments.Add (result);
 			return result;
 		}
-		HashSet<string> symbols = new HashSet<string> ();
 		bool reloadSettings;
 		
 		void HandleParseInformationUpdaterWorkerThreadDoWork (bool firstTime, ParsedDocument parsedDocument, CancellationToken token = default(CancellationToken))
 		{
-			var doc = Document;
-			if (doc == null || parsedDocument == null)
-				return;
-			UpdateErrorUndelines (parsedDocument);
-			if (!options.ShowFoldMargin)
-				return;
-			// don't update parsed documents that contain errors - the foldings from there may be invalid.
-			if (parsedDocument.HasErrors)
-				return;
-			try {
-				List<FoldSegment > foldSegments = new List<FoldSegment> ();
-				bool updateSymbols = parsedDocument.Defines.Count != symbols.Count;
-				if (!updateSymbols) {
-					foreach (PreProcessorDefine define in parsedDocument.Defines) {
-						if (token.IsCancellationRequested)
-							return;
-						if (!symbols.Contains (define.Define)) {
-							updateSymbols = true;
-							break;
-						}
-					}
-				}
-				
-				if (updateSymbols) {
-					symbols.Clear ();
-					foreach (PreProcessorDefine define in parsedDocument.Defines) {
-						symbols.Add (define.Define);
-					}
-				}
-				
-				foreach (FoldingRegion region in parsedDocument.Foldings) {
-					if (token.IsCancellationRequested)
+
+
+			if (reloadSettings) {
+				reloadSettings = false;
+				Application.Invoke (delegate {
+					if (isDisposed)
 						return;
-					FoldingType type = FoldingType.None;
-					bool setFolded = false;
-					bool folded = false;
-					
-					//decide whether the regions should be folded by default
-					switch (region.Type) {
-					case FoldType.Member:
-						type = FoldingType.TypeMember;
-						break;
-					case FoldType.Type:
-						type = FoldingType.TypeDefinition;
-						break;
-					case FoldType.UserRegion:
-						type = FoldingType.Region;
-						setFolded = options.DefaultRegionsFolding;
-						folded = true;
-						break;
-					case FoldType.Comment:
-						type = FoldingType.Comment;
-						setFolded = options.DefaultCommentFolding;
-						folded = true;
-						break;
-					case FoldType.CommentInsideMember:
-						type = FoldingType.Comment;
-						setFolded = options.DefaultCommentFolding;
-						folded = false;
-						break;
-					case FoldType.Undefined:
-						setFolded = true;
-						folded = region.IsFoldedByDefault;
-						break;
-					}
-					
-					//add the region
-					FoldSegment marker = AddMarker (foldSegments, region.Name, 
-					                                       region.Region, type);
-					
-					//and, if necessary, set its fold state
-					if (marker != null && setFolded && firstTime) {
-						// only fold on document open, later added folds are NOT folded by default.
-						marker.IsFolded = folded;
-						continue;
-					}
-					if (marker != null && region.Region.IsInside (textEditorData.Caret.Line, textEditorData.Caret.Column))
-						marker.IsFolded = false;
-					
-				}
-				doc.UpdateFoldSegments (foldSegments, false, true, token);
-
-				if (reloadSettings) {
-					reloadSettings = false;
-					Application.Invoke (delegate {
-						if (isDisposed)
-							return;
-						view.LoadSettings ();
-						mainsw.QueueDraw ();
-					});
-				}
-			} catch (Exception ex) {
-				LoggingService.LogError ("Unhandled exception in ParseInformationUpdaterWorkerThread", ex);
+					view.LoadSettings ();
+					mainsw.QueueDraw ();
+				});
 			}
+
 		}
 
 		internal void UpdateParsedDocument (ParsedDocument document)
@@ -608,77 +526,9 @@ namespace MonoDevelop.SourceEditor
 		{
 			this.lastActiveEditor = editor;
 		}
-			
-		#region Error underlining
-		List<ErrorMarker> errors = new List<ErrorMarker> ();
-		uint resetTimerId;
-		
-		void RemoveErrorUndelinesResetTimerId ()
-		{
-			if (resetTimerId > 0) {
-				GLib.Source.Remove (resetTimerId);
-				resetTimerId = 0;
-			}
-		}
-		
-		void UpdateErrorUndelines (ParsedDocument parsedDocument)
-		{
-			if (!options.UnderlineErrors || parsedDocument == null) {
-				Application.Invoke (delegate {
-					var doc = this.TextEditor != null ? this.TextEditor.Document : null;
-					if (doc == null)
-						return;
-					RemoveErrorUnderlines (doc);
-					UpdateQuickTasks (parsedDocument);
-				});
-				return;
-			}
-				
-			Application.Invoke (delegate {
-				if (!quickTaskProvider.Contains (this))
-					AddQuickTaskProvider (this);
-				RemoveErrorUndelinesResetTimerId ();
-				const uint timeout = 500;
-				resetTimerId = GLib.Timeout.Add (timeout, delegate {
-					if (!this.isDisposed) {
-						Document doc = this.TextEditor != null ? this.TextEditor.Document : null;
-						if (doc != null) {
-							RemoveErrorUnderlines (doc);
-
-							// Else we underline the error
-							if (parsedDocument.Errors != null) {
-								foreach (var error in parsedDocument.Errors)
-									UnderLineError (doc, error);
-							}
-						}
-					}
-					resetTimerId = 0;
-					return false;
-				});
-				UpdateQuickTasks (parsedDocument);
-			});
-		}
-		
-		void RemoveErrorUnderlines (Document doc)
-		{
-			errors.ForEach (err => doc.RemoveMarker (err));
-			errors.Clear ();
-		}
-		
-		void UnderLineError (Document doc, Error info)
-		{
-			var line = doc.GetLine (info.Region.BeginLine);
-			// If the line is already underlined
-			if (errors.Any (em => em.LineSegment == line))
-				return;
-			ErrorMarker error = new ErrorMarker (textEditor.Document, info, line);
-			errors.Add (error);
-			doc.AddMarker (line, error);
-		}
-		#endregion
-	
-		
-		Gtk.Paned splitContainer = null;
+
+		Gtk.Paned splitContainer;
+
 		public bool IsSplitted {
 			get {
 				return splitContainer != null;
@@ -763,7 +613,7 @@ namespace MonoDevelop.SourceEditor
 				 if (!textEditor.TextArea.HasFocus)
 					OnLostFocus ();
 			};
-			splittedTextEditor.Extension = textEditor.Extension;
+			splittedTextEditor.EditorExtension = textEditor.EditorExtension;
 			if (textEditor.GetTextEditorData ().HasIndentationTracker)
 				splittedTextEditor.GetTextEditorData ().IndentationTracker = textEditor.GetTextEditorData ().IndentationTracker;
 			splittedTextEditor.Document.BracketMatcher = textEditor.Document.BracketMatcher;
@@ -969,20 +819,38 @@ namespace MonoDevelop.SourceEditor
 			return "Unknown";
 		}
 
-		OverlayMessageWindow messageOverlayWindow;
+		//TODO: Support multiple Overlays at once to display above each other
+		internal void AddOverlay (Widget messageOverlayContent, Func<int> sizeFunc = null)
+		{
+			var messageOverlayWindow = new OverlayMessageWindow ();
+			messageOverlayWindow.Child = messageOverlayContent;
+			messageOverlayWindow.SizeFunc = sizeFunc;
+			messageOverlayWindow.ShowOverlay (TextEditor);
+			messageOverlayWindows.Add (messageOverlayWindow);
+		}
+
+		internal void RemoveOverlay (Widget messageOverlayContent)
+		{
+			var window = messageOverlayWindows.FirstOrDefault (w => w.Child == messageOverlayContent);
+			if (window == null)
+				return;
+			messageOverlayWindows.Remove (window);
+			window.Destroy ();
+		}
+
+		List<OverlayMessageWindow> messageOverlayWindows = new List<OverlayMessageWindow> ();
+		HBox incorrectEolMessage;
 
 		void ShowIncorrectEolMarkers (string fileName, bool multiple)
 		{
 			RemoveMessageBar ();
-			messageOverlayWindow = new OverlayMessageWindow ();
-
 			var hbox = new HBox ();
 			hbox.Spacing = 8;
 
 			var image = new HoverCloseButton ();
 			hbox.PackStart (image, false, false, 0);
 			var label = new Label (string.Format ("This file has line endings ({0}) which differ from the policy settings ({1}).", GetEolString (DetectedEolMarker), GetEolString (textEditor.Options.DefaultEolMarker)));
-			var color = (Mono.TextEditor.HslColor)textEditor.ColorStyle.NotificationText.Foreground;
+			var color = (HslColor)textEditor.ColorStyle.NotificationText.Foreground;
 			label.ModifyFg (StateType.Normal, color);
 
 			int w, h;
@@ -1007,11 +875,9 @@ namespace MonoDevelop.SourceEditor
 			var combo = new ComboBox (list.ToArray ());
 			combo.Active = 0;
 			hbox.PackEnd (combo, false, false, 0);
-			var container = new HBox ();
+			incorrectEolMessage = new HBox ();
 			const int containerPadding = 8;
-			container.PackStart (hbox, true, true, containerPadding); 
-			messageOverlayWindow.Child = container; 
-			messageOverlayWindow.ShowOverlay (this.TextEditor);
+			incorrectEolMessage.PackStart (hbox, true, true, containerPadding); 
 
 			// This is hacky, but it will ensure that our combo appears with with the correct size.
 			GLib.Timeout.Add (100, delegate {
@@ -1019,14 +885,15 @@ namespace MonoDevelop.SourceEditor
 				return false;
 			});
 
-			messageOverlayWindow.SizeFunc = () => {
+			AddOverlay (incorrectEolMessage, () => {
 				return okButton.SizeRequest ().Width +
-					combo.SizeRequest ().Width +
-					image.SizeRequest ().Width +
-					w +
-					hbox.Spacing * 4 + 
-					containerPadding * 2;
-			};
+							   combo.SizeRequest ().Width +
+							   image.SizeRequest ().Width +
+							   w +
+							   hbox.Spacing * 4 +
+							   containerPadding * 2;
+			});
+
 			image.Clicked += delegate {
 				UseIncorrectMarkers = true;
 				view.WorkbenchWindow.ShowNotification = false;
@@ -1086,11 +953,10 @@ namespace MonoDevelop.SourceEditor
 				b2.Image = ImageService.GetImage (Gtk.Stock.RevertToSaved, IconSize.Button);
 				b2.Clicked += delegate {
 					try {
-						string content = AutoSave.LoadAutoSave (fileName);
-						AutoSave.RemoveAutoSaveFile (fileName);
+						var content = AutoSave.LoadAndRemoveAutoSave (fileName);
 						TextEditor.GrabFocus ();
 						view.Load (fileName);
-						view.ReplaceContent (fileName, content, view.SourceEncoding);
+						view.ReplaceContent (fileName, content.Text, view.SourceEncoding);
 						view.WorkbenchWindow.Document.ReparseDocument ();
 						view.IsDirty = true;
 					} catch (Exception ex) {
@@ -1125,9 +991,9 @@ namespace MonoDevelop.SourceEditor
 			}
 			if (!TextEditor.Visible)
 				TextEditor.Visible = true;
-			if (messageOverlayWindow != null) {
-				messageOverlayWindow.Destroy ();
-				messageOverlayWindow = null;
+			if (incorrectEolMessage != null) {
+				RemoveOverlay (incorrectEolMessage);
+				incorrectEolMessage = null;
 			}
 		}
 
@@ -1420,20 +1286,8 @@ namespace MonoDevelop.SourceEditor
 		#region Help
 		internal void MonodocResolver ()
 		{
-			DomRegion region;
+			MonoDevelop.Ide.Editor.DocumentRegion region;
 			var res = TextEditor.GetLanguageItem (TextEditor.Caret.Offset, out region);
-			if (res is UnknownIdentifierResolveResult) {
-				var uir = (UnknownIdentifierResolveResult)res;
-				IdeApp.HelpOperations.SearchHelpFor (uir.Identifier);
-				return;
-			}
-
-			if (res is UnknownMemberResolveResult) {
-				var uir = (UnknownMemberResolveResult)res;
-				IdeApp.HelpOperations.SearchHelpFor (uir.MemberName);
-				return;
-			}
-
 			string url = HelpService.GetMonoDocHelpUrl (res);
 			if (url != null)
 				IdeApp.HelpOperations.ShowHelp (url);
@@ -1441,135 +1295,16 @@ namespace MonoDevelop.SourceEditor
 		
 		internal void MonodocResolverUpdate (CommandInfo cinfo)
 		{
-			DomRegion region;
+			MonoDevelop.Ide.Editor.DocumentRegion region;
 			var res = TextEditor.GetLanguageItem (TextEditor.Caret.Offset, out region);
-			if (res == null || !IdeApp.HelpOperations.CanShowHelp (res) && !(res is UnknownIdentifierResolveResult || res is UnknownMemberResolveResult))
+			if (HelpService.GetMonoDocHelpUrl (res) == null)
 				cinfo.Bypass = true;
 		}
 		
 		#endregion
 		
 		#region commenting and indentation
-		internal void OnUpdateToggleComment (MonoDevelop.Components.Commands.CommandInfo info)
-		{
-			var mode = Document.SyntaxMode as SyntaxMode;
-			if (mode == null) {
-				info.Visible = false;
-				return;
-			}
-			List<string> lineComments;
-			if (mode.Properties.TryGetValue ("LineComment", out lineComments)) {
-				info.Visible = lineComments.Count > 0;
-			} else {
-				List<string> blockStarts;
-				List<string> blockEnds;
-				if (mode.Properties.TryGetValue ("BlockCommentStart", out blockStarts) && mode.Properties.TryGetValue ("BlockCommentEnd", out blockEnds)) {
-					info.Visible = blockStarts.Count > 0 && blockEnds.Count > 0;
-				}
-			}
-		}
-		
-		void ToggleCodeCommentWithBlockComments ()
-		{
-			var mode = Document.SyntaxMode as SyntaxMode;
-			if (mode == null)
-				return;
-
-			List<string> blockStarts;
-			if (!mode.Properties.TryGetValue ("BlockCommentStart", out blockStarts) || blockStarts.Count == 0)
-				return;
-
-			List<string> blockEnds;
-			if (!mode.Properties.TryGetValue ("BlockCommentEnd", out blockEnds) || blockEnds.Count == 0)
-				return;
-
-			string blockStart = blockStarts[0];
-			string blockEnd = blockEnds[0];
-
-			using (var undo = Document.OpenUndoGroup ()) {
-				DocumentLine startLine;
-				DocumentLine endLine;
 	
-				if (TextEditor.IsSomethingSelected) {
-					startLine = Document.GetLineByOffset (textEditor.SelectionRange.Offset);
-					endLine = Document.GetLineByOffset (textEditor.SelectionRange.EndOffset);
-				} else {
-					startLine = endLine = Document.GetLine (textEditor.Caret.Line);
-				}
-				string startLineText = Document.GetTextAt (startLine.Offset, startLine.Length);
-				string endLineText = Document.GetTextAt (endLine.Offset, endLine.Length);
-				if (startLineText.StartsWith (blockStart) && endLineText.EndsWith (blockEnd, StringComparison.Ordinal)) {
-					textEditor.Remove (endLine.Offset + endLine.Length - blockEnd.Length, blockEnd.Length);
-					textEditor.Remove (startLine.Offset, blockStart.Length);
-					if (TextEditor.IsSomethingSelected) {
-						TextEditor.SelectionAnchor -= blockEnd.Length;
-					}
-				} else {
-					textEditor.Insert (endLine.Offset + endLine.Length, blockEnd);
-					textEditor.Insert (startLine.Offset, blockStart);
-					if (TextEditor.IsSomethingSelected) {
-						TextEditor.SelectionAnchor += blockEnd.Length;
-					}
-
-				}
-			}
-		}
-
-		bool TryGetLineCommentTag (out string commentTag)
-		{
-			var mode = Document.SyntaxMode as SyntaxMode;
-			List<string> lineComments;
-			if (mode == null || !mode.Properties.TryGetValue ("LineComment", out lineComments) || lineComments.Count == 0) {
-				commentTag = null;
-				return false;
-			}
-			commentTag = lineComments [0];
-			return true;
-		}
-
-		public void ToggleCodeComment ()
-		{
-			string commentTag;
-			if (!TryGetLineCommentTag (out commentTag)) {
-				ToggleCodeCommentWithBlockComments ();
-				return;
-			}
-
-			bool comment = false;
-			foreach (var line in textEditor.SelectedLines) {
-				if (line.GetIndentation (TextEditor.Document).Length == line.Length)
-					continue;
-				string text = Document.GetTextAt (line);
-				string trimmedText = text.TrimStart ();
-				if (!trimmedText.StartsWith (commentTag, StringComparison.Ordinal)) {
-					comment = true;
-					break;
-				}
-			}
-
-			if (comment) {
-				CommentSelectedLines (commentTag);
-			} else {
-				UncommentSelectedLines (commentTag);
-			}
-		}
-
-		public void AddCodeComment ()
-		{
-			string commentTag;
-			if (!TryGetLineCommentTag (out commentTag))
-				return;
-			CommentSelectedLines (commentTag);
-		}
-
-		public void RemoveCodeComment ()
-		{
-			string commentTag;
-			if (!TryGetLineCommentTag (out commentTag))
-				return;
-			UncommentSelectedLines (commentTag);
-		}
-
 		public void OnUpdateToggleErrorTextMarker (CommandInfo info)
 		{
 			DocumentLine line = TextEditor.Document.GetLine (TextEditor.Caret.Line);
@@ -1592,81 +1327,7 @@ namespace MonoDevelop.SourceEditor
 				TextEditor.QueueDraw ();
 			}
 		}
-		
-		void CommentSelectedLines (string commentTag)
-		{
-			int startLineNr = TextEditor.IsSomethingSelected ? Document.OffsetToLineNumber (TextEditor.SelectionRange.Offset) : TextEditor.Caret.Line;
-			int endLineNr = TextEditor.IsSomethingSelected ? Document.OffsetToLineNumber (TextEditor.SelectionRange.EndOffset) : TextEditor.Caret.Line;
-			if (endLineNr < 0)
-				endLineNr = Document.LineCount;
-			
-			DocumentLine anchorLine = TextEditor.IsSomethingSelected ? TextEditor.Document.GetLineByOffset (TextEditor.SelectionAnchor) : null;
-			int anchorColumn = TextEditor.IsSomethingSelected ? TextEditor.SelectionAnchor - anchorLine.Offset : -1;
-			
-			using (var undo = Document.OpenUndoGroup ()) {
-				foreach (DocumentLine line in TextEditor.SelectedLines) {
-//					if (line.GetIndentation (TextEditor.Document).Length == line.EditableLength)
-//						continue;
-					TextEditor.Insert (line.Offset, commentTag);
-				}
-				if (TextEditor.IsSomethingSelected) {
-					if (TextEditor.SelectionAnchor < TextEditor.Caret.Offset) {
-						if (anchorColumn != 0) 
-							TextEditor.SelectionAnchor = System.Math.Min (anchorLine.Offset + anchorLine.Length, System.Math.Max (anchorLine.Offset, TextEditor.SelectionAnchor + commentTag.Length));
-					} else {
-						if (anchorColumn != 0) {
-							TextEditor.SelectionAnchor = System.Math.Min (anchorLine.Offset + anchorLine.Length, System.Math.Max (anchorLine.Offset, anchorLine.Offset + anchorColumn + commentTag.Length));
-						} else {
-	//						TextEditor.SelectionAnchor = anchorLine.Offset;
-						}
-					}
-				}
-				
-				if (TextEditor.IsSomethingSelected) 
-					TextEditor.ExtendSelectionTo (TextEditor.Caret.Offset);
-			}
-			Document.CommitMultipleLineUpdate (startLineNr, endLineNr);
-		}
-		
-		void UncommentSelectedLines (string commentTag)
-		{
-			int startLineNr = TextEditor.IsSomethingSelected ? Document.OffsetToLineNumber (TextEditor.SelectionRange.Offset) : TextEditor.Caret.Line;
-			int endLineNr   = TextEditor.IsSomethingSelected ? Document.OffsetToLineNumber (TextEditor.SelectionRange.EndOffset) : TextEditor.Caret.Line;
-			if (endLineNr < 0)
-				endLineNr = Document.LineCount;
-			DocumentLine anchorLine   = TextEditor.IsSomethingSelected ? TextEditor.Document.GetLineByOffset (TextEditor.SelectionAnchor) : null;
-			int         anchorColumn = TextEditor.IsSomethingSelected ? TextEditor.SelectionAnchor - anchorLine.Offset : -1;
-			
-			using (var undo = Document.OpenUndoGroup ()) {
-				int first = -1;
-				int last  = 0;
-				foreach (DocumentLine line in TextEditor.SelectedLines) {
-					string text = Document.GetTextAt (line);
-					string trimmedText = text.TrimStart ();
-					int length = 0;
-					if (trimmedText.StartsWith (commentTag)) {
-						TextEditor.Remove (line.Offset + (text.Length - trimmedText.Length), commentTag.Length);
-						length = commentTag.Length;
-					}
-					last = length;
-					if (first < 0)
-						first = last;
-				}
-				
-				if (TextEditor.IsSomethingSelected) {
-					if (TextEditor.SelectionAnchor < TextEditor.Caret.Offset) {
-						TextEditor.SelectionAnchor = System.Math.Min (anchorLine.Offset + anchorLine.Length, System.Math.Max (anchorLine.Offset, TextEditor.SelectionAnchor - first));
-					} else {
-						TextEditor.SelectionAnchor = System.Math.Min (anchorLine.Offset + anchorLine.Length, System.Math.Max (anchorLine.Offset, anchorLine.Offset + anchorColumn - last));
-					}
-				}
-				
-				if (TextEditor.IsSomethingSelected) 
-					TextEditor.ExtendSelectionTo (TextEditor.Caret.Offset);
-			}
-			Document.CommitMultipleLineUpdate (startLineNr, endLineNr);
-		}
-		
+	
 		#endregion
 		
 		#region IQuickTaskProvider implementation
@@ -1687,17 +1348,17 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 		
-		void UpdateQuickTasks (ParsedDocument doc)
+		async void UpdateQuickTasks (ParsedDocument doc)
 		{
 			tasks.Clear ();
 			if (doc != null) {
-				foreach (var cmt in doc.TagComments) {
-					var newTask = new QuickTask (cmt.Text, cmt.Region.Begin, Severity.Hint);
+				foreach (var cmt in await doc.GetTagCommentsAsync()) {
+					var newTask = new QuickTask (cmt.Text, textEditor.LocationToOffset (cmt.Region.Begin.Line, cmt.Region.Begin.Column), DiagnosticSeverity.Info);
 					tasks.Add (newTask);
 				}
 			
-				foreach (var error in doc.Errors) {
-					var newTask = new QuickTask (error.Message, error.Region.Begin, error.ErrorType == ErrorType.Error ? Severity.Error : Severity.Warning);
+				foreach (var error in await doc.GetErrorsAsync()) {
+					var newTask = new QuickTask (error.Message, textEditor.LocationToOffset (error.Region.Begin.Line, error.Region.Begin.Column), error.ErrorType == MonoDevelop.Ide.TypeSystem.ErrorType.Error ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning);
 					tasks.Add (newTask);
 				}
 			}
@@ -1734,56 +1395,12 @@ namespace MonoDevelop.SourceEditor
 		}
 
 
-	}
-
-	class ErrorMarker : UnderlineMarker
-	{
-		public Error Info { get; private set; }
-		
-		public ErrorMarker (TextDocument doc, Error info, DocumentLine line)
-		{
-			Info = info;
-			LineSegment = line;
-			// may be null if no line is assigned to the error.
-			Wave = true;
-			
-			StartCol = Info.Region.BeginColumn;
-			if (line != null) {
-				var startOffset = line.Offset;
-				if (startOffset + StartCol - 1 >= 0) {
-					while (StartCol < line.Length) {
-						char ch = doc.GetCharAt (startOffset + StartCol - 1);
-						if (!char.IsWhiteSpace (ch))
-							break;
-						StartCol++;
-					}
-				}
-			}
-
-			if (Info.Region.EndColumn > StartCol) {
-				EndCol = Info.Region.EndColumn;
-			} else {
-				if (line == null) {
-					EndCol = StartCol + 1;
-					return;
-				}
-				var start = line.Offset + StartCol - 1;
-				int o = start + 1;
-				while (o < line.EndOffset) {
-					char ch = doc.GetCharAt (o);
-					if (!(char.IsLetterOrDigit (ch) || ch == '_'))
-						break;
-					o++;
-				}
-				EndCol = Info.Region.BeginColumn + o - start + 1;
-			}
-		}
-
-		public override void Draw (TextEditor editor, Cairo.Context cr, double y, LineMetrics metrics)
+		#region IServiceProvider implementation
+		object IServiceProvider.GetService (Type serviceType)
 		{
-			Color = Info.ErrorType == ErrorType.Warning ? editor.ColorStyle.UnderlineWarning.Color : editor.ColorStyle.UnderlineError.Color;
-
-			base.Draw (editor, cr, y, metrics);
+			return view.GetContent (serviceType);
 		}
+		#endregion
 	}
+
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs
index 01d4f54f65..7e46cb6ac9 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs
@@ -25,350 +25,302 @@
 // THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Policies;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide;
 using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor
 {
-
-	internal class StyledSourceEditorOptions : ISourceEditorOptions
+	class StyledSourceEditorOptions : TextEditorOptions
 	{
-		PolicyContainer policyContainer;
-		EventHandler changed;
-		IEnumerable<string> mimeTypes;
-		TextStylePolicy currentPolicy;
-		string lastMimeType;
+		MonoDevelop.Ide.Editor.ITextEditorOptions optionsCore;
 
-		public StyledSourceEditorOptions (Project styleParent, string mimeType)
-		{
-			UpdateStyleParent (styleParent, mimeType);
+		public MonoDevelop.Ide.Editor.ITextEditorOptions OptionsCore {
+			get {
+				return optionsCore;
+			}
+			set {
+				optionsCore = value;
+				OnChanged (EventArgs.Empty);
+			}
 		}
-
-		TextStylePolicy CurrentPolicy {
-			get { return currentPolicy; }
+	
+		public StyledSourceEditorOptions (MonoDevelop.Ide.Editor.ITextEditorOptions optionsCore)
+		{
+			if (optionsCore == null)
+				throw new ArgumentNullException ("optionsCore");
+			this.optionsCore = optionsCore;
+			DefaultSourceEditorOptions.Instance.Changed += HandleChanged;
 		}
 
-
-		public void UpdateStyleParent (Project styleParent, string mimeType)
+		public override void Dispose ()
 		{
-			if (styleParent != null && policyContainer == styleParent.Policies && mimeType == lastMimeType)
-				return;
-			lastMimeType = mimeType;
-
-			if (policyContainer != null)
-				policyContainer.PolicyChanged -= HandlePolicyChanged;
-
-			if (string.IsNullOrEmpty (mimeType))
-				mimeType = "text/plain";
-			this.mimeTypes = DesktopService.GetMimeTypeInheritanceChain (mimeType);
-
-			if (styleParent != null)
-				policyContainer = styleParent.Policies;
-			else
-				policyContainer = MonoDevelop.Projects.Policies.PolicyService.DefaultPolicies;
-			currentPolicy = policyContainer.Get<TextStylePolicy> (mimeTypes);
-
-			policyContainer.PolicyChanged += HandlePolicyChanged;
-			if (changed != null)
-				this.changed (this, EventArgs.Empty);
+			DefaultSourceEditorOptions.Instance.Changed -= HandleChanged;
+
+			base.Dispose ();
 		}
 
-		void HandlePolicyChanged (object sender, MonoDevelop.Projects.Policies.PolicyChangedEventArgs args)
+		void HandleChanged (object sender, EventArgs e)
 		{
-			currentPolicy = policyContainer.Get<TextStylePolicy> (mimeTypes);
-			if (changed != null)
-				this.changed (this, EventArgs.Empty);
+			DisposeFont ();
+			OnChanged (EventArgs.Empty);
 		}
 
-		public bool OverrideDocumentEolMarker {
-			get { return DefaultSourceEditorOptions.Instance.OverrideDocumentEolMarker; }
+		#region ITextEditorOptions implementation
+		static IWordFindStrategy monoDevelopWordFindStrategy = new EmacsWordFindStrategy (false);
+		static IWordFindStrategy emacsWordFindStrategy = new EmacsWordFindStrategy (true);
+		static IWordFindStrategy sharpDevelopWordFindStrategy = new SharpDevelopWordFindStrategy ();
+		static IWordFindStrategy viWordFindStrategy = new Mono.TextEditor.Vi.ViWordFindStrategy ();
+
+		public override IWordFindStrategy WordFindStrategy {
+			get {
+				switch (DefaultSourceEditorOptions.Instance.WordFindStrategy) {
+				case MonoDevelop.Ide.Editor.WordFindStrategy.MonoDevelop:
+					return monoDevelopWordFindStrategy;
+				case MonoDevelop.Ide.Editor.WordFindStrategy.Emacs:
+					return emacsWordFindStrategy;
+				case MonoDevelop.Ide.Editor.WordFindStrategy.SharpDevelop:
+					return sharpDevelopWordFindStrategy;
+				case MonoDevelop.Ide.Editor.WordFindStrategy.Vim:
+					return viWordFindStrategy;
+				default:
+					throw new ArgumentOutOfRangeException ();
+				}
+			}
 			set {
-				throw new NotSupportedException ();
+				throw new NotImplementedException ();
 			}
 		}
-		
-		public string DefaultEolMarker {
-			get { return TextStylePolicy.GetEolMarker (CurrentPolicy.EolMarker); }
+
+		public override bool AllowTabsAfterNonTabs {
+			get {
+				return DefaultSourceEditorOptions.Instance.AllowTabsAfterNonTabs;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public int RulerColumn {
-			get { return CurrentPolicy.FileWidth; }
+		public override bool HighlightMatchingBracket {
+			get {
+				return DefaultSourceEditorOptions.Instance.HighlightMatchingBracket;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public int TabSize {
-			get { return CurrentPolicy.TabWidth; }
+		public override bool TabsToSpaces {
+			get {
+				return optionsCore.TabsToSpaces;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public bool TabsToSpaces {
-			get { return CurrentPolicy.TabsToSpaces; }
+		public override int IndentationSize {
+			get {
+				return optionsCore.IndentationSize;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public bool RemoveTrailingWhitespaces {
-			get { return CurrentPolicy.RemoveTrailingWhitespace; }
+		public override int TabSize {
+			get {
+				return optionsCore.TabSize;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public bool AllowTabsAfterNonTabs {
-			get { return !CurrentPolicy.NoTabsAfterNonTabs; }
+
+		public override bool ShowIconMargin {
+			get {
+				return optionsCore.ShowIconMargin;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public int IndentationSize {
-			get { return CurrentPolicy.IndentWidth; }
+		public override bool ShowLineNumberMargin {
+			get {
+				return optionsCore.ShowLineNumberMargin;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public string IndentationString {
-			get { return this.TabsToSpaces ? new string (' ', this.TabSize) : "\t"; }
-		}
-
-		#region ITextEditorOptions implementation
-
-		public bool CanResetZoom {
-			get { return DefaultSourceEditorOptions.Instance.CanResetZoom; }
-		}
-
-		public bool CanZoomIn {
-			get { return DefaultSourceEditorOptions.Instance.CanZoomIn; }
-		}
-
-		public bool CanZoomOut {
-			get { return DefaultSourceEditorOptions.Instance.CanZoomOut; }
-		}
-
-		public event EventHandler Changed {
-			add {
-				if (changed == null)
-					DefaultSourceEditorOptions.Instance.Changed += HandleDefaultsChanged;
-				changed += value;
+		public override bool ShowFoldMargin {
+			get {
+				return optionsCore.ShowFoldMargin;
 			}
-			remove {
-				changed -= value;
-				if (changed == null)
-					DefaultSourceEditorOptions.Instance.Changed -= HandleDefaultsChanged;
+			set {
+				throw new NotSupportedException ();
 			}
 		}
 
-		void HandleDefaultsChanged (object sender, EventArgs e)
-		{
-			if (changed != null)
-				changed (this, EventArgs.Empty);
-		}
-
-		public string ColorScheme {
-			get { return DefaultSourceEditorOptions.Instance.ColorScheme; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool EnableSyntaxHighlighting {
-			get { return DefaultSourceEditorOptions.Instance.EnableSyntaxHighlighting; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public Pango.FontDescription Font {
-			get { return DefaultSourceEditorOptions.Instance.Font; }
-		}
-		
-		public string FontName {
-			get { return DefaultSourceEditorOptions.Instance.FontName; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public Pango.FontDescription GutterFont {
-			get { return DefaultSourceEditorOptions.Instance.GutterFont; }
-		}
-		
-		public string GutterFontName {
-			get { return DefaultSourceEditorOptions.Instance.GutterFontName; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public Mono.TextEditor.Highlighting.ColorScheme GetColorStyle ()
-		{
-			return DefaultSourceEditorOptions.Instance.GetColorStyle ();
-		}
-
-		public bool HighlightCaretLine {
-			get { return DefaultSourceEditorOptions.Instance.HighlightCaretLine; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool HighlightMatchingBracket {
-			get { return DefaultSourceEditorOptions.Instance.HighlightMatchingBracket; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool ShowFoldMargin {
-			get { return DefaultSourceEditorOptions.Instance.ShowFoldMargin; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool ShowIconMargin {
-			get { return DefaultSourceEditorOptions.Instance.ShowIconMargin; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool ShowLineNumberMargin {
-			get { return DefaultSourceEditorOptions.Instance.ShowLineNumberMargin; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool ShowRuler {
-			get { return DefaultSourceEditorOptions.Instance.ShowRuler; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool EnableAnimations {
-			get { return DefaultSourceEditorOptions.Instance.EnableAnimations; }
-			set { throw new NotSupportedException (); }
-		}
-		
-		public Mono.TextEditor.IWordFindStrategy WordFindStrategy {
-			get { return DefaultSourceEditorOptions.Instance.WordFindStrategy; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public double Zoom {
-			get { return DefaultSourceEditorOptions.Instance.Zoom; }
-			set { DefaultSourceEditorOptions.Instance.Zoom = value; }
-		}
-
-		public bool DrawIndentationMarkers {
-			get { return DefaultSourceEditorOptions.Instance.DrawIndentationMarkers; }
-			set { DefaultSourceEditorOptions.Instance.DrawIndentationMarkers = value; }
-		}
-
-		public ShowWhitespaces ShowWhitespaces  {
-			get { return DefaultSourceEditorOptions.Instance.ShowWhitespaces; }
-			set { DefaultSourceEditorOptions.Instance.ShowWhitespaces = value; }
-		}
-
-		public IncludeWhitespaces IncludeWhitespaces {
-			get { return DefaultSourceEditorOptions.Instance.IncludeWhitespaces; }
-			set { DefaultSourceEditorOptions.Instance.IncludeWhitespaces = value; }
-		}
-
-		public bool WrapLines {
-			get { return DefaultSourceEditorOptions.Instance.WrapLines; }
-			set { DefaultSourceEditorOptions.Instance.WrapLines = value; }
+		public override bool HighlightCaretLine {
+			get {
+				return optionsCore.HighlightCaretLine;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool EnableQuickDiff {
-			get { return DefaultSourceEditorOptions.Instance.EnableQuickDiff; }
-			set { DefaultSourceEditorOptions.Instance.EnableQuickDiff = value; }
+		public override int RulerColumn {
+			get {
+				return optionsCore.RulerColumn;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool GenerateFormattingUndoStep {
-			get { return DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep; }
-			set { DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep = value; }
+		public override bool ShowRuler {
+			get {
+				return optionsCore.ShowRuler;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public void ZoomIn ()
-		{
-			DefaultSourceEditorOptions.Instance.ZoomIn ();
+		public override Mono.TextEditor.IndentStyle IndentStyle {
+			get {
+				if (optionsCore.IndentStyle == MonoDevelop.Ide.Editor.IndentStyle.Smart && optionsCore.RemoveTrailingWhitespaces)
+					return Mono.TextEditor.IndentStyle.Virtual;
+				return (Mono.TextEditor.IndentStyle)optionsCore.IndentStyle;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public void ZoomOut ()
-		{
-			DefaultSourceEditorOptions.Instance.ZoomOut ();
+		public override bool OverrideDocumentEolMarker {
+			get {
+				return optionsCore.OverrideDocumentEolMarker;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public void ZoomReset ()
-		{
-			DefaultSourceEditorOptions.Instance.ZoomReset ();
+		public override bool EnableSyntaxHighlighting {
+			get {
+				return optionsCore.EnableSyntaxHighlighting;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		#endregion
-
-
-		#region ISourceEditorOptions implementation
-
-		public bool AutoInsertMatchingBracket {
-			get { return DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket; }
+		public override bool EnableAnimations {
+			get {
+				return DefaultSourceEditorOptions.Instance.HighlightMatchingBracket;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool DefaultCommentFolding {
-			get { return DefaultSourceEditorOptions.Instance.DefaultCommentFolding; }
+		public override bool EnableQuickDiff {
+			get {
+				return DefaultSourceEditorOptions.Instance.EnableQuickDiff;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool DefaultRegionsFolding {
-			get { return DefaultSourceEditorOptions.Instance.DefaultRegionsFolding; }
+		public override bool DrawIndentationMarkers {
+			get {
+				return DefaultSourceEditorOptions.Instance.DrawIndentationMarkers;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public EditorFontType EditorFontType {
-			get { return DefaultSourceEditorOptions.Instance.EditorFontType; }
+		public override bool WrapLines {
+			get {
+				return optionsCore.WrapLines;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool EnableAutoCodeCompletion {
-			get { return DefaultSourceEditorOptions.Instance.EnableAutoCodeCompletion; }
+		public override string FontName {
+			get {
+				return optionsCore.FontName;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool EnableSemanticHighlighting {
-			get { return DefaultSourceEditorOptions.Instance.EnableSemanticHighlighting; }
+		public override string GutterFontName {
+			get {
+				return optionsCore.GutterFontName;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public IndentStyle IndentStyle {
+		public override string ColorScheme {
 			get {
-				if ((DefaultSourceEditorOptions.Instance.IndentStyle == Mono.TextEditor.IndentStyle.Smart ||
-					DefaultSourceEditorOptions.Instance.IndentStyle == Mono.TextEditor.IndentStyle.Auto) && CurrentPolicy.RemoveTrailingWhitespace)
-					return IndentStyle.Virtual;
-				return DefaultSourceEditorOptions.Instance.IndentStyle;
+				return optionsCore.ColorScheme;
 			}
 			set {
-				throw new NotSupportedException ("Use property 'IndentStyle' instead.");
+				throw new NotSupportedException ();
 			}
 		}
 
-		public bool TabIsReindent {
-			get { return DefaultSourceEditorOptions.Instance.TabIsReindent; }
+		public override string DefaultEolMarker {
+			get {
+				return optionsCore.DefaultEolMarker;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool UnderlineErrors {
-			get { return DefaultSourceEditorOptions.Instance.UnderlineErrors; }
+		public override Mono.TextEditor.ShowWhitespaces ShowWhitespaces {
+			get {
+				return (Mono.TextEditor.ShowWhitespaces)optionsCore.ShowWhitespaces;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool UseViModes {
-			get { return DefaultSourceEditorOptions.Instance.UseViModes; }
+		public override Mono.TextEditor.IncludeWhitespaces IncludeWhitespaces {
+			get {
+				return (Mono.TextEditor.IncludeWhitespaces)optionsCore.IncludeWhitespaces;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool EnableSelectionWrappingKeys { 
-			get { return DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket; } 
+		public override bool GenerateFormattingUndoStep {
+			get {
+				return optionsCore.GenerateFormattingUndoStep;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-
 		#endregion
 
-		public void Dispose ()
-		{
-			mimeTypes = null;
-			if (policyContainer != null)
-				policyContainer.PolicyChanged -= HandlePolicyChanged;
-			if (changed != null) {
-				DefaultSourceEditorOptions.Instance.Changed -= HandleDefaultsChanged;
-				changed = null;
-			}
-		}
+
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeLoader.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeLoader.cs
new file mode 100644
index 0000000000..2f2e1c8f73
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeLoader.cs
@@ -0,0 +1,68 @@
+//
+// SyntaxModeLoader.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.IO;
+using Mono.Addins;
+using MonoDevelop.Ide.Editor.Highlighting;
+
+namespace MonoDevelop.SourceEditor
+{
+	static class SyntaxModeLoader
+	{
+		static bool initialized = false;
+
+		public static void Init ()
+		{
+			if (initialized)
+				return;
+			initialized = true;
+			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/SourceEditor2/SyntaxModes", OnSyntaxModeExtensionChanged);
+		}
+
+		static void OnSyntaxModeExtensionChanged (object s, ExtensionNodeEventArgs args)
+		{
+			TemplateCodon codon = (TemplateCodon)args.ExtensionNode;
+			if (args.Change == ExtensionChange.Add) {
+				Mono.TextEditor.Highlighting.SyntaxModeService.AddSyntaxMode (new StreamProviderWrapper(codon));
+			}
+		}
+
+		class StreamProviderWrapper : Mono.TextEditor.Highlighting.IStreamProvider
+		{
+			readonly TemplateCodon codon;
+
+			public StreamProviderWrapper (TemplateCodon codon)
+			{
+				this.codon = codon;
+			}
+
+			Stream Mono.TextEditor.Highlighting.IStreamProvider.Open ()
+			{
+				return codon.Open ();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeCodon.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/AsmLineMarker.cs
index f7339614c3..cd743619e6 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeCodon.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/AsmLineMarker.cs
@@ -1,21 +1,21 @@
-// 
-// SyntaxModeCodon.cs
-//  
+//
+// AsmLineMarker.cs
+//
 // Author:
-//   Mike Krüger <mkrueger@novell.com>
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
 //
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,30 +23,26 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
-using System;
+using Mono.TextEditor;
+using MonoDevelop.SourceEditor.Wrappers;
 using Mono.TextEditor.Highlighting;
-using Mono.Addins;
-
 
 namespace MonoDevelop.SourceEditor
 {
-	[ExtensionNode (Description="A syntax mode. The specified class must be a valid syntax mode.")]
-	class SyntaxModeCodon : TypeExtensionNode
+	class AsmLineMarker: TextLineMarker, MonoDevelop.Ide.Editor.ITextLineMarker
 	{
-		[NodeAttribute ("mimeTypes", true, "Mime types of the syntax mode.")]
-		string mimeTypes = null;
-		
-		public SyntaxMode SyntaxMode {
-			get {
-				return CreateInstance () as SyntaxMode;
-			}
+		public override ChunkStyle GetStyle (ChunkStyle baseStyle)
+		{
+			var st = new ChunkStyle (baseStyle);
+			st.Foreground = new Cairo.Color (125, 125, 125);
+			return st;
 		}
 
-		public string MimeTypes {
+		MonoDevelop.Ide.Editor.IDocumentLine MonoDevelop.Ide.Editor.ITextLineMarker.Line {
 			get {
-				return mimeTypes;
+				return new DocumentLineWrapper (LineSegment);
 			}
 		}
 	}
 }
+
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugTextMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/DebugTextMarker.cs
index 6bd1bcd4d8..d6e339ea03 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugTextMarker.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/DebugTextMarker.cs
@@ -28,19 +28,19 @@
 
 using System;
 using System.Linq;
-
 using Mono.TextEditor;
 using Mono.TextEditor.Highlighting;
-
+using MonoDevelop.SourceEditor.Wrappers;
 using MonoDevelop.Components;
 
 using Xwt.Drawing;
+using MonoDevelop.Debugger;
 
-namespace MonoDevelop.Debugger
+namespace MonoDevelop.SourceEditor
 {
-	public abstract class DebugTextMarker : MarginMarker
+	abstract class DebugTextMarker : MarginMarker
 	{
-		protected DebugTextMarker (TextEditor editor)
+		protected DebugTextMarker (MonoTextEditor editor)
 		{
 			Editor = editor;
 		}
@@ -60,7 +60,7 @@ namespace MonoDevelop.Debugger
 			return color.Color;
 		}
 
-		protected TextEditor Editor {
+		protected MonoTextEditor Editor {
 			get; private set;
 		}
 
@@ -74,7 +74,7 @@ namespace MonoDevelop.Debugger
 			return margin is IconMargin;
 		}
 
-		public override bool DrawBackground (TextEditor editor, Cairo.Context cr, double y, LineMetrics metrics)
+		public override bool DrawBackground (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics)
 		{
 			// check, if a message bubble is active in that line.
 			if (LineSegment != null && LineSegment.Markers.Any (m => m != this && (m is IExtendingTextLineMarker)))
@@ -82,7 +82,7 @@ namespace MonoDevelop.Debugger
 
 			var sidePadding = 4;
 			var rounding = editor.LineHeight / 2 - 1;
-
+			var y = metrics.LineYRenderStartPosition;
 			var d = metrics.TextRenderEndPosition - metrics.TextRenderStartPosition;
 			if (d > 0) {
 				cr.LineWidth = 1;
@@ -93,10 +93,10 @@ namespace MonoDevelop.Debugger
 				cr.Stroke ();
 			}
 
-			return base.DrawBackground (editor, cr, y, metrics);
+			return base.DrawBackground (editor, cr, metrics);
 		}
 
-		public override void DrawForeground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		public override void DrawForeground (MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 			double size = metrics.Margin.Width;
 			double borderLineWidth = cr.LineWidth;
@@ -136,12 +136,12 @@ namespace MonoDevelop.Debugger
 		}
 	}
 
-	public class BreakpointTextMarker : DebugTextMarker
+	class BreakpointTextMarker : DebugTextMarker
 	{
-		static readonly Image breakpoint = Image.FromResource ("gutter-breakpoint-15.png");
-		static readonly Image tracepoint = Image.FromResource ("gutter-tracepoint-15.png");
+		static readonly Image breakpoint = Image.FromResource (typeof(BreakpointPad), "gutter-breakpoint-15.png");
+		static readonly Image tracepoint = Image.FromResource (typeof(BreakpointPad), "gutter-tracepoint-15.png");
 
-		public BreakpointTextMarker (TextEditor editor, bool tracepoint) : base (editor)
+		public BreakpointTextMarker (MonoTextEditor editor, bool tracepoint) : base (editor)
 		{
 			IsTracepoint = tracepoint;
 		}
@@ -169,12 +169,12 @@ namespace MonoDevelop.Debugger
 		}
 	}
 
-	public class DisabledBreakpointTextMarker : DebugTextMarker
+	class DisabledBreakpointTextMarker : DebugTextMarker
 	{
-		static readonly Image breakpoint = Image.FromResource ("gutter-breakpoint-disabled-15.png");
-		static readonly Image tracepoint = Image.FromResource ("gutter-tracepoint-disabled-15.png");
+		static readonly Image breakpoint = Image.FromResource (typeof(BreakpointPad), "gutter-breakpoint-disabled-15.png");
+		static readonly Image tracepoint = Image.FromResource (typeof(BreakpointPad), "gutter-tracepoint-disabled-15.png");
 
-		public DisabledBreakpointTextMarker (TextEditor editor, bool tracepoint) : base (editor)
+		public DisabledBreakpointTextMarker (MonoTextEditor editor, bool tracepoint) : base (editor)
 		{
 			IsTracepoint = tracepoint;
 		}
@@ -197,12 +197,12 @@ namespace MonoDevelop.Debugger
 		}
 	}
 
-	public class InvalidBreakpointTextMarker : DebugTextMarker
+	class InvalidBreakpointTextMarker : DebugTextMarker
 	{
-		static readonly Image breakpoint = Image.FromResource ("gutter-breakpoint-invalid-15.png");
-		static readonly Image tracepoint = Image.FromResource ("gutter-tracepoint-invalid-15.png");
+		static readonly Image breakpoint = Image.FromResource (typeof(BreakpointPad), "gutter-breakpoint-invalid-15.png");
+		static readonly Image tracepoint = Image.FromResource (typeof(BreakpointPad), "gutter-tracepoint-invalid-15.png");
 
-		public InvalidBreakpointTextMarker (TextEditor editor, bool tracepoint) : base (editor)
+		public InvalidBreakpointTextMarker (MonoTextEditor editor, bool tracepoint) : base (editor)
 		{
 			IsTracepoint = tracepoint;
 		}
@@ -225,11 +225,11 @@ namespace MonoDevelop.Debugger
 		}
 	}
 
-	public class CurrentDebugLineTextMarker : DebugTextMarker
+	class CurrentDebugLineTextMarker : DebugTextMarker, MonoDevelop.Ide.Editor.ICurrentDebugLineTextMarker
 	{
-		static readonly Image currentLine = Image.FromResource ("gutter-execution-15.png");
+		static readonly Image currentLine = Image.FromResource (typeof(BreakpointPad), "gutter-execution-15.png");
 
-		public CurrentDebugLineTextMarker (TextEditor editor) : base (editor)
+		public CurrentDebugLineTextMarker (MonoTextEditor editor) : base (editor)
 		{
 		}
 
@@ -250,13 +250,19 @@ namespace MonoDevelop.Debugger
 		{
 			DrawImage (cr, currentLine, x, y, size);
 		}
+
+		MonoDevelop.Ide.Editor.IDocumentLine MonoDevelop.Ide.Editor.ITextLineMarker.Line {
+			get {
+				return new DocumentLineWrapper (base.LineSegment);
+			}
+		}
 	}
 
-	public class DebugStackLineTextMarker : DebugTextMarker
+	class DebugStackLineTextMarker : DebugTextMarker
 	{
-		static readonly Image stackLine = Image.FromResource ("gutter-stack-15.png");
+		static readonly Image stackLine = Image.FromResource (typeof(BreakpointPad), "gutter-stack-15.png");
 
-		public DebugStackLineTextMarker (TextEditor editor) : base (editor)
+		public DebugStackLineTextMarker (MonoTextEditor editor) : base (editor)
 		{
 		}
 
@@ -278,4 +284,5 @@ namespace MonoDevelop.Debugger
 			DrawImage (cr, stackLine, x, y, size);
 		}
 	}
+
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/ErrorMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/ErrorMarker.cs
new file mode 100644
index 0000000000..19067b2026
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/ErrorMarker.cs
@@ -0,0 +1,81 @@
+//
+// ErrorMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.SourceEditor
+{
+	class ErrorMarker : UnderlineTextSegmentMarker, IErrorMarker
+	{
+		readonly static Cairo.Color defaultColor = new Cairo.Color(0, 0, 0);
+
+		readonly Error info;
+
+		public ErrorMarker (Error info, int offset, int length) : base (defaultColor, new TextSegment (offset, length))
+		{
+			this.info = info;
+			this.Wave = true;
+		}
+
+		public override void Draw (Mono.TextEditor.MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+			Color = info.ErrorType == ErrorType.Warning ? editor.ColorStyle.UnderlineWarning.Color : editor.ColorStyle.UnderlineError.Color;
+			base.Draw (editor, cr, metrics, startOffset, endOffset);
+		}
+
+		event EventHandler<TextMarkerMouseEventArgs> ITextSegmentMarker.MousePressed {
+			add {
+				throw new NotImplementedException ();
+			}
+			remove {
+				throw new NotImplementedException ();
+			}
+		}
+
+		event EventHandler<TextMarkerMouseEventArgs> ITextSegmentMarker.MouseHover {
+			add {
+				throw new NotImplementedException ();
+			}
+			remove {
+				throw new NotImplementedException ();
+			}
+		}
+
+		object ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+
+		public Error Error {
+			get {
+				return info;
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/GrayOutMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/GrayOutMarker.cs
new file mode 100644
index 0000000000..4e5dcd4d56
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/GrayOutMarker.cs
@@ -0,0 +1,123 @@
+//
+// GrayOutMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Mono.TextEditor;
+using System.Collections.Generic;
+using MonoDevelop.Components;
+
+namespace MonoDevelop.SourceEditor
+{
+	class GrayOutMarker : UnderlineTextSegmentMarker, IChunkMarker, MonoDevelop.Ide.Editor.IGenericTextSegmentMarker
+	{
+		public GrayOutMarker (TextSegment segment) : base ("", segment)
+		{
+		}
+
+		public override void Draw (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+			// nothing (is drawn using chunk marker)
+		}
+
+		#region IChunkMarker implementation
+
+		void IChunkMarker.TransformChunks (List<Chunk> chunks)
+		{
+			int markerStart = Segment.Offset;
+			int markerEnd = Segment.EndOffset;
+			for (int i = 0; i < chunks.Count; i++) {
+				var chunk = chunks [i];
+				if (chunk.EndOffset < markerStart || markerEnd <= chunk.Offset) 
+					continue;
+				if (chunk.Offset == markerStart && chunk.EndOffset == markerEnd)
+					return;
+				if (chunk.Offset < markerStart && chunk.EndOffset > markerEnd) {
+					var newChunk = new Chunk (chunk.Offset, markerStart - chunk.Offset, chunk.Style);
+					chunks.Insert (i, newChunk);
+					chunk.Offset += newChunk.Length;
+					chunk.Length -= newChunk.Length;
+					continue;
+				}
+			}
+		}
+
+		void IChunkMarker.ChangeForeColor (MonoTextEditor editor, Chunk chunk, ref Cairo.Color color)
+		{
+			if (Debugger.DebuggingService.IsDebugging)
+				return;
+			int markerStart = Segment.Offset;
+			int markerEnd = Segment.EndOffset;
+			if (chunk.EndOffset <= markerStart || markerEnd <= chunk.Offset) 
+				return;
+			var bgc = editor.ColorStyle.PlainText.Background;
+			double alpha = 0.6;
+			color = new Cairo.Color (
+				color.R * alpha + bgc.R * (1.0 - alpha),
+				color.G * alpha + bgc.G * (1.0 - alpha),
+				color.B * alpha + bgc.B * (1.0 - alpha)
+			);
+		}
+		#endregion
+
+		event EventHandler<MonoDevelop.Ide.Editor.TextMarkerMouseEventArgs> MonoDevelop.Ide.Editor.ITextSegmentMarker.MousePressed {
+			add {
+				throw new NotSupportedException ();
+			}
+			remove {
+				throw new NotSupportedException ();
+			}
+		}
+
+		event EventHandler<MonoDevelop.Ide.Editor.TextMarkerMouseEventArgs> MonoDevelop.Ide.Editor.ITextSegmentMarker.MouseHover {
+			add {
+				throw new NotSupportedException ();
+			}
+			remove {
+				throw new NotSupportedException ();
+			}
+		}
+
+		object MonoDevelop.Ide.Editor.ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+
+		MonoDevelop.Ide.Editor.TextSegmentMarkerEffect MonoDevelop.Ide.Editor.IGenericTextSegmentMarker.Effect {
+			get {
+				return MonoDevelop.Ide.Editor.TextSegmentMarkerEffect.GrayOut;
+			}
+		}
+
+		HslColor MonoDevelop.Ide.Editor.IGenericTextSegmentMarker.Color {
+			get {
+				throw new NotSupportedException ();
+			}
+			set {
+				throw new NotSupportedException ();
+			}
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/LinkMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/LinkMarker.cs
new file mode 100644
index 0000000000..93cbd06d87
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/LinkMarker.cs
@@ -0,0 +1,66 @@
+//
+// LinkMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using Mono.TextEditor;
+
+namespace MonoDevelop.SourceEditor
+{
+	class LinkMarker : Mono.TextEditor.UnderlineTextSegmentMarker, ITextSegmentMarker
+	{
+		static readonly Cairo.Color linkColor = new Cairo.Color (0, 0, 1.0);
+		Action<LinkRequest> activateLink;
+
+		public LinkMarker (int offset, int length, Action<LinkRequest> activateLink) : base (linkColor, new TextSegment (offset, length))
+		{
+			this.activateLink = activateLink;
+			this.Wave = false;
+		}
+
+		event EventHandler<TextMarkerMouseEventArgs> ITextSegmentMarker.MousePressed {
+			add {
+				throw new NotImplementedException ();
+			}
+			remove {
+				throw new NotImplementedException ();
+			}
+		}
+		event EventHandler<TextMarkerMouseEventArgs> ITextSegmentMarker.MouseHover {
+			add {
+				throw new NotImplementedException ();
+			}
+			remove {
+				throw new NotImplementedException ();
+			}
+		}
+
+		object ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs
new file mode 100644
index 0000000000..f327dc895d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs
@@ -0,0 +1,150 @@
+//
+// SmartTagMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.SourceEditor
+{
+	class SmartTagMarker : TextSegmentMarker, IActionTextLineMarker, ISmartTagMarker
+	{
+		const double tagMarkerWidth = 8;
+		const double tagMarkerHeight = 2;
+		MonoDevelop.Ide.Editor.DocumentLocation loc;
+		Mono.TextEditor.MonoTextEditor editor;
+
+		public SmartTagMarker (int offset, MonoDevelop.Ide.Editor.DocumentLocation realLocation) : base (offset, 0)
+		{
+			this.loc = realLocation;
+		}
+
+		public override void Draw (Mono.TextEditor.MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+			this.editor = editor;
+			var line = editor.GetLine (loc.Line);
+			if (line == null)
+				return;
+			var x = editor.ColumnToX (line, loc.Column) - editor.HAdjustment.Value + editor.TextViewMargin.XOffset + editor.TextViewMargin.TextStartPosition;
+
+			cr.Rectangle (Math.Floor (x) + 0.5, Math.Floor (metrics.LineYRenderStartPosition) + 0.5 + (line == editor.GetLineByOffset (startOffset) ? editor.LineHeight - tagMarkerHeight - 1 : 0), tagMarkerWidth * cr.LineWidth, tagMarkerHeight * cr.LineWidth);
+
+			if (HslColor.Brightness (editor.ColorStyle.PlainText.Background) < 0.5) {
+				cr.SetSourceRGBA (0.8, 0.8, 1, 0.9);
+			} else {
+				cr.SetSourceRGBA (0.2, 0.2, 1, 0.9);
+			}
+			cr.Stroke ();
+		}
+
+		#region IActionTextLineMarker implementation
+		class TextEventArgsWrapper : TextMarkerMouseEventArgs
+		{
+			readonly MarginMouseEventArgs args;
+
+			public override double X {
+				get {
+					return args.X;
+				}
+			}
+
+			public override double Y {
+				get {
+					return args.Y;
+				}
+			}
+
+			public override object OverwriteCursor {
+				get;
+				set;
+			}
+
+			public override string TooltipMarkup {
+				get;
+				set;
+			}
+
+			public TextEventArgsWrapper (MarginMouseEventArgs args)
+			{
+				if (args == null)
+					throw new ArgumentNullException ("args");
+				this.args = args;
+			}
+
+			public override bool TriggersContextMenu ()
+			{
+				return args.TriggersContextMenu ();
+			}
+		}
+
+		bool IActionTextLineMarker.MousePressed (Mono.TextEditor.MonoTextEditor editor, MarginMouseEventArgs args)
+		{
+			var handler = MousePressed;
+			if (handler != null)
+				handler (this, new TextEventArgsWrapper (args));
+			return false;
+		}
+
+		void IActionTextLineMarker.MouseHover (Mono.TextEditor.MonoTextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result)
+		{
+			if (args.Button != 0)
+				return;
+			var handler = MouseHover;
+			if (handler != null)
+				handler (this, new TextEventArgsWrapper (args));
+		}
+
+		#endregion
+
+		bool ISmartTagMarker.IsInsideSmartTag (double x, double y)
+		{
+			if (editor == null)
+				return false;
+			var lin2 = editor.GetLine (loc.Line);
+			var x2 = editor.ColumnToX (lin2, loc.Column) - editor.HAdjustment.Value + editor.TextViewMargin.TextStartPosition;
+			var y2 = editor.LineToY (loc.Line + 1) - editor.VAdjustment.Value;
+			return x - x2 >= 0 * editor.Options.Zoom && 
+				x - x2 < tagMarkerWidth * editor.Options.Zoom && 
+				y - y2 < (editor.LineHeight / 2) * editor.Options.Zoom;
+		}
+
+		bool ISmartTagMarker.IsInsideWindow (Gtk.MotionNotifyEventArgs args)
+		{
+			if (editor == null)
+				return false;
+			return args.Event.Window == editor.TextArea.GdkWindow;
+		}
+
+		public event EventHandler<TextMarkerMouseEventArgs> MousePressed;
+		public event EventHandler<TextMarkerMouseEventArgs> MouseHover;
+
+		object ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UnitTestMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UnitTestMarker.cs
new file mode 100644
index 0000000000..49c242cde9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UnitTestMarker.cs
@@ -0,0 +1,136 @@
+using System;
+using MonoDevelop.Ide.Editor;
+using Mono.TextEditor;
+using MonoDevelop.Core;
+using MonoDevelop.Components;
+using MonoDevelop.SourceEditor.Wrappers;
+
+namespace MonoDevelop.SourceEditor
+{
+	class UnitTestMarker : MarginMarker, IUnitTestMarker
+	{
+		IDocumentLine ITextLineMarker.Line {
+			get {
+				return new DocumentLineWrapper (LineSegment);
+			}
+		}
+
+		readonly UnitTestMarkerHost host;
+		readonly UnitTestLocation unitTest;
+		readonly ExtensibleTextEditor textEditor;
+
+		UnitTestLocation IUnitTestMarker.UnitTest {
+			get {
+				return unitTest;
+			}
+		}
+
+		void IUnitTestMarker.UpdateState ()
+		{
+			var line = LineSegment;
+			if (line == null)
+				return;
+			textEditor.RedrawMarginLine (textEditor.ActionMargin, line.LineNumber); 
+		}
+
+		public UnitTestMarker (ExtensibleTextEditor textEditor, UnitTestMarkerHost host, UnitTestLocation unitTest)
+		{
+			if (textEditor == null)
+				throw new ArgumentNullException ("textEditor");
+			if (host == null)
+				throw new ArgumentNullException ("host");
+			this.textEditor = textEditor;
+			this.host = host;
+			this.unitTest = unitTest;
+		}
+
+		public override bool CanDrawForeground (Margin margin)
+		{
+			return margin is ActionMargin;
+		}
+
+		public override void InformMouseHover (Mono.TextEditor.MonoTextEditor editor, Margin margin, MarginMouseEventArgs args)
+		{
+			if (!(margin is ActionMargin))
+				return;
+			string toolTip;
+			if (unitTest.IsFixture) {
+				if (isFailed) {
+					toolTip = GettextCatalog.GetString ("NUnit Fixture failed (click to run)");
+					if (!string.IsNullOrEmpty (failMessage))
+						toolTip += Environment.NewLine + failMessage.TrimEnd ();
+				} else {
+					toolTip = GettextCatalog.GetString ("NUnit Fixture (click to run)");
+				}
+			} else {
+				if (isFailed) {
+					toolTip = GettextCatalog.GetString ("NUnit Test failed (click to run)");
+					if (!string.IsNullOrEmpty (failMessage))
+						toolTip += Environment.NewLine + failMessage.TrimEnd ();
+					foreach (var id in unitTest.TestCases) {
+						if (host.IsFailure (unitTest.UnitTestIdentifier, id)) {
+							var msg = host.GetMessage (unitTest.UnitTestIdentifier, id);
+							if (!string.IsNullOrEmpty (msg)) {
+								toolTip += Environment.NewLine + "Test" + id + ":";
+								toolTip += Environment.NewLine + msg.TrimEnd ();
+							}
+						}
+					}
+				} else {
+					toolTip = GettextCatalog.GetString ("NUnit Test (click to run)");
+				}
+
+			}
+			editor.TooltipText = toolTip;
+		}
+
+//		static Menu menu;
+
+		public override void InformMousePress (Mono.TextEditor.MonoTextEditor editor, Margin margin, MarginMouseEventArgs args)
+		{
+			if (!(margin is ActionMargin))
+				return;
+			host.PopupContextMenu (unitTest, (int)args.X, (int)args.Y);
+			editor.TextArea.ResetMouseState (); 
+		}
+
+		bool isFailed;
+		string failMessage;
+
+		public override void DrawForeground (Mono.TextEditor.MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		{
+			isFailed = false;
+			bool searchCases = false;
+
+			Xwt.Drawing.Image icon = host.GetStatusIcon (unitTest.UnitTestIdentifier);
+			if (icon != null) {
+				if (host.HasResult (unitTest.UnitTestIdentifier)) {
+					searchCases = true;
+				} else if (host.IsFailure (unitTest.UnitTestIdentifier)) {
+					failMessage = host.GetMessage (unitTest.UnitTestIdentifier);
+					isFailed = true;
+				}
+			} else {
+				searchCases = true;
+			}
+
+			if (searchCases) {
+				foreach (var caseId in unitTest.TestCases) {
+					icon = host.GetStatusIcon (unitTest.UnitTestIdentifier, caseId);
+					if (host.IsFailure (unitTest.UnitTestIdentifier, caseId)) {
+						failMessage = host.GetMessage (unitTest.UnitTestIdentifier, caseId);
+						isFailed = true;
+						break;
+					} 
+				}
+			}
+
+			if (icon != null) {
+				if (icon.Width > metrics.Width || icon.Height > metrics.Height)
+					icon = icon.WithBoxSize (metrics.Width, metrics.Height);
+				cr.DrawImage (editor, icon, Math.Truncate (metrics.X + metrics.Width / 2 - icon.Width / 2), Math.Truncate (metrics.Y + metrics.Height / 2 - icon.Height / 2));
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UrlTextLineMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UrlTextLineMarker.cs
new file mode 100644
index 0000000000..00e8ccfed0
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UrlTextLineMarker.cs
@@ -0,0 +1,56 @@
+//
+// UrlTextLineMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.SourceEditor
+{
+	class UrlTextLineMarker : UrlMarker, IUrlTextLineMarker
+    {
+		readonly IDocumentLine line;
+
+		public UrlTextLineMarker (TextDocument doc, IDocumentLine line, string url, Mono.TextEditor.UrlType urlType, string style, int startColumn, int endColumn) : base (doc, doc.GetLine (line.LineNumber), url, urlType, style, startColumn, endColumn)
+		{
+			if (doc == null)
+				throw new ArgumentNullException ("doc");
+			this.line = line;
+		}
+		
+		MonoDevelop.Ide.Editor.UrlType IUrlTextLineMarker.UrlType {
+			get {
+				return (MonoDevelop.Ide.Editor.UrlType)UrlType;
+			}
+		}
+
+		IDocumentLine ITextLineMarker.Line {
+			get {
+				return line;
+			}
+		}
+    }
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UsageSegmentMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UsageSegmentMarker.cs
new file mode 100644
index 0000000000..bdd4c7c59d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UsageSegmentMarker.cs
@@ -0,0 +1,102 @@
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.FindInFiles;
+using Cairo;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.SourceEditor
+{
+	class UsageSegmentMarker : TextSegmentMarker, ITextSegmentMarker
+	{
+		readonly Usage usage;
+
+		public Usage Usage {
+			get {
+				return usage;
+			}
+		}
+
+		public UsageSegmentMarker (Usage usage) : base (usage.Offset, usage.Length)
+		{
+			this.usage = usage;
+		}
+
+		event EventHandler<TextMarkerMouseEventArgs> ITextSegmentMarker.MousePressed {
+			add {
+			}
+			remove {
+			}
+		}
+
+		event EventHandler<TextMarkerMouseEventArgs> ITextSegmentMarker.MouseHover {
+			add {
+			}
+			remove {
+			}
+		}
+
+		object ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+
+		public override void DrawBackground (Mono.TextEditor.MonoTextEditor editor, Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+			int markerStart = usage.Offset;
+			int markerEnd = usage.EndOffset;
+
+			if (markerEnd < startOffset || markerStart > endOffset) 
+				return; 
+
+			double @from;
+			double to;
+			var startXPos = metrics.TextRenderStartPosition;
+			var endXPos = metrics.TextRenderEndPosition;
+			var y = metrics.LineYRenderStartPosition;
+			if (markerStart < startOffset && endOffset < markerEnd) {
+				@from = startXPos;
+				to = endXPos;
+			} else {
+				int start = startOffset < markerStart ? markerStart : startOffset;
+				int end = endOffset < markerEnd ? endOffset : markerEnd;
+
+				uint curIndex = 0, byteIndex = 0;
+				TextViewMargin.TranslateToUTF8Index (metrics.Layout.LineChars, (uint)(start - startOffset), ref curIndex, ref byteIndex);
+
+				int x_pos = metrics.Layout.Layout.IndexToPos ((int)byteIndex).X;
+
+				@from = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+
+				TextViewMargin.TranslateToUTF8Index (metrics.Layout.LineChars, (uint)(end - startOffset), ref curIndex, ref byteIndex);
+				x_pos = metrics.Layout.Layout.IndexToPos ((int)byteIndex).X;
+
+				to = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+			}
+
+			@from = Math.Max (@from, editor.TextViewMargin.XOffset);
+			to = Math.Max (to, editor.TextViewMargin.XOffset);
+			if (@from < to) {
+				Mono.TextEditor.Highlighting.AmbientColor colorStyle;
+				if ((usage.UsageType & ReferenceUsageType.Write) == ReferenceUsageType.Write ||
+					(usage.UsageType & ReferenceUsageType.Declariton) == ReferenceUsageType.Declariton) {
+					colorStyle = editor.ColorStyle.ChangingUsagesRectangle;
+				} else {
+					colorStyle = editor.ColorStyle.UsagesRectangle;
+				}
+
+				using (var lg = new LinearGradient (@from + 1, y + 1, to , y + editor.LineHeight)) {
+					lg.AddColorStop (0, colorStyle.Color);
+					lg.AddColorStop (1, colorStyle.SecondColor);
+					cr.SetSource (lg);
+					cr.RoundedRectangle (@from + 0.5, y + 1.5, to - @from - 1, editor.LineHeight - 2, editor.LineHeight / 4);
+					cr.FillPreserve ();
+				}
+
+				cr.SetSourceColor (colorStyle.BorderColor);
+				cr.Stroke ();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/WavedLineMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/WavedLineMarker.cs
new file mode 100644
index 0000000000..fdd11c9729
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/WavedLineMarker.cs
@@ -0,0 +1,133 @@
+//
+// WavedLineMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Components;
+using MonoDevelop.Debugger;
+using Pango;
+
+namespace MonoDevelop.SourceEditor
+{
+	class GenericUnderlineMarker : UnderlineTextSegmentMarker, MonoDevelop.Ide.Editor.IGenericTextSegmentMarker
+	{
+		HslColor color;
+
+		HslColor MonoDevelop.Ide.Editor.IGenericTextSegmentMarker.Color {
+			get {
+				return color;
+			}
+			set {
+				color = value;
+			}
+		}
+
+		public GenericUnderlineMarker (TextSegment segment, MonoDevelop.Ide.Editor.TextSegmentMarkerEffect effect) : base ("", segment)
+		{
+			this.effect = effect;
+		}
+
+		public override void Draw (MonoTextEditor editor, Cairo.Context cr, LineMetrics layout, int startOffset, int endOffset)
+		{
+			if (DebuggingService.IsDebugging)
+				return;
+			int markerStart = Segment.Offset;
+			int markerEnd = Segment.EndOffset;
+			if (markerEnd < startOffset || markerStart > endOffset) 
+				return;
+			
+			double drawFrom;
+			double drawTo;
+			double y = layout.LineYRenderStartPosition;
+			double startXPos = layout.TextRenderStartPosition;
+			double endXPos = layout.TextRenderEndPosition;
+
+			if (markerStart < startOffset && endOffset < markerEnd) {
+				drawTo = endXPos;
+				var line = editor.GetLineByOffset (startOffset);
+				int offset = line.GetIndentation (editor.Document).Length;
+				drawFrom = startXPos + (layout.Layout.Layout.IndexToPos (offset).X  / Pango.Scale.PangoScale);
+			} else {
+				int start;
+				if (startOffset < markerStart) {
+					start = markerStart;
+				} else {
+					var line = editor.GetLineByOffset (startOffset);
+					int offset = line.GetIndentation (editor.Document).Length;
+					start = startOffset + offset;
+				}
+				int end = endOffset < markerEnd ? endOffset : markerEnd;
+				int x_pos;
+
+				x_pos = layout.Layout.Layout.IndexToPos (start - startOffset).X;
+				drawFrom = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+				x_pos = layout.Layout.Layout.IndexToPos (end - startOffset).X;
+	
+				drawTo = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+			}
+			
+			drawFrom = Math.Max (drawFrom, editor.TextViewMargin.XOffset);
+			drawTo = Math.Max (drawTo, editor.TextViewMargin.XOffset);
+			if (drawFrom >= drawTo)
+				return;
+			
+			double height = editor.LineHeight / 5;
+			cr.SetSourceColor (color);
+			if (effect == MonoDevelop.Ide.Editor.TextSegmentMarkerEffect.WavedLine) {	
+				Pango.CairoHelper.ShowErrorUnderline (cr, drawFrom, y + editor.LineHeight - height, drawTo - drawFrom, height);
+			} else if (effect == MonoDevelop.Ide.Editor.TextSegmentMarkerEffect.DottedLine) {
+				cr.Save ();
+				cr.LineWidth = 1;
+				cr.MoveTo (drawFrom + 1, y + editor.LineHeight - 1 + 0.5);
+				cr.RelLineTo (Math.Min (drawTo - drawFrom, 4 * 3), 0);
+				cr.SetDash (new double[] { 2, 2 }, 0);
+				cr.Stroke ();
+				cr.Restore ();
+			} else {
+				cr.MoveTo (drawFrom, y + editor.LineHeight - 1);
+				cr.LineTo (drawTo, y + editor.LineHeight - 1);
+				cr.Stroke ();
+			}
+		}
+
+		public event EventHandler<MonoDevelop.Ide.Editor.TextMarkerMouseEventArgs> MousePressed;
+
+		public event EventHandler<MonoDevelop.Ide.Editor.TextMarkerMouseEventArgs> MouseHover;
+
+		object MonoDevelop.Ide.Editor.ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+
+		MonoDevelop.Ide.Editor.TextSegmentMarkerEffect effect;
+		MonoDevelop.Ide.Editor.TextSegmentMarkerEffect MonoDevelop.Ide.Editor.IGenericTextSegmentMarker.Effect {
+			get {
+				return effect;
+			}
+		}
+
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs
index 1b7c8e870b..1047bb7150 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs
@@ -2,86 +2,92 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.SourceEditor
 {
-	partial class GotoLineNumberWidget
+	public partial class GotoLineNumberWidget
 	{
 		private global::Gtk.HBox hbox1;
+
 		private global::Gtk.Entry entryLineNumber;
+
 		private global::Gtk.Button buttonGoToLine;
+
 		private global::Gtk.EventBox eventbox2;
+
 		private global::Gtk.Image image2;
+
 		private global::Gtk.Button closeButton;
+
 		private global::Gtk.EventBox eventbox1;
+
 		private global::Gtk.Image image1;
-		
-		protected virtual void Build ()
+
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.GotoLineNumberWidget
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.GotoLineNumberWidget";
 			// Container child MonoDevelop.SourceEditor.GotoLineNumberWidget.Gtk.Container+ContainerChild
-			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1 = new global::Gtk.HBox();
 			this.hbox1.Name = "hbox1";
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.entryLineNumber = new global::Gtk.Entry ();
+			this.entryLineNumber = new global::Gtk.Entry();
 			this.entryLineNumber.CanFocus = true;
 			this.entryLineNumber.Name = "entryLineNumber";
 			this.entryLineNumber.IsEditable = true;
 			this.entryLineNumber.InvisibleChar = '●';
-			this.hbox1.Add (this.entryLineNumber);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryLineNumber]));
+			this.hbox1.Add(this.entryLineNumber);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.entryLineNumber]));
 			w1.Position = 0;
 			w1.Expand = false;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.buttonGoToLine = new global::Gtk.Button ();
+			this.buttonGoToLine = new global::Gtk.Button();
 			this.buttonGoToLine.CanDefault = true;
 			this.buttonGoToLine.CanFocus = true;
 			this.buttonGoToLine.Name = "buttonGoToLine";
 			this.buttonGoToLine.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonGoToLine.Gtk.Container+ContainerChild
-			this.eventbox2 = new global::Gtk.EventBox ();
+			this.eventbox2 = new global::Gtk.EventBox();
 			this.eventbox2.Name = "eventbox2";
 			this.eventbox2.AboveChild = true;
 			this.eventbox2.VisibleWindow = false;
 			// Container child eventbox2.Gtk.Container+ContainerChild
-			this.image2 = new global::Gtk.Image ();
+			this.image2 = new global::Gtk.Image();
 			this.image2.Name = "image2";
-			this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-jump-to", global::Gtk.IconSize.Menu);
-			this.eventbox2.Add (this.image2);
-			this.buttonGoToLine.Add (this.eventbox2);
-			this.buttonGoToLine.Label = null;
-			this.hbox1.Add (this.buttonGoToLine);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonGoToLine]));
+			this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-jump-to", global::Gtk.IconSize.Menu);
+			this.eventbox2.Add(this.image2);
+			this.buttonGoToLine.Add(this.eventbox2);
+			this.hbox1.Add(this.buttonGoToLine);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonGoToLine]));
 			w4.Position = 1;
 			w4.Expand = false;
 			w4.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.closeButton = new global::Gtk.Button ();
+			this.closeButton = new global::Gtk.Button();
 			this.closeButton.CanFocus = true;
 			this.closeButton.Name = "closeButton";
 			this.closeButton.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child closeButton.Gtk.Container+ContainerChild
-			this.eventbox1 = new global::Gtk.EventBox ();
+			this.eventbox1 = new global::Gtk.EventBox();
 			this.eventbox1.Name = "eventbox1";
 			this.eventbox1.AboveChild = true;
 			this.eventbox1.VisibleWindow = false;
 			// Container child eventbox1.Gtk.Container+ContainerChild
-			this.image1 = new global::Gtk.Image ();
+			this.image1 = new global::Gtk.Image();
 			this.image1.Name = "image1";
-			this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-close", global::Gtk.IconSize.Menu);
-			this.eventbox1.Add (this.image1);
-			this.closeButton.Add (this.eventbox1);
-			this.closeButton.Label = null;
-			this.hbox1.Add (this.closeButton);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.closeButton]));
+			this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-close", global::Gtk.IconSize.Menu);
+			this.eventbox1.Add(this.image1);
+			this.closeButton.Add(this.eventbox1);
+			this.hbox1.Add(this.closeButton);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.closeButton]));
 			w7.Position = 2;
 			w7.Expand = false;
 			w7.Fill = false;
-			this.Add (this.hbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.hbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs
index 0fab32c065..dfd5170cc2 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs
@@ -5,289 +5,315 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	public partial class BehaviorPanel
 	{
 		private global::Gtk.VBox vbox1;
+
 		private global::Gtk.Label GtkLabel5;
+
 		private global::Gtk.Alignment alignment3;
+
 		private global::Gtk.VBox vbox4;
+
 		private global::Gtk.CheckButton autoInsertBraceCheckbutton;
+
 		private global::Gtk.HBox hbox2;
+
 		private global::Gtk.Label fixed1;
+
 		private global::Gtk.CheckButton smartSemicolonPlaceCheckbutton;
+
 		private global::Gtk.CheckButton checkbuttonOnTheFlyFormatting;
+
 		private global::Gtk.CheckButton checkbuttonFormatOnSave;
+
 		private global::Gtk.CheckButton checkbuttonAutoSetSearchPatternCasing;
+
 		private global::Gtk.CheckButton checkbuttonGenerateFormattingUndoStep;
+
 		private global::Gtk.Label GtkLabel6;
+
 		private global::Gtk.Alignment GtkAlignment;
+
 		private global::Gtk.VBox vbox2;
+
 		private global::Gtk.HBox hbox1;
+
 		private global::Gtk.Label label1;
+
 		private global::Gtk.ComboBox indentationCombobox;
+
 		private global::Gtk.CheckButton tabAsReindentCheckbutton;
+
 		private global::Gtk.Label GtkLabel8;
+
 		private global::Gtk.Alignment alignment4;
+
 		private global::Gtk.VBox vbox5;
+
 		private global::Gtk.CheckButton useViModesCheck;
+
 		private global::Gtk.HBox hbox3;
+
 		private global::Gtk.Label label2;
+
 		private global::Gtk.ComboBox controlLeftRightCombobox;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel5 = new global::Gtk.Label ();
+			this.GtkLabel5 = new global::Gtk.Label();
 			this.GtkLabel5.Name = "GtkLabel5";
 			this.GtkLabel5.Xalign = 0F;
-			this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Automatic behaviors</b>");
+			this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Automatic behaviors</b>");
 			this.GtkLabel5.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel5);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel5]));
+			this.vbox1.Add(this.GtkLabel5);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel5]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment3.Name = "alignment3";
 			this.alignment3.LeftPadding = ((uint)(12));
 			// Container child alignment3.Gtk.Container+ContainerChild
-			this.vbox4 = new global::Gtk.VBox ();
+			this.vbox4 = new global::Gtk.VBox();
 			this.vbox4.Name = "vbox4";
 			this.vbox4.Spacing = 6;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.autoInsertBraceCheckbutton = new global::Gtk.CheckButton ();
+			this.autoInsertBraceCheckbutton = new global::Gtk.CheckButton();
 			this.autoInsertBraceCheckbutton.CanFocus = true;
 			this.autoInsertBraceCheckbutton.Name = "autoInsertBraceCheckbutton";
-			this.autoInsertBraceCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Insert matching brace");
+			this.autoInsertBraceCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Insert matching brace");
 			this.autoInsertBraceCheckbutton.DrawIndicator = true;
 			this.autoInsertBraceCheckbutton.UseUnderline = true;
-			this.vbox4.Add (this.autoInsertBraceCheckbutton);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.autoInsertBraceCheckbutton]));
+			this.vbox4.Add(this.autoInsertBraceCheckbutton);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.autoInsertBraceCheckbutton]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
+			this.hbox2 = new global::Gtk.HBox();
 			this.hbox2.Name = "hbox2";
 			this.hbox2.Spacing = 6;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.fixed1 = new global::Gtk.Label ();
+			this.fixed1 = new global::Gtk.Label();
 			this.fixed1.Name = "fixed1";
-			this.hbox2.Add (this.fixed1);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed1]));
+			this.hbox2.Add(this.fixed1);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.fixed1]));
 			w3.Position = 0;
 			w3.Expand = false;
 			w3.Fill = false;
 			w3.Padding = ((uint)(6));
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.smartSemicolonPlaceCheckbutton = new global::Gtk.CheckButton ();
+			this.smartSemicolonPlaceCheckbutton = new global::Gtk.CheckButton();
 			this.smartSemicolonPlaceCheckbutton.CanFocus = true;
 			this.smartSemicolonPlaceCheckbutton.Name = "smartSemicolonPlaceCheckbutton";
-			this.smartSemicolonPlaceCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Smart semicolon placement");
+			this.smartSemicolonPlaceCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Smart semicolon placement");
 			this.smartSemicolonPlaceCheckbutton.Active = true;
 			this.smartSemicolonPlaceCheckbutton.DrawIndicator = true;
 			this.smartSemicolonPlaceCheckbutton.UseUnderline = true;
-			this.hbox2.Add (this.smartSemicolonPlaceCheckbutton);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.smartSemicolonPlaceCheckbutton]));
+			this.hbox2.Add(this.smartSemicolonPlaceCheckbutton);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.smartSemicolonPlaceCheckbutton]));
 			w4.Position = 1;
-			this.vbox4.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox2]));
+			this.vbox4.Add(this.hbox2);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.hbox2]));
 			w5.Position = 1;
 			w5.Expand = false;
 			w5.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonOnTheFlyFormatting = new global::Gtk.CheckButton ();
+			this.checkbuttonOnTheFlyFormatting = new global::Gtk.CheckButton();
 			this.checkbuttonOnTheFlyFormatting.CanFocus = true;
 			this.checkbuttonOnTheFlyFormatting.Name = "checkbuttonOnTheFlyFormatting";
-			this.checkbuttonOnTheFlyFormatting.Label = global::Mono.Unix.Catalog.GetString ("_Enable on the fly code formatting");
+			this.checkbuttonOnTheFlyFormatting.Label = global::Mono.Unix.Catalog.GetString("_Enable on the fly code formatting");
 			this.checkbuttonOnTheFlyFormatting.DrawIndicator = true;
 			this.checkbuttonOnTheFlyFormatting.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonOnTheFlyFormatting);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonOnTheFlyFormatting]));
+			this.vbox4.Add(this.checkbuttonOnTheFlyFormatting);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonOnTheFlyFormatting]));
 			w6.Position = 2;
 			w6.Expand = false;
 			w6.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonFormatOnSave = new global::Gtk.CheckButton ();
+			this.checkbuttonFormatOnSave = new global::Gtk.CheckButton();
 			this.checkbuttonFormatOnSave.CanFocus = true;
 			this.checkbuttonFormatOnSave.Name = "checkbuttonFormatOnSave";
-			this.checkbuttonFormatOnSave.Label = global::Mono.Unix.Catalog.GetString ("_Format document on save");
+			this.checkbuttonFormatOnSave.Label = global::Mono.Unix.Catalog.GetString("_Format document on save");
 			this.checkbuttonFormatOnSave.DrawIndicator = true;
 			this.checkbuttonFormatOnSave.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonFormatOnSave);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonFormatOnSave]));
+			this.vbox4.Add(this.checkbuttonFormatOnSave);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonFormatOnSave]));
 			w7.Position = 3;
 			w7.Expand = false;
 			w7.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonAutoSetSearchPatternCasing = new global::Gtk.CheckButton ();
+			this.checkbuttonAutoSetSearchPatternCasing = new global::Gtk.CheckButton();
 			this.checkbuttonAutoSetSearchPatternCasing.CanFocus = true;
 			this.checkbuttonAutoSetSearchPatternCasing.Name = "checkbuttonAutoSetSearchPatternCasing";
-			this.checkbuttonAutoSetSearchPatternCasing.Label = global::Mono.Unix.Catalog.GetString ("_Automatically set search pattern case sensitivity");
+			this.checkbuttonAutoSetSearchPatternCasing.Label = global::Mono.Unix.Catalog.GetString("_Automatically set search pattern case sensitivity");
 			this.checkbuttonAutoSetSearchPatternCasing.DrawIndicator = true;
 			this.checkbuttonAutoSetSearchPatternCasing.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonAutoSetSearchPatternCasing);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonAutoSetSearchPatternCasing]));
+			this.vbox4.Add(this.checkbuttonAutoSetSearchPatternCasing);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonAutoSetSearchPatternCasing]));
 			w8.Position = 4;
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonGenerateFormattingUndoStep = new global::Gtk.CheckButton ();
+			this.checkbuttonGenerateFormattingUndoStep = new global::Gtk.CheckButton();
 			this.checkbuttonGenerateFormattingUndoStep.CanFocus = true;
 			this.checkbuttonGenerateFormattingUndoStep.Name = "checkbuttonGenerateFormattingUndoStep";
-			this.checkbuttonGenerateFormattingUndoStep.Label = global::Mono.Unix.Catalog.GetString ("_Generate additional undo steps for formatting");
+			this.checkbuttonGenerateFormattingUndoStep.Label = global::Mono.Unix.Catalog.GetString("_Generate additional undo steps for formatting");
 			this.checkbuttonGenerateFormattingUndoStep.DrawIndicator = true;
 			this.checkbuttonGenerateFormattingUndoStep.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonGenerateFormattingUndoStep);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonGenerateFormattingUndoStep]));
+			this.vbox4.Add(this.checkbuttonGenerateFormattingUndoStep);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonGenerateFormattingUndoStep]));
 			w9.Position = 5;
 			w9.Expand = false;
 			w9.Fill = false;
-			this.alignment3.Add (this.vbox4);
-			this.vbox1.Add (this.alignment3);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3]));
+			this.alignment3.Add(this.vbox4);
+			this.vbox1.Add(this.alignment3);
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3]));
 			w11.Position = 1;
 			w11.Expand = false;
 			w11.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel6 = new global::Gtk.Label ();
+			this.GtkLabel6 = new global::Gtk.Label();
 			this.GtkLabel6.Name = "GtkLabel6";
 			this.GtkLabel6.Xalign = 0F;
-			this.GtkLabel6.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Indentation</b>");
+			this.GtkLabel6.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Indentation</b>");
 			this.GtkLabel6.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel6);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel6]));
+			this.vbox1.Add(this.GtkLabel6);
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel6]));
 			w12.Position = 2;
 			w12.Expand = false;
 			w12.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkAlignment = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
+			this.GtkAlignment = new global::Gtk.Alignment(0F, 0F, 1F, 1F);
 			this.GtkAlignment.Name = "GtkAlignment";
 			this.GtkAlignment.LeftPadding = ((uint)(12));
 			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			this.vbox2 = new global::Gtk.VBox ();
+			this.vbox2 = new global::Gtk.VBox();
 			this.vbox2.Name = "vbox2";
 			this.vbox2.Spacing = 6;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1 = new global::Gtk.HBox();
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.label1 = new global::Gtk.Label ();
+			this.label1 = new global::Gtk.Label();
 			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Indentation mode:");
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Indentation mode:");
 			this.label1.UseUnderline = true;
-			this.hbox1.Add (this.label1);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label1]));
+			this.hbox1.Add(this.label1);
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label1]));
 			w13.Position = 0;
 			w13.Expand = false;
 			w13.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.indentationCombobox = global::Gtk.ComboBox.NewText ();
+			this.indentationCombobox = global::Gtk.ComboBox.NewText();
 			this.indentationCombobox.Name = "indentationCombobox";
-			this.hbox1.Add (this.indentationCombobox);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.indentationCombobox]));
+			this.hbox1.Add(this.indentationCombobox);
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.indentationCombobox]));
 			w14.Position = 1;
 			w14.Expand = false;
 			w14.Fill = false;
-			this.vbox2.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1]));
+			this.vbox2.Add(this.hbox1);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
 			w15.Position = 0;
 			w15.Expand = false;
 			w15.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.tabAsReindentCheckbutton = new global::Gtk.CheckButton ();
+			this.tabAsReindentCheckbutton = new global::Gtk.CheckButton();
 			this.tabAsReindentCheckbutton.CanFocus = true;
 			this.tabAsReindentCheckbutton.Name = "tabAsReindentCheckbutton";
-			this.tabAsReindentCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Interpret tab _keystroke as reindent command");
+			this.tabAsReindentCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Interpret tab _keystroke as reindent command");
 			this.tabAsReindentCheckbutton.DrawIndicator = true;
 			this.tabAsReindentCheckbutton.UseUnderline = true;
-			this.vbox2.Add (this.tabAsReindentCheckbutton);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.tabAsReindentCheckbutton]));
+			this.vbox2.Add(this.tabAsReindentCheckbutton);
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.tabAsReindentCheckbutton]));
 			w16.Position = 1;
 			w16.Expand = false;
 			w16.Fill = false;
-			this.GtkAlignment.Add (this.vbox2);
-			this.vbox1.Add (this.GtkAlignment);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkAlignment]));
+			this.GtkAlignment.Add(this.vbox2);
+			this.vbox1.Add(this.GtkAlignment);
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkAlignment]));
 			w18.Position = 3;
 			w18.Expand = false;
 			w18.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel8 = new global::Gtk.Label ();
+			this.GtkLabel8 = new global::Gtk.Label();
 			this.GtkLabel8.Name = "GtkLabel8";
 			this.GtkLabel8.Xalign = 0F;
-			this.GtkLabel8.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Navigation</b>");
+			this.GtkLabel8.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Navigation</b>");
 			this.GtkLabel8.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel8);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel8]));
+			this.vbox1.Add(this.GtkLabel8);
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel8]));
 			w19.Position = 4;
 			w19.Expand = false;
 			w19.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment4 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment4 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment4.Name = "alignment4";
 			this.alignment4.LeftPadding = ((uint)(12));
 			// Container child alignment4.Gtk.Container+ContainerChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.useViModesCheck = new global::Gtk.CheckButton ();
+			this.useViModesCheck = new global::Gtk.CheckButton();
 			this.useViModesCheck.CanFocus = true;
 			this.useViModesCheck.Name = "useViModesCheck";
-			this.useViModesCheck.Label = global::Mono.Unix.Catalog.GetString ("Use _Vi modes");
+			this.useViModesCheck.Label = global::Mono.Unix.Catalog.GetString("Use _Vi modes");
 			this.useViModesCheck.DrawIndicator = true;
 			this.useViModesCheck.UseUnderline = true;
-			this.vbox5.Add (this.useViModesCheck);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.useViModesCheck]));
+			this.vbox5.Add(this.useViModesCheck);
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.useViModesCheck]));
 			w20.Position = 0;
 			w20.Expand = false;
 			w20.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3 = new global::Gtk.HBox();
 			this.hbox3.Name = "hbox3";
 			this.hbox3.Spacing = 6;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.label2 = new global::Gtk.Label ();
+			this.label2 = new global::Gtk.Label();
 			this.label2.Name = "label2";
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Word _break mode:");
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("Word _break mode:");
 			this.label2.UseUnderline = true;
-			this.hbox3.Add (this.label2);
-			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label2]));
+			this.hbox3.Add(this.label2);
+			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.label2]));
 			w21.Position = 0;
 			w21.Expand = false;
 			w21.Fill = false;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.controlLeftRightCombobox = global::Gtk.ComboBox.NewText ();
+			this.controlLeftRightCombobox = global::Gtk.ComboBox.NewText();
 			this.controlLeftRightCombobox.Name = "controlLeftRightCombobox";
-			this.hbox3.Add (this.controlLeftRightCombobox);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.controlLeftRightCombobox]));
+			this.hbox3.Add(this.controlLeftRightCombobox);
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.controlLeftRightCombobox]));
 			w22.Position = 1;
 			w22.Expand = false;
 			w22.Fill = false;
-			this.vbox5.Add (this.hbox3);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3]));
+			this.vbox5.Add(this.hbox3);
+			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox3]));
 			w23.Position = 1;
 			w23.Expand = false;
 			w23.Fill = false;
-			this.alignment4.Add (this.vbox5);
-			this.vbox1.Add (this.alignment4);
-			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment4]));
+			this.alignment4.Add(this.vbox5);
+			this.vbox1.Add(this.alignment4);
+			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment4]));
 			w25.Position = 5;
 			w25.Expand = false;
 			w25.Fill = false;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs
index 4b433ec225..d20c095ede 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs
@@ -5,46 +5,79 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	public partial class ColorShemeEditor
 	{
 		private global::Gtk.HBox hbox1;
+
 		private global::Gtk.Label label2;
+
 		private global::Gtk.Entry entryName;
+
 		private global::Gtk.Label label3;
+
 		private global::Gtk.Entry entryDescription;
+
 		private global::Gtk.HPaned hpaned1;
+
 		private global::Gtk.VBox vbox2;
+
 		private global::Gtk.Label label1;
+
 		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+
 		private global::Gtk.TreeView treeviewColors;
+
 		private global::Gtk.VBox vbox3;
+
 		private global::Gtk.Notebook notebookColorChooser;
+
 		private global::Gtk.VBox vbox4;
+
 		private global::Gtk.Table table1;
+
 		private global::Gtk.ColorButton colorbuttonBg;
+
 		private global::Gtk.ColorButton colorbuttonFg;
+
 		private global::Gtk.Label label5;
+
 		private global::Gtk.Label label7;
+
 		private global::Gtk.CheckButton checkbuttonBold;
+
 		private global::Gtk.CheckButton checkbuttonItalic;
+
 		private global::Gtk.Label label4;
+
 		private global::Gtk.VBox vbox5;
+
 		private global::Gtk.Table table2;
+
 		private global::Gtk.ColorButton colorbuttonBorder;
+
 		private global::Gtk.ColorButton colorbuttonPrimary;
+
 		private global::Gtk.ColorButton colorbuttonSecondary;
+
 		private global::Gtk.Label label10;
+
 		private global::Gtk.Label label11;
+
 		private global::Gtk.Label label9;
+
 		private global::Gtk.Label label6;
+
 		private global::Gtk.Label label8;
+
 		private global::Gtk.ScrolledWindow scrolledwindowTextEditor;
+
 		private global::Gtk.Button buttonCancel;
+
 		private global::Gtk.Button buttonOk;
-		
-		protected virtual void Build ()
+
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Edit color sheme");
+			this.Title = global::Mono.Unix.Catalog.GetString("Edit color sheme");
 			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
 			this.BorderWidth = ((uint)(6));
 			// Internal child MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.VBox
@@ -52,115 +85,116 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w1.Name = "dialog1_VBox";
 			w1.BorderWidth = ((uint)(2));
 			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1 = new global::Gtk.HBox();
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			this.hbox1.BorderWidth = ((uint)(6));
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.label2 = new global::Gtk.Label ();
+			this.label2 = new global::Gtk.Label();
 			this.label2.Name = "label2";
 			this.label2.Xalign = 0F;
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("_Name:");
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("_Name:");
 			this.label2.UseUnderline = true;
-			this.hbox1.Add (this.label2);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label2]));
+			this.hbox1.Add(this.label2);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label2]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.entryName = new global::Gtk.Entry ();
+			this.entryName = new global::Gtk.Entry();
 			this.entryName.CanFocus = true;
 			this.entryName.Name = "entryName";
 			this.entryName.IsEditable = true;
 			this.entryName.InvisibleChar = '●';
-			this.hbox1.Add (this.entryName);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryName]));
+			this.hbox1.Add(this.entryName);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.entryName]));
 			w3.Position = 1;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.label3 = new global::Gtk.Label ();
+			this.label3 = new global::Gtk.Label();
 			this.label3.Name = "label3";
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("_Description:");
+			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("_Description:");
 			this.label3.UseUnderline = true;
-			this.hbox1.Add (this.label3);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label3]));
+			this.hbox1.Add(this.label3);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label3]));
 			w4.Position = 2;
 			w4.Expand = false;
 			w4.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.entryDescription = new global::Gtk.Entry ();
+			this.entryDescription = new global::Gtk.Entry();
 			this.entryDescription.CanFocus = true;
 			this.entryDescription.Name = "entryDescription";
 			this.entryDescription.IsEditable = true;
 			this.entryDescription.InvisibleChar = '●';
-			this.hbox1.Add (this.entryDescription);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryDescription]));
+			this.hbox1.Add(this.entryDescription);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.entryDescription]));
 			w5.Position = 3;
-			w1.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1 [this.hbox1]));
+			w1.Add(this.hbox1);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1[this.hbox1]));
 			w6.Position = 0;
 			w6.Expand = false;
 			w6.Fill = false;
 			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.hpaned1 = new global::Gtk.HPaned ();
+			this.hpaned1 = new global::Gtk.HPaned();
 			this.hpaned1.CanFocus = true;
 			this.hpaned1.Name = "hpaned1";
 			this.hpaned1.Position = 415;
 			// Container child hpaned1.Gtk.Paned+PanedChild
-			this.vbox2 = new global::Gtk.VBox ();
+			this.vbox2 = new global::Gtk.VBox();
 			this.vbox2.Name = "vbox2";
 			this.vbox2.Spacing = 6;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.label1 = new global::Gtk.Label ();
+			this.label1 = new global::Gtk.Label();
 			this.label1.Name = "label1";
 			this.label1.Xalign = 0F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Colors");
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Colors");
 			this.label1.UseUnderline = true;
-			this.vbox2.Add (this.label1);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label1]));
+			this.vbox2.Add(this.label1);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.label1]));
 			w7.Position = 0;
 			w7.Expand = false;
 			w7.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
 			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
 			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-			this.treeviewColors = new global::Gtk.TreeView ();
+			this.treeviewColors = new global::Gtk.TreeView();
 			this.treeviewColors.CanFocus = true;
 			this.treeviewColors.Name = "treeviewColors";
-			this.GtkScrolledWindow.Add (this.treeviewColors);
-			this.vbox2.Add (this.GtkScrolledWindow);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow]));
+			this.GtkScrolledWindow.Add(this.treeviewColors);
+			this.vbox2.Add(this.GtkScrolledWindow);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.GtkScrolledWindow]));
 			w9.Position = 1;
-			this.hpaned1.Add (this.vbox2);
-			global::Gtk.Paned.PanedChild w10 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.vbox2]));
+			this.hpaned1.Add(this.vbox2);
+			global::Gtk.Paned.PanedChild w10 = ((global::Gtk.Paned.PanedChild)(this.hpaned1[this.vbox2]));
 			w10.Resize = false;
 			// Container child hpaned1.Gtk.Paned+PanedChild
-			this.vbox3 = new global::Gtk.VBox ();
+			this.vbox3 = new global::Gtk.VBox();
 			this.vbox3.Name = "vbox3";
 			this.vbox3.Spacing = 6;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.notebookColorChooser = new global::Gtk.Notebook ();
+			this.notebookColorChooser = new global::Gtk.Notebook();
 			this.notebookColorChooser.CanFocus = true;
 			this.notebookColorChooser.Name = "notebookColorChooser";
 			this.notebookColorChooser.CurrentPage = 1;
 			this.notebookColorChooser.ShowBorder = false;
 			this.notebookColorChooser.BorderWidth = ((uint)(8));
 			// Container child notebookColorChooser.Gtk.Notebook+NotebookChild
-			this.vbox4 = new global::Gtk.VBox ();
+			this.vbox4 = new global::Gtk.VBox();
 			this.vbox4.Name = "vbox4";
 			this.vbox4.Spacing = 6;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false);
+			this.table1 = new global::Gtk.Table(((uint)(2)), ((uint)(2)), false);
+			this.table1.Name = "table1";
 			this.table1.RowSpacing = ((uint)(6));
 			this.table1.ColumnSpacing = ((uint)(6));
 			// Container child table1.Gtk.Table+TableChild
-			this.colorbuttonBg = new global::Gtk.ColorButton ();
+			this.colorbuttonBg = new global::Gtk.ColorButton();
 			this.colorbuttonBg.CanFocus = true;
 			this.colorbuttonBg.Events = ((global::Gdk.EventMask)(784));
 			this.colorbuttonBg.Name = "colorbuttonBg";
-			this.table1.Add (this.colorbuttonBg);
-			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.colorbuttonBg]));
+			this.table1.Add(this.colorbuttonBg);
+			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.colorbuttonBg]));
 			w11.TopAttach = ((uint)(1));
 			w11.BottomAttach = ((uint)(2));
 			w11.LeftAttach = ((uint)(1));
@@ -168,90 +202,90 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w11.XOptions = ((global::Gtk.AttachOptions)(4));
 			w11.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.colorbuttonFg = new global::Gtk.ColorButton ();
+			this.colorbuttonFg = new global::Gtk.ColorButton();
 			this.colorbuttonFg.CanFocus = true;
 			this.colorbuttonFg.Events = ((global::Gdk.EventMask)(784));
 			this.colorbuttonFg.Name = "colorbuttonFg";
-			this.table1.Add (this.colorbuttonFg);
-			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.colorbuttonFg]));
+			this.table1.Add(this.colorbuttonFg);
+			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.colorbuttonFg]));
 			w12.LeftAttach = ((uint)(1));
 			w12.RightAttach = ((uint)(2));
 			w12.XOptions = ((global::Gtk.AttachOptions)(4));
 			w12.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label5 = new global::Gtk.Label ();
+			this.label5 = new global::Gtk.Label();
 			this.label5.Name = "label5";
 			this.label5.Xalign = 1F;
-			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("_Background:");
+			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString("_Background:");
 			this.label5.UseUnderline = true;
-			this.table1.Add (this.label5);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.label5]));
+			this.table1.Add(this.label5);
+			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.label5]));
 			w13.TopAttach = ((uint)(1));
 			w13.BottomAttach = ((uint)(2));
 			w13.XOptions = ((global::Gtk.AttachOptions)(4));
 			w13.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label7 = new global::Gtk.Label ();
+			this.label7 = new global::Gtk.Label();
 			this.label7.Name = "label7";
 			this.label7.Xalign = 1F;
-			this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("_Foreground:");
+			this.label7.LabelProp = global::Mono.Unix.Catalog.GetString("_Foreground:");
 			this.label7.UseUnderline = true;
-			this.table1.Add (this.label7);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.label7]));
+			this.table1.Add(this.label7);
+			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.label7]));
 			w14.XOptions = ((global::Gtk.AttachOptions)(4));
 			w14.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox4.Add (this.table1);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.table1]));
+			this.vbox4.Add(this.table1);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.table1]));
 			w15.Position = 0;
 			w15.Expand = false;
 			w15.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonBold = new global::Gtk.CheckButton ();
+			this.checkbuttonBold = new global::Gtk.CheckButton();
 			this.checkbuttonBold.CanFocus = true;
 			this.checkbuttonBold.Name = "checkbuttonBold";
-			this.checkbuttonBold.Label = global::Mono.Unix.Catalog.GetString ("B_old");
+			this.checkbuttonBold.Label = global::Mono.Unix.Catalog.GetString("B_old");
 			this.checkbuttonBold.DrawIndicator = true;
 			this.checkbuttonBold.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonBold);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonBold]));
+			this.vbox4.Add(this.checkbuttonBold);
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonBold]));
 			w16.Position = 1;
 			w16.Expand = false;
 			w16.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonItalic = new global::Gtk.CheckButton ();
+			this.checkbuttonItalic = new global::Gtk.CheckButton();
 			this.checkbuttonItalic.CanFocus = true;
 			this.checkbuttonItalic.Name = "checkbuttonItalic";
-			this.checkbuttonItalic.Label = global::Mono.Unix.Catalog.GetString ("Italic");
+			this.checkbuttonItalic.Label = global::Mono.Unix.Catalog.GetString("Italic");
 			this.checkbuttonItalic.DrawIndicator = true;
 			this.checkbuttonItalic.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonItalic);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonItalic]));
+			this.vbox4.Add(this.checkbuttonItalic);
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonItalic]));
 			w17.Position = 2;
 			w17.Expand = false;
 			w17.Fill = false;
-			this.notebookColorChooser.Add (this.vbox4);
+			this.notebookColorChooser.Add(this.vbox4);
 			// Notebook tab
-			this.label4 = new global::Gtk.Label ();
+			this.label4 = new global::Gtk.Label();
 			this.label4.Name = "label4";
-			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("page1");
-			this.notebookColorChooser.SetTabLabel (this.vbox4, this.label4);
-			this.label4.ShowAll ();
+			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString("page1");
+			this.notebookColorChooser.SetTabLabel(this.vbox4, this.label4);
+			this.label4.ShowAll();
 			// Container child notebookColorChooser.Gtk.Notebook+NotebookChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.table2 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
+			this.table2 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false);
 			this.table2.Name = "table2";
 			this.table2.RowSpacing = ((uint)(6));
 			this.table2.ColumnSpacing = ((uint)(6));
 			// Container child table2.Gtk.Table+TableChild
-			this.colorbuttonBorder = new global::Gtk.ColorButton ();
+			this.colorbuttonBorder = new global::Gtk.ColorButton();
 			this.colorbuttonBorder.CanFocus = true;
 			this.colorbuttonBorder.Events = ((global::Gdk.EventMask)(784));
 			this.colorbuttonBorder.Name = "colorbuttonBorder";
-			this.table2.Add (this.colorbuttonBorder);
-			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table2 [this.colorbuttonBorder]));
+			this.table2.Add(this.colorbuttonBorder);
+			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table2[this.colorbuttonBorder]));
 			w19.TopAttach = ((uint)(2));
 			w19.BottomAttach = ((uint)(3));
 			w19.LeftAttach = ((uint)(1));
@@ -259,23 +293,23 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w19.XOptions = ((global::Gtk.AttachOptions)(4));
 			w19.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
-			this.colorbuttonPrimary = new global::Gtk.ColorButton ();
+			this.colorbuttonPrimary = new global::Gtk.ColorButton();
 			this.colorbuttonPrimary.CanFocus = true;
 			this.colorbuttonPrimary.Events = ((global::Gdk.EventMask)(784));
 			this.colorbuttonPrimary.Name = "colorbuttonPrimary";
-			this.table2.Add (this.colorbuttonPrimary);
-			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table2 [this.colorbuttonPrimary]));
+			this.table2.Add(this.colorbuttonPrimary);
+			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table2[this.colorbuttonPrimary]));
 			w20.LeftAttach = ((uint)(1));
 			w20.RightAttach = ((uint)(2));
 			w20.XOptions = ((global::Gtk.AttachOptions)(4));
 			w20.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
-			this.colorbuttonSecondary = new global::Gtk.ColorButton ();
+			this.colorbuttonSecondary = new global::Gtk.ColorButton();
 			this.colorbuttonSecondary.CanFocus = true;
 			this.colorbuttonSecondary.Events = ((global::Gdk.EventMask)(784));
 			this.colorbuttonSecondary.Name = "colorbuttonSecondary";
-			this.table2.Add (this.colorbuttonSecondary);
-			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table2 [this.colorbuttonSecondary]));
+			this.table2.Add(this.colorbuttonSecondary);
+			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table2[this.colorbuttonSecondary]));
 			w21.TopAttach = ((uint)(1));
 			w21.BottomAttach = ((uint)(2));
 			w21.LeftAttach = ((uint)(1));
@@ -283,80 +317,80 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w21.XOptions = ((global::Gtk.AttachOptions)(4));
 			w21.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
-			this.label10 = new global::Gtk.Label ();
+			this.label10 = new global::Gtk.Label();
 			this.label10.Name = "label10";
 			this.label10.Xalign = 1F;
-			this.label10.LabelProp = global::Mono.Unix.Catalog.GetString ("_Secondary Color:");
+			this.label10.LabelProp = global::Mono.Unix.Catalog.GetString("_Secondary Color:");
 			this.label10.UseUnderline = true;
-			this.table2.Add (this.label10);
-			global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table2 [this.label10]));
+			this.table2.Add(this.label10);
+			global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table2[this.label10]));
 			w22.TopAttach = ((uint)(1));
 			w22.BottomAttach = ((uint)(2));
 			w22.XOptions = ((global::Gtk.AttachOptions)(4));
 			w22.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
-			this.label11 = new global::Gtk.Label ();
+			this.label11 = new global::Gtk.Label();
 			this.label11.Name = "label11";
 			this.label11.Xalign = 1F;
-			this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("_Border Color:");
+			this.label11.LabelProp = global::Mono.Unix.Catalog.GetString("_Border Color:");
 			this.label11.UseUnderline = true;
-			this.table2.Add (this.label11);
-			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table2 [this.label11]));
+			this.table2.Add(this.label11);
+			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table2[this.label11]));
 			w23.TopAttach = ((uint)(2));
 			w23.BottomAttach = ((uint)(3));
 			w23.XOptions = ((global::Gtk.AttachOptions)(4));
 			w23.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
-			this.label9 = new global::Gtk.Label ();
+			this.label9 = new global::Gtk.Label();
 			this.label9.Name = "label9";
 			this.label9.Xalign = 1F;
-			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("_Primary Color:");
+			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString("_Primary Color:");
 			this.label9.UseUnderline = true;
-			this.table2.Add (this.label9);
-			global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table2 [this.label9]));
+			this.table2.Add(this.label9);
+			global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table2[this.label9]));
 			w24.XOptions = ((global::Gtk.AttachOptions)(4));
 			w24.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox5.Add (this.table2);
-			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.table2]));
+			this.vbox5.Add(this.table2);
+			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.table2]));
 			w25.Position = 0;
 			w25.Expand = false;
 			w25.Fill = false;
-			this.notebookColorChooser.Add (this.vbox5);
-			global::Gtk.Notebook.NotebookChild w26 = ((global::Gtk.Notebook.NotebookChild)(this.notebookColorChooser [this.vbox5]));
+			this.notebookColorChooser.Add(this.vbox5);
+			global::Gtk.Notebook.NotebookChild w26 = ((global::Gtk.Notebook.NotebookChild)(this.notebookColorChooser[this.vbox5]));
 			w26.Position = 1;
 			// Notebook tab
-			this.label6 = new global::Gtk.Label ();
+			this.label6 = new global::Gtk.Label();
 			this.label6.Name = "label6";
-			this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("page2");
-			this.notebookColorChooser.SetTabLabel (this.vbox5, this.label6);
-			this.label6.ShowAll ();
-			this.vbox3.Add (this.notebookColorChooser);
-			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.notebookColorChooser]));
+			this.label6.LabelProp = global::Mono.Unix.Catalog.GetString("page2");
+			this.notebookColorChooser.SetTabLabel(this.vbox5, this.label6);
+			this.label6.ShowAll();
+			this.vbox3.Add(this.notebookColorChooser);
+			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.notebookColorChooser]));
 			w27.Position = 0;
 			w27.Expand = false;
 			w27.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.label8 = new global::Gtk.Label ();
+			this.label8 = new global::Gtk.Label();
 			this.label8.Name = "label8";
 			this.label8.Xalign = 0F;
-			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("_Preview:");
+			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString("_Preview:");
 			this.label8.UseUnderline = true;
-			this.vbox3.Add (this.label8);
-			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label8]));
+			this.vbox3.Add(this.label8);
+			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.label8]));
 			w28.Position = 1;
 			w28.Expand = false;
 			w28.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.scrolledwindowTextEditor = new global::Gtk.ScrolledWindow ();
+			this.scrolledwindowTextEditor = new global::Gtk.ScrolledWindow();
 			this.scrolledwindowTextEditor.CanFocus = true;
 			this.scrolledwindowTextEditor.Name = "scrolledwindowTextEditor";
 			this.scrolledwindowTextEditor.ShadowType = ((global::Gtk.ShadowType)(1));
-			this.vbox3.Add (this.scrolledwindowTextEditor);
-			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.scrolledwindowTextEditor]));
+			this.vbox3.Add(this.scrolledwindowTextEditor);
+			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.scrolledwindowTextEditor]));
 			w29.Position = 2;
-			this.hpaned1.Add (this.vbox3);
-			w1.Add (this.hpaned1);
-			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(w1 [this.hpaned1]));
+			this.hpaned1.Add(this.vbox3);
+			w1.Add(this.hpaned1);
+			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(w1[this.hpaned1]));
 			w31.Position = 1;
 			// Internal child MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.ActionArea
 			global::Gtk.HButtonBox w32 = this.ActionArea;
@@ -365,38 +399,39 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w32.BorderWidth = ((uint)(5));
 			w32.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::Gtk.Button ();
+			this.buttonCancel = new global::Gtk.Button();
 			this.buttonCancel.CanDefault = true;
 			this.buttonCancel.CanFocus = true;
 			this.buttonCancel.Name = "buttonCancel";
 			this.buttonCancel.UseStock = true;
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w33 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32 [this.buttonCancel]));
+			this.AddActionWidget(this.buttonCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w33 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32[this.buttonCancel]));
 			w33.Expand = false;
 			w33.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
+			this.buttonOk = new global::Gtk.Button();
 			this.buttonOk.CanDefault = true;
 			this.buttonOk.CanFocus = true;
 			this.buttonOk.Name = "buttonOk";
 			this.buttonOk.UseStock = true;
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w34 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32 [this.buttonOk]));
+			this.AddActionWidget(this.buttonOk, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w34 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32[this.buttonOk]));
 			w34.Position = 1;
 			w34.Expand = false;
 			w34.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
 			this.DefaultWidth = 760;
 			this.DefaultHeight = 458;
 			this.label2.MnemonicWidget = this.entryName;
 			this.label3.MnemonicWidget = this.entryDescription;
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs
index 2ec1f37faa..5bce3c3b27 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs
@@ -2,196 +2,167 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
-	internal partial class CompletionAppearancePanel
+	public partial class CompletionAppearancePanel
 	{
 		private global::Gtk.VBox vbox1;
-		private global::Gtk.HBox hbox1;
-		private global::Gtk.Label label2;
-		private global::Gtk.SpinButton spinbutton1;
-		private global::Gtk.Label label3;
+
 		private global::Gtk.Alignment alignment3;
+
 		private global::Gtk.VBox vbox5;
+
 		private global::Gtk.CheckButton filterByBrowsableCheckbutton;
+
 		private global::Gtk.HBox hbox2;
+
 		private global::Gtk.Fixed fixed1;
+
 		private global::Gtk.RadioButton normalOnlyRadiobutton;
+
 		private global::Gtk.Alignment alignment1;
+
 		private global::Gtk.Label label4;
+
 		private global::Gtk.HBox hbox3;
+
 		private global::Gtk.Fixed fixed2;
+
 		private global::Gtk.RadioButton includeAdvancedRadiobutton;
+
 		private global::Gtk.Alignment alignment2;
+
 		private global::Gtk.Label label5;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Completion list has");
-			this.hbox1.Add (this.label2);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label2]));
-			w1.Position = 0;
-			w1.Expand = false;
-			w1.Fill = false;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.spinbutton1 = new global::Gtk.SpinButton (0, 100, 1);
-			this.spinbutton1.CanFocus = true;
-			this.spinbutton1.Name = "spinbutton1";
-			this.spinbutton1.Adjustment.PageIncrement = 10;
-			this.spinbutton1.ClimbRate = 1;
-			this.spinbutton1.Numeric = true;
-			this.hbox1.Add (this.spinbutton1);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.spinbutton1]));
-			w2.Position = 1;
-			w2.Expand = false;
-			w2.Fill = false;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("rows");
-			this.hbox1.Add (this.label3);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label3]));
-			w3.Position = 2;
-			w3.Expand = false;
-			w3.Fill = false;
-			this.vbox1.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
-			w4.Position = 0;
-			w4.Expand = false;
-			w4.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment3.Name = "alignment3";
 			this.alignment3.LeftPadding = ((uint)(12));
 			// Container child alignment3.Gtk.Container+ContainerChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.filterByBrowsableCheckbutton = new global::Gtk.CheckButton ();
+			this.filterByBrowsableCheckbutton = new global::Gtk.CheckButton();
 			this.filterByBrowsableCheckbutton.CanFocus = true;
 			this.filterByBrowsableCheckbutton.Name = "filterByBrowsableCheckbutton";
-			this.filterByBrowsableCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Filter members by [EditorBrowsable] attribute");
+			this.filterByBrowsableCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Filter members by [EditorBrowsable] attribute");
 			this.filterByBrowsableCheckbutton.Active = true;
 			this.filterByBrowsableCheckbutton.DrawIndicator = true;
 			this.filterByBrowsableCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.filterByBrowsableCheckbutton);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.filterByBrowsableCheckbutton]));
-			w5.Position = 0;
-			w5.Expand = false;
-			w5.Fill = false;
+			this.vbox5.Add(this.filterByBrowsableCheckbutton);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.filterByBrowsableCheckbutton]));
+			w1.Position = 0;
+			w1.Expand = false;
+			w1.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
+			this.hbox2 = new global::Gtk.HBox();
 			this.hbox2.Name = "hbox2";
 			this.hbox2.Spacing = 6;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.fixed1 = new global::Gtk.Fixed ();
+			this.fixed1 = new global::Gtk.Fixed();
 			this.fixed1.Name = "fixed1";
 			this.fixed1.HasWindow = false;
-			this.hbox2.Add (this.fixed1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed1]));
-			w6.Position = 0;
-			w6.Expand = false;
-			w6.Padding = ((uint)(6));
+			this.hbox2.Add(this.fixed1);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.fixed1]));
+			w2.Position = 0;
+			w2.Expand = false;
+			w2.Padding = ((uint)(6));
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.normalOnlyRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Show Normal members only"));
+			this.normalOnlyRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("_Show Normal members only"));
 			this.normalOnlyRadiobutton.CanFocus = true;
 			this.normalOnlyRadiobutton.Name = "normalOnlyRadiobutton";
 			this.normalOnlyRadiobutton.DrawIndicator = true;
 			this.normalOnlyRadiobutton.UseUnderline = true;
-			this.normalOnlyRadiobutton.Group = new global::GLib.SList (global::System.IntPtr.Zero);
-			this.hbox2.Add (this.normalOnlyRadiobutton);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.normalOnlyRadiobutton]));
-			w7.Position = 1;
-			this.vbox5.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2]));
-			w8.Position = 1;
-			w8.Expand = false;
-			w8.Fill = false;
+			this.normalOnlyRadiobutton.Group = new global::GLib.SList(global::System.IntPtr.Zero);
+			this.hbox2.Add(this.normalOnlyRadiobutton);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.normalOnlyRadiobutton]));
+			w3.Position = 1;
+			this.vbox5.Add(this.hbox2);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox2]));
+			w4.Position = 1;
+			w4.Expand = false;
+			w4.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.alignment1 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment1 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment1.Name = "alignment1";
 			this.alignment1.LeftPadding = ((uint)(38));
 			// Container child alignment1.Gtk.Container+ContainerChild
-			this.label4 = new global::Gtk.Label ();
+			this.label4 = new global::Gtk.Label();
 			this.label4.Name = "label4";
 			this.label4.Xalign = 0F;
-			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("<i>EditorBrowsableState.Always</i>");
+			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString("<i>EditorBrowsableState.Always</i>");
 			this.label4.UseMarkup = true;
-			this.alignment1.Add (this.label4);
-			this.vbox5.Add (this.alignment1);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.alignment1]));
-			w10.Position = 2;
-			w10.Expand = false;
-			w10.Fill = false;
+			this.alignment1.Add(this.label4);
+			this.vbox5.Add(this.alignment1);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.alignment1]));
+			w6.Position = 2;
+			w6.Expand = false;
+			w6.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3 = new global::Gtk.HBox();
 			this.hbox3.Name = "hbox3";
 			this.hbox3.Spacing = 6;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.fixed2 = new global::Gtk.Fixed ();
+			this.fixed2 = new global::Gtk.Fixed();
 			this.fixed2.Name = "fixed2";
 			this.fixed2.HasWindow = false;
-			this.hbox3.Add (this.fixed2);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.fixed2]));
-			w11.Position = 0;
-			w11.Expand = false;
-			w11.Padding = ((uint)(6));
+			this.hbox3.Add(this.fixed2);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.fixed2]));
+			w7.Position = 0;
+			w7.Expand = false;
+			w7.Padding = ((uint)(6));
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.includeAdvancedRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Show Normal and _Advanced members"));
+			this.includeAdvancedRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("Show Normal and _Advanced members"));
 			this.includeAdvancedRadiobutton.CanFocus = true;
 			this.includeAdvancedRadiobutton.Name = "includeAdvancedRadiobutton";
 			this.includeAdvancedRadiobutton.DrawIndicator = true;
 			this.includeAdvancedRadiobutton.UseUnderline = true;
 			this.includeAdvancedRadiobutton.Group = this.normalOnlyRadiobutton.Group;
-			this.hbox3.Add (this.includeAdvancedRadiobutton);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.includeAdvancedRadiobutton]));
-			w12.Position = 1;
-			this.vbox5.Add (this.hbox3);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3]));
-			w13.Position = 3;
-			w13.Expand = false;
-			w13.Fill = false;
+			this.hbox3.Add(this.includeAdvancedRadiobutton);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.includeAdvancedRadiobutton]));
+			w8.Position = 1;
+			this.vbox5.Add(this.hbox3);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox3]));
+			w9.Position = 3;
+			w9.Expand = false;
+			w9.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.alignment2 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment2 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment2.Name = "alignment2";
 			this.alignment2.LeftPadding = ((uint)(38));
 			// Container child alignment2.Gtk.Container+ContainerChild
-			this.label5 = new global::Gtk.Label ();
+			this.label5 = new global::Gtk.Label();
 			this.label5.Name = "label5";
 			this.label5.Xalign = 0F;
-			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("<i>EditorBrowsableState.Always and EditorBrowsableState.Advanced</i>");
+			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString("<i>EditorBrowsableState.Always and EditorBrowsableState.Advanced</i>");
 			this.label5.UseMarkup = true;
-			this.alignment2.Add (this.label5);
-			this.vbox5.Add (this.alignment2);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.alignment2]));
-			w15.Position = 4;
-			w15.Expand = false;
-			w15.Fill = false;
-			this.alignment3.Add (this.vbox5);
-			this.vbox1.Add (this.alignment3);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3]));
-			w17.Position = 1;
-			w17.Expand = false;
-			w17.Fill = false;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.alignment2.Add(this.label5);
+			this.vbox5.Add(this.alignment2);
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.alignment2]));
+			w11.Position = 4;
+			w11.Expand = false;
+			w11.Fill = false;
+			this.alignment3.Add(this.vbox5);
+			this.vbox1.Add(this.alignment3);
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3]));
+			w13.Position = 0;
+			w13.Expand = false;
+			w13.Fill = false;
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Hide ();
+			this.Hide();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
index 7b6d6bd809..3576fb7b88 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
@@ -5,201 +5,219 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	internal partial class CompletionOptionsPanel
 	{
 		private global::Gtk.VBox vbox1;
+
 		private global::Gtk.Alignment alignment3;
+
 		private global::Gtk.VBox vbox5;
+
 		private global::Gtk.CheckButton autoCodeCompletionCheckbutton;
+
 		private global::Gtk.HBox hbox4;
+
 		private global::Gtk.Fixed fixed3;
+
 		private global::Gtk.CheckButton includeKeywordsCheckbutton;
+
 		private global::Gtk.HBox hbox5;
+
 		private global::Gtk.Fixed fixed4;
+
 		private global::Gtk.CheckButton includeCodeSnippetsCheckbutton;
+
 		private global::Gtk.CheckButton showImportsCheckbutton;
+
 		private global::Gtk.CheckButton insertParenthesesCheckbutton;
+
 		private global::Gtk.HBox hbox2;
+
 		private global::Gtk.Fixed fixed1;
+
 		private global::Gtk.RadioButton openingRadiobutton;
+
 		private global::Gtk.HBox hbox3;
+
 		private global::Gtk.Fixed fixed2;
+
 		private global::Gtk.RadioButton bothRadiobutton;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment3.Name = "alignment3";
 			this.alignment3.LeftPadding = ((uint)(12));
 			// Container child alignment3.Gtk.Container+ContainerChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.autoCodeCompletionCheckbutton = new global::Gtk.CheckButton ();
+			this.autoCodeCompletionCheckbutton = new global::Gtk.CheckButton();
 			this.autoCodeCompletionCheckbutton.CanFocus = true;
 			this.autoCodeCompletionCheckbutton.Name = "autoCodeCompletionCheckbutton";
-			this.autoCodeCompletionCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show completion list after a character is typed");
+			this.autoCodeCompletionCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show completion list after a character is typed");
 			this.autoCodeCompletionCheckbutton.DrawIndicator = true;
 			this.autoCodeCompletionCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.autoCodeCompletionCheckbutton);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.autoCodeCompletionCheckbutton]));
+			this.vbox5.Add(this.autoCodeCompletionCheckbutton);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.autoCodeCompletionCheckbutton]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox4 = new global::Gtk.HBox ();
+			this.hbox4 = new global::Gtk.HBox();
 			this.hbox4.Name = "hbox4";
 			this.hbox4.Spacing = 6;
 			// Container child hbox4.Gtk.Box+BoxChild
-			this.fixed3 = new global::Gtk.Fixed ();
+			this.fixed3 = new global::Gtk.Fixed();
 			this.fixed3.Name = "fixed3";
 			this.fixed3.HasWindow = false;
-			this.hbox4.Add (this.fixed3);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.fixed3]));
+			this.hbox4.Add(this.fixed3);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.fixed3]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Padding = ((uint)(6));
 			// Container child hbox4.Gtk.Box+BoxChild
-			this.includeKeywordsCheckbutton = new global::Gtk.CheckButton ();
+			this.includeKeywordsCheckbutton = new global::Gtk.CheckButton();
 			this.includeKeywordsCheckbutton.CanFocus = true;
 			this.includeKeywordsCheckbutton.Name = "includeKeywordsCheckbutton";
-			this.includeKeywordsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Include _keywords in completion list");
+			this.includeKeywordsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Include _keywords in completion list");
 			this.includeKeywordsCheckbutton.DrawIndicator = true;
 			this.includeKeywordsCheckbutton.UseUnderline = true;
-			this.hbox4.Add (this.includeKeywordsCheckbutton);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.includeKeywordsCheckbutton]));
+			this.hbox4.Add(this.includeKeywordsCheckbutton);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.includeKeywordsCheckbutton]));
 			w3.Position = 1;
-			this.vbox5.Add (this.hbox4);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox4]));
+			this.vbox5.Add(this.hbox4);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox4]));
 			w4.Position = 1;
 			w4.Expand = false;
 			w4.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox5 = new global::Gtk.HBox ();
+			this.hbox5 = new global::Gtk.HBox();
 			this.hbox5.Name = "hbox5";
 			this.hbox5.Spacing = 6;
 			// Container child hbox5.Gtk.Box+BoxChild
-			this.fixed4 = new global::Gtk.Fixed ();
+			this.fixed4 = new global::Gtk.Fixed();
 			this.fixed4.Name = "fixed4";
 			this.fixed4.HasWindow = false;
-			this.hbox5.Add (this.fixed4);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.fixed4]));
+			this.hbox5.Add(this.fixed4);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox5[this.fixed4]));
 			w5.Position = 0;
 			w5.Expand = false;
 			w5.Padding = ((uint)(6));
 			// Container child hbox5.Gtk.Box+BoxChild
-			this.includeCodeSnippetsCheckbutton = new global::Gtk.CheckButton ();
+			this.includeCodeSnippetsCheckbutton = new global::Gtk.CheckButton();
 			this.includeCodeSnippetsCheckbutton.CanFocus = true;
 			this.includeCodeSnippetsCheckbutton.Name = "includeCodeSnippetsCheckbutton";
-			this.includeCodeSnippetsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Include _code snippets in completion list");
+			this.includeCodeSnippetsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Include _code snippets in completion list");
 			this.includeCodeSnippetsCheckbutton.DrawIndicator = true;
 			this.includeCodeSnippetsCheckbutton.UseUnderline = true;
-			this.hbox5.Add (this.includeCodeSnippetsCheckbutton);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.includeCodeSnippetsCheckbutton]));
+			this.hbox5.Add(this.includeCodeSnippetsCheckbutton);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox5[this.includeCodeSnippetsCheckbutton]));
 			w6.Position = 1;
-			this.vbox5.Add (this.hbox5);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox5]));
+			this.vbox5.Add(this.hbox5);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox5]));
 			w7.Position = 2;
 			w7.Expand = false;
 			w7.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.showImportsCheckbutton = new global::Gtk.CheckButton ();
+			this.showImportsCheckbutton = new global::Gtk.CheckButton();
 			this.showImportsCheckbutton.CanFocus = true;
 			this.showImportsCheckbutton.Name = "showImportsCheckbutton";
-			this.showImportsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show import items");
+			this.showImportsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show import items");
 			this.showImportsCheckbutton.DrawIndicator = true;
 			this.showImportsCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.showImportsCheckbutton);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.showImportsCheckbutton]));
+			this.vbox5.Add(this.showImportsCheckbutton);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.showImportsCheckbutton]));
 			w8.Position = 3;
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.insertParenthesesCheckbutton = new global::Gtk.CheckButton ();
+			this.insertParenthesesCheckbutton = new global::Gtk.CheckButton();
 			this.insertParenthesesCheckbutton.CanFocus = true;
 			this.insertParenthesesCheckbutton.Name = "insertParenthesesCheckbutton";
-			this.insertParenthesesCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("A_utomatically insert parentheses after completion:");
+			this.insertParenthesesCheckbutton.Label = global::Mono.Unix.Catalog.GetString("A_utomatically insert parentheses after completion:");
 			this.insertParenthesesCheckbutton.DrawIndicator = true;
 			this.insertParenthesesCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.insertParenthesesCheckbutton);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.insertParenthesesCheckbutton]));
+			this.vbox5.Add(this.insertParenthesesCheckbutton);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.insertParenthesesCheckbutton]));
 			w9.Position = 4;
 			w9.Expand = false;
 			w9.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
+			this.hbox2 = new global::Gtk.HBox();
 			this.hbox2.Name = "hbox2";
 			this.hbox2.Spacing = 6;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.fixed1 = new global::Gtk.Fixed ();
+			this.fixed1 = new global::Gtk.Fixed();
 			this.fixed1.Name = "fixed1";
 			this.fixed1.HasWindow = false;
-			this.hbox2.Add (this.fixed1);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed1]));
+			this.hbox2.Add(this.fixed1);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.fixed1]));
 			w10.Position = 0;
 			w10.Expand = false;
 			w10.Padding = ((uint)(6));
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.openingRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Opening only"));
+			this.openingRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("_Opening only"));
 			this.openingRadiobutton.CanFocus = true;
 			this.openingRadiobutton.Name = "openingRadiobutton";
 			this.openingRadiobutton.DrawIndicator = true;
 			this.openingRadiobutton.UseUnderline = true;
-			this.openingRadiobutton.Group = new global::GLib.SList (global::System.IntPtr.Zero);
-			this.hbox2.Add (this.openingRadiobutton);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.openingRadiobutton]));
+			this.openingRadiobutton.Group = new global::GLib.SList(global::System.IntPtr.Zero);
+			this.hbox2.Add(this.openingRadiobutton);
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.openingRadiobutton]));
 			w11.Position = 1;
-			this.vbox5.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2]));
+			this.vbox5.Add(this.hbox2);
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox2]));
 			w12.Position = 5;
 			w12.Expand = false;
 			w12.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3 = new global::Gtk.HBox();
 			this.hbox3.Name = "hbox3";
 			this.hbox3.Spacing = 6;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.fixed2 = new global::Gtk.Fixed ();
+			this.fixed2 = new global::Gtk.Fixed();
 			this.fixed2.Name = "fixed2";
 			this.fixed2.HasWindow = false;
-			this.hbox3.Add (this.fixed2);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.fixed2]));
+			this.hbox3.Add(this.fixed2);
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.fixed2]));
 			w13.Position = 0;
 			w13.Expand = false;
 			w13.Padding = ((uint)(6));
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.bothRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Both opening and closing"));
+			this.bothRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("_Both opening and closing"));
 			this.bothRadiobutton.CanFocus = true;
 			this.bothRadiobutton.Name = "bothRadiobutton";
 			this.bothRadiobutton.DrawIndicator = true;
 			this.bothRadiobutton.UseUnderline = true;
 			this.bothRadiobutton.Group = this.openingRadiobutton.Group;
-			this.hbox3.Add (this.bothRadiobutton);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.bothRadiobutton]));
+			this.hbox3.Add(this.bothRadiobutton);
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.bothRadiobutton]));
 			w14.Position = 1;
-			this.vbox5.Add (this.hbox3);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3]));
+			this.vbox5.Add(this.hbox3);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox3]));
 			w15.Position = 6;
 			w15.Expand = false;
 			w15.Fill = false;
-			this.alignment3.Add (this.vbox5);
-			this.vbox1.Add (this.alignment3);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3]));
+			this.alignment3.Add(this.vbox5);
+			this.vbox1.Add(this.alignment3);
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3]));
 			w17.Position = 0;
 			w17.Expand = false;
 			w17.Fill = false;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Hide ();
+			this.Hide();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
index 27fc99c53f..73a12ec8ea 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
@@ -5,222 +5,242 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	internal partial class GeneralOptionsPanel
 	{
 		private global::Gtk.VBox vbox1;
+
 		private global::Gtk.Label GtkLabel13;
+
 		private global::Gtk.Alignment alignment2;
+
 		private global::Gtk.VBox vbox4;
+
 		private global::Gtk.HBox hbox3;
+
 		private global::Gtk.Fixed fixed2;
+
 		private global::Gtk.HBox hbox1;
+
 		private global::Gtk.Label label1;
+
 		private global::Gtk.ComboBox comboboxLineEndings;
+
 		private global::Gtk.Label GtkLabel14;
+
 		private global::Gtk.Alignment alignment3;
+
 		private global::Gtk.VBox vbox5;
+
 		private global::Gtk.CheckButton foldingCheckbutton;
+
 		private global::Gtk.CheckButton foldregionsCheckbutton;
+
 		private global::Gtk.CheckButton foldCommentsCheckbutton;
+
 		private global::Gtk.Label GtkLabel15;
+
 		private global::Gtk.Alignment alignment4;
+
 		private global::Gtk.VBox vbox6;
+
 		private global::Gtk.CheckButton wordWrapCheckbutton;
+
 		private global::Gtk.CheckButton antiAliasingCheckbutton;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel13 = new global::Gtk.Label ();
+			this.GtkLabel13 = new global::Gtk.Label();
 			this.GtkLabel13.Name = "GtkLabel13";
 			this.GtkLabel13.Xalign = 0F;
-			this.GtkLabel13.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Coding</b>");
+			this.GtkLabel13.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Coding</b>");
 			this.GtkLabel13.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel13);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel13]));
+			this.vbox1.Add(this.GtkLabel13);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel13]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment2 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment2 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment2.Name = "alignment2";
 			this.alignment2.LeftPadding = ((uint)(12));
 			// Container child alignment2.Gtk.Container+ContainerChild
-			this.vbox4 = new global::Gtk.VBox ();
+			this.vbox4 = new global::Gtk.VBox();
 			this.vbox4.Name = "vbox4";
 			this.vbox4.Spacing = 6;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3 = new global::Gtk.HBox();
 			this.hbox3.Name = "hbox3";
 			this.hbox3.Spacing = 6;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.fixed2 = new global::Gtk.Fixed ();
+			this.fixed2 = new global::Gtk.Fixed();
 			this.fixed2.Name = "fixed2";
 			this.fixed2.HasWindow = false;
-			this.hbox3.Add (this.fixed2);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.fixed2]));
+			this.hbox3.Add(this.fixed2);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.fixed2]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Padding = ((uint)(6));
-			this.vbox4.Add (this.hbox3);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox3]));
+			this.vbox4.Add(this.hbox3);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.hbox3]));
 			w3.Position = 0;
 			w3.Expand = false;
 			w3.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1 = new global::Gtk.HBox();
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.label1 = new global::Gtk.Label ();
+			this.label1 = new global::Gtk.Label();
 			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Line ending conversion:");
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Line ending conversion:");
 			this.label1.UseUnderline = true;
-			this.hbox1.Add (this.label1);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label1]));
+			this.hbox1.Add(this.label1);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label1]));
 			w4.Position = 0;
 			w4.Expand = false;
 			w4.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.comboboxLineEndings = global::Gtk.ComboBox.NewText ();
+			this.comboboxLineEndings = global::Gtk.ComboBox.NewText();
 			this.comboboxLineEndings.Name = "comboboxLineEndings";
-			this.hbox1.Add (this.comboboxLineEndings);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboboxLineEndings]));
+			this.hbox1.Add(this.comboboxLineEndings);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.comboboxLineEndings]));
 			w5.Position = 1;
 			w5.Expand = false;
 			w5.Fill = false;
-			this.vbox4.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox1]));
+			this.vbox4.Add(this.hbox1);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.hbox1]));
 			w6.Position = 1;
 			w6.Expand = false;
 			w6.Fill = false;
-			this.alignment2.Add (this.vbox4);
-			this.vbox1.Add (this.alignment2);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment2]));
+			this.alignment2.Add(this.vbox4);
+			this.vbox1.Add(this.alignment2);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment2]));
 			w8.Position = 1;
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel14 = new global::Gtk.Label ();
+			this.GtkLabel14 = new global::Gtk.Label();
 			this.GtkLabel14.Name = "GtkLabel14";
 			this.GtkLabel14.Xalign = 0F;
-			this.GtkLabel14.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Code Folding</b>");
+			this.GtkLabel14.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Code Folding</b>");
 			this.GtkLabel14.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel14);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel14]));
+			this.vbox1.Add(this.GtkLabel14);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel14]));
 			w9.Position = 2;
 			w9.Expand = false;
 			w9.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment3.Name = "alignment3";
 			this.alignment3.LeftPadding = ((uint)(12));
 			// Container child alignment3.Gtk.Container+ContainerChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.foldingCheckbutton = new global::Gtk.CheckButton ();
+			this.foldingCheckbutton = new global::Gtk.CheckButton();
 			this.foldingCheckbutton.CanFocus = true;
 			this.foldingCheckbutton.Name = "foldingCheckbutton";
-			this.foldingCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Enable code _folding");
+			this.foldingCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Enable code _folding");
 			this.foldingCheckbutton.DrawIndicator = true;
 			this.foldingCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.foldingCheckbutton);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.foldingCheckbutton]));
+			this.vbox5.Add(this.foldingCheckbutton);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.foldingCheckbutton]));
 			w10.Position = 0;
 			w10.Expand = false;
 			w10.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.foldregionsCheckbutton = new global::Gtk.CheckButton ();
+			this.foldregionsCheckbutton = new global::Gtk.CheckButton();
 			this.foldregionsCheckbutton.CanFocus = true;
 			this.foldregionsCheckbutton.Name = "foldregionsCheckbutton";
-			this.foldregionsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Fold #_regions by default");
+			this.foldregionsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Fold #_regions by default");
 			this.foldregionsCheckbutton.DrawIndicator = true;
 			this.foldregionsCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.foldregionsCheckbutton);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.foldregionsCheckbutton]));
+			this.vbox5.Add(this.foldregionsCheckbutton);
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.foldregionsCheckbutton]));
 			w11.Position = 1;
 			w11.Expand = false;
 			w11.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.foldCommentsCheckbutton = new global::Gtk.CheckButton ();
+			this.foldCommentsCheckbutton = new global::Gtk.CheckButton();
 			this.foldCommentsCheckbutton.CanFocus = true;
 			this.foldCommentsCheckbutton.Name = "foldCommentsCheckbutton";
-			this.foldCommentsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Fold _comments by default");
+			this.foldCommentsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Fold _comments by default");
 			this.foldCommentsCheckbutton.DrawIndicator = true;
 			this.foldCommentsCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.foldCommentsCheckbutton);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.foldCommentsCheckbutton]));
+			this.vbox5.Add(this.foldCommentsCheckbutton);
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.foldCommentsCheckbutton]));
 			w12.Position = 2;
 			w12.Expand = false;
 			w12.Fill = false;
-			this.alignment3.Add (this.vbox5);
-			this.vbox1.Add (this.alignment3);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3]));
+			this.alignment3.Add(this.vbox5);
+			this.vbox1.Add(this.alignment3);
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3]));
 			w14.Position = 3;
 			w14.Expand = false;
 			w14.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel15 = new global::Gtk.Label ();
+			this.GtkLabel15 = new global::Gtk.Label();
 			this.GtkLabel15.Name = "GtkLabel15";
 			this.GtkLabel15.Xalign = 0F;
-			this.GtkLabel15.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Appearance</b>");
+			this.GtkLabel15.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Appearance</b>");
 			this.GtkLabel15.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel15);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel15]));
+			this.vbox1.Add(this.GtkLabel15);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel15]));
 			w15.Position = 4;
 			w15.Expand = false;
 			w15.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment4 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment4 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment4.Name = "alignment4";
 			this.alignment4.LeftPadding = ((uint)(12));
 			// Container child alignment4.Gtk.Container+ContainerChild
-			this.vbox6 = new global::Gtk.VBox ();
+			this.vbox6 = new global::Gtk.VBox();
 			this.vbox6.Name = "vbox6";
 			this.vbox6.Spacing = 6;
 			// Container child vbox6.Gtk.Box+BoxChild
-			this.wordWrapCheckbutton = new global::Gtk.CheckButton ();
+			this.wordWrapCheckbutton = new global::Gtk.CheckButton();
 			this.wordWrapCheckbutton.CanFocus = true;
 			this.wordWrapCheckbutton.Name = "wordWrapCheckbutton";
-			this.wordWrapCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Word wrap");
+			this.wordWrapCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Word wrap");
 			this.wordWrapCheckbutton.DrawIndicator = true;
 			this.wordWrapCheckbutton.UseUnderline = true;
-			this.vbox6.Add (this.wordWrapCheckbutton);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.wordWrapCheckbutton]));
+			this.vbox6.Add(this.wordWrapCheckbutton);
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox6[this.wordWrapCheckbutton]));
 			w16.Position = 0;
 			w16.Expand = false;
 			w16.Fill = false;
 			// Container child vbox6.Gtk.Box+BoxChild
-			this.antiAliasingCheckbutton = new global::Gtk.CheckButton ();
+			this.antiAliasingCheckbutton = new global::Gtk.CheckButton();
 			this.antiAliasingCheckbutton.CanFocus = true;
 			this.antiAliasingCheckbutton.Name = "antiAliasingCheckbutton";
-			this.antiAliasingCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Use anti aliasing");
+			this.antiAliasingCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Use anti aliasing");
 			this.antiAliasingCheckbutton.DrawIndicator = true;
 			this.antiAliasingCheckbutton.UseUnderline = true;
-			this.vbox6.Add (this.antiAliasingCheckbutton);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.antiAliasingCheckbutton]));
+			this.vbox6.Add(this.antiAliasingCheckbutton);
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox6[this.antiAliasingCheckbutton]));
 			w17.Position = 1;
 			w17.Expand = false;
 			w17.Fill = false;
-			this.alignment4.Add (this.vbox6);
-			this.vbox1.Add (this.alignment4);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment4]));
+			this.alignment4.Add(this.vbox6);
+			this.vbox1.Add(this.alignment4);
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment4]));
 			w19.Position = 5;
 			w19.Expand = false;
 			w19.Fill = false;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
 			this.label1.MnemonicWidget = this.comboboxLineEndings;
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs
index b3e59c99f9..28afed11c1 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs
@@ -5,176 +5,177 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	public partial class HighlightingPanel
 	{
 		private global::Gtk.VBox vbox4;
-		
+
 		private global::Gtk.Label GtkLabel5;
-		
+
 		private global::Gtk.Alignment GtkAlignment;
-		
+
 		private global::Gtk.VBox vbox5;
-		
+
 		private global::Gtk.HBox hbox1;
-		
+
 		private global::Gtk.ScrolledWindow scrolledwindow1;
-		
+
 		private global::Gtk.TreeView styleTreeview;
-		
+
 		private global::Gtk.VBox vbox1;
-		
+
 		private global::Gtk.Button buttonNew;
-		
+
 		private global::Gtk.Button buttonEdit;
-		
+
 		private global::Gtk.HBox hbox2;
-		
+
 		private global::Gtk.Button addButton;
-		
+
 		private global::Gtk.Button removeButton;
-		
+
 		private global::Gtk.Button buttonExport;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.Gtk.Container+ContainerChild
-			this.vbox4 = new global::Gtk.VBox ();
+			this.vbox4 = new global::Gtk.VBox();
 			this.vbox4.Name = "vbox4";
 			this.vbox4.Spacing = 6;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.GtkLabel5 = new global::Gtk.Label ();
+			this.GtkLabel5 = new global::Gtk.Label();
 			this.GtkLabel5.Name = "GtkLabel5";
 			this.GtkLabel5.Xalign = 0F;
-			this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Color scheme</b>");
+			this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Color scheme</b>");
 			this.GtkLabel5.UseMarkup = true;
-			this.vbox4.Add (this.GtkLabel5);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.GtkLabel5]));
+			this.vbox4.Add(this.GtkLabel5);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.GtkLabel5]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.GtkAlignment = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
+			this.GtkAlignment = new global::Gtk.Alignment(0F, 0F, 1F, 1F);
 			this.GtkAlignment.Name = "GtkAlignment";
 			this.GtkAlignment.LeftPadding = ((uint)(12));
 			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1 = new global::Gtk.HBox();
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
+			this.scrolledwindow1 = new global::Gtk.ScrolledWindow();
 			this.scrolledwindow1.CanFocus = true;
 			this.scrolledwindow1.Name = "scrolledwindow1";
 			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			global::Gtk.Viewport w2 = new global::Gtk.Viewport ();
+			global::Gtk.Viewport w2 = new global::Gtk.Viewport();
 			w2.ShadowType = ((global::Gtk.ShadowType)(0));
 			// Container child GtkViewport.Gtk.Container+ContainerChild
-			this.styleTreeview = new global::Gtk.TreeView ();
+			this.styleTreeview = new global::Gtk.TreeView();
 			this.styleTreeview.CanFocus = true;
 			this.styleTreeview.Name = "styleTreeview";
 			this.styleTreeview.HeadersVisible = false;
-			w2.Add (this.styleTreeview);
-			this.scrolledwindow1.Add (w2);
-			this.hbox1.Add (this.scrolledwindow1);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.scrolledwindow1]));
+			w2.Add(this.styleTreeview);
+			this.scrolledwindow1.Add(w2);
+			this.hbox1.Add(this.scrolledwindow1);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1]));
 			w5.Position = 0;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.buttonNew = new global::Gtk.Button ();
+			this.buttonNew = new global::Gtk.Button();
 			this.buttonNew.CanFocus = true;
 			this.buttonNew.Name = "buttonNew";
 			this.buttonNew.UseStock = true;
 			this.buttonNew.UseUnderline = true;
 			this.buttonNew.Label = "gtk-new";
-			this.vbox1.Add (this.buttonNew);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.buttonNew]));
+			this.vbox1.Add(this.buttonNew);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.buttonNew]));
 			w6.Position = 0;
 			w6.Expand = false;
 			w6.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.buttonEdit = new global::Gtk.Button ();
+			this.buttonEdit = new global::Gtk.Button();
 			this.buttonEdit.CanFocus = true;
 			this.buttonEdit.Name = "buttonEdit";
 			this.buttonEdit.UseUnderline = true;
-			this.buttonEdit.Label = global::Mono.Unix.Catalog.GetString ("_Edit");
-			this.vbox1.Add (this.buttonEdit);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.buttonEdit]));
+			this.buttonEdit.Label = global::Mono.Unix.Catalog.GetString("_Edit");
+			this.vbox1.Add(this.buttonEdit);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.buttonEdit]));
 			w7.Position = 1;
 			w7.Expand = false;
 			w7.Fill = false;
-			this.hbox1.Add (this.vbox1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox1]));
+			this.hbox1.Add(this.vbox1);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.vbox1]));
 			w8.Position = 1;
 			w8.Expand = false;
 			w8.Fill = false;
-			this.vbox5.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox1]));
+			this.vbox5.Add(this.hbox1);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox1]));
 			w9.Position = 0;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
+			this.hbox2 = new global::Gtk.HBox();
 			this.hbox2.Name = "hbox2";
 			this.hbox2.Spacing = 6;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.addButton = new global::Gtk.Button ();
+			this.addButton = new global::Gtk.Button();
 			this.addButton.CanFocus = true;
 			this.addButton.Name = "addButton";
 			this.addButton.UseStock = true;
 			this.addButton.UseUnderline = true;
 			this.addButton.Label = "gtk-add";
-			this.hbox2.Add (this.addButton);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.addButton]));
+			this.hbox2.Add(this.addButton);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.addButton]));
 			w10.PackType = ((global::Gtk.PackType)(1));
 			w10.Position = 0;
 			w10.Expand = false;
 			w10.Fill = false;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.removeButton = new global::Gtk.Button ();
+			this.removeButton = new global::Gtk.Button();
 			this.removeButton.CanFocus = true;
 			this.removeButton.Name = "removeButton";
 			this.removeButton.UseStock = true;
 			this.removeButton.UseUnderline = true;
 			this.removeButton.Label = "gtk-remove";
-			this.hbox2.Add (this.removeButton);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.removeButton]));
+			this.hbox2.Add(this.removeButton);
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.removeButton]));
 			w11.PackType = ((global::Gtk.PackType)(1));
 			w11.Position = 1;
 			w11.Expand = false;
 			w11.Fill = false;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.buttonExport = new global::Gtk.Button ();
+			this.buttonExport = new global::Gtk.Button();
 			this.buttonExport.CanFocus = true;
 			this.buttonExport.Name = "buttonExport";
 			this.buttonExport.UseUnderline = true;
-			this.buttonExport.Label = global::Mono.Unix.Catalog.GetString ("Export");
-			this.hbox2.Add (this.buttonExport);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonExport]));
+			this.buttonExport.Label = global::Mono.Unix.Catalog.GetString("Export");
+			this.hbox2.Add(this.buttonExport);
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.buttonExport]));
 			w12.PackType = ((global::Gtk.PackType)(1));
 			w12.Position = 2;
 			w12.Expand = false;
 			w12.Fill = false;
-			this.vbox5.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2]));
+			this.vbox5.Add(this.hbox2);
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox2]));
 			w13.PackType = ((global::Gtk.PackType)(1));
 			w13.Position = 1;
 			w13.Expand = false;
 			w13.Fill = false;
-			this.GtkAlignment.Add (this.vbox5);
-			this.vbox4.Add (this.GtkAlignment);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.GtkAlignment]));
+			this.GtkAlignment.Add(this.vbox5);
+			this.vbox4.Add(this.GtkAlignment);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.GtkAlignment]));
 			w15.Position = 1;
-			this.Add (this.vbox4);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox4);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs
index e186e1dc05..7da2e57e69 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs
@@ -5,176 +5,194 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	public partial class MarkerPanel
 	{
 		private global::Gtk.VBox vbox1;
+
 		private global::Gtk.Label GtkLabel9;
+
 		private global::Gtk.Alignment alignment1;
+
 		private global::Gtk.VBox vbox3;
+
 		private global::Gtk.CheckButton showLineNumbersCheckbutton;
+
 		private global::Gtk.CheckButton underlineErrorsCheckbutton;
+
 		private global::Gtk.CheckButton highlightMatchingBracketCheckbutton;
+
 		private global::Gtk.CheckButton highlightCurrentLineCheckbutton;
+
 		private global::Gtk.CheckButton showRulerCheckbutton;
+
 		private global::Gtk.CheckButton enableAnimationCheckbutton1;
+
 		private global::Gtk.CheckButton enableHighlightUsagesCheckbutton;
+
 		private global::Gtk.CheckButton drawIndentMarkersCheckbutton;
+
 		private global::Gtk.CheckButton enableQuickDiffCheckbutton;
+
 		private global::Gtk.Table table1;
+
 		private global::Gtk.CheckButton checkbuttonLineEndings;
+
 		private global::Gtk.CheckButton checkbuttonSpaces;
+
 		private global::Gtk.CheckButton checkbuttonTabs;
+
 		private global::Gtk.Label label1;
+
 		private global::Gtk.ComboBox showWhitespacesCombobox;
-		
-		protected virtual void Build ()
+
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.MarkerPanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.MarkerPanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel9 = new global::Gtk.Label ();
+			this.GtkLabel9 = new global::Gtk.Label();
 			this.GtkLabel9.Name = "GtkLabel9";
 			this.GtkLabel9.Xalign = 0F;
-			this.GtkLabel9.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>General</b>");
+			this.GtkLabel9.LabelProp = global::Mono.Unix.Catalog.GetString("<b>General</b>");
 			this.GtkLabel9.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel9);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel9]));
+			this.vbox1.Add(this.GtkLabel9);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel9]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment1 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment1 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment1.Name = "alignment1";
 			this.alignment1.LeftPadding = ((uint)(12));
 			// Container child alignment1.Gtk.Container+ContainerChild
-			this.vbox3 = new global::Gtk.VBox ();
+			this.vbox3 = new global::Gtk.VBox();
 			this.vbox3.Name = "vbox3";
 			this.vbox3.Spacing = 6;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.showLineNumbersCheckbutton = new global::Gtk.CheckButton ();
+			this.showLineNumbersCheckbutton = new global::Gtk.CheckButton();
 			this.showLineNumbersCheckbutton.CanFocus = true;
 			this.showLineNumbersCheckbutton.Name = "showLineNumbersCheckbutton";
-			this.showLineNumbersCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show line numbers");
+			this.showLineNumbersCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show line numbers");
 			this.showLineNumbersCheckbutton.DrawIndicator = true;
 			this.showLineNumbersCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.showLineNumbersCheckbutton);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.showLineNumbersCheckbutton]));
+			this.vbox3.Add(this.showLineNumbersCheckbutton);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.showLineNumbersCheckbutton]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.underlineErrorsCheckbutton = new global::Gtk.CheckButton ();
+			this.underlineErrorsCheckbutton = new global::Gtk.CheckButton();
 			this.underlineErrorsCheckbutton.CanFocus = true;
 			this.underlineErrorsCheckbutton.Name = "underlineErrorsCheckbutton";
-			this.underlineErrorsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Underline errors");
+			this.underlineErrorsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Underline errors");
 			this.underlineErrorsCheckbutton.DrawIndicator = true;
 			this.underlineErrorsCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.underlineErrorsCheckbutton);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.underlineErrorsCheckbutton]));
+			this.vbox3.Add(this.underlineErrorsCheckbutton);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.underlineErrorsCheckbutton]));
 			w3.Position = 1;
 			w3.Expand = false;
 			w3.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.highlightMatchingBracketCheckbutton = new global::Gtk.CheckButton ();
+			this.highlightMatchingBracketCheckbutton = new global::Gtk.CheckButton();
 			this.highlightMatchingBracketCheckbutton.CanFocus = true;
 			this.highlightMatchingBracketCheckbutton.Name = "highlightMatchingBracketCheckbutton";
-			this.highlightMatchingBracketCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Highlight matching braces");
+			this.highlightMatchingBracketCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Highlight matching braces");
 			this.highlightMatchingBracketCheckbutton.DrawIndicator = true;
 			this.highlightMatchingBracketCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.highlightMatchingBracketCheckbutton);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.highlightMatchingBracketCheckbutton]));
+			this.vbox3.Add(this.highlightMatchingBracketCheckbutton);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.highlightMatchingBracketCheckbutton]));
 			w4.Position = 2;
 			w4.Expand = false;
 			w4.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.highlightCurrentLineCheckbutton = new global::Gtk.CheckButton ();
+			this.highlightCurrentLineCheckbutton = new global::Gtk.CheckButton();
 			this.highlightCurrentLineCheckbutton.CanFocus = true;
 			this.highlightCurrentLineCheckbutton.Name = "highlightCurrentLineCheckbutton";
-			this.highlightCurrentLineCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Highlight _current line");
+			this.highlightCurrentLineCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Highlight _current line");
 			this.highlightCurrentLineCheckbutton.DrawIndicator = true;
 			this.highlightCurrentLineCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.highlightCurrentLineCheckbutton);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.highlightCurrentLineCheckbutton]));
+			this.vbox3.Add(this.highlightCurrentLineCheckbutton);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.highlightCurrentLineCheckbutton]));
 			w5.Position = 3;
 			w5.Expand = false;
 			w5.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.showRulerCheckbutton = new global::Gtk.CheckButton ();
+			this.showRulerCheckbutton = new global::Gtk.CheckButton();
 			this.showRulerCheckbutton.CanFocus = true;
 			this.showRulerCheckbutton.Name = "showRulerCheckbutton";
-			this.showRulerCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Show _column ruler");
+			this.showRulerCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Show _column ruler");
 			this.showRulerCheckbutton.DrawIndicator = true;
 			this.showRulerCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.showRulerCheckbutton);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.showRulerCheckbutton]));
+			this.vbox3.Add(this.showRulerCheckbutton);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.showRulerCheckbutton]));
 			w6.Position = 4;
 			w6.Expand = false;
 			w6.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.enableAnimationCheckbutton1 = new global::Gtk.CheckButton ();
+			this.enableAnimationCheckbutton1 = new global::Gtk.CheckButton();
 			this.enableAnimationCheckbutton1.CanFocus = true;
 			this.enableAnimationCheckbutton1.Name = "enableAnimationCheckbutton1";
-			this.enableAnimationCheckbutton1.Label = global::Mono.Unix.Catalog.GetString ("_Enable animations");
+			this.enableAnimationCheckbutton1.Label = global::Mono.Unix.Catalog.GetString("_Enable animations");
 			this.enableAnimationCheckbutton1.DrawIndicator = true;
 			this.enableAnimationCheckbutton1.UseUnderline = true;
-			this.vbox3.Add (this.enableAnimationCheckbutton1);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.enableAnimationCheckbutton1]));
+			this.vbox3.Add(this.enableAnimationCheckbutton1);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.enableAnimationCheckbutton1]));
 			w7.Position = 5;
 			w7.Expand = false;
 			w7.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.enableHighlightUsagesCheckbutton = new global::Gtk.CheckButton ();
+			this.enableHighlightUsagesCheckbutton = new global::Gtk.CheckButton();
 			this.enableHighlightUsagesCheckbutton.CanFocus = true;
 			this.enableHighlightUsagesCheckbutton.Name = "enableHighlightUsagesCheckbutton";
-			this.enableHighlightUsagesCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Highlight _identifier references");
+			this.enableHighlightUsagesCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Highlight _identifier references");
 			this.enableHighlightUsagesCheckbutton.DrawIndicator = true;
 			this.enableHighlightUsagesCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.enableHighlightUsagesCheckbutton);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.enableHighlightUsagesCheckbutton]));
+			this.vbox3.Add(this.enableHighlightUsagesCheckbutton);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.enableHighlightUsagesCheckbutton]));
 			w8.Position = 6;
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.drawIndentMarkersCheckbutton = new global::Gtk.CheckButton ();
+			this.drawIndentMarkersCheckbutton = new global::Gtk.CheckButton();
 			this.drawIndentMarkersCheckbutton.CanFocus = true;
 			this.drawIndentMarkersCheckbutton.Name = "drawIndentMarkersCheckbutton";
-			this.drawIndentMarkersCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show indentation guides");
+			this.drawIndentMarkersCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show indentation guides");
 			this.drawIndentMarkersCheckbutton.DrawIndicator = true;
 			this.drawIndentMarkersCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.drawIndentMarkersCheckbutton);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.drawIndentMarkersCheckbutton]));
+			this.vbox3.Add(this.drawIndentMarkersCheckbutton);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.drawIndentMarkersCheckbutton]));
 			w9.Position = 7;
 			w9.Expand = false;
 			w9.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.enableQuickDiffCheckbutton = new global::Gtk.CheckButton ();
+			this.enableQuickDiffCheckbutton = new global::Gtk.CheckButton();
 			this.enableQuickDiffCheckbutton.CanFocus = true;
 			this.enableQuickDiffCheckbutton.Name = "enableQuickDiffCheckbutton";
-			this.enableQuickDiffCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Visualize changed lines");
+			this.enableQuickDiffCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Visualize changed lines");
 			this.enableQuickDiffCheckbutton.DrawIndicator = true;
 			this.enableQuickDiffCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.enableQuickDiffCheckbutton);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.enableQuickDiffCheckbutton]));
+			this.vbox3.Add(this.enableQuickDiffCheckbutton);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.enableQuickDiffCheckbutton]));
 			w10.Position = 8;
 			w10.Expand = false;
 			w10.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(4)), false);
+			this.table1 = new global::Gtk.Table(((uint)(4)), ((uint)(4)), false);
 			this.table1.Name = "table1";
 			this.table1.RowSpacing = ((uint)(6));
 			this.table1.ColumnSpacing = ((uint)(6));
 			// Container child table1.Gtk.Table+TableChild
-			this.checkbuttonLineEndings = new global::Gtk.CheckButton ();
+			this.checkbuttonLineEndings = new global::Gtk.CheckButton();
 			this.checkbuttonLineEndings.CanFocus = true;
 			this.checkbuttonLineEndings.Name = "checkbuttonLineEndings";
-			this.checkbuttonLineEndings.Label = global::Mono.Unix.Catalog.GetString ("Include Line Endings");
+			this.checkbuttonLineEndings.Label = global::Mono.Unix.Catalog.GetString("Include Line Endings");
 			this.checkbuttonLineEndings.DrawIndicator = true;
 			this.checkbuttonLineEndings.UseUnderline = true;
-			this.table1.Add (this.checkbuttonLineEndings);
-			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.checkbuttonLineEndings]));
+			this.table1.Add(this.checkbuttonLineEndings);
+			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonLineEndings]));
 			w11.TopAttach = ((uint)(3));
 			w11.BottomAttach = ((uint)(4));
 			w11.LeftAttach = ((uint)(1));
@@ -182,14 +200,14 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w11.XOptions = ((global::Gtk.AttachOptions)(4));
 			w11.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.checkbuttonSpaces = new global::Gtk.CheckButton ();
+			this.checkbuttonSpaces = new global::Gtk.CheckButton();
 			this.checkbuttonSpaces.CanFocus = true;
 			this.checkbuttonSpaces.Name = "checkbuttonSpaces";
-			this.checkbuttonSpaces.Label = global::Mono.Unix.Catalog.GetString ("Include _Spaces");
+			this.checkbuttonSpaces.Label = global::Mono.Unix.Catalog.GetString("Include _Spaces");
 			this.checkbuttonSpaces.DrawIndicator = true;
 			this.checkbuttonSpaces.UseUnderline = true;
-			this.table1.Add (this.checkbuttonSpaces);
-			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.checkbuttonSpaces]));
+			this.table1.Add(this.checkbuttonSpaces);
+			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonSpaces]));
 			w12.TopAttach = ((uint)(1));
 			w12.BottomAttach = ((uint)(2));
 			w12.LeftAttach = ((uint)(1));
@@ -197,14 +215,14 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w12.XOptions = ((global::Gtk.AttachOptions)(4));
 			w12.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.checkbuttonTabs = new global::Gtk.CheckButton ();
+			this.checkbuttonTabs = new global::Gtk.CheckButton();
 			this.checkbuttonTabs.CanFocus = true;
 			this.checkbuttonTabs.Name = "checkbuttonTabs";
-			this.checkbuttonTabs.Label = global::Mono.Unix.Catalog.GetString ("Include Tabs");
+			this.checkbuttonTabs.Label = global::Mono.Unix.Catalog.GetString("Include Tabs");
 			this.checkbuttonTabs.DrawIndicator = true;
 			this.checkbuttonTabs.UseUnderline = true;
-			this.table1.Add (this.checkbuttonTabs);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.checkbuttonTabs]));
+			this.table1.Add(this.checkbuttonTabs);
+			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonTabs]));
 			w13.TopAttach = ((uint)(2));
 			w13.BottomAttach = ((uint)(3));
 			w13.LeftAttach = ((uint)(1));
@@ -212,38 +230,39 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w13.XOptions = ((global::Gtk.AttachOptions)(4));
 			w13.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label1 = new global::Gtk.Label ();
+			this.label1 = new global::Gtk.Label();
 			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Show invisible characters:");
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Show invisible characters:");
 			this.label1.UseUnderline = true;
-			this.table1.Add (this.label1);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
+			this.table1.Add(this.label1);
+			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.label1]));
 			w14.XOptions = ((global::Gtk.AttachOptions)(4));
 			w14.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.showWhitespacesCombobox = global::Gtk.ComboBox.NewText ();
+			this.showWhitespacesCombobox = global::Gtk.ComboBox.NewText();
 			this.showWhitespacesCombobox.Name = "showWhitespacesCombobox";
-			this.table1.Add (this.showWhitespacesCombobox);
-			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1 [this.showWhitespacesCombobox]));
+			this.table1.Add(this.showWhitespacesCombobox);
+			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1[this.showWhitespacesCombobox]));
 			w15.LeftAttach = ((uint)(1));
 			w15.RightAttach = ((uint)(4));
 			w15.XOptions = ((global::Gtk.AttachOptions)(4));
 			w15.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox3.Add (this.table1);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.table1]));
+			this.vbox3.Add(this.table1);
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.table1]));
 			w16.Position = 9;
 			w16.Fill = false;
-			this.alignment1.Add (this.vbox3);
-			this.vbox1.Add (this.alignment1);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment1]));
+			this.alignment1.Add(this.vbox3);
+			this.vbox1.Add(this.alignment1);
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment1]));
 			w18.Position = 1;
 			w18.Expand = false;
 			w18.Fill = false;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs
index 8d919b5500..efa3323b30 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs
@@ -5,21 +5,29 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	public partial class NewColorShemeDialog
 	{
 		private global::Gtk.Table table1;
+
 		private global::Gtk.ComboBox comboboxBaseStyle;
+
 		private global::Gtk.Entry entryDescription;
+
 		private global::Gtk.Entry entryName;
+
 		private global::Gtk.Label label1;
+
 		private global::Gtk.Label label2;
+
 		private global::Gtk.Label label3;
+
 		private global::Gtk.Button buttonCancel;
+
 		private global::Gtk.Button buttonOk;
-		
-		protected virtual void Build ()
+
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Create new color sheme");
+			this.Title = global::Mono.Unix.Catalog.GetString("Create new color sheme");
 			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
 			this.BorderWidth = ((uint)(6));
 			// Internal child MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.VBox
@@ -27,26 +35,26 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w1.Name = "dialog1_VBox";
 			w1.BorderWidth = ((uint)(2));
 			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
+			this.table1 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false);
 			this.table1.Name = "table1";
 			this.table1.RowSpacing = ((uint)(6));
 			this.table1.ColumnSpacing = ((uint)(6));
 			// Container child table1.Gtk.Table+TableChild
-			this.comboboxBaseStyle = global::Gtk.ComboBox.NewText ();
+			this.comboboxBaseStyle = global::Gtk.ComboBox.NewText();
 			this.comboboxBaseStyle.Name = "comboboxBaseStyle";
-			this.table1.Add (this.comboboxBaseStyle);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboboxBaseStyle]));
+			this.table1.Add(this.comboboxBaseStyle);
+			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.comboboxBaseStyle]));
 			w2.LeftAttach = ((uint)(1));
 			w2.RightAttach = ((uint)(2));
 			w2.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.entryDescription = new global::Gtk.Entry ();
+			this.entryDescription = new global::Gtk.Entry();
 			this.entryDescription.CanFocus = true;
 			this.entryDescription.Name = "entryDescription";
 			this.entryDescription.IsEditable = true;
 			this.entryDescription.InvisibleChar = '●';
-			this.table1.Add (this.entryDescription);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryDescription]));
+			this.table1.Add(this.entryDescription);
+			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.entryDescription]));
 			w3.TopAttach = ((uint)(2));
 			w3.BottomAttach = ((uint)(3));
 			w3.LeftAttach = ((uint)(1));
@@ -54,13 +62,13 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w3.XOptions = ((global::Gtk.AttachOptions)(4));
 			w3.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.entryName = new global::Gtk.Entry ();
+			this.entryName = new global::Gtk.Entry();
 			this.entryName.CanFocus = true;
 			this.entryName.Name = "entryName";
 			this.entryName.IsEditable = true;
 			this.entryName.InvisibleChar = '●';
-			this.table1.Add (this.entryName);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryName]));
+			this.table1.Add(this.entryName);
+			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.entryName]));
 			w4.TopAttach = ((uint)(1));
 			w4.BottomAttach = ((uint)(2));
 			w4.LeftAttach = ((uint)(1));
@@ -68,41 +76,41 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w4.XOptions = ((global::Gtk.AttachOptions)(4));
 			w4.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label1 = new global::Gtk.Label ();
+			this.label1 = new global::Gtk.Label();
 			this.label1.Name = "label1";
 			this.label1.Xalign = 0F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Based on:");
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Based on:");
 			this.label1.UseMarkup = true;
 			this.label1.UseUnderline = true;
-			this.table1.Add (this.label1);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
+			this.table1.Add(this.label1);
+			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.label1]));
 			w5.XOptions = ((global::Gtk.AttachOptions)(4));
 			w5.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label2 = new global::Gtk.Label ();
+			this.label2 = new global::Gtk.Label();
 			this.label2.Name = "label2";
 			this.label2.Xalign = 0F;
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("_Name:");
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("_Name:");
 			this.label2.UseUnderline = true;
-			this.table1.Add (this.label2);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2]));
+			this.table1.Add(this.label2);
+			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.label2]));
 			w6.TopAttach = ((uint)(1));
 			w6.BottomAttach = ((uint)(2));
 			w6.XOptions = ((global::Gtk.AttachOptions)(4));
 			w6.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label3 = new global::Gtk.Label ();
+			this.label3 = new global::Gtk.Label();
 			this.label3.Name = "label3";
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("_Description:");
+			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("_Description:");
 			this.label3.UseUnderline = true;
-			this.table1.Add (this.label3);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3]));
+			this.table1.Add(this.label3);
+			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.label3]));
 			w7.TopAttach = ((uint)(2));
 			w7.BottomAttach = ((uint)(3));
 			w7.XOptions = ((global::Gtk.AttachOptions)(4));
 			w7.YOptions = ((global::Gtk.AttachOptions)(4));
-			w1.Add (this.table1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1 [this.table1]));
+			w1.Add(this.table1);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
 			w8.Position = 0;
 			w8.Expand = false;
 			w8.Fill = false;
@@ -113,38 +121,39 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w9.BorderWidth = ((uint)(5));
 			w9.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::Gtk.Button ();
+			this.buttonCancel = new global::Gtk.Button();
 			this.buttonCancel.CanDefault = true;
 			this.buttonCancel.CanFocus = true;
 			this.buttonCancel.Name = "buttonCancel";
 			this.buttonCancel.UseStock = true;
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9 [this.buttonCancel]));
+			this.AddActionWidget(this.buttonCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9[this.buttonCancel]));
 			w10.Expand = false;
 			w10.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
+			this.buttonOk = new global::Gtk.Button();
 			this.buttonOk.CanDefault = true;
 			this.buttonOk.CanFocus = true;
 			this.buttonOk.Name = "buttonOk";
 			this.buttonOk.UseStock = true;
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9 [this.buttonOk]));
+			this.AddActionWidget(this.buttonOk, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9[this.buttonOk]));
 			w11.Position = 1;
 			w11.Expand = false;
 			w11.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
 			this.DefaultWidth = 393;
 			this.DefaultHeight = 148;
 			this.label2.MnemonicWidget = this.entryName;
 			this.label3.MnemonicWidget = this.entryDescription;
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs
index 397cff6550..a4f72fc66a 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs
@@ -4,16 +4,17 @@ namespace MonoDevelop.SourceEditor
 {
 	internal partial class PrintSettingsWidget
 	{
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.PrintSettingsWidget
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.PrintSettingsWidget";
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Hide ();
+			this.Hide();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs
index 1768c2468d..95a85dd82a 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs
@@ -5,58 +5,80 @@ namespace MonoDevelop.SourceEditor
 	public partial class SearchAndReplaceWidget
 	{
 		private global::Gtk.Table table;
+
 		private global::Gtk.Button buttonSearchMode;
+
 		private global::Gtk.Arrow searchButtonModeArrow;
+
 		private global::Gtk.HBox hbox1;
+
 		private global::MonoDevelop.Components.SearchEntry searchEntry;
+
 		private global::Gtk.Button buttonSearchBackward;
+
 		private global::Gtk.EventBox eventbox2;
+
 		private global::Gtk.Image image2;
+
 		private global::Gtk.Button buttonSearchForward;
+
 		private global::Gtk.EventBox eventbox3;
+
 		private global::Gtk.Image image3;
+
 		private global::Gtk.Button closeButton;
+
 		private global::Gtk.EventBox eventbox4;
+
 		private global::Gtk.Image image4;
+
 		private global::Gtk.HBox hbox2;
+
 		private global::Gtk.Entry entryReplace;
+
 		private global::Gtk.Button buttonReplace;
+
 		private global::Gtk.EventBox eventbox5;
+
 		private global::Gtk.Image image5;
+
 		private global::Gtk.Button buttonReplaceAll;
+
 		private global::Gtk.HBox hbox3;
+
 		private global::Gtk.EventBox eventbox6;
+
 		private global::Gtk.Image image6;
+
 		private global::Gtk.Label label1;
-		
-		protected virtual void Build ()
+
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.SearchAndReplaceWidget
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.SearchAndReplaceWidget";
 			// Container child MonoDevelop.SourceEditor.SearchAndReplaceWidget.Gtk.Container+ContainerChild
-			this.table = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false);
+			this.table = new global::Gtk.Table(((uint)(2)), ((uint)(2)), false);
 			this.table.Name = "table";
 			this.table.BorderWidth = ((uint)(4));
 			// Container child table.Gtk.Table+TableChild
-			this.buttonSearchMode = new global::Gtk.Button ();
+			this.buttonSearchMode = new global::Gtk.Button();
 			this.buttonSearchMode.CanFocus = true;
 			this.buttonSearchMode.Name = "buttonSearchMode";
 			// Container child buttonSearchMode.Gtk.Container+ContainerChild
-			this.searchButtonModeArrow = new global::Gtk.Arrow (((global::Gtk.ArrowType)(0)), ((global::Gtk.ShadowType)(0)));
+			this.searchButtonModeArrow = new global::Gtk.Arrow(((global::Gtk.ArrowType)(0)), ((global::Gtk.ShadowType)(0)));
 			this.searchButtonModeArrow.Name = "searchButtonModeArrow";
-			this.buttonSearchMode.Add (this.searchButtonModeArrow);
-			this.buttonSearchMode.Label = null;
-			this.table.Add (this.buttonSearchMode);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table [this.buttonSearchMode]));
+			this.buttonSearchMode.Add(this.searchButtonModeArrow);
+			this.table.Add(this.buttonSearchMode);
+			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table[this.buttonSearchMode]));
 			w2.XOptions = ((global::Gtk.AttachOptions)(4));
 			w2.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table.Gtk.Table+TableChild
-			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1 = new global::Gtk.HBox();
 			this.hbox1.Name = "hbox1";
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.searchEntry = new global::MonoDevelop.Components.SearchEntry ();
+			this.searchEntry = new global::MonoDevelop.Components.SearchEntry();
 			this.searchEntry.Name = "searchEntry";
 			this.searchEntry.ForceFilterButtonVisible = false;
 			this.searchEntry.HasFrame = true;
@@ -65,166 +87,162 @@ namespace MonoDevelop.SourceEditor
 			this.searchEntry.ActiveFilterID = 0;
 			this.searchEntry.Ready = false;
 			this.searchEntry.HasFocus = false;
-			this.hbox1.Add (this.searchEntry);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.searchEntry]));
+			this.hbox1.Add(this.searchEntry);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.searchEntry]));
 			w3.Position = 0;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.buttonSearchBackward = new global::Gtk.Button ();
+			this.buttonSearchBackward = new global::Gtk.Button();
 			this.buttonSearchBackward.CanFocus = true;
 			this.buttonSearchBackward.Name = "buttonSearchBackward";
 			this.buttonSearchBackward.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonSearchBackward.Gtk.Container+ContainerChild
-			this.eventbox2 = new global::Gtk.EventBox ();
+			this.eventbox2 = new global::Gtk.EventBox();
 			this.eventbox2.Name = "eventbox2";
 			this.eventbox2.AboveChild = true;
 			this.eventbox2.VisibleWindow = false;
 			// Container child eventbox2.Gtk.Container+ContainerChild
-			this.image2 = new global::Gtk.Image ();
+			this.image2 = new global::Gtk.Image();
 			this.image2.Name = "image2";
-			this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-up", global::Gtk.IconSize.Menu);
-			this.eventbox2.Add (this.image2);
-			this.buttonSearchBackward.Add (this.eventbox2);
-			this.buttonSearchBackward.Label = null;
-			this.hbox1.Add (this.buttonSearchBackward);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonSearchBackward]));
+			this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-go-up", global::Gtk.IconSize.Menu);
+			this.eventbox2.Add(this.image2);
+			this.buttonSearchBackward.Add(this.eventbox2);
+			this.hbox1.Add(this.buttonSearchBackward);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonSearchBackward]));
 			w6.Position = 1;
 			w6.Expand = false;
 			w6.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.buttonSearchForward = new global::Gtk.Button ();
+			this.buttonSearchForward = new global::Gtk.Button();
 			this.buttonSearchForward.CanFocus = true;
 			this.buttonSearchForward.Name = "buttonSearchForward";
 			this.buttonSearchForward.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonSearchForward.Gtk.Container+ContainerChild
-			this.eventbox3 = new global::Gtk.EventBox ();
+			this.eventbox3 = new global::Gtk.EventBox();
 			this.eventbox3.Name = "eventbox3";
 			this.eventbox3.AboveChild = true;
 			this.eventbox3.VisibleWindow = false;
 			// Container child eventbox3.Gtk.Container+ContainerChild
-			this.image3 = new global::Gtk.Image ();
+			this.image3 = new global::Gtk.Image();
 			this.image3.Name = "image3";
-			this.image3.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-down", global::Gtk.IconSize.Menu);
-			this.eventbox3.Add (this.image3);
-			this.buttonSearchForward.Add (this.eventbox3);
-			this.buttonSearchForward.Label = null;
-			this.hbox1.Add (this.buttonSearchForward);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonSearchForward]));
+			this.image3.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-go-down", global::Gtk.IconSize.Menu);
+			this.eventbox3.Add(this.image3);
+			this.buttonSearchForward.Add(this.eventbox3);
+			this.hbox1.Add(this.buttonSearchForward);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonSearchForward]));
 			w9.Position = 2;
 			w9.Expand = false;
 			w9.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.closeButton = new global::Gtk.Button ();
+			this.closeButton = new global::Gtk.Button();
 			this.closeButton.CanFocus = true;
 			this.closeButton.Name = "closeButton";
 			this.closeButton.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child closeButton.Gtk.Container+ContainerChild
-			this.eventbox4 = new global::Gtk.EventBox ();
+			this.eventbox4 = new global::Gtk.EventBox();
 			this.eventbox4.Name = "eventbox4";
 			this.eventbox4.AboveChild = true;
 			this.eventbox4.VisibleWindow = false;
 			// Container child eventbox4.Gtk.Container+ContainerChild
-			this.image4 = new global::Gtk.Image ();
+			this.image4 = new global::Gtk.Image();
 			this.image4.Name = "image4";
-			this.image4.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-close", global::Gtk.IconSize.Menu);
-			this.eventbox4.Add (this.image4);
-			this.closeButton.Add (this.eventbox4);
-			this.closeButton.Label = null;
-			this.hbox1.Add (this.closeButton);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.closeButton]));
+			this.image4.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-close", global::Gtk.IconSize.Menu);
+			this.eventbox4.Add(this.image4);
+			this.closeButton.Add(this.eventbox4);
+			this.hbox1.Add(this.closeButton);
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.closeButton]));
 			w12.Position = 3;
 			w12.Expand = false;
 			w12.Fill = false;
-			this.table.Add (this.hbox1);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table [this.hbox1]));
+			this.table.Add(this.hbox1);
+			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table[this.hbox1]));
 			w13.LeftAttach = ((uint)(1));
 			w13.RightAttach = ((uint)(2));
 			w13.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table.Gtk.Table+TableChild
-			this.hbox2 = new global::Gtk.HBox ();
+			this.hbox2 = new global::Gtk.HBox();
 			this.hbox2.Name = "hbox2";
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.entryReplace = new global::Gtk.Entry ();
+			this.entryReplace = new global::Gtk.Entry();
 			this.entryReplace.CanFocus = true;
 			this.entryReplace.Name = "entryReplace";
 			this.entryReplace.IsEditable = true;
 			this.entryReplace.InvisibleChar = '●';
-			this.hbox2.Add (this.entryReplace);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.entryReplace]));
+			this.hbox2.Add(this.entryReplace);
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.entryReplace]));
 			w14.Position = 0;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.buttonReplace = new global::Gtk.Button ();
+			this.buttonReplace = new global::Gtk.Button();
 			this.buttonReplace.CanFocus = true;
 			this.buttonReplace.Name = "buttonReplace";
 			this.buttonReplace.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonReplace.Gtk.Container+ContainerChild
-			this.eventbox5 = new global::Gtk.EventBox ();
+			this.eventbox5 = new global::Gtk.EventBox();
 			this.eventbox5.Name = "eventbox5";
 			this.eventbox5.AboveChild = true;
 			this.eventbox5.VisibleWindow = false;
 			// Container child eventbox5.Gtk.Container+ContainerChild
-			this.image5 = new global::Gtk.Image ();
+			this.image5 = new global::Gtk.Image();
 			this.image5.Name = "image5";
-			this.image5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-find-and-replace", global::Gtk.IconSize.Menu);
-			this.eventbox5.Add (this.image5);
-			this.buttonReplace.Add (this.eventbox5);
-			this.buttonReplace.Label = null;
-			this.hbox2.Add (this.buttonReplace);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonReplace]));
+			this.image5.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-find-and-replace", global::Gtk.IconSize.Menu);
+			this.eventbox5.Add(this.image5);
+			this.buttonReplace.Add(this.eventbox5);
+			this.hbox2.Add(this.buttonReplace);
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.buttonReplace]));
 			w17.Position = 1;
 			w17.Expand = false;
 			w17.Fill = false;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.buttonReplaceAll = new global::Gtk.Button ();
+			this.buttonReplaceAll = new global::Gtk.Button();
 			this.buttonReplaceAll.CanFocus = true;
 			this.buttonReplaceAll.Name = "buttonReplaceAll";
 			this.buttonReplaceAll.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonReplaceAll.Gtk.Container+ContainerChild
-			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3 = new global::Gtk.HBox();
 			this.hbox3.Name = "hbox3";
 			this.hbox3.Spacing = 6;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.eventbox6 = new global::Gtk.EventBox ();
+			this.eventbox6 = new global::Gtk.EventBox();
 			this.eventbox6.Name = "eventbox6";
 			this.eventbox6.AboveChild = true;
 			this.eventbox6.VisibleWindow = false;
 			// Container child eventbox6.Gtk.Container+ContainerChild
-			this.image6 = new global::Gtk.Image ();
+			this.image6 = new global::Gtk.Image();
 			this.image6.Name = "image6";
-			this.image6.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-find-and-replace", global::Gtk.IconSize.Menu);
-			this.eventbox6.Add (this.image6);
-			this.hbox3.Add (this.eventbox6);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.eventbox6]));
+			this.image6.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-find-and-replace", global::Gtk.IconSize.Menu);
+			this.eventbox6.Add(this.image6);
+			this.hbox3.Add(this.eventbox6);
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.eventbox6]));
 			w19.Position = 0;
 			w19.Expand = false;
 			w19.Fill = false;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.label1 = new global::Gtk.Label ();
+			this.label1 = new global::Gtk.Label();
 			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("All");
-			this.hbox3.Add (this.label1);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label1]));
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("All");
+			this.hbox3.Add(this.label1);
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.label1]));
 			w20.Position = 1;
 			w20.Expand = false;
 			w20.Fill = false;
-			this.buttonReplaceAll.Add (this.hbox3);
-			this.buttonReplaceAll.Label = null;
-			this.hbox2.Add (this.buttonReplaceAll);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonReplaceAll]));
+			this.buttonReplaceAll.Add(this.hbox3);
+			this.hbox2.Add(this.buttonReplaceAll);
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.buttonReplaceAll]));
 			w22.Position = 2;
 			w22.Expand = false;
 			w22.Fill = false;
-			this.table.Add (this.hbox2);
-			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table [this.hbox2]));
+			this.table.Add(this.hbox2);
+			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table[this.hbox2]));
 			w23.TopAttach = ((uint)(1));
 			w23.BottomAttach = ((uint)(2));
 			w23.LeftAttach = ((uint)(1));
 			w23.RightAttach = ((uint)(2));
 			w23.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.Add (this.table);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.table);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs
index 5cdc11900b..3c6a731de3 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs
@@ -6,9 +6,10 @@ namespace Stetic
 	{
 		private static bool initialized;
 
-		internal static void Initialize (Gtk.Widget iconRenderer)
+		internal static void Initialize(Gtk.Widget iconRenderer)
 		{
-			if ((Stetic.Gui.initialized == false)) {
+			if ((Stetic.Gui.initialized == false))
+			{
 				Stetic.Gui.initialized = true;
 			}
 		}
@@ -17,50 +18,54 @@ namespace Stetic
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
-		
+
 		private Gtk.UIManager uimanager;
 
-		public static BinContainer Attach (Gtk.Bin bin)
+		public static BinContainer Attach(Gtk.Bin bin)
 		{
-			BinContainer bc = new BinContainer ();
-			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
-			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
-			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
+			BinContainer bc = new BinContainer();
+			bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
+			bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
+			bin.Added += new Gtk.AddedHandler(bc.OnAdded);
 			return bc;
 		}
 
-		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
+		private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args)
 		{
-			if ((this.child != null)) {
-				args.Requisition = this.child.SizeRequest ();
+			if ((this.child != null))
+			{
+				args.Requisition = this.child.SizeRequest();
 			}
 		}
 
-		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
+		private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args)
 		{
-			if ((this.child != null)) {
+			if ((this.child != null))
+			{
 				this.child.Allocation = args.Allocation;
 			}
 		}
 
-		private void OnAdded (object sender, Gtk.AddedArgs args)
+		private void OnAdded(object sender, Gtk.AddedArgs args)
 		{
 			this.child = args.Widget;
 		}
 
-		public void SetUiManager (Gtk.UIManager uim)
+		public void SetUiManager(Gtk.UIManager uim)
 		{
 			this.uimanager = uim;
-			this.child.Realized += new System.EventHandler (this.OnRealized);
+			this.child.Realized += new System.EventHandler(this.OnRealized);
 		}
 
-		private void OnRealized (object sender, System.EventArgs args)
+		private void OnRealized(object sender, System.EventArgs args)
 		{
-			if ((this.uimanager != null)) {
+			if ((this.uimanager != null))
+			{
 				Gtk.Widget w;
 				w = this.child.Toplevel;
-				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
-					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
+				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w)))
+				{
+					((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
 					this.uimanager = null;
 				}
 			}
@@ -69,32 +74,41 @@ namespace Stetic
 
 	internal class IconLoader
 	{
-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
+		public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size)
 		{
-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
-			if ((res != null)) {
+			Gdk.Pixbuf res = widget.RenderIcon(name, size, null);
+			if ((res != null))
+			{
 				return res;
-			} else {
+			}
+			else
+			{
 				int sz;
 				int sy;
-				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
-				try {
-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
-				} catch (System.Exception) {
-					if ((name != "gtk-missing-image")) {
-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
-					} else {
-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
-						Gdk.GC gc = new Gdk.GC (pmap);
-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
+				global::Gtk.Icon.SizeLookup(size, out sz, out sy);
+				try
+				{
+					return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
+				}
+				catch (System.Exception)
+				{
+					if ((name != "gtk-missing-image"))
+					{
+						return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size);
+					}
+					else
+					{
+						Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
+						Gdk.GC gc = new Gdk.GC(pmap);
+						gc.RgbFgColor = new Gdk.Color(255, 255, 255);
+						pmap.DrawRectangle(gc, true, 0, 0, sz, sz);
+						gc.RgbFgColor = new Gdk.Color(0, 0, 0);
+						pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1));
+						gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
+						gc.RgbFgColor = new Gdk.Color(255, 0, 0);
+						pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
+						pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
+						return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
 					}
 				}
 			}
@@ -103,12 +117,12 @@ namespace Stetic
 
 	internal class ActionGroups
 	{
-		public static Gtk.ActionGroup GetActionGroup (System.Type type)
+		public static Gtk.ActionGroup GetActionGroup(System.Type type)
 		{
-			return Stetic.ActionGroups.GetActionGroup (type.FullName);
+			return Stetic.ActionGroups.GetActionGroup(type.FullName);
 		}
 
-		public static Gtk.ActionGroup GetActionGroup (string name)
+		public static Gtk.ActionGroup GetActionGroup(string name)
 		{
 			return null;
 		}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
index 9fbd1d4b4d..31f1e1e159 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
@@ -7,9 +7,8 @@
   <import>
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
-    <widget-library name="../../../../build/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll" />
     <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
-    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" internal="true" />
+    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel" design-size="454 364">
     <property name="MemberName" />
@@ -2430,65 +2429,11 @@
   <widget class="Gtk.Bin" id="MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel" design-size="427 423">
     <property name="MemberName" />
     <property name="Visible">False</property>
-    <property name="GeneratePublic">False</property>
     <child>
       <widget class="Gtk.VBox" id="vbox1">
         <property name="MemberName" />
         <property name="Spacing">6</property>
         <child>
-          <widget class="Gtk.HBox" id="hbox1">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <child>
-              <widget class="Gtk.Label" id="label2">
-                <property name="MemberName" />
-                <property name="LabelProp" translatable="yes">Completion list has</property>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.SpinButton" id="spinbutton1">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="Upper">100</property>
-                <property name="PageIncrement">10</property>
-                <property name="StepIncrement">1</property>
-                <property name="ClimbRate">1</property>
-                <property name="Numeric">True</property>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label3">
-                <property name="MemberName" />
-                <property name="LabelProp" translatable="yes">rows</property>
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
           <widget class="Gtk.Alignment" id="alignment3">
             <property name="MemberName" />
             <property name="LeftPadding">12</property>
@@ -2635,7 +2580,7 @@
             </child>
           </widget>
           <packing>
-            <property name="Position">1</property>
+            <property name="Position">0</property>
             <property name="AutoSize">True</property>
             <property name="Expand">False</property>
             <property name="Fill">False</property>
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/packages.config b/main/src/addins/MonoDevelop.SourceEditor2/packages.config
new file mode 100644
index 0000000000..d3fca62c00
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs b/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs
index 3b3114af61..fa33c8b34e 100644
--- a/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs
+++ b/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs
@@ -25,24 +25,25 @@
 // THE SOFTWARE.
 
 using System;
-using MonoDevelop.Ide.Gui.Content;
 using System.Collections.Generic;
 using System.Threading;
-using Mono.TextEditor;
 using MonoDevelop.NUnit;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using Gtk;
 using MonoDevelop.Components;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.NUnit
 {
 	public abstract class AbstractUnitTestTextEditorExtension : TextEditorExtension
 	{
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
-			Document.DocumentParsed += HandleDocumentParsed; 
+			DocumentContext.DocumentParsed += HandleDocumentParsed; 
 			if (IdeApp.Workbench == null)
 				return;
 			NUnitService.Instance.TestSessionCompleted += HandleTestSessionCompleted;
@@ -50,22 +51,21 @@ namespace MonoDevelop.NUnit
 
 		void HandleTestSessionCompleted (object sender, EventArgs e)
 		{
-			if (document.Editor == null)
-				return;
-			document.Editor.Parent.TextArea.RedrawMargin (document.Editor.Parent.TextArea.ActionMargin);
+			foreach (var marker in currentMarker)
+				marker.UpdateState ();
 		}
 
 		public override void Dispose ()
 		{
 			NUnitService.Instance.TestSessionCompleted -= HandleTestSessionCompleted;
 			RemoveHandler ();
-			Document.DocumentParsed -= HandleDocumentParsed; 
+			DocumentContext.DocumentParsed -= HandleDocumentParsed; 
 			base.Dispose ();
 		}
 
 		CancellationTokenSource src = new CancellationTokenSource ();
 
-		public abstract IList<UnitTestLocation> GatherUnitTests ();
+		public abstract Task<IList<UnitTestLocation>> GatherUnitTests (CancellationToken token);
 
 		readonly static PropertyWrapper<bool> EnableUnitTestEditorIntegration = new PropertyWrapper<bool> ("Testing.EnableUnitTestEditorIntegration", false);
 
@@ -79,33 +79,31 @@ namespace MonoDevelop.NUnit
 			ThreadPool.QueueUserWorkItem (delegate {
 				if (token.IsCancellationRequested)
 					return;
-				var foundTests = GatherUnitTests ();
-				if (foundTests == null)
-					return;
-				Application.Invoke (delegate {
-					var editor = document.Editor;
-					if (editor == null)
-						return;
-					var textEditor = editor.Parent;
-					if (textEditor == null)
-						return;
-					var actionMargin = textEditor.ActionMargin;
-					if (actionMargin == null)
-						return;
-					if (actionMargin.IsVisible ^ (foundTests.Count > 0))
-						textEditor.QueueDraw ();
-					actionMargin.IsVisible |= foundTests.Count > 0;
-					foreach (var oldMarker in currentMarker)
-						editor.Document.RemoveMarker (oldMarker);
-
-					foreach (var foundTest in foundTests) {
-						if (token.IsCancellationRequested)
+				try {
+					GatherUnitTests (token).ContinueWith (task => {
+						var foundTests = task.Result;
+						if (foundTests == null)
 							return;
-						var unitTestMarker = new UnitTestMarker (foundTest, document);
-						currentMarker.Add (unitTestMarker);
-						editor.Document.AddMarker (foundTest.LineNumber, unitTestMarker);
-					}
-				});
+						Application.Invoke (delegate {
+							foreach (var oldMarker in currentMarker)
+								Editor.RemoveMarker (oldMarker);
+							var newMarkers = new List<IUnitTestMarker> ();
+							foreach (var foundTest in foundTests) {
+								var unitTestMarker = TextMarkerFactory.CreateUnitTestMarker (Editor, new UnitTestMarkerHostImpl (this), foundTest);
+								newMarkers.Add (unitTestMarker);
+								var line = Editor.GetLineByOffset (foundTest.Offset);
+								if (line != null) {
+									Editor.AddMarker (line, unitTestMarker);
+								}
+							}
+							this.currentMarker = newMarkers;
+						});
+
+					}, TaskContinuationOptions.ExecuteSynchronously | 
+						TaskContinuationOptions.NotOnCanceled | 
+						TaskContinuationOptions.NotOnFaulted);
+				} catch (OperationCanceledException) {
+				}
 			});
 		}
 
@@ -119,69 +117,60 @@ namespace MonoDevelop.NUnit
 			}
 		}
 
-		List<UnitTestMarker> currentMarker = new List<UnitTestMarker>();
+		List<IUnitTestMarker> currentMarker = new List<IUnitTestMarker>();
 
-		class UnitTestMarker : MarginMarker
+		class UnitTestMarkerHostImpl : UnitTestMarkerHost
 		{
-			readonly UnitTestLocation unitTest;
-			readonly MonoDevelop.Ide.Gui.Document doc;
+			static Menu menu;
 
-			public UnitTestMarker(UnitTestLocation unitTest, MonoDevelop.Ide.Gui.Document doc)
+			readonly AbstractUnitTestTextEditorExtension ext;
+
+			public UnitTestMarkerHostImpl (AbstractUnitTestTextEditorExtension ext)
 			{
-				this.unitTest = unitTest;
-				this.doc = doc;
+				if (ext == null)
+					throw new ArgumentNullException ("ext");
+				this.ext = ext;
 			}
 
-			public override bool CanDrawForeground (Margin margin)
+			#region implemented abstract members of UnitTestMarkerHost
+
+			public override Xwt.Drawing.Image GetStatusIcon (string unitTestIdentifier, string caseId = null)
 			{
-				return margin is ActionMargin;
+				var test = NUnitService.Instance.SearchTestById (unitTestIdentifier + caseId);
+				if (test != null)
+					return test.StatusIcon;
+				return TestStatusIcon.None;
 			}
 
-			public override void InformMouseHover (TextEditor editor, Margin margin, MarginMouseEventArgs args)
+			public override bool IsFailure (string unitTestIdentifier, string caseId = null)
 			{
-				if (!(margin is ActionMargin))
-					return;
-				string toolTip;
-				if (unitTest.IsFixture) {
-					if (isFailed) {
-						toolTip = GettextCatalog.GetString ("NUnit Fixture failed (click to run)");
-						if (!string.IsNullOrEmpty (failMessage))
-							toolTip += Environment.NewLine + failMessage.TrimEnd ();
-					} else {
-						toolTip = GettextCatalog.GetString ("NUnit Fixture (click to run)");
-					}
-				} else {
-					if (isFailed) {
-						toolTip = GettextCatalog.GetString ("NUnit Test failed (click to run)");
-						if (!string.IsNullOrEmpty (failMessage))
-							toolTip += Environment.NewLine + failMessage.TrimEnd ();
-						foreach (var id in unitTest.TestCases) {
-							var test = NUnitService.Instance.SearchTestById (unitTest.UnitTestIdentifier + id);
-							if (test != null) {
-								var result = test.GetLastResult ();
-								if (result != null && result.IsFailure) {
-									if (!string.IsNullOrEmpty (result.Message)) {
-										toolTip += Environment.NewLine + "Test" + id +":";
-										toolTip += Environment.NewLine + result.Message.TrimEnd ();
-									}
-								}
-							}
-
-						}
-					} else {
-						toolTip = GettextCatalog.GetString ("NUnit Test (click to run)");
-					}
+				var test = NUnitService.Instance.SearchTestById (unitTestIdentifier + caseId);
+				if (test != null) {
+					var result = test.GetLastResult ();
+					if (result != null)
+						return result.IsFailure;
+				}
+				return false;
+			}
 
+			public override string GetMessage (string unitTestIdentifier, string caseId = null)
+			{
+				var test = NUnitService.Instance.SearchTestById (unitTestIdentifier + caseId);
+				if (test != null) {
+					var result = test.GetLastResult ();
+					if (result != null)
+						return result.Message;
 				}
-				editor.TooltipText = toolTip;
+				return null;
 			}
 
-			static Menu menu;
+			public override bool HasResult (string unitTestIdentifier, string caseId = null)
+			{
+				return NUnitService.Instance.SearchTestById (unitTestIdentifier + caseId) != null;
+			}
 
-			public override void InformMousePress (TextEditor editor, Margin margin, MarginMouseEventArgs args)
+			public override void PopupContextMenu (UnitTestLocation unitTest, int x, int y)
 			{
-				if (!(margin is ActionMargin))
-					return;
 				if (menu != null) {
 					menu.Destroy ();
 				}
@@ -190,47 +179,47 @@ namespace MonoDevelop.NUnit
 				menu = new Menu ();
 				if (unitTest.IsFixture) {
 					var menuItem = new MenuItem ("_Run All");
-					menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, false).Run;
+					menuItem.Activated += new TestRunner (unitTest.UnitTestIdentifier, false).Run;
 					menu.Add (menuItem);
 					if (debugModeSet != null) {
 						menuItem = new MenuItem ("_Debug All");
-						menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, true).Run;
+						menuItem.Activated += new TestRunner (unitTest.UnitTestIdentifier, true).Run;
 						menu.Add (menuItem);
 					}
 					menuItem = new MenuItem ("_Select in Test Pad");
-					menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, true).Select;
+					menuItem.Activated += new TestRunner (unitTest.UnitTestIdentifier, true).Select;
 					menu.Add (menuItem);
 				} else {
 					if (unitTest.TestCases.Count == 0) {
 						var menuItem = new MenuItem ("_Run");
-						menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, false).Run;
+						menuItem.Activated += new TestRunner (unitTest.UnitTestIdentifier, false).Run;
 						menu.Add (menuItem);
 						if (debugModeSet != null) {
 							menuItem = new MenuItem ("_Debug");
-							menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, true).Run;
+							menuItem.Activated += new TestRunner (unitTest.UnitTestIdentifier, true).Run;
 							menu.Add (menuItem);
 						}
 						menuItem = new MenuItem ("_Select in Test Pad");
-						menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, true).Select;
+						menuItem.Activated += new TestRunner (unitTest.UnitTestIdentifier, true).Select;
 						menu.Add (menuItem);
 					} else {
 						var menuItem = new MenuItem ("_Run All");
-						menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, false).Run;
+						menuItem.Activated += new TestRunner (unitTest.UnitTestIdentifier, false).Run;
 						menu.Add (menuItem);
 						if (debugModeSet != null) {
 							menuItem = new MenuItem ("_Debug All");
-							menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, true).Run;
+							menuItem.Activated += new TestRunner (unitTest.UnitTestIdentifier, true).Run;
 							menu.Add (menuItem);
 						}
 						menu.Add (new SeparatorMenuItem ());
 						foreach (var id in unitTest.TestCases) {
 							var submenu = new Menu ();
 							menuItem = new MenuItem ("_Run");
-							menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier + id, false).Run;
+							menuItem.Activated += new TestRunner (unitTest.UnitTestIdentifier + id, false).Run;
 							submenu.Add (menuItem);
 							if (debugModeSet != null) {
 								menuItem = new MenuItem ("_Debug");
-								menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier + id, true).Run;
+								menuItem.Activated += new TestRunner (unitTest.UnitTestIdentifier + id, true).Run;
 								submenu.Add (menuItem);
 							}
 
@@ -246,7 +235,7 @@ namespace MonoDevelop.NUnit
 							}
 
 							menuItem = new MenuItem ("_Select in Test Pad");
-							menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier + id, true).Select;
+							menuItem.Activated += new TestRunner (unitTest.UnitTestIdentifier + id, true).Select;
 							submenu.Add (menuItem);
 
 
@@ -259,19 +248,20 @@ namespace MonoDevelop.NUnit
 					}
 				}
 				menu.ShowAll ();
-				editor.TextArea.ResetMouseState (); 
-				GtkWorkarounds.ShowContextMenu (menu, editor, new Gdk.Rectangle ((int)args.X, (int)args.Y, 1, 1));
+
+				GtkWorkarounds.ShowContextMenu (menu, ext.Editor, new Gdk.Rectangle (x, y, 1, 1));
+
 			}
 
+			#endregion
+
 			class TestRunner
 			{
-				//				readonly MonoDevelop.Ide.Gui.Document doc;
 				readonly string testCase;
 				readonly bool debug;
 
-				public TestRunner (MonoDevelop.Ide.Gui.Document doc, string testCase, bool debug)
+				public TestRunner (string testCase, bool debug)
 				{
-					//					this.doc = doc;
 					this.testCase = testCase;
 					this.debug = debug;
 				}
@@ -375,65 +365,6 @@ namespace MonoDevelop.NUnit
 					content.RunTest (test, ctx);
 				}
 			}
-
-			bool isFailed;
-			string failMessage;
-			public override void DrawForeground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
-			{
-				isFailed = false;
-				var test = NUnitService.Instance.SearchTestById (unitTest.UnitTestIdentifier);
-				bool searchCases = false;
-
-				Xwt.Drawing.Image icon = null;
-
-				if (test != null) {
-					icon = test.StatusIcon;
-					var result = test.GetLastResult ();
-					if (result == null) {
-						searchCases = true;
-					} else if (result.IsFailure) {
-						failMessage = result.Message;
-						isFailed = true;
-					}
-				} else {
-					searchCases = true;
-				}
-
-				if (searchCases) {
-					foreach (var caseId in unitTest.TestCases) {
-						test = NUnitService.Instance.SearchTestById (unitTest.UnitTestIdentifier + caseId);
-						if (test != null) {
-							icon = test.StatusIcon;
-							var result = test.GetLastResult ();
-							if (result != null && result.IsFailure) {
-								failMessage = result.Message;
-								isFailed = true;
-								break;
-							} 
-						}
-					}
-				}
-
-				if (icon != null) {
-					if (icon.Width > metrics.Width || icon.Height > metrics.Height)
-						icon = icon.WithBoxSize (metrics.Width, metrics.Height);
-					cr.DrawImage (editor, icon, Math.Truncate (metrics.X + metrics.Width / 2 - icon.Width / 2), Math.Truncate (metrics.Y + metrics.Height / 2 - icon.Height / 2));
-				}
-			}
-		}
-		public class UnitTestLocation
-		{
-			public int LineNumber { get; set; }
-			public bool IsFixture { get; set; }
-			public string UnitTestIdentifier { get; set; }
-			public bool IsIgnored { get; set; }
-
-			public List<string> TestCases = new List<string> ();
-
-			public UnitTestLocation (int lineNumber)
-			{
-				LineNumber = lineNumber;
-			}
 		}
 	}
 }
diff --git a/main/src/addins/NUnit/Gui/TestPad.cs b/main/src/addins/NUnit/Gui/TestPad.cs
index 96b5f929bb..5685fbc89d 100644
--- a/main/src/addins/NUnit/Gui/TestPad.cs
+++ b/main/src/addins/NUnit/Gui/TestPad.cs
@@ -41,7 +41,6 @@ using MonoDevelop.Ide.Execution;
 using MonoDevelop.Components.Docking;
 using MonoDevelop.Ide;
 using MonoDevelop.Projects;
-using Mono.TextEditor;
 using System.Linq;
 using MonoDevelop.Components;
 using MonoDevelop.Ide.Commands;
diff --git a/main/src/addins/NUnit/Gui/icons/unit-failed-16.png b/main/src/addins/NUnit/Gui/icons/unit-failed-16.png
index ab1367642d..86e339b5f9 100644
--- a/main/src/addins/NUnit/Gui/icons/unit-failed-16.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-failed-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png
index fc9fa4445b..cbc92c6fce 100644
--- a/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png
index ef419bb561..aea522080b 100644
--- a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png
index 03afb04a77..53eb836c07 100644
--- a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/unit-success-16.png b/main/src/addins/NUnit/Gui/icons/unit-success-16.png
index b167c97951..8d9f59c502 100644
--- a/main/src/addins/NUnit/Gui/icons/unit-success-16.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-success-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png
index 7abbc8ec46..12c2cd6515 100644
--- a/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png
diff --git a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj
index 97a3a43d73..aebd84d0d2 100644
--- a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj
+++ b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj
@@ -75,6 +75,22 @@
     <Reference Include="nunit.util">
       <HintPath>..\..\..\packages\NUnit.Runners.2.6.3\tools\lib\nunit.util.dll</HintPath>
     </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -92,16 +108,6 @@
       <Name>NUnitRunner</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -112,6 +118,11 @@
       <Name>Xwt</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="templates\NUnitAssemblyGroup.xpt.xml">
@@ -171,12 +182,13 @@
     <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32%402x.png">
       <LogicalName>project-nunit-overlay-32@2x.png</LogicalName>
     </EmbeddedResource>
+    <!--
     <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32.png">
       <LogicalName>project-nunit-overlay-light-32.png</LogicalName>
-    </EmbeddedResource><!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) -->
-    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32@2x.png">
+    </EmbeddedResource> --> <!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) -->
+    <!--<EmbeddedResource Include="Gui\icons\project-nunit-overlay-32@2x.png">
       <LogicalName>project-nunit-overlay-light-32@2x.png</LogicalName>
-    </EmbeddedResource><!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) -->
+    </EmbeddedResource> --> <!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) -->
     <EmbeddedResource Include="gtk-gui\gui.stetic">
       <LogicalName>gui.stetic</LogicalName>
     </EmbeddedResource>
diff --git a/main/src/addins/NUnit/Services/BinaryResultsStore.cs b/main/src/addins/NUnit/Services/BinaryResultsStore.cs
index c6d0eca036..dc0581e209 100644
--- a/main/src/addins/NUnit/Services/BinaryResultsStore.cs
+++ b/main/src/addins/NUnit/Services/BinaryResultsStore.cs
@@ -24,9 +24,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.Utils;
 using System.Xml.Serialization;
 using System.IO;
+using ICSharpCode.NRefactory6.Utils;
 
 namespace MonoDevelop.NUnit
 {
diff --git a/main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs b/main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
index 6a789d36ba..e7381ff1ae 100644
--- a/main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
+++ b/main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
@@ -34,8 +34,9 @@ using System.Collections.Generic;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
 using System;
+using Microsoft.CodeAnalysis;
+using System.Threading;
 using ProjectReference = MonoDevelop.Projects.ProjectReference;
 
 namespace MonoDevelop.NUnit
@@ -82,27 +83,45 @@ namespace MonoDevelop.NUnit
 		{
 			if (string.IsNullOrEmpty (fixtureTypeName) || string.IsNullOrEmpty (fixtureTypeName))
 				return null;
-			var ctx = TypeSystemService.GetCompilation (project);
-			var cls = ctx.MainAssembly.GetTypeDefinition (fixtureTypeNamespace ?? "", fixtureTypeName, 0);
+			var csc = new CancellationTokenSource ();
+			var task = TypeSystemService.GetCompilationAsync (project, csc.Token);
+			task.Wait (2000);
+			if (!task.IsCompleted) {
+				csc.Cancel ();
+				return null;
+			}
+			var ctx = task.Result;
+			var cls = ctx.Assembly.GetTypeByMetadataName (string.IsNullOrEmpty (fixtureTypeNamespace) ? fixtureTypeName : fixtureTypeNamespace + "." + fixtureTypeName);
 			if (cls == null)
 				return null;
 			
 			if (cls.Name != methodName) {
-				foreach (var met in cls.GetMethods ()) {
-					if (met.Name == methodName)
-						return new SourceCodeLocation (met.Region.FileName, met.Region.BeginLine, met.Region.BeginColumn);
+				foreach (var met in cls.GetMembers ().OfType<IMethodSymbol> ()) {
+					if (met.Name == methodName) {
+						var loc = met.Locations.FirstOrDefault (l => l.IsInSource);
+						return ConvertToSourceCodeLocation (loc);
+					}
 				}
 				
 				int idx = methodName != null ? methodName.IndexOf ('(') : -1;
 				if (idx > 0) {
 					methodName = methodName.Substring (0, idx);
-					foreach (var met in cls.GetMethods ()) {
-						if (met.Name == methodName)
-							return new SourceCodeLocation (met.Region.FileName, met.Region.BeginLine, met.Region.BeginColumn);
+					foreach (var met in cls.GetMembers ().OfType<IMethodSymbol> ()) {
+						if (met.Name == methodName){
+							var loc = met.Locations.FirstOrDefault (l => l.IsInSource);
+							return ConvertToSourceCodeLocation (loc);
+						}
 					}
 				}
 			}
-			return new SourceCodeLocation (cls.Region.FileName, cls.Region.BeginLine, cls.Region.BeginColumn);
+			var classLoc = cls.Locations.FirstOrDefault (l => l.IsInSource);
+			return ConvertToSourceCodeLocation (classLoc);
+		}
+
+		SourceCodeLocation ConvertToSourceCodeLocation (Location loc)
+		{
+			var lineSpan = loc.GetLineSpan ();
+			return new SourceCodeLocation (loc.SourceTree.FilePath, lineSpan.StartLinePosition.Line, lineSpan.StartLinePosition.Character);
 		}
 		
 		public override void Dispose ()
diff --git a/main/src/addins/NUnit/packages.config b/main/src/addins/NUnit/packages.config
index 3ca92b52ea..9e112b4847 100644
--- a/main/src/addins/NUnit/packages.config
+++ b/main/src/addins/NUnit/packages.config
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

   <package id="NUnit" version="2.6.3" targetFramework="net40" />

   <package id="NUnit.Runners" version="2.6.3" targetFramework="net40" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

 </packages>
\ No newline at end of file
diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs
index 3ca28d88c2..3396e1342f 100644
--- a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs
@@ -237,9 +237,9 @@ namespace Mono.TextTemplating
 				return path;
 			var dir = Path.GetDirectoryName (inputFile);
 			var test = Path.Combine (dir, path);
-			if (File.Exists (test))
+			if (File.Exists (test) || Directory.Exists (test))
 				return test;
-			return null;
+			return path;
 		}
 		
 		#endregion
@@ -262,7 +262,7 @@ namespace Mono.TextTemplating
 			content = "";
 			location = ResolvePath (requestFileName);
 			
-			if (location == null) {
+			if (location == null || !File.Exists (location)) {
 				foreach (string path in includePaths) {
 					string f = Path.Combine (path, requestFileName);
 					if (File.Exists (f)) {
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs
index 260518ee9d..1479522a06 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs
@@ -32,6 +32,10 @@ using MonoDevelop.DesignerSupport;
 using MonoDevelop.TextTemplating.Parser;
 using MonoDevelop.Ide;
 using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace MonoDevelop.TextTemplating.Gui
 {
@@ -44,16 +48,16 @@ namespace MonoDevelop.TextTemplating.Gui
 		{
 		}
 		
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
-			Document.DocumentParsed += HandleDocumentDocumentParsed;
+			DocumentContext.DocumentParsed += HandleDocumentDocumentParsed;
 			HandleDocumentDocumentParsed (this, EventArgs.Empty);
 		}
 
 		void HandleDocumentDocumentParsed (object sender, EventArgs e)
 		{
-			parsedDoc = (T4ParsedDocument)Document.ParsedDocument;
+			parsedDoc = (T4ParsedDocument)DocumentContext.ParsedDocument;
 			if (parsedDoc != null)
 				RefreshOutline ();
 		}
@@ -71,30 +75,21 @@ namespace MonoDevelop.TextTemplating.Gui
 		protected T4ParsedDocument ParsedDoc {
 			get { return parsedDoc; }
 		}
-		
-		protected ITextBuffer Buffer {
-			get {
-				if (Document == null)
-					throw new InvalidOperationException ("Editor extension not yet initialized");
-				return Document.GetContent<ITextBuffer> ();
-			}
-		}
-		
-		protected IEditableTextBuffer EditableBuffer {
+
+		protected TextEditor EditableBuffer {
 			get {
-				if (Document == null)
+				if (DocumentContext == null)
 					throw new InvalidOperationException ("Editor extension not yet initialized");
-				return Document.GetContent<IEditableTextBuffer> ();
+				return DocumentContext.GetContent<TextEditor> ();
 			}
 		}
 		
 		protected string GetBufferText (DomRegion region)
 		{
-			MonoDevelop.Ide.Gui.Content.ITextBuffer buf = Buffer;
-			int start = buf.GetPositionFromLineColumn (region.BeginLine, region.BeginColumn);
-			int end = buf.GetPositionFromLineColumn (region.EndLine, region.EndColumn);
+			int start = Editor.LocationToOffset (region.BeginLine, region.BeginColumn);
+			int end = Editor.LocationToOffset (region.EndLine, region.EndColumn);
 			if (end > start && start >= 0)
-				return buf.GetText (start, end);
+				return Editor.GetTextBetween (start, end);
 			else
 				return null;
 		}
@@ -108,23 +103,20 @@ namespace MonoDevelop.TextTemplating.Gui
 			int pos = completionContext.TriggerOffset;
 			if (pos <= 0)
 				return null;
-			int triggerWordLength = 0;
-			return HandleCodeCompletion ((CodeCompletionContext) completionContext, true, ref triggerWordLength);
+			return HandleCodeCompletion ((CodeCompletionContext) completionContext, true);
 		}
 
-		public override ICompletionDataList HandleCodeCompletion (
-		    CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
+		public override Task<ICompletionDataList> HandleCodeCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
 			int pos = completionContext.TriggerOffset;
 			if (pos > 0 && Editor.GetCharAt (pos - 1) == completionChar) {
-				return HandleCodeCompletion ((CodeCompletionContext) completionContext, 
-				                             false, ref triggerWordLength);
+				return Task.FromResult (HandleCodeCompletion ((CodeCompletionContext) completionContext, false));
 			}
 			return null;
 		}
 
 		protected virtual ICompletionDataList HandleCodeCompletion (
-		    CodeCompletionContext completionContext, bool forced, ref int triggerWordLength)
+		    CodeCompletionContext completionContext, bool forced)
 		{
 			//IEditableTextBuffer buf = this.EditableBuffer;
 			return null;
@@ -272,9 +264,9 @@ namespace MonoDevelop.TextTemplating.Gui
 		
 		void SelectSegment (Mono.TextTemplating.ISegment seg)
 		{
-			int s = Editor.Document.LocationToOffset (seg.TagStartLocation.Line, seg.TagStartLocation.Column);
+			int s = Editor.LocationToOffset (seg.TagStartLocation.Line, seg.TagStartLocation.Column);
 			if (s > -1) {
-				Editor.Caret.Offset = s;
+				Editor.CaretOffset = s;
 				Editor.CenterTo (s);
 			}
 		}
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
index 91b0d65c0a..6829810e05 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
@@ -76,6 +76,22 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -104,16 +120,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
@@ -135,5 +141,6 @@
     <None Include="Templates\T4PreprocessedTemplateCSharp.xft.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4ParsedDocument.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4ParsedDocument.cs
index 6c3e152a43..1d6036c153 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4ParsedDocument.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4ParsedDocument.cs
@@ -29,35 +29,28 @@ using System.Collections.Generic;
 using Mono.TextTemplating;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
+using System.Linq;
 
 namespace MonoDevelop.TextTemplating.Parser
 {
 	
 	
-	public class T4ParsedDocument : ParsedDocument
+	public class T4ParsedDocument : DefaultParsedDocument
 	{
-		string fileName;
-		IList<Error> errors;
+		IList<MonoDevelop.Ide.TypeSystem.Error> errors;
 
-		public override string FileName {
-			get {
-				return fileName;
-			}
-		}
-
-		public T4ParsedDocument (string fileName, List<ISegment> segments, IList<Error> errors)
+		public T4ParsedDocument (string fileName, List<ISegment> segments, IList<MonoDevelop.Ide.TypeSystem.Error> errors) : base(fileName)
 		{
-			this.fileName = fileName;
 			this.errors = errors;
 			TemplateSegments = segments;
 		}
 
-		public override IList<Error> Errors {
-			get {
-				return errors;
-			}
+		public override System.Threading.Tasks.Task<IReadOnlyList<MonoDevelop.Ide.TypeSystem.Error>> GetErrorsAsync (System.Threading.CancellationToken cancellationToken)
+		{
+			return System.Threading.Tasks.Task.FromResult((IReadOnlyList<MonoDevelop.Ide.TypeSystem.Error>)errors);
 		}
-		
+
 		public List<ISegment> TemplateSegments { get; private set; }
 		
 		public IEnumerable<Directive> TemplateDirectives {
@@ -79,10 +72,15 @@ namespace MonoDevelop.TextTemplating.Parser
 				}
 			}
 		}
+
+		public override System.Threading.Tasks.Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (System.Threading.CancellationToken cancellationToken)
+		{
+			return System.Threading.Tasks.Task.FromResult((IReadOnlyList<FoldingRegion>)Foldings.ToList ());
+		}
 		
-		public override IEnumerable<FoldingRegion> Foldings {
+		public IEnumerable<FoldingRegion> Foldings {
 			get {
-				foreach (var region in Comments.ToFolds ()) 
+				foreach (var region in GetCommentsAsync().Result.ToFolds ()) 
 					yield return region;
 				foreach (ISegment seg in TemplateSegments) {
 					if (seg.EndLocation.Line - seg.TagStartLocation.Line < 1)
@@ -105,7 +103,7 @@ namespace MonoDevelop.TextTemplating.Parser
 						name = "<#@" + dir.Name + "...#>";
 					}
 					
-					DomRegion region = new DomRegion (seg.TagStartLocation.Line, seg.TagStartLocation.Column,
+					var region = new DocumentRegion (seg.TagStartLocation.Line, seg.TagStartLocation.Column,
 				                                      seg.EndLocation.Line, seg.EndLocation.Column);
 					
 					yield return new FoldingRegion (name, region, false);
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4Parser.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4Parser.cs
index a18ebdbc6a..d348e6340e 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4Parser.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4Parser.cs
@@ -28,32 +28,35 @@ using System;
 using System.IO;
 using Mono.TextTemplating;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Projects;
 using System.Collections.Generic;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.TextTemplating.Parser
 {
 	public class T4Parser : TypeSystemParser
 	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader content, Project project = null)
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions parseOptions, System.Threading.CancellationToken cancellationToken)
 		{
+			var fileName = parseOptions.FileName;
 			ParsedTemplate template = new ParsedTemplate (fileName);
+			var readOnlyDoc = TextEditorFactory.CreateNewReadonlyDocument (parseOptions.Content, fileName);
+
 			try {
-				var tk = new Tokeniser (fileName, content.ReadToEnd ());
+				var tk = new Tokeniser (fileName, readOnlyDoc.Text);
 				template.ParseWithoutIncludes (tk);
 			} catch (ParserException ex) {
 				template.LogError (ex.Message, ex.Location);
 			}
-
 			var errors = new List<Error> ();
 			foreach (System.CodeDom.Compiler.CompilerError err in template.Errors) {
-				errors.Add (new Error (err.IsWarning ? ErrorType.Warning : ErrorType.Error, err.ErrorText, err.Line, err.Column));
+				errors.Add (new Error (err.IsWarning ? ErrorType.Warning : ErrorType.Error, err.ErrorText, new DocumentLocation (err.Line, err.Column)));
 			}
 			var doc = new T4ParsedDocument (fileName, template.RawSegments, errors);
 			doc.Flags |= ParsedDocumentFlags.NonSerializable;
 
-			return doc;
+			return System.Threading.Tasks.Task.FromResult((ParsedDocument)doc);
 		}
 	}
 }
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFilePreprocessor.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFilePreprocessor.cs
index 5f1ab37897..4387d8d872 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFilePreprocessor.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFilePreprocessor.cs
@@ -107,4 +107,3 @@ namespace MonoDevelop.TextTemplating
 		}
 	}
 }
-
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config
new file mode 100644
index 0000000000..d3fca62c00
--- /dev/null
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/TextTemplating/TextTransform/TextTransform.cs b/main/src/addins/TextTemplating/TextTransform/TextTransform.cs
index d1b061d07c..e4f239e320 100644
--- a/main/src/addins/TextTemplating/TextTransform/TextTransform.cs
+++ b/main/src/addins/TextTemplating/TextTransform/TextTransform.cs
@@ -37,6 +37,17 @@ namespace Mono.TextTemplating
 		const string name ="TextTransform.exe";
 		
 		public static int Main (string[] args)
+		{

+			try {

+				return MainInternal(args);

+			}

+			catch (Exception e) {

+				Console.Error.WriteLine(e);

+				return -1;

+			}

+		}
+
+		private static int MainInternal (string[] args)
 		{
 			if (args.Length == 0) {
 				ShowHelp (true);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs
index 26462b2335..f9bcd2461a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs
@@ -1,6 +1,7 @@
 using System;

 using System.IO; 

 using MonoDevelop.Ide.Gui;

+using System.Text;

 

 namespace MonoDevelop.VersionControl
 {

@@ -13,10 +14,15 @@ namespace MonoDevelop.VersionControl
 			this.name = name;

 		}

 		

-		protected virtual void SaveAs (string fileName)

+		protected virtual void SaveAs (FileSaveInformation fileSaveInformation)

 		{

 		}

 

+		void IViewContent.Load (FileOpenInformation fileOpenInformation)

+		{

+			throw new InvalidOperationException();

+		}

+		

 		void IViewContent.Load (string fileName)

 		{

 			throw new InvalidOperationException();

@@ -38,9 +44,14 @@ namespace MonoDevelop.VersionControl
 		

 		void IViewContent.Save (string fileName)

 		{

-			SaveAs (fileName);

-		}
-		
+			SaveAs (new FileSaveInformation (fileName));

+		}

+

+		void IViewContent.Save (FileSaveInformation info)

+		{

+			SaveAs (info);

+		}

+

 		string IViewContent.ContentName {

 			get { return name; }

 			set { }

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
index e9de77d760..266cf16338 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
@@ -34,6 +34,7 @@ using MonoDevelop.Ide;
 using System.Threading;
 using MonoDevelop.Core;
 using MonoDevelop.Components.Commands;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.VersionControl.Views
 {
@@ -53,7 +54,7 @@ namespace MonoDevelop.VersionControl.Views
 		
 		BlameRenderer overview;
 		
-		TextEditor editor;
+		MonoTextEditor editor;
 		List<ContainerChild> children = new List<ContainerChild> ();
 		
 		public Adjustment Vadjustment {
@@ -74,7 +75,7 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 		
-		public TextEditor Editor {
+		public MonoTextEditor Editor {
 			get {
 				return this.editor;
 			}
@@ -123,7 +124,7 @@ namespace MonoDevelop.VersionControl.Views
 			hScrollBar = new HScrollbar (hAdjustment);
 			AddChild (hScrollBar);
 			
-			editor = new TextEditor (sourceEditor.TextEditor.Document, sourceEditor.TextEditor.Options);
+			editor = new MonoTextEditor (sourceEditor.TextEditor.Document, sourceEditor.TextEditor.Options);
 			AddChild (editor);
 			editor.SetScrollAdjustments (hAdjustment, vAdjustment);
 			
@@ -720,7 +721,7 @@ namespace MonoDevelop.VersionControl.Views
 								e.Window.DrawLayout (Style.BlackGC, Allocation.Width - revisionWidth - margin - revisionWidth - dateRevisionSpacing, (int)(curY + (widget.Editor.LineHeight - h) / 2), layout);
 							}
 
-							using (var authorLayout = PangoUtil.CreateLayout (this)) {
+							using (var authorLayout = MonoDevelop.Components.PangoUtil.CreateLayout (this)) {
 								var description = Pango.FontDescription.FromString ("Tahoma " + (int)(10 * widget.Editor.Options.Zoom));
 								authorLayout.FontDescription = description;
 								authorLayout.SetText (ann.Author);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs
new file mode 100644
index 0000000000..65a172c36d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs
@@ -0,0 +1,399 @@
+
+// 
+// ComparisonWidget.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Gtk;
+using Gdk;
+using System.Collections.Generic;
+using Mono.TextEditor;
+using MonoDevelop.Ide;
+using MonoDevelop.Components;
+using System.ComponentModel;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Fonts;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.VersionControl.Views
+{
+	// Code snatched from SourceEditor
+	class CommonTextEditorOptions : TextEditorOptions, Mono.TextEditor.ITextEditorOptions
+	{
+		static CommonTextEditorOptions instance;
+		//static TextStylePolicy defaultPolicy;
+		static bool inited;
+
+		public static CommonTextEditorOptions Instance {
+			get { return instance; }
+		}
+
+		static CommonTextEditorOptions ()
+		{
+			Init ();
+		}
+
+		public static void Init ()
+		{
+			if (inited)
+				return;
+			inited = true;
+
+			TextStylePolicy policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> ("text/plain");
+			instance = new CommonTextEditorOptions (policy);
+			MonoDevelop.Projects.Policies.PolicyService.DefaultPolicies.PolicyChanged += instance.HandlePolicyChanged;
+		}
+
+		void HandlePolicyChanged (object sender, MonoDevelop.Projects.Policies.PolicyChangedEventArgs args)
+		{
+			TextStylePolicy pol = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> ("text/plain");
+			UpdateStylePolicy (pol);
+		}
+
+		CommonTextEditorOptions (MonoDevelop.Ide.Gui.Content.TextStylePolicy currentPolicy)
+		{
+			UpdateStylePolicy (currentPolicy);
+			MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.Changed += delegate(object sender, EventArgs e) {
+				OnChanged (e);
+			};
+		}
+
+		public override void Dispose()
+		{
+			FontService.RemoveCallback (UpdateFont);
+		}
+
+		void UpdateFont ()
+		{
+			base.FontName = FontName;
+			base.GutterFontName = GutterFontName;
+			this.OnChanged (EventArgs.Empty);
+
+		}
+
+		void UpdateStylePolicy (MonoDevelop.Ide.Gui.Content.TextStylePolicy currentPolicy)
+		{
+			this.defaultEolMarker = TextStylePolicy.GetEolMarker (currentPolicy.EolMarker);
+			base.TabsToSpaces          = currentPolicy.TabsToSpaces; // PropertyService.Get ("TabsToSpaces", false);
+			base.IndentationSize       = currentPolicy.TabWidth; //PropertyService.Get ("TabIndent", 4);
+			base.RulerColumn           = currentPolicy.FileWidth; //PropertyService.Get ("RulerColumn", 80);
+			base.AllowTabsAfterNonTabs = !currentPolicy.NoTabsAfterNonTabs; //PropertyService.Get ("AllowTabsAfterNonTabs", true);
+			base.RemoveTrailingWhitespaces = currentPolicy.RemoveTrailingWhitespace; //PropertyService.Get ("RemoveTrailingWhitespaces", true);
+		}
+
+		#region new options
+
+		public bool EnableAutoCodeCompletion {
+			get { return CompletionTextEditorExtension.EnableAutoCodeCompletion; }
+			set { CompletionTextEditorExtension.EnableAutoCodeCompletion.Set (value); }
+		}
+
+		public bool DefaultRegionsFolding {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.DefaultRegionsFolding;
+			}
+			set {
+			}
+		}
+
+		public bool DefaultCommentFolding {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.DefaultCommentFolding;
+			}
+			set {
+			}
+		}
+
+		public bool EnableSemanticHighlighting {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.EnableSemanticHighlighting;
+			}
+			set {
+			}
+		}
+
+		public bool TabIsReindent {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.TabIsReindent;
+			}
+			set {
+			}
+		}
+
+		public bool AutoInsertMatchingBracket {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket;
+			}
+			set {
+			}
+		}
+
+		public bool SmartSemicolonPlacement {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.SmartSemicolonPlacement;
+			}
+			set {
+			}
+		}
+
+		public bool UnderlineErrors {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.UnderlineErrors; 
+			}
+			set {
+			}
+		}
+
+		public override IndentStyle IndentStyle {
+			get {
+				return (IndentStyle)MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.IndentStyle;
+			}
+			set {
+			}
+		}
+
+		public bool EnableHighlightUsages {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.EnableHighlightUsages;
+			}
+			set {
+			}
+		}
+
+		MonoDevelop.Ide.Editor.LineEndingConversion lineEndingConversion;
+		public MonoDevelop.Ide.Editor.LineEndingConversion LineEndingConversion {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.LineEndingConversion;
+			}
+			set {
+			}
+		}
+
+
+		#endregion
+		public bool UseViModes {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.UseViModes;
+			}
+			set {
+			}
+		}
+
+		public bool OnTheFlyFormatting {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.OnTheFlyFormatting;
+			}
+			set {
+			}
+		}
+
+		#region old options
+		string defaultEolMarker;
+		public override string DefaultEolMarker {
+			get { return defaultEolMarker; }
+		}
+
+		public MonoDevelop.Ide.Editor.ControlLeftRightMode ControlLeftRightMode {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.ControlLeftRightMode;
+			}
+			set {
+			}
+		}
+
+		IWordFindStrategy wordFindStrategy = null;
+		public override IWordFindStrategy WordFindStrategy {
+			get {
+				if (wordFindStrategy == null)
+					SetWordFindStrategy ();
+				return this.wordFindStrategy;
+			}
+			set {
+				throw new System.NotImplementedException ();
+			}
+		}
+
+		void SetWordFindStrategy ()
+		{
+			if (UseViModes) {
+				this.wordFindStrategy = new Mono.TextEditor.Vi.ViWordFindStrategy ();
+				return;
+			}
+
+			switch (ControlLeftRightMode) {
+			case MonoDevelop.Ide.Editor.ControlLeftRightMode.MonoDevelop:
+				this.wordFindStrategy = new EmacsWordFindStrategy (true);
+				break;
+			case MonoDevelop.Ide.Editor.ControlLeftRightMode.Emacs:
+				this.wordFindStrategy = new EmacsWordFindStrategy (false);
+				break;
+			case MonoDevelop.Ide.Editor.ControlLeftRightMode.SharpDevelop:
+				this.wordFindStrategy = new SharpDevelopWordFindStrategy ();
+				break;
+			}
+		}
+
+		public override bool ShowLineNumberMargin {
+			get {
+				return true;
+			}
+			set {
+			}
+		}
+
+		public override bool ShowFoldMargin {
+			get {
+				return false;
+			}
+			set {
+			}
+		}
+
+		public override bool HighlightCaretLine {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.HighlightCaretLine;
+			}
+			set {
+			}
+		}
+
+		public override bool EnableSyntaxHighlighting {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.EnableSyntaxHighlighting;
+			}
+			set {
+			}
+		}
+
+		public override bool HighlightMatchingBracket {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.HighlightMatchingBracket;
+			}
+			set {
+			}
+		}
+
+		public override bool ShowRuler {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.ShowRuler;
+			}
+			set {
+			}
+		}
+
+		public override bool EnableAnimations {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.EnableAnimations;
+			}
+			set {
+			}
+		}
+
+		public override bool DrawIndentationMarkers {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.DrawIndentationMarkers;
+			}
+			set {
+			}
+		}
+
+		PropertyWrapper<ShowWhitespaces> showWhitespaces = new PropertyWrapper<ShowWhitespaces> ("ShowWhitespaces", ShowWhitespaces.Never);
+		public override ShowWhitespaces ShowWhitespaces {
+			get {
+				return showWhitespaces;
+			}
+			set {
+				if (showWhitespaces.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<IncludeWhitespaces> includeWhitespaces = new PropertyWrapper<IncludeWhitespaces> ("IncludeWhitespaces", IncludeWhitespaces.All);
+		public override IncludeWhitespaces IncludeWhitespaces {
+			get {
+				return includeWhitespaces;
+			}
+			set {
+				if (includeWhitespaces.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		public override bool WrapLines {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.WrapLines;
+			}
+			set {
+			}
+		}
+
+		public override bool EnableQuickDiff {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.EnableQuickDiff;
+			}
+			set {
+			}
+		}
+
+		public override string FontName {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.FontName;
+			}
+			set {
+				throw new InvalidOperationException ("Set font through font service");
+			}
+		}
+
+		public override string GutterFontName {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.GutterFontName;
+			}
+			set {
+				throw new InvalidOperationException ("Set font through font service");
+			}
+		}
+
+		public override string ColorScheme {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.ColorScheme;
+			}
+			set {
+			}
+		}
+
+		public override bool GenerateFormattingUndoStep {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep;
+			}
+			set {
+			}
+		}
+
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
index 2b3fa3a3dc..30599ec58b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
@@ -43,19 +43,19 @@ namespace MonoDevelop.VersionControl.Views
 	{
 		internal DropDownBox originalComboBox, diffComboBox;
 		
-		public TextEditor OriginalEditor {
+		public MonoTextEditor OriginalEditor {
 			get {
 				return editors[1];
 			}
 		}
 
-		public TextEditor DiffEditor {
+		public MonoTextEditor DiffEditor {
 			get {
 				return editors[0];
 			}
 		}
 
-		protected override TextEditor MainEditor {
+		protected override MonoTextEditor MainEditor {
 			get {
 				return editors[1];
 			}
@@ -69,8 +69,8 @@ namespace MonoDevelop.VersionControl.Views
 		protected override void CreateComponents ()
 		{
 			this.editors = new [] {
-				new TextEditor (new TextDocument (), new CommonTextEditorOptions ()),
-				new TextEditor (new TextDocument (), new CommonTextEditorOptions ()),
+				new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance),
+				new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance),
 			};
 
 			if (!viewOnly) {
@@ -148,7 +148,7 @@ namespace MonoDevelop.VersionControl.Views
 			QueueDraw ();
 		}
 		
-		public void SetRevision (TextEditor toEditor, Revision rev)
+		public void SetRevision (MonoTextEditor toEditor, Revision rev)
 		{
 			BackgroundWorker worker = new BackgroundWorker ();
 			worker.DoWork += delegate(object sender, DoWorkEventArgs e) {
@@ -236,14 +236,14 @@ namespace MonoDevelop.VersionControl.Views
 			{
 				if (n == 0) {
 					box.SetItem ("Local", null, new object());
-					widget.SetLocal (((TextEditor)box.Tag).GetTextEditorData ());
+					widget.SetLocal (((MonoTextEditor)box.Tag).GetTextEditorData ());
 					return;
 				}
-				widget.RemoveLocal (((TextEditor)box.Tag).GetTextEditorData ());
-				((TextEditor)box.Tag).Document.ReadOnly = true;
+				widget.RemoveLocal (((MonoTextEditor)box.Tag).GetTextEditorData ());
+				((MonoTextEditor)box.Tag).Document.ReadOnly = true;
 				if (n == 1) {
 					box.SetItem ("Base", null, new object());
-					if (((TextEditor)box.Tag) == widget.editors[0]) {
+					if (((MonoTextEditor)box.Tag) == widget.editors[0]) {
 						widget.diffRevision = null;
 					} else {
 						widget.originalRevision = null;
@@ -256,13 +256,13 @@ namespace MonoDevelop.VersionControl.Views
 						MessageService.ShowError (text);
 					}
 					
-					((TextEditor)box.Tag).Document.Text = text;
+					((MonoTextEditor)box.Tag).Document.Text = text;
 					widget.CreateDiff ();
 					return;
 				}
 				
 				Revision rev = widget.info.History[n - 2];
-				widget.SetRevision ((TextEditor)box.Tag, rev);
+				widget.SetRevision ((MonoTextEditor)box.Tag, rev);
 			}
 
 			public int IconCount {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
index 9d92426ff6..715d6f4e26 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
@@ -32,6 +32,7 @@ using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using MonoDevelop.Projects;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.VersionControl.Views
 {
@@ -50,16 +51,16 @@ namespace MonoDevelop.VersionControl.Views
 		static Regex eolExpression = new Regex (@"(?<eol>\r\n|\n|\r)", RegexOptions.Compiled);
 		
 		#region AbstractParser overrides
-		
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader textReader, Project project = null)
+
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions parseOptions, System.Threading.CancellationToken cancellationToken)
 		{
-			var doc = new DefaultParsedDocument (fileName);
+			ParsedDocument doc = new DefaultParsedDocument (parseOptions.FileName);
 			
 			DefaultUnresolvedTypeDefinition currentFile = null;
 			DefaultUnresolvedProperty currentRegion = null;
 			
 			string eol = Environment.NewLine;
-			string content = textReader.ReadToEnd ();
+			string content = parseOptions.Content.Text;
 			Match eolMatch = eolExpression.Match (content);
 			if (eolMatch != null && eolMatch.Success)
 				eol = eolMatch.Groups ["eol"].Value;
@@ -82,7 +83,7 @@ namespace MonoDevelop.VersionControl.Views
 					// Create new file region
 					currentFile = new DefaultUnresolvedTypeDefinition (string.Empty, string.Empty);
 					currentFile.Region = currentFile.BodyRegion = new DomRegion (lastToken (lineMatch.Groups ["filepath"].Value), linenum, line.Length + 1, linenum, int.MaxValue);
-					doc.TopLevelTypeDefinitions.Add (currentFile);
+					// doc.TopLevelTypeDefinitions.Add (currentFile);
 				} else {
 					lineMatch = chunkExpression.Match (line);
 					if (lineMatch != null && lineMatch.Success && currentFile != null) {
@@ -110,7 +111,7 @@ namespace MonoDevelop.VersionControl.Views
 				                                          currentRegion.BodyRegion.BeginColumn, 
 				                                          Math.Max (1, linenum - 2), int.MaxValue);
 			
-			return doc;
+			return System.Threading.Tasks.Task.FromResult (doc);
 		}
 		
 		#endregion
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
index 4d3521553b..8920fd588a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
@@ -83,7 +83,7 @@ namespace MonoDevelop.VersionControl.Views
 		
 		#region IAttachableViewContent implementation
 
-		public int GetLineInCenter (Mono.TextEditor.TextEditor editor)
+		public int GetLineInCenter (Mono.TextEditor.MonoTextEditor editor)
 		{
 			double midY = editor.VAdjustment.Value + editor.Allocation.Height / 2;
 			return editor.YToLine (midY);
@@ -93,11 +93,10 @@ namespace MonoDevelop.VersionControl.Views
 		{
 			info.Start ();
 			ComparisonWidget.UpdateLocalText ();
-			var buffer = info.Document.GetContent<ITextBuffer> ();
+			var buffer = info.Document.GetContent<MonoDevelop.Ide.Editor.TextEditor> ();
 			if (buffer != null) {
-				int line, col;
-				buffer.GetLineColumnFromPosition (buffer.CursorPosition, out line, out col);
-				ComparisonWidget.OriginalEditor.SetCaretTo (line, col);
+				var loc = buffer.CaretLocation;
+				ComparisonWidget.OriginalEditor.SetCaretTo (loc.Line, loc.Column);
 			}
 			
 			if (ComparisonWidget.Allocation.Height == 1 && ComparisonWidget.Allocation.Width == 1) {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs
index fc7089a08b..d98b37dab1 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs
@@ -33,7 +33,7 @@ namespace MonoDevelop.VersionControl.Views
 	public partial class DiffWidget : Gtk.Bin
 	{
 		VersionControlDocumentInfo info;
-		Mono.TextEditor.TextEditor diffTextEditor;
+		Mono.TextEditor.MonoTextEditor diffTextEditor;
 		ComparisonWidget comparisonWidget;
 		Gtk.Button buttonNext;
 		Gtk.Button buttonPrev;
@@ -63,7 +63,7 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 		
-		public Mono.TextEditor.TextEditor FocusedEditor {
+		public Mono.TextEditor.MonoTextEditor FocusedEditor {
 			get {
 				return comparisonWidget.FocusedEditor;
 			}
@@ -91,7 +91,7 @@ namespace MonoDevelop.VersionControl.Views
 			};
 			comparisonWidget.SetVersionControlInfo (info);
 			this.buttonDiff.Clicked += HandleButtonDiffhandleClicked;
-			diffTextEditor = new global::Mono.TextEditor.TextEditor (new Mono.TextEditor.TextDocument (), new CommonTextEditorOptions ());
+			diffTextEditor = new global::Mono.TextEditor.MonoTextEditor (new Mono.TextEditor.TextDocument (), CommonTextEditorOptions.Instance);
 			diffTextEditor.Document.MimeType = "text/x-diff";
 			
 			diffTextEditor.Options.ShowFoldMargin = false;
@@ -143,7 +143,7 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 		
-		static string GetRevisionText (Mono.TextEditor.TextEditor editor, Revision rev)
+		static string GetRevisionText (Mono.TextEditor.MonoTextEditor editor, Revision rev)
 		{
 			if (!editor.Document.ReadOnly)
 				return GettextCatalog.GetString ("(working copy)");
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
index 066ad679b2..32e8313988 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
@@ -29,6 +29,7 @@ using System.ComponentModel;
 using MonoDevelop.Ide;
 using Gtk;
 using Mono.TextEditor;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.VersionControl.Views
 {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs
index ea883f870e..c4fe20f7f3 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs
@@ -36,6 +36,7 @@ using MonoDevelop.Ide;
 using MonoDevelop.Core;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Projects.Text;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.VersionControl.Views
 {
@@ -54,7 +55,7 @@ namespace MonoDevelop.VersionControl.Views
 		DiffScrollbar rightDiffScrollBar, leftDiffScrollBar;
 		MiddleArea[] middleAreas;
 
-		protected TextEditor[] editors;
+		protected MonoTextEditor[] editors;
 		protected Widget[] headerWidgets;
 
 		
@@ -85,13 +86,13 @@ namespace MonoDevelop.VersionControl.Views
 		static readonly Cairo.Color lightBlue = new Cairo.Color (190 / 255.0, 190 / 255.0, 240 / 255.0);
 		static readonly Cairo.Color darkBlue = new Cairo.Color (133 / 255.0, 133 / 255.0, 168 / 255.0);
 		
-		protected abstract TextEditor MainEditor {
+		protected abstract MonoTextEditor MainEditor {
 			get;
 		}
 		
-		public TextEditor FocusedEditor {
+		public MonoTextEditor FocusedEditor {
 			get {
-				foreach (TextEditor editor in editors) {
+				foreach (MonoTextEditor editor in editors) {
 					
 					if (editor.HasFocus)
 						return editor;
@@ -203,7 +204,7 @@ namespace MonoDevelop.VersionControl.Views
 			this.MainEditor.EditorOptionsChanged += HandleMainEditorhandleEditorOptionsChanged;
 		}
 		
-		void ShowPopup (TextEditor editor, EventButton evt)
+		void ShowPopup (MonoTextEditor editor, EventButton evt)
 		{
 			CommandEntrySet cset = IdeApp.CommandService.CreateCommandEntrySet ("/MonoDevelop/VersionControl/DiffView/ContextMenu");
 			Gtk.Menu menu = IdeApp.CommandService.CreateMenu (cset);
@@ -253,7 +254,7 @@ namespace MonoDevelop.VersionControl.Views
 		
 		protected abstract void CreateComponents ();
 		
-		public static ICollection<Cairo.Rectangle> GetDiffRectangles (TextEditor editor, int startOffset, int endOffset)
+		public static ICollection<Cairo.Rectangle> GetDiffRectangles (MonoTextEditor editor, int startOffset, int endOffset)
 		{
 			ICollection<Cairo.Rectangle> rectangles = new List<Cairo.Rectangle> ();
 			var startLine = editor.GetLineByOffset (startOffset);
@@ -276,12 +277,12 @@ namespace MonoDevelop.VersionControl.Views
 			diffCache.Clear ();
 		}
 		
-		static List<TextSegment> BreakTextInWords (TextEditor editor, int start, int count)
+		static List<TextSegment> BreakTextInWords (MonoTextEditor editor, int start, int count)
 		{
 			return TextBreaker.BreakLinesIntoWords(editor, start, count);
 		}
 		
-		static List<Cairo.Rectangle> CalculateChunkPath (TextEditor editor, List<Hunk> diff, List<TextSegment> words, bool useRemove)
+		static List<Cairo.Rectangle> CalculateChunkPath (MonoTextEditor editor, List<Hunk> diff, List<TextSegment> words, bool useRemove)
 		{
 			List<Cairo.Rectangle> result = new List<Cairo.Rectangle> ();
 			int startOffset = -1;
@@ -304,7 +305,7 @@ namespace MonoDevelop.VersionControl.Views
 			return result;
 		}
 		
-		Tuple<List<Cairo.Rectangle>, List<Cairo.Rectangle>> GetDiffPaths (List<Hunk> diff, TextEditor editor, Hunk hunk)
+		Tuple<List<Cairo.Rectangle>, List<Cairo.Rectangle>> GetDiffPaths (List<Hunk> diff, MonoTextEditor editor, Hunk hunk)
 		{
 			if (!diffCache.ContainsKey (diff))
 				diffCache[diff] = new Dictionary<Hunk, Tuple<List<Cairo.Rectangle>, List<Cairo.Rectangle>>> ();
@@ -375,7 +376,7 @@ namespace MonoDevelop.VersionControl.Views
 
 		internal static void EditorFocusIn (object sender, FocusInEventArgs args)
 		{
-			TextEditor editor = (TextEditor)sender;
+			MonoTextEditor editor = (MonoTextEditor)sender;
 			UpdateCaretPosition (editor.Caret);
 		}
 
@@ -611,10 +612,11 @@ namespace MonoDevelop.VersionControl.Views
 				throw new InvalidOperationException ("Version control info must be set before attaching the merge view to an editor.");
 			dict[data.Document] = data;
 			
-			var editor = info.Document.GetContent <ITextFile> ();
-			if (editor != null)
+			var editor = info.Document.GetContent <MonoDevelop.Ide.Editor.IReadonlyTextDocument> ();
+			if (editor != null) {
 				data.Document.Text = editor.Text;
-			data.Document.ReadOnly = info.Document.GetContent<IEditableTextFile> () == null;
+				data.Document.ReadOnly = editor.IsReadOnly;
+			}
 			
 			CreateDiff ();
 			data.Document.TextReplaced += HandleDataDocumentTextReplaced;
@@ -624,9 +626,8 @@ namespace MonoDevelop.VersionControl.Views
 		{
 			var data = dict [(TextDocument)sender];
 			localUpdate.Remove (data);
-			var editor = info.Document.GetContent<IEditableTextFile> ();
-			editor.DeleteText (e.Offset, e.RemovalLength);
-			editor.InsertText (e.Offset, e.InsertedText.Text);
+			var editor = info.Document.GetContent<MonoDevelop.Ide.Editor.ITextDocument> ();
+			editor.ReplaceText (e.Offset, e.RemovalLength, e.InsertedText.Text);
 			localUpdate.Add (data);
 			UpdateDiff ();
 		}
@@ -637,7 +638,7 @@ namespace MonoDevelop.VersionControl.Views
 			data.Document.TextReplaced -= HandleDataDocumentTextReplaced;
 		}
 
-		protected virtual void UndoChange (TextEditor fromEditor, TextEditor toEditor, Hunk hunk)
+		protected virtual void UndoChange (MonoTextEditor fromEditor, MonoTextEditor toEditor, Hunk hunk)
 		{
 			using (var undo = toEditor.OpenUndoGroup ()) {
 				var start = toEditor.Document.GetLine (hunk.InsertStart);
@@ -668,7 +669,7 @@ namespace MonoDevelop.VersionControl.Views
 		class MiddleArea : DrawingArea
 		{
 			EditorCompareWidgetBase widget;
-			TextEditor fromEditor, toEditor;
+			MonoTextEditor fromEditor, toEditor;
 			bool useLeft;
 
 			IEnumerable<Hunk> Diff {
@@ -677,7 +678,7 @@ namespace MonoDevelop.VersionControl.Views
 				}
 			}
 
-			public MiddleArea (EditorCompareWidgetBase widget, TextEditor fromEditor, TextEditor toEditor, bool useLeft)
+			public MiddleArea (EditorCompareWidgetBase widget, MonoTextEditor fromEditor, MonoTextEditor toEditor, bool useLeft)
 			{
 				this.widget = widget;
 				this.Events |= EventMask.PointerMotionMask | EventMask.ButtonPressMask;
@@ -888,7 +889,7 @@ namespace MonoDevelop.VersionControl.Views
 								//	mx -= (int)x;
 								//	my -= (int)y;
 									using (var gradient = new Cairo.RadialGradient (mx, my, h, mx, my, 2)) {
-										var color = (HslColor)Style.Mid (StateType.Normal);
+										var color = (MonoDevelop.Components.HslColor)Style.Mid (StateType.Normal);
 										color.L *= 1.05;
 										gradient.AddColorStop (0, color);
 										color.L *= 1.07;
@@ -896,11 +897,11 @@ namespace MonoDevelop.VersionControl.Views
 										cr.SetSource (gradient);
 									}
 								} else {
-									cr.SetSourceColor ((HslColor)Style.Mid (StateType.Normal));
+									cr.SetSourceColor ((MonoDevelop.Components.HslColor)Style.Mid (StateType.Normal));
 								}
 								cr.FillPreserve ();
 								
-								cr.SetSourceColor ((HslColor)Style.Dark (StateType.Normal));
+								cr.SetSourceColor ((MonoDevelop.Components.HslColor)Style.Dark (StateType.Normal));
 								cr.Stroke ();
 								cr.LineWidth = 1;
 								cr.SetSourceRGB (0, 0, 0);
@@ -930,13 +931,13 @@ namespace MonoDevelop.VersionControl.Views
 
 		class DiffScrollbar : DrawingArea
 		{
-			TextEditor editor;
+			MonoTextEditor editor;
 			EditorCompareWidgetBase widget;
 			bool useLeftDiff;
 			bool paintInsert;
 			Adjustment vAdjustment;
 			
-			public DiffScrollbar (EditorCompareWidgetBase widget, TextEditor editor, bool useLeftDiff, bool paintInsert)
+			public DiffScrollbar (EditorCompareWidgetBase widget, MonoTextEditor editor, bool useLeftDiff, bool paintInsert)
 			{
 				this.editor = editor;
 				this.useLeftDiff = useLeftDiff;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
index ab9c7898d6..02e20fc3f4 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
@@ -38,7 +38,7 @@ namespace MonoDevelop.VersionControl.Views
 {
 	public class MergeWidget : EditorCompareWidgetBase
 	{
-		protected override TextEditor MainEditor {
+		protected override MonoTextEditor MainEditor {
 			get {
 				return editors != null && editors.Length >= 2 ? editors[1] : null;
 			}
@@ -49,7 +49,7 @@ namespace MonoDevelop.VersionControl.Views
 			MainEditor.Document.TextReplaced += UpdateConflictsOnTextReplace;
 		}
 
-		protected override void UndoChange (TextEditor fromEditor, TextEditor toEditor, Hunk hunk)
+		protected override void UndoChange (MonoTextEditor fromEditor, MonoTextEditor toEditor, Hunk hunk)
 		{
 			base.UndoChange (fromEditor, toEditor, hunk);
 			int i = leftConflicts.IndexOf (hunk);
@@ -100,9 +100,9 @@ namespace MonoDevelop.VersionControl.Views
 		protected override void CreateComponents ()
 		{
 			this.editors = new [] {
-				new TextEditor (new TextDocument (), new CommonTextEditorOptions ()),
-				new TextEditor (new TextDocument (), new CommonTextEditorOptions ()),
-				new TextEditor (new TextDocument (), new CommonTextEditorOptions ()),
+				new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance),
+				new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance),
+				new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance),
 			};
 			
 			this.editors[0].Document.ReadOnly = true;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
index 1de9cb6406..c329b72003 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
@@ -112,6 +112,22 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="icons\added-overlay-16.png">
@@ -407,10 +423,12 @@
     <Compile Include="AddinInfo.cs" />
     <Compile Include="MonoDevelop.VersionControl\VersionControlException.cs" />
     <Compile Include="MonoDevelop.VersionControl\VersionControlTask.cs" />
+    <Compile Include="MonoDevelop.VersionControl.Views\CommonTextEditorOptions.cs" />
     <Compile Include="MonoDevelop.VersionControl.Views\BaseView.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/packages.config b/main/src/addins/VersionControl/MonoDevelop.VersionControl/packages.config
new file mode 100644
index 0000000000..d3fca62c00
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj b/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj
index 90bc822e52..644f6ff136 100644
--- a/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj
+++ b/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj
@@ -60,10 +60,10 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="SharpSvn">
-      <HintPath>..\..\..\..\packages\SharpSvn.1.8-x86.1.8011.3394.61\lib\net40\SharpSvn.dll</HintPath>
+      <HintPath>..\..\..\..\packages\SharpSvn.1.8-x86.1.8013.3576.94\lib\net40\SharpSvn.dll</HintPath>
     </Reference>
     <Reference Include="SharpSvn.UI">
-      <HintPath>..\..\..\..\packages\SharpSvn.1.8-x86.1.8011.3394.61\lib\net40\SharpSvn.UI.dll</HintPath>
+      <HintPath>..\..\..\..\packages\SharpSvn.1.8-x86.1.8013.3576.94\lib\net40\SharpSvn.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -127,11 +127,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\..\packages\SharpSvn.1.8-x86.1.8011.3394.61\lib\net40\SharpPlink-Win32.svnExe">
+    <None Include="..\..\..\..\packages\SharpSvn.1.8-x86.1.8013.3576.94\lib\net40\SharpPlink-Win32.svnExe">
       <Link>SharpPlink-Win32.svnExe</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\..\packages\SharpSvn.1.8-x86.1.8011.3394.61\lib\net40\SharpSvn-DB44-20-win32.svnDll">
+    <None Include="..\..\..\..\packages\SharpSvn.1.8-x86.1.8013.3576.94\lib\net40\SharpSvn-DB44-20-win32.svnDll">
       <Link>SharpSvn-DB44-20-win32.svnDll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/main/src/addins/VersionControl/Subversion.Win32/packages.config b/main/src/addins/VersionControl/Subversion.Win32/packages.config
index c9f086190f..825e3d922d 100644
--- a/main/src/addins/VersionControl/Subversion.Win32/packages.config
+++ b/main/src/addins/VersionControl/Subversion.Win32/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

-  <package id="SharpSvn.1.8-x86" version="1.8011.3394.61" targetFramework="net45" />

+  <package id="SharpSvn.1.8-x86" version="1.8013.3576.94" targetFramework="net45" />

 </packages>
\ No newline at end of file
diff --git a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/PropertySystem/ShellProperty.cs b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/PropertySystem/ShellProperty.cs
index ef4167876c..93650334e4 100644
--- a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/PropertySystem/ShellProperty.cs
+++ b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/PropertySystem/ShellProperty.cs
@@ -195,14 +195,15 @@ namespace Microsoft.WindowsAPICodePack.Shell.PropertySystem
                 // Make sure we use the correct type

                 Debug.Assert(ValueType == ShellPropertyFactory.VarEnumToSystemType(Description.VarEnumType));

 

-                if (typeof(T) != ValueType)

+				var type = typeof(T);

+                if (type != ValueType)

                 {

                     throw new NotSupportedException(

                         string.Format(System.Globalization.CultureInfo.InvariantCulture,

                         LocalizedMessages.ShellPropertyWrongType, ValueType.Name));

                 }

 

-                if (value is Nullable)

+				if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))

                 {

                     Type t = typeof(T);

                     PropertyInfo pi = t.GetProperty("HasValue");

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs
index 1749628239..229063160d 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs
@@ -34,18 +34,18 @@ using System.IO;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
-using System.Runtime.InteropServices;

+using System.Runtime.InteropServices;
 using System.Collections.Generic;
 using Microsoft.Win32;
-using CustomControls.OS;

+using CustomControls.OS;
 using MonoDevelop.Ide.Desktop;
 using System.Diagnostics;
 using MonoDevelop.Core.Execution;
 using System.Text;
 using MonoDevelop.Core;
 using Microsoft.WindowsAPICodePack.Taskbar;
-using MonoDevelop.Ide;

-

+using MonoDevelop.Ide;
+
 namespace MonoDevelop.Platform
 {
 	public class WindowsPlatform : PlatformService
@@ -344,7 +344,7 @@ namespace MonoDevelop.Platform
 
 			//first check for the user's preferred app for this file type and use it as the default
 			using (var key = Registry.CurrentUser.OpenSubKey (@"Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\" + extension + @"\UserChoice")) {
-				var progid = key == null ? null : key.GetValue ("ProgId") as string;
+				var progid = key?.GetValue ("ProgId") as string;
 				if (progid != null)
 					apps[progid] = defaultApp = WindowsAppFromName (progid, true, AssociationFlags.None);
 			}
diff --git a/main/src/addins/Xml/Completion/XmlCompletionData.cs b/main/src/addins/Xml/Completion/XmlCompletionData.cs
index c3c77f6e94..3eb5a504c9 100644
--- a/main/src/addins/Xml/Completion/XmlCompletionData.cs
+++ b/main/src/addins/Xml/Completion/XmlCompletionData.cs
@@ -22,15 +22,19 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 
-using System;
-using Gdk;

-using Mono.TextEditor;

+using Gdk;
+using Gtk;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.CodeCompletion;

+using System;

 using MonoDevelop.Core;

+using MonoDevelop.Ide.Gui.Content;

 using MonoDevelop.Ide;

 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Ide.Commands;

 using MonoDevelop.Ide.Gui.Content;

 using MonoDevelop.Xml.Editor;

+using MonoDevelop.Ide.Editor.Extension;

 

 namespace MonoDevelop.Xml.Completion

 {

@@ -104,18 +108,15 @@ namespace MonoDevelop.Xml.Completion
 			}
 		}

 

-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, ModifierType modifier)

+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)

 		{

 			if (XmlEditorOptions.AutoInsertFragments && dataType == DataType.XmlAttribute) {

-				var textEditorDataProvier = window.CompletionWidget as ITextEditorDataProvider;

-				var textBuffer = window.CompletionWidget as ITextBuffer;

-				base.InsertCompletionText (window, ref ka, closeChar, keyChar, modifier);

-				if (textEditorDataProvier != null && textBuffer != null)

-					textEditorDataProvier.GetTextEditorData ().SetSkipChar (textBuffer.CursorPosition, '"');

+				base.InsertCompletionText (window, ref ka, descriptor);

+				window.CompletionWidget.AddSkipChar (window.CompletionWidget.CaretOffset, '"');

 				IdeApp.CommandService.DispatchCommand (TextEditorCommands.ShowCompletionWindow);

 				ka &= ~KeyActions.CloseWindow;

 			} else {

-				base.InsertCompletionText (window, ref ka, closeChar, keyChar, modifier);

+				base.InsertCompletionText (window, ref ka, descriptor);

 			}

 		}

 		

diff --git a/main/src/addins/Xml/Completion/XmlTagCompletionData.cs b/main/src/addins/Xml/Completion/XmlTagCompletionData.cs
index befc32f068..e0d08b5ef2 100644
--- a/main/src/addins/Xml/Completion/XmlTagCompletionData.cs
+++ b/main/src/addins/Xml/Completion/XmlTagCompletionData.cs
@@ -31,6 +31,7 @@ using System;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Xml.Completion
 {
@@ -66,20 +67,17 @@ namespace MonoDevelop.Xml.Completion
 			get { return element; }
 		}
 		
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
-			IEditableTextBuffer buf = window.CompletionWidget as IEditableTextBuffer;
+			var buf = window.CompletionWidget;
 			if (buf != null) {
 				//completion context gets nulled from window as soon as we alter the buffer
 				var codeCompletionContext = window.CodeCompletionContext;
 
-				using (var undo = buf.OpenUndoGroup ()) {
-					buf.InsertText (buf.CursorPosition, element);
+				buf.Replace (buf.CaretOffset, 0, element);
 					
-					// Move caret into the middle of the tags
-					buf.CursorPosition = codeCompletionContext.TriggerOffset + cursorOffset;
-					buf.Select (buf.CursorPosition, buf.CursorPosition);
-				}

+				// Move caret into the middle of the tags
+				buf.CaretOffset = codeCompletionContext.TriggerOffset + cursorOffset;
 			}
 		}
 	}
diff --git a/main/src/addins/Xml/Dom/XAttribute.cs b/main/src/addins/Xml/Dom/XAttribute.cs
index f34f456727..c82a8e7a8b 100644
--- a/main/src/addins/Xml/Dom/XAttribute.cs
+++ b/main/src/addins/Xml/Dom/XAttribute.cs
@@ -23,21 +23,20 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

-
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XAttribute : XObject, INamedXObject
 	{
 
-		public XAttribute (TextLocation start, XName name, string value) : base (start)
+		public XAttribute (DocumentLocation start, XName name, string value) : base (start)
 		{
 			this.Name = name;
 			this.Value = value;
 		}
 
-		public XAttribute (TextLocation start) : base (start)
+		public XAttribute (DocumentLocation start) : base (start)
 		{
 		}
 
diff --git a/main/src/addins/Xml/Dom/XCData.cs b/main/src/addins/Xml/Dom/XCData.cs
index 001f80521b..f850d91cec 100644
--- a/main/src/addins/Xml/Dom/XCData.cs
+++ b/main/src/addins/Xml/Dom/XCData.cs
@@ -24,15 +24,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XCData : XNode
 	{
-		public XCData (TextLocation start) : base (start) {}
-		public XCData (DomRegion region) : base (region) {}
+		public XCData (DocumentLocation start) : base (start) {}
+		public XCData (DocumentRegion region) : base (region) {}
 
 		protected XCData () {}
 		protected override XObject NewInstance () { return new XCData (); }
diff --git a/main/src/addins/Xml/Dom/XClosingTag.cs b/main/src/addins/Xml/Dom/XClosingTag.cs
index c134dea6a4..3973ad2ab8 100644
--- a/main/src/addins/Xml/Dom/XClosingTag.cs
+++ b/main/src/addins/Xml/Dom/XClosingTag.cs
@@ -24,15 +24,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XClosingTag : XNode, INamedXObject
 	{
-		public XClosingTag (TextLocation start) : base (start) {}
+		public XClosingTag (DocumentLocation start) : base (start) {}
 
-		public XClosingTag (XName name, TextLocation start) : base (start)
+		public XClosingTag (XName name, DocumentLocation start) : base (start)
 		{
 			this.Name = name;
 		}
diff --git a/main/src/addins/Xml/Dom/XComment.cs b/main/src/addins/Xml/Dom/XComment.cs
index 57231b974f..08a7998065 100644
--- a/main/src/addins/Xml/Dom/XComment.cs
+++ b/main/src/addins/Xml/Dom/XComment.cs
@@ -23,16 +23,14 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

-
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XComment : XNode
 	{
-		public XComment (TextLocation start) : base (start) {}
-		public XComment (DomRegion region) : base (region) {}
+		public XComment (DocumentLocation start) : base (start) {}
+		public XComment (DocumentRegion region) : base (region) {}
 
 		protected XComment () {}
 		protected override XObject NewInstance () { return new XComment (); }
diff --git a/main/src/addins/Xml/Dom/XContainer.cs b/main/src/addins/Xml/Dom/XContainer.cs
index 997def1ad0..dd6e0c10fd 100644
--- a/main/src/addins/Xml/Dom/XContainer.cs
+++ b/main/src/addins/Xml/Dom/XContainer.cs
@@ -25,14 +25,14 @@
 // THE SOFTWARE.

 
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.NRefactory;
+using System.Text;

+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public abstract class XContainer : XNode
 	{
-		protected XContainer (TextLocation start) : base (start) {	}
+		protected XContainer (DocumentLocation start) : base (start) {	}
 
 		XNode firstNode;
 		XNode lastChild;
diff --git a/main/src/addins/Xml/Dom/XDocType.cs b/main/src/addins/Xml/Dom/XDocType.cs
index ff29a31322..a91f85be96 100644
--- a/main/src/addins/Xml/Dom/XDocType.cs
+++ b/main/src/addins/Xml/Dom/XDocType.cs
@@ -24,15 +24,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XDocType : XNode, INamedXObject
 	{
-		public XDocType (TextLocation start) : base (start) {}
-		public XDocType (DomRegion region) : base (region) {}
+		public XDocType (DocumentLocation start) : base (start) {}
+		public XDocType (DocumentRegion region) : base (region) {}
 
 		protected XDocType () {}
 		protected override XObject NewInstance () { return new XDocType (); }
@@ -40,7 +39,7 @@ namespace MonoDevelop.Xml.Dom
 		public XName RootElement { get; set; }
 		public string PublicFpi { get; set; }
 		public bool IsPublic { get { return PublicFpi != null; } }
-		public DomRegion InternalDeclarationRegion { get; set; }
+		public DocumentRegion InternalDeclarationRegion { get; set; }
 		public string Uri { get; set; }
 
 		public override string FriendlyPathRepresentation {
diff --git a/main/src/addins/Xml/Dom/XDocument.cs b/main/src/addins/Xml/Dom/XDocument.cs
index dc6cfafccc..2425c065c7 100644
--- a/main/src/addins/Xml/Dom/XDocument.cs
+++ b/main/src/addins/Xml/Dom/XDocument.cs
@@ -24,8 +24,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using System;
-using ICSharpCode.NRefactory;
+using System;

+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
@@ -33,7 +33,7 @@ namespace MonoDevelop.Xml.Dom
 	{
 		public XElement RootElement { get; private set; }
 
-		public XDocument () : base (new TextLocation (1, 1)) {}
+		public XDocument () : base (new DocumentLocation (1, 1)) {}
 		protected override XObject NewInstance () { return new XDocument (); }
 
 		public override string FriendlyPathRepresentation {
diff --git a/main/src/addins/Xml/Dom/XElement.cs b/main/src/addins/Xml/Dom/XElement.cs
index a49a2b81d4..81ff5eceba 100644
--- a/main/src/addins/Xml/Dom/XElement.cs
+++ b/main/src/addins/Xml/Dom/XElement.cs
@@ -25,8 +25,8 @@
 // THE SOFTWARE.

 
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.NRefactory;
+using System.Text;

+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
@@ -35,12 +35,12 @@ namespace MonoDevelop.Xml.Dom
 		XNode closingTag;
 		readonly XAttributeCollection attributes;
 
-		public XElement (TextLocation start) : base (start)
+		public XElement (DocumentLocation start) : base (start)
 		{
 			attributes = new XAttributeCollection (this);
 		}
 
-		public XElement (TextLocation start, XName name) : this (start)
+		public XElement (DocumentLocation start, XName name) : this (start)
 		{
 			this.Name = name;
 		}
diff --git a/main/src/addins/Xml/Dom/XNode.cs b/main/src/addins/Xml/Dom/XNode.cs
index d98b02b761..37fd74d643 100644
--- a/main/src/addins/Xml/Dom/XNode.cs
+++ b/main/src/addins/Xml/Dom/XNode.cs
@@ -24,15 +24,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public abstract class XNode : XObject
 	{
-		protected XNode (TextLocation start) : base (start) {}
-		protected XNode (DomRegion region) : base (region) {}
+		protected XNode (DocumentLocation start) : base (start) {}
+		protected XNode (DocumentRegion region) : base (region) {}
 		protected XNode () {}
 
 		public XNode NextSibling { get; internal protected set; }
diff --git a/main/src/addins/Xml/Dom/XObject.cs b/main/src/addins/Xml/Dom/XObject.cs
index f999256eea..c55d3e3742 100644
--- a/main/src/addins/Xml/Dom/XObject.cs
+++ b/main/src/addins/Xml/Dom/XObject.cs
@@ -25,22 +25,21 @@
 // THE SOFTWARE.

 
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using System.Text;

+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public abstract class XObject
 	{
-		DomRegion region;
+		DocumentRegion region;
 
-		protected XObject (TextLocation start)
+		protected XObject (DocumentLocation start)
 		{
-			region = new DomRegion (start, TextLocation.Empty);
+			region = new DocumentRegion (start, DocumentLocation.Empty);
 		}
 
-		protected XObject (DomRegion region)
+		protected XObject (DocumentRegion region)
 		{
 			this.region = region;
 		}
@@ -57,13 +56,13 @@ namespace MonoDevelop.Xml.Dom
 			}
 		}
 
-		public DomRegion Region {
+		public DocumentRegion Region {
 			get { return region; }
 		}
 
-		public void End (TextLocation endLocation)
+		public void End (DocumentLocation endLocation)
 		{
-			region = new DomRegion (region.Begin, endLocation);
+			region = new DocumentRegion (region.Begin, endLocation);
 		}
 
 		public bool IsEnded {
diff --git a/main/src/addins/Xml/Dom/XProcessingInstruction.cs b/main/src/addins/Xml/Dom/XProcessingInstruction.cs
index 9089897116..03d907fe62 100644
--- a/main/src/addins/Xml/Dom/XProcessingInstruction.cs
+++ b/main/src/addins/Xml/Dom/XProcessingInstruction.cs
@@ -23,16 +23,14 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

-
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XProcessingInstruction : XNode
 	{
-		public XProcessingInstruction (TextLocation start) : base (start) {}
-		public XProcessingInstruction (DomRegion region) : base (region) {}
+		public XProcessingInstruction (DocumentLocation start) : base (start) {}
+		public XProcessingInstruction (DocumentRegion region) : base (region) {}
 
 		protected XProcessingInstruction () {}
 		protected override XObject NewInstance () { return new XProcessingInstruction (); }
diff --git a/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs b/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs
index f0395d0aea..75a9fdf5de 100644
--- a/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs
+++ b/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs
@@ -34,10 +34,7 @@ using System.Linq;
 
 using Gtk;
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 
-using Mono.TextEditor;
 using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.DesignerSupport;
@@ -45,10 +42,14 @@ using MonoDevelop.Ide;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
 using MonoDevelop.Projects;
 using MonoDevelop.Xml.Completion;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace MonoDevelop.Xml.Editor
 {
@@ -65,18 +66,17 @@ namespace MonoDevelop.Xml.Editor
 
 		#region Setup and teardown
 
-		public override bool ExtendsEditor (MonoDevelop.Ide.Gui.Document doc, IEditableTextBuffer editor)
+		public override bool IsValidInContext (DocumentContext context)
 		{
 			//can only attach if there is not already an attached BaseXmlEditorExtension
-			return doc.GetContent<BaseXmlEditorExtension> () == null;
+			return context.GetContent<BaseXmlEditorExtension> () == null;
 		}
 		
 		protected virtual XmlRootState CreateRootState ()
 		{
 			return new XmlRootState ();
 		}
-
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 
@@ -89,11 +89,11 @@ namespace MonoDevelop.Xml.Editor
 
 			var parser = new XmlParser (CreateRootState (), false);
 			tracker = new DocumentStateTracker<XmlParser> (parser, Editor);
+			DocumentContext.DocumentParsed += UpdateParsedDocument;
+			Editor.CaretPositionChanged += HandleCaretPositionChanged;
 
-			Document.DocumentParsed += UpdateParsedDocument;
-			
-			if (Document.ParsedDocument != null) {
-				lastCU = Document.ParsedDocument;
+			if (DocumentContext.ParsedDocument != null) {
+				lastCU = DocumentContext.ParsedDocument;
 				OnParsedDocumentUpdated ();
 			}
 
@@ -105,7 +105,7 @@ namespace MonoDevelop.Xml.Editor
 
 		void HandleProjectChanged (object sender, ProjectFileEventArgs e)
 		{
-			if (e.Any (f => f.ProjectFile.FilePath == Document.FileName))
+			if (e.Any (f => f.ProjectFile.FilePath == DocumentContext.Name))
 				UpdateOwnerProjects ();
 		}
 
@@ -115,37 +115,39 @@ namespace MonoDevelop.Xml.Editor
 				ownerProjects = new List<DotNetProject> ();
 				return;
 			}
-			var projects = new HashSet<DotNetProject> (IdeApp.Workspace.GetAllItems<DotNetProject> ().Where (p => p.IsFileInProject (Document.FileName)));
+			var projects = new HashSet<DotNetProject> (IdeApp.Workspace.GetAllItems<DotNetProject> ().Where (p => p.IsFileInProject (DocumentContext.Name)));
 			if (ownerProjects == null || !projects.SetEquals (ownerProjects)) {
 				ownerProjects = projects.OrderBy (p => p.Name).ToList ();
-				var dnp = Document.Project as DotNetProject;
+				var dnp = DocumentContext.Project as DotNetProject;
 				if (ownerProjects.Count > 0 && (dnp == null || !ownerProjects.Contains (dnp))) {
 					// If the project for the document is not a DotNetProject but there is a project containing this file
 					// in the current solution, then use that project
-					var pp = Document.Project != null ? ownerProjects.FirstOrDefault (p => p.ParentSolution == Document.Project.ParentSolution) : null;
+					var pp = DocumentContext.Project != null ? ownerProjects.FirstOrDefault (p => p.ParentSolution == DocumentContext.Project.ParentSolution) : null;
 					if (pp != null)
-						Document.AttachToProject (pp);
+						DocumentContext.AttachToProject (pp);
 				}
 			}
-			if (Document.Project == null && ownerProjects.Count > 0)
-				Document.AttachToProject (ownerProjects[0]);
+			if (DocumentContext.Project == null && ownerProjects.Count > 0)
+				DocumentContext.AttachToProject (ownerProjects[0]);
 			UpdatePath ();
 		}
 
 		void UpdateParsedDocument (object sender, EventArgs args)
 		{
-			lastCU = Document.ParsedDocument;
+			lastCU = DocumentContext.ParsedDocument;
 			OnParsedDocumentUpdated ();
 		}
 
 		public override void Dispose ()
 		{
+			Editor.CaretPositionChanged -= HandleCaretPositionChanged;
+
 			if (tracker != null) {
 				tracker = null;
 				base.Dispose ();
 			}
 
-			Document.DocumentParsed -= UpdateParsedDocument;
+			DocumentContext.DocumentParsed -= UpdateParsedDocument;
 
 			if (IdeApp.Workspace != null) {
 				IdeApp.Workspace.FileAddedToProject -= HandleProjectChanged;
@@ -183,34 +185,17 @@ namespace MonoDevelop.Xml.Editor
 		protected ParsedDocument CU {
 			get { return lastCU; }
 		}
-		
-		protected ITextBuffer Buffer {
-			get {
-				if (Document == null)
-					throw new InvalidOperationException ("Editor extension not yet initialized");
-				return Document.GetContent<ITextBuffer> ();
-			}
-		}
-		
-		protected IEditableTextBuffer EditableBuffer {
-			get {
-				if (Document == null)
-					throw new InvalidOperationException ("Editor extension not yet initialized");
-				return Document.GetContent<IEditableTextBuffer> ();
-			}
-		}
-		
+
 		protected DocumentStateTracker<XmlParser> Tracker {
 			get { return tracker; }
 		}
 		
-		protected string GetBufferText (DomRegion region)
+		protected string GetBufferText (DocumentRegion region)
 		{
-			ITextBuffer buf = Buffer;
-			int start = buf.GetPositionFromLineColumn (region.BeginLine, region.BeginColumn);
-			int end = buf.GetPositionFromLineColumn (region.EndLine, region.EndColumn);
+			int start = Editor.LocationToOffset (region.BeginLine, region.BeginColumn);
+			int end = Editor.LocationToOffset (region.EndLine, region.EndColumn);
 			if (end > start && start >= 0)
-				return buf.GetText (start, end);
+				return Editor.GetTextBetween (start, end);
 			return null;
 		}
 		
@@ -219,7 +204,12 @@ namespace MonoDevelop.Xml.Editor
 		public override string CompletionLanguage {
 			get { return "Xml"; }
 		}
-		
+
+		protected FilePath FileName {
+			get {
+				return Editor.FileName;
+			}
+		}
 		protected XDocType DocType {
 			get { return docType; }
 			set {
@@ -234,29 +224,24 @@ namespace MonoDevelop.Xml.Editor
 		{
 		}
 		
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			if (Document.Editor.Options.IndentStyle == IndentStyle.Smart) {
-				var newLine = Editor.Caret.Line + 1;
-				var ret = base.KeyPress (key, keyChar, modifier);
-				if (key == Gdk.Key.Return && Editor.Caret.Line == newLine) {
+			if (Editor.Options.IndentStyle == IndentStyle.Smart) {
+				var newLine = Editor.CaretLine + 1;
+				var ret = base.KeyPress (descriptor);
+				if (descriptor.SpecialKey == SpecialKey.Return && Editor.CaretLine == newLine) {
 					string indent = GetLineIndent (newLine);
 					var oldIndent = Editor.GetLineIndent (newLine);
 					var seg = Editor.GetLine (newLine);
 					if (oldIndent != indent) {
-						int newCaretOffset = Editor.Caret.Offset;
-						if (newCaretOffset > seg.Offset) {
-							newCaretOffset += (indent.Length - oldIndent.Length);
-						}
 						using (var undo = Editor.OpenUndoGroup ()) {
-							Editor.Replace (seg.Offset, oldIndent.Length, indent);
-							Editor.Caret.Offset = newCaretOffset;
+							Editor.ReplaceText (seg.Offset, oldIndent.Length, indent);
 						}
 					}
 				}
 				return ret;
 			}
-			return base.KeyPress (key, keyChar, modifier);
+			return base.KeyPress (descriptor);
 		}
 		
 		#region Code completion
@@ -266,31 +251,29 @@ namespace MonoDevelop.Xml.Editor
 			int pos = completionContext.TriggerOffset;
 			if (pos <= 0)
 				return null;
-			int triggerWordLength = 0;
-			
 			tracker.UpdateEngine ();
-			return HandleCodeCompletion (completionContext, true, ref triggerWordLength);
+			var task = HandleCodeCompletion (completionContext, true, default(CancellationToken));
+			return task != null ? task.Result : null;
 		}
 
-		public override ICompletionDataList HandleCodeCompletion (
-		    CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
+		public override Task<ICompletionDataList> HandleCodeCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
 			int pos = completionContext.TriggerOffset;
 			char ch = CompletionWidget != null ? CompletionWidget.GetChar (pos - 1) : Editor.GetCharAt (pos - 1);
 			if (pos > 0 && ch == completionChar) {
 				tracker.UpdateEngine ();
-				return HandleCodeCompletion (completionContext, false, ref triggerWordLength);
+				return HandleCodeCompletion (completionContext, false, token);
 			}
 			return null;
 		}
 
-		protected virtual ICompletionDataList HandleCodeCompletion (
-		    CodeCompletionContext completionContext, bool forced, ref int triggerWordLength)
+		protected virtual Task<ICompletionDataList> HandleCodeCompletion (
+			CodeCompletionContext completionContext, bool forced, CancellationToken token)
 		{
-			IEditableTextBuffer buf = EditableBuffer;
+			var buf = this.Editor;
 
 			// completionChar may be a space even if the current char isn't, when ctrl-space is fired t
-			var currentLocation = new TextLocation (completionContext.TriggerLine, completionContext.TriggerLineOffset);
+			var currentLocation = new DocumentLocation (completionContext.TriggerLine, completionContext.TriggerLineOffset);
 			char currentChar = completionContext.TriggerOffset < 1? ' ' : buf.GetCharAt (completionContext.TriggerOffset - 1);
 			char previousChar = completionContext.TriggerOffset < 2? ' ' : buf.GetCharAt (completionContext.TriggerOffset - 2);
 
@@ -299,13 +282,13 @@ namespace MonoDevelop.Xml.Editor
 				tracker.Engine.CurrentStateLength, previousChar, currentChar, forced);
 			
 			//closing tag completion
-			if (tracker.Engine.CurrentState is XmlRootState && currentChar == '>')

-				return ClosingTagCompletion (buf, currentLocation);
+			if (tracker.Engine.CurrentState is XmlRootState && currentChar == '>')
+				return Task.FromResult (ClosingTagCompletion (buf, currentLocation));
 			
 			// Auto insert '>' when '/' is typed inside tag state (for quick tag closing)
 			//FIXME: avoid doing this when the next non-whitespace char is ">" or ignore the next ">" typed
 			if (XmlEditorOptions.AutoInsertFragments && tracker.Engine.CurrentState is XmlTagState && currentChar == '/') {
-				buf.InsertText (buf.CursorPosition, ">");
+				buf.InsertAtCaret (">");
 				return null;
 			}
 			
@@ -331,7 +314,7 @@ namespace MonoDevelop.Xml.Editor
 				list.Add ("&").CompletionText = "amp;";
 				
 				GetEntityCompletions (list);
-				return list;
+				return Task.FromResult ((ICompletionDataList)list);
 			}
 			
 			//doctype completion
@@ -339,7 +322,7 @@ namespace MonoDevelop.Xml.Editor
 				if (tracker.Engine.CurrentStateLength == 1) {
 					CompletionDataList list = GetDocTypeCompletions ();
 					if (list != null && list.Count > 0)
-						return list;
+						return Task.FromResult ((ICompletionDataList)list);
 				}
 				return null;
 			}
@@ -359,9 +342,13 @@ namespace MonoDevelop.Xml.Editor
 						return null;
 
 					//if triggered by first letter of value or forced, grab those letters
-					triggerWordLength = Tracker.Engine.CurrentStateLength - 1;
 
-					return GetAttributeValueCompletions (attributedOb, att);
+					var result = GetAttributeValueCompletions (attributedOb, att);
+					if (result != null) {
+						result.TriggerWordLength = Tracker.Engine.CurrentStateLength - 1;
+						return Task.FromResult ((ICompletionDataList)result);
+					}
+					return null;
 				}
 			}
 			
@@ -380,17 +367,18 @@ namespace MonoDevelop.Xml.Editor
 				if (attributedOb.Name.IsValid && (forced ||
 					(char.IsWhiteSpace (previousChar) && char.IsLetter (currentChar))))
 				{
-					
-					if (!forced)
-						triggerWordLength = 1;
-					
 					var existingAtts = new Dictionary<string,string> (StringComparer.OrdinalIgnoreCase);
 					
 					foreach (XAttribute att in attributedOb.Attributes) {
 						existingAtts [att.Name.FullName] = att.Value ?? string.Empty;
 					}
-					
-					return GetAttributeCompletions (attributedOb, existingAtts);
+					var result = GetAttributeCompletions (attributedOb, existingAtts);
+					if (result != null) {
+						if (!forced)
+							result.TriggerWordLength = 1;
+						return Task.FromResult ((ICompletionDataList)result);
+					}
+					return null;
 				}
 			}
 			
@@ -405,48 +393,79 @@ namespace MonoDevelop.Xml.Editor
 				var list = new CompletionDataList ();
 				GetElementCompletions (list);
 				AddCloseTag (list, Tracker.Engine.Nodes);
-				return list.Count > 0? list : null;
+				return Task.FromResult ((ICompletionDataList)(list.Count > 0? list : null));
 			}
 
 			if (forced && Tracker.Engine.CurrentState is XmlRootState) {
 				var list = new CompletionDataList ();
-				MonoDevelop.Ide.CodeTemplates.CodeTemplateService.AddCompletionDataForFileName (Document.Name, list);
-				return list.Count > 0? list : null;
+				MonoDevelop.Ide.CodeTemplates.CodeTemplateService.AddCompletionDataForFileName (DocumentContext.Name, list);
+				return Task.FromResult ((ICompletionDataList)(list.Count > 0? list : null));
 			}
 			
 			return null;
-		}

-

-		protected virtual ICompletionDataList ClosingTagCompletion (IEditableTextBuffer buf, TextLocation currentLocation)

-		{

-			//get name of current node in document that's being ended

-			var el = tracker.Engine.Nodes.Peek () as XElement;

-			if (el != null && el.Region.End >= currentLocation && !el.IsClosed && el.IsNamed) {

-				string tag = String.Concat ("</", el.Name.FullName, ">");

-				if (XmlEditorOptions.AutoCompleteElements) {

-

-					//						//make sure we have a clean atomic undo so the user can undo the tag insertion

-					//						//independently of the >

-					//						bool wasInAtomicUndo = this.Editor.Document.IsInAtomicUndo;

-					//						if (wasInAtomicUndo)

-					//							this.Editor.Document.EndAtomicUndo ();

-

-					using (var undo = buf.OpenUndoGroup ()) {

-						buf.InsertText (buf.CursorPosition, tag);

-						buf.CursorPosition -= tag.Length;

-					}

-

-					//						if (wasInAtomicUndo)

-					//							this.Editor.Document.BeginAtomicUndo ();

-

-					return null;

-				} else {

-					var cp = new CompletionDataList ();

-					cp.Add (new XmlTagCompletionData (tag, 0, true));

-					return cp;

-				}

-			}

-			return null;

+		}
+
+
+
+		protected virtual ICompletionDataList ClosingTagCompletion (TextEditor buf, DocumentLocation currentLocation)
+
+		{
+
+			//get name of current node in document that's being ended
+
+			var el = tracker.Engine.Nodes.Peek () as XElement;
+
+			if (el != null && el.Region.End >= currentLocation && !el.IsClosed && el.IsNamed) {
+
+				string tag = String.Concat ("</", el.Name.FullName, ">");
+
+				if (XmlEditorOptions.AutoCompleteElements) {
+
+
+
+					//						//make sure we have a clean atomic undo so the user can undo the tag insertion
+
+					//						//independently of the >
+
+					//						bool wasInAtomicUndo = this.Editor.Document.IsInAtomicUndo;
+
+					//						if (wasInAtomicUndo)
+
+					//							this.Editor.Document.EndAtomicUndo ();
+
+
+
+					using (var undo = buf.OpenUndoGroup ()) {
+
+						buf.InsertText (buf.CaretOffset, tag);
+
+						buf.CaretOffset -= tag.Length;
+
+					}
+
+
+
+					//						if (wasInAtomicUndo)
+
+					//							this.Editor.Document.BeginAtomicUndo ();
+
+
+
+					return null;
+
+				} else {
+
+					var cp = new CompletionDataList ();
+
+					cp.Add (new XmlTagCompletionData (tag, 0, true));
+
+					return cp;
+
+				}
+
+			}
+
+			return null;
 		}
 		
 		protected virtual void GetElementCompletions (CompletionDataList list)
@@ -475,7 +494,7 @@ namespace MonoDevelop.Xml.Editor
 		
 		protected string GetLineIndent (int line)
 		{
-			var seg = Editor.Document.GetLine (line);
+			var seg = Editor.GetLine (line);
 			
 			//reset the tracker to the beginning of the line
 			Tracker.UpdateEngine (seg.Offset);
@@ -592,7 +611,7 @@ namespace MonoDevelop.Xml.Editor
 		PathEntry[] currentPath;
 		bool pathUpdateQueued;
 		
-		public override void CursorPositionChanged ()
+		void HandleCaretPositionChanged (object sender, EventArgs e)
 		{
 			if (pathUpdateQueued)
 				return;
@@ -602,7 +621,6 @@ namespace MonoDevelop.Xml.Editor
 				UpdatePath ();
 				return false;
 			});
-				
 		}
 
 		public void SelectPath (int depth)
@@ -662,16 +680,16 @@ namespace MonoDevelop.Xml.Editor
 				//pick out the locations, with some offsets to account for the parsing model
 				var s = contents? el.Region.End : el.Region.Begin;
 				var e = contents? el.ClosingTag.Region.Begin : el.ClosingTag.Region.End;
-				EditorSelect (new DomRegion (s, e));
+				EditorSelect (new DocumentRegion (s, e));
 			} else {
 				LoggingService.LogDebug ("No end tag found for selection");
 			}
 		}
 		
-		protected void EditorSelect (DomRegion region)
+		protected void EditorSelect (DocumentRegion region)
 		{
-			int s = Editor.Document.LocationToOffset (region.BeginLine, region.BeginColumn);
-			int e = Editor.Document.LocationToOffset (region.EndLine, region.EndColumn);
+			int s = Editor.LocationToOffset (region.BeginLine, region.BeginColumn);
+			int e = Editor.LocationToOffset (region.EndLine, region.EndColumn);
 			if (s > -1 && e > s) {
 				Editor.SetSelection (s, e);
 				Editor.ScrollTo (s);
@@ -743,7 +761,7 @@ namespace MonoDevelop.Xml.Editor
 
 			public void ActivateItem (int n)
 			{
-				ext.Document.AttachToProject (ext.ownerProjects [n]);
+				ext.DocumentContext.AttachToProject (ext.ownerProjects [n]);
 			}
 
 			public int IconCount {
@@ -842,7 +860,7 @@ namespace MonoDevelop.Xml.Editor
 			var path = new List<PathEntry> ();
 			if (ownerProjects.Count > 1) {
 				// Current project if there is more than one
-				path.Add (new PathEntry (ImageService.GetIcon (Document.Project.StockIcon), GLib.Markup.EscapeText (Document.Project.Name)) { Tag = Document.Project });
+				path.Add (new PathEntry (ImageService.GetIcon (DocumentContext.Project.StockIcon), GLib.Markup.EscapeText (DocumentContext.Project.Name)) { Tag = DocumentContext.Project });
 			}
 			if (l != null) {
 				for (int i = 0; i < l.Count; i++) {
@@ -999,7 +1017,7 @@ namespace MonoDevelop.Xml.Editor
 			
 			var el = n as XElement;
 			if (el != null && el.IsClosed && el.ClosingTag.Region.End > region.End) {
-				region = new DomRegion (region.Begin, el.ClosingTag.Region.End);
+				region = new DocumentRegion (region.Begin, el.ClosingTag.Region.End);
 			}
 			EditorSelect (region);
 		}		
diff --git a/main/src/addins/Xml/Editor/XmlDocumentParser.cs b/main/src/addins/Xml/Editor/XmlDocumentParser.cs
index 5f17fead35..d97ef44b69 100644
--- a/main/src/addins/Xml/Editor/XmlDocumentParser.cs
+++ b/main/src/addins/Xml/Editor/XmlDocumentParser.cs
@@ -31,20 +31,22 @@ using System.IO;
 
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Xml.Parser;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Xml.Editor
 {
 	class XmlDocumentParser : TypeSystemParser
 	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader content, MonoDevelop.Projects.Project project = null)
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions parseOptions, System.Threading.CancellationToken cancellationToken)
 		{
-			var doc = new XmlParsedDocument (fileName);
+			var doc = new XmlParsedDocument (parseOptions.FileName);
 			doc.Flags |= ParsedDocumentFlags.NonSerializable;
 			try {
 				var xmlParser = new XmlParser (new XmlRootState (), true);
-				xmlParser.Parse (content);
+				xmlParser.Parse (parseOptions.Content.CreateReader ());
 				doc.XDocument = xmlParser.Nodes.GetRoot ();
-				doc.Add (xmlParser.Errors);
+				// TODO error conversion!
+				//doc.Add (xmlParser.Errors);
 				
 				if (doc.XDocument != null && doc.XDocument.RootElement != null) {
 					if (!doc.XDocument.RootElement.IsEnded)
@@ -54,7 +56,7 @@ namespace MonoDevelop.Xml.Editor
 			catch (Exception ex) {
 				MonoDevelop.Core.LoggingService.LogError ("Unhandled error parsing xml document", ex);
 			}
-			return doc;
+			return System.Threading.Tasks.Task.FromResult((ParsedDocument)doc);
 		}
 	}
 }
diff --git a/main/src/addins/Xml/Editor/XmlEditorService.cs b/main/src/addins/Xml/Editor/XmlEditorService.cs
index 7e0201ef57..4b388eb528 100644
--- a/main/src/addins/Xml/Editor/XmlEditorService.cs
+++ b/main/src/addins/Xml/Editor/XmlEditorService.cs
@@ -1,42 +1,48 @@
-//

-// MonoDevelop XML Editor

-//

-// Copyright (C) 2006-2007 Matthew Ward

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-// 

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+//
+// MonoDevelop XML Editor
+//
+// Copyright (C) 2006-2007 Matthew Ward
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
-using System.Text;

-using System.Xml;

-using System.Xml.Schema;

+using System.Text;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.XPath;
+using System.Xml.Xsl;
+using MonoDevelop.Components;
+using Gtk;
+using MonoDevelop.Components.Extensions;
+using MonoDevelop.Ide.Editor;
 using System.Xml.XPath;
 using System.Xml.Xsl;
 
 using MonoDevelop.Components;
 using MonoDevelop.Components.Extensions;
-using MonoDevelop.Core;

-using MonoDevelop.Ide;

-using MonoDevelop.Ide.Gui;

-using MonoDevelop.Ide.Tasks;

-using MonoDevelop.Projects;

+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Tasks;
+using MonoDevelop.Projects;
 using MonoDevelop.Xml.Completion;
 
 namespace MonoDevelop.Xml.Editor
@@ -44,7 +50,7 @@ namespace MonoDevelop.Xml.Editor
 	static class XmlEditorService
 	{
 		#region Task management
-		public static void AddTask(string fileName, string message, int column, int line, TaskSeverity taskType)

+		public static void AddTask(string fileName, string message, int column, int line, TaskSeverity taskType)
 		{
 			// HACK: Use a compiler error since we cannot add an error
 			// task otherwise (task type property is read-only and
@@ -55,23 +61,23 @@ namespace MonoDevelop.Xml.Editor
 			error.ErrorText = message;
 			error.FileName = fileName;
 			error.IsWarning = false;
-			

+			
 			//Task task = new Task(fileName, message, column, line);
 			TaskListEntry task = new TaskListEntry (error);
-			TaskService.Errors.Add(task);

-		}

-		#endregion

-		

+			TaskService.Errors.Add(task);
+		}
+		#endregion
+		
 		#region View tracking
-		

-		public static XmlTextEditorExtension ActiveEditor {

-			get {

-				Document doc = IdeApp.Workbench.ActiveDocument;

-				if (doc != null)

-					return doc.GetContent<XmlTextEditorExtension>();

-				return null;

-			}

-		}

+		
+		public static XmlTextEditorExtension ActiveEditor {
+			get {
+				Document doc = IdeApp.Workbench.ActiveDocument;
+				if (doc != null)
+					return doc.GetContent<XmlTextEditorExtension>();
+				return null;
+			}
+		}
 		
 		public static ReadOnlyCollection<XmlTextEditorExtension> OpenXmlEditorViews {
 			get {
@@ -89,8 +95,8 @@ namespace MonoDevelop.Xml.Editor
 			get {
 				return ActiveEditor != null;
 			}
-		}

-		#endregion

+		}
+		#endregion
 		
 		/*
 		public static bool IsXslOutputViewContentActive {
@@ -103,339 +109,339 @@ namespace MonoDevelop.Xml.Editor
 		public static ProgressMonitor GetMonitor ()
 		{
 			return IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor ("XML", "md-xml-file-icon", true, true);
-		}

-		

+		}
+		
 		#region Formatting utilities
 		
 		/// <summary>
 		/// Creates a XmlTextWriter using the current text editor
 		/// properties for indentation.
 		/// </summary>
-		public static XmlTextWriter CreateXmlTextWriter (Document doc, TextWriter textWriter)
+		public static XmlTextWriter CreateXmlTextWriter (TextEditor doc, TextWriter textWriter)
 		{
-			XmlTextWriter xmlWriter = new XmlTextWriter(textWriter);

-			xmlWriter.Formatting = System.Xml.Formatting.Indented;

-			if (doc.Editor.TabsToSpaces) {

-				xmlWriter.Indentation = doc.Editor.Options.TabSize;

-				xmlWriter.IndentChar = ' ';

-			} else {

-				xmlWriter.Indentation = 1;

-				xmlWriter.IndentChar = '\t';

-			}

+			XmlTextWriter xmlWriter = new XmlTextWriter(textWriter);
+			xmlWriter.Formatting = System.Xml.Formatting.Indented;
+			if (doc.Options.TabsToSpaces) {
+				xmlWriter.Indentation = doc.Options.TabSize;
+				xmlWriter.IndentChar = ' ';
+			} else {
+				xmlWriter.Indentation = 1;
+				xmlWriter.IndentChar = '\t';
+			}
 			return xmlWriter;
-		}

-		

-		public static XmlTextWriter CreateXmlTextWriter (Document doc)

-		{

-			return CreateXmlTextWriter (doc, new EncodedStringWriter (Encoding.UTF8));

-		}

-		

+		}
+		
+		public static XmlTextWriter CreateXmlTextWriter (TextEditor doc)
+		{
+			return CreateXmlTextWriter (doc, new EncodedStringWriter (Encoding.UTF8));
+		}
+		
 		#endregion
 		
-		/// <summary>

-		/// Runs an XSL transform on the input xml.

-		/// </summary>

-		/// <param name="input">The input xml to transform.</param>

-		/// <param name="transform">The transform xml.</param>

-		/// <returns>The output of the transform.</returns>

-		public static string Transform (string input, string transform)

-		{

-			StringReader inputString = new StringReader (input);

-			XPathDocument sourceDocument = new XPathDocument (inputString);

-

-			StringReader transformString = new StringReader (transform);

-			XPathDocument transformDocument = new XPathDocument (transformString);

-

-			XslCompiledTransform xslTransform = new XslCompiledTransform ();

+		/// <summary>
+		/// Runs an XSL transform on the input xml.
+		/// </summary>
+		/// <param name="input">The input xml to transform.</param>
+		/// <param name="transform">The transform xml.</param>
+		/// <returns>The output of the transform.</returns>
+		public static string Transform (string input, string transform)
+		{
+			StringReader inputString = new StringReader (input);
+			XPathDocument sourceDocument = new XPathDocument (inputString);
+
+			StringReader transformString = new StringReader (transform);
+			XPathDocument transformDocument = new XPathDocument (transformString);
+
+			XslCompiledTransform xslTransform = new XslCompiledTransform ();
 			xslTransform.Load (transformDocument, null, new XmlUrlResolver ());
-

-			MemoryStream outputStream = new MemoryStream ();

-			XmlTextWriter writer = new XmlTextWriter (outputStream, Encoding.UTF8);

-

-			xslTransform.Transform (sourceDocument, writer);

-

-			int preambleLength = Encoding.UTF8.GetPreamble ().Length;

-			byte[] outputBytes = outputStream.ToArray ();

-			return UTF8Encoding.UTF8.GetString (outputBytes, preambleLength, outputBytes.Length - preambleLength);

-		}

-		

-		public static string CreateSchema (Document doc, string xml)

-		{

-			using (System.Data.DataSet dataSet = new System.Data.DataSet()) {

-				dataSet.ReadXml(new StringReader (xml), System.Data.XmlReadMode.InferSchema);

-				using (EncodedStringWriter writer = new EncodedStringWriter (Encoding.UTF8)) {

-					using (XmlTextWriter xmlWriter = XmlEditorService.CreateXmlTextWriter (doc, writer)) {

-						dataSet.WriteXmlSchema(xmlWriter);

-						return writer.ToString();

+
+			MemoryStream outputStream = new MemoryStream ();
+			XmlTextWriter writer = new XmlTextWriter (outputStream, Encoding.UTF8);
+
+			xslTransform.Transform (sourceDocument, writer);
+
+			int preambleLength = Encoding.UTF8.GetPreamble ().Length;
+			byte[] outputBytes = outputStream.ToArray ();
+			return UTF8Encoding.UTF8.GetString (outputBytes, preambleLength, outputBytes.Length - preambleLength);
+		}
+		
+		public static string CreateSchema (TextEditor doc, string xml)
+		{
+			using (System.Data.DataSet dataSet = new System.Data.DataSet()) {
+				dataSet.ReadXml(new StringReader (xml), System.Data.XmlReadMode.InferSchema);
+				using (EncodedStringWriter writer = new EncodedStringWriter (Encoding.UTF8)) {
+					using (XmlTextWriter xmlWriter = XmlEditorService.CreateXmlTextWriter (doc, writer)) {
+						dataSet.WriteXmlSchema(xmlWriter);
+						return writer.ToString();
 					}
-				}

-			}

-		}

-		

-		public static string GenerateFileName (string sourceName, string extensionFormat)

-		{

-			return GenerateFileName (

-			    Path.Combine (Path.GetDirectoryName (sourceName), Path.GetFileNameWithoutExtension (sourceName)) + 

-			    extensionFormat);

-		}

-		

-		// newNameFormat should be a string format for the new filename such as 

-		// "/some/path/oldname{0}.xsd", where {0} is the index that will be incremented until a

-		// non-existing file is found.

-		public static string GenerateFileName (string newNameFormat)

-		{

-			string generatedFilename = string.Format (newNameFormat, "");

+				}
+			}
+		}
+		
+		public static string GenerateFileName (string sourceName, string extensionFormat)
+		{
+			return GenerateFileName (
+			    Path.Combine (Path.GetDirectoryName (sourceName), Path.GetFileNameWithoutExtension (sourceName)) + 
+			    extensionFormat);
+		}
+		
+		// newNameFormat should be a string format for the new filename such as 
+		// "/some/path/oldname{0}.xsd", where {0} is the index that will be incremented until a
+		// non-existing file is found.
+		public static string GenerateFileName (string newNameFormat)
+		{
+			string generatedFilename = string.Format (newNameFormat, "");
 			int count = 1;
 			while (File.Exists (generatedFilename)) {
-				generatedFilename = string.Format (newNameFormat, count);

-				++count;

-			}

-			return generatedFilename;

-		}

-		

-		#region Validation

-		

-		/// <summary>

-		/// Checks that the xml in this view is well-formed.

-		/// </summary>

+				generatedFilename = string.Format (newNameFormat, count);
+				++count;
+			}
+			return generatedFilename;
+		}
+		
+		#region Validation
+		
+		/// <summary>
+		/// Checks that the xml in this view is well-formed.
+		/// </summary>
 		public static XmlDocument ValidateWellFormedness (ProgressMonitor monitor, string xml, string fileName)
-		{

+		{
 			monitor.BeginTask (GettextCatalog.GetString ("Validating XML..."), 1);
-			bool error = false;

-			XmlDocument doc = null;

+			bool error = false;
+			XmlDocument doc = null;
 			
 			try {
-				doc = new XmlDocument ();

-				doc.LoadXml (xml);

-			} catch (XmlException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber, TaskSeverity.Error);

-				error = true;

-			}

+				doc = new XmlDocument ();
+				doc.LoadXml (xml);
+			} catch (XmlException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber, TaskSeverity.Error);
+				error = true;
+			}
 			
-			if (error) {

+			if (error) {
 				monitor.Log.WriteLine (GettextCatalog.GetString ("Validation failed."));
 				TaskService.ShowErrors ();
-			} else {

-				monitor.Log.WriteLine (GettextCatalog.GetString ("XML is valid."));

-			}

-			

-			monitor.EndTask ();

+			} else {
+				monitor.Log.WriteLine (GettextCatalog.GetString ("XML is valid."));
+			}
+			
+			monitor.EndTask ();
 			return error? null: doc;
-		}

-		

-		/// <summary>

-		/// Validates the xml against known schemas.

+		}
+		
+		/// <summary>
+		/// Validates the xml against known schemas.
 		/// </summary>		
 		public static XmlDocument ValidateXml (ProgressMonitor monitor, string xml, string fileName)
 		{
 			monitor.BeginTask (GettextCatalog.GetString ("Validating XML..."), 1);
-			bool error = false;

-			XmlDocument doc = null;

-			StringReader stringReader = new StringReader (xml);

-			

-			XmlReaderSettings settings = new XmlReaderSettings ();

-			settings.ValidationFlags = XmlSchemaValidationFlags.ProcessIdentityConstraints

-					| XmlSchemaValidationFlags.ProcessInlineSchema

-					| XmlSchemaValidationFlags.ProcessSchemaLocation

-					| XmlSchemaValidationFlags.ReportValidationWarnings;

-			settings.ValidationType = ValidationType.Schema;

-			settings.DtdProcessing = DtdProcessing.Parse;

-			

-			ValidationEventHandler validationHandler = delegate (object sender, System.Xml.Schema.ValidationEventArgs args) {

-				if (args.Severity == XmlSeverityType.Warning) {

-					monitor.Log.WriteLine (args.Message);

-					AddTask (fileName, args.Exception.Message, args.Exception.LinePosition, args.Exception.LineNumber,TaskSeverity.Warning);

-				} else {

-					AddTask (fileName, args.Exception.Message, args.Exception.LinePosition, args.Exception.LineNumber,TaskSeverity.Error);

-					monitor.Log.WriteLine (args.Message);

-					error = true;

-				}	

-			};

-			settings.ValidationEventHandler += validationHandler;

-			

+			bool error = false;
+			XmlDocument doc = null;
+			StringReader stringReader = new StringReader (xml);
+			
+			XmlReaderSettings settings = new XmlReaderSettings ();
+			settings.ValidationFlags = XmlSchemaValidationFlags.ProcessIdentityConstraints
+					| XmlSchemaValidationFlags.ProcessInlineSchema
+					| XmlSchemaValidationFlags.ProcessSchemaLocation
+					| XmlSchemaValidationFlags.ReportValidationWarnings;
+			settings.ValidationType = ValidationType.Schema;
+			settings.DtdProcessing = DtdProcessing.Parse;
+			
+			ValidationEventHandler validationHandler = delegate (object sender, System.Xml.Schema.ValidationEventArgs args) {
+				if (args.Severity == XmlSeverityType.Warning) {
+					monitor.Log.WriteLine (args.Message);
+					AddTask (fileName, args.Exception.Message, args.Exception.LinePosition, args.Exception.LineNumber,TaskSeverity.Warning);
+				} else {
+					AddTask (fileName, args.Exception.Message, args.Exception.LinePosition, args.Exception.LineNumber,TaskSeverity.Error);
+					monitor.Log.WriteLine (args.Message);
+					error = true;
+				}	
+			};
+			settings.ValidationEventHandler += validationHandler;
+			
 			try {
-				foreach (XmlSchemaCompletionData sd in XmlSchemaManager.SchemaCompletionDataItems)

-					settings.Schemas.Add (sd.Schema);

-				settings.Schemas.Compile ();

-				

-				XmlReader reader = XmlReader.Create (stringReader, settings);

-				doc = new XmlDocument();

-				doc.Load (reader);

-				

-			} catch (XmlSchemaException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-				error = true;

-			}

-			catch (XmlException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-				error = true;

-			}

-			finally {

-				if (stringReader != null)

-					stringReader.Dispose ();

-				settings.ValidationEventHandler -= validationHandler;

+				foreach (XmlSchemaCompletionData sd in XmlSchemaManager.SchemaCompletionDataItems)
+					settings.Schemas.Add (sd.Schema);
+				settings.Schemas.Compile ();
+				
+				XmlReader reader = XmlReader.Create (stringReader, settings);
+				doc = new XmlDocument();
+				doc.Load (reader);
+				
+			} catch (XmlSchemaException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+				error = true;
+			}
+			catch (XmlException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+				error = true;
+			}
+			finally {
+				if (stringReader != null)
+					stringReader.Dispose ();
+				settings.ValidationEventHandler -= validationHandler;
 			}
 			
-			if (error) {

+			if (error) {
 				monitor.Log.WriteLine (GettextCatalog.GetString ("Validation failed."));
 				TaskService.ShowErrors ();
 			} else {
-				monitor.Log.WriteLine  (GettextCatalog.GetString ("XML is valid."));

-			}

-			

-			monitor.EndTask ();

-			return error? null: doc;

-		}

-		

-		/// <summary>

-		/// Validates the schema.

+				monitor.Log.WriteLine  (GettextCatalog.GetString ("XML is valid."));
+			}
+			
+			monitor.EndTask ();
+			return error? null: doc;
+		}
+		
+		/// <summary>
+		/// Validates the schema.
 		/// </summary>		
 		public static XmlSchema ValidateSchema (ProgressMonitor monitor, string xml, string fileName)
 		{
 			monitor.BeginTask (GettextCatalog.GetString ("Validating schema..."), 1);
-			bool error = false;

-			XmlSchema schema = null;

-			try {

-				StringReader stringReader = new StringReader (xml);

-				XmlTextReader xmlReader = new XmlTextReader (stringReader);

+			bool error = false;
+			XmlSchema schema = null;
+			try {
+				StringReader stringReader = new StringReader (xml);
+				XmlTextReader xmlReader = new XmlTextReader (stringReader);
 				xmlReader.XmlResolver = null;
-				

-				ValidationEventHandler callback = delegate (object source, ValidationEventArgs args) {

-					if (args.Severity == XmlSeverityType.Warning) {

-						monitor.ReportWarning (args.Message);

-					} else {

-						monitor.ReportError (args.Message, args.Exception);

-						error = true;

-					}

-					AddTask (fileName, args.Message, args.Exception.LinePosition, args.Exception.LineNumber,

-					    (args.Severity == XmlSeverityType.Warning)? TaskSeverity.Warning : TaskSeverity.Error);

+				
+				ValidationEventHandler callback = delegate (object source, ValidationEventArgs args) {
+					if (args.Severity == XmlSeverityType.Warning) {
+						monitor.ReportWarning (args.Message);
+					} else {
+						monitor.ReportError (args.Message, args.Exception);
+						error = true;
+					}
+					AddTask (fileName, args.Message, args.Exception.LinePosition, args.Exception.LineNumber,
+					    (args.Severity == XmlSeverityType.Warning)? TaskSeverity.Warning : TaskSeverity.Error);
 				};
-				schema = XmlSchema.Read (xmlReader, callback);

-				XmlSchemaSet sset = new XmlSchemaSet ();

-				sset.Add (schema);

-				sset.ValidationEventHandler += callback;

+				schema = XmlSchema.Read (xmlReader, callback);
+				XmlSchemaSet sset = new XmlSchemaSet ();
+				sset.Add (schema);
+				sset.ValidationEventHandler += callback;
 				sset.Compile ();
-			} 

-			catch (XmlSchemaException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-				error = true;

-			}

-			catch (XmlException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-				error = true;

-			}

+			} 
+			catch (XmlSchemaException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+				error = true;
+			}
+			catch (XmlException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+				error = true;
+			}
 			
-			if (error) {

+			if (error) {
 				monitor.Log.WriteLine (GettextCatalog.GetString ("Validation failed."));
 				TaskService.ShowErrors ();
 			} else {
-				monitor.Log.WriteLine  (GettextCatalog.GetString ("Schema is valid."));

-			}

-			

-			monitor.EndTask ();

-			return error? null: schema;

-		}

-		

-		public static XslCompiledTransform ValidateStylesheet (ProgressMonitor monitor, string xml, string fileName)

-		{

+				monitor.Log.WriteLine  (GettextCatalog.GetString ("Schema is valid."));
+			}
+			
+			monitor.EndTask ();
+			return error? null: schema;
+		}
+		
+		public static XslCompiledTransform ValidateStylesheet (ProgressMonitor monitor, string xml, string fileName)
+		{
 			monitor.BeginTask (GettextCatalog.GetString ("Validating stylesheet..."), 1);
-			bool error = true;

-			XslCompiledTransform xslt = null;

-			

-			try {

-				StringReader reader = new StringReader (xml);

-				XPathDocument doc = new XPathDocument (reader);

-				xslt = new XslCompiledTransform ();

-				xslt.Load (doc, null, new XmlUrlResolver ());

-				error = false;

-			} catch (XsltCompileException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-			}

-			catch (XsltException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-			}

-			catch (XmlException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-			}

-			

-			if (error) {

+			bool error = true;
+			XslCompiledTransform xslt = null;
+			
+			try {
+				StringReader reader = new StringReader (xml);
+				XPathDocument doc = new XPathDocument (reader);
+				xslt = new XslCompiledTransform ();
+				xslt.Load (doc, null, new XmlUrlResolver ());
+				error = false;
+			} catch (XsltCompileException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+			}
+			catch (XsltException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+			}
+			catch (XmlException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+			}
+			
+			if (error) {
 				monitor.Log.WriteLine (GettextCatalog.GetString ("Validation failed."));
 				TaskService.ShowErrors ();
 			} else {
-				monitor.Log.WriteLine (GettextCatalog.GetString ("Stylesheet is valid."));

-			}

-			return error? null: xslt;

-		}

-		

-		#endregion

-		

-		#region File browsing utilities

-		

-		/// <summary>Allows the user to browse the file system for a stylesheet.</summary>

-		/// <returns>The stylesheet filename the user selected; otherwise null.</returns>

-		public static string BrowseForStylesheetFile ()

-		{

-			var dlg = new SelectFileDialog (GettextCatalog.GetString ("Select XSLT Stylesheet")) {

-				TransientFor = IdeApp.Workbench.RootWindow,

-			};

-			dlg.AddFilter (new SelectFileDialogFilter (

-				GettextCatalog.GetString ("XML Files"),

-				new string[] { "*.xml" },

-				new string[] { "text/xml", "application/xml" }

-			));

-			dlg.AddFilter (new SelectFileDialogFilter(

-				GettextCatalog.GetString ("XSL Files"),

-				new string[] { "*.xslt", "*.xsl" },

-				new string[] { "text/x-xslt" }

-			));

-			dlg.AddAllFilesFilter ();

-			

-			if (dlg.Run ())

-				return dlg.SelectedFile;

-			return null;

-		}

-		

-		/// <summary>Allows the user to browse the file system for a schema.</summary>

-		/// <returns>The schema filename the user selected; otherwise null.</returns>

-		public static string BrowseForSchemaFile ()

-		{

-			var dlg = new SelectFileDialog (GettextCatalog.GetString ("Select XML Schema"));

-			dlg.AddFilter (new SelectFileDialogFilter (

-				GettextCatalog.GetString ("XML Files"),

-				new string[] { "*.xsd" },

-				new string[] { "text/xml", "application/xml" }

-			));

-			dlg.AddAllFilesFilter ();

-			

-			if (dlg.Run ())

-				return dlg.SelectedFile;

-			return null;

-		}

-		

-		#endregion

-

-		class EncodedStringWriter : StringWriter

-		{

-			readonly Encoding encoding;

-

-			public EncodedStringWriter(Encoding encoding)

-			{

-				this.encoding = encoding;

-			}

-

-			public override Encoding Encoding {

-				get {

-					return encoding;

-				}

-			}

+				monitor.Log.WriteLine (GettextCatalog.GetString ("Stylesheet is valid."));
+			}
+			return error? null: xslt;
+		}
+		
+		#endregion
+		
+		#region File browsing utilities
+		
+		/// <summary>Allows the user to browse the file system for a stylesheet.</summary>
+		/// <returns>The stylesheet filename the user selected; otherwise null.</returns>
+		public static string BrowseForStylesheetFile ()
+		{
+			var dlg = new SelectFileDialog (GettextCatalog.GetString ("Select XSLT Stylesheet")) {
+				TransientFor = IdeApp.Workbench.RootWindow,
+			};
+			dlg.AddFilter (new SelectFileDialogFilter (
+				GettextCatalog.GetString ("XML Files"),
+				new string[] { "*.xml" },
+				new string[] { "text/xml", "application/xml" }
+			));
+			dlg.AddFilter (new SelectFileDialogFilter(
+				GettextCatalog.GetString ("XSL Files"),
+				new string[] { "*.xslt", "*.xsl" },
+				new string[] { "text/x-xslt" }
+			));
+			dlg.AddAllFilesFilter ();
+			
+			if (dlg.Run ())
+				return dlg.SelectedFile;
+			return null;
+		}
+		
+		/// <summary>Allows the user to browse the file system for a schema.</summary>
+		/// <returns>The schema filename the user selected; otherwise null.</returns>
+		public static string BrowseForSchemaFile ()
+		{
+			var dlg = new SelectFileDialog (GettextCatalog.GetString ("Select XML Schema"));
+			dlg.AddFilter (new SelectFileDialogFilter (
+				GettextCatalog.GetString ("XML Files"),
+				new string[] { "*.xsd" },
+				new string[] { "text/xml", "application/xml" }
+			));
+			dlg.AddAllFilesFilter ();
+			
+			if (dlg.Run ())
+				return dlg.SelectedFile;
+			return null;
+		}
+		
+		#endregion
+
+		class EncodedStringWriter : StringWriter
+		{
+			readonly Encoding encoding;
+
+			public EncodedStringWriter(Encoding encoding)
+			{
+				this.encoding = encoding;
+			}
+
+			public override Encoding Encoding {
+				get {
+					return encoding;
+				}
+			}
 		}
 	}
 }
diff --git a/main/src/addins/Xml/Editor/XmlParsedDocument.cs b/main/src/addins/Xml/Editor/XmlParsedDocument.cs
index bd6bc32cbf..94de472070 100644
--- a/main/src/addins/Xml/Editor/XmlParsedDocument.cs
+++ b/main/src/addins/Xml/Editor/XmlParsedDocument.cs
@@ -29,8 +29,9 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
+using System.Linq;
 
 namespace MonoDevelop.Xml.Editor
 {
@@ -41,19 +42,24 @@ namespace MonoDevelop.Xml.Editor
 		}
 		
 		public XDocument XDocument { get; set; }
-		
-		public override IEnumerable<FoldingRegion> Foldings {
+
+		public override System.Threading.Tasks.Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (System.Threading.CancellationToken cancellationToken)
+		{
+			return System.Threading.Tasks.Task.FromResult((IReadOnlyList<FoldingRegion>)Foldings.ToList ());
+		}
+
+		public IEnumerable<FoldingRegion> Foldings {
 			get {
 				if (XDocument == null)
 					yield break;
-				foreach (var region in Comments.ToFolds ()) 
+				foreach (var region in GetCommentsAsync().Result.ToFolds ()) 
 					yield return region;
 				foreach (XNode node in XDocument.AllDescendentNodes) {
 					if (node is XCData)
 					{
 						if (node.Region.EndLine - node.Region.BeginLine > 2)
 							yield return new FoldingRegion ("<![CDATA[ ]]>", node.Region);
-					}
+					} 
 					else if (node is XComment)
 					{
 						if (node.Region.EndLine - node.Region.BeginLine > 2)
@@ -65,7 +71,7 @@ namespace MonoDevelop.Xml.Editor
 						if (el.IsClosed && el.ClosingTag.Region.EndLine - el.Region.BeginLine > 2) {
 							yield return new FoldingRegion
 								(string.Format ("<{0}...>", el.Name.FullName),
-								 new DomRegion (el.Region.Begin, el.ClosingTag.Region.End));
+								 new DocumentRegion (el.Region.Begin, el.ClosingTag.Region.End));
 						}
 					}
 					else if (node is XDocType)
diff --git a/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs b/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs
index 58790e1276..d04db17fd2 100644
--- a/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs
+++ b/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs
@@ -32,17 +32,19 @@ using System.Collections.Generic;
 using System.Xml;
 using System.Xml.Schema;
 
-using Mono.TextEditor;
-
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Tasks;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.CodeFormatting;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.Xml.Completion;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Xml.Editor
 {
@@ -56,12 +58,12 @@ namespace MonoDevelop.Xml.Editor
 		InferredXmlCompletionProvider inferredCompletionData;
 		bool inferenceQueued;
 
-		public override bool ExtendsEditor (MonoDevelop.Ide.Gui.Document doc, IEditableTextBuffer editor)
+		public override bool IsValidInContext (DocumentContext context)
 		{
-			return IsFileNameHandled (doc.Name) && base.ExtendsEditor (doc, editor);
+			return IsFileNameHandled (context.Name) && base.IsValidInContext (context);
 		}
 		
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 			XmlEditorOptions.XmlFileAssociationChanged += HandleXmlFileAssociationChanged;
@@ -69,16 +71,16 @@ namespace MonoDevelop.Xml.Editor
 			XmlSchemaManager.UserSchemaRemoved += UserSchemaRemoved;
 			SetDefaultSchema ();
 			
-			var view = Document.GetContent<MonoDevelop.SourceEditor.SourceEditorView> ();
-			if (view != null && string.IsNullOrEmpty (view.Document.MimeType)) {
-				view.Document.MimeType = ApplicationXmlMimeType;
-				Document.ReparseDocument ();
+			//var view = Document.GetContent<MonoDevelop.SourceEditor.SourceEditorView> ();
+			if (string.IsNullOrEmpty (Editor.MimeType)) {
+				Editor.MimeType = ApplicationXmlMimeType;
+				DocumentContext.ReparseDocument ();
 			}
 		}
 
 		void HandleXmlFileAssociationChanged (object sender, XmlFileAssociationChangedEventArgs e)
 		{
-			var filename = document.FileName;
+			var filename = DocumentContext.Name;
 			if (filename != null && filename.ToString ().EndsWith (e.Extension, StringComparison.Ordinal))
 				SetDefaultSchema ();
 		}
@@ -89,7 +91,8 @@ namespace MonoDevelop.Xml.Editor
 			if (!disposed) {
 				disposed = false;
 				XmlEditorOptions.XmlFileAssociationChanged -= HandleXmlFileAssociationChanged;
-				XmlSchemaManager.UserSchemaAdded -= UserSchemaAdded;

+				XmlSchemaManager.UserSchemaAdded -= UserSchemaAdded;
+
 				XmlSchemaManager.UserSchemaRemoved -= UserSchemaRemoved;
 				base.Dispose ();
 			}
@@ -108,18 +111,23 @@ namespace MonoDevelop.Xml.Editor
 		
 		protected override void GetElementCompletions (CompletionDataList list)
 		{	
-			var path = GetElementPath ();

+			var path = GetElementPath ();
+
 			if (path.Elements.Count > 0) {
 				IXmlCompletionProvider schema = FindSchema (path);
 				if (schema == null)
-					schema = inferredCompletionData;

-				if (schema != null) {

+					schema = inferredCompletionData;
+
+				if (schema != null) {
+
 					var completionData = schema.GetChildElementCompletionData (path);
 					if (completionData != null)
 						list.AddRange (completionData);
-				}

+				}
+
 			} else if (defaultSchemaCompletionData != null) {
-				list.AddRange (defaultSchemaCompletionData.GetElementCompletionData (defaultNamespacePrefix));

+				list.AddRange (defaultSchemaCompletionData.GetElementCompletionData (defaultNamespacePrefix));
+
 			} else if (inferredCompletionData != null) {
 				list.AddRange (inferredCompletionData.GetElementCompletionData ());
 			}
@@ -129,12 +137,15 @@ namespace MonoDevelop.Xml.Editor
 		protected override CompletionDataList GetAttributeCompletions (IAttributedXObject attributedOb,
 			Dictionary<string, string> existingAtts)
 		{
-			var path = GetElementPath ();

+			var path = GetElementPath ();
+
 			if (path.Elements.Count > 0) {
 				IXmlCompletionProvider schema = FindSchema (path);
 				if (schema == null)
-					schema = inferredCompletionData;

-				if (schema != null)

+					schema = inferredCompletionData;
+
+				if (schema != null)
+
 					return schema.GetAttributeCompletionData (path);
 			}
 			return null;
@@ -142,10 +153,13 @@ namespace MonoDevelop.Xml.Editor
 		
 		protected override CompletionDataList GetAttributeValueCompletions (IAttributedXObject attributedOb, XAttribute att)
 		{
-			var path = GetElementPath ();

+			var path = GetElementPath ();
+
 			if (path.Elements.Count > 0) {
-				var schema = FindSchema (path);

-				if (schema != null)

+				var schema = FindSchema (path);
+
+				if (schema != null)
+
 					return schema.GetAttributeValueCompletionData (path, att.Name.FullName);
 			}
 			return null;
@@ -170,47 +184,79 @@ namespace MonoDevelop.Xml.Editor
 			return FindSchema (XmlSchemaManager.SchemaCompletionDataItems, path);
 		}
 		
-		/// <summary>

-		/// Finds the schema given the xml element path.

-		/// </summary>

-		public XmlSchemaCompletionData FindSchema (IXmlSchemaCompletionDataCollection schemaCompletionDataItems, XmlElementPath path)

-		{

-			if (path.Elements.Count > 0) {

-				string namespaceUri = path.Elements[0].Namespace;

-				if (namespaceUri.Length > 0) {

-					return schemaCompletionDataItems[namespaceUri];

-				} else if (defaultSchemaCompletionData != null) {

-					

-					// Use the default schema namespace if none

-					// specified in a xml element path, otherwise

-					// we will not find any attribute or element matches

-					// later.

-					foreach (QualifiedName name in path.Elements) {

-						if (name.Namespace.Length == 0) {

-							name.Namespace = defaultSchemaCompletionData.NamespaceUri;

-						}

-					}

-					return defaultSchemaCompletionData;

-				}

-			}

-			return null;

+		/// <summary>
+
+		/// Finds the schema given the xml element path.
+
+		/// </summary>
+
+		public XmlSchemaCompletionData FindSchema (IXmlSchemaCompletionDataCollection schemaCompletionDataItems, XmlElementPath path)
+
+		{
+
+			if (path.Elements.Count > 0) {
+
+				string namespaceUri = path.Elements[0].Namespace;
+
+				if (namespaceUri.Length > 0) {
+
+					return schemaCompletionDataItems[namespaceUri];
+
+				} else if (defaultSchemaCompletionData != null) {
+
+					
+
+					// Use the default schema namespace if none
+
+					// specified in a xml element path, otherwise
+
+					// we will not find any attribute or element matches
+
+					// later.
+
+					foreach (QualifiedName name in path.Elements) {
+
+						if (name.Namespace.Length == 0) {
+
+							name.Namespace = defaultSchemaCompletionData.NamespaceUri;
+
+						}
+
+					}
+
+					return defaultSchemaCompletionData;
+
+				}
+
+			}
+
+			return null;
+
 		}
 		
 		#endregion
 		
 		#region Schema resolution
 		
-		/// <summary>

-		/// Gets the XmlSchemaObject that defines the currently selected xml element or attribute.

-		/// </summary>

+		/// <summary>
+
+		/// Gets the XmlSchemaObject that defines the currently selected xml element or attribute.
+
+		/// </summary>
+
 		/// <param name="currentSchemaCompletionData">This is the schema completion data for the schema currently being 
-		/// displayed. This can be null if the document is not a schema.</param>

-		public XmlSchemaObject GetSchemaObjectSelected (XmlSchemaCompletionData currentSchemaCompletionData)

-		{

-			// Find element under cursor.

+		/// displayed. This can be null if the document is not a schema.</param>
+
+		public XmlSchemaObject GetSchemaObjectSelected (XmlSchemaCompletionData currentSchemaCompletionData)
+
+		{
+
+			// Find element under cursor.
+
 			XmlElementPath path = GetElementPath ();
 			
-			//attribute name under cursor, if valid

+			//attribute name under cursor, if valid
+
 			string attributeName = null;
 			XAttribute xatt = Tracker.Engine.Nodes.Peek (0) as XAttribute;
 			if (xatt != null) {
@@ -219,173 +265,306 @@ namespace MonoDevelop.Xml.Editor
 					xattName = GetCompleteName ();
 				}
 				attributeName = xattName.FullName;
-			}

+			}
+
 			
-			// Find schema definition object.

-			XmlSchemaCompletionData schemaCompletionData = FindSchema (path);

-			XmlSchemaObject schemaObject = null;

+			// Find schema definition object.
+
+			XmlSchemaCompletionData schemaCompletionData = FindSchema (path);
+
+			XmlSchemaObject schemaObject = null;
+
 			if (schemaCompletionData != null) {
-				XmlSchemaElement element = schemaCompletionData.FindElement(path);

-				schemaObject = element;

+				XmlSchemaElement element = schemaCompletionData.FindElement(path);
+
+				schemaObject = element;
+
 				if (element != null) {
 					if (!string.IsNullOrEmpty (attributeName)) {
-						XmlSchemaAttribute attribute = schemaCompletionData.FindAttribute(element, attributeName);

+						XmlSchemaAttribute attribute = schemaCompletionData.FindAttribute(element, attributeName);
+
 						if (attribute != null) {
-							if (currentSchemaCompletionData != null) {

-								schemaObject = GetSchemaObjectReferenced (currentSchemaCompletionData, element, attribute);

-							} else {

-								schemaObject = attribute;

-							}

-						}

-					}

-					return schemaObject;

-				}

-			}	

-			return null;

-		}
-		
-		/// <summary>

-		/// If the attribute value found references another item in the schema

-		/// return this instead of the attribute schema object. For example, if the

-		/// user can select the attribute value and the code will work out the schema object pointed to by the ref

-		/// or type attribute:

-		///

-		/// xs:element ref="ref-name"

-		/// xs:attribute type="type-name"

-		/// </summary>

-		/// <returns>

-		/// The <paramref name="attribute"/> if no schema object was referenced.

-		/// </returns>

-		XmlSchemaObject GetSchemaObjectReferenced (XmlSchemaCompletionData currentSchemaCompletionData, XmlSchemaElement element, XmlSchemaAttribute attribute)

-		{

-			XmlSchemaObject schemaObject = null;

-			if (IsXmlSchemaNamespace(element)) {

+							if (currentSchemaCompletionData != null) {
+
+								schemaObject = GetSchemaObjectReferenced (currentSchemaCompletionData, element, attribute);
+
+							} else {
+
+								schemaObject = attribute;
+
+							}
+
+						}
+
+					}
+
+					return schemaObject;
+
+				}
+
+			}	
+
+			return null;
+
+		}
+		
+		/// <summary>
+
+		/// If the attribute value found references another item in the schema
+
+		/// return this instead of the attribute schema object. For example, if the
+
+		/// user can select the attribute value and the code will work out the schema object pointed to by the ref
+
+		/// or type attribute:
+
+		///
+
+		/// xs:element ref="ref-name"
+
+		/// xs:attribute type="type-name"
+
+		/// </summary>
+
+		/// <returns>
+
+		/// The <paramref name="attribute"/> if no schema object was referenced.
+
+		/// </returns>
+
+		XmlSchemaObject GetSchemaObjectReferenced (XmlSchemaCompletionData currentSchemaCompletionData, XmlSchemaElement element, XmlSchemaAttribute attribute)
+
+		{
+
+			XmlSchemaObject schemaObject = null;
+
+			if (IsXmlSchemaNamespace(element)) {
+
 				// Find attribute value.
-				//fixme implement

-				string attributeValue = "";// XmlParser.GetAttributeValueAtIndex(xml, index);

-				if (attributeValue.Length == 0) {

-					return attribute;

-				}

-		

-				if (attribute.Name == "ref") {

-					schemaObject = FindSchemaObjectReference(attributeValue, currentSchemaCompletionData, element.Name);

-				} else if (attribute.Name == "type") {

-					schemaObject = FindSchemaObjectType(attributeValue, currentSchemaCompletionData, element.Name);

-				}

-			}

-			

-			if (schemaObject != null) {

-				return schemaObject;

-			}

-			return attribute;

-		}
-		
-		/// <summary>

-		/// Checks whether the element belongs to the XSD namespace.

-		/// </summary>

-		static bool IsXmlSchemaNamespace (XmlSchemaElement element)

-		{

-			XmlQualifiedName qualifiedName = element.QualifiedName;

-			if (qualifiedName != null) {

-				return XmlSchemaManager.IsXmlSchemaNamespace (qualifiedName.Namespace);

-			}

-			return false;

-		}
-		
-		/// <summary>

-		/// Attempts to locate the reference name in the specified schema.

-		/// </summary>

-		/// <param name="name">The reference to look up.</param>

-		/// <param name="schemaCompletionData">The schema completion data to use to

-		/// find the reference.</param>

-		/// <param name="elementName">The element to determine what sort of reference it is

-		/// (e.g. group, attribute, element).</param>

-		/// <returns><see langword="null"/> if no match can be found.</returns>

-		XmlSchemaObject FindSchemaObjectReference(string name, XmlSchemaCompletionData schemaCompletionData, string elementName)

-		{

-			QualifiedName qualifiedName = schemaCompletionData.CreateQualifiedName(name);

-			XmlSchemaCompletionData qualifiedNameSchema = FindSchema(qualifiedName.Namespace);

-			if (qualifiedNameSchema != null) {

-				schemaCompletionData = qualifiedNameSchema;

-			}

-			switch (elementName) {

-				case "element":

-					return schemaCompletionData.FindElement(qualifiedName);

-				case "attribute":

-					return schemaCompletionData.FindAttribute(qualifiedName.Name);

-				case "group":

-					return schemaCompletionData.FindGroup(qualifiedName.Name);

-				case "attributeGroup":

-					return schemaCompletionData.FindAttributeGroup(qualifiedName.Name);

-			}

-			return null;

-		}

-		

-		/// <summary>

-		/// Attempts to locate the type name in the specified schema.

-		/// </summary>

-		/// <param name="name">The type to look up.</param>

-		/// <param name="schemaCompletionData">The schema completion data to use to

-		/// find the type.</param>

-		/// <param name="elementName">The element to determine what sort of type it is

-		/// (e.g. group, attribute, element).</param>

-		/// <returns><see langword="null"/> if no match can be found.</returns>

-		XmlSchemaObject FindSchemaObjectType(string name, XmlSchemaCompletionData schemaCompletionData, string elementName)

-		{

-			QualifiedName qualifiedName = schemaCompletionData.CreateQualifiedName(name);

-			XmlSchemaCompletionData qualifiedNameSchema = FindSchema(qualifiedName.Namespace);

-			if (qualifiedNameSchema != null) {

-				schemaCompletionData = qualifiedNameSchema;

-			}

-			switch (elementName) {

-				case "element":

-					return schemaCompletionData.FindComplexType(qualifiedName);

-				case "attribute":

-					return schemaCompletionData.FindSimpleType(qualifiedName.Name);

-			}

-			return null;

+				//fixme implement
+
+				string attributeValue = "";// XmlParser.GetAttributeValueAtIndex(xml, index);
+
+				if (attributeValue.Length == 0) {
+
+					return attribute;
+
+				}
+
+		
+
+				if (attribute.Name == "ref") {
+
+					schemaObject = FindSchemaObjectReference(attributeValue, currentSchemaCompletionData, element.Name);
+
+				} else if (attribute.Name == "type") {
+
+					schemaObject = FindSchemaObjectType(attributeValue, currentSchemaCompletionData, element.Name);
+
+				}
+
+			}
+
+			
+
+			if (schemaObject != null) {
+
+				return schemaObject;
+
+			}
+
+			return attribute;
+
+		}
+		
+		/// <summary>
+
+		/// Checks whether the element belongs to the XSD namespace.
+
+		/// </summary>
+
+		static bool IsXmlSchemaNamespace (XmlSchemaElement element)
+
+		{
+
+			XmlQualifiedName qualifiedName = element.QualifiedName;
+
+			if (qualifiedName != null) {
+
+				return XmlSchemaManager.IsXmlSchemaNamespace (qualifiedName.Namespace);
+
+			}
+
+			return false;
+
+		}
+		
+		/// <summary>
+
+		/// Attempts to locate the reference name in the specified schema.
+
+		/// </summary>
+
+		/// <param name="name">The reference to look up.</param>
+
+		/// <param name="schemaCompletionData">The schema completion data to use to
+
+		/// find the reference.</param>
+
+		/// <param name="elementName">The element to determine what sort of reference it is
+
+		/// (e.g. group, attribute, element).</param>
+
+		/// <returns><see langword="null"/> if no match can be found.</returns>
+
+		XmlSchemaObject FindSchemaObjectReference(string name, XmlSchemaCompletionData schemaCompletionData, string elementName)
+
+		{
+
+			QualifiedName qualifiedName = schemaCompletionData.CreateQualifiedName(name);
+
+			XmlSchemaCompletionData qualifiedNameSchema = FindSchema(qualifiedName.Namespace);
+
+			if (qualifiedNameSchema != null) {
+
+				schemaCompletionData = qualifiedNameSchema;
+
+			}
+
+			switch (elementName) {
+
+				case "element":
+
+					return schemaCompletionData.FindElement(qualifiedName);
+
+				case "attribute":
+
+					return schemaCompletionData.FindAttribute(qualifiedName.Name);
+
+				case "group":
+
+					return schemaCompletionData.FindGroup(qualifiedName.Name);
+
+				case "attributeGroup":
+
+					return schemaCompletionData.FindAttributeGroup(qualifiedName.Name);
+
+			}
+
+			return null;
+
+		}
+
+		
+
+		/// <summary>
+
+		/// Attempts to locate the type name in the specified schema.
+
+		/// </summary>
+
+		/// <param name="name">The type to look up.</param>
+
+		/// <param name="schemaCompletionData">The schema completion data to use to
+
+		/// find the type.</param>
+
+		/// <param name="elementName">The element to determine what sort of type it is
+
+		/// (e.g. group, attribute, element).</param>
+
+		/// <returns><see langword="null"/> if no match can be found.</returns>
+
+		XmlSchemaObject FindSchemaObjectType(string name, XmlSchemaCompletionData schemaCompletionData, string elementName)
+
+		{
+
+			QualifiedName qualifiedName = schemaCompletionData.CreateQualifiedName(name);
+
+			XmlSchemaCompletionData qualifiedNameSchema = FindSchema(qualifiedName.Namespace);
+
+			if (qualifiedNameSchema != null) {
+
+				schemaCompletionData = qualifiedNameSchema;
+
+			}
+
+			switch (elementName) {
+
+				case "element":
+
+					return schemaCompletionData.FindComplexType(qualifiedName);
+
+				case "attribute":
+
+					return schemaCompletionData.FindSimpleType(qualifiedName.Name);
+
+			}
+
+			return null;
+
 		}
 		
 		#endregion
 		
 		#region Settings handling
 		
-		void SetDefaultSchema ()

+		void SetDefaultSchema ()
+
 		{
-			var filename = document.FileName;
+			var filename = DocumentContext.Name;
 			if (filename == null)
 				return;
-			

+			
+
 			defaultSchemaCompletionData = XmlSchemaManager.GetSchemaCompletionDataForFileName (filename);
 			if (defaultSchemaCompletionData != null)
 				inferredCompletionData = null;
 			else
-				QueueInference ();

-			defaultNamespacePrefix = XmlSchemaManager.GetNamespacePrefixForFileName (filename);

-		}

-		

-		/// Updates the default schema association since the schema may have been added.

-		void UserSchemaAdded (object source, EventArgs e)

+				QueueInference ();
+
+			defaultNamespacePrefix = XmlSchemaManager.GetNamespacePrefixForFileName (filename);
+
+		}
+
+		
+
+		/// Updates the default schema association since the schema may have been added.
+
+		void UserSchemaAdded (object source, EventArgs e)
+
 		{	
 			SetDefaultSchema ();
-		}

-		

-		// Updates the default schema association since the schema may have been removed.

-		void UserSchemaRemoved (object source, EventArgs e)

-		{

-			SetDefaultSchema ();

+		}
+
+		
+
+		// Updates the default schema association since the schema may have been removed.
+
+		void UserSchemaRemoved (object source, EventArgs e)
+
+		{
+
+			SetDefaultSchema ();
+
 		}
 		
 		#endregion
 		
 		#region Stylesheet handling
 		
-		/// <summary>

-		/// Gets or sets the stylesheet associated with this xml file.

-		/// </summary>

-		public string StylesheetFileName {

-			get { return stylesheetFileName; }

-			set { stylesheetFileName = value; }

+		/// <summary>
+
+		/// Gets or sets the stylesheet associated with this xml file.
+
+		/// </summary>
+
+		public string StylesheetFileName {
+
+			get { return stylesheetFileName; }
+
+			set { stylesheetFileName = value; }
+
 		}
 						
 		#endregion
@@ -430,16 +609,17 @@ namespace MonoDevelop.Xml.Editor
 		
 		#region Smart indent
 		
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
 			bool result;
-			

-			if (Document.Editor.Options.IndentStyle == IndentStyle.Smart && key == Gdk.Key.Return) {
-				result = base.KeyPress (key, keyChar, modifier);
-				SmartIndentLine (Editor.Caret.Line);
+			
+
+			if (Editor.Options.IndentStyle == IndentStyle.Smart && descriptor.SpecialKey == SpecialKey.Return) {
+				result = base.KeyPress (descriptor);
+				SmartIndentLine (Editor.CaretLine);
 				return result;
 			}
-			return base.KeyPress (key, keyChar, modifier);
+			return base.KeyPress (descriptor);
 		}
 		
 		void SmartIndentLine (int line)
@@ -500,8 +680,10 @@ namespace MonoDevelop.Xml.Editor
 		[CommandHandler (XmlCommands.CreateSchema)]
 		public void CreateSchemaCommand ()
 		{
-			try {

-				TaskService.Errors.Clear ();

+			try {
+
+				TaskService.Errors.Clear ();
+
 				string xml = Editor.Text;
 				using (ProgressMonitor monitor = XmlEditorService.GetMonitor ()) {
 					XmlDocument doc = XmlEditorService.ValidateWellFormedness (monitor, xml, FileName);
@@ -509,7 +691,8 @@ namespace MonoDevelop.Xml.Editor
 						return;
 					monitor.BeginTask (GettextCatalog.GetString ("Creating schema..."), 0);
 					try {
-						string schema = XmlEditorService.CreateSchema (Document, xml);

+						string schema = XmlEditorService.CreateSchema (Editor, xml);
+
 						string fileName = XmlEditorService.GenerateFileName (FileName, "{0}.xsd");
 						IdeApp.Workbench.NewDocument (fileName, "application/xml", schema);
 						monitor.ReportSuccess (GettextCatalog.GetString ("Schema created."));
@@ -518,22 +701,30 @@ namespace MonoDevelop.Xml.Editor
 						LoggingService.LogError (msg, ex);
 						monitor.ReportError (msg, ex);
 					}
-				}

-			} catch (Exception ex) {

-				MessageService.ShowError (ex.Message);

+				}
+
+			} catch (Exception ex) {
+
+				MessageService.ShowError (ex.Message);
+
 			}
 		}
 		
 		[CommandHandler (XmlCommands.OpenStylesheet)]
 		public void OpenStylesheetCommand ()
-		{

-			if (!string.IsNullOrEmpty (stylesheetFileName)) {

-				try {

-					IdeApp.Workbench.OpenDocument (stylesheetFileName, Document.Project);

+		{
+
+			if (!string.IsNullOrEmpty (stylesheetFileName)) {
+
+				try {
+
+					IdeApp.Workbench.OpenDocument (stylesheetFileName, DocumentContext.Project);
+
 				} catch (Exception ex) {
-					MessageService.ShowError ("Could not open document.", ex);

-				}

-			}

+					LoggingService.LogError ("Could not open document.", ex);
+					MessageService.ShowException (ex, "Could not open document.");
+				}
+			}
 		}
 		
 		[CommandUpdateHandler (XmlCommands.OpenStylesheet)]
@@ -546,21 +737,28 @@ namespace MonoDevelop.Xml.Editor
 		public void GoToSchemaDefinitionCommand ()
 		{
 			try {
-				//try to resolve the schema

-				XmlSchemaCompletionData currentSchemaCompletionData = FindSchemaFromFileName (FileName);						

-				XmlSchemaObject schemaObject = GetSchemaObjectSelected (currentSchemaCompletionData);

-				

-				// Open schema if resolved

-				if (schemaObject != null && schemaObject.SourceUri != null && schemaObject.SourceUri.Length > 0) {

+				//try to resolve the schema
+
+				XmlSchemaCompletionData currentSchemaCompletionData = FindSchemaFromFileName (FileName);						
+
+				XmlSchemaObject schemaObject = GetSchemaObjectSelected (currentSchemaCompletionData);
+
+				
+
+				// Open schema if resolved
+
+				if (schemaObject != null && schemaObject.SourceUri != null && schemaObject.SourceUri.Length > 0) {
+
 					string schemaFileName = schemaObject.SourceUri.Replace ("file:/", String.Empty);
 					IdeApp.Workbench.OpenDocument (
 					    schemaFileName,
-						Document.Project,
+						DocumentContext.Project,
 					    Math.Max (1, schemaObject.LineNumber),
 					    Math.Max (1, schemaObject.LinePosition));
 				}
 			} catch (Exception ex) {
-				MessageService.ShowError ("Could not open document.", ex);

+				MonoDevelop.Core.LoggingService.LogError ("Could not open document.", ex);
+				MessageService.ShowException (ex, "Could not open document.");
 			}
 		}
 		
@@ -571,7 +769,8 @@ namespace MonoDevelop.Xml.Editor
 			using (ProgressMonitor monitor = XmlEditorService.GetMonitor()) {
 				if (IsSchema)
 					XmlEditorService.ValidateSchema (monitor, Editor.Text, FileName);
-				else

+				else
+
 					XmlEditorService.ValidateXml (monitor, Editor.Text, FileName);
 			}
 		}
@@ -579,17 +778,22 @@ namespace MonoDevelop.Xml.Editor
 		[CommandHandler (XmlCommands.AssignStylesheet)]
 		public void AssignStylesheetCommand ()
 		{
-			// Prompt user for filename.

-			string fileName = XmlEditorService.BrowseForStylesheetFile ();

-			if (!string.IsNullOrEmpty (stylesheetFileName))

+			// Prompt user for filename.
+
+			string fileName = XmlEditorService.BrowseForStylesheetFile ();
+
+			if (!string.IsNullOrEmpty (stylesheetFileName))
+
 				stylesheetFileName = fileName;
 		}
 		
 		[CommandHandler (XmlCommands.RunXslTransform)]
 		public void RunXslTransformCommand ()
 		{
-			if (string.IsNullOrEmpty (stylesheetFileName)) {

-				stylesheetFileName = XmlEditorService.BrowseForStylesheetFile ();

+			if (string.IsNullOrEmpty (stylesheetFileName)) {
+
+				stylesheetFileName = XmlEditorService.BrowseForStylesheetFile ();
+
 				if (string.IsNullOrEmpty (stylesheetFileName))
 					return;
 			}
@@ -616,7 +820,7 @@ namespace MonoDevelop.Xml.Editor
 					string newFileName = XmlEditorService.GenerateFileName (FileName, "-transformed{0}.xml");
 					
 					monitor.BeginTask (GettextCatalog.GetString ("Executing transform..."), 1);
-					using (XmlTextWriter output = XmlEditorService.CreateXmlTextWriter(Document)) {
+					using (XmlTextWriter output = XmlEditorService.CreateXmlTextWriter(Editor)) {
 						xslt.Transform (doc, null, output);
 						IdeApp.Workbench.NewDocument (
 						    newFileName, "application/xml", output.ToString ());
@@ -626,19 +830,24 @@ namespace MonoDevelop.Xml.Editor
 				} catch (Exception ex) {
 					string msg = GettextCatalog.GetString ("Could not run transform.");
 					monitor.ReportError (msg, ex);
-					monitor.EndTask ();

+					monitor.EndTask ();
+
 				}
 			}
 		}
 		
-		string GetFileContent (string fileName)

+		string GetFileContent (string fileName)
+
 		{
-			MonoDevelop.Projects.Text.IEditableTextFile tf =
-				MonoDevelop.Ide.TextFileProvider.Instance.GetEditableTextFile (fileName);
+			var tf =
+				MonoDevelop.Ide.TextFileProvider.Instance.GetReadOnlyTextEditorData (fileName);
  			if (tf != null)
-				return tf.Text;

-			System.IO.StreamReader reader = new System.IO.StreamReader (fileName, true);

-			return reader.ReadToEnd();

+				return tf.Text;
+
+			System.IO.StreamReader reader = new System.IO.StreamReader (fileName, true);
+
+			return reader.ReadToEnd();
+
 		}
 		
 		#endregion
@@ -650,7 +859,7 @@ namespace MonoDevelop.Xml.Editor
 				return;
 			if (inferredCompletionData == null
 			    || (doc.LastWriteTimeUtc - inferredCompletionData.TimeStampUtc).TotalSeconds >= 5
-			        && doc.Errors.Count <= inferredCompletionData.ErrorCount)
+					&& doc.GetErrorsAsync().Result.Count <= inferredCompletionData.ErrorCount)
 			{
 				inferenceQueued = true;
 				System.Threading.ThreadPool.QueueUserWorkItem (delegate {
@@ -658,7 +867,7 @@ namespace MonoDevelop.Xml.Editor
 						InferredXmlCompletionProvider newData = new InferredXmlCompletionProvider ();
 						newData.Populate (doc.XDocument);
 						newData.TimeStampUtc = DateTime.UtcNow;
-						newData.ErrorCount = doc.Errors.Count;
+						newData.ErrorCount = doc.GetErrorsAsync().Result.Count;
 						this.inferenceQueued = false;
 						this.inferredCompletionData = newData;
 					} catch (Exception ex) {
diff --git a/main/src/addins/Xml/MSBuild/MSBuildResolveContext.cs b/main/src/addins/Xml/MSBuild/MSBuildResolveContext.cs
index bb01db9027..b9de149700 100644
--- a/main/src/addins/Xml/MSBuild/MSBuildResolveContext.cs
+++ b/main/src/addins/Xml/MSBuild/MSBuildResolveContext.cs
@@ -82,7 +82,7 @@ namespace MonoDevelop.Xml.MSBuild
 		{
 			var ctx = new MSBuildResolveContext ();
 			ctx.Populate (doc.XDocument);
-			if (doc.Errors.Count > 0)

+			if (doc.GetErrorsAsync().Result.Count > 0)

 				ctx.Merge (previous);
 			return ctx;
 		}
diff --git a/main/src/addins/Xml/MonoDevelop.Xml.csproj b/main/src/addins/Xml/MonoDevelop.Xml.csproj
index 5a796abe25..8637fab210 100644
--- a/main/src/addins/Xml/MonoDevelop.Xml.csproj
+++ b/main/src/addins/Xml/MonoDevelop.Xml.csproj
@@ -66,6 +66,10 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -83,26 +87,11 @@
       <Name>MonoDevelop.DesignerSupport</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -118,6 +107,11 @@
       <Name>Xwt</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="icons\prefs-xml-16.png">
diff --git a/main/src/addins/Xml/Parser/XmlDocTypeState.cs b/main/src/addins/Xml/Parser/XmlDocTypeState.cs
index fc8103e8fd..2445422939 100644
--- a/main/src/addins/Xml/Parser/XmlDocTypeState.cs
+++ b/main/src/addins/Xml/Parser/XmlDocTypeState.cs
@@ -27,9 +27,8 @@
 //
 
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
 

 namespace MonoDevelop.Xml.Parser

 {

@@ -132,7 +131,7 @@ namespace MonoDevelop.Xml.Parser
 				switch (context.StateTag) {
 				case 0:
 					if (c == '[') {
-						doc.InternalDeclarationRegion = new DomRegion (context.Location, TextLocation.Empty);
+						doc.InternalDeclarationRegion = new DocumentRegion (context.Location, DocumentLocation.Empty);
 						context.StateTag = 1;
 						return null;
 					}
@@ -143,7 +142,7 @@ namespace MonoDevelop.Xml.Parser
 						return null;
 					} else if (c == ']') {
 						context.StateTag = 0;
-						doc.InternalDeclarationRegion = new DomRegion (doc.InternalDeclarationRegion.Begin, context.Location);
+						doc.InternalDeclarationRegion = new DocumentRegion (doc.InternalDeclarationRegion.Begin, context.Location);
 						return null;
 					}
 					break;
diff --git a/main/src/addins/Xml/Parser/XmlParser.cs b/main/src/addins/Xml/Parser/XmlParser.cs
index de40145786..72d8f726e6 100644
--- a/main/src/addins/Xml/Parser/XmlParser.cs
+++ b/main/src/addins/Xml/Parser/XmlParser.cs
@@ -30,10 +30,10 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Xml.Dom;

+using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.TypeSystem;

 

 namespace MonoDevelop.Xml.Parser

 {

@@ -45,8 +45,8 @@ namespace MonoDevelop.Xml.Parser
 		bool buildTree;
 		
 		int position;

-		TextLocation location;

-		TextLocation previousLineEnd;
+		DocumentLocation location;

+		DocumentLocation previousLineEnd;
 		int stateTag;
 		StringBuilder keywordBuilder;
 		int currentStateLength;
@@ -94,7 +94,7 @@ namespace MonoDevelop.Xml.Parser
 		#region IDocumentStateEngine

 		

 		public int Position { get { return position; } }
-		public TextLocation Location { get { return location; } }
+		public DocumentLocation Location { get { return location; } }
 		

 		public void Reset ()
 		{
@@ -102,8 +102,8 @@ namespace MonoDevelop.Xml.Parser
 			previousState = rootState;

 			position = 0;
 			stateTag = 0;

-			location = new TextLocation (1, 1);

-			previousLineEnd = TextLocation.Empty;
+			location = new DocumentLocation (1, 1);

+			previousLineEnd = DocumentLocation.Empty;
 			keywordBuilder = new StringBuilder ();
 			currentStateLength = 0;
 			nodes = new NodeStack ();
@@ -131,10 +131,10 @@ namespace MonoDevelop.Xml.Parser
 				//FIXME: position/location should be at current char, not after it
 				position++;
 				if (c == '\n') {
-					previousLineEnd = new TextLocation (location.Line, location.Column + 1);
-					location = new TextLocation (location.Line + 1, 1);
+					previousLineEnd = new DocumentLocation (location.Line, location.Column + 1);
+					location = new DocumentLocation (location.Line + 1, 1);
 				} else {
-					location = new TextLocation (location.Line, location.Column + 1);
+					location = new DocumentLocation (location.Line, location.Column + 1);
 				}
 
 				for (int loopLimit = 0; loopLimit < 10; loopLimit++) {
@@ -172,7 +172,7 @@ namespace MonoDevelop.Xml.Parser
 
 					//rollback position and location so they're valid
 					position -= (rollback.Length + 1);
-					location = new TextLocation (location.Line, location.Column - (rollback.Length + 1));
+					location = new DocumentLocation (location.Line, location.Column - (rollback.Length + 1));
 					if (location.Column < 0)
 						throw new InvalidOperationException ("Can't roll back across line boundary");
 
@@ -181,7 +181,7 @@ namespace MonoDevelop.Xml.Parser
 
 					//restore position and location
 					position++;
-					location = new TextLocation (location.Line, location.Column + 1);
+					location = new DocumentLocation (location.Line, location.Column + 1);
 				}
 				throw new InvalidOperationException ("Too many state changes for char '" + c + "'. Current state is " + currentState.ToString () + ".");
 			} catch (Exception ex)  {
@@ -253,8 +253,8 @@ namespace MonoDevelop.Xml.Parser
 				builder.AppendLine ("Errors=");
 				foreach (Error err in errors) {
 					builder.Append (' ', 4);
-					builder.AppendFormat ("[{0}@{1}:{2}, {3}]\n", err.ErrorType, err.Region.BeginLine,
-					                      err.Region.BeginColumn, err.Message);
+					builder.AppendFormat ("[{0}@{1}:{2}, {3}]\n", err.ErrorType, err.Region.Begin.Line,
+					                      err.Region.Begin.Column, err.Message);
 				}
 			}
 			

@@ -269,7 +269,7 @@ namespace MonoDevelop.Xml.Parser
 			set { stateTag = value; }
 		}
 		
-		TextLocation IXmlParserContext.LocationMinus (int colOffset)
+		DocumentLocation IXmlParserContext.LocationMinus (int colOffset)
 		{
 			int col = Location.Column - colOffset;

 			int line = Location.Line;

@@ -279,7 +279,7 @@ namespace MonoDevelop.Xml.Parser
 				System.Diagnostics.Debug.Assert (col > 0);

 			}

 			System.Diagnostics.Debug.Assert (line > 0);
-			return new TextLocation (line, col);
+			return new DocumentLocation (line, col);
 		}
 		
 		StringBuilder IXmlParserContext.KeywordBuilder {
@@ -307,25 +307,25 @@ namespace MonoDevelop.Xml.Parser
 				InternalLogError (new Error (ErrorType.Warning, message, ((IXmlParserContext)this).LocationMinus (1)));
 		}
 		
-		void IXmlParserContext.LogError (string message, TextLocation location)
+		void IXmlParserContext.LogError (string message, DocumentLocation location)
 		{
 			if (errors != null || ErrorLogged != null)
 				InternalLogError (new Error (ErrorType.Error, message, ((IXmlParserContext)this).LocationMinus (1)));
 		}
 		
-		void IXmlParserContext.LogWarning (string message, TextLocation location)
+		void IXmlParserContext.LogWarning (string message, DocumentLocation location)
 		{
 			if (errors != null || ErrorLogged != null)
 				InternalLogError (new Error (ErrorType.Warning, message, location));
 		}
 		
-		void IXmlParserContext.LogError (string message, DomRegion region)
+		void IXmlParserContext.LogError (string message, DocumentRegion region)
 		{
 			if (errors != null || ErrorLogged != null)
 				InternalLogError (new Error (ErrorType.Error, message, region));
 		}
 		
-		void IXmlParserContext.LogWarning (string message, DomRegion region)
+		void IXmlParserContext.LogWarning (string message, DocumentRegion region)
 		{
 			if (errors != null || ErrorLogged != null)
 				InternalLogError (new Error (ErrorType.Warning, message, region));
@@ -382,17 +382,17 @@ namespace MonoDevelop.Xml.Parser
 		int StateTag { get; set; }
 		StringBuilder KeywordBuilder { get; }
 		int CurrentStateLength { get; }
-		TextLocation Location { get; }
-		TextLocation LocationMinus (int colOffset);
+		DocumentLocation Location { get; }
+		DocumentLocation LocationMinus (int colOffset);
 		XmlParserState PreviousState { get; }
 		NodeStack Nodes { get; }
 		bool BuildTree { get; }
 		void LogError (string message);
 		void LogWarning (string message);
-		void LogError (string message, TextLocation location);
-		void LogWarning (string message, TextLocation location);
-		void LogError (string message, DomRegion region);
-		void LogWarning (string message, DomRegion region);
+		void LogError (string message, DocumentLocation location);
+		void LogWarning (string message, DocumentLocation location);
+		void LogError (string message, DocumentRegion region);
+		void LogWarning (string message, DocumentRegion region);
 		void EndAll (bool pop);
 		void ConnectAll ();
 	}
diff --git a/main/src/addins/Xml/Parser/XmlRootState.cs b/main/src/addins/Xml/Parser/XmlRootState.cs
index d77d7e787b..bdc49a57a9 100644
--- a/main/src/addins/Xml/Parser/XmlRootState.cs
+++ b/main/src/addins/Xml/Parser/XmlRootState.cs
@@ -26,8 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Xml.Dom;

+using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.Xml.Parser

 {

@@ -106,7 +106,7 @@ namespace MonoDevelop.Xml.Parser
 			if (c == '<') {
 				if (context.StateTag != FREE)
 					context.LogError ("Incomplete tag opening; encountered unexpected '<'.",
-						new DomRegion (
+						new DocumentRegion (
 							context.LocationMinus (LengthFromOpenBracket (context) + 1),
 							context.LocationMinus (1)));
 				context.StateTag = BRACKET;
@@ -176,7 +176,7 @@ namespace MonoDevelop.Xml.Parser
 			}
 			
 			context.LogError ("Incomplete tag opening; encountered unexpected character '" + c + "'.",
-				new DomRegion (
+				new DocumentRegion (
 					context.LocationMinus (LengthFromOpenBracket (context)),
 					context.Location));
 			
diff --git a/main/src/addins/Xml/Parser/XmlTagState.cs b/main/src/addins/Xml/Parser/XmlTagState.cs
index 20de1d46ec..604613a88c 100644
--- a/main/src/addins/Xml/Parser/XmlTagState.cs
+++ b/main/src/addins/Xml/Parser/XmlTagState.cs
@@ -27,19 +27,19 @@
 //
 
 using System;
-using System.Diagnostics;

-using ICSharpCode.NRefactory;
-using MonoDevelop.Xml.Dom;

-

+using System.Diagnostics;
+using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
+
 namespace MonoDevelop.Xml.Parser
 {
 	
 	
 	public class XmlTagState : XmlParserState
-	{

-		const int ATTEMPT_RECOVERY = 1;

-		const int RECOVERY_FOUND_WHITESPACE = 2;

-		const int MAYBE_SELF_CLOSING = 2;

+	{
+		const int ATTEMPT_RECOVERY = 1;
+		const int RECOVERY_FOUND_WHITESPACE = 2;
+		const int MAYBE_SELF_CLOSING = 2;
 		const int OK = 0;
 
 		readonly XmlAttributeState AttributeState;
@@ -49,16 +49,16 @@ namespace MonoDevelop.Xml.Parser
 		
 		public XmlTagState  (XmlAttributeState attributeState)
 			: this (attributeState, new XmlNameState ()) {}
-		

-		public XmlTagState (XmlAttributeState attributeState, XmlNameState nameState)

+		
+		public XmlTagState (XmlAttributeState attributeState, XmlNameState nameState)
 		{
 			this.AttributeState = attributeState;
 			this.NameState = nameState;
 			
 			Adopt (this.AttributeState);
-			Adopt (this.NameState);

+			Adopt (this.NameState);
 		}
-		

+		
 		public override XmlParserState PushChar (char c, IXmlParserContext context, ref string rollback)
 		{
 			XElement element = context.Nodes.Peek () as XElement;
@@ -105,33 +105,33 @@ namespace MonoDevelop.Xml.Parser
 					Close (element, context, context.Location);
 				}
 				return Parent;
-			}

-

-			if (c == '/') {

-				context.StateTag = MAYBE_SELF_CLOSING;

-				return null;

-			}

-

-			if (context.StateTag == ATTEMPT_RECOVERY) {

-				if (XmlChar.IsWhitespace (c)) {

-					context.StateTag = RECOVERY_FOUND_WHITESPACE;

-				}

-				return null;

-			}

-

-			if (context.StateTag == RECOVERY_FOUND_WHITESPACE) {

-				if (!XmlChar.IsFirstNameChar (c))

-					return null;

-			}

-

-			context.StateTag = OK;

-

+			}
+
+			if (c == '/') {
+				context.StateTag = MAYBE_SELF_CLOSING;
+				return null;
+			}
+
+			if (context.StateTag == ATTEMPT_RECOVERY) {
+				if (XmlChar.IsWhitespace (c)) {
+					context.StateTag = RECOVERY_FOUND_WHITESPACE;
+				}
+				return null;
+			}
+
+			if (context.StateTag == RECOVERY_FOUND_WHITESPACE) {
+				if (!XmlChar.IsFirstNameChar (c))
+					return null;
+			}
+
+			context.StateTag = OK;
+
 			if (!element.IsNamed && XmlChar.IsFirstNameChar (c)) {
 				rollback = string.Empty;
-				return NameState;

-			}

-

-			if (context.CurrentStateLength > 1 && XmlChar.IsFirstNameChar (c)) {

+				return NameState;
+			}
+
+			if (context.CurrentStateLength > 1 && XmlChar.IsFirstNameChar (c)) {
 				rollback = string.Empty;
 				return AttributeState;
 			}
@@ -139,17 +139,17 @@ namespace MonoDevelop.Xml.Parser
 			if (XmlChar.IsWhitespace (c))
 				return null;
 
-			context.LogError ("Unexpected character '" + c + "' in tag.", context.LocationMinus (1));

+			context.LogError ("Unexpected character '" + c + "' in tag.", context.LocationMinus (1));
 			context.StateTag = ATTEMPT_RECOVERY;
-			return null;

+			return null;
 		}
 		
-		protected virtual void Close (XElement element, IXmlParserContext context, TextLocation location)
+		protected virtual void Close (XElement element, IXmlParserContext context, DocumentLocation location)
 		{
 			//have already checked that element is not null, i.e. top of stack is our element
 			if (element.IsClosed)
-				context.Nodes.Pop ();

-

+				context.Nodes.Pop ();
+
 			element.End (location);
 			if (context.BuildTree) {
 				XContainer container = element.IsClosed? 
diff --git a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj
index 19cc5c4b38..0b551fa523 100644
--- a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj
+++ b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj
@@ -51,10 +51,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\external\guiunit\src\framework\GuiUnit_NET_4_5.csproj">
       <Project>{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}</Project>
       <Name>GuiUnit_NET_4_5</Name>
@@ -64,10 +60,18 @@
       <Name>MonoDevelop.Xml</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Parser\ActiveElementStartPathTestFixture.cs" />
diff --git a/main/src/addins/Xml/Tests/Parser/ParsingTests.cs b/main/src/addins/Xml/Tests/Parser/ParsingTests.cs
index 04d8f2275d..f30f8d1581 100644
--- a/main/src/addins/Xml/Tests/Parser/ParsingTests.cs
+++ b/main/src/addins/Xml/Tests/Parser/ParsingTests.cs
@@ -28,10 +28,10 @@
 
 using System.Linq;
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
 using NUnit.Framework;
+using MonoDevelop.Ide.TypeSystem;
 
 
 namespace MonoDevelop.Xml.Tests.Parser
@@ -243,8 +243,8 @@ namespace MonoDevelop.Xml.Tests.Parser
 			Assert.AreEqual ("foo", el.Attributes.ElementAt (2).Name.Name);
 			Assert.AreEqual (3, el.Attributes.Count ());

 			parser.AssertErrorCount (1);
-			Assert.AreEqual (1, parser.Errors [0].Region.BeginLine);
-			Assert.AreEqual (26, parser.Errors [0].Region.BeginColumn);

+			Assert.AreEqual (1, parser.Errors [0].Region.Begin.Line);
+			Assert.AreEqual (26, parser.Errors [0].Region.Begin.Column);

 		}
 
 		[Test]
diff --git a/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs b/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs
index 74afe274ff..04b6c5b979 100644
--- a/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs
+++ b/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs
@@ -30,12 +30,12 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 

-using ICSharpCode.NRefactory;

-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Completion;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
 using NUnit.Framework;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Tests.Parser
 {
@@ -65,7 +65,7 @@ namespace MonoDevelop.Xml.Tests.Parser
 			var p = new TestXmlParser (new XmlRootState (), true);
 
 			//parse and capture line/col info
-			var list = new List<TextLocation> ();
+			var list = new List<DocumentLocation> ();
 			p.Parse (txt, Array.ConvertAll (asserts, a => (Action)(() => list.Add (p.Location))));
 
 			var doc = (XDocument) p.Nodes.Last ();
diff --git a/main/src/addins/Xml/Tests/Schema/AttributeAnnotationTestFixture.cs b/main/src/addins/Xml/Tests/Schema/AttributeAnnotationTestFixture.cs
index 071f9ac510..098e18098f 100644
--- a/main/src/addins/Xml/Tests/Schema/AttributeAnnotationTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/AttributeAnnotationTestFixture.cs
@@ -28,13 +28,13 @@ namespace MonoDevelop.Xml.Tests.Schema
 		[Test]

 		public void FooAttributeDocumentation()

 		{

-			Assert.AreEqual("Documentation for foo attribute.", fooAttributeCompletionData[0].Description);

+			Assert.AreEqual("Documentation for foo attribute.", ((MonoDevelop.Ide.CodeCompletion.CompletionData)fooAttributeCompletionData[0]).Description);

 		}

 		

 		[Test]

 		public void BarAttributeDocumentation()

 		{

-			Assert.AreEqual("Documentation for bar attribute.", barAttributeCompletionData[0].Description);

+			Assert.AreEqual("Documentation for bar attribute.", ((MonoDevelop.Ide.CodeCompletion.CompletionData)barAttributeCompletionData[0]).Description);

 		}

 		

 		protected override string GetSchema()

diff --git a/main/src/addins/Xml/Tests/Schema/ElementAnnotationTestFixture.cs b/main/src/addins/Xml/Tests/Schema/ElementAnnotationTestFixture.cs
index f4f709366e..0799de7aec 100644
--- a/main/src/addins/Xml/Tests/Schema/ElementAnnotationTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/ElementAnnotationTestFixture.cs
@@ -27,13 +27,13 @@ namespace MonoDevelop.Xml.Tests.Schema
 		[Test]

 		public void RootElementDocumentation()

 		{

-			Assert.AreEqual("Documentation for foo element.", rootElementCompletionData[0].Description);

+			Assert.AreEqual("Documentation for foo element.", ((MonoDevelop.Ide.CodeCompletion.CompletionData)rootElementCompletionData[0]).Description);

 		}

 		

 		[Test]

 		public void FooChildElementDocumentation()

 		{

-			Assert.AreEqual("Documentation for bar element.", fooChildElementCompletionData[0].Description);

+			Assert.AreEqual("Documentation for bar element.", ((MonoDevelop.Ide.CodeCompletion.CompletionData)fooChildElementCompletionData[0]).Description);

 		}

 		

 		protected override string GetSchema()

diff --git a/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs b/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs
index 5997a316bd..16e56e185e 100644
--- a/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs
+++ b/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs
@@ -1,4 +1,3 @@
-using ICSharpCode.NRefactory.Completion;

 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -52,7 +51,7 @@ namespace MonoDevelop.Xml.Tests.Schema
 		{

 			bool Contains = false;

 			

-			foreach (ICompletionData data in items) {

+			foreach (var data in items) {

 				if (data.DisplayText == name) {

 					Contains = true;

 					break;

@@ -70,12 +69,12 @@ namespace MonoDevelop.Xml.Tests.Schema
 		{

 			bool Contains = false;

 			

-			foreach (ICompletionData data in items) {

+			foreach (var data in items) {

 				if (data.DisplayText == name) {

-					if (data.Description == description) {

+					//if (data.DisplayText == description) {

 						Contains = true;

 						break;						

-					}

+					//}

 				}

 			}

 				

@@ -90,7 +89,7 @@ namespace MonoDevelop.Xml.Tests.Schema
 		{

 			int count = 0;

 			

-			foreach (ICompletionData data in items) {

+			foreach (var data in items) {

 				if (data.DisplayText == name) {

 					++count;

 				}

diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
index 79dc77fd34..b2a0451ba3 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
@@ -36,7 +36,7 @@ using Xwt.Drawing;
 
 namespace Mono.TextEditor.Highlighting
 {
-	public class ColorScheme
+	public sealed class ColorScheme
 	{
 		public string Name { get; set; }
 		public string Description { get; set; }
@@ -202,335 +202,437 @@ namespace Mono.TextEditor.Highlighting
 		#endregion
 
 		#region Text Colors
-
-		[ColorDescription("Plain Text", VSSetting = "Plain Text")]
+		
+		public const string PlainTextKey = "Plain Text";
+		
+		[ColorDescription(PlainTextKey, VSSetting = "Plain Text")]
 		public ChunkStyle PlainText { get; private set; }
 
-		[ColorDescription("Selected Text", VSSetting = "Selected Text")]
+		public const string SelectedTextKey = "Selected Text";
+		[ColorDescription(SelectedTextKey, VSSetting = "Selected Text")]
 		public ChunkStyle SelectedText { get; private set; }
 
-		[ColorDescription("Selected Text(Inactive)", VSSetting = "Inactive Selected Text")]
+		public const string SelectedInactiveTextKey = "Selected Text(Inactive)";
+		[ColorDescription(SelectedInactiveTextKey, VSSetting = "Inactive Selected Text")]
 		public ChunkStyle SelectedInactiveText { get; private set; }
 
-		[ColorDescription("Collapsed Text", VSSetting = "Collapsible Text")]
+		public const string CollapsedTextKey = "Collapsed Text";
+		[ColorDescription(CollapsedTextKey, VSSetting = "Collapsible Text")]
 		public ChunkStyle CollapsedText { get; private set; }
 
-		[ColorDescription("Line Numbers", VSSetting = "Line Numbers")]
+		public const string LineNumbersKey = "Line Numbers";
+		[ColorDescription(LineNumbersKey, VSSetting = "Line Numbers")]
 		public ChunkStyle LineNumbers { get; private set; }
 
-		[ColorDescription("Punctuation", VSSetting = "Operator")]
+		public const string PunctuationKey = "Punctuation";
+		[ColorDescription(PunctuationKey, VSSetting = "Operator")]
 		public ChunkStyle Punctuation { get; private set; }
 
-		[ColorDescription("Punctuation(Brackets)", VSSetting = "Plain Text")]
+		public const string PunctuationForBracketsKey = "Punctuation(Brackets)";
+		[ColorDescription(PunctuationForBracketsKey, VSSetting = "Plain Text")]
 		public ChunkStyle PunctuationForBrackets { get; private set; }
 
-		[ColorDescription("Comment(Line)", VSSetting = "Comment")]
+		public const string CommentsSingleLineKey = "Comment(Line)";
+		[ColorDescription(CommentsSingleLineKey, VSSetting = "Comment")]
 		public ChunkStyle CommentsSingleLine { get; private set; }
 
-		[ColorDescription("Comment(Block)", VSSetting = "Comment")]
-		public ChunkStyle CommentsMultiLine { get; private set; }
+		public const string CommentsBlockKey = "Comment(Block)";
+		[ColorDescription(CommentsBlockKey, VSSetting = "Comment")]
+		public ChunkStyle CommentsBlock { get; private set; }
 
-		[ColorDescription("Comment(Doc)", VSSetting = "XML Doc Comment")]
+		public const string CommentsForDocumentationKey = "Comment(Doc)";
+		[ColorDescription(CommentsForDocumentationKey, VSSetting = "XML Doc Comment")]
 		public ChunkStyle CommentsForDocumentation { get; private set; }
 		
-		[ColorDescription("Comment(DocTag)", VSSetting = "XML Doc Tag")]
+		public const string CommentsForDocumentationTagsKey = "Comment(DocTag)";
+		[ColorDescription(CommentsForDocumentationTagsKey, VSSetting = "XML Doc Tag")]
 		public ChunkStyle CommentsForDocumentationTags { get; private set; }
 		
-		[ColorDescription("Comment Tag", VSSetting = "Comment")]
+		public const string CommentTagsKey = "Comment Tag";
+		[ColorDescription(CommentTagsKey, VSSetting = "Comment")]
 		public ChunkStyle CommentTags { get; private set; }
 		
-		[ColorDescription("Excluded Code", VSSetting = "Excluded Code")]
+		public const string ExcludedCodeKey = "Excluded Code";
+		[ColorDescription(ExcludedCodeKey, VSSetting = "Excluded Code")]
 		public ChunkStyle ExcludedCode { get; private set; }
 
-		[ColorDescription("String", VSSetting = "String")]
+		public const string StringKey = "String";
+		[ColorDescription(StringKey, VSSetting = "String")]
 		public ChunkStyle String { get; private set; }
 
-		[ColorDescription("String(Escape)", VSSetting = "String")]
+		public const string StringEscapeSequenceKey = "String(Escape)";
+		[ColorDescription(StringEscapeSequenceKey, VSSetting = "String")]
 		public ChunkStyle StringEscapeSequence { get; private set; }
 
-		[ColorDescription("String(C# @ Verbatim)", VSSetting = "String(C# @ Verbatim)")]
+		public const string StringVerbatimKey = "String(C# @ Verbatim)";
+		[ColorDescription(StringVerbatimKey, VSSetting = "String(C# @ Verbatim)")]
 		public ChunkStyle StringVerbatim { get; private set; }
 
-		[ColorDescription("Number", VSSetting = "Number")]
+		public const string NumberKey = "Number";
+		[ColorDescription(NumberKey, VSSetting = "Number")]
 		public ChunkStyle Number { get; private set; }
 
-		[ColorDescription("Preprocessor", VSSetting = "Preprocessor Keyword")]
+		public const string PreprocessorKey = "Preprocessor";
+		[ColorDescription(PreprocessorKey, VSSetting = "Preprocessor Keyword")]
 		public ChunkStyle Preprocessor { get; private set; }
 
-		[ColorDescription("Preprocessor(Region Name)", VSSetting = "Plain Text")]
+		public const string PreprocessorRegionNameKey = "Preprocessor(Region Name)";
+		[ColorDescription(PreprocessorRegionNameKey, VSSetting = "Plain Text")]
 		public ChunkStyle PreprocessorRegionName { get; private set; }
 
-		[ColorDescription("Xml Text", VSSetting = "XML Text")]
+		public const string XmlTextKey = "Xml Text";
+		[ColorDescription(XmlTextKey, VSSetting = "XML Text")]
 		public ChunkStyle XmlText { get; private set; }
 
-		[ColorDescription("Xml Delimiter", VSSetting = "XML Delimiter")]
+		public const string XmlDelimiterKey = "Xml Delimiter";
+		[ColorDescription(XmlDelimiterKey, VSSetting = "XML Delimiter")]
 		public ChunkStyle XmlDelimiter { get; private set; }
 
-		[ColorDescription("Xml Name", VSSetting ="XML Name")]
+		public const string XmlNameKey = "Xml Name";
+		[ColorDescription(XmlNameKey, VSSetting ="XML Name")]
 		public ChunkStyle XmlName { get; private set; }
 
-		[ColorDescription("Xml Attribute", VSSetting = "XML Attribute")]
+		public const string XmlAttributeKey = "Xml Attribute";
+		[ColorDescription(XmlAttributeKey, VSSetting = "XML Attribute")]
 		public ChunkStyle XmlAttribute { get; private set; }
 		
-		[ColorDescription("Xml Attribute Quotes", VSSetting = "XML Attribute Quotes")]
+		public const string XmlAttributeQuotesKey = "Xml Attribute Quotes";
+		[ColorDescription(XmlAttributeQuotesKey, VSSetting = "XML Attribute Quotes")]
 		public ChunkStyle XmlAttributeQuotes { get; private set; }
 		
-		[ColorDescription("Xml Attribute Value", VSSetting = "XML Attribute Value")]
+		public const string XmlAttributeValueKey = "Xml Attribute Value";
+		[ColorDescription(XmlAttributeValueKey, VSSetting = "XML Attribute Value")]
 		public ChunkStyle XmlAttributeValue { get; private set; }
 		
-		[ColorDescription("Xml Comment", VSSetting = "XML Comment")]
+		public const string XmlCommentKey = "Xml Comment";
+		[ColorDescription(XmlCommentKey, VSSetting = "XML Comment")]
 		public ChunkStyle XmlComment { get; private set; }
 
-		[ColorDescription("Xml CData Section", VSSetting = "XML CData Section")]
+		public const string XmlCDataSectionKey = "Xml CData Section";
+		[ColorDescription(XmlCDataSectionKey, VSSetting = "XML CData Section")]
 		public ChunkStyle XmlCDataSection { get; private set; }
 
-		[ColorDescription("Tooltip Text")] // not defined in vs.net
+		public const string TooltipTextKey = "Tooltip Text";
+		[ColorDescription(TooltipTextKey)] // not defined in vs.net
 		public ChunkStyle TooltipText { get; private set; }
 
-		[ColorDescription("Notification Text")] // not defined in vs.net
+		public const string NotificationTextKey = "Notification Text";
+		[ColorDescription(NotificationTextKey)] // not defined in vs.net
 		public ChunkStyle NotificationText { get; private set; }
 
-		[ColorDescription("Completion Text")] //not defined in vs.net
+		public const string CompletionTextKey = "Completion Text";
+		[ColorDescription(CompletionTextKey)] //not defined in vs.net
 		public ChunkStyle CompletionText { get; private set; }
 
-		[ColorDescription("Completion Selected Text")] //not defined in vs.net
+		public const string CompletionSelectedTextKey = "Completion Selected Text";
+		[ColorDescription(CompletionSelectedTextKey)] //not defined in vs.net
 		public ChunkStyle CompletionSelectedText { get; private set; }
 
-		[ColorDescription("Completion Selected Text(Inactive)")] //not defined in vs.net
+		public const string CompletionSelectedInactiveTextKey = "Completion Selected Text(Inactive)";
+		[ColorDescription(CompletionSelectedInactiveTextKey)] //not defined in vs.net
 		public ChunkStyle CompletionSelectedInactiveText { get; private set; }
 
-		[ColorDescription("Keyword(Access)", VSSetting = "Keyword")]
+		public const string KeywordAccessorsKey = "Keyword(Access)";
+		[ColorDescription(KeywordAccessorsKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordAccessors { get; private set; }
 
-		[ColorDescription("Keyword(Type)", VSSetting = "Keyword")]
+		public const string KeywordTypesKey = "Keyword(Type)";
+		[ColorDescription(KeywordTypesKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordTypes { get; private set; }
 
-		[ColorDescription("Keyword(Operator)", VSSetting = "Keyword")]
+		public const string KeywordOperatorsKey = "Keyword(Operator)";
+		[ColorDescription(KeywordOperatorsKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordOperators { get; private set; }
 
-		[ColorDescription("Keyword(Selection)", VSSetting = "Keyword")]
+		public const string KeywordSelectionKey = "Keyword(Selection)";
+		[ColorDescription(KeywordSelectionKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordSelection { get; private set; }
 
-		[ColorDescription("Keyword(Iteration)", VSSetting = "Keyword")]
+		public const string KeywordIterationKey = "Keyword(Iteration)";
+		[ColorDescription(KeywordIterationKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordIteration { get; private set; }
 
-		[ColorDescription("Keyword(Jump)", VSSetting = "Keyword")]
+		public const string KeywordJumpKey = "Keyword(Jump)";
+		[ColorDescription(KeywordJumpKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordJump { get; private set; }
 
-		[ColorDescription("Keyword(Context)", VSSetting = "Keyword")]
+		public const string KeywordContextKey = "Keyword(Context)";
+		[ColorDescription(KeywordContextKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordContext { get; private set; }
 
-		[ColorDescription("Keyword(Exception)", VSSetting = "Keyword")]
+		public const string KeywordExceptionKey = "Keyword(Exception)";
+		[ColorDescription(KeywordExceptionKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordException { get; private set; }
 		
-		[ColorDescription("Keyword(Modifiers)", VSSetting = "Keyword")]
+		public const string KeywordModifiersKey = "Keyword(Modifiers)";
+		[ColorDescription(KeywordModifiersKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordModifiers { get; private set; }
 		
-		[ColorDescription("Keyword(Constants)", VSSetting = "Keyword")]
+		public const string KeywordConstantsKey = "Keyword(Constants)";
+		[ColorDescription(KeywordConstantsKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordConstants { get; private set; }
 		
-		[ColorDescription("Keyword(Void)", VSSetting = "Keyword")]
+		public const string KeywordVoidKey = "Keyword(Void)";
+		[ColorDescription(KeywordVoidKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordVoid { get; private set; }
 		
-		[ColorDescription("Keyword(Namespace)", VSSetting = "Keyword")]
+		public const string KeywordNamespaceKey = "Keyword(Namespace)";
+		[ColorDescription(KeywordNamespaceKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordNamespace { get; private set; }
 		
-		[ColorDescription("Keyword(Property)", VSSetting = "Keyword")]
+		public const string KeywordPropertyKey = "Keyword(Property)";
+		[ColorDescription(KeywordPropertyKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordProperty { get; private set; }
 		
-		[ColorDescription("Keyword(Declaration)", VSSetting = "Keyword")]
+		public const string KeywordDeclarationKey = "Keyword(Declaration)";
+		[ColorDescription(KeywordDeclarationKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordDeclaration { get; private set; }
 		
-		[ColorDescription("Keyword(Parameter)", VSSetting = "Keyword")]
+		public const string KeywordParameterKey = "Keyword(Parameter)";
+		[ColorDescription(KeywordParameterKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordParameter { get; private set; }
 		
-		[ColorDescription("Keyword(Operator Declaration)", VSSetting = "Keyword")]
+		public const string KeywordOperatorDeclarationKey = "Keyword(Operator Declaration)";
+		[ColorDescription(KeywordOperatorDeclarationKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordOperatorDeclaration { get; private set; }
 		
-		[ColorDescription("Keyword(Other)", VSSetting = "Keyword")]
+		public const string KeywordOtherKey = "Keyword(Other)";
+		[ColorDescription(KeywordOtherKey, VSSetting = "Keyword")]
 		public ChunkStyle KeywordOther { get; private set; }
 
-		[ColorDescription("User Types", VSSetting = "User Types")]
+		public const string UserTypesKey = "User Types";
+		[ColorDescription(UserTypesKey, VSSetting = "User Types")]
 		public ChunkStyle UserTypes { get; private set; }
 
-		[ColorDescription("User Types(Enums)", VSSetting = "User Types(Enums)")]
+		public const string UserTypesEnumsKey = "User Types(Enums)";
+		[ColorDescription(UserTypesEnumsKey, VSSetting = "User Types(Enums)")]
 		public ChunkStyle UserTypesEnums { get; private set; }
 		
-		[ColorDescription("User Types(Interfaces)", VSSetting = "User Types(Interfaces)")]
+		public const string UserTypesInterfacesKey = "User Types(Interfaces)";
+		[ColorDescription(UserTypesInterfacesKey, VSSetting = "User Types(Interfaces)")]
 		public ChunkStyle UserTypesInterfaces { get; private set; }
 		
-		[ColorDescription("User Types(Delegates)", VSSetting = "User Types(Delegates)")]
-		public ChunkStyle UserTypesDelegatess { get; private set; }
+		public const string UserTypesDelegatesKey = "User Types(Delegates)";
+		[ColorDescription(UserTypesDelegatesKey, VSSetting = "User Types(Delegates)")]
+		public ChunkStyle UserTypesDelegates { get; private set; }
 		
-		[ColorDescription("User Types(Value types)", VSSetting = "User Types(Value types)")]
+		public const string UserTypesValueTypesKey = "User Types(Value types)";
+		[ColorDescription(UserTypesValueTypesKey, VSSetting = "User Types(Value types)")]
 		public ChunkStyle UserTypesValueTypes { get; private set; }
 
-		[ColorDescription("User Types(Type parameters)", VSSetting = "User Types(Type parameters)")]
+		public const string UserTypesTypeParametersKey = "User Types(Type parameters)";
+		[ColorDescription(UserTypesTypeParametersKey, VSSetting = "User Types(Type parameters)")]
 		public ChunkStyle UserTypesTypeParameters { get; private set; }
 
-		[ColorDescription("User Field Usage", VSSetting = "Identifier")]
+		public const string UserFieldUsageKey = "User Field Usage";
+		[ColorDescription(UserFieldUsageKey, VSSetting = "Identifier")]
 		public ChunkStyle UserFieldUsage { get; private set; }
 		
-		[ColorDescription("User Field Declaration", VSSetting = "Identifier")]
+		public const string UserFieldDeclarationKey = "User Field Declaration";
+		[ColorDescription(UserFieldDeclarationKey, VSSetting = "Identifier")]
 		public ChunkStyle UserFieldDeclaration { get; private set; }
 		
-		[ColorDescription("User Property Usage", VSSetting = "Identifier")]
+		public const string UserPropertyUsageKey = "User Property Usage";
+		[ColorDescription(UserPropertyUsageKey, VSSetting = "Identifier")]
 		public ChunkStyle UserPropertyUsage { get; private set; }
 		
-		[ColorDescription("User Property Declaration", VSSetting = "Identifier")]
+		public const string UserPropertyDeclarationKey = "User Property Declaration";
+		[ColorDescription(UserPropertyDeclarationKey, VSSetting = "Identifier")]
 		public ChunkStyle UserPropertyDeclaration { get; private set; }
 		
-		[ColorDescription("User Event Usage", VSSetting = "Identifier")]
+		public const string UserEventUsageKey = "User Event Usage";
+		[ColorDescription(UserEventUsageKey, VSSetting = "Identifier")]
 		public ChunkStyle UserEventUsage { get; private set; }
 		
-		[ColorDescription("User Event Declaration", VSSetting = "Identifier")]
+		public const string UserEventDeclarationKey = "User Event Declaration";
+		[ColorDescription(UserEventDeclarationKey, VSSetting = "Identifier")]
 		public ChunkStyle UserEventDeclaration { get; private set; }
 		
-		[ColorDescription("User Method Usage", VSSetting = "Identifier")]
+		public const string UserMethodUsageKey = "User Method Usage";
+		[ColorDescription(UserMethodUsageKey, VSSetting = "Identifier")]
 		public ChunkStyle UserMethodUsage { get; private set; }
 
-		[ColorDescription("User Method Declaration", VSSetting = "Identifier")]
+		public const string UserMethodDeclarationKey = "User Method Declaration";
+		[ColorDescription(UserMethodDeclarationKey, VSSetting = "Identifier")]
 		public ChunkStyle UserMethodDeclaration { get; private set; }
 
-		[ColorDescription("User Parameter Usage", VSSetting = "Identifier")]
+		public const string UserParameterUsageKey = "User Parameter Usage";
+		[ColorDescription(UserParameterUsageKey, VSSetting = "Identifier")]
 		public ChunkStyle UserParameterUsage { get; private set; }
 		
-		[ColorDescription("User Parameter Declaration", VSSetting = "Identifier")]
+		public const string UserParameterDeclarationKey = "User Parameter Declaration";
+		[ColorDescription(UserParameterDeclarationKey, VSSetting = "Identifier")]
 		public ChunkStyle UserParameterDeclaration { get; private set; }
 
-		[ColorDescription("User Variable Usage", VSSetting = "Identifier")]
+		public const string UserVariableUsageKey = "User Variable Usage";
+		[ColorDescription(UserVariableUsageKey, VSSetting = "Identifier")]
 		public ChunkStyle UserVariableUsage { get; private set; }
 		
-		[ColorDescription("User Variable Declaration", VSSetting = "Identifier")]
+		public const string UserVariableDeclarationKey = "User Variable Declaration";
+		[ColorDescription(UserVariableDeclarationKey, VSSetting = "Identifier")]
 		public ChunkStyle UserVariableDeclaration { get; private set; }
 
-		[ColorDescription("Syntax Error", VSSetting = "Syntax Error")]
+		public const string SyntaxErrorKey = "Syntax Error";
+		[ColorDescription(SyntaxErrorKey, VSSetting = "Syntax Error")]
 		public ChunkStyle SyntaxError { get; private set; }
 
-		[ColorDescription("String Format Items", VSSetting = "String")]
+		public const string StringFormatItemsKey = "String Format Items";
+		[ColorDescription(StringFormatItemsKey, VSSetting = "String")]
 		public ChunkStyle StringFormatItems { get; private set; }
 
-		[ColorDescription("Breakpoint Text", VSSetting = "Breakpoint (Enabled)")]
+		public const string BreakpointTextKey = "Breakpoint Text";
+		[ColorDescription(BreakpointTextKey, VSSetting = "Breakpoint (Enabled)")]
 		public ChunkStyle BreakpointText { get; private set; }
 
-		[ColorDescription("Debugger Current Statement", VSSetting = "Current Statement")]
+		public const string DebuggerCurrentLineKey = "Debugger Current Statement";
+		[ColorDescription(DebuggerCurrentLineKey, VSSetting = "Current Statement")]
 		public ChunkStyle DebuggerCurrentLine { get; private set; }
 
-		[ColorDescription("Debugger Stack Line")] // not defined
+		public const string DebuggerStackLineKey = "Debugger Stack Line";
+		[ColorDescription(DebuggerStackLineKey)] // not defined
 		public ChunkStyle DebuggerStackLine { get; private set; }
 
-		[ColorDescription("Diff Line(Added)")] //not defined
+		public const string DiffLineAddedKey = "Diff Line(Added)";
+		[ColorDescription(DiffLineAddedKey)] //not defined
 		public ChunkStyle DiffLineAdded { get; private set; }
 
-		[ColorDescription("Diff Line(Removed)")] //not defined
+		public const string DiffLineRemovedKey = "Diff Line(Removed)";
+		[ColorDescription(DiffLineRemovedKey)] //not defined
 		public ChunkStyle DiffLineRemoved { get; private set; }
 
-		[ColorDescription("Diff Line(Changed)")] //not defined
+		public const string DiffLineChangedKey = "Diff Line(Changed)";
+		[ColorDescription(DiffLineChangedKey)] //not defined
 		public ChunkStyle DiffLineChanged { get; private set; }
 
-		[ColorDescription("Diff Header")] //not defined
+		public const string DiffHeaderKey = "Diff Header";
+		[ColorDescription(DiffHeaderKey)] //not defined
 		public ChunkStyle DiffHeader { get; private set; }
 		
-		[ColorDescription("Diff Header(Separator)")] //not defined
+		public const string DiffHeaderSeparatorKey = "Diff Header(Separator)";
+		[ColorDescription(DiffHeaderSeparatorKey)] //not defined
 		public ChunkStyle DiffHeaderSeparator { get; private set; }
 		
-		[ColorDescription("Diff Header(Old)")] //not defined
+		public const string DiffHeaderOldKey = "Diff Header(Old)";
+		[ColorDescription(DiffHeaderOldKey)] //not defined
 		public ChunkStyle DiffHeaderOld { get; private set; }
 		
-		[ColorDescription("Diff Header(New)")] //not defined
+		public const string DiffHeaderNewKey = "Diff Header(New)";
+		[ColorDescription(DiffHeaderNewKey)] //not defined
 		public ChunkStyle DiffHeaderNew { get; private set; }
 
-		[ColorDescription("Diff Location")] //not defined
+		public const string DiffLocationKey = "Diff Location";
+		[ColorDescription(DiffLocationKey)] //not defined
 		public ChunkStyle DiffLocation { get; private set; }
 
-		[ColorDescription("Html Attribute Name", VSSetting="HTML Attribute")]
+		public const string HtmlAttributeNameKey = "Html Attribute Name";
+		[ColorDescription(HtmlAttributeNameKey, VSSetting="HTML Attribute")]
 		public ChunkStyle HtmlAttributeName { get; private set; }
-		
-		[ColorDescription("Html Attribute Value", VSSetting="HTML Attribute Value")]
+
+		public const string HtmlAttributeValueKey = "Html Attribute Value";
+		[ColorDescription(HtmlAttributeValueKey, VSSetting="HTML Attribute Value")]
 		public ChunkStyle HtmlAttributeValue { get; private set; }
 		
-		[ColorDescription("Html Comment", VSSetting="HTML Comment")]
+		public const string HtmlCommentKey = "Html Comment";
+		[ColorDescription(HtmlCommentKey, VSSetting="HTML Comment")]
 		public ChunkStyle HtmlComment { get; private set; }
 		
-		[ColorDescription("Html Element Name", VSSetting="HTML Element Name")]
+		public const string HtmlElementNameKey = "Html Element Name";
+		[ColorDescription(HtmlElementNameKey, VSSetting="HTML Element Name")]
 		public ChunkStyle HtmlElementName { get; private set; }
 		
-		[ColorDescription("Html Entity", VSSetting="HTML Entity")]
+		public const string HtmlEntityKey = "Html Entity";
+		[ColorDescription(HtmlEntityKey, VSSetting="HTML Entity")]
 		public ChunkStyle HtmlEntity { get; private set; }
 		
-		[ColorDescription("Html Operator", VSSetting="HTML Operator")]
+		public const string HtmlOperatorKey = "Html Operator";
+		[ColorDescription(HtmlOperatorKey, VSSetting="HTML Operator")]
 		public ChunkStyle HtmlOperator { get; private set; }
 		
-		[ColorDescription("Html Server-Side Script", VSSetting="HTML Server-Side Script")]
+		public const string HtmlServerSideScriptKey = "Html Server-Side Script";
+		[ColorDescription(HtmlServerSideScriptKey, VSSetting="HTML Server-Side Script")]
 		public ChunkStyle HtmlServerSideScript { get; private set; }
 		
-		[ColorDescription("Html Tag Delimiter", VSSetting="HTML Tag Delimiter")]
+		public const string HtmlTagDelimiterKey = "Html Tag Delimiter";
+		[ColorDescription(HtmlTagDelimiterKey, VSSetting="HTML Tag Delimiter")]
 		public ChunkStyle HtmlTagDelimiter { get; private set; }
 		
-		[ColorDescription("Razor Code", VSSetting="Razor Code")]
+		public const string RazorCodeKey = "Razor Code";
+		[ColorDescription(RazorCodeKey, VSSetting="Razor Code")]
 		public ChunkStyle RazorCode { get; private set; }
 
-		[ColorDescription("Css Comment", VSSetting="CSS Comment")]
+		public const string CssCommentKey = "Css Comment";
+		[ColorDescription(CssCommentKey, VSSetting="CSS Comment")]
 		public ChunkStyle CssComment { get; private set; }
 
-		[ColorDescription("Css Property Name", VSSetting="CSS Property Name")]
+		public const string CssPropertyNameKey = "Css Property Name";
+		[ColorDescription(CssPropertyNameKey, VSSetting="CSS Property Name")]
 		public ChunkStyle CssPropertyName { get; private set; }
 		
-		[ColorDescription("Css Property Value", VSSetting="CSS Property Value")]
+		public const string CssPropertyValueKey = "Css Property Value";
+		[ColorDescription(CssPropertyValueKey, VSSetting="CSS Property Value")]
 		public ChunkStyle CssPropertyValue { get; private set; }
 		
-		[ColorDescription("Css Selector", VSSetting="CSS Selector")]
+		public const string CssSelectorKey = "Css Selector";
+		[ColorDescription(CssSelectorKey, VSSetting="CSS Selector")]
 		public ChunkStyle CssSelector { get; private set; }
 		
-		[ColorDescription("Css String Value", VSSetting="CSS String Value")]
+		public const string CssStringValueKey = "Css String Value";
+		[ColorDescription(CssStringValueKey, VSSetting="CSS String Value")]
 		public ChunkStyle CssStringValue { get; private set; }
 		
-		[ColorDescription("Css Keyword", VSSetting="CSS Keyword")]
+		public const string CssKeywordKey = "Css Keyword";
+		[ColorDescription(CssKeywordKey, VSSetting="CSS Keyword")]
 		public ChunkStyle CssKeyword { get; private set; }
 
-		[ColorDescription("Script Comment", VSSetting="Script Comment")]
+		public const string ScriptCommentKey = "Script Comment";
+		[ColorDescription(ScriptCommentKey, VSSetting="Script Comment")]
 		public ChunkStyle ScriptComment { get; private set; }
 		
-		[ColorDescription("Script Identifier", VSSetting="Script Identifier")]
+		public const string ScriptIdentifierKey = "Script Identifier";
+		[ColorDescription(ScriptIdentifierKey, VSSetting="Script Identifier")]
 		public ChunkStyle ScriptIdentifier { get; private set; }
 		
-		[ColorDescription("Script Keyword", VSSetting="Script Keyword")]
+		public const string ScriptKeywordKey = "Script Keyword";
+		[ColorDescription(ScriptKeywordKey, VSSetting="Script Keyword")]
 		public ChunkStyle ScriptKeyword { get; private set; }
 		
-		[ColorDescription("Script Number", VSSetting="Script Number")]
+		public const string ScriptNumberKey = "Script Number";
+		[ColorDescription(ScriptNumberKey, VSSetting="Script Number")]
 		public ChunkStyle ScriptNumber { get; private set; }
 		
-		[ColorDescription("Script Operator", VSSetting="Script Operator")]
+		public const string ScriptOperatorKey = "Script Operator";
+		[ColorDescription(ScriptOperatorKey, VSSetting="Script Operator")]
 		public ChunkStyle ScriptOperator { get; private set; }
 
-		[ColorDescription("Script String", VSSetting="Script String")]
+		public const string ScriptStringKey = "Script String";
+		[ColorDescription(ScriptStringKey, VSSetting="Script String")]
 		public ChunkStyle ScriptString { get; private set; }
 
 		#endregion
 
-		public class PropertyDecsription
+		public sealed class PropertyDescription
 		{
 			public readonly PropertyInfo Info;
 			public readonly ColorDescriptionAttribute Attribute;
 
-			public PropertyDecsription (PropertyInfo info, ColorDescriptionAttribute attribute)
+			public PropertyDescription (PropertyInfo info, ColorDescriptionAttribute attribute)
 			{
 				this.Info = info;
 				this.Attribute = attribute;
 			}
 		}
 
-		static Dictionary<string, PropertyDecsription> textColors = new Dictionary<string, PropertyDecsription> ();
+		static Dictionary<string, PropertyDescription> textColors = new Dictionary<string, PropertyDescription> ();
 
-		public static IEnumerable<PropertyDecsription> TextColors {
+		public static IEnumerable<PropertyDescription> TextColors {
 			get {
 				return textColors.Values;
 			}
 		}
 
-		static Dictionary<string, PropertyDecsription> ambientColors = new Dictionary<string, PropertyDecsription> ();
+		static Dictionary<string, PropertyDescription> ambientColors = new Dictionary<string, PropertyDescription> ();
 
-		public static IEnumerable<PropertyDecsription> AmbientColors {
+		public static IEnumerable<PropertyDescription> AmbientColors {
 			get {
 				return ambientColors.Values;
 			}
@@ -543,9 +645,9 @@ namespace Mono.TextEditor.Highlighting
 				if (description == null)
 					continue;
 				if (property.PropertyType == typeof (ChunkStyle)) {
-					textColors.Add (description.Name, new PropertyDecsription (property, description));
+					textColors.Add (description.Name, new PropertyDescription (property, description));
 				} else {
-					ambientColors.Add (description.Name, new PropertyDecsription (property, description));
+					ambientColors.Add (description.Name, new PropertyDescription (property, description));
 				}
 			}
 		}
@@ -591,7 +693,7 @@ namespace Mono.TextEditor.Highlighting
 		{
 			if (color == null)
 				return GetChunkStyle ("Plain Text");
-			PropertyDecsription val;
+			PropertyDescription val;
 			if (!textColors.TryGetValue (color, out val)) {
 				Console.WriteLine ("Chunk style : " + color + " is undefined.");
 				return GetChunkStyle ("Plain Text");
@@ -652,7 +754,7 @@ namespace Mono.TextEditor.Highlighting
 
 			foreach (var colorElement in root.XPathSelectElements("//colors/*")) {
 				var color = AmbientColor.Create (colorElement, palette);
-				PropertyDecsription info;
+				PropertyDescription info;
 				if (!ambientColors.TryGetValue (color.Name, out info)) {
 					Console.WriteLine ("Ambient color:" + color.Name + " not found.");
 					continue;
@@ -662,7 +764,7 @@ namespace Mono.TextEditor.Highlighting
 
 			foreach (var textColorElement in root.XPathSelectElements("//text/*")) {
 				var color = ChunkStyle.Create (textColorElement, palette);
-				PropertyDecsription info;
+				PropertyDescription info;
 				if (!textColors.TryGetValue (color.Name, out info)) {
 					Console.WriteLine ("Text color:" + color.Name + " not found.");
 					continue;
@@ -805,7 +907,7 @@ namespace Mono.TextEditor.Highlighting
 			return HslColor.Parse (color);
 		}
 
-		public class VSSettingColor
+		public sealed class VSSettingColor
 		{
 			public string Name { get; private set; }
 			public string Foreground { get; private set; }
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs
index 0d9ecc76fb..ef17e3d304 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs
@@ -38,7 +38,7 @@ namespace Mono.TextEditor.Highlighting
 	{
 		protected TextDocument doc;
 
-		public TextDocument Document {
+		public virtual TextDocument Document {
 			get {
 				return doc;
 			}
@@ -743,6 +743,9 @@ namespace Mono.TextEditor.Highlighting
 					string extends = reader.GetAttribute ("extends");
 					if (!String.IsNullOrEmpty (extends)) {
 						result = (SyntaxMode)SyntaxModeService.GetSyntaxMode (null, extends).MemberwiseClone ();
+						spanList.AddRange (result.spans);
+						prevMarkerList.AddRange (result.prevMarker);
+						matches.AddRange (result.matches);
 					}
 					result.Name = reader.GetAttribute ("name");
 					result.MimeType = reader.GetAttribute (MimeTypesAttribute);
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Theatrics/BounceFadePopupWindow.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Theatrics/BounceFadePopupWindow.cs
index 6fc42b0782..8f74963df2 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Theatrics/BounceFadePopupWindow.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Theatrics/BounceFadePopupWindow.cs
@@ -37,12 +37,12 @@ namespace Mono.TextEditor.Theatrics
 	{
 		Stage<BounceFadePopupWindow> stage = new Stage<BounceFadePopupWindow> ();
 		Gdk.Pixbuf textImage = null;
-		TextEditor editor;
+		MonoTextEditor editor;
 		
 		protected double scale = 0.0;
 		protected double opacity = 1.0;
 		
-		public BounceFadePopupWindow (TextEditor editor) : base (Gtk.WindowType.Popup)
+		public BounceFadePopupWindow (MonoTextEditor editor) : base (Gtk.WindowType.Popup)
 		{
 			if (!IsComposited)
 				throw new InvalidOperationException ("Only works with composited screen. Check Widget.IsComposited.");
@@ -69,7 +69,7 @@ namespace Mono.TextEditor.Theatrics
 			stage.UpdateFrequency = 10;
 		}
 		
-		protected TextEditor Editor { get { return editor; } }
+		protected MonoTextEditor Editor { get { return editor; } }
 		
 		/// <summary>Duration of the animation, in milliseconds.</summary>
 		public uint Duration { get; set; }
@@ -227,12 +227,12 @@ namespace Mono.TextEditor.Theatrics
 	{
 		Stage<BounceFadePopupWidget> stage = new Stage<BounceFadePopupWidget> ();
 		Gdk.Pixbuf textImage = null;
-		TextEditor editor;
+		MonoTextEditor editor;
 		
 		protected double scale = 0.0;
 		protected double opacity = 1.0;
 		
-		public BounceFadePopupWidget (TextEditor editor)
+		public BounceFadePopupWidget (MonoTextEditor editor)
 		{
 			if (!IsComposited)
 				throw new InvalidOperationException ("Only works with composited screen. Check Widget.IsComposited.");
@@ -256,7 +256,7 @@ namespace Mono.TextEditor.Theatrics
 			stage.UpdateFrequency = 10;
 		}
 		
-		protected TextEditor Editor { get { return editor; } }
+		protected MonoTextEditor Editor { get { return editor; } }
 		
 		/// <summary>Duration of the animation, in milliseconds.</summary>
 		public uint Duration { get; set; }
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/CharRope.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/CharRope.cs
new file mode 100644
index 0000000000..df70acc8c4
--- /dev/null
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/CharRope.cs
@@ -0,0 +1,226 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+namespace Mono.TextEditor.Utils
+{
+	/// <summary>
+	/// Poor man's template specialization: extension methods for Rope&lt;char&gt;.
+	/// </summary>
+	public static class CharRope
+	{
+		/// <summary>
+		/// Creates a new rope from the specified text.
+		/// </summary>
+		public static Rope<char> Create(string text)
+		{
+			if (text == null)
+				throw new ArgumentNullException("text");
+			return new Rope<char>(InitFromString(text));
+		}
+
+		/// <summary>
+		/// Retrieves the text for a portion of the rope.
+		/// Runs in O(lg N + M), where M=<paramref name="length"/>.
+		/// </summary>
+		/// <exception cref="ArgumentOutOfRangeException">offset or length is outside the valid range.</exception>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public static string ToString(this Rope<char> rope, int startIndex, int length)
+		{
+			if (rope == null)
+				throw new ArgumentNullException("rope");
+			#if DEBUG
+			if (length < 0)
+				throw new ArgumentOutOfRangeException("length", length, "Value must be >= 0");
+			#endif
+			if (length == 0)
+				return string.Empty;
+			char[] buffer = new char[length];
+			rope.CopyTo(startIndex, buffer, 0, length);
+			return new string(buffer);
+		}
+
+		/// <summary>
+		/// Retrieves the text for a portion of the rope and writes it to the specified text writer.
+		/// Runs in O(lg N + M), where M=<paramref name="length"/>.
+		/// </summary>
+		/// <exception cref="ArgumentOutOfRangeException">offset or length is outside the valid range.</exception>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public static void WriteTo(this Rope<char> rope, TextWriter output, int startIndex, int length)
+		{
+			if (rope == null)
+				throw new ArgumentNullException("rope");
+			if (output == null)
+				throw new ArgumentNullException("output");
+			rope.VerifyRange(startIndex, length);
+			rope.root.WriteTo(startIndex, output, length);
+		}
+
+		/// <summary>
+		/// Appends text to this rope.
+		/// Runs in O(lg N + M).
+		/// </summary>
+		/// <exception cref="ArgumentNullException">newElements is null.</exception>
+		public static void AddText(this Rope<char> rope, string text)
+		{
+			InsertText(rope, rope.Length, text);
+		}
+
+		/// <summary>
+		/// Inserts text into this rope.
+		/// Runs in O(lg N + M).
+		/// </summary>
+		/// <exception cref="ArgumentNullException">newElements is null.</exception>
+		/// <exception cref="ArgumentOutOfRangeException">index or length is outside the valid range.</exception>
+		public static void InsertText(this Rope<char> rope, int index, string text)
+		{
+			if (rope == null)
+				throw new ArgumentNullException("rope");
+			rope.InsertRange(index, text.ToCharArray(), 0, text.Length);
+			/*if (index < 0 || index > rope.Length) {
+				throw new ArgumentOutOfRangeException("index", index, "0 <= index <= " + rope.Length.ToString(CultureInfo.InvariantCulture));
+			}
+			if (text == null)
+				throw new ArgumentNullException("text");
+			if (text.Length == 0)
+				return;
+			rope.root = rope.root.Insert(index, text);
+			rope.OnChanged();*/
+		}
+
+		internal static RopeNode<char> InitFromString(string text)
+		{
+			if (text.Length == 0) {
+				return RopeNode<char>.emptyRopeNode;
+			}
+			RopeNode<char> node = RopeNode<char>.CreateNodes(text.Length);
+			FillNode(node, text, 0);
+			return node;
+		}
+
+		static void FillNode(RopeNode<char> node, string text, int start)
+		{
+			if (node.contents != null) {
+				text.CopyTo(start, node.contents, 0, node.length);
+			} else {
+				FillNode(node.left, text, start);
+				FillNode(node.right, text, start + node.left.length);
+			}
+		}
+
+		internal static void WriteTo(this RopeNode<char> node, int index, TextWriter output, int count)
+		{
+			if (node.height == 0) {
+				if (node.contents == null) {
+					// function node
+					node.GetContentNode().WriteTo(index, output, count);
+				} else {
+					// leaf node: append data
+					output.Write(node.contents, index, count);
+				}
+			} else {
+				// concat node: do recursive calls
+				if (index + count <= node.left.length) {
+					node.left.WriteTo(index, output, count);
+				} else if (index >= node.left.length) {
+					node.right.WriteTo(index - node.left.length, output, count);
+				} else {
+					int amountInLeft = node.left.length - index;
+					node.left.WriteTo(index, output, amountInLeft);
+					node.right.WriteTo(0, output, count - amountInLeft);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets the index of the first occurrence of any element in the specified array.
+		/// </summary>
+		/// <param name="rope">The target rope.</param>
+		/// <param name="anyOf">Array of characters being searched.</param>
+		/// <param name="startIndex">Start index of the search.</param>
+		/// <param name="length">Length of the area to search.</param>
+		/// <returns>The first index where any character was found; or -1 if no occurrence was found.</returns>
+		public static int IndexOfAny(this Rope<char> rope, char[] anyOf, int startIndex, int length)
+		{
+			if (rope == null)
+				throw new ArgumentNullException("rope");
+			if (anyOf == null)
+				throw new ArgumentNullException("anyOf");
+			rope.VerifyRange(startIndex, length);
+
+			while (length > 0) {
+				var entry = rope.FindNodeUsingCache(startIndex).PeekOrDefault();
+				char[] contents = entry.node.contents;
+				int startWithinNode = startIndex - entry.nodeStartIndex;
+				int nodeLength = System.Math.Min(entry.node.length, startWithinNode + length);
+				for (int i = startIndex - entry.nodeStartIndex; i < nodeLength; i++) {
+					char element = contents[i];
+					foreach (char needle in anyOf) {
+						if (element == needle)
+							return entry.nodeStartIndex + i;
+					}
+				}
+				length -= nodeLength - startWithinNode;
+				startIndex = entry.nodeStartIndex + nodeLength;
+			}
+			return -1;
+		}
+
+		/// <summary>
+		/// Gets the index of the first occurrence of the search text.
+		/// </summary>
+		public static int IndexOf(this Rope<char> rope, string searchText, int startIndex, int length, StringComparison comparisonType)
+		{
+			if (rope == null)
+				throw new ArgumentNullException("rope");
+			if (searchText == null)
+				throw new ArgumentNullException("searchText");
+			rope.VerifyRange(startIndex, length);
+			int pos = rope.ToString(startIndex, length).IndexOf(searchText, comparisonType);
+			if (pos < 0)
+				return -1;
+			else
+				return pos + startIndex;
+		}
+
+		/// <summary>
+		/// Gets the index of the last occurrence of the search text.
+		/// </summary>
+		public static int LastIndexOf(this Rope<char> rope, string searchText, int startIndex, int length, StringComparison comparisonType)
+		{
+			if (rope == null)
+				throw new ArgumentNullException("rope");
+			if (searchText == null)
+				throw new ArgumentNullException("searchText");
+			rope.VerifyRange(startIndex, length);
+			int pos = rope.ToString(startIndex, length).LastIndexOf(searchText, comparisonType);
+			if (pos < 0)
+				return -1;
+			else
+				return pos + startIndex;
+		}
+	}
+}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/ImmutableStack.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/ImmutableStack.cs
new file mode 100644
index 0000000000..4611571c0d
--- /dev/null
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/ImmutableStack.cs
@@ -0,0 +1,132 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+
+namespace Mono.TextEditor.Utils
+{
+	/// <summary>
+	/// An immutable stack.
+	/// 
+	/// Using 'foreach' on the stack will return the items from top to bottom (in the order they would be popped).
+	/// </summary>
+	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix")]
+	[Serializable]
+	public sealed class ImmutableStack<T> : IEnumerable<T>
+	{
+		/// <summary>
+		/// Gets the empty stack instance.
+		/// </summary>
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "ImmutableStack is immutable")]
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+		public static readonly ImmutableStack<T> Empty = new ImmutableStack<T>();
+
+		readonly T value;
+		readonly ImmutableStack<T> next;
+
+		private ImmutableStack()
+		{
+		}
+
+		private ImmutableStack(T value, ImmutableStack<T> next)
+		{
+			this.value = value;
+			this.next = next;
+		}
+
+		/// <summary>
+		/// Pushes an item on the stack. This does not modify the stack itself, but returns a new
+		/// one with the value pushed.
+		/// </summary>
+		public ImmutableStack<T> Push(T item)
+		{
+			return new ImmutableStack<T>(item, this);
+		}
+
+		/// <summary>
+		/// Gets the item on the top of the stack.
+		/// </summary>
+		/// <exception cref="InvalidOperationException">The stack is empty.</exception>
+		public T Peek()
+		{
+			if (IsEmpty)
+				throw new InvalidOperationException("Operation not valid on empty stack.");
+			return value;
+		}
+
+		/// <summary>
+		/// Gets the item on the top of the stack.
+		/// Returns <c>default(T)</c> if the stack is empty.
+		/// </summary>
+		public T PeekOrDefault()
+		{
+			return value;
+		}
+
+		/// <summary>
+		/// Gets the stack with the top item removed.
+		/// </summary>
+		/// <exception cref="InvalidOperationException">The stack is empty.</exception>
+		public ImmutableStack<T> Pop()
+		{
+			if (IsEmpty)
+				throw new InvalidOperationException("Operation not valid on empty stack.");
+			return next;
+		}
+
+		/// <summary>
+		/// Gets if this stack is empty.
+		/// </summary>
+		public bool IsEmpty {
+			get { return next == null; }
+		}
+
+		/// <summary>
+		/// Gets an enumerator that iterates through the stack top-to-bottom.
+		/// </summary>
+		public IEnumerator<T> GetEnumerator()
+		{
+			ImmutableStack<T> t = this;
+			while (!t.IsEmpty) {
+				yield return t.value;
+				t = t.next;
+			}
+		}
+
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+		{
+			return this.GetEnumerator();
+		}
+
+		/// <inheritdoc/>
+		public override string ToString()
+		{
+			StringBuilder b = new StringBuilder("[Stack");
+			foreach (T val in this) {
+				b.Append(' ');
+				b.Append(val);
+			}
+			b.Append(']');
+			return b.ToString();
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/Rope.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/Rope.cs
new file mode 100644
index 0000000000..0ce950d5bc
--- /dev/null
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/Rope.cs
@@ -0,0 +1,854 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace Mono.TextEditor.Utils
+{
+	/// <summary>
+	/// A kind of List&lt;T&gt;, but more efficient for random insertions/removal.
+	/// Also has cheap Clone() and SubRope() implementations.
+	/// </summary>
+	/// <remarks>
+	/// This class is not thread-safe: multiple concurrent write operations or writes concurrent to reads have undefined behaviour.
+	/// Concurrent reads, however, are safe.
+	/// However, clones of a rope are safe to use on other threads even though they share data with the original rope.
+	/// </remarks>
+	[Serializable]
+	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+	public sealed class Rope<T> : IList<T>, ICloneable
+	{
+		internal RopeNode<T> root;
+		
+		internal Rope(RopeNode<T> root)
+		{
+			this.root = root;
+			root.CheckInvariants();
+		}
+		
+		/// <summary>
+		/// Creates a new rope representing the empty string.
+		/// </summary>
+		public Rope()
+		{
+			// we'll construct the empty rope as a clone of an imaginary static empty rope
+			this.root = RopeNode<T>.emptyRopeNode;
+			root.CheckInvariants();
+		}
+		
+		/// <summary>
+		/// Creates a rope from the specified input.
+		/// This operation runs in O(N).
+		/// </summary>
+		/// <exception cref="ArgumentNullException">input is null.</exception>
+		public Rope(IEnumerable<T> input)
+		{
+			if (input == null)
+				throw new ArgumentNullException("input");
+			Rope<T> inputRope = input as Rope<T>;
+			if (inputRope != null) {
+				// clone ropes instead of copying them
+				inputRope.root.Publish();
+				this.root = inputRope.root;
+			} else {
+				string text = input as string;
+				if (text != null) {
+					// if a string is IEnumerable<T>, then T must be char
+					((Rope<char>)(object)this).root = CharRope.InitFromString(text);
+				} else {
+					T[] arr = ToArray(input);
+					this.root = RopeNode<T>.CreateFromArray(arr, 0, arr.Length);
+				}
+			}
+			this.root.CheckInvariants();
+		}
+		
+		/// <summary>
+		/// Creates a rope from a part of the array.
+		/// This operation runs in O(N).
+		/// </summary>
+		/// <exception cref="ArgumentNullException">input is null.</exception>
+		public Rope(T[] array, int arrayIndex, int count)
+		{
+			VerifyArrayWithRange(array, arrayIndex, count);
+			this.root = RopeNode<T>.CreateFromArray(array, arrayIndex, count);
+			this.root.CheckInvariants();
+		}
+		
+		/// <summary>
+		/// Creates a new rope that lazily initalizes its content.
+		/// </summary>
+		/// <param name="length">The length of the rope that will be lazily loaded.</param>
+		/// <param name="initializer">
+		/// The callback that provides the content for this rope.
+		/// <paramref name="initializer"/> will be called exactly once when the content of this rope is first requested.
+		/// It must return a rope with the specified length.
+		/// Because the initializer function is not called when a rope is cloned, and such clones may be used on another threads,
+		/// it is possible for the initializer callback to occur on any thread.
+		/// </param>
+		/// <remarks>
+		/// Any modifications inside the rope will also cause the content to be initialized.
+		/// However, insertions at the beginning and the end, as well as inserting this rope into another or
+		/// using the <see cref="Concat(Rope{T},Rope{T})"/> method, allows constructions of larger ropes where parts are
+		/// lazily loaded.
+		/// However, even methods like Concat may sometimes cause the initializer function to be called, e.g. when
+		/// two short ropes are concatenated.
+		/// </remarks>
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]
+		public Rope(int length, Func<Rope<T>> initializer)
+		{
+			if (initializer == null)
+				throw new ArgumentNullException("initializer");
+			if (length < 0)
+				throw new ArgumentOutOfRangeException("length", length, "Length must not be negative");
+			if (length == 0) {
+				this.root = RopeNode<T>.emptyRopeNode;
+			} else {
+				this.root = new FunctionNode<T>(length, initializer);
+			}
+			this.root.CheckInvariants();
+		}
+		
+		static T[] ToArray(IEnumerable<T> input)
+		{
+			T[] arr = input as T[];
+			return arr ?? input.ToArray();
+		}
+		
+		/// <summary>
+		/// Clones the rope.
+		/// This operation runs in linear time to the number of rope nodes touched since the last clone was created.
+		/// If you count the per-node cost to the operation modifying the rope (doing this doesn't increase the complexity of the modification operations);
+		/// the remainder of Clone() runs in O(1).
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public Rope<T> Clone()
+		{
+			// The Publish() call actually modifies this rope instance; but this modification is thread-safe
+			// as long as the tree structure doesn't change during the operation.
+			root.Publish();
+			return new Rope<T>(root);
+		}
+		
+		object ICloneable.Clone()
+		{
+			return this.Clone();
+		}
+		
+		/// <summary>
+		/// Resets the rope to an empty list.
+		/// Runs in O(1).
+		/// </summary>
+		public void Clear()
+		{
+			root = RopeNode<T>.emptyRopeNode;
+			OnChanged();
+		}
+		
+		/// <summary>
+		/// Gets the length of the rope.
+		/// Runs in O(1).
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public int Length {
+			get { return root.length; }
+		}
+		
+		/// <summary>
+		/// Gets the length of the rope.
+		/// Runs in O(1).
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public int Count {
+			get { return root.length; }
+		}
+		
+		/// <summary>
+		/// Inserts another rope into this rope.
+		/// Runs in O(lg N + lg M), plus a per-node cost as if <c>newElements.Clone()</c> was called.
+		/// </summary>
+		/// <exception cref="ArgumentNullException">newElements is null.</exception>
+		/// <exception cref="ArgumentOutOfRangeException">index or length is outside the valid range.</exception>
+		public void InsertRange(int index, Rope<T> newElements)
+		{
+			if (index < 0 || index > this.Length) {
+				throw new ArgumentOutOfRangeException("index", index, "0 <= index <= " + this.Length.ToString(CultureInfo.InvariantCulture));
+			}
+			if (newElements == null)
+				throw new ArgumentNullException("newElements");
+			newElements.root.Publish();
+			root = root.Insert(index, newElements.root);
+			OnChanged();
+		}
+		
+		/// <summary>
+		/// Inserts new elemetns into this rope.
+		/// Runs in O(lg N + M), where N is the length of this rope and M is the number of new elements.
+		/// </summary>
+		/// <exception cref="ArgumentNullException">newElements is null.</exception>
+		/// <exception cref="ArgumentOutOfRangeException">index or length is outside the valid range.</exception>
+		public void InsertRange(int index, IEnumerable<T> newElements)
+		{
+			if (newElements == null)
+				throw new ArgumentNullException("newElements");
+			Rope<T> newElementsRope = newElements as Rope<T>;
+			if (newElementsRope != null) {
+				InsertRange(index, newElementsRope);
+			} else {
+				T[] arr = ToArray(newElements);
+				InsertRange(index, arr, 0, arr.Length);
+			}
+		}
+		
+		/// <summary>
+		/// Inserts new elements into this rope.
+		/// Runs in O(lg N + M), where N is the length of this rope and M is the number of new elements.
+		/// </summary>
+		/// <exception cref="ArgumentNullException">newElements is null.</exception>
+		/// <exception cref="ArgumentOutOfRangeException">index or length is outside the valid range.</exception>
+		public void InsertRange(int index, T[] array, int arrayIndex, int count)
+		{
+			if (index < 0 || index > this.Length) {
+				throw new ArgumentOutOfRangeException("index", index, "0 <= index <= " + this.Length.ToString(CultureInfo.InvariantCulture));
+			}
+			VerifyArrayWithRange(array, arrayIndex, count);
+			if (count > 0) {
+				root = root.Insert(index, array, arrayIndex, count);
+				OnChanged();
+			}
+		}
+		
+		/// <summary>
+		/// Appends multiple elements to the end of this rope.
+		/// Runs in O(lg N + M), where N is the length of this rope and M is the number of new elements.
+		/// </summary>
+		/// <exception cref="ArgumentNullException">newElements is null.</exception>
+		public void AddRange(IEnumerable<T> newElements)
+		{
+			InsertRange(this.Length, newElements);
+		}
+		
+		/// <summary>
+		/// Appends another rope to the end of this rope.
+		/// Runs in O(lg N + lg M), plus a per-node cost as if <c>newElements.Clone()</c> was called.
+		/// </summary>
+		/// <exception cref="ArgumentNullException">newElements is null.</exception>
+		public void AddRange(Rope<T> newElements)
+		{
+			InsertRange(this.Length, newElements);
+		}
+		
+		/// <summary>
+		/// Appends new elements to the end of this rope.
+		/// Runs in O(lg N + M), where N is the length of this rope and M is the number of new elements.
+		/// </summary>
+		/// <exception cref="ArgumentNullException">array is null.</exception>
+		public void AddRange(T[] array, int arrayIndex, int count)
+		{
+			InsertRange(this.Length, array, arrayIndex, count);
+		}
+		
+		/// <summary>
+		/// Removes a range of elements from the rope.
+		/// Runs in O(lg N).
+		/// </summary>
+		/// <exception cref="ArgumentOutOfRangeException">offset or length is outside the valid range.</exception>
+		public void RemoveRange(int index, int count)
+		{
+			VerifyRange(index, count);
+			if (count > 0) {
+				root = root.RemoveRange(index, count);
+				OnChanged();
+			}
+		}
+		
+		/// <summary>
+		/// Copies a range of the specified array into the rope, overwriting existing elements.
+		/// Runs in O(lg N + M).
+		/// </summary>
+		public void SetRange(int index, T[] array, int arrayIndex, int count)
+		{
+			VerifyRange(index, count);
+			VerifyArrayWithRange(array, arrayIndex, count);
+			if (count > 0) {
+				root = root.StoreElements(index, array, arrayIndex, count);
+				OnChanged();
+			}
+		}
+		
+		/// <summary>
+		/// Creates a new rope and initializes it with a part of this rope.
+		/// Runs in O(lg N) plus a per-node cost as if <c>this.Clone()</c> was called.
+		/// </summary>
+		/// <exception cref="ArgumentOutOfRangeException">offset or length is outside the valid range.</exception>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public Rope<T> GetRange(int index, int count)
+		{
+			VerifyRange(index, count);
+			Rope<T> newRope = Clone();
+			int endIndex = index + count;
+			newRope.RemoveRange(endIndex, newRope.Length - endIndex);
+			newRope.RemoveRange(0, index);
+			return newRope;
+		}
+		
+		/*
+		#region Equality
+		/// <summary>
+		/// Gets whether the two ropes have the same content.
+		/// Runs in O(N + M).
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public bool Equals(Rope other)
+		{
+			if (other == null)
+				return false;
+			// quick detection for ropes that are clones of each other:
+			if (other.root == this.root)
+				return true;
+			if (other.Length != this.Length)
+				return false;
+			using (RopeTextReader a = new RopeTextReader(this, false)) {
+				using (RopeTextReader b = new RopeTextReader(other, false)) {
+					int charA, charB;
+					do {
+						charA = a.Read();
+						charB = b.Read();
+						if (charA != charB)
+							return false;
+					} while (charA != -1);
+					return true;
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Gets whether two ropes have the same content.
+		/// Runs in O(N + M).
+		/// </summary>
+		public override bool Equals(object obj)
+		{
+			return Equals(obj as Rope);
+		}
+		
+		/// <summary>
+		/// Calculates the hash code of the rope's content.
+		/// Runs in O(N).
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public override int GetHashCode()
+		{
+			int hashcode = 0;
+			using (RopeTextReader reader = new RopeTextReader(this, false)) {
+				unchecked {
+					int val;
+					while ((val = reader.Read()) != -1) {
+						hashcode = hashcode * 31 + val;
+					}
+				}
+			}
+			return hashcode;
+		}
+		#endregion
+		 */
+		
+		/// <summary>
+		/// Concatenates two ropes. The input ropes are not modified.
+		/// Runs in O(lg N + lg M).
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+		public static Rope<T> Concat(Rope<T> left, Rope<T> right)
+		{
+			if (left == null)
+				throw new ArgumentNullException("left");
+			if (right == null)
+				throw new ArgumentNullException("right");
+			left.root.Publish();
+			right.root.Publish();
+			return new Rope<T>(RopeNode<T>.Concat(left.root, right.root));
+		}
+		
+		/// <summary>
+		/// Concatenates multiple ropes. The input ropes are not modified.
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+		public static Rope<T> Concat(params Rope<T>[] ropes)
+		{
+			if (ropes == null)
+				throw new ArgumentNullException("ropes");
+			Rope<T> result = new Rope<T>();
+			foreach (Rope<T> r in ropes)
+				result.AddRange(r);
+			return result;
+		}
+		
+		#region Caches / Changed event
+		internal struct RopeCacheEntry
+		{
+			internal readonly RopeNode<T> node;
+			internal readonly int nodeStartIndex;
+			
+			internal RopeCacheEntry(RopeNode<T> node, int nodeStartOffset)
+			{
+				this.node = node;
+				this.nodeStartIndex = nodeStartOffset;
+			}
+			
+			internal bool IsInside(int offset)
+			{
+				return node != null && offset >= nodeStartIndex && offset < nodeStartIndex + node.length;
+			}
+		}
+		
+		// cached pointer to 'last used node', used to speed up accesses by index that are close together
+		[NonSerialized]
+		volatile ImmutableStack<RopeCacheEntry> lastUsedNodeStack;
+		
+		internal void OnChanged()
+		{
+			lastUsedNodeStack = null;
+			
+			root.CheckInvariants();
+		}
+		#endregion
+		
+		#region GetChar / SetChar
+		/// <summary>
+		/// Gets/Sets a single character.
+		/// Runs in O(lg N) for random access. Sequential read-only access benefits from a special optimization and runs in amortized O(1).
+		/// </summary>
+		/// <exception cref="ArgumentOutOfRangeException">Offset is outside the valid range (0 to Length-1).</exception>
+		/// <remarks>
+		/// The getter counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public T this[int index] {
+			get {
+				// use unsigned integers - this way negative values for index overflow and can be tested for with the same check
+				if (unchecked((uint)index >= (uint)this.Length)) {
+					throw new ArgumentOutOfRangeException("index", index, "0 <= index < " + this.Length.ToString(CultureInfo.InvariantCulture));
+				}
+				RopeCacheEntry entry = FindNodeUsingCache(index).PeekOrDefault();
+				return entry.node.contents[index - entry.nodeStartIndex];
+			}
+			set {
+				if (index < 0 || index >= this.Length) {
+					throw new ArgumentOutOfRangeException("index", index, "0 <= index < " + this.Length.ToString(CultureInfo.InvariantCulture));
+				}
+				root = root.SetElement(index, value);
+				OnChanged();
+				/* Here's a try at implementing the setter using the cached node stack (UNTESTED code!).
+				 * However I don't use the code because it's complicated and doesn't integrate correctly with change notifications.
+				 * Instead, I'll use the much easier to understand recursive solution.
+				 * Oh, and it also doesn't work correctly with function nodes.
+				ImmutableStack<RopeCacheEntry> nodeStack = FindNodeUsingCache(offset);
+				RopeCacheEntry entry = nodeStack.Peek();
+				if (!entry.node.isShared) {
+					entry.node.contents[offset - entry.nodeStartOffset] = value;
+					// missing: clear the caches except for the node stack cache (e.g. ToString() cache?)
+				} else {
+					RopeNode oldNode = entry.node;
+					RopeNode newNode = oldNode.Clone();
+					newNode.contents[offset - entry.nodeStartOffset] = value;
+					for (nodeStack = nodeStack.Pop(); !nodeStack.IsEmpty; nodeStack = nodeStack.Pop()) {
+						RopeNode parentNode = nodeStack.Peek().node;
+						RopeNode newParentNode = parentNode.CloneIfShared();
+						if (newParentNode.left == oldNode) {
+							newParentNode.left = newNode;
+						} else {
+							Debug.Assert(newParentNode.right == oldNode);
+							newParentNode.right = newNode;
+						}
+						if (parentNode == newParentNode) {
+							// we were able to change the existing node (it was not shared);
+							// there's no reason to go further upwards
+							ClearCacheOnModification();
+							return;
+						} else {
+							oldNode = parentNode;
+							newNode = newParentNode;
+						}
+					}
+					// we reached the root of the rope.
+					Debug.Assert(root == oldNode);
+					root = newNode;
+					ClearCacheOnModification();
+				}*/
+			}
+		}
+		
+		internal ImmutableStack<RopeCacheEntry> FindNodeUsingCache(int index)
+		{
+			Debug.Assert(index >= 0 && index < this.Length);
+			
+			// thread safety: fetch stack into local variable
+			ImmutableStack<RopeCacheEntry> stack = lastUsedNodeStack;
+			ImmutableStack<RopeCacheEntry> oldStack = stack;
+			
+			if (stack == null) {
+				stack = ImmutableStack<RopeCacheEntry>.Empty.Push(new RopeCacheEntry(root, 0));
+			}
+			while (!stack.PeekOrDefault().IsInside(index))
+				stack = stack.Pop();
+			while (true) {
+				RopeCacheEntry entry = stack.PeekOrDefault();
+				// check if we've reached a leaf or function node
+				if (entry.node.height == 0) {
+					if (entry.node.contents == null) {
+						// this is a function node - go down into its subtree
+						entry = new RopeCacheEntry(entry.node.GetContentNode(), entry.nodeStartIndex);
+						// entry is now guaranteed NOT to be another function node
+					}
+					if (entry.node.contents != null) {
+						// this is a node containing actual content, so we're done
+						break;
+					}
+				}
+				// go down towards leaves
+				if (index - entry.nodeStartIndex >= entry.node.left.length)
+					stack = stack.Push(new RopeCacheEntry(entry.node.right, entry.nodeStartIndex + entry.node.left.length));
+				else
+					stack = stack.Push(new RopeCacheEntry(entry.node.left, entry.nodeStartIndex));
+			}
+			
+			// write back stack to volatile cache variable
+			// (in multithreaded access, it doesn't matter which of the threads wins - it's just a cache)
+			if (oldStack != stack) {
+				// no need to write when we the cache variable didn't change
+				lastUsedNodeStack = stack;
+			}
+			
+			// this method guarantees that it finds a leaf node
+			Debug.Assert(stack.Peek().node.contents != null);
+			return stack;
+		}
+		#endregion
+		
+		#region ToString / WriteTo
+		internal void VerifyRange(int startIndex, int length)
+		{
+			if (startIndex < 0 || startIndex > this.Length) {
+				throw new ArgumentOutOfRangeException("startIndex", startIndex, "0 <= startIndex <= " + this.Length.ToString(CultureInfo.InvariantCulture));
+			}
+			if (length < 0 || startIndex + length > this.Length) {
+				throw new ArgumentOutOfRangeException("length", length, "0 <= length, startIndex(" + startIndex + ")+length <= " + this.Length.ToString(CultureInfo.InvariantCulture));
+			}
+		}
+		
+		internal static void VerifyArrayWithRange(T[] array, int arrayIndex, int count)
+		{
+			if (array == null)
+				throw new ArgumentNullException("array");
+			if (arrayIndex < 0 || arrayIndex > array.Length) {
+				throw new ArgumentOutOfRangeException("startIndex", arrayIndex, "0 <= arrayIndex <= " + array.Length.ToString(CultureInfo.InvariantCulture));
+			}
+			if (count < 0 || arrayIndex + count > array.Length) {
+				throw new ArgumentOutOfRangeException("count", count, "0 <= length, arrayIndex(" + arrayIndex + ")+count <= " + array.Length.ToString(CultureInfo.InvariantCulture));
+			}
+		}
+		
+		/// <summary>
+		/// Creates a string from the rope. Runs in O(N).
+		/// </summary>
+		/// <returns>A string consisting of all elements in the rope as comma-separated list in {}.
+		/// As a special case, Rope&lt;char&gt; will return its contents as string without any additional separators or braces,
+		/// so it can be used like StringBuilder.ToString().</returns>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public override string ToString()
+		{
+			Rope<char> charRope = this as Rope<char>;
+			if (charRope != null) {
+				return charRope.ToString(0, this.Length);
+			} else {
+				StringBuilder b = new StringBuilder();
+				foreach (T element in this) {
+					if (b.Length == 0)
+						b.Append('{');
+					else
+						b.Append(", ");
+					b.Append(element.ToString());
+				}
+				b.Append('}');
+				return b.ToString();
+			}
+		}
+		
+		internal string GetTreeAsString()
+		{
+			#if DEBUG
+			return root.GetTreeAsString();
+			#else
+			return "Not available in release build.";
+			#endif
+		}
+		#endregion
+		
+		bool ICollection<T>.IsReadOnly {
+			get { return false; }
+		}
+		
+		/// <summary>
+		/// Finds the first occurance of item.
+		/// Runs in O(N).
+		/// </summary>
+		/// <returns>The index of the first occurance of item, or -1 if it cannot be found.</returns>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public int IndexOf(T item)
+		{
+			return IndexOf(item, 0, this.Length);
+		}
+		
+		/// <summary>
+		/// Gets the index of the first occurrence the specified item.
+		/// </summary>
+		/// <param name="item">Item to search for.</param>
+		/// <param name="startIndex">Start index of the search.</param>
+		/// <param name="count">Length of the area to search.</param>
+		/// <returns>The first index where the item was found; or -1 if no occurrence was found.</returns>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public int IndexOf(T item, int startIndex, int count)
+		{
+			VerifyRange(startIndex, count);
+			
+			while (count > 0) {
+				var entry = FindNodeUsingCache(startIndex).PeekOrDefault();
+				T[] contents = entry.node.contents;
+				int startWithinNode = startIndex - entry.nodeStartIndex;
+				int nodeLength = System.Math.Min(entry.node.length, startWithinNode + count);
+				int r = Array.IndexOf(contents, item, startWithinNode, nodeLength - startWithinNode);
+				if (r >= 0)
+					return entry.nodeStartIndex + r;
+				count -= nodeLength - startWithinNode;
+				startIndex = entry.nodeStartIndex + nodeLength;
+			}
+			return -1;
+		}
+		
+		/// <summary>
+		/// Gets the index of the last occurrence of the specified item in this rope.
+		/// </summary>
+		public int LastIndexOf(T item)
+		{
+			return LastIndexOf(item, 0, this.Length);
+		}
+		
+		/// <summary>
+		/// Gets the index of the last occurrence of the specified item in this rope.
+		/// </summary>
+		/// <param name="item">The search item</param>
+		/// <param name="startIndex">Start index of the area to search.</param>
+		/// <param name="count">Length of the area to search.</param>
+		/// <returns>The last index where the item was found; or -1 if no occurrence was found.</returns>
+		/// <remarks>The search proceeds backwards from (startIndex+count) to startIndex.
+		/// This is different than the meaning of the parameters on Array.LastIndexOf!</remarks>
+		public int LastIndexOf(T item, int startIndex, int count)
+		{
+			VerifyRange(startIndex, count);
+			
+			var comparer = EqualityComparer<T>.Default;
+			for (int i = startIndex + count - 1; i >= startIndex; i--) {
+				if (comparer.Equals(this[i], item))
+					return i;
+			}
+			return -1;
+		}
+		
+		/// <summary>
+		/// Inserts the item at the specified index in the rope.
+		/// Runs in O(lg N).
+		/// </summary>
+		public void Insert(int index, T item)
+		{
+			InsertRange(index, new[] { item }, 0, 1);
+		}
+		
+		/// <summary>
+		/// Removes a single item from the rope.
+		/// Runs in O(lg N).
+		/// </summary>
+		public void RemoveAt(int index)
+		{
+			RemoveRange(index, 1);
+		}
+		
+		/// <summary>
+		/// Appends the item at the end of the rope.
+		/// Runs in O(lg N).
+		/// </summary>
+		public void Add(T item)
+		{
+			InsertRange(this.Length, new[] { item }, 0, 1);
+		}
+		
+		/// <summary>
+		/// Searches the item in the rope.
+		/// Runs in O(N).
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public bool Contains(T item)
+		{
+			return IndexOf(item) >= 0;
+		}
+		
+		/// <summary>
+		/// Copies the whole content of the rope into the specified array.
+		/// Runs in O(N).
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public void CopyTo(T[] array, int arrayIndex)
+		{
+			CopyTo(0, array, arrayIndex, this.Length);
+		}
+		
+		/// <summary>
+		/// Copies the a part of the rope into the specified array.
+		/// Runs in O(lg N + M).
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public void CopyTo(int index, T[] array, int arrayIndex, int count)
+		{
+			VerifyRange(index, count);
+			VerifyArrayWithRange(array, arrayIndex, count);
+			this.root.CopyTo(index, array, arrayIndex, count);
+		}
+		
+		/// <summary>
+		/// Removes the first occurance of an item from the rope.
+		/// Runs in O(N).
+		/// </summary>
+		public bool Remove(T item)
+		{
+			int index = IndexOf(item);
+			if (index >= 0) {
+				RemoveAt(index);
+				return true;
+			}
+			return false;
+		}
+		
+		/// <summary>
+		/// Retrieves an enumerator to iterate through the rope.
+		/// The enumerator will reflect the state of the rope from the GetEnumerator() call, further modifications
+		/// to the rope will not be visible to the enumerator.
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public IEnumerator<T> GetEnumerator()
+		{
+			this.root.Publish();
+			return Enumerate(root);
+		}
+		
+		/// <summary>
+		/// Creates an array and copies the contents of the rope into it.
+		/// Runs in O(N).
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public T[] ToArray()
+		{
+			T[] arr = new T[this.Length];
+			this.root.CopyTo(0, arr, 0, arr.Length);
+			return arr;
+		}
+		
+		/// <summary>
+		/// Creates an array and copies the contents of the rope into it.
+		/// Runs in O(N).
+		/// </summary>
+		/// <remarks>
+		/// This method counts as a read access and may be called concurrently to other read accesses.
+		/// </remarks>
+		public T[] ToArray(int startIndex, int count)
+		{
+			VerifyRange(startIndex, count);
+			T[] arr = new T[count];
+			CopyTo(startIndex, arr, 0, count);
+			return arr;
+		}
+		
+		static IEnumerator<T> Enumerate(RopeNode<T> node)
+		{
+			Stack<RopeNode<T>> stack = new Stack<RopeNode<T>>();
+			while (node != null) {
+				// go to leftmost node, pushing the right parts that we'll have to visit later
+				while (node.contents == null) {
+					if (node.height == 0) {
+						// go down into function nodes
+						node = node.GetContentNode();
+						continue;
+					}
+					Debug.Assert(node.right != null);
+					stack.Push(node.right);
+					node = node.left;
+				}
+				// yield contents of leaf node
+				for (int i = 0; i < node.length; i++) {
+					yield return node.contents[i];
+				}
+				// go up to the next node not visited yet
+				if (stack.Count > 0)
+					node = stack.Pop();
+				else
+					node = null;
+			}
+		}
+		
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+		{
+			return this.GetEnumerator();
+		}
+	}
+}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/RopeNode.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/RopeNode.cs
new file mode 100644
index 0000000000..bc6b5bade7
--- /dev/null
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/RopeNode.cs
@@ -0,0 +1,621 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Diagnostics;
+using System.Runtime.Serialization;
+
+using System.Text;
+
+namespace Mono.TextEditor.Utils
+{
+	// Class used to represent a node in the tree.
+	// There are three types of nodes:
+	// Concat nodes: height>0, left!=null, right!=null, contents==null
+	// Leaf nodes: height==0, left==null, right==null, contents!=null
+	// Function nodes: height==0, left==null, right==null, contents==null, are of type FunctionNode<T>
+
+	[Serializable]
+	class RopeNode<T>
+	{
+		internal const int NodeSize = 256;
+
+		internal static readonly RopeNode<T> emptyRopeNode = new RopeNode<T> { isShared = true, contents = new T[RopeNode<T>.NodeSize] };
+
+		// Fields for pointers to sub-nodes. Only non-null for concat nodes (height>=1)
+		internal RopeNode<T> left, right;
+		internal volatile bool isShared; // specifies whether this node is shared between multiple ropes
+		// the total length of all text in this subtree
+		internal int length;
+		// the height of this subtree: 0 for leaf nodes; 1+max(left.height,right.height) for concat nodes
+		internal byte height;
+
+		// The character data. Only non-null for leaf nodes (height=0) that aren't function nodes.
+		internal T[] contents;
+
+		internal int Balance {
+			get { return right.height - left.height; }
+		}
+
+		[Conditional("DATACONSISTENCYTEST")]
+		internal void CheckInvariants()
+		{
+			if (height == 0) {
+				Debug.Assert(left == null && right == null);
+				if (contents == null) {
+					Debug.Assert(this is FunctionNode<T>);
+					Debug.Assert(length > 0);
+					Debug.Assert(isShared);
+				} else {
+					Debug.Assert(contents != null && contents.Length == NodeSize);
+					Debug.Assert(length >= 0 && length <= NodeSize);
+				}
+			} else {
+				Debug.Assert(left != null && right != null);
+				Debug.Assert(contents == null);
+				Debug.Assert(length == left.length + right.length);
+				Debug.Assert(height == 1 + System.Math.Max(left.height, right.height));
+				Debug.Assert(System.Math.Abs(this.Balance) <= 1);
+
+				// this is an additional invariant that forces the tree to combine small leafs to prevent excessive memory usage:
+				Debug.Assert(length > NodeSize);
+				// note that this invariant ensures that all nodes except for the empty rope's single node have at least length 1
+
+				if (isShared)
+					Debug.Assert(left.isShared && right.isShared);
+				left.CheckInvariants();
+				right.CheckInvariants();
+			}
+		}
+
+		internal RopeNode<T> Clone()
+		{
+			if (height == 0) {
+				// If a function node needs cloning, we'll evaluate it.
+				if (contents == null)
+					return GetContentNode().Clone();
+				T[] newContents = new T[NodeSize];
+				contents.CopyTo(newContents, 0);
+				return new RopeNode<T> {
+					length = this.length,
+					contents = newContents
+				};
+			} else {
+				return new RopeNode<T> {
+					left = this.left,
+					right = this.right,
+					length = this.length,
+					height = this.height
+				};
+			}
+		}
+
+		internal RopeNode<T> CloneIfShared()
+		{
+			if (isShared)
+				return Clone();
+			else
+				return this;
+		}
+
+		internal void Publish()
+		{
+			if (!isShared) {
+				if (left != null)
+					left.Publish();
+				if (right != null)
+					right.Publish();
+				// it's important that isShared=true is set at the end:
+				// Publish() must not return until the whole subtree is marked as shared, even when
+				// Publish() is called concurrently.
+				isShared = true;
+			}
+		}
+
+		internal static RopeNode<T> CreateFromArray(T[] arr, int index, int length)
+		{
+			if (length == 0) {
+				return emptyRopeNode;
+			}
+			RopeNode<T> node = CreateNodes(length);
+			return node.StoreElements(0, arr, index, length);
+		}
+
+		internal static RopeNode<T> CreateNodes(int totalLength)
+		{
+			int leafCount = (totalLength + NodeSize - 1) / NodeSize;
+			return CreateNodes(leafCount, totalLength);
+		}
+
+		static RopeNode<T> CreateNodes(int leafCount, int totalLength)
+		{
+			Debug.Assert(leafCount > 0);
+			Debug.Assert(totalLength > 0);
+			RopeNode<T> result = new RopeNode<T>();
+			result.length = totalLength;
+			if (leafCount == 1) {
+				result.contents = new T[NodeSize];
+			} else {
+				int rightSide = leafCount / 2;
+				int leftSide = leafCount - rightSide;
+				int leftLength = leftSide * NodeSize;
+				result.left = CreateNodes(leftSide, leftLength);
+				result.right = CreateNodes(rightSide, totalLength - leftLength);
+				result.height = (byte)(1 + System.Math.Max(result.left.height, result.right.height));
+			}
+			return result;
+		}
+
+		/// <summary>
+		/// Balances this node and recomputes the 'height' field.
+		/// This method assumes that the children of this node are already balanced and have an up-to-date 'height' value.
+		/// </summary>
+		internal void Rebalance()
+		{
+			// Rebalance() shouldn't be called on shared nodes - it's only called after modifications!
+			Debug.Assert(!isShared);
+			// leaf nodes are always balanced (we don't use 'height' to detect leaf nodes here
+			// because Balance is supposed to recompute the height).
+			if (left == null)
+				return;
+
+			// ensure we didn't miss a MergeIfPossible step
+			Debug.Assert(this.length > NodeSize);
+
+			// We need to loop until it's balanced. Rotations might cause two small leaves to combine to a larger one,
+			// which changes the height and might mean we need additional balancing steps.
+			while (System.Math.Abs(this.Balance) > 1) {
+				// AVL balancing
+				// note: because we don't care about the identity of concat nodes, this works a little different than usual
+				// tree rotations: in our implementation, the "this" node will stay at the top, only its children are rearranged
+				if (this.Balance > 1) {
+					if (right.Balance < 0) {
+						right = right.CloneIfShared();
+						right.RotateRight();
+					}
+					this.RotateLeft();
+					// If 'this' was unbalanced by more than 2, we've shifted some of the inbalance to the left node; so rebalance that.
+					this.left.Rebalance();
+				} else if (this.Balance < -1) {
+					if (left.Balance > 0) {
+						left = left.CloneIfShared();
+						left.RotateLeft();
+					}
+					this.RotateRight();
+					// If 'this' was unbalanced by more than 2, we've shifted some of the inbalance to the right node; so rebalance that.
+					this.right.Rebalance();
+				}
+			}
+
+			Debug.Assert(System.Math.Abs(this.Balance) <= 1);
+			this.height = (byte)(1 + System.Math.Max(left.height, right.height));
+		}
+
+		void RotateLeft()
+		{
+			Debug.Assert(!isShared);
+
+			/* Rotate tree to the left
+			 * 
+			 *       this               this
+			 *       /  \               /  \
+			*      A   right   ===>  left  C
+			*           / \          / \
+			*          B   C        A   B
+			*/
+			RopeNode<T> a = left;
+			RopeNode<T> b = right.left;
+			RopeNode<T> c = right.right;
+			// reuse right concat node, if possible
+			this.left = right.isShared ? new RopeNode<T>() : right;
+			this.left.left = a;
+			this.left.right = b;
+			this.left.length = a.length + b.length;
+			this.left.height = (byte)(1 + System.Math.Max(a.height, b.height));
+			this.right = c;
+
+			this.left.MergeIfPossible();
+		}
+
+		void RotateRight()
+		{
+			Debug.Assert(!isShared);
+
+			/* Rotate tree to the right
+			 * 
+			 *       this             this
+			 *       /  \             /  \
+			*     left  C   ===>    A  right
+			*     / \                   /  \
+			*    A   B                 B    C
+			*/
+			RopeNode<T> a = left.left;
+			RopeNode<T> b = left.right;
+			RopeNode<T> c = right;
+			// reuse left concat node, if possible
+			this.right = left.isShared ? new RopeNode<T>() : left;
+			this.right.left = b;
+			this.right.right = c;
+			this.right.length = b.length + c.length;
+			this.right.height = (byte)(1 + System.Math.Max(b.height, c.height));
+			this.left = a;
+
+			this.right.MergeIfPossible();
+		}
+		static readonly T[] emptyArr = new T[0];
+
+		void MergeIfPossible()
+		{
+			Debug.Assert(!isShared);
+
+			if (this.length <= NodeSize) {
+				// Convert this concat node to leaf node.
+				// We know left and right cannot be concat nodes (they would have merged already),
+				// but they could be function nodes.
+				this.height = 0;
+				int lengthOnLeftSide = this.left.length;
+				if (this.left.isShared) {
+					this.contents = new T[NodeSize];
+					left.CopyTo(0, this.contents, 0, lengthOnLeftSide);
+				} else {
+					// must be a leaf node: function nodes are always marked shared
+					Debug.Assert(this.left.contents != null);
+					// steal buffer from left side
+					this.contents = this.left.contents;
+					#if DEBUG
+					// In debug builds, explicitly mark left node as 'damaged' - but no one else should be using it
+					// because it's not shared.
+					this.left.contents = emptyArr;
+					#endif
+				}
+				this.left = null;
+				right.CopyTo(0, this.contents, lengthOnLeftSide, this.right.length);
+				this.right = null;
+			}
+		}
+
+		/// <summary>
+		/// Copies from the array to this node.
+		/// </summary>
+		internal RopeNode<T> StoreElements(int index, T[] array, int arrayIndex, int count)
+		{
+			RopeNode<T> result = this.CloneIfShared();
+			// result cannot be function node after a call to Clone()
+			if (result.height == 0) {
+				// leaf node:
+				Array.Copy(array, arrayIndex, result.contents, index, count);
+			} else {
+				// concat node:
+				if (index + count <= result.left.length) {
+					result.left = result.left.StoreElements(index, array, arrayIndex, count);
+				} else if (index >= this.left.length) {
+					result.right = result.right.StoreElements(index - result.left.length, array, arrayIndex, count);
+				} else {
+					int amountInLeft = result.left.length - index;
+					result.left = result.left.StoreElements(index, array, arrayIndex, amountInLeft);
+					result.right = result.right.StoreElements(0, array, arrayIndex + amountInLeft, count - amountInLeft);
+				}
+				result.Rebalance(); // tree layout might have changed if function nodes were replaced with their content
+			}
+			return result;
+		}
+
+		/// <summary>
+		/// Copies from this node to the array.
+		/// </summary>
+		internal void CopyTo(int index, T[] array, int arrayIndex, int count)
+		{
+			if (height == 0) {
+				if (this.contents == null) {
+					// function node
+					this.GetContentNode().CopyTo(index, array, arrayIndex, count);
+				} else {
+					// leaf node
+					Array.Copy(this.contents, index, array, arrayIndex, count);
+				}
+			} else {
+				// concat node
+				if (index + count <= this.left.length) {
+					this.left.CopyTo(index, array, arrayIndex, count);
+				} else if (index >= this.left.length) {
+					this.right.CopyTo(index - this.left.length, array, arrayIndex, count);
+				} else {
+					int amountInLeft = this.left.length - index;
+					this.left.CopyTo(index, array, arrayIndex, amountInLeft);
+					this.right.CopyTo(0, array, arrayIndex + amountInLeft, count - amountInLeft);
+				}
+			}
+		}
+
+		internal RopeNode<T> SetElement(int offset, T value)
+		{
+			RopeNode<T> result = CloneIfShared();
+			// result of CloneIfShared() is leaf or concat node
+			if (result.height == 0) {
+				result.contents[offset] = value;
+			} else {
+				if (offset < result.left.length) {
+					result.left = result.left.SetElement(offset, value);
+				} else {
+					result.right = result.right.SetElement(offset - result.left.length, value);
+				}
+				result.Rebalance(); // tree layout might have changed if function nodes were replaced with their content
+			}
+			return result;
+		}
+
+		internal static RopeNode<T> Concat(RopeNode<T> left, RopeNode<T> right)
+		{
+			if (left.length == 0)
+				return right;
+			if (right.length == 0)
+				return left;
+
+			if (left.length + right.length <= NodeSize) {
+				left = left.CloneIfShared();
+				// left is guaranteed to be leaf node after cloning:
+				// - it cannot be function node (due to clone)
+				// - it cannot be concat node (too short)
+				right.CopyTo(0, left.contents, left.length, right.length);
+				left.length += right.length;
+				return left;
+			} else {
+				RopeNode<T> concatNode = new RopeNode<T>();
+				concatNode.left = left;
+				concatNode.right = right;
+				concatNode.length = left.length + right.length;
+				concatNode.Rebalance();
+				return concatNode;
+			}
+		}
+
+		/// <summary>
+		/// Splits this leaf node at offset and returns a new node with the part of the text after offset.
+		/// </summary>
+		RopeNode<T> SplitAfter(int offset)
+		{
+			Debug.Assert(!isShared && height == 0 && contents != null);
+			RopeNode<T> newPart = new RopeNode<T>();
+			newPart.contents = new T[NodeSize];
+			newPart.length = this.length - offset;
+			Array.Copy(this.contents, offset, newPart.contents, 0, newPart.length);
+			this.length = offset;
+			return newPart;
+		}
+
+		internal RopeNode<T> Insert(int offset, RopeNode<T> newElements)
+		{
+			if (offset == 0) {
+				return Concat(newElements, this);
+			} else if (offset == this.length) {
+				return Concat(this, newElements);
+			}
+
+			// first clone this node (converts function nodes to leaf or concat nodes)
+			RopeNode<T> result = CloneIfShared();
+			if (result.height == 0) {
+				// leaf node: we'll need to split this node
+				RopeNode<T> left = result;
+				RopeNode<T> right = left.SplitAfter(offset);
+				return Concat(Concat(left, newElements), right);
+			} else {
+				// concat node
+				if (offset < result.left.length) {
+					result.left = result.left.Insert(offset, newElements);
+				} else {
+					result.right = result.right.Insert(offset - result.left.length, newElements);
+				}
+				result.length += newElements.length;
+				result.Rebalance();
+				return result;
+			}
+		}
+
+		internal RopeNode<T> Insert(int offset, T[] array, int arrayIndex, int count)
+		{
+			Debug.Assert(count > 0);
+
+			if (this.length + count < RopeNode<char>.NodeSize) {
+				RopeNode<T> result = CloneIfShared();
+				// result must be leaf node (Clone never returns function nodes, too short for concat node)
+				int lengthAfterOffset = result.length - offset;
+				T[] resultContents = result.contents;
+				for (int i = lengthAfterOffset; i >= 0; i--) {
+					resultContents[i + offset + count] = resultContents[i + offset];
+				}
+				Array.Copy(array, arrayIndex, resultContents, offset, count);
+				result.length += count;
+				return result;
+			} else if (height == 0) {
+				// TODO: implement this more efficiently?
+				return Insert(offset, CreateFromArray(array, arrayIndex, count));
+			} else {
+				// this is a concat node (both leafs and function nodes are handled by the case above)
+				RopeNode<T> result = CloneIfShared();
+				if (offset < result.left.length) {
+					result.left = result.left.Insert(offset, array, arrayIndex, count);
+				} else {
+					result.right = result.right.Insert(offset - result.left.length, array, arrayIndex, count);
+				}
+				result.length += count;
+				result.Rebalance();
+				return result;
+			}
+		}
+
+		internal RopeNode<T> RemoveRange(int index, int count)
+		{
+			Debug.Assert(count > 0);
+
+			// produce empty node when one node is deleted completely
+			if (index == 0 && count == this.length)
+				return emptyRopeNode;
+
+			int endIndex = index + count;
+			RopeNode<T> result = CloneIfShared(); // convert function node to concat/leaf
+			if (result.height == 0) {
+				int remainingAfterEnd = result.length - endIndex;
+				for (int i = 0; i < remainingAfterEnd; i++) {
+					result.contents[index + i] = result.contents[endIndex + i];
+				}
+				result.length -= count;
+			} else {
+				if (endIndex <= result.left.length) {
+					// deletion is only within the left part
+					result.left = result.left.RemoveRange(index, count);
+				} else if (index >= result.left.length) {
+					// deletion is only within the right part
+					result.right = result.right.RemoveRange(index - result.left.length, count);
+				} else {
+					// deletion overlaps both parts
+					int deletionAmountOnLeftSide = result.left.length - index;
+					result.left = result.left.RemoveRange(index, deletionAmountOnLeftSide);
+					result.right = result.right.RemoveRange(0, count - deletionAmountOnLeftSide);
+				}
+				// The deletion might have introduced empty nodes. Those must be removed.
+				if (result.left.length == 0)
+					return result.right;
+				if (result.right.length == 0)
+					return result.left;
+
+				result.length -= count;
+				result.MergeIfPossible();
+				result.Rebalance();
+			}
+			return result;
+		}
+
+		#region Debug Output
+		#if DEBUG
+		internal virtual void AppendTreeToString(StringBuilder b, int indent)
+		{
+			b.AppendLine(ToString());
+			indent += 2;
+			if (left != null) {
+				b.Append(' ', indent);
+				b.Append("L: ");
+				left.AppendTreeToString(b, indent);
+			}
+			if (right != null) {
+				b.Append(' ', indent);
+				b.Append("R: ");
+				right.AppendTreeToString(b, indent);
+			}
+		}
+
+		public override string ToString()
+		{
+			if (contents != null) {
+				char[] charContents = contents as char[];
+				if (charContents != null)
+					return "[Leaf length=" + length + ", isShared=" + isShared + ", text=\"" + new string(charContents, 0, length) + "\"]";
+				else
+					return "[Leaf length=" + length + ", isShared=" + isShared + "\"]";
+			} else {
+				return "[Concat length=" + length + ", isShared=" + isShared + ", height=" + height + ", Balance=" + this.Balance + "]";
+			}
+		}
+
+		internal string GetTreeAsString()
+		{
+			StringBuilder b = new StringBuilder();
+			AppendTreeToString(b, 0);
+			return b.ToString();
+		}
+		#endif
+		#endregion
+
+		/// <summary>
+		/// Gets the root node of the subtree from a lazily evaluated function node.
+		/// Such nodes are always marked as shared.
+		/// GetContentNode() will return either a Concat or Leaf node, never another FunctionNode.
+		/// </summary>
+		internal virtual RopeNode<T> GetContentNode()
+		{
+			throw new InvalidOperationException("Called GetContentNode() on non-FunctionNode.");
+		}
+	}
+
+	sealed class FunctionNode<T> : RopeNode<T>
+	{
+		Func<Rope<T>> initializer;
+		RopeNode<T> cachedResults;
+
+		public FunctionNode(int length, Func<Rope<T>> initializer)
+		{
+			Debug.Assert(length > 0);
+			Debug.Assert(initializer != null);
+
+			this.length = length;
+			this.initializer = initializer;
+			// Function nodes are immediately shared, but cannot be cloned.
+			// This ensures we evaluate every initializer only once.
+			this.isShared = true;
+		}
+
+		internal override RopeNode<T> GetContentNode()
+		{
+			lock (this) {
+				if (this.cachedResults == null) {
+					if (this.initializer == null)
+						throw new InvalidOperationException("Trying to load this node recursively; or: a previous call to a rope initializer failed.");
+					Func<Rope<T>> initializerCopy = this.initializer;
+					this.initializer = null;
+					Rope<T> resultRope = initializerCopy();
+					if (resultRope == null)
+						throw new InvalidOperationException("Rope initializer returned null.");
+					RopeNode<T> resultNode = resultRope.root;
+					resultNode.Publish(); // result is shared between returned rope and the rope containing this function node
+					if (resultNode.length != this.length)
+						throw new InvalidOperationException("Rope initializer returned rope with incorrect length.");
+					if (resultNode.height == 0 && resultNode.contents == null) {
+						// ResultNode is another function node.
+						// We want to guarantee that GetContentNode() never returns function nodes, so we have to
+						// go down further in the tree.
+						this.cachedResults = resultNode.GetContentNode();
+					} else {
+						this.cachedResults = resultNode;
+					}
+				}
+				return this.cachedResults;
+			}
+		}
+
+		#if DEBUG
+		internal override void AppendTreeToString(StringBuilder b, int indent)
+		{
+			RopeNode<T> resultNode;
+			lock (this) {
+				b.AppendLine(ToString());
+				resultNode = cachedResults;
+			}
+			indent += 2;
+			if (resultNode != null) {
+				b.Append(' ', indent);
+				b.Append("C: ");
+				resultNode.AppendTreeToString(b, indent);
+			}
+		}
+
+		public override string ToString()
+		{
+			return "[FunctionNode length=" + length + " initializerRan=" + (initializer == null) + "]";
+		}
+		#endif
+	}
+}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/RopeTextReader.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/RopeTextReader.cs
new file mode 100644
index 0000000000..b6827683db
--- /dev/null
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/RopeTextReader.cs
@@ -0,0 +1,120 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+
+namespace Mono.TextEditor.Utils
+{
+	/// <summary>
+	/// TextReader implementation that reads text from a rope.
+	/// </summary>
+	public sealed class RopeTextReader : TextReader
+	{
+		Stack<RopeNode<char>> stack = new Stack<RopeNode<char>>();
+		RopeNode<char> currentNode;
+		int indexInsideNode;
+
+		/// <summary>
+		/// Creates a new RopeTextReader.
+		/// Internally, this method creates a Clone of the rope; so the text reader will always read through the old
+		/// version of the rope if it is modified. <seealso cref="Rope{T}.Clone()"/>
+		/// </summary>
+		public RopeTextReader(Rope<char> rope)
+		{
+			if (rope == null)
+				throw new ArgumentNullException("rope");
+
+			// We force the user to iterate through a clone of the rope to keep the API contract of RopeTextReader simple
+			// (what happens when a rope is modified while iterating through it?)
+			rope.root.Publish();
+
+			// special case for the empty rope:
+			// leave currentNode initialized to null (RopeTextReader doesn't support empty nodes)
+			if (rope.Length != 0) {
+				currentNode = rope.root;
+				GoToLeftMostLeaf();
+			}
+		}
+
+		void GoToLeftMostLeaf()
+		{
+			while (currentNode.contents == null) {
+				if (currentNode.height == 0) {
+					// this is a function node - move to its contained rope
+					currentNode = currentNode.GetContentNode();
+					continue;
+				}
+				Debug.Assert(currentNode.right != null);
+				stack.Push(currentNode.right);
+				currentNode = currentNode.left;
+			}
+			Debug.Assert(currentNode.height == 0);
+		}
+
+		/// <inheritdoc/>
+		public override int Peek()
+		{
+			if (currentNode == null)
+				return -1;
+			return currentNode.contents[indexInsideNode];
+		}
+
+		/// <inheritdoc/>
+		public override int Read()
+		{
+			if (currentNode == null)
+				return -1;
+			char result = currentNode.contents[indexInsideNode++];
+			if (indexInsideNode >= currentNode.length)
+				GoToNextNode();
+			return result;
+		}
+
+		void GoToNextNode()
+		{
+			if (stack.Count == 0) {
+				currentNode = null;
+			} else {
+				indexInsideNode = 0;
+				currentNode = stack.Pop();
+				GoToLeftMostLeaf();
+			}
+		}
+
+		/// <inheritdoc/>
+		public override int Read(char[] buffer, int index, int count)
+		{
+			if (currentNode == null)
+				return 0;
+			int amountInCurrentNode = currentNode.length - indexInsideNode;
+			if (count < amountInCurrentNode) {
+				Array.Copy(currentNode.contents, indexInsideNode, buffer, index, count);
+				indexInsideNode += count;
+				return count;
+			} else {
+				// read to end of current node
+				Array.Copy(currentNode.contents, indexInsideNode, buffer, index, amountInCurrentNode);
+				GoToNextNode();
+				return amountInCurrentNode;
+			}
+		}
+	}
+}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/TextBreaker.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/TextBreaker.cs
index e96caf39af..4e87370e22 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/TextBreaker.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/TextBreaker.cs
@@ -49,7 +49,7 @@ namespace Mono.TextEditor.Utils
 		/// <param name='lineCount'>
 		/// The number of lines to get words from
 		/// </param>
-		public static List<TextSegment> BreakLinesIntoWords (TextEditor editor, int startLine, int lineCount, bool includeDelimiter = true)
+		public static List<TextSegment> BreakLinesIntoWords (MonoTextEditor editor, int startLine, int lineCount, bool includeDelimiter = true)
 		{
 			return BreakLinesIntoWords (editor.Document, startLine, lineCount, includeDelimiter);
 		}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/NewViEditMode.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/NewViEditMode.cs
index 2527e953bd..e83d383e32 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/NewViEditMode.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/NewViEditMode.cs
@@ -35,7 +35,7 @@ namespace Mono.TextEditor.Vi
 	public class NewViEditMode : EditMode
 	{
 		ViStatusArea statusArea;
-		TextEditor viTextEditor;
+		MonoTextEditor viTextEditor;
 
 		protected ViEditor ViEditor { get ; private set ;}
 
@@ -75,7 +75,7 @@ namespace Mono.TextEditor.Vi
 			}
 		}
 
-		public override void AllocateTextArea (TextEditor textEditor, TextArea textArea, Gdk.Rectangle allocation)
+		public override void AllocateTextArea (MonoTextEditor textEditor, TextArea textArea, Gdk.Rectangle allocation)
 		{
 			statusArea.AllocateArea (textArea, allocation);
 		}
@@ -85,7 +85,7 @@ namespace Mono.TextEditor.Vi
 			ViEditor.ProcessKey (modifier, key, (char)unicodeKey);
 		}
 
-		public new TextEditor Editor { get { return base.Editor; } }
+		public new MonoTextEditor Editor { get { return base.Editor; } }
 		public new TextEditorData Data { get { return base.Data; } }
 
 		public override bool WantsToPreemptIM {
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViEditor.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViEditor.cs
index 83110bd41e..9cd39fdd76 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViEditor.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViEditor.cs
@@ -55,7 +55,7 @@ namespace Mono.TextEditor.Vi
 		Dictionary<char,string> registers = new Dictionary<char,string> ();
 		Dictionary<char,ViMark> marks = new Dictionary<char, ViMark> ();
 		
-		public TextEditor Editor { get { return editMode.Editor; } }
+		public MonoTextEditor Editor { get { return editMode.Editor; } }
 		public TextEditorData Data { get { return editMode.Data; } }
 		public TextDocument Document { get { return Data.Document; } }
 		ViBuilderContext Context { get; set; }
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs
index 9eb1a3164c..83d8caee06 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs
@@ -187,7 +187,7 @@ namespace Mono.TextEditor.Vi
 		}
 
 		ViStatusArea statusArea;
-		TextEditor viTextEditor;
+		MonoTextEditor viTextEditor;
 
 		void CheckVisualMode ()
 		{
@@ -243,7 +243,7 @@ namespace Mono.TextEditor.Vi
 			}
 		}
 
-		public override void AllocateTextArea (TextEditor textEditor, TextArea textArea, Gdk.Rectangle allocation)
+		public override void AllocateTextArea (MonoTextEditor textEditor, TextArea textArea, Gdk.Rectangle allocation)
 		{
 			statusArea.AllocateArea (textArea, allocation);
 		}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViStatusArea.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViStatusArea.cs
index 6c768d7935..3b26ada8e7 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViStatusArea.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViStatusArea.cs
@@ -31,18 +31,18 @@ namespace Mono.TextEditor.Vi
 {
 	class ViStatusArea : Gtk.DrawingArea
 	{
-		TextEditor editor;
+		MonoTextEditor editor;
 		bool showCaret;
 		string statusText;
 
-		public ViStatusArea (TextEditor editor)
+		public ViStatusArea (MonoTextEditor editor)
 		{
 			this.editor = editor;
 			editor.TextViewMargin.CaretBlink += HandleCaretBlink;
 			editor.Caret.PositionChanged += HandlePositionChanged;
 
 			editor.AddTopLevelWidget (this, 0, 0);
-			((TextEditor.EditorContainerChild)editor[this]).FixedPosition = true;
+			((MonoTextEditor.EditorContainerChild)editor[this]).FixedPosition = true;
 			Show ();
 		}
 
@@ -83,7 +83,7 @@ namespace Mono.TextEditor.Vi
 			if (textArea.Allocation != allocation) {
 				textArea.SizeAllocate (allocation);
 				SetSizeRequest (allocation.Width, (int)editor.LineHeight);
-				var pos = ((TextEditor.EditorContainerChild)editor [this]);
+				var pos = ((MonoTextEditor.EditorContainerChild)editor [this]);
 				if (pos.X != 0 || pos.Y != allocation.Height)
 					editor.MoveTopLevelWidget (this, 0, allocation.Height);
 			}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.csproj b/main/src/core/Mono.Texteditor/Mono.TextEditor.csproj
index fde0ebbec9..0f798d61d4 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.csproj
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.csproj
@@ -168,9 +168,7 @@
     <Compile Include="Mono.TextEditor\Document\DocumentLocation.cs" />
     <Compile Include="Mono.TextEditor\Document\DocumentRegion.cs" />
     <Compile Include="Mono.TextEditor\Document\DocumentUpdateRequest.cs" />
-    <Compile Include="Mono.TextEditor\Document\IBuffer.cs" />
     <Compile Include="Mono.TextEditor\Gui\ITooltipProvider.cs" />
-    <Compile Include="Mono.TextEditor\Document\GapBuffer.cs" />
     <Compile Include="Mono.TextEditor\Document\FoldSegment.cs" />
     <Compile Include="Mono.TextEditor\Document\LineEventArgs.cs" />
     <Compile Include="Mono.TextEditor\Document\LineSplitter.cs" />
@@ -183,12 +181,10 @@
     <Compile Include="Mono.TextEditor\Document\PrimitiveLineSplitter.cs" />
     <Compile Include="Mono.TextEditor\Document\IWordFindStrategy.cs" />
     <Compile Include="Mono.TextEditor\Actions\SelectionActions.cs" />
-    <Compile Include="Mono.TextEditor\Document\StringBuffer.cs" />
     <Compile Include="Mono.TextEditor\Document\TextSegment.cs" />
     <Compile Include="Mono.TextEditor\Gui\TextViewMargin.cs" />
     <Compile Include="Mono.TextEditor\Document\SharpDevelopWordFindStrategy.cs" />
     <Compile Include="Mono.TextEditor\Document\EmacsWordFindStrategy.cs" />
-    <Compile Include="Mono.TextEditor\Document\BufferedTextReader.cs" />
     <Compile Include="Mono.TextEditor\Document\SyntaxModeChangeEventArgs.cs" />
     <Compile Include="Mono.TextEditor\Document\DocumentLine.cs" />
     <Compile Include="Mono.TextEditor\Standalone\TextSourceVersionProvider.cs" />
@@ -207,7 +203,6 @@
     <Compile Include="Mono.TextEditor\TextSegmentMarker.cs" />
     <Compile Include="Mono.TextEditor\Gui\FoldMarkerMargin.cs" />
     <Compile Include="Mono.TextEditor\Gui\TextArea.cs" />
-    <Compile Include="Mono.TextEditor\Gui\TextEditor.cs" />
     <Compile Include="Mono.TextEditor\Standalone\StringTextSource.cs" />
     <Compile Include="Mono.TextEditor.Utils\HtmlWriter.cs" />
     <Compile Include="Mono.TextEditor.PopupWindow\WindowTransparencyDecorator.cs" />
@@ -236,6 +231,13 @@
     <Compile Include="Mono.TextEditor\Gui\LayoutCache.cs" />
     <Compile Include="Mono.TextEditor\Gui\GtkUtil.cs" />
     <Compile Include="Mono.TextEditor\EditModeChangedEventArgs.cs" />
+    <Compile Include="Mono.TextEditor.Utils\Rope.cs" />
+    <Compile Include="Mono.TextEditor.Utils\RopeNode.cs" />
+    <Compile Include="Mono.TextEditor.Utils\ImmutableStack.cs" />
+    <Compile Include="Mono.TextEditor.Utils\CharRope.cs" />
+    <Compile Include="Mono.TextEditor.Utils\RopeTextReader.cs" />
+    <Compile Include="Mono.TextEditor\Document\ImmutableLineSplitter.cs" />
+    <Compile Include="Mono.TextEditor\Gui\MonoTextEditor.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Mono.TextEditor.dll.config">
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/DeleteActions.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/DeleteActions.cs
index ce3e4c3b98..1c1cb81ad4 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/DeleteActions.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/DeleteActions.cs
@@ -220,7 +220,35 @@ namespace Mono.TextEditor
 				// Virtual indentation needs to be fixed before to have the same behavior
 				// if it's there or not (otherwise user has to press multiple backspaces in some cases)
 				data.EnsureCaretIsNotVirtual ();
-				DocumentLine line = data.Document.GetLine (data.Caret.Line);
+
+				var line = data.Document.GetLine (data.Caret.Line);
+				// smart backspace (delete indentation)
+				if (data.Options.IndentStyle == IndentStyle.Smart || data.Options.IndentStyle == IndentStyle.Virtual) {
+					if (data.Caret.Column == data.GetVirtualIndentationColumn (data.Caret.Location)) {
+						bool isAllIndent = line.GetIndentation (data.Document).Length == data.Caret.Column - 1;
+
+						if (isAllIndent) {
+							var prevLine = line.PreviousLine;
+							var prevLineIsEmpty = prevLine != null && prevLine.Length == 0;
+
+							var startOffset = prevLine != null ? prevLine.EndOffset : 0;
+							data.Remove (startOffset, data.Caret.Offset - startOffset);
+							if (prevLine != null) {
+								if (prevLineIsEmpty) {
+									if (line.Length - data.Caret.Column - 1 > 0 && data.HasIndentationTracker) {
+										data.InsertAtCaret (data.IndentationTracker.GetIndentationString (data.Caret.Offset));
+									} else {
+										data.Caret.Column = data.GetVirtualIndentationColumn (prevLine.Offset);
+									}
+								}
+								data.FixVirtualIndentation ();
+							}
+							return;
+						}
+					}
+				}
+
+				// normal backspace.
 				if (data.Caret.Column > line.Length + 1) {
 					data.Caret.Column = line.Length + 1;
 				} else if (data.Caret.Offset == line.Offset) {
@@ -287,7 +315,21 @@ namespace Mono.TextEditor
 				DocumentLine line = data.Document.GetLine (data.Caret.Line);
 				if (data.Caret.Column == line.Length + 1) {
 					if (data.Caret.Line < data.Document.LineCount) { 
-						data.Remove (line.EndOffsetIncludingDelimiter - line.DelimiterLength, line.DelimiterLength);
+						var deletionLength = line.DelimiterLength;
+						// smart backspace (delete indentation)
+						if (data.Options.IndentStyle == IndentStyle.Smart || data.Options.IndentStyle == IndentStyle.Virtual) {
+							var next = line.NextLine;
+							if (next != null) {
+								if (data.HasIndentationTracker) {
+									var lineIndentation = next.GetIndentation (data.Document);
+									if (lineIndentation.StartsWith (data.IndentationTracker.GetIndentationString (next.Offset))) {
+										deletionLength += lineIndentation.Length;
+									}
+								}
+							}
+						} 
+
+						data.Remove (line.EndOffsetIncludingDelimiter - line.DelimiterLength, deletionLength);
 						if (line.EndOffsetIncludingDelimiter == data.Document.TextLength)
 							line.UnicodeNewline = UnicodeNewline.Unknown;
 					}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/MiscActions.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/MiscActions.cs
index 8a42f8b0a0..37b5dd2c81 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/MiscActions.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/MiscActions.cs
@@ -272,9 +272,11 @@ namespace Mono.TextEditor
 					break;
 				case IndentStyle.Auto:
 					data.EnsureCaretIsNotVirtual ();
-					var sb = new StringBuilder (data.EolMarker);
-					sb.Append (data.Document.GetLineIndent (data.Caret.Line));
-					data.InsertAtCaret (sb.ToString ());
+					var indent = data.Document.GetLineIndent (data.Caret.Line);
+					data.InsertAtCaret (data.EolMarker);
+					data.EnsureCaretIsNotVirtual ();
+					if (data.GetLine (data.Caret.Line).Length == 0)
+						data.InsertAtCaret (indent);
 					break;
 				case IndentStyle.Smart:
 					if (!data.HasIndentationTracker)
@@ -511,59 +513,5 @@ namespace Mono.TextEditor
 			}
 		}
 
-		public static void SortSelectedLines (TextEditorData data)
-		{
-			var start = data.MainSelection.Start;
-			var end = data.MainSelection.End;
-			var caret = data.Caret.Location;
-
-			int startLine = start.Line;
-			int endLine = end.Line;
-			if (startLine == endLine)
-				return;
-
-			int length = 0;
-			var lines = new string[endLine - startLine + 1];
-			for (int i = startLine; i <= endLine; i++) {
-				//get lines *with* line endings
-				var lineText = data.GetLineText (i, true);
-				lines [i - startLine] = lineText;
-				length += lineText.Length;
-			}
-
-			var linesUnsorted = new string[lines.Length];
-
-			Array.Sort (lines, StringComparer.Ordinal);
-
-			bool changed = false;
-			for (int i = 0; i <= lines.Length; i++) {
-				//can't simply use reference comparison as Array.Sort is not stable
-				if (string.Equals (lines [i], linesUnsorted [i], StringComparison.Ordinal)) {
-					continue;
-				}
-				changed = true;
-				break;
-			}
-			if (!changed) {
-				return;
-			}
-
-
-			var sb = new StringBuilder ();
-			for (int i = 0; i < lines.Length; i++) {
-				sb.Append (lines [i]);
-			}
-
-			var startOffset = data.Document.LocationToOffset (new TextLocation (startLine, 0));
-			data.Replace (startOffset, length, sb.ToString ());
-
-			data.Caret.Location = LimitColumn (data, caret);
-			data.SetSelection (LimitColumn (data, start), LimitColumn (data, end));
-		}
-
-		static DocumentLocation LimitColumn (TextEditorData data, DocumentLocation loc)
-		{
-			return new DocumentLocation (loc.Line, System.Math.Min (loc.Column, data.GetLine (loc.Line).Length + 1));
-		}
 	}
 }
\ No newline at end of file
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/BookmarkMarker.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/BookmarkMarker.cs
index c40ea22edf..63e525d6d5 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/BookmarkMarker.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/BookmarkMarker.cs
@@ -49,14 +49,14 @@ namespace Mono.TextEditor
 			return margin is IconMargin;
 		}
 
-		public override void DrawForeground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		public override void DrawForeground (MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 			DrawBookmarkFunc (editor, cr, LineSegment, metrics.X, metrics.Y, metrics.Width, metrics.Height);
 		}
 
-		public static Action<TextEditor, Cairo.Context, DocumentLine, double, double, double, double> DrawBookmarkFunc = DrawIcon;
+		public static Action<MonoTextEditor, Cairo.Context, DocumentLine, double, double, double, double> DrawBookmarkFunc = DrawIcon;
 
-		static void DrawIcon (TextEditor editor, Cairo.Context cr, DocumentLine lineSegment, double x, double y, double width, double height)
+		static void DrawIcon (MonoTextEditor editor, Cairo.Context cr, DocumentLine lineSegment, double x, double y, double width, double height)
 		{
 			if (lineSegment.IsBookmarked) {
 				var color1 = editor.ColorStyle.Bookmarks.Color;
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/BufferedTextReader.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/BufferedTextReader.cs
deleted file mode 100644
index 77340951be..0000000000
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/BufferedTextReader.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// BufferedTextReader.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-namespace Mono.TextEditor
-{
-	/// <summary>
-	/// Wraps the IBuffer interface to a System.IO.TextReader model.
-	/// </summary>
-	class BufferedTextReader : System.IO.TextReader
-	{
-		int position = 0;
-		IBuffer buffer;
-		
-		public BufferedTextReader (IBuffer buffer)
-		{
-			this.buffer = buffer;
-		}
-		
-		protected override void Dispose (bool disposing)
-		{
-			if (disposing)
-				buffer = null;
-		}
-		
-		public override void Close ()
-		{
-			Dispose ();
-		}
-		
-		public override int Peek ()
-		{
-			if (position < 0 || position >= buffer.TextLength)
-				return -1;
-			return buffer.GetCharAt (position);
-		}
-		
-		public override int Read ()
-		{
-			if (position < 0 || position >= buffer.TextLength)
-				return -1;
-			return buffer.GetCharAt (position++);
-		}
-		
-		public override int Read (char[] buffer, int index, int count)
-		{
-			if (buffer == null)
-				throw new ArgumentNullException ();
-			int lastOffset = System.Math.Min (this.buffer.TextLength, position + count);
-			int length = lastOffset - position;
-			if (length <= 0)
-				return 0;
-			string text = this.buffer.GetTextAt (position, length);
-			text.CopyTo (0, buffer, index, length);
-			position += length;
-			return length;
-		}
-		
-		public override string ReadToEnd ()
-		{
-			if (position < 0 || position >= buffer.TextLength)
-				return "";
-			string result = this.buffer.GetTextAt (position, buffer.TextLength - position);
-			position = buffer.TextLength;
-			return result;
-		}
-	}
-}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/DiffTracker.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/DiffTracker.cs
index 1b56c0130f..1c8a1e190a 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/DiffTracker.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/DiffTracker.cs
@@ -46,7 +46,7 @@ namespace Mono.TextEditor
 
 		public Mono.TextEditor.TextDocument.LineState GetLineState (DocumentLine line)
 		{
-			if (line != null) {
+			if (line != null && lineStates != null) {
 				try {
 					var info = lineStates [line.LineNumber];
 					if (info != null) {
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/DocumentUpdateRequest.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/DocumentUpdateRequest.cs
index bf4ce8f02d..baa5551ec1 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/DocumentUpdateRequest.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/DocumentUpdateRequest.cs
@@ -29,7 +29,7 @@ namespace Mono.TextEditor
 {
 	public abstract class DocumentUpdateRequest
 	{
-		public abstract void Update (TextEditor editor);
+		public abstract void Update (MonoTextEditor editor);
 	}
 	
 	public class SinglePositionUpdate : DocumentUpdateRequest
@@ -42,7 +42,7 @@ namespace Mono.TextEditor
 			this.column = column;
 		}
 		
-		public override void Update (TextEditor editor)
+		public override void Update (MonoTextEditor editor)
 		{
 			editor.RedrawPosition (line, column);
 		}
@@ -50,7 +50,7 @@ namespace Mono.TextEditor
 	
 	public class UpdateAll : DocumentUpdateRequest
 	{
-		public override void Update (TextEditor editor)
+		public override void Update (MonoTextEditor editor)
 		{
 			editor.QueueDraw ();
 		}
@@ -65,7 +65,7 @@ namespace Mono.TextEditor
 			this.line = line;
 		}
 		
-		public override void Update (TextEditor editor)
+		public override void Update (MonoTextEditor editor)
 		{
 			editor.RedrawLine (line);
 		}
@@ -81,7 +81,7 @@ namespace Mono.TextEditor
 			this.end   = end;
 		}
 		
-		public override void Update (TextEditor editor)
+		public override void Update (MonoTextEditor editor)
 		{
 			editor.TextViewMargin.PurgeLayoutCache ();
 			editor.RedrawLines (start, end);
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/GapBuffer.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/GapBuffer.cs
deleted file mode 100644
index 7ba81771aa..0000000000
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/GapBuffer.cs
+++ /dev/null
@@ -1,599 +0,0 @@
-// GapBuffer.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using System.Text;
-using System.Collections.Generic;
-
-namespace Mono.TextEditor
-{
-	public sealed class GapBuffer : IBuffer
-	{
-		char[] buffer = new char[0];
-		
-		int gapBegin  = 0;
-		int gapEnd    = 0;
-		int gapLength = 0;
-		
-		const int minGapLength = 4 * 1024;
-		const int maxGapLength = 32 * 1024;
-		
-		public int TextLength {
-			get {
-				return buffer.Length - gapLength;
-			}
-		}
-		
-		public void Insert (int offset, string text)
-		{
-			Replace (offset, 0, text);
-		}
-		
-		public void Remove (int offset, int count)
-		{
-			Replace (offset, count, null);
-		}
-		
-		public void Remove (TextSegment segment)
-		{
-			Remove (segment.Offset, segment.Length);
-		}
-		
-		public string GetTextAt (TextSegment segment)
-		{
-			return GetTextAt (segment.Offset, segment.Length);
-		}
-		
-		public string Text {
-			get {
-				return GetTextAt (0, TextLength);
-			}
-			set {
-				buffer = value != null ? value.ToCharArray () : new char[0];
-				gapBegin = gapEnd = gapLength = 0;
-			}
-		}
-		
-		public char GetCharAt (int offset)
-		{
-			return buffer[offset < gapBegin ? offset : offset + gapLength];
-		}
-		
-		public string GetTextAt (int offset, int count)
-		{
-			int end = offset + count;
-			if (end < gapBegin) 
-				return new string (buffer, offset, count);
-			if (offset > gapBegin) 
-				return new string (buffer, offset + gapLength, count);
-		
-			int leftBlockSize = gapBegin - offset;
-			int rightBlockSize = end - gapBegin;
-			char[] result = new char [leftBlockSize + rightBlockSize];
-			Array.Copy (buffer, offset, result, 0, leftBlockSize);
-			Array.Copy (buffer, gapEnd, result, leftBlockSize, rightBlockSize);
-			return new string (result);
-		}
-		
-		public void Replace (int offset, int count, string text)
-		{
-			if (!string.IsNullOrEmpty (text)) { 
-				PlaceGap (offset, text.Length - count);
-				text.CopyTo (0, buffer, offset, text.Length);
-				gapBegin += text.Length;
-			} else {
-				PlaceGap (offset, 0);
-			}
-			gapEnd   += count; 
-			gapLength = gapEnd - gapBegin;
-			if (gapLength > maxGapLength) 
-				CreateBuffer (gapBegin, minGapLength);
-		}
-		
-		void PlaceGap (int newOffset, int minLength)
-		{
-			if (gapLength < minLength) {
-				if (minLength < maxGapLength) {
-					CreateBuffer (newOffset, minLength + (maxGapLength - minLength) / 2);
-				} else {
-					CreateBuffer (newOffset, minLength + minGapLength);
-				}
-				return;
-			}
-			
-			int delta = gapBegin - newOffset;
-			if (delta > 0) {
-				Array.Copy (buffer, newOffset, buffer, gapEnd - delta, delta);
-			} else {
-				Array.Copy (buffer, gapEnd, buffer, gapBegin, -delta);
-			}
-			gapBegin -= delta;
-			gapEnd   -= delta;
-		}
-		
-		void CreateBuffer (int gapOffset, int gapLength)
-		{
-			gapLength = System.Math.Max (minGapLength, gapLength);
-			
-			char[] newBuffer = new char[TextLength + gapLength];
-			if (gapOffset < gapBegin) {
-				Array.Copy (buffer, 0, newBuffer, 0, gapOffset);
-				Array.Copy (buffer, gapOffset, newBuffer, gapOffset + gapLength, gapBegin - gapOffset);
-				Array.Copy (buffer, gapEnd, newBuffer, newBuffer.Length - (buffer.Length - gapEnd), buffer.Length - gapEnd);
-			} else {
-				Array.Copy (buffer, 0, newBuffer, 0, gapBegin);
-				Array.Copy (buffer, gapEnd, newBuffer, gapBegin, gapOffset - gapBegin);
-				int lastPartLength = newBuffer.Length - (gapOffset + gapLength);
-				Array.Copy (buffer, buffer.Length - lastPartLength, newBuffer, gapOffset + gapLength, lastPartLength);
-			}
-			
-			gapBegin = gapOffset;
-			gapEnd = gapOffset + gapLength;
-			this.gapLength = gapLength;
-			buffer = newBuffer;
-		}
-
-
-		// TODO: Optimize!
-		int IBuffer.IndexOf (char c, int startIndex, int count)
-		{
-			return Text.IndexOf (c, startIndex, count);
-		}
-
-		int IBuffer.IndexOfAny (char[] anyOf, int startIndex, int count)
-		{
-			return Text.IndexOfAny (anyOf, startIndex, count);
-		}
-
-		public int IndexOf (string searchText, int startIndex, int count, StringComparison comparisonType)
-		{
-			return Text.IndexOf (searchText, startIndex, count, comparisonType);
-		}
-
-		int IBuffer.LastIndexOf (char c, int startIndex, int count)
-		{
-			return Text.LastIndexOf (c, startIndex, count);
-		}
-
-		public int LastIndexOf (string searchText, int startIndex, int count, StringComparison comparisonType)
-		{
-			return Text.LastIndexOf (searchText, startIndex, count, comparisonType);
-		}
-		
-//		#region Search
-//		unsafe int SearchForwardInternal (string pattern, int startIndex)
-//		{
-//			if (startIndex > gapBegin)
-//				startIndex += gapLength;
-//			
-//			int valueLen = pattern.Length;
-//			if (startIndex >= buffer.Length - valueLen + 1)
-//				return -1;
-//			
-//			fixed (char* bufferPtr = buffer, patternPtr = pattern) {
-//				char* ap = bufferPtr + startIndex;
-//				char* bufferPhysEnd = bufferPtr + buffer.Length;
-//				char* bufferEnd = bufferPhysEnd - valueLen + 1;
-//				char* gapBeginPtr = bufferPtr + gapBegin;
-//				char* gapEndPtr = bufferPtr + gapEnd;
-//				char* stopGap = gapBeginPtr - valueLen + 1;
-//				char* patternPos1Ptr = patternPtr + 1;
-//				char* patternEndPtr = patternPtr + valueLen;
-//				char p0 = *patternPtr;
-//				
-//				if (ap < gapBeginPtr) {
-//					if (stopGap > bufferPtr) {
-//						while (ap < stopGap) {
-//							if (*ap == p0) {
-//								char* p = ap + 1;
-//								char* v = patternPos1Ptr;
-//								while (v < patternEndPtr) {
-//									if (*p != *v)
-//										goto NextVal;
-//									v++;
-//									p++;
-//								}
-//								return (int)(ap - bufferPtr);
-//							}
-//							NextVal:
-//							ap++;
-//						}
-//					}
-//					
-//					while (ap != gapBeginPtr) {
-//						if (*ap == p0) {
-//							char* p = ap + 1;
-//							char* v = patternPos1Ptr;
-//							while (v < patternEndPtr) {
-//								if (*p != *v)
-//									goto NextVal;
-//								v++;
-//								p++;
-//								if (p == gapBeginPtr)
-//									p = gapEndPtr;
-//							}
-//							return (int)(ap - bufferPtr);
-//						}
-//						NextVal:
-//						ap++;
-//					}
-//				}
-//				
-//				if (ap < gapEndPtr)
-//					ap = gapEndPtr;
-//				if (ap < bufferEnd) {
-//					while (ap != bufferEnd) {
-//						if (*ap == p0) {
-//							char* p = ap + 1;
-//							char* v = patternPos1Ptr;
-//							while (v < patternEndPtr) {
-//								if (*p != *v)
-//									goto NextVal;
-//								v++;
-//								p++;
-//							}
-//							return (int)(ap - gapLength - bufferPtr);
-//						}
-//						NextVal:
-//						ap++;
-//					}
-//				}
-//			}
-//			return -1;
-//		}
-//		
-//		unsafe int SearchForwardInternalIgnoreCase (string pattern, int startIndex)
-//		{
-//			if (startIndex > gapBegin)
-//				startIndex += gapLength;
-//			
-//			int valueLen = pattern.Length;
-//			if (startIndex >= buffer.Length - valueLen + 1)
-//				return -1;
-//			
-//			fixed (char* bufferPtr = buffer, patternPtr = pattern) {
-//				char* ap = bufferPtr + startIndex;
-//				char* bufferPhysEnd = bufferPtr + buffer.Length;
-//				char* bufferEnd = bufferPhysEnd - valueLen + 1;
-//				char* gapBeginPtr = bufferPtr + gapBegin;
-//				char* gapEndPtr = bufferPtr + gapEnd;
-//				char* stopGap = gapBeginPtr - valueLen + 1;
-//				char* patternPos1Ptr = patternPtr + 1;
-//				char* patternEndPtr = patternPtr + valueLen;
-//				char p0 = *patternPtr;
-//				
-//				if (ap < gapBeginPtr) {
-//					if (stopGap > bufferPtr) {
-//						while (ap < stopGap) {
-//							if (char.ToUpper (*ap) == p0) {
-//								char* p = ap + 1;
-//								char* v = patternPos1Ptr;
-//								while (v < patternEndPtr) {
-//									if (char.ToUpper (*p) != *v)
-//										goto NextVal;
-//									v++;
-//									p++;
-//								}
-//								return (int)(ap - bufferPtr);
-//							}
-//							NextVal:
-//							ap++;
-//						}
-//					}
-//					
-//					while (ap != gapBeginPtr) {
-//						if (char.ToUpper (*ap) == p0) {
-//							char* p = ap + 1;
-//							char* v = patternPos1Ptr;
-//							while (v < patternEndPtr) {
-//								if (char.ToUpper (*p) != *v)
-//									goto NextVal;
-//								v++;
-//								p++;
-//								if (p == gapBeginPtr)
-//									p = gapEndPtr;
-//							}
-//							return (int)(ap - bufferPtr);
-//						}
-//						NextVal:
-//						ap++;
-//					}
-//				}
-//				
-//				if (ap < gapEndPtr)
-//					ap = gapEndPtr;
-//				if (ap < bufferEnd) {
-//					while (ap != bufferEnd) {
-//						if (char.ToUpper (*ap) == p0) {
-//							char* p = ap + 1;
-//							char* v = patternPos1Ptr;
-//							while (v < patternEndPtr) {
-//								if (char.ToUpper (*p) != *v)
-//									goto NextVal;
-//								v++;
-//								p++;
-//							}
-//							return (int)(ap - gapLength - bufferPtr);
-//						}
-//						NextVal:
-//						ap++;
-//					}
-//				}
-//			}
-//			return -1;
-//		}
-//		
-//		public IEnumerable<int> SearchForward (string pattern, int startIndex)
-//		{
-//			int idx = startIndex;
-//			while ((idx = SearchForwardInternal (pattern, idx)) != -1) {
-//				yield return idx;
-//				idx += pattern.Length;
-//			}
-//		}
-//		
-//		public IEnumerable<int> SearchForwardIgnoreCase (string pattern, int startIndex)
-//		{
-//			pattern = pattern.ToUpper ();
-//			int idx = startIndex;
-//			while ((idx = SearchForwardInternalIgnoreCase (pattern, idx)) != -1) {
-//				yield return idx;
-//				idx += pattern.Length;
-//			}
-//		}
-//		
-//		unsafe int SearchBackwardInternal (string pattern, int startIndex)
-//		{
-//			int valueLen = pattern.Length;
-//			if (startIndex < valueLen - 1)
-//				return -1;
-//			if (startIndex > gapBegin)
-//				startIndex += gapLength;
-//			fixed (char* bufferPtr = buffer, patternPtr = pattern) {
-//				char* ap = bufferPtr + startIndex;
-//				char* bufferEnd = bufferPtr + valueLen - 1;
-//				
-//				char* bufferPhysEnd = bufferPtr + buffer.Length;
-//				char* gapBeginPtr = bufferPtr + gapBegin;
-//				char* gapEndPtr = bufferPtr + gapEnd;
-//				char* stopGap = gapEndPtr + valueLen - 1;
-//				char* patternPos1Ptr = patternPtr + valueLen - 2;
-//				char* patternEndPtr = patternPtr - 1;
-//				char p0 = *(patternPtr + valueLen - 1);
-//				
-//				if (ap >= gapEndPtr) {
-//					if (stopGap < bufferPhysEnd) {
-//						while (ap >= stopGap) {
-//							if (*ap == p0) {
-//								char* p = ap - 1;
-//								char* v = patternPos1Ptr;
-//								while (v > patternEndPtr) {
-//									if (*p != *v)
-//										goto NextVal;
-//									v--;
-//									p--;
-//								}
-//								return (int)(p - gapLength - bufferPtr + 1);
-//							}
-//							NextVal:
-//							ap--;
-//						}
-//					}
-//					
-//					while (ap >= gapEndPtr) {
-//						if (*ap == p0) {
-//							char* p = ap - 1;
-//							char* v = patternPos1Ptr;
-//							while (v > patternEndPtr) {
-//								if (*p != *v)
-//									goto NextVal;
-//								v--;
-//								if (p == gapEndPtr) {
-//									p = gapBeginPtr - 1;
-//								} else {
-//									p--;
-//								}
-//							}
-//							if (p >= gapEndPtr)
-//								return (int)(p - gapLength - bufferPtr + 1);
-//							return (int)(p - bufferPtr + 1);
-//						}
-//						NextVal:
-//						ap--;
-//					}
-//				}
-//				
-//				while (ap >= bufferEnd) {
-//					if (*ap == p0) {
-//						char* p = ap - 1;
-//						char* v = patternPos1Ptr;
-//						while (v > patternEndPtr) {
-//							if (*p != *v)
-//								goto NextVal;
-//							v--;
-//							p--;
-//						}
-//						return (int)(p - bufferPtr + 1);
-//					}
-//					NextVal:
-//					ap--;
-//				}
-//			}
-//			return -1;
-//		}
-//		
-//		unsafe int SearchBackwardInternalIgnoreCase (string pattern, int startIndex)
-//		{
-//			int valueLen = pattern.Length;
-//			if (startIndex < valueLen - 1)
-//				return -1;
-//			if (startIndex > gapBegin)
-//				startIndex += gapLength;
-//			
-//			fixed (char* bufferPtr = buffer, patternPtr = pattern) {
-//				char* ap = bufferPtr + startIndex;
-//				char* bufferEnd = bufferPtr + valueLen - 1;
-//				
-//				char* bufferPhysEnd = bufferPtr + buffer.Length;
-//				char* gapBeginPtr = bufferPtr + gapBegin;
-//				char* gapEndPtr = bufferPtr + gapEnd;
-//				char* stopGap = gapEndPtr + valueLen - 1;
-//				char* patternPos1Ptr = patternPtr + valueLen - 2;
-//				char* patternEndPtr = patternPtr - 1;
-//				char p0 = *(patternPtr + valueLen - 1);
-//				
-//				if (ap >= gapEndPtr) {
-//					if (stopGap < bufferPhysEnd) {
-//						while (ap >= stopGap) {
-//							if (char.ToUpper (*ap) == p0) {
-//								char* p = ap - 1;
-//								char* v = patternPos1Ptr;
-//								while (v > patternEndPtr) {
-//									if (char.ToUpper (*p) != *v)
-//										goto NextVal;
-//									v--;
-//									p--;
-//								}
-//								return (int)(p - gapLength - bufferPtr + 1);
-//							}
-//							NextVal:
-//							ap--;
-//						}
-//					}
-//					
-//					while (ap >= gapEndPtr) {
-//						if (char.ToUpper (*ap) == p0) {
-//							char* p = ap - 1;
-//							char* v = patternPos1Ptr;
-//							while (v > patternEndPtr) {
-//								if (char.ToUpper (*p) != *v)
-//									goto NextVal;
-//								v--;
-//								if (p == gapEndPtr) {
-//									p = gapBeginPtr - 1;
-//								} else {
-//									p--;
-//								}
-//							}
-//							if (p >= gapEndPtr)
-//								return (int)(p - gapLength - bufferPtr + 1);
-//							return (int)(p - bufferPtr + 1);
-//						}
-//						NextVal:
-//						ap--;
-//					}
-//				}
-//				while (ap >= bufferEnd) {
-//					if (char.ToUpper (*ap) == p0) {
-//						char* p = ap - 1;
-//						char* v = patternPos1Ptr;
-//						while (v > patternEndPtr) {
-//							if (char.ToUpper (*p) != *v)
-//								goto NextVal;
-//							v--;
-//							p--;
-//						}
-//						return (int)(p - bufferPtr + 1);
-//					}
-//					NextVal:
-//					ap--;
-//				}
-//			}
-//			return -1;
-//		}
-//		
-//		public IEnumerable<int> SearchBackward (string pattern, int startIndex)
-//		{
-//			int idx = startIndex;
-//			while ((idx = SearchBackwardInternal (pattern, idx)) != -1) {
-//				yield return idx;
-//				idx -= pattern.Length;
-//			}
-//		}
-//		
-//		public IEnumerable<int> SearchBackwardIgnoreCase (string pattern, int startIndex)
-//		{
-//			pattern = pattern.ToUpper ();
-//			int idx = startIndex;
-//			while ((idx = SearchBackwardInternalIgnoreCase (pattern, idx)) != -1) {
-//				yield return idx;
-//				idx -= pattern.Length;
-//			}
-//		}
-//		
-//		/* Boyer-Moore-Horspool-Raita implementation: (but on Intel Core i brute force outpeforms it.
-//
-//	static int[] ProcessString (string pattern)
-//	{
-//		var result = new int[char.MaxValue];
-//		for (int i = 0; i < result.Length; i++)
-//			result[i] = pattern.Length - 1;
-//		for (int i = 0; i < pattern.Length - 1; ++i) {
-//			result[pattern[i]] = pattern.Length - i - 1;
-//		}
-//		return result;
-//	}
-//	unsafe static int bmhrSearchBytes (string text, string pattern, int textStart, int[] b)
-//	{
-//		int lastIndex = text.Length + pattern.Length - 1;
-//		if (textStart >= lastIndex)
-//			return -1;
-//		
-//		int m = pattern.Length - 1;
-//		int mMinusOne = pattern.Length - 2;
-//		
-//		var last = pattern[pattern.Length - 1];
-//		var first = pattern[0];
-//		
-//		fixed (char* textPtr = text, pattenrPtr = pattern) {
-//			char* i = textPtr + textStart + pattern.Length - 1;
-//			char* endText = textPtr + lastIndex;
-//			while (i < endText) {
-//				if (*i == last) {
-//					//if (*(i - m) == first) {
-//						char* k = i - 1;
-//						char* pp = pattenrPtr + mMinusOne;
-//						
-//						while (pp >= pattenrPtr && *k == *pp) {
-//							--k;
-//							--pp;
-//						}
-//						
-//						if (pp < pattenrPtr)
-//							return (int)(k - textPtr) + 1;
-//				//	}
-//				}
-//				i += b[*i];
-//			}
-//		}
-//		return -1;
-//	}
-//			 * */
-//		#endregion
-		
-	}
-}
\ No newline at end of file
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/IBuffer.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/IBuffer.cs
deleted file mode 100644
index 0cfffef74e..0000000000
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/IBuffer.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// IBuffer.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Mono.TextEditor
-{
-	public interface IBuffer
-	{
-		/// <summary>
-		/// Gets the total text length.
-		/// </summary>
-		/// <returns>The length of the text, in characters.</returns>
-		/// <remarks>This is the same as Text.Length, but is more efficient because
-		///  it doesn't require creating a String object.</remarks>
-		int TextLength {
-			get;
-		}
-		
-		/// <summary>
-		/// Gets the whole text as string.
-		/// </summary>
-		string Text {
-			get;
-			set;
-		}
-
-		/// <summary>
-		/// Replaces text.
-		/// </summary>
-		/// <param name="offset">The starting offset of the text to be replaced.</param>
-		/// <param name="count">The length of the text to be replaced.</param>
-		/// <param name="value">The new text.</param>
-		void Replace (int offset, int count, string value);
-		
-		/// <summary>
-		/// Retrieves the text for a portion of the document.
-		/// </summary>
-		/// <exception cref="ArgumentOutOfRangeException">offset or length is outside the valid range.</exception>
-		/// <remarks>This is the same as Text.Substring, but is more efficient because
-		///  it doesn't require creating a String object for the whole document.</remarks>
-		string GetTextAt (int offset, int count);
-		
-		/// <summary>
-		/// Gets a character at the specified position in the document.
-		/// </summary>
-		/// <paramref name="offset">The index of the character to get.</paramref>
-		/// <exception cref="ArgumentOutOfRangeException">Offset is outside the valid range (0 to TextLength-1).</exception>
-		/// <returns>The character at the specified position.</returns>
-		/// <remarks>This is the same as Text[offset], but is more efficient because
-		///  it doesn't require creating a String object.</remarks>
-		char GetCharAt (int offset);
-		
-		/// <summary>
-		/// Gets the index of the first occurrence of the character in the specified array.
-		/// </summary>
-		/// <param name="c">Character to search for</param>
-		/// <param name="startIndex">Start index of the area to search.</param>
-		/// <param name="count">Length of the area to search.</param>
-		/// <returns>The first index where the character was found; or -1 if no occurrence was found.</returns>
-		int IndexOf (char c, int startIndex, int count);
-
-		/// <summary>
-		/// Gets the index of the first occurrence of any character in the specified array.
-		/// </summary>
-		/// <param name="anyOf">Characters to search for</param>
-		/// <param name="startIndex">Start index of the area to search.</param>
-		/// <param name="count">Length of the area to search.</param>
-		/// <returns>The first index where any character was found; or -1 if no occurrence was found.</returns>
-		int IndexOfAny (char[] anyOf, int startIndex, int count);
-		
-		/// <summary>
-		/// Gets the index of the first occurrence of the specified search text in this text source.
-		/// </summary>
-		/// <param name="searchText">The search text</param>
-		/// <param name="startIndex">Start index of the area to search.</param>
-		/// <param name="count">Length of the area to search.</param>
-		/// <param name="comparisonType">String comparison to use.</param>
-		/// <returns>The first index where the search term was found; or -1 if no occurrence was found.</returns>
-		int IndexOf (string searchText, int startIndex, int count, StringComparison comparisonType);
-		
-		/// <summary>
-		/// Gets the index of the last occurrence of the specified character in this text source.
-		/// </summary>
-		/// <param name="c">The search character</param>
-		/// <param name="startIndex">Start index of the area to search.</param>
-		/// <param name="count">Length of the area to search.</param>
-		/// <returns>The last index where the search term was found; or -1 if no occurrence was found.</returns>
-		/// <remarks>The search proceeds backwards from (startIndex+count) to startIndex.
-		/// This is different than the meaning of the parameters on string.LastIndexOf!</remarks>
-		int LastIndexOf (char c, int startIndex, int count);
-		
-		/// <summary>
-		/// Gets the index of the last occurrence of the specified search text in this text source.
-		/// </summary>
-		/// <param name="searchText">The search text</param>
-		/// <param name="startIndex">Start index of the area to search.</param>
-		/// <param name="count">Length of the area to search.</param>
-		/// <param name="comparisonType">String comparison to use.</param>
-		/// <returns>The last index where the search term was found; or -1 if no occurrence was found.</returns>
-		/// <remarks>The search proceeds backwards from (startIndex+count) to startIndex.
-		/// This is different than the meaning of the parameters on string.LastIndexOf!</remarks>
-		int LastIndexOf (string searchText, int startIndex, int count, StringComparison comparisonType);
-	}
-}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/ImmutableLineSplitter.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/ImmutableLineSplitter.cs
new file mode 100644
index 0000000000..a2d65da072
--- /dev/null
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/ImmutableLineSplitter.cs
@@ -0,0 +1,179 @@
+//
+// ImmutableLineSplitter.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory;
+using System.Collections.Generic;
+
+namespace Mono.TextEditor
+{
+	class ImmutableLineSplitter : ILineSplitter
+	{
+		readonly LineSegment[] lines;
+
+		sealed class LineSegment : DocumentLine
+		{
+			readonly ImmutableLineSplitter splitter;
+			readonly int lineNumber;
+
+			public override int Offset { get; set; }
+
+			public override int LineNumber {
+				get {
+					return lineNumber + 1;
+				}
+			}
+
+			public override DocumentLine NextLine {
+				get {
+					return splitter.Get (lineNumber + 1);
+				}
+			}
+
+			public override DocumentLine PreviousLine {
+				get {
+					return splitter.Get (lineNumber - 1);
+				}
+			}
+
+			public LineSegment (ImmutableLineSplitter splitter, int lineNumber, int offset, int length, UnicodeNewline newLine) : base(length, newLine)
+			{
+				this.splitter = splitter;
+				this.lineNumber = lineNumber;
+				Offset = offset;
+			}
+		}
+
+		public ImmutableLineSplitter (ILineSplitter src)
+		{
+			if (src == null)
+				throw new ArgumentNullException ("src");
+			lines = new LineSegment[src.Count];
+			int cur = 0;
+			foreach (var line in src.Lines) {
+				lines [cur] = new LineSegment (this, cur, line.Offset, line.LengthIncludingDelimiter, line.UnicodeNewline);
+				cur++;
+			}
+		}
+
+		#region ILineSplitter implementation
+
+		public event EventHandler<LineEventArgs> LineChanged;
+
+		public event EventHandler<LineEventArgs> LineInserted;
+
+		public event EventHandler<LineEventArgs> LineRemoved;
+
+		public void Clear ()
+		{
+		}
+
+		public void Initalize (string text, out DocumentLine longestLine)
+		{
+			longestLine = null;
+		}
+
+		public DocumentLine Get (int number)
+		{
+			return lines [number - 1];
+		}
+
+		public DocumentLine GetLineByOffset (int offset)
+		{
+			return lines [OffsetToLineNumber (offset) - 1];
+		}
+
+		public int OffsetToLineNumber (int offset)
+		{
+			int min = 0;
+			int max = lines.Length - 1;
+			while (min <= max) {
+				int mid = (min + max) / 2;
+				var middleLine = lines [mid];
+				if (offset < middleLine.Offset) {
+					max = mid - 1;
+				} else if (offset > middleLine.EndOffset) {
+					min = mid + 1;
+				} else {
+					return mid + 1;
+				}
+			}
+			return lines.Length;
+		}
+
+		public void TextReplaced (object sender, DocumentChangeEventArgs args)
+		{
+		}
+
+		public void TextRemove (int offset, int length)
+		{
+		}
+
+		public void TextInsert (int offset, string text)
+		{
+		}
+
+		public IEnumerable<DocumentLine> GetLinesBetween (int startLine, int endLine)
+		{
+			for (int i = startLine; i <= endLine; i++)
+				yield return Get (i);
+		}
+
+		public IEnumerable<DocumentLine> GetLinesStartingAt (int startLine)
+		{
+			for (int i = startLine; i <= Count; i++)
+				yield return Get (i);
+		}
+
+		public IEnumerable<DocumentLine> GetLinesReverseStartingAt (int startLine)
+		{
+			for (int i = startLine; i-- > DocumentLocation.MinLine;)
+				yield return Get (i);
+		}
+
+		public int Count {
+			get {
+				return lines.Length;
+			}
+		}
+
+		public bool LineEndingMismatch {
+			get;
+			set;
+		}
+
+		public System.Collections.Generic.IEnumerable<DocumentLine> Lines {
+			get {
+				return lines;
+			}
+		}
+
+		#endregion
+
+
+	}
+}
+
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/StringBuffer.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/StringBuffer.cs
deleted file mode 100644
index ba504a179a..0000000000
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/StringBuffer.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace Mono.TextEditor
-{
-	/// <summary>

-	/// Simple implementation of the buffer interface to support fast read-only documents.

-	/// </summary>
-	public class StringBuffer : IBuffer

-	{

-		string buffer;

-

-		public StringBuffer (string buffer)

-		{

-			this.buffer = buffer;

-		}

-

-		#region IBuffer Members

-		int IBuffer.TextLength {

-			get { return buffer.Length; }

-		}

-

-		string IBuffer.Text {

-			get { return buffer; }

-			set { buffer = value; }

-		}

-

-		void IBuffer.Replace (int offset, int count, string value)

-		{

-			throw new NotSupportedException ("Operation not supported on this buffer.");

-		}

-

-		string IBuffer.GetTextAt (int offset, int count)

-		{

-			return buffer.Substring (offset, count);

-		}

-

-		char IBuffer.GetCharAt (int offset)

-		{

-			return buffer[offset];

-		}

-
-		int IBuffer.IndexOf (char c, int startIndex, int count)
-		{
-			return buffer.IndexOf (c, startIndex, count);
-		}
-
-		int IBuffer.IndexOfAny (char[] anyOf, int startIndex, int count)
-		{
-			return buffer.IndexOfAny (anyOf, startIndex, count);
-		}
-
-		public int IndexOf (string searchText, int startIndex, int count, StringComparison comparisonType)
-		{
-			return buffer.IndexOf (searchText, startIndex, count, comparisonType);
-		}
-
-		int IBuffer.LastIndexOf (char c, int startIndex, int count)
-		{
-			return buffer.LastIndexOf (c, startIndex, count);
-		}
-
-		public int LastIndexOf (string searchText, int startIndex, int count, StringComparison comparisonType)
-		{
-			return buffer.LastIndexOf (searchText, startIndex, count, comparisonType);
-		}
-		#endregion
-	}
-}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/TextDocument.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/TextDocument.cs
index f69c94d427..1b958ef287 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/TextDocument.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/TextDocument.cs
@@ -40,7 +40,7 @@ namespace Mono.TextEditor
 {
 	public class TextDocument : ICSharpCode.NRefactory.AbstractAnnotatable, ICSharpCode.NRefactory.Editor.IDocument
 	{
-		readonly IBuffer buffer;
+		readonly Rope<char> buffer;
 		readonly ILineSplitter splitter;
 
 		ISyntaxMode syntaxMode = null;
@@ -61,11 +61,21 @@ namespace Mono.TextEditor
 					lock (this) {
 						mimeType = value;
 						SyntaxMode = SyntaxModeService.GetSyntaxMode (this, value);
+						OnMimeTypeChanged (EventArgs.Empty);
 					}
 				}
 			}
 		}
-		
+
+		public event EventHandler MimeTypeChanged;
+
+		protected virtual void OnMimeTypeChanged (EventArgs e)
+		{
+			EventHandler handler = this.MimeTypeChanged;
+			if (handler != null)
+				handler (this, e);
+		}
+
 		string fileName;
 		public string FileName {
 			get {
@@ -91,6 +101,16 @@ namespace Mono.TextEditor
 			set;
 		}
 
+		public bool UseBom {
+			get;
+			set;
+		}
+
+		public System.Text.Encoding Encoding {
+			get;
+			set;
+		}
+
 		internal ILineSplitter Splitter {
 			get {
 				return splitter;
@@ -135,11 +155,10 @@ namespace Mono.TextEditor
 			}
 		}
 		
-		protected TextDocument (IBuffer buffer,ILineSplitter splitter)
+		protected TextDocument (Rope<char> buffer,ILineSplitter splitter)
 		{
 			this.buffer = buffer;
 			this.splitter = splitter;
-			splitter.LineChanged += SplitterLineSegmentTreeLineChanged;
 			splitter.LineRemoved += HandleSplitterLineSegmentTreeLineRemoved;
 			foldSegmentTree.tree.NodeRemoved += HandleFoldSegmentTreetreeNodeRemoved; 
 			textSegmentMarkerTree.InstallListener (this);
@@ -152,7 +171,7 @@ namespace Mono.TextEditor
 				foldedSegments.Remove (e.Node);
 		}
 
-		public TextDocument () : this(new GapBuffer (), new LineSplitter ())
+		public TextDocument () : this(new Rope<char> (), new LineSplitter ())
 		{
 		}
 
@@ -163,41 +182,56 @@ namespace Mono.TextEditor
 
 		public static TextDocument CreateImmutableDocument (string text, bool suppressHighlighting = true)
 		{
-			return new TextDocument (new StringBuffer (text), new PrimitiveLineSplitter ()) {
+			return new TextDocument (CharRope.Create (text), new PrimitiveLineSplitter ()) {
 				SuppressHighlightUpdate = suppressHighlighting,
 				Text = text,
 				ReadOnly = true
 			};
 		}
 
-		void SplitterLineSegmentTreeLineChanged (object sender, LineEventArgs e)
-		{
-			if (LineChanged != null)
-				LineChanged (this, e);
+		public event EventHandler<LineEventArgs> LineChanged {
+			add { splitter.LineChanged += value; }
+			remove { splitter.LineChanged -= value; }
 		}
-		
-		public event EventHandler<LineEventArgs> LineChanged;
-	//	public event EventHandler<LineEventArgs> LineInserted;
-		
+
+		public event EventHandler<LineEventArgs> LineInserted {
+			add { splitter.LineInserted += value; }
+			remove { splitter.LineInserted -= value; }
+		}
+
+		public event EventHandler<LineEventArgs> LineRemoved {
+			add { splitter.LineRemoved += value; }
+			remove { splitter.LineRemoved -= value; }
+		}
+
 		#region Buffer implementation
+
 		public int TextLength {
 			get {
-				return buffer.TextLength;
+				return buffer.Length;
 			}
 		}
 
 		public bool SuppressHighlightUpdate { get; set; }
 		internal DocumentLine longestLineAtTextSet;
+		WeakReference cachedText;
 
 		public string Text {
 			get {
-				return buffer.Text;
+				string completeText = cachedText != null ? (cachedText.Target as string) : null;
+				if (completeText == null) {
+					completeText = buffer.ToString();
+					cachedText = new WeakReference(completeText);
+				}
+				return completeText;
 			}
 			set {
 				var args = new DocumentChangeEventArgs (0, Text, value);
 				textSegmentMarkerTree.Clear ();
 				OnTextReplacing (args);
-				buffer.Text = value;
+				cachedText = null;
+				buffer.Clear ();
+				buffer.InsertText (0, value); 
 				extendingTextMarkers = new List<TextLineMarker> ();
 				splitter.Initalize (value, out longestLineAtTextSet);
 				ClearFoldSegments ();
@@ -255,8 +289,10 @@ namespace Mono.TextEditor
 				}
 				redoStack.Clear ();
 			}
-			
-			buffer.Replace (offset, count, value);
+			cachedText = null;
+			buffer.RemoveRange(offset, count);
+			if (!string.IsNullOrEmpty (value))
+				buffer.InsertText (offset, value);
 			foldSegmentTree.UpdateOnTextReplace (this, args);
 			splitter.TextReplaced (this, args);
 			versionProvider.AppendChange (args);
@@ -274,7 +310,7 @@ namespace Mono.TextEditor
 			if (endOffset > TextLength)
 				throw new ArgumentException ("endOffset > Length");
 			
-			return buffer.GetTextAt (startOffset, endOffset - startOffset);
+			return buffer.ToString (startOffset, endOffset - startOffset);
 		}
 		
 		public string GetTextBetween (DocumentLocation start, DocumentLocation end)
@@ -297,7 +333,7 @@ namespace Mono.TextEditor
 				throw new ArgumentException ("count < 0");
 			if (offset + count > TextLength)
 				throw new ArgumentException ("offset + count is beyond EOF");
-			return buffer.GetTextAt (offset, count);
+			return buffer.ToString (offset, count);
 		}
 		
 		public string GetTextAt (DocumentRegion region)
@@ -337,17 +373,17 @@ namespace Mono.TextEditor
 				throw new ArgumentException ("offset < 0");
 			if (offset >= TextLength)
 				throw new ArgumentException ("offset >= TextLength");
-			return buffer.GetCharAt (offset);
+			return buffer [offset];
 		}
 
 		public char GetCharAt (DocumentLocation location)
 		{
-			return buffer.GetCharAt (LocationToOffset (location));
+			return buffer [LocationToOffset (location)];
 		}
 
 		public char GetCharAt (int line, int column)
 		{
-			return buffer.GetCharAt (LocationToOffset (line, column));
+			return buffer [LocationToOffset (line, column)];
 		}
 
 		/// <summary>
@@ -1176,6 +1212,11 @@ namespace Mono.TextEditor
 			return foldSegmentTree.GetSegmentsOverlapping (line.Offset, line.Length).Cast<FoldSegment> ();
 		}
 
+		public IEnumerable<FoldSegment> GetFoldingContaining (int offset, int length)
+		{
+			return foldSegmentTree.GetSegmentsOverlapping (offset, length).Cast<FoldSegment> ();
+		}
+
 		public IEnumerable<FoldSegment> GetStartFoldings (int lineNumber)
 		{
 			return GetStartFoldings (this.GetLine (lineNumber));
@@ -1188,6 +1229,11 @@ namespace Mono.TextEditor
 			return GetFoldingContaining (line).Where (fold => fold.StartLine == line);
 		}
 
+		public IEnumerable<FoldSegment> GetStartFoldings (int offset, int length)
+		{
+			return GetFoldingContaining (offset, length).Where (fold => offset <= fold.StartLine.Offset && fold.StartLine.Offset < offset + length);
+		}
+
 		public IEnumerable<FoldSegment> GetEndFoldings (int lineNumber)
 		{
 			return GetStartFoldings (this.GetLine (lineNumber));
@@ -1200,7 +1246,12 @@ namespace Mono.TextEditor
 					yield return segment;
 			}
 		}
-		
+
+		public IEnumerable<FoldSegment> GetEndFoldings (int offset, int length)
+		{
+			return GetFoldingContaining (offset, length).Where (fold => offset <= fold.EndLine.Offset && fold.EndLine.Offset < offset + length);
+		}
+
 		public int GetLineCount (FoldSegment segment)
 		{
 			return segment.EndLine.LineNumber - segment.StartLine.LineNumber;
@@ -1656,12 +1707,14 @@ namespace Mono.TextEditor
 		
 		
 		#region Diff
+
+
 		int[] GetDiffCodes (ref int codeCounter, Dictionary<string, int> codeDictionary, bool includeEol)
 		{
 			int i = 0;
 			var result = new int[LineCount];
 			foreach (DocumentLine line in Lines) {
-				string lineText = buffer.GetTextAt (line.Offset, includeEol ? line.LengthIncludingDelimiter : line.Length);
+				string lineText = buffer.ToString (line.Offset, includeEol ? line.LengthIncludingDelimiter : line.Length);
 				int curCode;
 				if (!codeDictionary.TryGetValue (lineText, out curCode)) {
 					codeDictionary[lineText] = curCode = ++codeCounter;
@@ -1854,12 +1907,12 @@ namespace Mono.TextEditor
 
 		public System.IO.TextReader CreateReader ()
 		{
-			return new BufferedTextReader (buffer);
+			return new RopeTextReader (buffer);
 		}
 
 		public System.IO.TextReader CreateReader (int offset, int length)
 		{
-			throw new NotImplementedException ();
+			return new RopeTextReader(buffer.GetRange(offset, length));
 		}
 
 		string ICSharpCode.NRefactory.Editor.ITextSource.GetText (int offset, int length)
@@ -1893,25 +1946,37 @@ namespace Mono.TextEditor
 				}
 			}
 
-			public SnapshotDocument (string text, ITextSourceVersion version) : base (new StringBuffer (text), new PrimitiveLineSplitter ())
+			public SnapshotDocument (TextDocument doc) : base (doc.buffer.Clone(), new ImmutableLineSplitter (doc.splitter))
 			{
-				this.version = version;
-				Text = text;
+				this.version = doc.Version;
+				fileName = doc.fileName;
+				Encoding = doc.Encoding;
+				UseBom = doc.UseBom;
+				mimeType = doc.mimeType;
+
 				ReadOnly = true;
 			}
 		}
 
 		public TextDocument CreateDocumentSnapshot ()
 		{
-			return new SnapshotDocument (Text, Version);
+			return new SnapshotDocument (this);
 		}
 
-		ICSharpCode.NRefactory.Editor.IDocument ICSharpCode.NRefactory.Editor.IDocument.CreateDocumentSnapshot ()
+		public Mono.TextEditor.Utils.Rope<char> CloneRope ()
 		{
-			return new SnapshotDocument (Text, Version);
+			return buffer.Clone ();
 		}
 
+		public Mono.TextEditor.Utils.Rope<char> CloneRope (int offset, int count)
+		{
+			return buffer.GetRange (offset, count);
+		}
 
+		ICSharpCode.NRefactory.Editor.IDocument ICSharpCode.NRefactory.Editor.IDocument.CreateDocumentSnapshot ()
+		{
+			return new SnapshotDocument (this);
+		}
 
 		#endregion
 	}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/EditMode.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/EditMode.cs
index a6f2acded4..90fcd4a2e8 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/EditMode.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/EditMode.cs
@@ -37,10 +37,10 @@ namespace Mono.TextEditor
 		//NOTE: the behaviour of this class is actually stateless; these variables are used to make the API
 		// friendlier for subclassers of this class
 		protected TextEditorData textEditorData;
-		protected TextEditor editor;
+		protected MonoTextEditor editor;
 	//	string status;
 		
-		public void InternalHandleKeypress (TextEditor editor, TextEditorData data, Gdk.Key key, 
+		public void InternalHandleKeypress (MonoTextEditor editor, TextEditorData data, Gdk.Key key, 
 		                                      uint unicodeChar, Gdk.ModifierType modifier)
 		{
 			this.editor = editor; 
@@ -53,7 +53,7 @@ namespace Mono.TextEditor
 			this.editor = null;
 		}
 		
-		internal virtual void InternalSelectionChanged (TextEditor editor, TextEditorData data)
+		internal virtual void InternalSelectionChanged (MonoTextEditor editor, TextEditorData data)
 		{
 			// only trigger SelectionChanged when event is a result of external stimuli, i.e. when 
 			// not already running HandleKeypress
@@ -66,7 +66,7 @@ namespace Mono.TextEditor
 			}
 		}
 		
-		internal void InternalCaretPositionChanged (TextEditor editor, TextEditorData data)
+		internal void InternalCaretPositionChanged (MonoTextEditor editor, TextEditorData data)
 		{
 			// only trigger CaretPositionChanged when event is a result of external stimuli, i.e. when 
 			// not already running HandleKeypress
@@ -95,7 +95,7 @@ namespace Mono.TextEditor
 
 		protected Caret Caret { get { return textEditorData.Caret; } }
 		protected TextDocument Document { get { return textEditorData.Document; } }
-		protected TextEditor Editor { get { return editor; } }
+		protected MonoTextEditor Editor { get { return editor; } }
 		protected TextEditorData Data { get { return textEditorData; } }
 		
 		protected abstract void HandleKeypress (Gdk.Key key, uint unicodeKey, Gdk.ModifierType modifier);
@@ -266,7 +266,7 @@ namespace Mono.TextEditor
 		}
 
 		#region TextAreaControl
-		public virtual void AllocateTextArea (TextEditor textEditor, TextArea textArea, Rectangle allocation)
+		public virtual void AllocateTextArea (MonoTextEditor textEditor, TextArea textArea, Rectangle allocation)
 		{
 			if (textArea.Allocation != allocation)
 				textArea.SizeAllocate (allocation);
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/ActionMargin.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/ActionMargin.cs
index ba069dfc6e..ea054fb966 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/ActionMargin.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/ActionMargin.cs
@@ -30,7 +30,7 @@ namespace Mono.TextEditor
 {
 	public class ActionMargin : Margin
 	{
-		readonly TextEditor editor;
+		readonly MonoTextEditor editor;
 
 		double marginWidth;
 		public override double Width {
@@ -39,7 +39,7 @@ namespace Mono.TextEditor
 			}
 		}
 
-		public ActionMargin (TextEditor editor)
+		public ActionMargin (MonoTextEditor editor)
 		{
 			if (editor == null)
 				throw new ArgumentNullException ("editor");
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentEditorWindow.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentEditorWindow.cs
index b461bc6b7a..93115383ac 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentEditorWindow.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentEditorWindow.cs
@@ -29,7 +29,7 @@ namespace Mono.TextEditor
 {
 	public class CodeSegmentEditorWindow : Gtk.Window
 	{
-		TextEditor codeSegmentEditor = new TextEditor ();
+		MonoTextEditor codeSegmentEditor = new MonoTextEditor ();
 		
 		public ISyntaxMode SyntaxMode {
 			get {
@@ -49,7 +49,7 @@ namespace Mono.TextEditor
 			}
 		}
 		
-		public CodeSegmentEditorWindow (TextEditor editor) : base (Gtk.WindowType.Toplevel)
+		public CodeSegmentEditorWindow (MonoTextEditor editor) : base (Gtk.WindowType.Toplevel)
 		{
 			Gtk.ScrolledWindow scrolledWindow = new Gtk.ScrolledWindow ();
 			scrolledWindow.Child = codeSegmentEditor;
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs
index 29a546cb20..424ba054cc 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs
@@ -38,7 +38,7 @@ namespace Mono.TextEditor
 	{
 		const int DefaultPreviewWindowWidth = 320;
 		const int DefaultPreviewWindowHeight = 200;
-		TextEditor editor;
+		MonoTextEditor editor;
 		Pango.FontDescription fontDescription;
 		Pango.Layout layout;
 		Pango.Layout informLayout;
@@ -64,11 +64,11 @@ namespace Mono.TextEditor
 			}
 		}
 
-		public CodeSegmentPreviewWindow (TextEditor editor, bool hideCodeSegmentPreviewInformString, TextSegment segment, bool removeIndent = true) : this(editor, hideCodeSegmentPreviewInformString, segment, DefaultPreviewWindowWidth, DefaultPreviewWindowHeight, removeIndent)
+		public CodeSegmentPreviewWindow (MonoTextEditor editor, bool hideCodeSegmentPreviewInformString, TextSegment segment, bool removeIndent = true) : this(editor, hideCodeSegmentPreviewInformString, segment, DefaultPreviewWindowWidth, DefaultPreviewWindowHeight, removeIndent)
 		{
 		}
 		
-		public CodeSegmentPreviewWindow (TextEditor editor, bool hideCodeSegmentPreviewInformString, TextSegment segment, int width, int height, bool removeIndent = true) : base (Gtk.WindowType.Popup)
+		public CodeSegmentPreviewWindow (MonoTextEditor editor, bool hideCodeSegmentPreviewInformString, TextSegment segment, int width, int height, bool removeIndent = true) : base (Gtk.WindowType.Popup)
 		{
 			this.HideCodeSegmentPreviewInformString = hideCodeSegmentPreviewInformString;
 			this.Segment = segment;
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/DashedLineMargin.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/DashedLineMargin.cs
index 154111bc09..db52b966d9 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/DashedLineMargin.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/DashedLineMargin.cs
@@ -30,7 +30,7 @@ namespace Mono.TextEditor
 {
 	public class DashedLineMargin : Margin
 	{
-		TextEditor editor;
+		MonoTextEditor editor;
 		Cairo.Color color;
 		
 		public override double Width {
@@ -39,7 +39,7 @@ namespace Mono.TextEditor
 			}
 		}
 		
-		public DashedLineMargin (TextEditor editor)
+		public DashedLineMargin (MonoTextEditor editor)
 		{
 			this.editor = editor;
 		}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/FoldMarkerMargin.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/FoldMarkerMargin.cs
index 7a87bfe63a..68aa69fb9f 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/FoldMarkerMargin.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/FoldMarkerMargin.cs
@@ -35,7 +35,7 @@ namespace Mono.TextEditor
 {
 	public class FoldMarkerMargin : Margin
 	{
-		TextEditor editor;
+		MonoTextEditor editor;
 		DocumentLine lineHover;
 		Pango.Layout layout;
 		
@@ -63,7 +63,7 @@ namespace Mono.TextEditor
 			}
 		}
 		
-		public FoldMarkerMargin (TextEditor editor)
+		public FoldMarkerMargin (MonoTextEditor editor)
 		{
 			this.editor = editor;
 			layout = PangoUtil.CreateLayout (editor);
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/FoldingScreenbackgroundRenderer.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/FoldingScreenbackgroundRenderer.cs
index 6c392f8ae7..c1803dbdaf 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/FoldingScreenbackgroundRenderer.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/FoldingScreenbackgroundRenderer.cs
@@ -31,7 +31,7 @@ namespace Mono.TextEditor
 {
 	public class FoldingScreenbackgroundRenderer : IBackgroundRenderer, IDisposable
 	{
-		TextEditor editor;
+		MonoTextEditor editor;
 		List<FoldSegment> foldSegments;
 		[Flags]
 		enum Roles
@@ -54,7 +54,7 @@ namespace Mono.TextEditor
 			}
 		}
 
-		public FoldingScreenbackgroundRenderer (TextEditor editor, IEnumerable<FoldSegment> foldSegments)
+		public FoldingScreenbackgroundRenderer (MonoTextEditor editor, IEnumerable<FoldSegment> foldSegments)
 		{
 			this.editor = editor;
 			this.foldSegments = new List<FoldSegment> (foldSegments);
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GtkWorkarounds.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GtkWorkarounds.cs
index 01d2665829..b3dcc07170 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GtkWorkarounds.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GtkWorkarounds.cs
@@ -34,7 +34,7 @@ using Gtk;
 
 namespace Mono.TextEditor
 {
-	public static class GtkWorkarounds
+	static class GtkWorkarounds
 	{
 		const string LIBOBJC ="/usr/lib/libobjc.dylib";
 		const string USER32DLL = "User32.dll";
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GutterMargin.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GutterMargin.cs
index 1428c3fc0c..8c69267e8b 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GutterMargin.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GutterMargin.cs
@@ -34,13 +34,13 @@ namespace Mono.TextEditor
 {
 	public class GutterMargin : Margin
 	{
-		TextEditor editor;
+		MonoTextEditor editor;
 		int width;
 		int oldLineCountLog10 = -1;
 
 		double fontHeight;
 		
-		public GutterMargin (TextEditor editor)
+		public GutterMargin (MonoTextEditor editor)
 		{
 			this.editor = editor;
 
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/HslColor.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/HslColor.cs
index 6f7f446845..f8e525f939 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/HslColor.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/HslColor.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 
 namespace Mono.TextEditor
 {
-	public struct HslColor
+	struct HslColor
 	{
 		public double H {
 			get;
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/ITooltipProvider.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/ITooltipProvider.cs
index cd0cb8d027..6cdc53eccb 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/ITooltipProvider.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/ITooltipProvider.cs
@@ -50,5 +50,15 @@ namespace Mono.TextEditor
 			this.ItemSegment = new TextSegment (offset, length);
 			this.Item = item;
 		}
+
+		public override bool Equals (object obj)
+		{
+			return ItemSegment.Equals (((TooltipItem)obj).ItemSegment);
+		}
+
+		public override int GetHashCode ()
+		{
+			return ItemSegment.GetHashCode ();
+		}
 	}
 }
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/IconMargin.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/IconMargin.cs
index 89f264056d..f3ab923632 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/IconMargin.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/IconMargin.cs
@@ -33,11 +33,11 @@ namespace Mono.TextEditor
 {
 	public class IconMargin : Margin
 	{
-		TextEditor editor;
+		MonoTextEditor editor;
 		Cairo.Color backgroundColor, separatorColor;
 		const int marginWidth = 22;
 		
-		public IconMargin (TextEditor editor)
+		public IconMargin (MonoTextEditor editor)
 		{
 			this.editor = editor;
 		}
@@ -136,7 +136,7 @@ namespace Mono.TextEditor
 	
 	public class BookmarkMarginDrawEventArgs : EventArgs
 	{
-		public TextEditor Editor {
+		public MonoTextEditor Editor {
 			get;
 			private set;
 		}
@@ -166,7 +166,7 @@ namespace Mono.TextEditor
 			private set;
 		}
 		
-		public BookmarkMarginDrawEventArgs (TextEditor editor, Cairo.Context context, DocumentLine line, int lineNumber, double xPos, double yPos)
+		public BookmarkMarginDrawEventArgs (MonoTextEditor editor, Cairo.Context context, DocumentLine line, int lineNumber, double xPos, double yPos)
 		{
 			this.Editor = editor;
 			this.Context    = context;
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/Margin.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/Margin.cs
index 9a132f34ee..fdd570e2c3 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/Margin.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/Margin.cs
@@ -182,18 +182,18 @@ namespace Mono.TextEditor
 			}
 		}
 
-		public TextEditor Editor {
+		public MonoTextEditor Editor {
 			get;
 			private set;
 		}
 		
-		public MarginMouseEventArgs (TextEditor editor, Gdk.Event raw, uint button, double x, double y, Gdk.ModifierType modifierState)
+		public MarginMouseEventArgs (MonoTextEditor editor, Gdk.Event raw, uint button, double x, double y, Gdk.ModifierType modifierState)
 			: this (editor, raw.Type, button, x, y, modifierState)
 		{
 			this.RawEvent = raw;
 		}
 		
-		public MarginMouseEventArgs (TextEditor editor, Gdk.EventType type, uint button, double x, double y, Gdk.ModifierType modifierState)
+		public MarginMouseEventArgs (MonoTextEditor editor, Gdk.EventType type, uint button, double x, double y, Gdk.ModifierType modifierState)
 		{
 			this.Editor = editor;
 			this.Type = type;
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextEditor.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/MonoTextEditor.cs
index 9c6542011c..29c4bde505 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextEditor.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/MonoTextEditor.cs
@@ -41,7 +41,7 @@ namespace Mono.TextEditor
 {
 	[System.ComponentModel.Category("Mono.TextEditor")]
 	[System.ComponentModel.ToolboxItem(true)]
-	public class TextEditor : Container
+	public class MonoTextEditor : Container
 	{
 		readonly TextArea textArea;
 
@@ -60,21 +60,21 @@ namespace Mono.TextEditor
 			}
 		}
 
-		public TextEditor () : this(new TextDocument ())
+		public MonoTextEditor () : this(new TextDocument ())
 		{
 		}
 
-		public TextEditor (TextDocument doc)
+		public MonoTextEditor (TextDocument doc)
 			: this (doc, null)
 		{
 		}
 		
-		public TextEditor (TextDocument doc, ITextEditorOptions options)
+		public MonoTextEditor (TextDocument doc, ITextEditorOptions options)
 			: this (doc, options, new SimpleEditMode ())
 		{
 		}
 
-		public TextEditor (TextDocument doc, ITextEditorOptions options, EditMode initialMode) 
+		public MonoTextEditor (TextDocument doc, ITextEditorOptions options, EditMode initialMode) 
 		{
 			GtkWorkarounds.FixContainerLeak (this);
 			WidgetFlags |= WidgetFlags.NoWindow;
@@ -376,6 +376,9 @@ namespace Mono.TextEditor
 			get {
 				return textArea.Document;
 			}
+			set {
+				textArea.Document = value;
+			}
 		}
 		
 		public bool IsDisposed {
@@ -723,7 +726,16 @@ namespace Mono.TextEditor
 				textArea.SelectionAnchor = value;
 			}
 		}
-		
+
+		public int SelectionLead {
+			get {
+				return textArea.SelectionLead;
+			}
+			set {
+				textArea.SelectionLead = value;
+			}
+		}
+
 		public IEnumerable<DocumentLine> SelectedLines {
 			get {
 				return textArea.SelectedLines;
@@ -1203,6 +1215,8 @@ namespace Mono.TextEditor
 		
 		public double ColumnToX (DocumentLine line, int column)
 		{
+			if (line == null)
+				throw new ArgumentNullException ("line");
 			return TextViewMargin.ColumnToX (line, column);
 		}
 		
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs
index ebb0580971..4a2415bfa4 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs
@@ -76,6 +76,9 @@ namespace Mono.TextEditor
 			get {
 				return textEditorData.Document;
 			}
+			set {
+				textEditorData.Document = value;
+			}
 		}
 
 		public bool IsDisposed {
@@ -296,8 +299,8 @@ namespace Mono.TextEditor
 			ResizeMode = ResizeMode.Queue;
 		}
 
-		TextEditor editor;
-		internal void Initialize (TextEditor editor, TextDocument doc, ITextEditorOptions options, EditMode initialMode)
+		MonoTextEditor editor;
+		internal void Initialize (MonoTextEditor editor, TextDocument doc, ITextEditorOptions options, EditMode initialMode)
 		{
 			if (doc == null)
 				throw new ArgumentNullException ("doc");
@@ -1479,8 +1482,10 @@ namespace Mono.TextEditor
 			} else {
 				double caretX = ColumnToX (Document.GetLine (p.Line), p.Column);
 				double textWith = Allocation.Width - textViewMargin.XOffset;
-				if (this.textEditorData.HAdjustment.Value > caretX) {
-					this.textEditorData.HAdjustment.Value = caretX;
+				if (caretX < this.textEditorData.HAdjustment.Upper) {
+					this.textEditorData.HAdjustment.Value = 0;
+				} else if (this.textEditorData.HAdjustment.Value > caretX) {
+					this.textEditorData.HAdjustment.Value = System.Math.Max (0, caretX - this.textEditorData.HAdjustment.Upper / 2);
 				} else if (this.textEditorData.HAdjustment.Value + textWith < caretX + TextViewMargin.CharWidth) {
 					double adjustment = System.Math.Max (0, caretX - textWith + TextViewMargin.CharWidth);
 					this.textEditorData.HAdjustment.Value = adjustment;
@@ -1953,7 +1958,16 @@ namespace Mono.TextEditor
 				this.textEditorData.SelectionAnchor = value;
 			}
 		}
-		
+
+		public int SelectionLead {
+			get {
+				return this.textEditorData.SelectionLead;
+			}
+			set {
+				this.textEditorData.SelectionLead = value;
+			}
+		}
+
 		public IEnumerable<DocumentLine> SelectedLines {
 			get {
 				return this.textEditorData.SelectedLines;
@@ -2277,7 +2291,7 @@ namespace Mono.TextEditor
 		
 		class CaretPulseAnimation : IAnimationDrawer
 		{
-			TextEditor editor;
+			MonoTextEditor editor;
 			
 			public double Percent { get; set; }
 			
@@ -2294,7 +2308,7 @@ namespace Mono.TextEditor
 				}
 			}
 			
-			public CaretPulseAnimation (TextEditor editor)
+			public CaretPulseAnimation (MonoTextEditor editor)
 			{
 				this.editor = editor;
 			}
@@ -2331,7 +2345,7 @@ namespace Mono.TextEditor
 		
 		public class RegionPulseAnimation : IAnimationDrawer
 		{
-			TextEditor editor;
+			MonoTextEditor editor;
 			
 			public PulseKind Kind { get; set; }
 			public double Percent { get; set; }
@@ -2352,10 +2366,10 @@ namespace Mono.TextEditor
 				}
 			}
 			
-			public RegionPulseAnimation (TextEditor editor, Gdk.Point position, Gdk.Size size)
+			public RegionPulseAnimation (MonoTextEditor editor, Gdk.Point position, Gdk.Size size)
 				: this (editor, new Gdk.Rectangle (position, size)) {}
 			
-			public RegionPulseAnimation (TextEditor editor, Gdk.Rectangle region)
+			public RegionPulseAnimation (MonoTextEditor editor, Gdk.Rectangle region)
 			{
 				if (region.X < 0 || region.Y < 0 || region.Width < 0 || region.Height < 0)
 					throw new ArgumentException ("region is invalid");
@@ -2478,7 +2492,7 @@ namespace Mono.TextEditor
 				set;
 			}
 			
-			public SearchHighlightPopupWindow (TextEditor editor) : base (editor)
+			public SearchHighlightPopupWindow (MonoTextEditor editor) : base (editor)
 			{
 			}
 			
@@ -2753,9 +2767,11 @@ namespace Mono.TextEditor
 				tipItem = item;
 				Gtk.Window tw = null;
 				try {
-					tw = provider.ShowTooltipWindow (editor, nextTipOffset, nextTipModifierState, tipX + (int) TextViewMargin.XOffset, tipY, item);
+					tw = provider.CreateTooltipWindow (editor, nextTipOffset, nextTipModifierState, item);
+					if (tw != null)
+						provider.ShowTooltipWindow (editor, tw, nextTipOffset, nextTipModifierState, tipX + (int) TextViewMargin.XOffset, tipY, item);
 				} catch (Exception e) {
-					Console.WriteLine ("-------- Exception while creating tooltip:");
+					Console.WriteLine ("-------- Exception while creating tooltip: " + provider);
 					Console.WriteLine (e);
 				}
 				if (tw == tipWindow)
@@ -2821,9 +2837,12 @@ namespace Mono.TextEditor
 			nextTipOffset = -1;
 		}
 		
-		void OnDocumentStateChanged (object s, EventArgs a)
+		void OnDocumentStateChanged (object s, DocumentChangeEventArgs args)
 		{
 			HideTooltip ();
+			var start = editor.Document.OffsetToLineNumber (args.Offset);
+			var end = editor.Document.OffsetToLineNumber (args.Offset + args.InsertionLength);
+			editor.Document.CommitMultipleLineUpdate (start, end);
 		}
 		
 		void OnTextSet (object sender, EventArgs e)
@@ -3047,12 +3066,12 @@ namespace Mono.TextEditor
 
 		class SetCaret 
 		{
-			TextEditor view;
+			MonoTextEditor view;
 			int line, column;
 			bool highlightCaretLine;
 			bool centerCaret;
 			
-			public SetCaret (TextEditor view, int line, int column, bool highlightCaretLine, bool centerCaret)
+			public SetCaret (MonoTextEditor view, int line, int column, bool highlightCaretLine, bool centerCaret)
 			{
 				this.view = view;
 				this.line = line;
@@ -3122,12 +3141,12 @@ namespace Mono.TextEditor
 			return Gtk.Widget.GType;
 		}
 		
-		internal List<TextEditor.EditorContainerChild> containerChildren = new List<TextEditor.EditorContainerChild> ();
+		internal List<MonoTextEditor.EditorContainerChild> containerChildren = new List<MonoTextEditor.EditorContainerChild> ();
 		
 		public void AddTopLevelWidget (Gtk.Widget widget, int x, int y)
 		{
 			widget.Parent = this;
-			TextEditor.EditorContainerChild info = new TextEditor.EditorContainerChild (this, widget);
+			MonoTextEditor.EditorContainerChild info = new MonoTextEditor.EditorContainerChild (this, widget);
 			info.X = x;
 			info.Y = y;
 			containerChildren.Add (info);
@@ -3218,7 +3237,7 @@ namespace Mono.TextEditor
 			containerChildren.ForEach (child => child.Child.Unmap ());
 		}
 
-		void ResizeChild (Rectangle allocation, TextEditor.EditorContainerChild child)
+		void ResizeChild (Rectangle allocation, MonoTextEditor.EditorContainerChild child)
 		{
 			Requisition req = child.Child.SizeRequest ();
 			var childRectangle = new Gdk.Rectangle (child.X, child.Y, req.Width, req.Height);
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs
index c055338beb..68441c45cd 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs
@@ -42,7 +42,7 @@ namespace Mono.TextEditor
 {
 	public class TextViewMargin : Margin
 	{
-		readonly TextEditor textEditor;
+		readonly MonoTextEditor textEditor;
 		Pango.TabArray tabArray;
 		Pango.Layout markerLayout, defaultLayout;
 		Pango.Layout[] eolMarkerLayout;
@@ -120,7 +120,7 @@ namespace Mono.TextEditor
 		}
 
 
-		public TextViewMargin (TextEditor textEditor)
+		public TextViewMargin (MonoTextEditor textEditor)
 		{
 			if (textEditor == null)
 				throw new ArgumentNullException ("textEditor");
@@ -1630,18 +1630,26 @@ namespace Mono.TextEditor
 				TextRenderEndPosition = xPos + width,
 
 				LineHeight = _lineHeight,
-				WholeLineWidth = textEditor.Allocation.Width - xPos
+				WholeLineWidth = textEditor.Allocation.Width - xPos,
+
+				LineYRenderStartPosition = y
 			};
 
 			foreach (TextLineMarker marker in line.Markers) {
 				if (!marker.IsVisible)
 					continue;
 
-				if (marker.DrawBackground (textEditor, cr, y, metrics)) {
+				if (marker.DrawBackground (textEditor, cr, metrics)) {
 					isSelectionDrawn |= (marker.Flags & TextLineMarkerFlags.DrawsSelection) == TextLineMarkerFlags.DrawsSelection;
 				}
 			}
 
+			foreach (var marker in Document.GetTextSegmentMarkersAt (line).Where (m => m.IsVisible)) {
+				if (layout.Layout != null)
+					marker.DrawBackground (textEditor, cr, metrics, offset, offset + length);
+			}
+
+
 			if (DecorateLineBg != null)
 				DecorateLineBg (cr, layout, offset, length, xPos, y, selectionStartOffset, selectionEndOffset);
 			
@@ -1819,12 +1827,12 @@ namespace Mono.TextEditor
 			}
 			foreach (TextLineMarker marker in line.Markers.Where (m => m.IsVisible)) {
 				if (layout.Layout != null)
-					marker.Draw (textEditor, cr, y, metrics);
+					marker.Draw (textEditor, cr, metrics);
 			}
 
 			foreach (var marker in Document.GetTextSegmentMarkersAt (line).Where (m => m.IsVisible)) {
 				if (layout.Layout != null)
-					marker.Draw (textEditor, cr, layout.Layout, false, /*selected*/offset, offset + length, y, xPos, xPos + width);
+					marker.Draw (textEditor, cr, metrics, offset, offset + length);
 			}
 			position += System.Math.Floor (layout.LastLineWidth);
 
@@ -2037,7 +2045,7 @@ namespace Mono.TextEditor
 						textEditor.ClearSelection ();
 						Caret.Location = clickLocation;
 						InSelectionDrag = true;
-						textEditor.SetSelection (clickLocation, clickLocation);
+						textEditor.MainSelection = new Selection (clickLocation, clickLocation);
 					}
 					textEditor.RequestResetCaretBlink ();
 				}
@@ -2417,6 +2425,8 @@ namespace Mono.TextEditor
 
 		public static int GetNextTabstop (TextEditorData textEditor, int currentColumn, int tabSize)
 		{
+			if (tabSize == 0)
+				return currentColumn;
 			int result = currentColumn - 1 + tabSize;
 			return 1 + (result / tabSize) * tabSize;
 		}
@@ -2878,10 +2888,11 @@ namespace Mono.TextEditor
 				var metrics = new EndOfLineMetrics {
 					LineSegment = line,
 					TextRenderEndPosition = TextStartPosition + position,
-					LineHeight = _lineHeight
+					LineHeight = _lineHeight,
+					LineYRenderStartPosition = y
 				};
 				foreach (var marker in line.Markers) {
-					marker.DrawAfterEol (textEditor, cr, y, metrics);
+					marker.DrawAfterEol (textEditor, cr, metrics);
 				}
 			}
 
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TooltipProvider.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TooltipProvider.cs
index 20ea1309e9..c3467dcb75 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TooltipProvider.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TooltipProvider.cs
@@ -29,30 +29,26 @@ namespace Mono.TextEditor
 {
 	public abstract class TooltipProvider
 	{
-		public abstract TooltipItem GetItem (TextEditor editor, int offset);
+		public abstract TooltipItem GetItem (MonoTextEditor editor, int offset);
 
-		public virtual bool IsInteractive (TextEditor editor, Gtk.Window tipWindow)
+		public virtual bool IsInteractive (MonoTextEditor editor, Gtk.Window tipWindow)
 		{
 			return false;
 		}
 
-		protected virtual void GetRequiredPosition (TextEditor editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)
+		protected virtual void GetRequiredPosition (MonoTextEditor editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)
 		{
 			requiredWidth = tipWindow.SizeRequest ().Width;
 			xalign = 0.5;
 		}
 
-		protected virtual Gtk.Window CreateTooltipWindow (TextEditor editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)
+		public virtual Gtk.Window CreateTooltipWindow (MonoTextEditor editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)
 		{
 			return null;
 		}
 
-		public virtual Gtk.Window ShowTooltipWindow (TextEditor editor, int offset, Gdk.ModifierType modifierState, int mouseX, int mouseY, TooltipItem item)
+		public virtual Gtk.Window ShowTooltipWindow (MonoTextEditor editor, Gtk.Window tipWindow, int offset, Gdk.ModifierType modifierState, int mouseX, int mouseY, TooltipItem item)
 		{
-			Gtk.Window tipWindow = CreateTooltipWindow (editor, offset, modifierState, item);
-			if (tipWindow == null)
-				return null;
-
 			int ox = 0, oy = 0;
 			if (editor.GdkWindow != null)
 				editor.GdkWindow.GetOrigin (out ox, out oy);
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/HeightTree.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/HeightTree.cs
index 7ea191115a..768a4c1a68 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/HeightTree.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/HeightTree.cs
@@ -70,7 +70,9 @@ namespace Mono.TextEditor
 
 		void HandleLineRemoved (object sender, LineEventArgs e)
 		{
-			RemoveLine (e.Line.LineNumber);
+			Rebuild ();
+			OnLineUpdateFrom (new HeightChangedEventArgs (e.Line.LineNumber - 1));
+			//RemoveLine (e.Line.LineNumber);
 		}
 
 		public void Dispose ()
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/HelperMethods.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/HelperMethods.cs
index 1b74818031..29c68acd36 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/HelperMethods.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/HelperMethods.cs
@@ -34,7 +34,7 @@ using System.Collections.Generic;
 
 namespace Mono.TextEditor
 {
-	public static class HelperMethods
+	public static class PublicHelperMethods
 	{
 		public static TextSegment AdjustSegment (this TextSegment segment, DocumentChangeEventArgs args)
 		{
@@ -50,7 +50,10 @@ namespace Mono.TextEditor
 				yield return segment.AdjustSegment (args);
 			}
 		}
+	}
 
+	static class HelperMethods
+	{
 		public static T Kill<T>(this T gc) where T : IDisposable
 		{
 			if (gc != null) 
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/ITextEditorOptions.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/ITextEditorOptions.cs
index 3c5e8551e3..732f4d2302 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/ITextEditorOptions.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/ITextEditorOptions.cs
@@ -29,21 +29,23 @@ using Mono.TextEditor.Highlighting;
 
 namespace Mono.TextEditor
 {
-	public enum ShowWhitespaces {
+	public enum ShowWhitespaces
+	{
 		Never,
 		Selection,
 		Always
 	}
 
 	[Flags]
-	public enum IncludeWhitespaces {
-		None        = 0,
-		Space       = 1,
-		Tab         = 2,
+	public enum IncludeWhitespaces
+	{
+		None = 0,
+		Space = 1,
+		Tab = 2,
 		LineEndings = 4,
-		All         = Space | Tab | LineEndings
+		All = Space | Tab | LineEndings
 	}
-	
+
 	public interface ITextEditorOptions : IDisposable
 	{
 		double Zoom { get; set; }
@@ -53,11 +55,11 @@ namespace Mono.TextEditor
 		void ZoomIn ();
 		void ZoomOut ();
 		void ZoomReset ();
-		
+
 		string IndentationString { get; }
-		
+
 		IWordFindStrategy WordFindStrategy { get; set; }
-		
+
 		bool AllowTabsAfterNonTabs { get; set; }
 		bool HighlightMatchingBracket { get; set; }
 		bool TabsToSpaces { get; set; }
@@ -80,21 +82,23 @@ namespace Mono.TextEditor
 		bool DrawIndentationMarkers { get; set; }
 
 		bool WrapLines { get; set; }
-		string FontName { get;  set; }
-		Pango.FontDescription Font { get;  }
+		string FontName { get; set; }
+		Pango.FontDescription Font { get; }
 
 		string GutterFontName { get; set; }
 		Pango.FontDescription GutterFont { get; }
-		
-		string ColorScheme { get; set;  }
+
+		string ColorScheme { get; set; }
 		string DefaultEolMarker { get; set; }
 
 		ShowWhitespaces ShowWhitespaces { get; set; }
 		IncludeWhitespaces IncludeWhitespaces { get; set; }
 
 		bool GenerateFormattingUndoStep { get; set; }
+		event EventHandler ZoomChanged;
+
 		ColorScheme GetColorStyle ();
-		
+
 		event EventHandler Changed;
 	}
 }
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/InsertionCursorEditMode.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/InsertionCursorEditMode.cs
index b23ade4f51..f403816ab1 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/InsertionCursorEditMode.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/InsertionCursorEditMode.cs
@@ -97,9 +97,9 @@ namespace Mono.TextEditor
 	
 	public class HelpWindowEditMode : SimpleEditMode
 	{
-		protected new TextEditor editor;
+		protected new MonoTextEditor editor;
 		
-		public new TextEditor Editor {
+		public new MonoTextEditor Editor {
 			get {
 				return editor;
 			}
@@ -199,7 +199,7 @@ namespace Mono.TextEditor
 			get { return insertionPoints; }
 		}
 		
-		public InsertionCursorEditMode (TextEditor editor, List<InsertionPoint> insertionPoints)
+		public InsertionCursorEditMode (MonoTextEditor editor, List<InsertionPoint> insertionPoints)
 		{
 			this.editor = editor;
 			this.insertionPoints = insertionPoints;
@@ -324,7 +324,7 @@ namespace Mono.TextEditor
 
 			public double GetLineIndentationStart ()
 			{
-				TextEditor editor = mode.editor;
+				MonoTextEditor editor = mode.editor;
 
 				var lineAbove = editor.Document.GetLine (mode.CurrentInsertionPoint.Line - 1);
 				var lineBelow = editor.Document.GetLine (mode.CurrentInsertionPoint.Line);
@@ -356,7 +356,7 @@ namespace Mono.TextEditor
 
 			public override void Draw (Cairo.Context cr, Cairo.Rectangle erea)
 			{
-				TextEditor editor = mode.editor;
+				MonoTextEditor editor = mode.editor;
 				
 				double y = editor.LineToY (mode.CurrentInsertionPoint.Line) - editor.VAdjustment.Value; 
 				double x = GetLineIndentationStart ();
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/LineBackgroundMarker.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/LineBackgroundMarker.cs
index 3fead25185..f74f08ec90 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/LineBackgroundMarker.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/LineBackgroundMarker.cs
@@ -40,12 +40,12 @@ namespace Mono.TextEditor
 			this.color = color;
 		}
 
-		public override bool DrawBackground (TextEditor editor, Cairo.Context cr, double y, LineMetrics metrics)
+		public override bool DrawBackground (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics)
 		{
 			if (metrics.SelectionStart > 0)
 				return true;
 			cr.SetSourceColor (color);
-			cr.Rectangle (metrics.TextRenderStartPosition, y, metrics.TextRenderEndPosition - metrics.TextRenderStartPosition, editor.LineHeight);
+			cr.Rectangle (metrics.TextRenderStartPosition, metrics.LineYRenderStartPosition, metrics.TextRenderEndPosition - metrics.TextRenderStartPosition, editor.LineHeight);
 			cr.Fill ();
 			return true;
 		}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/MarginMarker.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/MarginMarker.cs
index c8cd377311..26638df368 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/MarginMarker.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/MarginMarker.cs
@@ -128,7 +128,7 @@ namespace Mono.TextEditor
 		/// <summary>
 		/// Draws the foreground of the specified margin.
 		/// </summary>
-		public virtual void DrawForeground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		public virtual void DrawForeground (MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 		}
 
@@ -136,7 +136,7 @@ namespace Mono.TextEditor
 		/// Draws the background of the specified margin.
 		/// </summary>
 		/// <returns>true, if the background is drawn. false if the margin should fallback to the default background renderer. </returns>
-		public virtual bool DrawBackground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		public virtual bool DrawBackground (MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 			return false;
 		}
@@ -147,7 +147,7 @@ namespace Mono.TextEditor
 		/// <param name="editor">The text editor in which the event press occured.</param>
 		/// <param name="margin">The margin in which the event occured.</param>
 		/// <param name="args">The event arguments.</param>
-		public virtual void InformMousePress (TextEditor editor, Margin margin, MarginMouseEventArgs args)
+		public virtual void InformMousePress (MonoTextEditor editor, Margin margin, MarginMouseEventArgs args)
 		{
 		}
 
@@ -157,7 +157,7 @@ namespace Mono.TextEditor
 		/// <param name="editor">The text editor in which the event press occured.</param>
 		/// <param name="margin">The margin in which the event occured.</param>
 		/// <param name="args">The event arguments.</param>
-		public virtual void InformMouseRelease (TextEditor editor, Margin margin, MarginMouseEventArgs args)
+		public virtual void InformMouseRelease (MonoTextEditor editor, Margin margin, MarginMouseEventArgs args)
 		{
 		}
 
@@ -167,7 +167,7 @@ namespace Mono.TextEditor
 		/// <param name="editor">The text editor in which the event press occured.</param>
 		/// <param name="margin">The margin in which the event occured.</param>
 		/// <param name="args">The event arguments.</param>
-		public virtual void InformMouseHover (TextEditor editor, Margin margin, MarginMouseEventArgs args)
+		public virtual void InformMouseHover (MonoTextEditor editor, Margin margin, MarginMouseEventArgs args)
 		{
 		}
 	}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs
index a9c9e75adc..599ba88014 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs
@@ -95,7 +95,7 @@ namespace Mono.TextEditor
 		/// </summary>
 		public event EventHandler<EditModeChangedEventArgs> EditModeChanged;
 		
-		public TextEditor Parent {
+		public MonoTextEditor Parent {
 			get;
 			set;
 		}
@@ -207,24 +207,28 @@ namespace Mono.TextEditor
 			caret.PositionChanged += CaretPositionChanged;
 
 			options = TextEditorOptions.DefaultOptions;
-			
 			document = doc;
+			AttachDocument ();
+			SearchEngine = new BasicSearchEngine ();
+
+			HeightTree = new HeightTree (this);
+			HeightTree.Rebuild ();
+			IndentationTracker = new DefaultIndentationTracker (document);
+		}
+
+		void AttachDocument ()
+		{
+			if (document == null)
+				return;
 			document.BeginUndo += OnBeginUndo;
 			document.EndUndo += OnEndUndo;
-
 			document.Undone += DocumentHandleUndone;
 			document.Redone += DocumentHandleRedone;
 			document.LineChanged += HandleDocLineChanged;
 			document.TextReplaced += HandleTextReplaced;
-
 			document.TextSet += HandleDocTextSet;
 			document.Folded += HandleTextEditorDataDocumentFolded;
 			document.FoldTreeUpdated += HandleFoldTreeUpdated;
-			SearchEngine = new BasicSearchEngine ();
-
-			HeightTree = new HeightTree (this);
-			HeightTree.Rebuild ();
-			IndentationTracker = new DefaultIndentationTracker (document);
 		}
 
 		void HandleFoldTreeUpdated (object sender, EventArgs e)
@@ -267,6 +271,12 @@ namespace Mono.TextEditor
 			get {
 				return document;
 			}
+			set {
+				DetachDocument ();
+				document = value;
+				this.caret.SetDocument (document);
+				AttachDocument ();
+			}
 		}
 
 		void HandleTextReplaced (object sender, DocumentChangeEventArgs e)
@@ -805,6 +815,26 @@ namespace Mono.TextEditor
 			}
 		}
 
+		public int SelectionLead {
+			get {
+				if (MainSelection.IsEmpty)
+					return -1;
+				return MainSelection.GetLeadOffset (this);
+			}
+			set {
+				DocumentLocation location = Document.OffsetToLocation (value);
+				if (mainSelection.IsEmpty) {
+					MainSelection = new Selection (location, location);
+				} else {
+					if (MainSelection.Anchor == location) {
+						MainSelection = MainSelection.WithAnchor (MainSelection.Lead);
+					} else {
+						MainSelection = MainSelection.WithLead (location);
+					}
+				}
+			}
+		}
+
 		/// <summary>
 		/// Gets or sets the selection range. If nothing is selected (Caret.Offset, 0) is returned.
 		/// </summary>
@@ -888,6 +918,10 @@ namespace Mono.TextEditor
 		
 		public void SetSelection (int anchorOffset, int leadOffset)
 		{
+			if (anchorOffset == leadOffset) {
+				MainSelection = Selection.Empty;
+				return;
+			}
 			var anchor = document.OffsetToLocation (anchorOffset);
 			var lead = document.OffsetToLocation (leadOffset);
 			MainSelection = new Selection (anchor, lead);
@@ -895,7 +929,7 @@ namespace Mono.TextEditor
 
 		public void SetSelection (DocumentLocation anchor, DocumentLocation lead)
 		{
-			MainSelection = new Selection (anchor, lead);
+			MainSelection = anchor == lead ? Selection.Empty : new Selection (anchor, lead);
 		}
 
 		public void SetSelection (int anchorLine, int anchorColumn, int leadLine, int leadColumn)
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorOptions.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorOptions.cs
index 3028e70c6d..2721756861 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorOptions.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorOptions.cs
@@ -65,10 +65,11 @@ namespace Mono.TextEditor
 		string colorStyle = DefaultColorStyle;
 		Pango.FontDescription font, gutterFont;
 		
-		double zoom = 1d;
 		IWordFindStrategy wordFindStrategy = new EmacsWordFindStrategy (true);
 
 		#region Zoom
+		static double zoom = 1d;
+		static event EventHandler StaticZoomChanged;
 
 		const double ZOOM_FACTOR = 1.1f;
 		const int ZOOM_MIN_POW = -4;
@@ -78,7 +79,7 @@ namespace Mono.TextEditor
 
 		public double Zoom {
 			get {
-				 return zoom;
+				return zoom;
 			}
 			set {
 				value = System.Math.Min (ZOOM_MAX, System.Math.Max (ZOOM_MIN, value));
@@ -90,39 +91,39 @@ namespace Mono.TextEditor
 				}
 				if (zoom != value) {
 					zoom = value;
-					DisposeFont ();
-					OnChanged (EventArgs.Empty);
+					StaticZoomChanged?.Invoke (this, EventArgs.Empty);
 				}
 			}
 		}
-		
+		public event EventHandler ZoomChanged { add { StaticZoomChanged += value; } remove { StaticZoomChanged -= value; } }
+
 		public bool CanZoomIn {
 			get {
-				return zoom < ZOOM_MAX - 0.000001d;
+				return Zoom < ZOOM_MAX - 0.000001d;
 			}
 		}
 		
 		public bool CanZoomOut {
 			get {
-				return zoom > ZOOM_MIN + 0.000001d;
+				return Zoom > ZOOM_MIN + 0.000001d;
 			}
 		}
 		
 		public bool CanResetZoom {
 			get {
-				return zoom != 1d;
+				return Zoom != 1d;
 			}
 		}
 		
 		public void ZoomIn ()
 		{
-			int oldPow = (int)System.Math.Round (System.Math.Log (zoom) / System.Math.Log (ZOOM_FACTOR));
+			int oldPow = (int)System.Math.Round (System.Math.Log (Zoom) / System.Math.Log (ZOOM_FACTOR));
 			Zoom = System.Math.Pow (ZOOM_FACTOR, oldPow + 1);
 		}
 		
 		public void ZoomOut ()
 		{
-			int oldPow = (int)System.Math.Round (System.Math.Log (zoom) / System.Math.Log (ZOOM_FACTOR));
+			int oldPow = (int)System.Math.Round (System.Math.Log (Zoom) / System.Math.Log (ZOOM_FACTOR));
 			Zoom = System.Math.Pow (ZOOM_FACTOR, oldPow - 1);
 		}
 		
@@ -345,7 +346,7 @@ namespace Mono.TextEditor
 			}
 		}
 
-		void DisposeFont ()
+		protected void DisposeFont ()
 		{
 			if (font != null) {
 				font.Dispose ();
@@ -543,7 +544,7 @@ namespace Mono.TextEditor
 		
 		public virtual void CopyFrom (TextEditorOptions other)
 		{
-			zoom = other.zoom;
+			Zoom = other.Zoom;
 			highlightMatchingBracket = other.highlightMatchingBracket;
 			tabsToSpaces = other.tabsToSpaces;
 			indentationSize = other.indentationSize;
@@ -568,11 +569,23 @@ namespace Mono.TextEditor
 			DisposeFont ();
 			OnChanged (EventArgs.Empty);
 		}
-		
+
+		public TextEditorOptions ()
+		{
+			StaticZoomChanged += HandleStaticZoomChanged;
+		}
+
 		public virtual void Dispose ()
 		{
+			StaticZoomChanged -= HandleStaticZoomChanged;
 		}
-		
+
+		void HandleStaticZoomChanged (object sender, EventArgs e)
+		{
+			DisposeFont ();
+			OnChanged (EventArgs.Empty);
+		}
+
 		protected void OnChanged (EventArgs args)
 		{
 			if (Changed != null)
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLineMarker.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLineMarker.cs
index 90f5d5fc52..a8eb35b235 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLineMarker.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLineMarker.cs
@@ -31,8 +31,8 @@ namespace Mono.TextEditor
 {
 	public interface IExtendingTextLineMarker 
 	{
-		double GetLineHeight (TextEditor editor);
-		void Draw (TextEditor editor, Cairo.Context cr, int lineNr, Cairo.Rectangle lineArea);
+		double GetLineHeight (MonoTextEditor editor);
+		void Draw (MonoTextEditor editor, Cairo.Context cr, int lineNr, Cairo.Rectangle lineArea);
 	}
 	
 	public interface IActionTextLineMarker
@@ -40,9 +40,9 @@ namespace Mono.TextEditor
 		/// <returns>
 		/// true, if the mouse press was handled - false otherwise.
 		/// </returns>
-		bool MousePressed (TextEditor editor, MarginMouseEventArgs args);
+		bool MousePressed (MonoTextEditor editor, MarginMouseEventArgs args);
 		
-		void MouseHover (TextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result);
+		void MouseHover (MonoTextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result);
 	}
 	
 	public class TextLineMarkerHoverResult 
@@ -90,6 +90,8 @@ namespace Mono.TextEditor
 		public double LineHeight { get; internal set; }
 
 		public double WholeLineWidth { get; internal set; }
+
+		public double LineYRenderStartPosition { get; internal set; }
 	}
 
 	public class EndOfLineMetrics
@@ -97,6 +99,7 @@ namespace Mono.TextEditor
 		public DocumentLine LineSegment { get; internal set; }
 		public double TextRenderEndPosition { get; internal set; }
 		public double LineHeight { get; internal set; }
+		public double LineYRenderStartPosition { get; internal set; }
 	}
 
 	public class TextLineMarker
@@ -116,7 +119,11 @@ namespace Mono.TextEditor
 			get;
 			set;
 		}
-		
+
+		public object Tag {
+			get;
+			set;
+		}		
 		
 		bool isVisible = true;
 		public virtual bool IsVisible {
@@ -128,7 +135,7 @@ namespace Mono.TextEditor
 		{
 		}
 		
-		public virtual void Draw (TextEditor editor, Cairo.Context cr, double y, LineMetrics metrics)
+		public virtual void Draw (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics)
 		{
 		}
 		
@@ -145,7 +152,7 @@ namespace Mono.TextEditor
 		/// <param name="cr">The cairo context.</param>
 		/// <param name="y">The y coordinate.</param>
 		/// <param name="metrics">The line metrics.</param>
-		public virtual bool DrawBackground (TextEditor editor, Cairo.Context cr, double y, LineMetrics metrics)
+		public virtual bool DrawBackground (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics)
 		{
 			return false;
 		}
@@ -153,7 +160,7 @@ namespace Mono.TextEditor
 		/// <summary>
 		/// Is used to draw in the area after the visible text.
 		/// </summary>
-		public virtual void DrawAfterEol (TextEditor textEditor, Cairo.Context cr, double y, EndOfLineMetrics lineHeight)
+		public virtual void DrawAfterEol (MonoTextEditor textEditor, Cairo.Context cr, EndOfLineMetrics metrics)
 		{
 		}
 	}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLinkEditMode.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLinkEditMode.cs
index 16415127e2..017517c7ef 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLinkEditMode.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLinkEditMode.cs
@@ -188,7 +188,7 @@ namespace Mono.TextEditor
 
 		TextLinkTooltipProvider tooltipProvider;
 
-		public TextLinkEditMode (TextEditor editor, int baseOffset, List<TextLink> links)
+		public TextLinkEditMode (MonoTextEditor editor, int baseOffset, List<TextLink> links)
 		{
 			this.editor = editor;
 			this.links = links;
@@ -547,7 +547,7 @@ namespace Mono.TextEditor
 			this.mode = mode;
 		}
 		#region ITooltipProvider implementation 
-		public override TooltipItem GetItem (TextEditor Editor, int offset)
+		public override TooltipItem GetItem (MonoTextEditor Editor, int offset)
 		{
 			int o = offset - mode.BaseOffset;
 			for (int i = 0; i < mode.Links.Count; i++) {
@@ -559,7 +559,7 @@ namespace Mono.TextEditor
 			//return mode.Links.First (l => l.PrimaryLink != null && l.PrimaryLink.Offset <= o && o <= l.PrimaryLink.EndOffset);
 		}
 
-		protected override Gtk.Window CreateTooltipWindow (TextEditor Editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)
+		public override Gtk.Window CreateTooltipWindow (MonoTextEditor Editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)
 		{
 			TextLink link = item.Item as TextLink;
 			if (link == null || string.IsNullOrEmpty (link.Tooltip))
@@ -570,7 +570,7 @@ namespace Mono.TextEditor
 			return window;
 		}
 
-		protected override void GetRequiredPosition (TextEditor Editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)
+		protected override void GetRequiredPosition (MonoTextEditor Editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)
 		{
 			TooltipWindow win = (TooltipWindow)tipWindow;
 			requiredWidth = win.SetMaxWidth (win.Screen.Width);
@@ -594,7 +594,7 @@ namespace Mono.TextEditor
 			IsVisible = true;
 		}
 
-		public override bool DrawBackground (TextEditor editor, Cairo.Context cr, double y, LineMetrics metrics)
+		public override bool DrawBackground (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics)
 		{
 			int caretOffset = editor.Caret.Offset - BaseOffset;
 
@@ -625,7 +625,7 @@ namespace Mono.TextEditor
 						double x1 = metrics.TextRenderStartPosition + x_pos - 1;
 						double x2 = metrics.TextRenderStartPosition + x_pos2 - 1 + 0.5;
 
-						cr.Rectangle (x1 + 0.5, y + 0.5, x2 - x1, editor.LineHeight - 1);
+						cr.Rectangle (x1 + 0.5, metrics.LineYRenderStartPosition + 0.5, x2 - x1, editor.LineHeight - 1);
 						
 						cr.SetSourceColor (fillGc);
 						cr.FillPreserve ();
@@ -649,7 +649,7 @@ namespace Mono.TextEditor
 			return margin is GutterMargin;
 		}
 
-		public override bool DrawBackground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		public override bool DrawBackground (MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 			var width = metrics.Width;
 
@@ -661,7 +661,7 @@ namespace Mono.TextEditor
 			return true;
 		}
 
-		public override void DrawForeground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		public override void DrawForeground (MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 			var width = metrics.Width;
 			var lineNumberBgGC = editor.ColorStyle.LineNumbers.Background;
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextSegmentMarker.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextSegmentMarker.cs
index cb2c35d223..e76300b91a 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextSegmentMarker.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextSegmentMarker.cs
@@ -53,7 +53,11 @@ namespace Mono.TextEditor
 		{
 		}
 		
-		public virtual void Draw (TextEditor editor, Cairo.Context cr, Pango.Layout layout, bool selected, int startOffset, int endOffset, double y, double startXPos, double endXPos)
+		public virtual void Draw (MonoTextEditor editor, Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+		}
+
+		public virtual void DrawBackground (MonoTextEditor editor, Context cr, LineMetrics metrics, int startOffset, int endOffset)
 		{
 		}
 		
@@ -67,7 +71,7 @@ namespace Mono.TextEditor
 	{
 		void TransformChunks (List<Chunk> chunks);
 
-		void ChangeForeColor (TextEditor editor, Chunk chunk, ref Cairo.Color color);
+		void ChangeForeColor (MonoTextEditor editor, Chunk chunk, ref Cairo.Color color);
 	}
 
 	public class UnderlineTextSegmentMarker : TextSegmentMarker
@@ -88,14 +92,16 @@ namespace Mono.TextEditor
 		public Cairo.Color Color { get; set; }
 		public bool Wave { get; set; }
 		
-		public override void Draw (TextEditor editor, Cairo.Context cr, Pango.Layout layout, bool selected, int startOffset, int endOffset, double y, double startXPos, double endXPos)
+		public override void Draw (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics, int startOffset, int endOffset)
 		{
 			int markerStart = Segment.Offset;
 			int markerEnd = Segment.EndOffset;
 			if (markerEnd < startOffset || markerStart > endOffset) 
 				return; 
-			
-			
+			var layout = metrics.Layout.Layout;
+			double startXPos = metrics.TextRenderStartPosition;
+			double endXPos = metrics.TextRenderEndPosition;
+			double y = metrics.LineYRenderStartPosition;
 			if (editor.IsSomethingSelected) {
 				var range = editor.SelectionRange;
 				if (range.Contains (markerStart)) {
@@ -121,7 +127,7 @@ namespace Mono.TextEditor
 			InternalDraw (markerStart, markerEnd, editor, cr, layout, false, startOffset, endOffset, y, startXPos, endXPos);
 		}
 		
-		void InternalDraw (int markerStart, int markerEnd, TextEditor editor, Cairo.Context cr, Pango.Layout layout, bool selected, int startOffset, int endOffset, double y, double startXPos, double endXPos)
+		void InternalDraw (int markerStart, int markerEnd, MonoTextEditor editor, Cairo.Context cr, Pango.Layout layout, bool selected, int startOffset, int endOffset, double y, double startXPos, double endXPos)
 		{
 			if (markerStart >= markerEnd)
 				return;
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/UnderlineMarker.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/UnderlineMarker.cs
index 0e8f4240d2..06698c143b 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/UnderlineMarker.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/UnderlineMarker.cs
@@ -57,12 +57,13 @@ namespace Mono.TextEditor
 		public int EndCol { get; set; }
 		public bool Wave { get; set; }
 		
-		public override void Draw (TextEditor editor, Cairo.Context cr, double y, LineMetrics metrics)
+		public override void Draw (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics)
 		{
 			var startOffset = metrics.TextStartOffset;
 			int endOffset = metrics.TextEndOffset;
 			double startXPos = metrics.TextRenderStartPosition;
 			double endXPos = metrics.TextRenderEndPosition;
+			double y = metrics.LineYRenderStartPosition;
 			var layout = metrics.Layout.Layout;
 
 			int markerStart = LineSegment.Offset + System.Math.Max (StartCol - 1, 0);
@@ -95,7 +96,7 @@ namespace Mono.TextEditor
 			InternalDraw (markerStart, markerEnd, editor, cr, layout, false, startOffset, endOffset, y, startXPos, endXPos);
 		}
 		
-		void InternalDraw (int markerStart, int markerEnd, TextEditor editor, Cairo.Context cr, Pango.Layout layout, bool selected, int startOffset, int endOffset, double y, double startXPos, double endXPos)
+		void InternalDraw (int markerStart, int markerEnd, MonoTextEditor editor, Cairo.Context cr, Pango.Layout layout, bool selected, int startOffset, int endOffset, double y, double startXPos, double endXPos)
 		{
 			if (markerStart >= markerEnd)
 				return;
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/UrlMarker.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/UrlMarker.cs
index 88469244a8..681fee2e66 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/UrlMarker.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/UrlMarker.cs
@@ -100,12 +100,13 @@ namespace Mono.TextEditor
 			line = null;
 		}
 		
-		public override void Draw (TextEditor editor, Cairo.Context cr, double y, LineMetrics metrics)
+		public override void Draw (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics)
 		{
 			var startOffset = metrics.TextStartOffset;
 			int endOffset = metrics.TextEndOffset;
 			double startXPos = metrics.TextRenderStartPosition;
 			double endXPos = metrics.TextRenderEndPosition;
+			double y = metrics.LineYRenderStartPosition;
 			var layout = metrics.Layout.Layout;
 			int markerStart = line.Offset + startColumn;
 			int markerEnd = line.Offset + endColumn;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs
index 4c3e290a83..837dac0d7a 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs
@@ -34,6 +34,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
+using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
 using MonoDevelop.Core.AddIns;
 using MonoDevelop.Core.Serialization;
@@ -240,7 +241,7 @@ namespace MonoDevelop.Core.Assemblies
 				return;
 			foreach (string pcfile in GetAllPkgConfigFiles ()) {
 				try {
-					ParsePCFile (FileService.ResolveFullPath (pcfile));
+					ParsePCFile (new FilePath (pcfile).ResolveLinks ());
 					if (ShuttingDown)
 						return;
 				}
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.FileSystem/UnixFileSystemExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.FileSystem/UnixFileSystemExtension.cs
deleted file mode 100644
index d29c7e9772..0000000000
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.FileSystem/UnixFileSystemExtension.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// UnixFileSystemExtension.cs
-//
-// Author:
-//   Alan McGovern <alan@xamarin.com>
-//
-// Copyright (c) 2011 Xamarin, Inc (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace MonoDevelop.Core.FileSystem
-{
-	class UnixFileSystemExtension : DefaultFileSystemExtension
-	{
-		const int PATHMAX = 4096 + 1;
-		
-		[DllImport ("libc")]
-		static extern IntPtr realpath (string path, IntPtr buffer);
-		
-		public override FilePath ResolveFullPath (FilePath path)
-		{
-			IntPtr buffer = IntPtr.Zero;
-			try {
-				buffer = Marshal.AllocHGlobal (PATHMAX);
-				var result = realpath (path, buffer);
-				return result == IntPtr.Zero ? "" : Marshal.PtrToStringAuto (buffer);
-			} finally {
-				if (buffer != IntPtr.Zero)
-					Marshal.FreeHGlobal (buffer);
-			}
-		}
-	}
-}
-
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/BacktrackingStringMatcher.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/BacktrackingStringMatcher.cs
index 53c9f25962..d28da461a2 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/BacktrackingStringMatcher.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/BacktrackingStringMatcher.cs
@@ -138,17 +138,23 @@ namespace MonoDevelop.Core.Text
 			// letter case
 			ch = text [j];
 			bool textCharIsUpper = char.IsUpper (ch);
-			if (!onlyWordStart && filterChar == (textCharIsUpper ? ch : char.ToUpper (ch)) && char.IsLetter (ch)) {
-				// cases don't match. Filter is upper char & letter is low, now prefer the match that does the word skip.
-				if (!(textCharIsUpper || (filterTextLowerCaseTable & flag) != 0) && j + 1 < text.Length) {
-					int possibleBetterResult = GetMatchChar (text, i, j + 1, onlyWordStart);
-					if (possibleBetterResult >= 0)
-						return possibleBetterResult;
+			if (!onlyWordStart) {
+				if (filterChar == (textCharIsUpper ? ch : char.ToUpper (ch)) && char.IsLetter (ch)) {
+					// cases don't match. Filter is upper char & letter is low, now prefer the match that does the word skip.
+					if (!(textCharIsUpper || (filterTextLowerCaseTable & flag) != 0) && j + 1 < text.Length) {
+						int possibleBetterResult = GetMatchChar (text, i, j + 1, onlyWordStart);
+						if (possibleBetterResult >= 0)
+							return possibleBetterResult;
+					}
+					return j;
+				}
+			} else {
+				if (textCharIsUpper && filterChar == ch && char.IsLetter (ch)) {
+					return j;
 				}
-				return j;
 			}
+
 			// no match, try to continue match at the next word start
-			
 			bool lastWasLower = false;
 			bool lastWasUpper = false;
 			int wordStart = j + 1;
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/ISegment.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/ISegment.cs
new file mode 100644
index 0000000000..02c0acfda2
--- /dev/null
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/ISegment.cs
@@ -0,0 +1,406 @@
+//
+// ISegment.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Core.Text
+{
+	/// <summary>
+	/// An (Offset,Length)-pair.
+	/// </summary>
+	public interface ISegment
+	{
+		/// <summary>
+		/// Gets the start offset of the segment.
+		/// </summary>
+		int Offset { get; }
+
+		/// <summary>
+		/// Gets the length of the segment.
+		/// </summary>
+		/// <remarks>For line segments (IDocumentLine), the length does not include the line delimeter.</remarks>
+		int Length { get; }
+
+		/// <summary>
+		/// Gets the end offset of the segment.
+		/// </summary>
+		/// <remarks>EndOffset = Offset + Length;</remarks>
+		int EndOffset { get; }
+	}
+
+	/// <summary>
+	/// An (Offset, Length) pair representing a text span.
+	/// </summary>
+	public struct TextSegment : IEquatable<TextSegment>, ISegment
+	{
+		public static readonly TextSegment Invalid = new TextSegment (-1, 0);
+
+		readonly int offset;
+
+		/// <summary>
+		///  Gets the start offset of the segment. 
+		/// </summary>
+		/// <value>
+		/// The offset.
+		/// </value>
+		public int Offset {
+			get {
+				return offset;
+			}
+		}
+
+		readonly int length;
+
+		/// <summary>
+		/// Gets the length of the segment. 
+		/// </summary>
+		/// <value>
+		/// The length.
+		/// </value>
+		public int Length {
+			get {
+				return length;
+			}
+		}
+
+		/// <summary>
+		/// Gets the end offset of the segment. 
+		/// </summary>
+		/// <remarks>
+		/// EndOffset = Offset + Length;
+		/// </remarks>
+		/// <value>
+		/// The end offset.
+		/// </value>
+		public int EndOffset {
+			get {
+				return Offset + Length;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether this instance is empty.
+		/// </summary>
+		/// <value>
+		/// <c>true</c> if this instance is empty; otherwise, <c>false</c>.
+		/// </value>
+		public bool IsEmpty {
+			get {
+				return Length == 0;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether this instance is invalid.
+		/// </summary>
+		/// <value>
+		/// <c>true</c> if this instance is invalid; otherwise, <c>false</c>.
+		/// </value>
+		public bool IsInvalid {
+			get {
+				return Offset < 0;
+			}
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TextSegment"/> struct.
+		/// </summary>
+		/// <param name='offset'>
+		/// The offset of the segment.
+		/// </param>
+		/// <param name='length'>
+		/// The length of the segment.
+		/// </param>
+		public TextSegment (int offset, int length)
+		{
+			this.offset = offset;
+			this.length = length;
+		}
+
+		public static bool operator == (TextSegment left, TextSegment right)
+		{
+			return Equals (left, right);
+		}
+
+		public static bool operator != (TextSegment left, TextSegment right)
+		{
+			return !Equals (left, right);
+		}
+
+		public static bool Equals (TextSegment left, TextSegment right)
+		{
+			return left.Offset == right.Offset && left.Length == right.Length;
+		}
+
+		/// <summary>
+		/// Determines whether this instance is inside the specified offset. 
+		/// </summary>
+		/// <returns>
+		/// <c>true</c> if this instance is inside the specified offset (upper bound inclusive); otherwise, <c>false</c>.
+		/// </returns>
+		/// <param name='offset'>
+		/// The offset offset.
+		/// </param>
+		public bool IsInside (int offset)
+		{
+			return Offset <= offset && offset <= EndOffset;
+		}
+
+		/// <summary>
+		/// Determines whether the specified <see cref="TextSegment"/> is equal to the current <see cref="TextSegment"/>.
+		/// </summary>
+		/// <param name='other'>
+		/// The <see cref="TextSegment"/> to compare with the current <see cref="TextSegment"/>.
+		/// </param>
+		/// <returns>
+		/// <c>true</c> if the specified <see cref="TextSegment"/> is equal to the current
+		/// <see cref="TextSegment"/>; otherwise, <c>false</c>.
+		/// </returns>
+		public bool Equals (TextSegment other)
+		{
+			return Equals (this, other);
+		}
+
+		/// <summary>
+		/// Determines whether the specified <see cref="System.Object"/> is equal to the current <see cref="TextSegment"/>.
+		/// </summary>
+		/// <param name='obj'>
+		/// The <see cref="System.Object"/> to compare with the current <see cref="TextSegment"/>.
+		/// </param>
+		/// <returns>
+		/// <c>true</c> if the specified <see cref="System.Object"/> is equal to the current
+		/// <see cref="TextSegment"/>; otherwise, <c>false</c>.
+		/// </returns>
+		public override bool Equals (object obj)
+		{
+			return obj is ISegment && Equals (this, (ISegment)obj);
+		}
+
+		/// <summary>
+		/// Serves as a hash function for a <see cref="TextSegment"/> object.
+		/// </summary>
+		/// <returns>
+		/// A hash code for this instance that is suitable for use in hashing algorithms and data structures such as a hash table.
+		/// </returns>
+		public override int GetHashCode ()
+		{
+			return Offset ^ Length;
+		}
+
+		public static TextSegment FromBounds (int startOffset, int endOffset)
+		{
+			if (startOffset > endOffset)
+				throw new ArgumentOutOfRangeException ("endOffset", "endOffset < startOffset");
+			return new TextSegment (startOffset, endOffset - startOffset);
+		}
+
+		/// <summary>
+		/// Returns a <see cref="System.String"/> that represents the current <see cref="TextSegment"/>.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> that represents the current <see cref="TextSegment"/>.
+		/// </returns>
+		public override string ToString ()
+		{
+			return string.Format ("[TextSegment: Offset={0}, Length={1}]", Offset, Length);
+		}
+	}
+
+	/// <summary>
+	/// An abstract implementation of the ISegment (Offset, Length) pair representing a text span.
+	/// </summary>
+	public abstract class AbstractSegment : ISegment
+	{
+		readonly int offset;
+
+		/// <summary>
+		///  Gets the start offset of the segment. 
+		/// </summary>
+		/// <value>
+		/// The offset.
+		/// </value>
+		public int Offset {
+			get {
+				return offset;
+			}
+		}
+
+		readonly int length;
+
+		/// <summary>
+		/// Gets the length of the segment. 
+		/// </summary>
+		/// <value>
+		/// The length.
+		/// </value>
+		public int Length {
+			get {
+				return length;
+			}
+		}
+
+		/// <summary>
+		/// Gets the end offset of the segment. 
+		/// </summary>
+		/// <remarks>
+		/// EndOffset = Offset + Length;
+		/// </remarks>
+		/// <value>
+		/// The end offset.
+		/// </value>
+		public int EndOffset {
+			get {
+				return Offset + Length;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether this instance is empty.
+		/// </summary>
+		/// <value>
+		/// <c>true</c> if this instance is empty; otherwise, <c>false</c>.
+		/// </value>
+		public bool IsEmpty {
+			get {
+				return Length == 0;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether this instance is invalid.
+		/// </summary>
+		/// <value>
+		/// <c>true</c> if this instance is invalid; otherwise, <c>false</c>.
+		/// </value>
+		public bool IsInvalid {
+			get {
+				return Offset < 0;
+			}
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TextSegment"/> struct.
+		/// </summary>
+		/// <param name='offset'>
+		/// The offset of the segment.
+		/// </param>
+		/// <param name='length'>
+		/// The length of the segment.
+		/// </param>
+		protected AbstractSegment (int offset, int length)
+		{
+			this.offset = offset;
+			this.length = length;
+		}
+
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TextSegment"/> struct.
+		/// </summary>
+		protected AbstractSegment (ISegment segment)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			this.offset = segment.Offset;
+			this.length = segment.Length;
+		}
+	}
+
+
+	/// <summary>
+	/// Extension methods for <see cref="ISegment"/>.
+	/// </summary>
+	public static class ISegmentExtensions
+	{
+		/// <summary>
+		/// Gets whether <paramref name="segment"/> fully contains the specified segment.
+		/// </summary>
+		/// <remarks>
+		/// Use <c>segment.Contains(offset, 0)</c> to detect whether a segment (end inclusive) contains offset;
+		/// use <c>segment.Contains(offset, 1)</c> to detect whether a segment (end exclusive) contains offset.
+		/// </remarks>
+		public static bool Contains (this ISegment segment, int offset, int length)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return segment.Offset <= offset && offset + length <= segment.EndOffset;
+		}
+
+		/// <summary>
+		/// Gets whether <paramref name="segment"/> fully contains the specified segment.
+		/// </summary>
+		public static bool Contains (this ISegment segment, ISegment span)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			if (span == null)
+				throw new ArgumentNullException ("span");
+			return segment.Offset <= span.Offset && span.EndOffset <= segment.EndOffset;
+		}
+
+		/// <summary>
+		/// Gets whether the offset is within the <paramref name="segment"/>.
+		/// </summary>
+		public static bool Contains (this ISegment segment, int offset)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return unchecked((uint)(offset - segment.Offset) < (uint)segment.Length);
+		}
+
+		/// <summary>
+		/// Determines whether <paramref name="other"/> overlaps this span. Two spans are considered to overlap 
+		/// if they have positions in common and neither is empty. Empty spans do not overlap with any 
+		/// other span.
+		/// </summary>
+		public static bool OverlapsWith (this ISegment segment, ISegment other)
+		{
+			int overlapStart = Math.Max (segment.Offset, other.Offset);
+			int overlapEnd = Math.Min (segment.EndOffset, other.EndOffset);
+			return overlapStart < overlapEnd;
+		}
+
+		public static ISegment AdjustSegment (this ISegment segment, TextChangeEventArgs args)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			if (args.Offset < segment.Offset)
+				return new TextSegment (segment.Offset + args.InsertionLength - args.RemovalLength, segment.Length);
+			if (args.Offset <= segment.EndOffset)
+				return new TextSegment (segment.Offset, segment.Length);
+			return segment;
+		}
+
+		public static IEnumerable<ISegment> AdjustSegments (this IEnumerable<ISegment> segments, TextChangeEventArgs args)
+		{
+			if (segments == null)
+				throw new ArgumentNullException ("segments");
+			foreach (var segment in segments) {
+				yield return segment.AdjustSegment (args);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/ITextSource.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/ITextSource.cs
new file mode 100644
index 0000000000..5dcfd13c51
--- /dev/null
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/ITextSource.cs
@@ -0,0 +1,206 @@
+//
+// ITextSource.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.IO;
+using System.Text;
+
+namespace MonoDevelop.Core.Text
+{
+	/// <summary>
+	/// A read-only view on a (potentially mutable) text source.
+	/// The IDocument interface derives from this interface.
+	/// </summary>
+	public interface ITextSource
+	{
+		/// <summary>
+		/// Gets a version identifier for this text source.
+		/// Returns null for unversioned text sources.
+		/// </summary>
+		ITextSourceVersion Version { get; }
+
+		/// <summary>
+		/// Determines if a byte order mark was read or is going to be written.
+		/// </summary>
+		bool UseBOM { get; }
+
+		/// <summary>
+		/// Encoding of the text that was read from or is going to be saved to.
+		/// </summary>
+		Encoding Encoding { get; }
+
+		/// <summary>
+		/// Gets the total text length.
+		/// </summary>
+		/// <returns>The length of the text, in characters.</returns>
+		/// <remarks>This is the same as Text.Length, but is more efficient because
+		///  it doesn't require creating a String object.</remarks>
+		int Length { get; }
+
+		/// <summary>
+		/// Gets the whole text as string.
+		/// </summary>
+		[System.Diagnostics.CodeAnalysis.SuppressMessage ("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods")]
+		string Text { get; }
+
+		/// <summary>
+		/// Gets a character at the specified position in the document.
+		/// </summary>
+		/// <paramref name="offset">The index of the character to get.</paramref>
+		/// <exception cref="ArgumentOutOfRangeException">Offset is outside the valid range (0 to TextLength-1).</exception>
+		/// <returns>The character at the specified position.</returns>
+		/// <remarks>This is the same as Text[offset], but is more efficient because
+		///  it doesn't require creating a String object.</remarks>
+		char this [int offset] { get; }
+
+		/// <summary>
+		/// Gets a character at the specified position in the document.
+		/// </summary>
+		/// <paramref name="offset">The index of the character to get.</paramref>
+		/// <exception cref="ArgumentOutOfRangeException">Offset is outside the valid range (0 to TextLength-1).</exception>
+		/// <returns>The character at the specified position.</returns>
+		/// <remarks>This is the same as Text[offset], but is more efficient because
+		///  it doesn't require creating a String object.</remarks>
+		char GetCharAt (int offset);
+
+		/// <summary>
+		/// Retrieves the text for a portion of the document.
+		/// </summary>
+		/// <exception cref="ArgumentOutOfRangeException">offset or length is outside the valid range.</exception>
+		/// <remarks>This is the same as Text.Substring, but is more efficient because
+		///  it doesn't require creating a String object for the whole document.</remarks>
+		string GetTextAt (int offset, int length);
+
+		/// <summary>
+		/// Creates a new TextReader to read from this text source.
+		/// </summary>
+		TextReader CreateReader ();
+
+		/// <summary>
+		/// Creates a new TextReader to read from this text source.
+		/// </summary>
+		TextReader CreateReader (int offset, int length);		
+
+		/// <summary>
+		/// Writes the text from this document into the TextWriter.
+		/// </summary>
+		void WriteTextTo (TextWriter writer);
+
+		/// <summary>
+		/// Writes the text from this document into the TextWriter.
+		/// </summary>
+		void WriteTextTo (TextWriter writer, int offset, int length);
+
+		/// <summary>
+		/// Creates an immutable snapshot of this text source.
+		/// Unlike all other methods in this interface, this method is thread-safe.
+		/// </summary>
+		ITextSource CreateSnapshot ();
+
+		/// <summary>
+		/// Creates an immutable snapshot of a part of this text source.
+		/// Unlike all other methods in this interface, this method is thread-safe.
+		/// </summary>
+		ITextSource CreateSnapshot (int offset, int length);
+	}
+
+	public static class TextSourceExtension
+	{
+		/// <summary>
+		/// Retrieves the text for a portion of the document.
+		/// </summary>
+		/// <exception cref="ArgumentOutOfRangeException">offset or length is outside the valid range.</exception>
+		public static string GetTextAt (this ITextSource source, ISegment segment)
+		{
+			if (source == null)
+				throw new ArgumentNullException ("source");
+			return source.GetTextAt (segment.Offset, segment.Length);
+		}
+
+
+		public static string GetTextBetween (this ITextSource source, int startOffset, int endOffset)
+		{
+			if (source == null)
+				throw new ArgumentNullException ("source");
+			if (startOffset < 0 || startOffset > source.Length)
+				throw new ArgumentNullException ("startOffset");
+			if (endOffset < 0 || endOffset > source.Length)
+				throw new ArgumentNullException ("endOffset");
+			if (startOffset > endOffset)
+				throw new InvalidOperationException ();
+			return source.GetTextAt (startOffset, endOffset - startOffset);
+		}
+
+
+		/// <summary>
+		/// Writes the text from this document into a file.
+		/// </summary>
+		public static void WriteTextTo (this ITextSource source, string fileName)
+		{
+			if (source == null)
+				throw new ArgumentNullException ("source");
+			TextFileUtility.WriteText (fileName, source.Text, source.Encoding, source.UseBOM); 
+		}
+
+		/// <summary>
+		/// Writes the text from this document into the TextWriter.
+		/// </summary>
+		public static void WriteTextTo (this ITextSource source, TextWriter writer, ISegment segment)
+		{
+			if (source == null)
+				throw new ArgumentNullException ("source");
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			source.WriteTextTo (writer, segment.Offset, segment.Length);
+		}
+
+		/// <summary>
+		/// Creates a new TextReader to read from this text source.
+		/// </summary>
+		public static TextReader CreateReader (this ITextSource source, ISegment segment)
+		{
+			if (source == null)
+				throw new ArgumentNullException ("source");
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return source.CreateReader (segment.Offset, segment.Length);
+		}
+
+		/// <summary>
+		/// Creates an immutable snapshot of a part of this text source.
+		/// Unlike all other methods in this interface, this method is thread-safe.
+		/// </summary>
+		public static ITextSource CreateSnapshot (this ITextSource source, ISegment segment)
+		{
+			if (source == null)
+				throw new ArgumentNullException ("source");
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return source.CreateSnapshot (segment.Offset, segment.Length);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/ITextSourceVersion.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/ITextSourceVersion.cs
new file mode 100644
index 0000000000..e63b8214fd
--- /dev/null
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/ITextSourceVersion.cs
@@ -0,0 +1,74 @@
+//
+// ITextSourceVersion.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+
+namespace MonoDevelop.Core.Text
+{
+	/// <summary>
+	/// Represents a version identifier for a text source.
+	/// </summary>
+	/// <remarks>
+	/// Verions can be used to efficiently detect whether a document has changed and needs reparsing;
+	/// or even to implement incremental parsers.
+	/// It is a separate class from ITextSource to allow the GC to collect the text source while
+	/// the version checkpoint is still in use.
+	/// </remarks>
+	public interface ITextSourceVersion
+	{
+		/// <summary>
+		/// Gets whether this checkpoint belongs to the same document as the other checkpoint.
+		/// </summary>
+		/// <remarks>
+		/// Returns false when given <c>null</c>.
+		/// </remarks>
+		bool BelongsToSameDocumentAs (ITextSourceVersion other);
+
+		/// <summary>
+		/// Compares the age of this checkpoint to the other checkpoint.
+		/// </summary>
+		/// <remarks>This method is thread-safe.</remarks>
+		/// <exception cref="ArgumentException">Raised if 'other' belongs to a different document than this version.</exception>
+		/// <returns>-1 if this version is older than <paramref name="other"/>.
+		/// 0 if <c>this</c> version instance represents the same version as <paramref name="other"/>.
+		/// 1 if this version is newer than <paramref name="other"/>.</returns>
+		int CompareAge (ITextSourceVersion other);
+
+		/// <summary>
+		/// Gets the changes from this checkpoint to the other checkpoint.
+		/// If 'other' is older than this checkpoint, reverse changes are calculated.
+		/// </summary>
+		/// <remarks>This method is thread-safe.</remarks>
+		/// <exception cref="ArgumentException">Raised if 'other' belongs to a different document than this checkpoint.</exception>
+		IEnumerable<TextChangeEventArgs> GetChangesTo (ITextSourceVersion other);
+
+		/// <summary>
+		/// Calculates where the offset has moved in the other buffer version.
+		/// </summary>
+		/// <exception cref="ArgumentException">Raised if 'other' belongs to a different document than this checkpoint.</exception>
+		int MoveOffsetTo (ITextSourceVersion other, int oldOffset);
+	}
+}
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/StringTextSource.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/StringTextSource.cs
new file mode 100644
index 0000000000..d223d16bc7
--- /dev/null
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/StringTextSource.cs
@@ -0,0 +1,173 @@
+//
+// StringTextSource.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Text;
+using System.IO;
+
+namespace MonoDevelop.Core.Text
+{
+	/// <summary>
+	/// Implements the ITextSource interface using a string.
+	/// Note that objects from this class are immutable.
+	/// </summary>
+	[Serializable]
+	public class StringTextSource : ITextSource
+	{
+		/// <summary>
+		/// Gets a text source containing the empty string.
+		/// </summary>
+		public static readonly StringTextSource Empty = new StringTextSource (string.Empty);
+
+		readonly string text;
+		readonly ITextSourceVersion version;
+
+		/// <summary>
+		/// Determines if a byte order mark was read or is going to be written.
+		/// </summary>
+		public bool UseBOM { get; private set; }
+
+		/// <summary>
+		/// Encoding of the text that was read from or is going to be saved to.
+		/// </summary>
+		public Encoding Encoding { get; private set; }
+
+		/// <summary>
+		/// Creates a new StringTextSource with the given text.
+		/// </summary>
+		public StringTextSource (string text, Encoding encoding = null, bool useBom = true)
+		{
+			if (text == null)
+				throw new ArgumentNullException ("text");
+			this.text = text;
+			this.UseBOM = useBom;
+			this.Encoding = encoding ?? Encoding.UTF8;
+		}
+
+		/// <summary>
+		/// Creates a new StringTextSource with the given text.
+		/// </summary>
+		public StringTextSource (string text, ITextSourceVersion version, Encoding encoding = null, bool useBom = true)
+		{
+			if (text == null)
+				throw new ArgumentNullException ("text");
+			this.text = text;
+			this.version = version;
+			this.UseBOM = useBom;
+			this.Encoding = encoding ?? Encoding.UTF8;
+		}
+
+		/// <inheritdoc/>
+		public ITextSourceVersion Version {
+			get { return version; }
+		}
+
+		/// <inheritdoc/>
+		public int Length {
+			get { return text.Length; }
+		}
+
+		/// <inheritdoc/>
+		public string Text {
+			get { return text; }
+		}
+
+		/// <inheritdoc/>
+		public ITextSource CreateSnapshot ()
+		{
+			return this; // StringTextSource is immutable
+		}
+
+		/// <inheritdoc/>
+		public ITextSource CreateSnapshot (int offset, int length)
+		{
+			return new StringTextSource (text.Substring (offset, length));
+		}
+
+		/// <inheritdoc/>
+		public char GetCharAt (int offset)
+		{
+			return text [offset];
+		}
+
+		public char this [int offset] {
+			get {
+				return text [offset];
+			}
+		}
+
+		/// <inheritdoc/>
+		public string GetTextAt (int offset, int length)
+		{
+			return text.Substring (offset, length);
+		}
+
+		public StringTextSource WithEncoding (Encoding encoding)
+		{
+			return new StringTextSource (text, encoding, UseBOM);
+		}
+
+		public StringTextSource WithBom (bool useBom)
+		{
+			return new StringTextSource (text, Encoding, useBom);
+		}
+
+		public static StringTextSource ReadFrom (string fileName)
+		{
+			bool hadBom;
+			Encoding encoding;
+			var text = TextFileUtility.ReadAllText (fileName, out hadBom, out encoding);
+			return new StringTextSource (text, encoding, hadBom);
+		}
+
+		/// <inheritdoc/>
+		public TextReader CreateReader ()
+		{
+			return new StringReader (text);
+		}
+
+		/// <inheritdoc/>
+		public TextReader CreateReader (int offset, int length)
+		{
+			return new StringReader (text.Substring (offset, length));
+		}
+
+		/// <inheritdoc/>
+		public void WriteTextTo (TextWriter writer)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			writer.Write (text);
+		}
+
+		/// <inheritdoc/>
+		public void WriteTextTo (TextWriter writer, int offset, int length)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			writer.Write (text.Substring (offset, length));
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/TextChangeEventArgs.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/TextChangeEventArgs.cs
new file mode 100644
index 0000000000..ccd4033844
--- /dev/null
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/TextChangeEventArgs.cs
@@ -0,0 +1,135 @@
+//
+// TextChangeEventArgs.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Core.Text
+{
+	/// <summary>
+	/// Describes a change of the document text.
+	/// This class is thread-safe.
+	/// </summary>
+	[Serializable]
+	public class TextChangeEventArgs : EventArgs
+	{
+		readonly int offset;
+		readonly ITextSource removedText;
+		readonly ITextSource insertedText;
+
+		/// <summary>
+		/// The offset at which the change occurs.
+		/// </summary>
+		public int Offset {
+			get { return offset; }
+		}
+
+		/// <summary>
+		/// The text that was removed.
+		/// </summary>
+		public ITextSource RemovedText {
+			get { return removedText; }
+		}
+
+		/// <summary>
+		/// The number of characters removed.
+		/// </summary>
+		public int RemovalLength {
+			get { return removedText.Length; }
+		}
+
+		/// <summary>
+		/// The text that was inserted.
+		/// </summary>
+		public ITextSource InsertedText {
+			get { return insertedText; }
+		}
+
+		/// <summary>
+		/// The number of characters inserted.
+		/// </summary>
+		public int InsertionLength {
+			get { return insertedText.Length; }
+		}
+
+		/// <summary>
+		/// InsertionLength - RemovalLength
+		/// </summary>
+		public int ChangeDelta {
+			get {
+				return InsertionLength - RemovalLength;
+			}
+		}
+
+		/// <summary>
+		/// Creates a new TextChangeEventArgs object.
+		/// </summary>
+		public TextChangeEventArgs(int offset, string removedText, string insertedText)
+		{
+			if (offset < 0)
+				throw new ArgumentOutOfRangeException("offset", offset, "offset must not be negative");
+			this.offset = offset;
+			this.removedText = removedText != null ? new StringTextSource(removedText) : StringTextSource.Empty;
+			this.insertedText = insertedText != null ? new StringTextSource(insertedText) : StringTextSource.Empty;
+		}
+
+		/// <summary>
+		/// Creates a new TextChangeEventArgs object.
+		/// </summary>
+		public TextChangeEventArgs(int offset, ITextSource removedText, ITextSource insertedText)
+		{
+			if (offset < 0)
+				throw new ArgumentOutOfRangeException("offset", offset, "offset must not be negative");
+			this.offset = offset;
+			this.removedText = removedText ?? StringTextSource.Empty;
+			this.insertedText = insertedText ?? StringTextSource.Empty;
+		}
+
+		/// <summary>
+		/// Gets the new offset where the specified offset moves after this document change.
+		/// </summary>
+		public virtual int GetNewOffset(int offset)
+		{
+			if (offset >= this.Offset && offset <= this.Offset + this.RemovalLength) {
+//				if (movementType == AnchorMovementType.BeforeInsertion)
+//					return this.Offset;
+//				else
+					return this.Offset + this.InsertionLength;
+			} else if (offset > this.Offset) {
+				return offset + this.InsertionLength - this.RemovalLength;
+			} else {
+				return offset;
+			}
+		}
+
+		/// <summary>
+		/// Creates TextChangeEventArgs for the reverse change.
+		/// </summary>
+		public virtual TextChangeEventArgs Invert()
+		{
+			return new TextChangeEventArgs(offset, insertedText, removedText);
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/TextFileUtility.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/TextFileUtility.cs
new file mode 100644
index 0000000000..5d7eed6fab
--- /dev/null
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/TextFileUtility.cs
@@ -0,0 +1,850 @@
+//
+// TextFileUtility.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace MonoDevelop.Core.Text
+{
+	/// <summary>
+	/// This class handles text input from files, streams and byte arrays with auto-detect encoding.
+	/// </summary>
+	public static class TextFileUtility
+	{
+		readonly static int maxBomLength = 0;
+		readonly static Encoding[] encodingsWithBom;
+
+		static TextFileUtility ()
+		{
+			var encodings = new List<Encoding> ();
+
+			foreach (var info in Encoding.GetEncodings ()) {
+				Encoding encoding;
+				try {
+					encoding = info.GetEncoding ();
+				} catch (NotSupportedException) {
+					continue;
+				}
+				var bom = encoding.GetPreamble ();
+				if (bom == null || bom.Length == 0)
+					continue;
+				maxBomLength = Math.Max (maxBomLength, bom.Length);
+				encodings.Add (encoding);
+			}
+			encodingsWithBom = encodings.ToArray ();
+
+			// Encoding verifiers
+			var verifierList = new List<Verifier> {
+				new Utf8Verifier (),
+				new GB18030CodePageVerifier (),
+				new WindowsCodePageVerifier (),
+				new UnicodeVerifier (),
+				new BigEndianUnicodeVerifier (),
+				new CodePage858Verifier ()
+			};
+
+			verifiers = verifierList.Where (v => v.IsSupported).ToArray ();
+
+			// cache the verifier machine state tables, to do the virtual StateTable only once.
+			stateTables = new byte[verifiers.Length][][];
+			for (int i = 0; i < verifiers.Length; i++) {
+				verifiers [i].Initialize ();
+				stateTables [i] = verifiers [i].StateTable;
+			}
+		}
+
+		#region stream reader methods
+		public static StreamReader OpenStream (string fileName)
+		{
+			bool hadBom;
+			return OpenStream (File.ReadAllBytes (fileName), out hadBom);
+		}
+
+		public static StreamReader OpenStream (string fileName, out bool hadBom)
+		{
+			return OpenStream (File.ReadAllBytes (fileName), out hadBom);
+		}
+
+		public static StreamReader OpenStream (byte[] bytes)
+		{
+			bool hadBom;
+			return OpenStream (bytes, out hadBom);
+		}
+
+		public static StreamReader OpenStream (byte[] bytes, out bool hadBom)
+		{
+			if (bytes == null)
+				throw new ArgumentNullException ("bytes");
+			return OpenStream (new MemoryStream (bytes, false), out hadBom);
+		}
+
+		public static StreamReader OpenStream (Stream stream)
+		{
+			bool hadBom;
+			return OpenStream (stream, out hadBom);
+		}
+
+		public static StreamReader OpenStream (Stream stream, out bool hadBom)
+		{
+			if (stream == null)
+				throw new ArgumentNullException ("stream");
+			byte[] possibleBom = new byte[maxBomLength];
+			stream.Read (possibleBom, 0, Math.Min ((int)stream.Length, maxBomLength));
+
+			foreach (var encoding in encodingsWithBom) {
+				var bom = encoding.GetPreamble ();
+				bool invalid = false;
+				for (int i = 0; i < bom.Length; i++) {
+					if (bom [i] != possibleBom [i]) {
+						invalid = true;
+						break;
+					}
+				}
+
+				if (!invalid) {
+					hadBom = true;
+					stream.Position = bom.Length;
+					return new StreamReader (stream, encoding);
+				}
+			}
+			stream.Position = 0;
+			hadBom = false;
+			return new StreamReader (stream, AutoDetectEncoding (stream));
+		}
+		#endregion
+
+		#region string methods
+		public static string GetText (byte[] bytes)
+		{
+			using (var stream = OpenStream (bytes)) {
+				return stream.ReadToEnd ();
+			}
+		}
+
+		public static string GetText (byte[] bytes, out Encoding encoding, out bool hadBom)
+		{
+			if (bytes == null)
+				throw new ArgumentNullException ("bytes");
+			using (var stream = OpenStream (bytes, out hadBom)) {
+				encoding = stream.CurrentEncoding;
+				return stream.ReadToEnd ();
+			}
+		}
+
+		public static string GetText (byte[] bytes, Encoding encoding, out bool hadBom)
+		{
+			byte[] bom = encoding.GetPreamble ();
+			if (bom != null && bom.Length > 0 && bom.Length <= bytes.Length) {
+				hadBom = true;
+				for (int i = 0; i < bom.Length; i++) {
+					if (bytes [i] != bom [i]) {
+						hadBom = false;
+						break;
+					}
+				}
+			} else {
+				hadBom = false;
+			}
+			if (hadBom) 
+				return encoding.GetString (bytes, bom.Length, bytes.Length - bom.Length);
+			return encoding.GetString (bytes);
+		}
+
+		public static string GetText (Stream inputStream)
+		{
+			using (var stream = OpenStream (inputStream)) {
+				return stream.ReadToEnd ();
+			}
+		}
+
+		public static string GetText (Stream inputStream, out Encoding encoding, out bool hadBom)
+		{
+			if (inputStream == null)
+				throw new ArgumentNullException ("inputStream");
+			using (var stream = OpenStream (inputStream, out hadBom)) {
+				encoding = stream.CurrentEncoding;
+				return stream.ReadToEnd ();
+			}
+		}
+
+		public static string GetText (string fileName)
+		{
+			using (var stream = OpenStream (fileName)) {
+				return stream.ReadToEnd ();
+			}
+		}
+
+		public static string GetText (string fileName, out Encoding encoding, out bool hadBom)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
+			using (var stream = OpenStream (fileName, out hadBom)) {
+				encoding = stream.CurrentEncoding;
+				return stream.ReadToEnd ();
+			}
+		}
+
+		#endregion
+
+		#region file methods
+		public static void WriteText (string fileName, string text, Encoding encoding, bool hadBom)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
+			if (text == null)
+				throw new ArgumentNullException ("text");
+			if (encoding == null)
+				throw new ArgumentNullException ("encoding");
+			// atomic rename only works in the same directory on linux. The tmp files may be on another partition -> breaks save.
+			string tmpPath = Path.Combine (Path.GetDirectoryName (fileName), ".#" + Path.GetFileName (fileName));
+			using (var stream = new FileStream (tmpPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Write)) {
+				if (hadBom) {
+					var bom = encoding.GetPreamble ();
+					if (bom != null && bom.Length > 0)
+						stream.Write (bom, 0, bom.Length);
+				}
+				byte[] bytes = encoding.GetBytes (text);
+				stream.Write (bytes, 0, bytes.Length);
+			}
+			try {
+				SystemRename (tmpPath, fileName);
+			} catch (Exception) {
+				try {
+					File.Delete (tmpPath);
+				} catch {
+					// nothing
+				}
+				throw;
+			}
+		}
+
+		/// <summary>
+		/// Returns a byte array containing the text encoded by a specified encoding &amp; bom.
+		/// </summary>
+		/// <param name="text">The text to encode.</param>
+		/// <param name="encoding">The encoding.</param>
+		/// <param name="hadBom">If set to <c>true</c> a bom will be prepended.</param>
+		public static byte[] GetBuffer (string text, Encoding encoding, bool hadBom)
+		{
+			using (var stream = new MemoryStream ()) {
+				if (hadBom) {
+					var bom = encoding.GetPreamble ();
+					if (bom != null && bom.Length > 0)
+						stream.Write (bom, 0, bom.Length);
+				}
+				byte[] bytes = encoding.GetBytes (text);
+				stream.Write (bytes, 0, bytes.Length);
+				return stream.GetBuffer ();
+			}
+		}
+
+		// Code taken from FileService.cs
+		static void SystemRename (string sourceFile, string destFile)
+		{
+			//FIXME: use the atomic System.IO.File.Replace on NTFS
+			if (Platform.IsWindows) {
+				string wtmp = null;
+				if (File.Exists (destFile)) {
+					do {
+						wtmp = Path.Combine (Path.GetTempPath (), Guid.NewGuid ().ToString ());
+					} while (File.Exists (wtmp));
+					File.Move (destFile, wtmp);
+				}
+				try {
+					File.Move (sourceFile, destFile);
+				} catch {
+					try {
+						if (wtmp != null)
+							File.Move (wtmp, destFile);
+					} catch {
+						wtmp = null;
+					}
+					throw;
+				} finally {
+					if (wtmp != null) {
+						try {
+							File.Delete (wtmp);
+						} catch {
+						}
+					}
+				}
+			} else {
+				Mono.Unix.Native.Syscall.rename (sourceFile, destFile);
+			}
+		}
+
+		public static string ReadAllText (string fileName)
+		{
+			bool hadBom;
+			Encoding encoding;
+			return ReadAllText (fileName, out hadBom, out encoding);
+		}
+
+		public static string ReadAllText (string fileName, out bool hadBom, out Encoding encoding)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
+			using (var stream = new FileStream (fileName, FileMode.Open, FileAccess.Read, FileShare.Read)) {
+				return GetText (stream, out encoding, out hadBom);
+			}
+		}
+
+		public static string ReadAllText (string fileName, Encoding encoding, out bool hadBom)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
+			if (encoding == null)
+				throw new ArgumentNullException ("encoding");
+
+			byte[] content = File.ReadAllBytes (fileName);
+			return GetText (content, encoding, out hadBom); 
+		}
+		#endregion
+
+		#region ASCII encoding check
+		public static bool IsASCII (string text)
+		{
+			if (text == null)
+				throw new ArgumentNullException ("text");
+			for (int i = 0; i < text.Length; i++) {
+				var ch = text [i];
+				if (ch > 0x7F)
+					return false;
+			}
+			return true;
+		}
+		#endregion
+
+		#region Binary check
+		public static bool IsBinary (byte[] bytes)
+		{
+			if (bytes == null)
+				throw new ArgumentNullException ("bytes");
+			return IsBinary (new MemoryStream (bytes, false));
+		}
+
+		public static bool IsBinary (string fileName)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
+			using (var stream = new FileStream (fileName, FileMode.Open, FileAccess.Read, FileShare.Read)) {
+				return IsBinary (stream);
+			}
+		}
+
+		public static bool IsBinary (Stream stream)
+		{
+			if (stream == null)
+				throw new ArgumentNullException ("stream");
+
+			var enc = AutoDetectEncoding (stream);
+			return enc == Encoding.ASCII;
+		}
+		#endregion
+
+		#region Encoding autodetection
+		static readonly Verifier[] verifiers;
+		static readonly byte[][][] stateTables;
+
+		static unsafe Encoding AutoDetectEncoding (Stream stream)
+		{
+			try {
+				int max = (int)Math.Min (stream.Length, 50 * 1024);
+				byte[] readBuf = new byte[max];
+				int readLength = stream.Read (readBuf, 0, max);
+				stream.Position = 0;
+
+				// Store the dfa data from the verifiers in local variables.
+				byte[] states = new byte[verifiers.Length];
+				int verifiersRunning = verifiers.Length;
+
+				for (int i = 0; i < verifiers.Length; i++)
+					states [i] = verifiers [i].InitalState;
+
+				// run the verifiers
+				fixed (byte* bBeginPtr = readBuf, stateBeginPtr = states) {
+					byte* bPtr = bBeginPtr;
+					byte* bEndPtr = bBeginPtr + readLength;
+					byte* sEndPtr = stateBeginPtr + states.Length;
+
+					while (bPtr != bEndPtr) {
+						byte* sPtr = stateBeginPtr;
+						int i = 0;
+						while (sPtr != sEndPtr) {
+							byte curState = *sPtr;
+							if (curState != 0) {
+								curState = stateTables [i] [curState] [*bPtr];
+								if (curState == 0) {
+									verifiersRunning--;
+									if (verifiersRunning == 0) 
+										goto finishVerify;
+								}
+								*sPtr = curState;
+							}
+							sPtr++;
+							i++;
+						}
+						bPtr++;
+					}
+					finishVerify:
+					if (verifiersRunning > 0) {
+						//						Console.WriteLine ("valid encodings:");
+						//						for (int i = 0; i < verifiers.Length; i++) {
+						//							if (verifiers [i].IsEncodingValid (states [i]))
+						//								Console.WriteLine (verifiers [i].Encoding.EncodingName);
+						//						}
+						//						Console.WriteLine ("---------------");
+						for (int i = 0; i < verifiers.Length; i++) {
+							if (verifiers [i].IsEncodingValid (states [i]))
+								return verifiers [i].Encoding;
+						}
+					}
+				}
+
+			} catch (Exception e) {
+				Console.WriteLine (e);
+			}
+			return Encoding.ASCII;
+		}
+
+		abstract class Verifier
+		{
+			internal const byte Error = 0;
+			protected static readonly byte[] errorTable = new byte[(int)byte.MaxValue + 1];
+
+			public abstract byte InitalState { get; }
+
+			public abstract Encoding Encoding { get; }
+
+			public abstract byte[][] StateTable { get; }
+
+			protected abstract void Init ();
+
+			bool isInitialized = false;
+
+			public void Initialize ()
+			{
+				if (isInitialized)
+					throw new InvalidOperationException ("Already initialized");
+				isInitialized = true;
+				Init ();
+			}
+
+			public abstract bool IsSupported { get; }
+
+			public virtual bool IsEncodingValid (byte state)
+			{
+				return state != Error; 
+			}
+		}
+
+		class Utf8Verifier : Verifier
+		{
+			const byte UTF1 = 1;
+			const byte UTFTail1 = 2;
+			const byte UTFTail2 = 3;
+			const byte UTFTail3 = 4;
+			const byte UTF8_3_TailPre1 = 5;
+			const byte UTF8_3_TailPre2 = 6;
+			const byte UTF8_4_TailPre1 = 7;
+			const byte UTF8_4_TailPre2 = 8;
+			const byte LAST = 9;
+			static byte[][] table;
+
+			public override bool IsSupported {
+				get {
+					try {
+						return Encoding.UTF8 != null;
+					} catch (Exception) {
+						return false;
+					}
+				}
+			}
+
+			protected override void Init ()
+			{
+				table = new byte[LAST][];
+				table [0] = errorTable;
+				for (int i = 1; i < LAST; i++)
+					table [i] = new byte[(int)byte.MaxValue + 1];
+
+				// UTF8-1      = %x00-7F
+				// Take out the 0 case, that indicates a UTF16/32 file.
+				for (int i = 0x00; i <= 0x7F; i++) {
+					table [UTF1] [i] = UTF1;
+				}
+
+				// UTF8-tail   = %x80-BF
+				for (int i = 0x80; i <= 0xBF; i++) {
+					table [UTFTail1] [i] = UTF1;
+					table [UTFTail2] [i] = UTFTail1;
+					table [UTFTail3] [i] = UTFTail2;
+				}
+
+				// UTF8-2 = %xC2-DF UTF8-tail
+				for (int i = 0xC2; i <= 0xDF; i++)
+					table [UTF1] [i] = UTFTail1;
+
+				// UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
+				//               %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
+				for (int i = 0xA0; i <= 0xBF; i++) {
+					table [UTF8_3_TailPre1] [i] = UTFTail1;
+				}
+				for (int i = 0x80; i <= 0x9F; i++) {
+					table [UTF8_3_TailPre2] [i] = UTFTail1;
+				}
+
+				table [UTF1] [0xE0] = UTF8_3_TailPre1;
+				for (int i = 0xE1; i <= 0xEC; i++)
+					table [UTF1] [i] = UTFTail2;
+				table [UTF1] [0xED] = UTF8_3_TailPre2;
+				for (int i = 0xEE; i <= 0xEF; i++)
+					table [UTF1] [i] = UTFTail2;
+
+				// UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
+				//               %xF4 %x80-8F 2( UTF8-tail )
+
+				for (int i = 0x90; i <= 0xBF; i++) {
+					table [UTF8_4_TailPre1] [i] = UTFTail2;
+				}
+				for (int i = 0x80; i <= 0xBF; i++) {
+					table [UTF8_4_TailPre2] [i] = UTFTail2;
+				}
+				table [UTF1] [0xF0] = UTF8_4_TailPre1;
+				for (int i = 0xF1; i <= 0xF3; i++)
+					table [UTF1] [i] = UTFTail3;
+				table [UTF1] [0xF4] = UTF8_4_TailPre2;
+
+				// always invalid.
+				for (int i = 0; i < table.Length; i++) {
+					table [i] [0xC0] = Error;
+					table [i] [0xC1] = Error;
+					table [i] [0xF5] = Error;
+					table [i] [0xFF] = Error;
+				}
+			}
+
+			public override byte InitalState { get { return UTF1; } }
+
+			public override Encoding Encoding { get { return Encoding.UTF8; } }
+
+			public override byte[][] StateTable { get { return table; } }
+		}
+
+		/// <summary>
+		/// Unicode verifier
+		/// </summary> 
+		class UnicodeVerifier : Verifier
+		{
+			const byte Even = 1;
+			const byte Odd = 2;
+			const byte EvenPossible = 3;
+			const byte OddPossible = 4;
+			const byte LAST = 5;
+			static byte[][] table;
+
+			protected override void Init ()
+			{
+				// Simple approach - detect 0 at odd posititons, then it's likely a utf16
+				// if 0 at an even position it's regarded as no utf-16.
+				table = new byte[LAST][];
+				table [0] = errorTable;
+				for (int i = 1; i < LAST; i++)
+					table [i] = new byte[(int)byte.MaxValue + 1];
+
+				for (int i = 0x00; i <= 0xFF; i++) {
+					table [Even] [i] = Odd;
+					table [Odd] [i] = Even;
+					table [EvenPossible] [i] = OddPossible;
+					table [OddPossible] [i] = EvenPossible;
+				}
+				table [Odd] [0] = EvenPossible;
+				table [Even] [0] = Error;
+				table [EvenPossible] [0] = Error;
+			}
+
+			public override byte InitalState { get { return Even; } }
+
+			public override Encoding Encoding { get { return Encoding.Unicode; } }
+
+			public override byte[][] StateTable { get { return table; } }
+
+			public override bool IsSupported {
+				get {
+					try {
+						return Encoding.Unicode != null;
+					} catch (Exception) {
+						return false;
+					}
+				}
+			}
+
+			public override bool IsEncodingValid (byte state)
+			{
+				return state == EvenPossible || state == OddPossible;
+			}
+		}
+
+		class BigEndianUnicodeVerifier : Verifier
+		{
+			const byte Even = 1;
+			const byte Odd = 2;
+			const byte EvenPossible = 3;
+			const byte OddPossible = 4;
+			const byte LAST = 5;
+
+			public override byte InitalState { get { return Even; } }
+
+			public override Encoding Encoding { get { return Encoding.BigEndianUnicode; } }
+
+			public override byte[][] StateTable { get { return table; } }
+
+			public override bool IsSupported {
+				get {
+					try {
+						return Encoding.BigEndianUnicode != null;
+					} catch (Exception) {
+						return false;
+					}
+				}
+			}
+
+			public override bool IsEncodingValid (byte state)
+			{
+				return state == EvenPossible || state == OddPossible;
+			}
+
+			static byte[][] table;
+
+			protected override void Init ()
+			{
+				// Simple approach - detect 0 at even posititons, then it's likely a utf16be
+				// if 0 at an odd position it's regarded as no utf-16be.
+				table = new byte[LAST][];
+				table [0] = errorTable;
+				for (int i = 1; i < LAST; i++)
+					table [i] = new byte[(int)byte.MaxValue + 1];
+
+				for (int i = 0x00; i <= 0xFF; i++) {
+					table [Even] [i] = Odd;
+					table [Odd] [i] = Even;
+					table [EvenPossible] [i] = OddPossible;
+					table [OddPossible] [i] = EvenPossible;
+				}
+				table [Odd] [0] = Error;
+				table [OddPossible] [0] = Error;
+				table [Even] [0] = OddPossible;
+			}
+		}
+
+		/// <summary>
+		/// Code page 1252 was the long time default on windows. This encoding is a superset of ISO 8859-1.
+		/// </summary>
+		class WindowsCodePageVerifier : Verifier
+		{
+			const byte Valid = 1;
+			const byte LAST = 2;
+			static byte[][] table;
+			static Encoding EncodingWindows;
+
+			public override byte InitalState { get { return Valid; } }
+
+			public override Encoding Encoding { get { return EncodingWindows; } }
+
+			public override byte[][] StateTable { get { return table; } }
+
+
+			const int westernEncodingCodePage = 1252;
+			/// <summary>
+			/// Try to guess the windows code page using the default encoding, on non windows system default
+			/// to 1252 (western encoding).
+			/// </summary>
+			int WindowsCodePage {
+				get {
+					if (Platform.IsWindows) {
+						int cp = Encoding.Default.CodePage;
+						if (cp >= 1250 && cp < 1260)
+							return cp;
+					}
+					return westernEncodingCodePage;
+				}
+			}
+
+			public override bool IsSupported {
+				get {
+					try {
+						return Encoding.GetEncoding (WindowsCodePage) != null;
+					} catch (Exception) {
+						return false;
+					}
+				}
+			}
+
+			protected override void Init ()
+			{
+				EncodingWindows = Encoding.GetEncoding (WindowsCodePage);
+				table = new byte[LAST][];
+				table [0] = errorTable;
+				for (int i = 1; i < LAST; i++)
+					table [i] = new byte[(int)byte.MaxValue + 1];
+
+				for (int i = 0x00; i <= 0xFF; i++) {
+					table [Valid] [i] = Valid;
+				}
+				table [Valid] [0x81] = Error;
+				table [Valid] [0x8D] = Error;
+				table [Valid] [0x8F] = Error;
+				table [Valid] [0x90] = Error;
+				table [Valid] [0x9D] = Error;
+			}
+		}
+
+		/// <summary>
+		/// Code page 858 supports old DOS style files extended with the euro sign.
+		/// </summary>
+		class CodePage858Verifier : Verifier
+		{
+			const byte Valid = 1;
+			const byte LAST = 2;
+			static byte[][] table;
+			static Encoding EncodingCp858;
+
+			public override byte InitalState { get { return Valid; } }
+
+			public override Encoding Encoding { get { return EncodingCp858; } }
+
+			public override byte[][] StateTable { get { return table; } }
+
+			public override bool IsSupported {
+				get {
+					try {
+						return Encoding.GetEncoding (858) != null;
+					} catch (Exception) {
+						return false;
+					}
+				}
+			}
+
+			protected override void Init ()
+			{
+				EncodingCp858 = Encoding.GetEncoding (858);
+				table = new byte[LAST][];
+				table [0] = errorTable;
+				for (int i = 1; i < LAST; i++)
+					table [i] = new byte[(int)byte.MaxValue + 1];
+
+				for (int i = 0x20; i <= 0xFF; i++) {
+					table [Valid] [i] = Valid;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Try to detect chinese encoding.
+		/// </summary>
+		class GB18030CodePageVerifier : Verifier
+		{
+			const byte Valid  = 1;
+			const byte Second = 2;
+			const byte Third  = 3;
+			const byte Fourth  = 4;
+			const byte NotValid  = 5;
+
+			const byte LAST = 6;
+			static byte[][] table;
+			static Encoding EncodingWindows;
+
+			public override byte InitalState { get { return NotValid; } }
+
+			public override Encoding Encoding { get { return EncodingWindows; } }
+
+			public override byte[][] StateTable { get { return table; } }
+
+			public override bool IsEncodingValid (byte state)
+			{
+				return state == Valid; 
+			}
+
+			int WindowsCodePage {
+				get {
+					return 54936;
+				}
+			}
+
+			public override bool IsSupported {
+				get {
+					try {
+						return Encoding.GetEncoding (WindowsCodePage) != null;
+					} catch (Exception) {
+						return false;
+					}
+				}
+			}
+
+			protected override void Init ()
+			{
+				EncodingWindows = Encoding.GetEncoding (WindowsCodePage);
+				table = new byte[LAST][];
+				table [0] = errorTable;
+				for (int i = 1; i < LAST; i++)
+					table [i] = new byte[(int)byte.MaxValue + 1];
+
+				for (int i = 0x00; i <= 0x80; i++)
+					table [Valid] [i] = Valid;
+				for (int i = 0x81; i <= 0xFE; i++)
+					table [Valid] [i] = Second;
+				table [Valid] [0xFF] = Error;
+
+				// need to encounter a multi byte sequence first.
+				for (int i = 0x00; i <= 0x80; i++)
+					table [NotValid] [i] = NotValid;
+				for (int i = 0x81; i <= 0xFE; i++)
+					table [NotValid] [i] = Second;
+				table [NotValid] [0xFF] = Error;
+
+				for (int i = 0x00; i <= 0xFF; i++)
+					table [Second] [i] = Error;
+				for (int i = 0x40; i <= 0xFE; i++)
+					table [Second] [i] = Valid;
+				for (int i = 0x30; i <= 0x39; i++)
+					table [Second] [i] = Third;
+
+				for (int i = 0x00; i <= 0xFF; i++)
+					table [Third] [i] = Error;
+				for (int i = 0x81; i <= 0xFE; i++)
+					table [Third] [i] = Fourth;
+
+				for (int i = 0x00; i <= 0xFF; i++)
+					table [Fourth] [i] = Error;
+				for (int i = 0x30; i <= 0x39; i++)
+					table [Fourth] [i] = Valid;
+			}
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/TextSourceVersionProvider.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/TextSourceVersionProvider.cs
new file mode 100644
index 0000000000..3e2cae228b
--- /dev/null
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/TextSourceVersionProvider.cs
@@ -0,0 +1,136 @@
+//
+// TextSourceVersionProvider.cs
+//
+// Taken from NRefactory 5.
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MonoDevelop.Core.Text
+{
+	/// <summary>
+	/// Provides ITextSourceVersion instances.
+	/// </summary>
+	public class TextSourceVersionProvider
+	{
+		Version currentVersion;
+
+		public TextSourceVersionProvider ()
+		{
+			this.currentVersion = new Version (this);
+		}
+
+		/// <summary>
+		/// Gets the current version.
+		/// </summary>
+		public ITextSourceVersion CurrentVersion {
+			get { return currentVersion; }
+		}
+
+		/// <summary>
+		/// Replaces the current version with a new version.
+		/// </summary>
+		/// <param name="change">Change from current version to new version</param>
+		public void AppendChange (TextChangeEventArgs change)
+		{
+			if (change == null)
+				throw new ArgumentNullException ("change");
+			currentVersion.change = change;
+			currentVersion.next = new Version (currentVersion);
+			currentVersion = currentVersion.next;
+		}
+
+		sealed class Version : ITextSourceVersion
+		{
+
+			// Reference back to the provider.
+			// Used to determine if two checkpoints belong to the same document.
+			readonly TextSourceVersionProvider provider;
+			// ID used for CompareAge()
+			readonly int id;
+
+			// the change from this version to the next version
+			internal TextChangeEventArgs change;
+			internal Version next;
+
+			internal Version (TextSourceVersionProvider provider)
+			{
+				this.provider = provider;
+			}
+
+			internal Version (Version prev)
+			{
+				this.provider = prev.provider;
+				this.id = unchecked(prev.id + 1);
+			}
+
+			public bool BelongsToSameDocumentAs (ITextSourceVersion other)
+			{
+				Version o = other as Version;
+				return o != null && provider == o.provider;
+			}
+
+			public int CompareAge (ITextSourceVersion other)
+			{
+				if (other == null)
+					throw new ArgumentNullException ("other");
+				var o = other as Version;
+				if (o == null || provider != o.provider)
+					throw new ArgumentException ("Versions do not belong to the same document.");
+				// We will allow overflows, but assume that the maximum distance between checkpoints is 2^31-1.
+				// This is guaranteed on x86 because so many checkpoints don't fit into memory.
+				return Math.Sign (unchecked(this.id - o.id));
+			}
+
+			public IEnumerable<TextChangeEventArgs> GetChangesTo (ITextSourceVersion other)
+			{
+				int result = CompareAge (other);
+				Version o = (Version)other;
+				if (result < 0)
+					return GetForwardChanges (o);
+				else if (result > 0)
+					return o.GetForwardChanges (this).Reverse ().Select (change => change.Invert ());
+				return Enumerable.Empty<TextChangeEventArgs> ();
+			}
+
+			IEnumerable<TextChangeEventArgs> GetForwardChanges (Version other)
+			{
+				for (Version node = this; node != other; node = node.next) {
+					yield return node.change;
+				}
+			}
+
+			public int MoveOffsetTo (ITextSourceVersion other, int oldOffset)
+			{
+				int offset = oldOffset;
+				foreach (var e in GetChangesTo(other)) {
+					offset = e.GetNewOffset (offset);
+				}
+				return offset;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/UnicodeNewLine.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/UnicodeNewLine.cs
new file mode 100644
index 0000000000..0f371c2f32
--- /dev/null
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Text/UnicodeNewLine.cs
@@ -0,0 +1,366 @@
+//
+// UnicodeNewLine.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Core.Text
+{
+	public enum UnicodeNewline
+	{
+		Unknown,
+
+		/// <summary>
+		/// Line Feed, U+000A
+		/// </summary>
+		LF = 0x0A,
+
+
+		CRLF = 0x0D0A,
+
+		/// <summary>
+		/// Carriage Return, U+000D
+		/// </summary>
+		CR = 0x0D,
+
+		/// <summary>
+		/// Next Line, U+0085
+		/// </summary>
+		NEL = 0x85,
+
+		/// <summary>
+		/// Vertical Tab, U+000B
+		/// </summary>
+		VT = 0x0B,
+
+		/// <summary>
+		/// Form Feed, U+000C
+		/// </summary>
+		FF = 0x0C,
+
+		/// <summary>
+		/// Line Separator, U+2028
+		/// </summary>
+		LS = 0x2028,
+
+		/// <summary>
+		/// Paragraph Separator, U+2029
+		/// </summary>
+		PS = 0x2029
+	}
+
+
+	/// <summary>
+	/// Defines unicode new lines according to  Unicode Technical Report #13
+	/// http://www.unicode.org/standard/reports/tr13/tr13-5.html
+	/// </summary>
+	public static class NewLine
+	{
+		/// <summary>
+		/// Carriage Return, U+000D
+		/// </summary>
+		public const char CR = (char)0x0D;
+
+		/// <summary>
+		/// Line Feed, U+000A
+		/// </summary>
+		public const char LF = (char)0x0A;
+
+		/// <summary>
+		/// Next Line, U+0085
+		/// </summary>
+		public const char NEL = (char)0x85;
+
+		/// <summary>
+		/// Vertical Tab, U+000B
+		/// </summary>
+		public const char VT = (char)0x0B;
+
+		/// <summary>
+		/// Form Feed, U+000C
+		/// </summary>
+		public const char FF = (char)0x0C;
+
+		/// <summary>
+		/// Line Separator, U+2028
+		/// </summary>
+		public const char LS = (char)0x2028;
+
+		/// <summary>
+		/// Paragraph Separator, U+2029
+		/// </summary>
+		public const char PS = (char)0x2029;
+
+		/// <summary>
+		/// Determines if a char is a new line delimiter.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name="nextChar">A callback getting the next character (may be null).</param>
+		public static int GetDelimiterLength (char curChar, Func<char> nextChar = null)
+		{
+			if (curChar == CR) {
+				if (nextChar != null && nextChar () == LF)
+					return 2;
+				return 1;
+			}
+
+			if (curChar == LF || curChar == NEL || curChar == VT || curChar == FF || curChar == LS || curChar == PS)
+				return 1;
+			return 0;
+		}
+
+		/// <summary>
+		/// Determines if a char is a new line delimiter.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name="nextChar">The next character (if != LF then length will always be 0 or 1).</param>
+		public static int GetDelimiterLength (char curChar, char nextChar)
+		{
+			if (curChar == CR) {
+				if (nextChar == LF)
+					return 2;
+				return 1;
+			}
+
+			if (curChar == LF || curChar == NEL || curChar == VT || curChar == FF || curChar == LS || curChar == PS)
+				return 1;
+			return 0;
+		}
+
+
+		/// <summary>
+		/// Determines if a char is a new line delimiter.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name = "length">The length of the delimiter</param>
+		/// <param name = "type">The type of the delimiter</param>
+		/// <param name="nextChar">A callback getting the next character (may be null).</param>
+		public static bool TryGetDelimiterLengthAndType (char curChar, out int length, out UnicodeNewline type, Func<char> nextChar = null)
+		{
+			if (curChar == CR) {
+				if (nextChar != null && nextChar () == LF) {
+					length = 2;
+					type = UnicodeNewline.CRLF;
+				} else {
+					length = 1;
+					type = UnicodeNewline.CR;
+
+				}
+				return true;
+			}
+
+			switch (curChar) {
+			case LF:
+				type = UnicodeNewline.LF;
+				length = 1;
+				return true;
+			case NEL:
+				type = UnicodeNewline.NEL;
+				length = 1;
+				return true;
+			case VT:
+				type = UnicodeNewline.VT;
+				length = 1;
+				return true;
+			case FF:
+				type = UnicodeNewline.FF;
+				length = 1;
+				return true;
+			case LS:
+				type = UnicodeNewline.LS;
+				length = 1;
+				return true;
+			case PS:
+				type = UnicodeNewline.PS;
+				length = 1;
+				return true;
+			}
+			length = -1;
+			type = UnicodeNewline.Unknown;
+			return false;
+		}
+
+		/// <summary>
+		/// Determines if a char is a new line delimiter.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name = "length">The length of the delimiter</param>
+		/// <param name = "type">The type of the delimiter</param>
+		/// <param name="nextChar">The next character (if != LF then length will always be 0 or 1).</param>
+		public static bool TryGetDelimiterLengthAndType (char curChar, out int length, out UnicodeNewline type, char nextChar)
+		{
+			if (curChar == CR) {
+				if (nextChar == LF) {
+					length = 2;
+					type = UnicodeNewline.CRLF;
+				} else {
+					length = 1;
+					type = UnicodeNewline.CR;
+
+				}
+				return true;
+			}
+
+			switch (curChar) {
+			case LF:
+				type = UnicodeNewline.LF;
+				length = 1;
+				return true;
+			case NEL:
+				type = UnicodeNewline.NEL;
+				length = 1;
+				return true;
+			case VT:
+				type = UnicodeNewline.VT;
+				length = 1;
+				return true;
+			case FF:
+				type = UnicodeNewline.FF;
+				length = 1;
+				return true;
+			case LS:
+				type = UnicodeNewline.LS;
+				length = 1;
+				return true;
+			case PS:
+				type = UnicodeNewline.PS;
+				length = 1;
+				return true;
+			}
+			length = -1;
+			type = UnicodeNewline.Unknown;
+			return false;
+		}
+
+		/// <summary>
+		/// Gets the new line type of a given char/next char.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name="nextChar">A callback getting the next character (may be null).</param>
+		public static UnicodeNewline GetDelimiterType (char curChar, Func<char> nextChar = null)
+		{
+			switch (curChar) {
+			case CR:
+				if (nextChar != null && nextChar () == LF)
+					return UnicodeNewline.CRLF;
+				return UnicodeNewline.CR;
+			case LF:
+				return UnicodeNewline.LF;
+			case NEL:
+				return UnicodeNewline.NEL;
+			case VT:
+				return UnicodeNewline.VT;
+			case FF:
+				return UnicodeNewline.FF;
+			case LS:
+				return UnicodeNewline.LS;
+			case PS:
+				return UnicodeNewline.PS;
+			}
+			return UnicodeNewline.Unknown;
+		}
+
+		/// <summary>
+		/// Gets the new line type of a given char/next char.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name="nextChar">The next character (if != LF then length will always be 0 or 1).</param>
+		public static UnicodeNewline GetDelimiterType (char curChar, char nextChar)
+		{
+			switch (curChar) {
+			case CR:
+				if (nextChar == LF)
+					return UnicodeNewline.CRLF;
+				return UnicodeNewline.CR;
+			case LF:
+				return UnicodeNewline.LF;
+			case NEL:
+				return UnicodeNewline.NEL;
+			case VT:
+				return UnicodeNewline.VT;
+			case FF:
+				return UnicodeNewline.FF;
+			case LS:
+				return UnicodeNewline.LS;
+			case PS:
+				return UnicodeNewline.PS;
+			}
+			return UnicodeNewline.Unknown;
+		}
+
+		/// <summary>
+		/// Determines if a char is a new line delimiter. 
+		/// 
+		/// Note that the only 2 char wide new line is CR LF and both chars are new line
+		/// chars on their own. For most cases GetDelimiterLength is the better choice.
+		/// </summary>
+		public static bool IsNewLine (char ch)
+		{
+			return
+				ch == NewLine.CR ||
+			ch == NewLine.LF ||
+			ch == NewLine.NEL ||
+			ch == NewLine.VT ||
+			ch == NewLine.FF ||
+			ch == NewLine.LS ||
+			ch == NewLine.PS;
+		}
+
+		/// <summary>
+		/// Gets the new line as a string.
+		/// </summary>
+		public static string GetString (UnicodeNewline newLine)
+		{
+			switch (newLine) {
+			case UnicodeNewline.Unknown:
+				return "";
+			case UnicodeNewline.LF:
+				return "\n";
+			case UnicodeNewline.CRLF:
+				return "\r\n";
+			case UnicodeNewline.CR:
+				return "\r";
+			case UnicodeNewline.NEL:
+				return "\u0085";
+			case UnicodeNewline.VT:
+				return "\u000B";
+			case UnicodeNewline.FF:
+				return "\u000C";
+			case UnicodeNewline.LS:
+				return "\u2028";
+			case UnicodeNewline.PS:
+				return "\u2029";
+			default:
+				throw new ArgumentOutOfRangeException ();
+			}
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
index d980d4c1ce..411f70c72e 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
@@ -98,6 +98,18 @@
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Build.Engine" />
@@ -346,9 +358,7 @@
     <Compile Include="MonoDevelop.Projects.Policies\PolicyContainer.cs" />
     <Compile Include="MonoDevelop.Projects.Policies\ScopedPolicy.cs" />
     <Compile Include="MonoDevelop.Projects.Policies\PolicyDictionary.cs" />
-    <Compile Include="MonoDevelop.Projects.Text\IEditableTextFile.cs" />
     <Compile Include="MonoDevelop.Projects.Text\ITextFile.cs" />
-    <Compile Include="MonoDevelop.Projects.Text\ITextFileProvider.cs" />
     <Compile Include="MonoDevelop.Projects.Text\TextFile.cs" />
     <Compile Include="MonoDevelop.Projects.Text\TextEncoding.cs" />
     <Compile Include="MonoDevelop.Projects.Text\TextFileReader.cs" />
@@ -397,7 +407,6 @@
     <Compile Include="MonoDevelop.Core\LinuxSystemInformation.cs" />
     <Compile Include="MonoDevelop.Core\UnixSystemInformation.cs" />
     <Compile Include="MonoDevelop.Core\ISystemInformationProvider.cs" />
-    <Compile Include="MonoDevelop.Core.FileSystem\UnixFileSystemExtension.cs" />
     <Compile Include="MonoDevelop.Core.LogReporting\CrashEventArgs.cs" />
     <Compile Include="MonoDevelop.Core.LogReporting\CrashMonitor.cs" />
     <Compile Include="MonoDevelop.Core.LogReporting\ICrashMonitor.cs" />
@@ -438,10 +447,18 @@
     <Compile Include="MonoDevelop.Core.Web\STSAuthHelper.cs" />
     <Compile Include="MonoDevelop.Core.Web\WIFTypeProvider.cs" />
     <Compile Include="MonoDevelop.Core.Web\CredentialProviderExtensions.cs" />
+    <Compile Include="MonoDevelop.Core.Text\ISegment.cs" />
+    <Compile Include="MonoDevelop.Core.Text\UnicodeNewLine.cs" />
+    <Compile Include="MonoDevelop.Core.Text\ITextSource.cs" />
+    <Compile Include="MonoDevelop.Core.Text\TextChangeEventArgs.cs" />
+    <Compile Include="MonoDevelop.Core.Text\StringTextSource.cs" />
+    <Compile Include="MonoDevelop.Core.Text\TextFileUtility.cs" />
+    <Compile Include="MonoDevelop.Core.Text\ITextSourceVersion.cs" />
     <Compile Include="MonoDevelop.Core.Execution\IDebugConsole.cs" />
     <Compile Include="MonoDevelop.Projects\IDotNetFileContainer.cs" />
     <Compile Include="MonoDevelop.Projects.Formats.MSBuild\IMSBuildGlobalPropertyProvider.cs" />
     <Compile Include="MonoDevelop.Projects\DotNetProjectImport.cs" />
+    <Compile Include="MonoDevelop.Core.Text\TextSourceVersionProvider.cs" />
     <Compile Include="MonoDevelop.Core.LogReporting\CrashReporter.cs" />
     <Compile Include="MonoDevelop.Core.Instrumentation\InstrumentationConsumer.cs" />
     <Compile Include="MonoDevelop.Projects\DotNetProjectExtension.cs" />
@@ -572,14 +589,6 @@
       <Project>{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}</Project>
       <Name>Newtonsoft.Json</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -600,10 +609,6 @@
       <Project>{63E6915C-7EA4-4D76-AB28-0D7191EEA626}</Project>
       <Name>Mono.Cecil.Pdb</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
-      <Project>{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}</Project>
-      <Name>ICSharpCode.NRefactory.Cecil</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="MonoDevelop.Core.dll.config">
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FilePath.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FilePath.cs
index c972e9cce6..5718176fcd 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FilePath.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FilePath.cs
@@ -28,14 +28,15 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 
 namespace MonoDevelop.Core
 {
 	[Serializable]

 	public struct FilePath: IComparable<FilePath>, IComparable, IEquatable<FilePath>

 	{
-		static readonly StringComparer PathComparer = (Platform.IsWindows || Platform.IsMac) ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal;
-		static readonly StringComparison PathComparison = (Platform.IsWindows || Platform.IsMac) ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
+		public static readonly StringComparer PathComparer = (Platform.IsWindows || Platform.IsMac) ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal;
+		public static readonly StringComparison PathComparison = (Platform.IsWindows || Platform.IsMac) ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
 

 		readonly string fileName;

 

@@ -64,6 +65,28 @@ namespace MonoDevelop.Core
 

 		public bool IsEmpty {

 			get { return fileName != null && fileName.Length == 0; }

+		}
+
+		const int PATHMAX = 4096 + 1;
+
+		[DllImport ("libc")]
+		static extern IntPtr realpath (string path, IntPtr buffer);
+
+		public FilePath ResolveLinks ()
+		{
+			if (Platform.IsWindows) {
+				return Path.GetFullPath (this);
+			}
+
+			IntPtr buffer = IntPtr.Zero;
+			try {
+				buffer = Marshal.AllocHGlobal (PATHMAX);
+				var result = realpath (this, buffer);
+				return result == IntPtr.Zero ? "" : Marshal.PtrToStringAuto (buffer);
+			} finally {
+				if (buffer != IntPtr.Zero)
+					Marshal.FreeHGlobal (buffer);
+			}
 		}

 

 		public FilePath FullPath {

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs
index 96d24ff503..6968d7b776 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs
@@ -50,7 +50,7 @@ namespace MonoDevelop.Core
 		static FileServiceErrorHandler errorHandler;

 		

 		static FileSystemExtension fileSystemChain;

-		static readonly FileSystemExtension defaultExtension = Platform.IsWindows ? new DefaultFileSystemExtension () : new UnixFileSystemExtension () ;

+		static readonly FileSystemExtension defaultExtension = new DefaultFileSystemExtension ();

 		

 		static readonly EventQueue eventQueue = new EventQueue ();

 		

@@ -90,17 +90,6 @@ namespace MonoDevelop.Core
 			}

 		}

 		

-		public static FilePath ResolveFullPath (FilePath path)

-		{

-			try {

-				return GetFileSystemForPath (path, false).ResolveFullPath (path);

-			} catch (Exception e) {

-				if (!HandleError (GettextCatalog.GetString ("Can't resolve full path {0}", path), e))

-					throw;

-				return FilePath.Empty;

-			}

-		}

-		

 		public static void DeleteFile (string fileName)

 		{

 			Debug.Assert (!String.IsNullOrEmpty (fileName));

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Properties.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Properties.cs
index 2c35989714..22f5906ee3 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Properties.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Properties.cs
@@ -28,7 +28,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;

+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
@@ -37,17 +37,18 @@ using System.Xml;
 using System.Xml.Serialization;
 
 using MonoDevelop.Core;
+using System.Collections.Immutable;
 
 namespace MonoDevelop.Core
 {
 	public class Properties : ICustomXmlSerializer
 	{
-		Dictionary<string, object> properties    = new Dictionary<string, object> ();
-		Dictionary<string, object> defaultValues = new Dictionary<string, object> ();
-		Dictionary<Type, TypeConverter> cachedConverters = new Dictionary<Type, TypeConverter> ();
+		ImmutableDictionary<string, object> properties    = ImmutableDictionary<string, object>.Empty;
+		ImmutableDictionary<string, object> defaultValues = ImmutableDictionary<string, object>.Empty;
+		ImmutableDictionary<Type, TypeConverter> cachedConverters = ImmutableDictionary<Type, TypeConverter>.Empty;
 		Dictionary<string,EventHandler<PropertyChangedEventArgs>> propertyListeners;
 		
-		public ICollection<string> Keys {
+		public IEnumerable<string> Keys {
 			get {
 				return properties.Keys;
 			}
@@ -66,19 +67,19 @@ namespace MonoDevelop.Core
 				return (T) o;
 			
 			TypeConverter converter = GetConverter (typeof(T));
-			

-			if (o is string) {

-				try {

-					return (T)converter.ConvertFromInvariantString (o.ToString ());

-				} catch (Exception) {

-					return default(T);

+			
+			if (o is string) {
+				try {
+					return (T)converter.ConvertFromInvariantString (o.ToString ());
+				} catch (Exception) {
+					return default(T);
 				}
 			}
 			
-			try {

-				return (T)converter.ConvertFrom (o);

-			} catch (Exception) {

-				return default(T);

+			try {
+				return (T)converter.ConvertFrom (o);
+			} catch (Exception) {
+				return default(T);
 			}
 		}
 		
@@ -87,26 +88,26 @@ namespace MonoDevelop.Core
 			if (o == null)
 				return null;
 			TypeConverter converter = GetConverter (o.GetType ());
-			return converter.ConvertToInvariantString (o);

+			return converter.ConvertToInvariantString (o);
 		}
 		
 		TypeConverter GetConverter (Type type)
 		{
 			TypeConverter converter;
-			if (!cachedConverters.TryGetValue (type, out converter)) {

+			if (!cachedConverters.TryGetValue (type, out converter)) {
 				converter = TypeDescriptor.GetConverter (type);
-				cachedConverters [type] = converter;
+				cachedConverters = cachedConverters.SetItem (type, converter);
 			}
 			return converter;
 		}
 		
 		public T Get<T> (string property, T defaultValue)
 		{
-			defaultValues[property] = defaultValue;
+			defaultValues = defaultValues.SetItem (property, defaultValue);
 			object val;
 			if (GetPropertyValue<T> (property, out val))
 				return Convert<T> (val);
-			properties[property] = defaultValue;
+			properties = properties.SetItem (property, defaultValue);
 			return defaultValue;
 		}
 		
@@ -127,7 +128,7 @@ namespace MonoDevelop.Core
 					// Deserialize the data and store it in the dictionary, so
 					// following calls return the same object
 					val = ((LazyXmlDeserializer)val).Deserialize<T> ();
-					properties[property] = val;
+					properties = properties.SetItem (property, val);
 				}
 				return true;
 			} else {
@@ -154,7 +155,7 @@ namespace MonoDevelop.Core
 				//avoid emitting the event if not necessary
 				if (val.Equals (old))
 					return;
-				properties[key] = val;
+				properties = properties.SetItem (key, val);
 				if (!val.GetType ().IsClass ||(val is string)) {
 					if (defaultValues.ContainsKey (key)) {
 						if (defaultValues[key] == val)
@@ -239,14 +240,14 @@ namespace MonoDevelop.Core
 			}
 			
 			//write out the new state to a temp file
-			try {

-				using (XmlTextWriter writer = new XmlTextWriter (tempFileName, System.Text.Encoding.UTF8)) {

-					writer.Formatting = Formatting.Indented;

-					writer.WriteStartElement (PropertiesRootNode);

-					writer.WriteAttributeString (PropertiesVersionAttribute, PropertiesVersion);

-					Write (writer, false);

-					writer.WriteEndElement (); // PropertiesRootNode

-				}

+			try {
+				using (XmlTextWriter writer = new XmlTextWriter (tempFileName, System.Text.Encoding.UTF8)) {
+					writer.Formatting = Formatting.Indented;
+					writer.WriteStartElement (PropertiesRootNode);
+					writer.WriteAttributeString (PropertiesVersionAttribute, PropertiesVersion);
+					Write (writer, false);
+					writer.WriteEndElement (); // PropertiesRootNode
+				}
 
 				//write was successful (no exception)
 				//so move the file to the real location, overwriting the old file
@@ -355,7 +356,7 @@ namespace MonoDevelop.Core
 		public Properties Clone ()
 		{
 			Properties result = new Properties ();
-			result.properties = new Dictionary<string, object> (properties);
+			result.properties = properties;
 			return result;
 		}
 		
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/DocGenerator.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/DocGenerator.cs
index 7d5a752b09..94622ce476 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/DocGenerator.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/DocGenerator.cs
@@ -26,7 +26,7 @@
 using System;
 using MonoDevelop.Core;
 using Mono.Addins;
-using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.Projects.Text
 {
@@ -37,7 +37,7 @@ namespace MonoDevelop.Projects.Text
 			private set;
 		}
 		
-		public abstract string GenerateDocumentation (IMember member, string linePrefix);
+		public abstract string GenerateDocumentation (ISymbol member, string linePrefix);
 		
 		static DocGenerator ()
 		{
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/IEditableTextFile.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/IEditableTextFile.cs
deleted file mode 100644
index fa9a33ff06..0000000000
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/IEditableTextFile.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// IEditableTextFile.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace MonoDevelop.Projects.Text
-{
-	public interface IEditableTextFile: ITextFile
-	{
-		new string Text {
-			get;
-			set;
-		}
-		
-		/// <returns>
-		/// The length of the inserted text. The real text may differ in lenth because
-		/// of some conversions (tabs -> spaces, different line ends etc.)
-		/// </returns>
-		int InsertText (int position, string text);
-		void DeleteText (int position, int length);
-	}
-}
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/ITextFileProvider.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/ITextFileProvider.cs
deleted file mode 100644
index 47afc17755..0000000000
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/ITextFileProvider.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// ITextFileProvider.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;

-using MonoDevelop.Core;
-
-namespace MonoDevelop.Projects.Text
-{
-	public interface ITextFileProvider
-	{

-		IEditableTextFile GetEditableTextFile (FilePath filePath);
-	}
-}
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/TextFile.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/TextFile.cs
index 85f4dd8b26..7aa7443e11 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/TextFile.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/TextFile.cs
@@ -39,7 +39,7 @@ using MonoDevelop.Projects.Utility;
 
 namespace MonoDevelop.Projects.Text
 {
-	public class TextFile: IEditableTextFile
+	public class TextFile: ITextFile
 	{
 		const string LIBGLIB = "libglib-2.0-0.dll";
 

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs
index 48cb680170..79cb567ff8 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs
@@ -72,5 +72,8 @@ namespace MonoDevelop.Projects
 
 		public virtual bool NoStdLib { get; set; }
 		public virtual string DebugType { get { return ""; } set {} }
+
+		public abstract Microsoft.CodeAnalysis.CompilationOptions CreateCompilationOptions ();
+		public abstract Microsoft.CodeAnalysis.ParseOptions CreateParseOptions ();
 	}
 }
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/HelpService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/HelpService.cs
index 55148f5392..c5bf38ffcb 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/HelpService.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/HelpService.cs
@@ -33,11 +33,6 @@ using Mono.Addins;
 using System.IO;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Extensions;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Text;
-using System.Xml;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Documentation;
 
 namespace MonoDevelop.Projects
 {
@@ -135,172 +130,12 @@ namespace MonoDevelop.Projects
 		
 		//note: this method is very careful to check that the generated URLs exist in MonoDoc
 		//because if we send nonexistent URLS to MonoDoc, it shows empty pages
-		public static string GetMonoDocHelpUrl (ResolveResult result)
+		public static string GetMonoDocHelpUrl (Microsoft.CodeAnalysis.ISymbol result)
 		{
 			if (result == null)
 				return null;
-			
-//			if (result is AggregatedResolveResult) 
-//				result = ((AggregatedResolveResult)result).PrimaryResult;
-			
-			
-			if (result is NamespaceResolveResult) {
-				string namespc = ((NamespaceResolveResult)result).NamespaceName;
-				//verify that the namespace exists in the help tree
-				//FIXME: GetHelpXml doesn't seem to work for namespaces, so forced to do full render
-				Monodoc.Node dummy;
-				if (!String.IsNullOrEmpty (namespc) && HelpTree != null && HelpTree.RenderUrl ("N:" + namespc, out dummy) != null)
-					return "N:" + namespc;
-				else
-					return null;
-			}
-			
-			IMember member = null;
-//			if (result is MethodGroupResolveResult)
-//				member = ((MethodGroupResolveResult)result).Methods.FirstOrDefault ();
-//			else 
-			if (result is MemberResolveResult)
-				member = ((MemberResolveResult)result).Member;
-			
-			if (member != null && member.GetMonodocDocumentation () != null)
-				return member.GetIdString ();
-			
-			var type = result.Type;
-			if (type != null && !String.IsNullOrEmpty (type.FullName)) {
-				string t = "T:" + type.FullName;
-				try {
-					var tree = HelpTree;
-					if (tree != null && tree.GetHelpXml (t) != null)
-						return t;
-				} catch (Exception) {
-					return null;
-				}
-			}
-			
-			return null;
-		}
-	}
-	
-	public static class HelpExtension
-	{
-		static void AppendTypeReference (StringBuilder result, ITypeReference type)
-		{
-			if (type is ArrayTypeReference) {
-				var array = (ArrayTypeReference)type;
-				AppendTypeReference (result, array.ElementType);
-				result.Append ("[");
-				result.Append (new string (',', array.Dimensions));
-				result.Append ("]");
-				return;
-			}
-			
-			if (type is PointerTypeReference) {
-				var ptr = (PointerTypeReference)type;
-				AppendTypeReference (result, ptr.ElementType);
-				result.Append ("*");
-				return;
-			}
-			
-			if (type is IType)
-				result.Append (((IType)type).FullName);
+			return result.GetDocumentationCommentId ();
 		}
-		
-		
-		static void AppendHelpParameterList (StringBuilder result, IList<IParameter> parameters)
-		{
-			result.Append ('(');
-			if (parameters != null) {
-				for (int i = 0; i < parameters.Count; i++) {
-					if (i > 0)
-						result.Append (',');
-					var p = parameters [i];
-					if (p == null)
-						continue;
-					if (p.IsRef || p.IsOut)
-						result.Append ("&");
-					AppendTypeReference (result, p.Type.ToTypeReference ());
-				}
-			}
-			result.Append (')');
-		}
-		
-		static void AppendHelpParameterList (StringBuilder result, IList<IUnresolvedParameter> parameters)
-		{
-			result.Append ('(');
-			if (parameters != null) {
-				for (int i = 0; i < parameters.Count; i++) {
-					if (i > 0)
-						result.Append (',');
-					var p = parameters [i];
-					if (p == null)
-						continue;
-					if (p.IsRef || p.IsOut)
-						result.Append ("&");
-					AppendTypeReference (result, p.Type);
-				}
-			}
-			result.Append (')');
-		}
-		
-		static XmlNode FindMatch (IMethod method, XmlNodeList nodes)
-		{
-			foreach (XmlNode node in nodes) {
-				XmlNodeList paramList = node.SelectNodes ("Parameters/*");
-				if (method.Parameters.Count == 0 && paramList.Count == 0) 
-					return node;
-				if (method.Parameters.Count != paramList.Count) 
-					continue;
-				
-/*				bool matched = true;
-				for (int i = 0; i < p.Count; i++) {
-					if (p [i].ReturnType.FullName != paramList [i].Attributes ["Type"].Value) {
-						matched = false;
-						break;
-					}
-				}
-				if (matched)*/
-					return node;
-			}
-			return null;
-		}
-		
-		public static XmlNode GetMonodocDocumentation (this IEntity member)
-		{
-			if (member.SymbolKind == SymbolKind.TypeDefinition) {
-				var helpXml = HelpService.HelpTree != null ? HelpService.HelpTree.GetHelpXml (member.GetIdString ()) : null;
-				if (helpXml == null)
-					return null;
-				return helpXml.SelectSingleNode ("/Type/Docs");
-			}
-			
-			var declaringXml = HelpService.HelpTree != null && member.DeclaringTypeDefinition != null ? HelpService.HelpTree.GetHelpXml (member.DeclaringTypeDefinition.GetIdString ()) : null;
-			if (declaringXml == null)
-				return null;
-			
-			switch (member.SymbolKind) {
-			case SymbolKind.Method: {
-					var nodes = declaringXml.SelectNodes ("/Type/Members/Member[@MemberName='" + member.Name + "']");
-					XmlNode node = nodes.Count == 1 ? nodes [0] : FindMatch ((IMethod)member, nodes);
-					if (node != null) {
-						System.Xml.XmlNode result = node.SelectSingleNode ("Docs");
-						return result;
-					}
-					return null;
-				}
-			case SymbolKind.Constructor: {
-					var nodes = declaringXml.SelectNodes ("/Type/Members/Member[@MemberName='.ctor']");
-					XmlNode node = nodes.Count == 1 ? nodes [0] : FindMatch ((IMethod)member, nodes);
-					if (node != null) {
-						System.Xml.XmlNode result = node.SelectSingleNode ("Docs");
-						return result;
-					}
-					return null;
-				}
-			default:
-				return declaringXml.SelectSingleNode ("/Type/Members/Member[@MemberName='" + member.Name + "']/Docs");
-			}
-		}
-		
 	}
 }
 
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs
index 20dffa193b..12ce44ff8c 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs
@@ -35,6 +35,8 @@ using MonoDevelop.Core.Serialization;
 
 using MonoDevelop.Core;
 using Mono.Addins;
+using MonoDevelop.Core.ProgressMonitoring;
+using MonoDevelop.Core.Execution;
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Core.Instrumentation;
 using MonoDevelop.Projects.Extensions;
@@ -177,7 +179,7 @@ namespace MonoDevelop.Projects
 			return Runtime.RunInMainThread (async delegate {
 				if (!File.Exists (file))
 					throw new IOException (GettextCatalog.GetString ("File not found: {0}", file));
-				string fullpath = FileService.ResolveFullPath (file).FullPath;
+				string fullpath = file.ResolveLinks ().FullPath;
 				using (Counters.ReadWorkspaceItem.BeginTiming ("Read solution " + file)) {
 					fullpath = GetTargetFile (fullpath);
 					WorkspaceItem item = await GetExtensionChain ().LoadWorkspaceItem (monitor, fullpath) as WorkspaceItem;
diff --git a/main/src/core/MonoDevelop.Core/packages.config b/main/src/core/MonoDevelop.Core/packages.config
index 591f985ff1..6cc5b68cc1 100644
--- a/main/src/core/MonoDevelop.Core/packages.config
+++ b/main/src/core/MonoDevelop.Core/packages.config
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>

+<?xml version="1.0" encoding="utf-8"?>

 <packages>

-  <package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

 </packages>
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs b/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs
index df2563993f..6d7c8abadf 100644
--- a/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs
+++ b/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs
@@ -14,7 +14,17 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("MonoDevelop.DesignerSupport")]
 [assembly: InternalsVisibleTo("Ide.Tests")]
 [assembly: InternalsVisibleTo("UnitTests")]
+[assembly: InternalsVisibleTo("MonoDevelop.SourceEditor")]
+[assembly: InternalsVisibleTo("Xamarin.OSXEditor")]
 [assembly: InternalsVisibleTo("MonoDevelop.Refactoring")]
+[assembly: InternalsVisibleTo("MonoDevelop.CSharpBinding")]
+[assembly: InternalsVisibleTo("FSharpBinding")]
+[assembly: InternalsVisibleTo("MonoDevelop.CBinding")]
+[assembly: InternalsVisibleTo("MonoDevelop.Xml")]
+[assembly: InternalsVisibleTo("MonoDevelop.AspNet")]
 [assembly: InternalsVisibleTo("Xamarin.Ide")]
 [assembly: InternalsVisibleTo("MonoDevelop.SourceEditor")]
 [assembly: InternalsVisibleTo("MonoDevelop.SourceEditor2")]
+[assembly: InternalsVisibleTo("MonoDevelop.AssemblyBrowser")]
+[assembly: InternalsVisibleTo("MonoDevelop.AspNet")]
+[assembly: InternalsVisibleTo("Xamarin.Sketches")]
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
index 7697bc917a..f98ef0fbde 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml
@@ -1021,8 +1021,28 @@
 			_label = "Toggle block selection mode"/>
 	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.DuplicateLine"
 			_label = "Duplicate line"/>
+	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.DynamicAbbrev"
+			defaultHandler = "MonoDevelop.Ide.Editor.DynamicAbbrevHandler"
+			_label = "Dynamic abbrev"
+			_description = "Cycles completing the current word from matching words in all open files"
+			macShortcut = "Ctrl|/"
+			shortcut = "Alt|/" />
+	<Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.PulseCaret"
+			_label = "Find caret"
+			_description = "Animates the text editor caret to help find it"
+			shortcut = "Ctrl||"
+			macShortcut = "Meta||" />
+			
+	<Command id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.Toggle"
+			_label = "Toggle message bubble"
+			_description = "Toggles message bubble on/off"/>
+	<Command id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.HideIssues"
+			defaultHandler = "MonoDevelop.Ide.Editor.HideIssuesHandler"
+			_label = "_Hide Issues"/>
+	<Command id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.ToggleIssues"
+			defaultHandler = "MonoDevelop.Ide.Editor.ToggleIssuesHandler"
+			_label = "Toggle Issues"
+			type="array"/>
 	</Category>
-
 </Extension>
-
 </ExtensionModel>
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
index 25cda3ed16..75c69530f4 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
@@ -115,6 +115,12 @@
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.DeleteCurrentLayout" />
 		<SeparatorItem id = "ViewSeparator2" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ViewList" />
+		<ItemSet id = "MessageBubbles" _label = "_Message Bubbles">
+			<CommandItem id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.Toggle" />
+			<CommandItem id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.HideIssues" />
+			<SeparatorItem id = "Separator1" />
+			<CommandItem id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.ToggleIssues" />
+		</ItemSet>
 		<SeparatorItem id = "ViewSeparator3" />
 		<SeparatorItem id = "ViewItemsSeparator" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ZoomIn" />
@@ -128,6 +134,7 @@
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.FocusCurrentDocument" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.ShowWelcomePage" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.FullScreen" />
+	
 	</ItemSet>
 	
 	<ItemSet id = "Search" _label = "_Search">
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
index c510afb657..6cdd5cb768 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
@@ -155,15 +155,43 @@
 		<ExtensionNode name="Parser" type="MonoDevelop.Ide.Extensions.MimeTypeExtensionNode"/>
 	</ExtensionPoint>	
 
-	<ExtensionPoint path = "/MonoDevelop/TypeSystem/Ambiences" name = "Language ambiences">
+	<ExtensionPoint path = "/MonoDevelop/TypeSystem/AmbienceTooltipProviders" name = "Language ambiences">
 		<Description>Language ambiences. Specified classes must implement IAmbience.</Description>
-		<ExtensionNode name="Ambience" type="MonoDevelop.Ide.Extensions.MimeTypeExtensionNode" />
+		<ExtensionNode name="Provider" type="MonoDevelop.Ide.Extensions.MimeTypeExtensionNode" />
 	</ExtensionPoint>
 	
 	<ExtensionPoint path = "/MonoDevelop/TypeSystem/CodeGenerators">
 		<ExtensionNode name="Generator" type="MonoDevelop.Ide.Extensions.MimeTypeExtensionNode"/>
 	</ExtensionPoint>
 
+	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/SyntaxModes" name = "Text editor syntax modes">
+		<Description>Syntax modes</Description>
+		<ExtensionNode name="Templates" type="MonoDevelop.Ide.Editor.Highlighting.TemplateCodon"/>
+	</ExtensionPoint>
+
+	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/Styles" name = "Text editor styles">
+		<Description>Styles</Description>
+		<ExtensionNode name="Templates" type="MonoDevelop.Ide.Editor.Highlighting.TemplateCodon"/>
+	</ExtensionPoint>
+
+	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/CustomModes" name = "Text editor custom syntax modes">
+		<Description>Styles</Description>
+		<ExtensionNode name="SyntaxMode" type="MonoDevelop.Ide.Editor.Highlighting.SyntaxModeCodon"/>
+	</ExtensionPoint>
+
+	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/EditorFactory" name = "Editor factories">
+		<Description>Allows providing a platform-specific implementation for the text editor</Description>
+		<ExtensionNode name="Class" />
+	</ExtensionPoint>
+
+	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/TooltipProviders" name = "Tooltip providers">
+		<Description>Tooltip providers. Classes must implement ITooltipProvider.</Description>
+		<ExtensionNode name="Class" type="MonoDevelop.Ide.Editor.TooltipExtensionNode" />
+		<ConditionType id="FileType" type="MonoDevelop.Ide.Extensions.FileTypeCondition">
+			<Description>Type of the file being edited.</Description>
+		</ConditionType>
+	</ExtensionPoint>
+
 	<!-- Extensions -->
 	
 	<Extension path = "/MonoDevelop/Core/Applications">
@@ -179,6 +207,8 @@
 	<Extension path = "/MonoDevelop/Ide/DisplayBindings">
 		<DisplayBinding id    = "DefaultDisplayBinding"
 		                class = "MonoDevelop.Ide.Gui.DefaultDisplayBinding"/>
+		<DisplayBinding id = "TextEditor"
+						class = "MonoDevelop.Ide.Editor.TextEditorDisplayBinding" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/StartupHandlers">
@@ -228,9 +258,9 @@
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
-		<Class id="InitialStep" class = "MonoDevelop.Ide.Gui.Content.TextEditorExtensionMarker" />
-		<Class id="MidStep" class = "MonoDevelop.Ide.Gui.Content.TextEditorExtensionMarker" />
-		<Class id="FinalStep" class = "MonoDevelop.Ide.Gui.Content.TextEditorExtensionMarker" />
+		<Class id="InitialStep" class = "MonoDevelop.Ide.Editor.Extension.TextEditorExtensionMarker" />
+		<Class id="MidStep" class = "MonoDevelop.Ide.Editor.Extension.TextEditorExtensionMarker" />
+		<Class id="FinalStep" class = "MonoDevelop.Ide.Editor.Extension.TextEditorExtensionMarker" />
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/Ide/ContextMenu/DocumentTab">
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs
index 28366ed5eb..6ed67e3ac5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs
@@ -28,10 +28,8 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using Gtk;
 using Gdk;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components.Chart
 {
@@ -577,9 +575,9 @@ namespace MonoDevelop.Components.Chart
 						win.DrawLine (gc, px, top + height, px, top + height - tick);
 					}
 				}
-				else {

-					if (Math.Abs ((long)lastPos - (long)py) < minTickStep || py < top || py > top + height)

-						continue;

+				else {
+					if (Math.Abs ((long)lastPos - (long)py) < minTickStep || py < top || py > top + height)
+						continue;
 					lastPos = py;
 					
 					bool labelFits = false;
@@ -780,32 +778,32 @@ namespace MonoDevelop.Components.Chart
 		}
 		
 		void GetPoint (double wx, double wy, out double x, out double y)
-		{

-			unchecked {

-				if (reverseXAxis)

-					x = left + width - (((wx - startX) * ((double) width)) / (endX - startX));

-				else

-					x = left + (((wx - startX) * ((double) width)) / (endX - startX));

-

-				if (reverseYAxis)

-					y = top + ((wy - startY) * ((double) height) / (endY - startY));

-				else

-					y = top + height - ((wy - startY) * ((double) height) / (endY - startY));

+		{
+			unchecked {
+				if (reverseXAxis)
+					x = left + width - (((wx - startX) * ((double) width)) / (endX - startX));
+				else
+					x = left + (((wx - startX) * ((double) width)) / (endX - startX));
+
+				if (reverseYAxis)
+					y = top + ((wy - startY) * ((double) height) / (endY - startY));
+				else
+					y = top + height - ((wy - startY) * ((double) height) / (endY - startY));
 			}
 		}
 		
 		void GetValue (int x, int y, out double wx, out double wy)
-		{

-			unchecked {

-				if (reverseXAxis)

-					wx = startX + ((double) (left + width - 1 - x)) * (endX - startX) / (double) width;

-				else

-					wx = startX + ((double) (x - left)) * (endX - startX) / (double) width;

-

-				if (reverseYAxis)

-					wy = startY + ((double) (top + y)) * (endY - startY) / (double) height;

-				else

-					wy = startY + ((double) (top + height - y - 1)) * (endY - startY) / (double) height;

+		{
+			unchecked {
+				if (reverseXAxis)
+					wx = startX + ((double) (left + width - 1 - x)) * (endX - startX) / (double) width;
+				else
+					wx = startX + ((double) (x - left)) * (endX - startX) / (double) width;
+
+				if (reverseYAxis)
+					wy = startY + ((double) (top + y)) * (endY - startY) / (double) height;
+				else
+					wy = startY + ((double) (top + height - y - 1)) * (endY - startY) / (double) height;
 			}
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandFrame.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandFrame.cs
index 836250a967..266d6f83af 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandFrame.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandFrame.cs
@@ -26,10 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using Mono.Addins;
 using MonoDevelop.Components.DockToolbars;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components.Commands
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
index c7064e52e8..aefb043257 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
@@ -34,7 +34,6 @@ using System.Collections.Generic;
 using System.Linq;
 
 using MonoDevelop.Components.Commands.ExtensionNodes;
-using Mono.TextEditor;
 using Mono.Addins;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
@@ -847,8 +846,8 @@ namespace MonoDevelop.Components.Commands
 			if (menu is CommandMenu) {
 				((CommandMenu)menu).InitialCommandTarget = initialCommandTarget ?? parent;
 			}
-
-			Mono.TextEditor.GtkWorkarounds.ShowContextMenu (menu, parent, evt);
+			
+			GtkWorkarounds.ShowContextMenu (menu, parent, evt);
 		}
 		
 		/// <summary>
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuBar.cs
index 3030a5dcbc..b7da31e1be 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuBar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuBar.cs
@@ -26,11 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using Gtk;
-using Gdk;
-using MonoDevelop.Ide.Gui;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components.Commands
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/KeyBindingManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/KeyBindingManager.cs
index b4a590202b..ec563318db 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/KeyBindingManager.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/KeyBindingManager.cs
@@ -26,10 +26,8 @@
 //
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
-using Mono.TextEditor;
 
 // Terminology:
 //   chord: A 'chord' is a key binding prefix / modifier meant to allow a
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockWindow.cs
index d525e048d8..e74496696c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockWindow.cs
@@ -27,7 +27,6 @@
 using Gdk;
 using Gtk;
 using MonoDevelop.Components.Docking;
-using Mono.TextEditor;
 using MonoDevelop.Ide;
 using System.Collections.Generic;
 using MonoDevelop.Ide.Gui;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs
index bf874ce3a7..397d413170 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs
@@ -27,7 +27,6 @@
 using Gdk;
 using Gtk;
 using MonoDevelop.Components.Docking;
-using Mono.TextEditor;
 using MonoDevelop.Ide;
 using System.Collections.Generic;
 using MonoDevelop.Ide.Gui;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs
index 4437cfeff1..245c0a2e86 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs
@@ -28,7 +28,6 @@ using System.Linq;
 using Gdk;
 using Gtk;
 using System;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using Cairo;
 using MonoDevelop.Components;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/DockToolbar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/DockToolbar.cs
index 4e7c905e0f..3e3f6a4b21 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/DockToolbar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/DockToolbar.cs
@@ -30,7 +30,6 @@ using System;
 using System.Collections.Generic;
 using Gtk;
 using Gdk;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components.DockToolbars
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/DockToolbarFrame.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/DockToolbarFrame.cs
index 791bb12428..e1efdd06a6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/DockToolbarFrame.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/DockToolbarFrame.cs
@@ -26,14 +26,11 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using Gtk;
 using Gdk;
-using System.Collections;
 using System.Xml;
 using System.Xml.Serialization;
 using System.Collections.Generic;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components.DockToolbars
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/FixedPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/FixedPanel.cs
index ab3daa2305..90ca29dfe6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/FixedPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockToolbars/FixedPanel.cs
@@ -45,7 +45,7 @@ namespace MonoDevelop.Components.DockToolbars
 		
 		public FixedPanel ()
 		{
-			Mono.TextEditor.GtkWorkarounds.FixContainerLeak (this);
+			GtkWorkarounds.FixContainerLeak (this);
 			
 			WidgetFlags |= WidgetFlags.NoWindow;
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs
index b3d5cf4779..0ad3d05024 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs
@@ -30,10 +30,8 @@
 
 //#define ANIMATE_DOCKING
 
-using System;
 using Gtk;
 using Gdk;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components.Docking
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs
index c3d7ae3c1a..2466ff5e6b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs
@@ -31,9 +31,7 @@
 
 using System;
 using Gtk;
-using System.Collections.Generic;
 using MonoDevelop.Ide.Gui;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components.Docking
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
index 4efd300406..b1a04940f1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
@@ -31,7 +31,6 @@
 
 using System;
 using Gtk;
-using Mono.TextEditor;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Components;
 using Xwt.Motion;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs
index b02b654ba6..aa58869f97 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs
@@ -56,7 +56,7 @@ namespace MonoDevelop.Components.Docking
 		
 		public DockContainer (DockFrame frame)
 		{
-			Mono.TextEditor.GtkWorkarounds.FixContainerLeak (this);
+			GtkWorkarounds.FixContainerLeak (this);
 			
 			this.Events = EventMask.ButtonPressMask | EventMask.ButtonReleaseMask | EventMask.PointerMotionMask | EventMask.LeaveNotifyMask;
 			this.frame = frame;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs
index 3938cb3d6d..98b7666572 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs
@@ -68,7 +68,7 @@ namespace MonoDevelop.Components.Docking
 
 		public DockFrame ()
 		{
-			Mono.TextEditor.GtkWorkarounds.FixContainerLeak (this);
+			GtkWorkarounds.FixContainerLeak (this);
 
 			dockBarTop = new DockBar (this, Gtk.PositionType.Top);
 			dockBarBottom = new DockBar (this, Gtk.PositionType.Bottom);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs
index 4aace5dc41..94febd4940 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs
@@ -32,7 +32,6 @@ using System;
 using System.Xml;
 using Gtk;
 using Mono.Unix;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components.Docking
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs
index 6fef6b1d98..d6a332b165 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs
@@ -30,9 +30,6 @@
 
 using System;
 using Gtk;
-using Mono.Unix;
-using Mono.TextEditor;
-using MonoDevelop.Ide.Gui;
 
 namespace MonoDevelop.Components.Docking
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs
index 652b1f725b..6d0c73a1f8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs
@@ -32,7 +32,6 @@ using MonoDevelop.Ide.Gui;
 using System.Linq;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
-using Mono.TextEditor;
 using MonoDevelop.Components;
 
 namespace MonoDevelop.Components.Docking
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/PlaceholderWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/PlaceholderWindow.cs
index ff99bf3c61..faf3966c12 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/PlaceholderWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/PlaceholderWindow.cs
@@ -110,7 +110,7 @@ namespace MonoDevelop.Components.Docking
 		
 		public void Relocate (int x, int y, int w, int h, bool animate)
 		{
-			Gdk.Rectangle geometry = Mono.TextEditor.GtkWorkarounds.GetUsableMonitorGeometry (Screen, Screen.GetMonitorAtPoint (x, y));
+			Gdk.Rectangle geometry = GtkWorkarounds.GetUsableMonitorGeometry (Screen, Screen.GetMonitorAtPoint (x, y));
 			if (x < geometry.X)
 				x = geometry.X;
 			if (x + w > geometry.Right)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs
index 43d814ebe4..a0c8af95be 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs
@@ -86,7 +86,7 @@ namespace MonoDevelop.Components.Extensions
 				};
 				md.VBox.PackStart (responseEntry, false, true, 6);
 				
-				md.AddActionWidget (new Button (Gtk.Stock.Cancel), ResponseType.Cancel);
+				md.AddActionWidget (new Button (Gtk.Stock.Cancel) { CanDefault = true }, ResponseType.Cancel);
 				md.AddActionWidget (new Button (Gtk.Stock.Ok), ResponseType.Ok);
 
 				md.DefaultResponse = ResponseType.Cancel;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs
index 34b1968ba3..9e502170ca 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs
@@ -32,11 +32,12 @@ using MonoDevelop.Core.Instrumentation;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Core.Text;
 using Gtk;
 using System.Linq;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.Components.MainToolbar
 {
@@ -51,7 +52,7 @@ namespace MonoDevelop.Components.MainToolbar
 
 		IEnumerable<ProjectFile> files {
 			get {
-				foreach (Document doc in IdeApp.Workbench.Documents) {
+				foreach (var doc in IdeApp.Workbench.Documents) {
 					// We only want to check it here if it's not part
 					// of the open combine.  Otherwise, it will get
 					// checked down below.
@@ -61,7 +62,7 @@ namespace MonoDevelop.Components.MainToolbar
 				
 				var projects = IdeApp.Workspace.GetAllProjects ();
 
-				foreach (Project p in projects) {
+				foreach (var p in projects) {
 					foreach (ProjectFile file in p.Files) {
 						if (file.Subtype != Subtype.Directory && (file.Flags & ProjectItemFlags.Hidden) != ProjectItemFlags.Hidden)
 							yield return file;
@@ -126,9 +127,7 @@ namespace MonoDevelop.Components.MainToolbar
 		class WorkerResult 
 		{
 			public List<ProjectFile> filteredFiles = null;
-			public List<ITypeDefinition> filteredTypes = null;
-			public List<IMember> filteredMembers  = null;
-			
+
 			public string pattern = null;
 			public bool isGotoFilePattern;
 			public ResultsDataSource results;
@@ -137,8 +136,6 @@ namespace MonoDevelop.Components.MainToolbar
 			
 			public bool IncludeFiles, IncludeTypes, IncludeMembers;
 			
-			public Ambience ambience;
-			
 			public StringMatcher matcher = null;
 			
 			public WorkerResult (Widget widget)
@@ -162,18 +159,6 @@ namespace MonoDevelop.Components.MainToolbar
 				return null;
 			}
 			
-			internal SearchResult CheckType (ITypeDefinition type)
-			{
-				int rank;
-				if (MatchName (type.Name, out rank))
-					return new TypeSearchResult (pattern, type.Name, rank, type, false) { Ambience = ambience };
-				if (!FullSearch)
-					return null;
-				if (MatchName (type.FullName, out rank))
-					return new TypeSearchResult (pattern, type.FullName, rank, type, true) { Ambience = ambience };
-				return null;
-			}
-			
 			Dictionary<string, MatchResult> savedMatches = new Dictionary<string, MatchResult> ();
 			bool MatchName (string name, out int matchRank)
 			{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ISearchDataSource.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ISearchDataSource.cs
index b1a90a607b..4648be4d3a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ISearchDataSource.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ISearchDataSource.cs
@@ -26,8 +26,8 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Components.MainToolbar
 {
@@ -42,7 +42,9 @@ namespace MonoDevelop.Components.MainToolbar
 		TooltipInformation GetTooltip (int item);
 		double GetWeight (int item);
 
-		DomRegion GetRegion (int item);
+		ISegment GetRegion (int item);
+		string GetFileName (int item);
+
 		bool CanActivate (int item);
 		void Activate (int item);
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs
index 0c2f09ee5c..bad71a8f9c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs
@@ -30,7 +30,6 @@ using MonoDevelop.Ide;
 using MonoDevelop.Ide.Commands;
 using MonoDevelop.Core;
 using System.Linq;
-using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Components;
 using Cairo;
 using MonoDevelop.Projects;
@@ -38,15 +37,12 @@ using System.Collections.Generic;
 using Mono.Addins;
 using MonoDevelop.Components.Commands.ExtensionNodes;
 using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Execution;
 using MonoDevelop.Core.Execution;
 using MonoDevelop.Ide.TypeSystem;
 using System.Threading;
-using ICSharpCode.NRefactory.TypeSystem;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
 using System.Text;
 
-
 namespace MonoDevelop.Components.MainToolbar
 {
 	class MainToolbar: Gtk.EventBox, IMainToolbarView
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
index 123893630e..76d9eaea10 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
@@ -35,6 +35,7 @@ using Mono.Addins;
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Execution;
 using System.Text;
+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.Components.MainToolbar
 {
@@ -107,6 +108,10 @@ namespace MonoDevelop.Components.MainToolbar
 			IdeApp.ProjectOperations.CurrentSelectedSolutionChanged += HandleCurrentSelectedSolutionChanged;
 
 			AddinManager.ExtensionChanged += OnExtensionChanged;
+			MonoDevelopWorkspace.LoadingFinished += delegate {
+				ProjectSearchCategory.UpdateSymbolInfos ();
+				HandleSearchEntryChanged (null, EventArgs.Empty);
+			};
 		}
 
 		public void Initialize ()
@@ -533,7 +538,6 @@ namespace MonoDevelop.Components.MainToolbar
 				PositionPopup ();
 				popup.ShowAll ();
 			}
-
 			popup.Update (pattern);
 		}
 
@@ -545,9 +549,9 @@ namespace MonoDevelop.Components.MainToolbar
 				var doc = IdeApp.Workbench.ActiveDocument;
 				if (doc != null && doc.Editor != null) {
 					doc.Select ();
-					doc.Editor.Caret.Location = new Mono.TextEditor.DocumentLocation (pattern.LineNumber, pattern.Column > 0 ? pattern.Column : 1);
+					doc.Editor.CaretLocation = new MonoDevelop.Ide.Editor.DocumentLocation (pattern.LineNumber, pattern.Column > 0 ? pattern.Column : 1);
 					doc.Editor.CenterToCaret ();
-					doc.Editor.Parent.StartCaretPulseAnimation ();
+					doc.Editor.StartCaretPulseAnimation ();
 				}
 				return;
 			}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ProjectSearchCategory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ProjectSearchCategory.cs
index 3af7fa2545..1731f08255 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ProjectSearchCategory.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ProjectSearchCategory.cs
@@ -32,64 +32,89 @@ using MonoDevelop.Core.Instrumentation;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Core.Text;
 using Gtk;
 using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Collections.Concurrent;
 
 namespace MonoDevelop.Components.MainToolbar
 {
 	class ProjectSearchCategory : SearchCategory
 	{
-		SearchPopupWindow widget;
+		static SearchPopupWindow widget;
 
-		public ProjectSearchCategory (SearchPopupWindow widget) : base (GettextCatalog.GetString("Solution"))
+		public ProjectSearchCategory (SearchPopupWindow widget) : base (GettextCatalog.GetString ("Solution"))
 		{
-			this.widget = widget;
-			this.lastResult = new WorkerResult (widget);
+			ProjectSearchCategory.widget = widget;
+			lastResult = new WorkerResult (widget);
 		}
 
+		internal static Task<ImmutableList<DeclaredSymbolInfo>> SymbolInfoTask;
+
 		static TimerCounter getMembersTimer = InstrumentationService.CreateTimerCounter ("Time to get all members", "NavigateToDialog");
+		static TimerCounter getTypesTimer = InstrumentationService.CreateTimerCounter ("Time to get all types", "NavigateToDialog");
 
+		static CancellationTokenSource symbolInfoTokenSrc = new CancellationTokenSource();
+		public static void UpdateSymbolInfos ()
+		{
+			symbolInfoTokenSrc.Cancel ();
+			symbolInfoTokenSrc = new CancellationTokenSource();
+			CancellationToken token = symbolInfoTokenSrc.Token;
+			lastResult = new WorkerResult (widget);
+			SymbolInfoTask = Task.Run (delegate {
+				return GetSymbolInfos (token);
+			}, token);
+		}
 
-		static TimerCounter getTypesTimer = InstrumentationService.CreateTimerCounter ("Time to get all types", "NavigateToDialog");
+		static ImmutableList<DeclaredSymbolInfo> GetSymbolInfos (CancellationToken token)
+		{
+			getTypesTimer.BeginTiming ();
+			try {
+				var result = ImmutableList<DeclaredSymbolInfo>.Empty;
+				Stopwatch sw = new Stopwatch();
+				sw.Start ();
+				foreach (var workspace in TypeSystemService.AllWorkspaces) {
+					result = result.AddRange (workspace.CurrentSolution.Projects.Select (p => SearchAsync (p, token)).SelectMany (i => i));
+				}
+				sw.Stop ();
+				return result;
+			} catch (AggregateException ae) {
+				ae.Flatten ().Handle (ex => ex is TaskCanceledException);
+				return ImmutableList<DeclaredSymbolInfo>.Empty;
+			} catch (TaskCanceledException) {
+				return ImmutableList<DeclaredSymbolInfo>.Empty;
+			} finally {
+				getTypesTimer.EndTiming ();
+			}
+		}
 
-		IEnumerable<ITypeDefinition> types {
-			get {
-				getTypesTimer.BeginTiming ();
+		static IEnumerable<DeclaredSymbolInfo> SearchAsync(Microsoft.CodeAnalysis.Project project, CancellationToken cancellationToken)
+		{
+			var result = new ConcurrentBag<DeclaredSymbolInfo> ();
+			Parallel.ForEach (project.Documents, async delegate (Microsoft.CodeAnalysis.Document document) {
 				try {
-					foreach (Document doc in IdeApp.Workbench.Documents) {
-						// We only want to check it here if it's not part
-						// of the open combine. Otherwise, it will get
-						// checked down below.
-						if (doc.Project == null && doc.IsFile) {
-							var info = doc.ParsedDocument;
-							if (info != null) {
-								var ctx = doc.Compilation;
-								foreach (var type in ctx.MainAssembly.GetAllTypeDefinitions ()) {
-									yield return type;
-								}
-							}
+					cancellationToken.ThrowIfCancellationRequested ();
+					var root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+					foreach (var current in root.DescendantNodesAndSelf (CSharpSyntaxFactsService.DescentIntoSymbolForDeclarationSearch)) {
+						DeclaredSymbolInfo declaredSymbolInfo;
+						if (current.TryGetDeclaredSymbolInfo (out declaredSymbolInfo)) {
+							result.Add (declaredSymbolInfo);
 						}
 					}
-					
-					var projects = IdeApp.Workspace.GetAllProjects ();
-					
-					foreach (Project p in projects) {
-						var pctx = TypeSystemService.GetCompilation (p);
-						foreach (var type in pctx.MainAssembly.GetAllTypeDefinitions ())
-							yield return type;
-					}
-				} finally {
-					getTypesTimer.EndTiming ();
+				} catch (OperationCanceledException) {
 				}
-			}
+			});
+			return (IEnumerable<DeclaredSymbolInfo>)result;
 		}
 
-		WorkerResult lastResult;
-		string[] typeTags = new [] { "type", "c", "s", "i", "e", "d"};
-		string[] memberTags = new [] { "member", "m", "p", "f", "evt"};
+		static WorkerResult lastResult;
+		string[] typeTags = new [] { "type", "c", "s", "i", "e", "d" };
+		string[] memberTags = new [] { "member", "m", "p", "f", "evt" };
 
 		public override bool IsValidTag (string tag)
 		{
@@ -98,7 +123,7 @@ namespace MonoDevelop.Components.MainToolbar
 
 		public override Task<ISearchDataSource> GetResults (SearchPopupSearchPattern searchPattern, int resultsCount, CancellationToken token)
 		{
-			return Task.Factory.StartNew (delegate {
+			return Task.Run (delegate {
 				if (searchPattern.Tag != null && !(typeTags.Contains (searchPattern.Tag) || memberTags.Contains (searchPattern.Tag)) || searchPattern.HasLineNumber)
 					return null;
 				try {
@@ -106,11 +131,12 @@ namespace MonoDevelop.Components.MainToolbar
 					newResult.pattern = searchPattern.Pattern;
 					newResult.IncludeFiles = true;
 					newResult.Tag = searchPattern.Tag;
-					newResult.IncludeTypes = searchPattern.Tag == null || typeTags.Contains (searchPattern.Tag) ;
+					newResult.IncludeTypes = searchPattern.Tag == null || typeTags.Contains (searchPattern.Tag);
 					newResult.IncludeMembers = searchPattern.Tag == null || memberTags.Contains (searchPattern.Tag);
-					var firstType = types.FirstOrDefault ();
-					newResult.ambience = firstType != null ? AmbienceService.GetAmbienceForFile (firstType.Region.FileName) : AmbienceService.DefaultAmbience;
-					
+					ImmutableList<DeclaredSymbolInfo> allTypes;
+					if (SymbolInfoTask == null)
+						SymbolInfoTask = Task.FromResult(GetSymbolInfos (token));
+					allTypes = SymbolInfoTask.Result;
 					string toMatch = searchPattern.Pattern;
 					newResult.matcher = StringMatcher.GetMatcher (toMatch, false);
 					newResult.FullSearch = toMatch.IndexOf ('.') > 0;
@@ -119,7 +145,7 @@ namespace MonoDevelop.Components.MainToolbar
 						oldLastResult = new WorkerResult (widget);
 //					var now = DateTime.Now;
 
-					AllResults (oldLastResult, newResult, token);
+					AllResults (oldLastResult, newResult, allTypes, token);
 					newResult.results.SortUpToN (new DataItemComparer (token), resultsCount);
 					lastResult = newResult;
 //					Console.WriteLine ((now - DateTime.Now).TotalMilliseconds);
@@ -131,104 +157,58 @@ namespace MonoDevelop.Components.MainToolbar
 			}, token);
 		}
 
-		void AllResults (WorkerResult lastResult, WorkerResult newResult, CancellationToken token)
+		void AllResults (WorkerResult lastResult, WorkerResult newResult, IReadOnlyList<DeclaredSymbolInfo> completeTypeList, CancellationToken token)
 		{
 			if (newResult.isGotoFilePattern)
 				return;
 			uint x = 0;
 			// Search Types
 			if (newResult.IncludeTypes && (newResult.Tag == null || typeTags.Any (t => t == newResult.Tag))) {
-				newResult.filteredTypes = new List<ITypeDefinition> ();
-				bool startsWithLastFilter = lastResult.pattern != null && newResult.pattern.StartsWith (lastResult.pattern, StringComparison.Ordinal) && lastResult.filteredTypes != null;
-				var allTypes = startsWithLastFilter ? lastResult.filteredTypes : types;
+				newResult.filteredSymbols = new List<DeclaredSymbolInfo> ();
+				bool startsWithLastFilter = lastResult.pattern != null && newResult.pattern.StartsWith (lastResult.pattern, StringComparison.Ordinal) && lastResult.filteredSymbols != null;
+				var allTypes = startsWithLastFilter ? lastResult.filteredSymbols : completeTypeList;
 				foreach (var type in allTypes) {
-					if (unchecked(x++) % 100 == 0 && token.IsCancellationRequested)
+					if (unchecked(x++) % 100 == 0 && token.IsCancellationRequested) {
+						newResult.filteredSymbols = null;
 						return;
+					}
 
+					if (type.Kind == DeclaredSymbolInfoKind.Constructor ||
+					    type.Kind == DeclaredSymbolInfoKind.Module ||
+					    type.Kind == DeclaredSymbolInfoKind.Indexer)
+						continue;
+					
 					if (newResult.Tag != null) {
-						if (newResult.Tag == "c" && type.Kind != TypeKind.Class)
+						if (newResult.Tag == "c" && type.Kind != DeclaredSymbolInfoKind.Class)
 							continue;
-						if (newResult.Tag == "s" && type.Kind != TypeKind.Struct)
+						if (newResult.Tag == "s" && type.Kind != DeclaredSymbolInfoKind.Struct)
 							continue;
-						if (newResult.Tag == "i" && type.Kind != TypeKind.Interface)
+						if (newResult.Tag == "i" && type.Kind != DeclaredSymbolInfoKind.Interface)
 							continue;
-						if (newResult.Tag == "e" && type.Kind != TypeKind.Enum)
+						if (newResult.Tag == "e" && type.Kind != DeclaredSymbolInfoKind.Enum)
+							continue;
+						if (newResult.Tag == "d" && type.Kind != DeclaredSymbolInfoKind.Delegate)
+							continue;
+
+						if (newResult.Tag == "m" && type.Kind != DeclaredSymbolInfoKind.Method)
 							continue;
-						if (newResult.Tag == "d" && type.Kind != TypeKind.Delegate)
+						if (newResult.Tag == "p" && type.Kind != DeclaredSymbolInfoKind.Property)
 							continue;
+						if (newResult.Tag == "f" && type.Kind != DeclaredSymbolInfoKind.Field)
+							continue;
+						if (newResult.Tag == "evt" && type.Kind != DeclaredSymbolInfoKind.Event)
+							continue;
+						
 					}
 					SearchResult curResult = newResult.CheckType (type);
 					if (curResult != null) {
-						newResult.filteredTypes.Add (type);
+						newResult.filteredSymbols.Add (type);
 						newResult.results.AddResult (curResult);
 					}
 				}
 			}
-			
-			// Search members
-			if (newResult.IncludeMembers && (newResult.Tag == null || memberTags.Any (t => t == newResult.Tag))) {
-				newResult.filteredMembers = new List<Tuple<ITypeDefinition, IUnresolvedMember>> ();
-				bool startsWithLastFilter = lastResult.pattern != null && newResult.pattern.StartsWith (lastResult.pattern, StringComparison.Ordinal) && lastResult.filteredMembers != null;
-				if (startsWithLastFilter) {
-					foreach (var t in lastResult.filteredMembers) {
-						if (unchecked(x++) % 100 == 0 && token.IsCancellationRequested)
-							return;
-						var member = t.Item2;
-						if (newResult.Tag != null) {
-							if (newResult.Tag == "m" && member.SymbolKind != SymbolKind.Method)
-								continue;
-							if (newResult.Tag == "p" && member.SymbolKind != SymbolKind.Property)
-								continue;
-							if (newResult.Tag == "f" && member.SymbolKind != SymbolKind.Field)
-								continue;
-							if (newResult.Tag == "evt" && member.SymbolKind != SymbolKind.Event)
-								continue;
-						}
-						SearchResult curResult = newResult.CheckMember (t.Item1, member);
-						if (curResult != null) {
-							newResult.filteredMembers.Add (t);
-							newResult.results.AddResult (curResult);
-						}
-					}
-				} else {
-					Func<IUnresolvedMember, bool> mPred = member => {
-						if (newResult.Tag != null) {
-							if (newResult.Tag == "m" && member.SymbolKind != SymbolKind.Method)
-								return false;
-							if (newResult.Tag == "p" && member.SymbolKind != SymbolKind.Property)
-								return false;
-							if (newResult.Tag == "f" && member.SymbolKind != SymbolKind.Field)
-								return false;
-							if (newResult.Tag == "evt" && member.SymbolKind != SymbolKind.Event)
-								return false;
-						}
-						return newResult.IsMatchingMember (member);
-					};
-
-					getMembersTimer.BeginTiming ();
-					try {
-						foreach (var type in types) {
-							if (type.Kind == TypeKind.Delegate)
-								continue;
-							foreach (var p in type.Parts) {
-								foreach (var member in p.Members.Where (mPred)) {
-									if (unchecked(x++) % 100 == 0 && token.IsCancellationRequested)
-										return;
-									SearchResult curResult = newResult.CheckMember (type, member);
-									if (curResult != null) {
-										newResult.filteredMembers.Add (Tuple.Create (type, member));
-										newResult.results.AddResult (curResult);
-									}
-								}
-							}
-						}
-					} finally {
-						getMembersTimer.EndTiming ();
-					}
-				}
-			}
 		}
-		
+
 		class WorkerResult
 		{
 			public string Tag {
@@ -236,12 +216,12 @@ namespace MonoDevelop.Components.MainToolbar
 				set;
 			}
 
-			public List<ProjectFile> filteredFiles;
-			public List<ITypeDefinition> filteredTypes;
-			public List<Tuple<ITypeDefinition, IUnresolvedMember>> filteredMembers;
+			public List<DeclaredSymbolInfo> filteredSymbols;
+
 			string pattern2;
 			char firstChar;
 			char[] firstChars;
+
 			public string pattern {
 				get {
 					return pattern2;
@@ -249,76 +229,42 @@ namespace MonoDevelop.Components.MainToolbar
 				set {
 					pattern2 = value;
 					if (pattern2.Length == 1) {
-						firstChar = pattern2[0];
+						firstChar = pattern2 [0];
 						firstChars = new [] { char.ToUpper (firstChar), char.ToLower (firstChar) };
 					} else {
 						firstChars = null;
 					}
 				}
 			}
+
 			public bool isGotoFilePattern;
 			public ResultsDataSource results;
 			public bool FullSearch;
 			public bool IncludeFiles, IncludeTypes, IncludeMembers;
-			public Ambience ambience;
 			public StringMatcher matcher;
-			
+
 			public WorkerResult (Widget widget)
 			{
 				results = new ResultsDataSource (widget);
 			}
-			
-			internal SearchResult CheckFile (ProjectFile file)
-			{
-				int rank;
-				string matchString = System.IO.Path.GetFileName (file.FilePath);
-				if (MatchName (matchString, out rank)) 
-					return new FileSearchResult (pattern, matchString, rank, file, true);
-				
-				if (!FullSearch)
-					return null;
-				matchString = FileSearchResult.GetRelProjectPath (file);
-				if (MatchName (matchString, out rank)) 
-					return new FileSearchResult (pattern, matchString, rank, file, false);
-				
-				return null;
-			}
-			
-			internal SearchResult CheckType (ITypeDefinition type)
+
+			internal SearchResult CheckType (DeclaredSymbolInfo symbol)
 			{
 				int rank;
-				if (MatchName (TypeSearchResult.GetPlainText (type, false), out rank)) {
-					if (type.DeclaringType != null)
-						rank--;
-					return new TypeSearchResult (pattern, TypeSearchResult.GetPlainText (type, false), rank, type, false) { Ambience = ambience };
+				if (MatchName (symbol.Name, out rank)) {
+//					if (type.ContainerDisplayName != null)
+//						rank--;
+					return new DeclaredSymbolInfoResult (pattern, symbol.Name, rank, symbol, false);
 				}
 				if (!FullSearch)
 					return null;
-				if (MatchName (TypeSearchResult.GetPlainText (type, true), out rank)) {
-					if (type.DeclaringType != null)
-						rank--;
-					return new TypeSearchResult (pattern, TypeSearchResult.GetPlainText (type, true), rank, type, true) { Ambience = ambience };
+				if (MatchName (symbol.FullyQualifiedContainerName, out rank)) {
+//					if (type.ContainingType != null)
+//						rank--;
+					return new DeclaredSymbolInfoResult (pattern, symbol.FullyQualifiedContainerName, rank, symbol, true);
 				}
 				return null;
 			}
-			
-			internal SearchResult CheckMember (ITypeDefinition declaringType, IUnresolvedMember member)
-			{
-				int rank;
-				bool useDeclaringTypeName = member is IUnresolvedMethod && (((IUnresolvedMethod)member).IsConstructor || ((IUnresolvedMethod)member).IsDestructor);
-				string memberName = useDeclaringTypeName ? member.DeclaringTypeDefinition.Name : member.Name;
-				if (MatchName (memberName, out rank))
-					return new MemberSearchResult (pattern, memberName, rank, declaringType, member, false) { Ambience = ambience };
-				return null;
-			}
-
-			internal bool IsMatchingMember (IUnresolvedMember member)
-			{
-				int rank;
-				bool useDeclaringTypeName = member is IUnresolvedMethod && (((IUnresolvedMethod)member).IsConstructor || ((IUnresolvedMethod)member).IsDestructor);
-				string memberName = useDeclaringTypeName ? member.DeclaringTypeDefinition.Name : member.Name;
-				return MatchName (memberName, out rank);
-			}
 
 			Dictionary<string, MatchResult> savedMatches = new Dictionary<string, MatchResult> (StringComparer.Ordinal);
 
@@ -335,7 +281,7 @@ namespace MonoDevelop.Components.MainToolbar
 					doesMatch = idx >= 0;
 					if (doesMatch) {
 						matchRank = int.MaxValue - (name.Length - 1) * 10 - idx;
-						if (name[idx] != firstChar)
+						if (name [idx] != firstChar)
 							matchRank /= 2;
 						return true;
 					} else {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ResultsDataSource.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ResultsDataSource.cs
index 5de97bdd00..d11204909a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ResultsDataSource.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ResultsDataSource.cs
@@ -38,7 +38,7 @@ using MonoDevelop.Core.Instrumentation;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Components.MainToolbar;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Components.MainToolbar
 {
@@ -134,10 +134,16 @@ namespace MonoDevelop.Components.MainToolbar
 			return this [item].GetDescriptionMarkupText (widget);
 		}
 
-		ICSharpCode.NRefactory.TypeSystem.DomRegion ISearchDataSource.GetRegion (int item)
+		ISegment ISearchDataSource.GetRegion (int item)
 		{
 			var result = this [item];
-			return new DomRegion (result.File, result.Row, result.Column, result.Row, result.Column);
+			return new TextSegment (result.Offset, result.Length);
+		}
+
+		string ISearchDataSource.GetFileName (int item)
+		{
+			var result = this [item];
+			return result.File;
 		}
 
 		bool ISearchDataSource.CanActivate (int item)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs
index 4a7bd9074a..f7ea8eb214 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs
@@ -30,8 +30,6 @@ using MonoDevelop.Components;
 using Cairo;
 using MonoDevelop.Ide;
 using System.Reflection;
-using Mono.TextEditor;
-
 
 namespace MonoDevelop.Components.MainToolbar
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchCategory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchCategory.cs
index 7c15d26c6f..a2b06f8020 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchCategory.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchCategory.cs
@@ -28,7 +28,6 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using ICSharpCode.NRefactory.TypeSystem;
 
 namespace MonoDevelop.Components.MainToolbar
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs
index c204647762..82f5bdbaea 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs
@@ -31,6 +31,7 @@ using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.FindInFiles;
 using System.Linq;
 using MonoDevelop.Ide.Gui;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Components.MainToolbar
 {
@@ -88,9 +89,14 @@ namespace MonoDevelop.Components.MainToolbar
 				return 0;
 			}
 
-			DomRegion ISearchDataSource.GetRegion (int item)
+			ISegment ISearchDataSource.GetRegion (int item)
 			{
-				return DomRegion.Empty;
+				return TextSegment.Invalid;
+			}
+
+			string ISearchDataSource.GetFileName (int item)
+			{
+				return null;
 			}
 
 			bool ISearchDataSource.CanActivate (int item)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
index b996ba099c..b062f6ca28 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
@@ -30,11 +30,11 @@ using MonoDevelop.Core;
 using System.Collections.Generic;
 using Gtk;
 using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.CodeCompletion;
 using Mono.Addins;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Components.MainToolbar
 {
@@ -84,7 +84,13 @@ namespace MonoDevelop.Components.MainToolbar
 			{
 				throw new NotImplementedException ();
 			}
-			DomRegion ISearchDataSource.GetRegion (int item)
+			
+			ISegment ISearchDataSource.GetRegion (int item)
+			{
+				throw new NotImplementedException ();
+			}
+			
+			string ISearchDataSource.GetFileName (int item)
 			{
 				throw new NotImplementedException ();
 			}
@@ -176,16 +182,18 @@ namespace MonoDevelop.Components.MainToolbar
 				var region = SelectedItemRegion;
 				Destroy ();
 
-				if (string.IsNullOrEmpty (region.FileName))
+				if (string.IsNullOrEmpty (SelectedItemFileName))
 					return;
-				if (region.Begin.IsEmpty) {
+				if (region.Length <= 0) {
 					if (Pattern.LineNumber == 0) {
-						IdeApp.Workbench.OpenDocument (region.FileName);
+						IdeApp.Workbench.OpenDocument (SelectedItemFileName);
 					} else {
-						IdeApp.Workbench.OpenDocument (region.FileName, Pattern.LineNumber, Pattern.HasColumn ? Pattern.Column : 1);
+						IdeApp.Workbench.OpenDocument (SelectedItemFileName, Pattern.LineNumber, Pattern.HasColumn ? Pattern.Column : 1);
 					}
 				} else {
-					IdeApp.Workbench.OpenDocument (region.FileName, region.BeginLine, region.BeginColumn);
+					IdeApp.Workbench.OpenDocument (new FileOpenInformation (SelectedItemFileName, null) {
+						Offset = region.Offset
+					});
 				}
 			}
 		}
@@ -226,6 +234,8 @@ namespace MonoDevelop.Components.MainToolbar
 						LoggingService.LogError ("Error getting search results", t.Exception);
 					} else {
 						Application.Invoke (delegate {
+							if (token.IsCancellationRequested)
+								return;
 							ShowResult (cat, t.Result ?? new NullDataSource ());
 						});
 					}
@@ -344,13 +354,13 @@ namespace MonoDevelop.Components.MainToolbar
 						return new ItemIdentifier (category, dataSrc, i);
 					}
 
-					var region = dataSrc.GetRegion (i);
-					if (!region.Begin.IsEmpty) {
-						layout.SetMarkup (region.BeginLine.ToString ());
-						int w2, h2;
-						layout.GetPixelSize (out w2, out h2);
-						w += w2;
-					}
+//					var region = dataSrc.GetRegion (i);
+//					if (!region.IsEmpty) {
+//						layout.SetMarkup (region.BeginLine.ToString ());
+//						int w2, h2;
+//						layout.GetPixelSize (out w2, out h2);
+//						w += w2;
+//					}
 					itemsAdded++;
 				}
 				if (itemsAdded > 0)
@@ -743,14 +753,22 @@ namespace MonoDevelop.Components.MainToolbar
 				handler (this, e);
 		}
 
-		public DomRegion SelectedItemRegion {
+		public ISegment SelectedItemRegion {
 			get {
 				if (selectedItem == null || selectedItem.Item < 0 || selectedItem.Item >= selectedItem.DataSource.ItemCount)
-					return DomRegion.Empty;
+					return TextSegment.Invalid;
 				return selectedItem.DataSource.GetRegion (selectedItem.Item);
 			}
 		}
 
+		public string SelectedItemFileName {
+			get {
+				if (selectedItem == null || selectedItem.Item < 0 || selectedItem.Item >= selectedItem.DataSource.ItemCount)
+					return null;
+				return selectedItem.DataSource.GetFileName (selectedItem.Item);
+			}
+		}
+
 		class ItemIdentifier {
 			public SearchCategory Category { get; private set; }
 			public ISearchDataSource DataSource { get; private set; }
@@ -820,13 +838,13 @@ namespace MonoDevelop.Components.MainToolbar
 							return new Cairo.Rectangle (0, y, Allocation.Width, h + itemSeparatorHeight);
 						y += h + itemSeparatorHeight;
 
-						var region = dataSrc.GetRegion (i);
-						if (!region.Begin.IsEmpty) {
-							layout.SetMarkup (region.BeginLine.ToString ());
-							int w2, h2;
-							layout.GetPixelSize (out w2, out h2);
-							w += w2;
-						}
+//						var region = dataSrc.GetRegion (i);
+//						if (!region.IsEmpty) {
+//							layout.SetMarkup (region.BeginLine.ToString ());
+//							int w2, h2;
+//							layout.GetPixelSize (out w2, out h2);
+//							w += w2;
+//						}
 						itemsAdded++;
 					}
 					if (itemsAdded > 0)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs
index 4d67e179ff..525016a618 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs
@@ -31,11 +31,14 @@ using Gtk;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Text;
 using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide;
+using Microsoft.CodeAnalysis;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Threading;
 
 namespace MonoDevelop.Components.MainToolbar
 {
@@ -58,7 +61,7 @@ namespace MonoDevelop.Components.MainToolbar
 
 		public virtual string GetDescriptionMarkupText (Widget widget)
 		{
-			return AmbienceService.EscapeText (Description);
+			return Ambience.EscapeText (Description);
 		}
 
 
@@ -67,8 +70,8 @@ namespace MonoDevelop.Components.MainToolbar
 
 		public int Rank { get; private set; }
 
-		public virtual int Row { get { return -1; } }
-		public virtual int Column { get { return -1; } }
+		public virtual int Offset { get { return -1; } }
+		public virtual int Length { get { return -1; } }
 		
 		public abstract string File { get; }
 		public abstract Xwt.Drawing.Image Icon { get; }
@@ -117,54 +120,49 @@ namespace MonoDevelop.Components.MainToolbar
 		}
 	}
 	
-	class TypeSearchResult : MemberSearchResult
+	class DeclaredSymbolInfoResult : SearchResult
 	{
-		ITypeDefinition type;
+		bool useFullName;
+
+		DeclaredSymbolInfo type;
 			
 		public override SearchResultType SearchResultType { get { return SearchResultType.Type; } }
 
 		public override string File {
-			get { return type.Region.FileName; }
+			get { return type.Node.GetLocation ().SourceTree.FilePath; }
 		}
 		
 		public override Xwt.Drawing.Image Icon {
 			get {
-				return ImageService.GetIcon (type.GetStockIcon (false), IconSize.Menu);
+				return ImageService.GetIcon (type.GetStockIconForSymbolInfo(), IconSize.Menu);
 			}
 		}
+
 		
-		public override int Row {
-			get { return type.Region.BeginLine; }
-		}
-		
-		public override int Column {
-			get { return type.Region.BeginColumn; }
+		public override int Offset {
+			get { return type.Span.Start; }
 		}
 
-		public static string GetPlainText (ITypeDefinition type, bool useFullName)
-		{
-			if (type.TypeParameterCount == 0)
-				return useFullName ? type.FullName : type.Name;
-			StringBuilder sb = new StringBuilder (useFullName ? type.FullName : type.Name);
-			sb.Append ("<");
-			for (int i = 0; i < type.TypeParameterCount; i++) {
-				if (i > 0)
-					sb.Append (", ");
-				sb.Append (type.TypeParameters [i].Name);
-			}
-			sb.Append (">");
-			return sb.ToString ();
+		public override int Length {
+			get { return type.Span.Length; }
 		}
-		
+			
 		public override string PlainText {
 			get {
-				return GetPlainText (type, false);
+				return type.Name;
 			}
 		}
 
-		public override MonoDevelop.Ide.CodeCompletion.TooltipInformation TooltipInformation {
+		public override TooltipInformation TooltipInformation {
 			get {
-				return Ambience.GetTooltip (type);
+				var docId = TypeSystemService.GetDocuments (type.Node.SyntaxTree.FilePath).FirstOrDefault ();
+				if (docId == null) {
+					return new  TooltipInformation ();
+				}
+				var cancellationToken = default(CancellationToken);
+				var task = type.GetSymbolAsync (TypeSystemService.GetCodeAnysisDocument (docId, cancellationToken), cancellationToken);
+				var tooltipInformation = Ambience.GetTooltip (task.Result);
+				return tooltipInformation;
 			}
 		}
 
@@ -172,34 +170,47 @@ namespace MonoDevelop.Components.MainToolbar
 			get {
 				string loc;
 				MonoDevelop.Projects.Project project;
-				if (type.TryGetSourceProject (out project)) {
-					loc = GettextCatalog.GetString ("project {0}", project.Name);
-				} else {
-					loc = GettextCatalog.GetString ("file {0}", type.Region.FileName);
-				}
+//				if (type.TryGetSourceProject (out project)) {
+//					loc = GettextCatalog.GetString ("project {0}", project.Name);
+//				} else {
+				loc = GettextCatalog.GetString ("file {0}", File);
+//				}
 
 				switch (type.Kind) {
-				case TypeKind.Interface:
+				case DeclaredSymbolInfoKind.Interface:
 					return GettextCatalog.GetString ("interface ({0})", loc);
-				case TypeKind.Struct:
+				case DeclaredSymbolInfoKind.Struct:
 					return GettextCatalog.GetString ("struct ({0})", loc);
-				case TypeKind.Delegate:
+				case DeclaredSymbolInfoKind.Delegate:
 					return GettextCatalog.GetString ("delegate ({0})", loc);
-				case TypeKind.Enum:
+				case DeclaredSymbolInfoKind.Enum:
 					return GettextCatalog.GetString ("enumeration ({0})", loc);
-				default:
+				case DeclaredSymbolInfoKind.Class:
 					return GettextCatalog.GetString ("class ({0})", loc);
+
+				case DeclaredSymbolInfoKind.Field:
+					return GettextCatalog.GetString ("field ({0})", loc);
+				case DeclaredSymbolInfoKind.Property:
+					return GettextCatalog.GetString ("property ({0})", loc);
+				case DeclaredSymbolInfoKind.Indexer:
+					return GettextCatalog.GetString ("indexer ({0})", loc);
+				case DeclaredSymbolInfoKind.Event:
+					return GettextCatalog.GetString ("event ({0})", loc);
+				case DeclaredSymbolInfoKind.Method:
+					return GettextCatalog.GetString ("method ({0})", loc);
 				}
+				return GettextCatalog.GetString ("symbol ({0})", loc);
 			}
 		}
 		
 		public override string GetMarkupText (Widget widget)
 		{
-			return HighlightMatch (widget, GetPlainText (type, useFullName), match);
+			return HighlightMatch (widget, useFullName ? type.FullyQualifiedContainerName : type.Name, match);
 		}
 		
-		public TypeSearchResult (string match, string matchedString, int rank, ITypeDefinition type, bool useFullName) : base (match, matchedString, rank, null, null, useFullName)
+		public DeclaredSymbolInfoResult (string match, string matchedString, int rank, DeclaredSymbolInfo type, bool useFullName)  : base (match, matchedString, rank)
 		{
+			this.useFullName = useFullName;
 			this.type = type;
 		}
 	}
@@ -261,99 +272,7 @@ namespace MonoDevelop.Components.MainToolbar
 			return file.FilePath;
 		}
 	}
-	
-	class MemberSearchResult : SearchResult
-	{
-		protected bool useFullName;
-		protected IUnresolvedMember member;
-		protected ITypeDefinition declaringType;
-
-		public override SearchResultType SearchResultType { get { return SearchResultType.Member; } }
-
-		protected virtual OutputFlags Flags {
-			get {
-				return OutputFlags.IncludeParameters | OutputFlags.IncludeGenerics
-					| (useFullName  ? OutputFlags.UseFullName : OutputFlags.None);
-			}
-		}
-		
-		public override string PlainText {
-			get {
-				return member.Name;
-			}
-		}
-
-		public override MonoDevelop.Ide.CodeCompletion.TooltipInformation TooltipInformation {
-			get {
-				var ctx = member.DeclaringTypeDefinition.CreateResolveContext (new SimpleTypeResolveContext (declaringType));
-				return Ambience.GetTooltip (member.Resolve (ctx));
-			}
-		}
 
-		public override string File {
-			get { return member.DeclaringTypeDefinition.Region.FileName; }
-		}
-		
-		public override Xwt.Drawing.Image Icon {
-			get {
-				return ImageService.GetIcon (member.GetStockIcon (false), IconSize.Menu);
-			}
-		}
-		
-		public override int Row {
-			get { return member.Region.BeginLine; }
-		}
-		
-		public override int Column {
-			get { return member.Region.BeginColumn; }
-		}
-		
-		public override string Description {
-			get {
-				string loc = GettextCatalog.GetString ("type \"{0}\"", member.DeclaringTypeDefinition.Name);
-
-				switch (member.SymbolKind) {
-				case SymbolKind.Field:
-					return GettextCatalog.GetString ("field ({0})", loc);
-				case SymbolKind.Property:
-					return GettextCatalog.GetString ("property ({0})", loc);
-				case SymbolKind.Indexer:
-					return GettextCatalog.GetString ("indexer ({0})", loc);
-				case SymbolKind.Event:
-					return GettextCatalog.GetString ("event ({0})", loc);
-				case SymbolKind.Method:
-					return GettextCatalog.GetString ("method ({0})", loc);
-				case SymbolKind.Operator:
-					return GettextCatalog.GetString ("operator ({0})", loc);
-				case SymbolKind.Constructor:
-					return GettextCatalog.GetString ("constructor ({0})", loc);
-				case SymbolKind.Destructor:
-					return GettextCatalog.GetString ("destructor ({0})", loc);
-				default:
-					throw new NotSupportedException (member.SymbolKind + " is not supported.");
-				}
-			}
-		}
-		
-		public MemberSearchResult (string match, string matchedString, int rank, ITypeDefinition declaringType, IUnresolvedMember member, bool useFullName) : base (match, matchedString, rank)
-		{
-			this.declaringType = declaringType;
-			this.member = member;
-			this.useFullName = useFullName;
-		}
-		
-		public override string GetMarkupText (Widget widget)
-		{
-			if (useFullName)
-				return HighlightMatch (widget, member.SymbolKind == SymbolKind.Constructor ? member.DeclaringTypeDefinition.FullName :  member.FullName, match);
-			return HighlightMatch (widget, member.SymbolKind == SymbolKind.Constructor ? member.DeclaringTypeDefinition.Name : member.Name, match);
-		}
-		
-		internal Ambience Ambience { 
-			get;
-			set;
-		}
-	}
 
 	class CommandResult: SearchResult
 	{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs
index a57d05cf83..cfdf239aa3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs
@@ -35,8 +35,6 @@ using System.Collections.Generic;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor;
-
 using StockIcons = MonoDevelop.Ide.Gui.Stock;
 using Xwt.Motion;
 using MonoDevelop.Ide.Fonts;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaBuildTheme.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaBuildTheme.cs
index a86dc68ade..ce58e8d373 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaBuildTheme.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaBuildTheme.cs
@@ -27,7 +27,6 @@ using MonoDevelop.Components;
 using Cairo;

 

 using StockIcons = MonoDevelop.Ide.Gui.Stock;

-using Mono.TextEditor;
 

 namespace MonoDevelop.Components.MainToolbar

 {

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaTheme.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaTheme.cs
index 8de5c8ebff..2434d1b7df 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaTheme.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaTheme.cs
@@ -37,7 +37,6 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Components;
 
 using StockIcons = MonoDevelop.Ide.Gui.Stock;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components.MainToolbar
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ExpandableObjectEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ExpandableObjectEditor.cs
new file mode 100644
index 0000000000..a172e7b4d3
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ExpandableObjectEditor.cs
@@ -0,0 +1,61 @@
+/* 

+ * ExpandableObjectEditor.cs - Temporary editor until we get expandable object support in main grid

+ * 

+ * Part of PropertyGrid - A Gtk# widget that displays and allows 

+ * editing of all of an object's public properties 

+ * 

+ * Authors: 

+ *  Michael Hutchinson <m.j.hutchinson@gmail.com>

+ *  Lluis Sanchez Gual

+ *  

+ * Copyright (C) 2005 Michael Hutchinson

+ *

+ * This sourcecode is licenced under The MIT License:

+ * 

+ * Permission is hereby granted, free of charge, to any person obtaining

+ * a copy of this software and associated documentation files (the

+ * "Software"), to deal in the Software without restriction, including

+ * without limitation the rights to use, copy, modify, merge, publish,

+ * distribute, sublicense, and/or sell copies of the Software, and to permit

+ * persons to whom the Software is furnished to do so, subject to the

+ * following conditions:

+ * 

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN

+ * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,

+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

+ * USE OR OTHER DEALINGS IN THE SOFTWARE.

+ */

+

+using Gtk;

+

+namespace MonoDevelop.Components.PropertyGrid.PropertyEditors

+{

+	class ExpandableObjectEditor : PropertyEditorCell

+	{

+		protected override string GetValueMarkup ()

+		{

+			string val;

+			if (Property.Converter.CanConvertTo (Context, typeof(string)))

+				val = Property.Converter.ConvertToString (Context, Value);

+			else

+				val = Value != null ? Value.ToString () : "";

+			

+			return "<b>" + GLib.Markup.EscapeText (val) + "</b>";

+		}

+		

+		protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, StateType state)

+		{

+			if (Property.Converter.CanConvertTo (Context, typeof(string)) && Property.Converter.CanConvertFrom (Context, typeof(string)))

+				return new PropertyTextEditor ();

+			else

+				return null;

+		}

+

+	}

+}

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs
index 60734be428..841494977e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs
@@ -35,8 +35,8 @@ using Gdk;
 
 namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 {
-	[PropertyEditorType (typeof (string))]

-	public class TextEditor: HBox, IPropertyEditor
+	[PropertyEditorType (typeof (string))]
+	public class PropertyTextEditor: Gtk.HBox, IPropertyEditor
 	{
 		EditSession session;
 		bool disposed;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/EditorManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/EditorManager.cs
index 918ec9865a..19202cda26 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/EditorManager.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/EditorManager.cs
@@ -5,7 +5,7 @@
  * editing of all of an object's public properties 

  * 

  * Authors: 

- *  Michael Hutchinson <m.j.hutchinson@gmail.com>
+ *  Michael Hutchinson <m.j.hutchinson@gmail.com>

  *  Lluis Sanchez Gual

  *  

  * Copyright (C) 2005 Michael Hutchinson

@@ -42,11 +42,11 @@ namespace MonoDevelop.Components.PropertyGrid
 {

 	class EditorManager

 	{

-		readonly Dictionary<Type,Type> editors = new Dictionary<Type,Type> ();
+		readonly Dictionary<Type,Type> editors = new Dictionary<Type,Type> ();

 		readonly Dictionary<Type,Type> inheritingEditors = new Dictionary<Type, Type>();

 		readonly Dictionary<Type,Type> surrogates = new Dictionary<Type,Type> ();

-		static readonly PropertyEditorCell Default = new PropertyEditorCell ();
-		static readonly Dictionary<Type,PropertyEditorCell> cellCache = new Dictionary<Type,PropertyEditorCell> ();
+		static readonly PropertyEditorCell Default = new PropertyEditorCell ();

+		static readonly Dictionary<Type,PropertyEditorCell> cellCache = new Dictionary<Type,PropertyEditorCell> ();

 

 		public EditorManager ()

 		{

@@ -57,12 +57,12 @@ namespace MonoDevelop.Components.PropertyGrid
 		{

 			foreach (Type t in editorAssembly.GetTypes ()) {

 				foreach (Attribute currentAttribute in Attribute.GetCustomAttributes (t)) {

-					if (currentAttribute.GetType() == typeof (PropertyEditorTypeAttribute)) {
+					if (currentAttribute.GetType() == typeof (PropertyEditorTypeAttribute)) {

 						var peta = (PropertyEditorTypeAttribute)currentAttribute;

 						Type editsType = peta.Type;

-						if (t.IsSubclassOf (typeof (PropertyEditorCell)))
-							if (peta.Inherits)
-								inheritingEditors.Add (editsType, t);
+						if (t.IsSubclassOf (typeof (PropertyEditorCell)))

+							if (peta.Inherits)

+								inheritingEditors.Add (editsType, t);

 							else

 								editors.Add (editsType, t);

 					}

@@ -75,105 +75,105 @@ namespace MonoDevelop.Components.PropertyGrid
 		}

 

 		public PropertyEditorCell GetEditor (ITypeDescriptorContext context)

-		{
-			var cell = context.PropertyDescriptor.GetEditor (typeof(PropertyEditorCell)) as PropertyEditorCell;
-			if (cell != null)
-				return cell;
-			
-			Type editorType = GetEditorType (context);
-			if (editorType == null)
-				return Default;
-			
-			if (typeof(IPropertyEditor).IsAssignableFrom (editorType)) {
-				if (!typeof(Gtk.Widget).IsAssignableFrom (editorType))
-					throw new Exception ("The property editor '" + editorType + "' must be a Gtk Widget");
-				return Default;
+		{

+			var cell = context.PropertyDescriptor.GetEditor (typeof(PropertyEditorCell)) as PropertyEditorCell;

+			if (cell != null)

+				return cell;

+			

+			Type editorType = GetEditorType (context);

+			if (editorType == null)

+				return Default;

+			

+			if (typeof(IPropertyEditor).IsAssignableFrom (editorType)) {

+				if (!typeof(Gtk.Widget).IsAssignableFrom (editorType))

+					throw new Exception ("The property editor '" + editorType + "' must be a Gtk Widget");

+				return Default;

 			}

-
-			if (cellCache.TryGetValue (editorType, out cell)) {
+

+			if (cellCache.TryGetValue (editorType, out cell)) {

 				return cell;

-			}
-
-			if (!typeof(PropertyEditorCell).IsAssignableFrom (editorType))
-				throw new Exception ("The property editor '" + editorType + "' must be a subclass of Stetic.PropertyEditorCell or implement Stetic.IPropertyEditor");
-
-			cell = (PropertyEditorCell) Activator.CreateInstance (editorType);
-			cellCache [editorType] = cell;
-			return cell;
+			}

+

+			if (!typeof(PropertyEditorCell).IsAssignableFrom (editorType))

+				throw new Exception ("The property editor '" + editorType + "' must be a subclass of Stetic.PropertyEditorCell or implement Stetic.IPropertyEditor");

+

+			cell = (PropertyEditorCell) Activator.CreateInstance (editorType);

+			cellCache [editorType] = cell;

+			return cell;

 		}

-
+

 		public Type GetEditorType (ITypeDescriptorContext context)

 		{

 			var pd = context.PropertyDescriptor;

-
+

 			//try to find a custom editor

 			//TODO: Find a way to provide a IWindowsFormsEditorService so this can work directly

 			//for now, substitute GTK#-based editors

-			/*
+			/*

 			UITypeEditor UITypeEd = (UITypeEditor) pd.GetEditor(typeof (System.Drawing.Design.UITypeEditor));//first, does it have custom editors?

 			if (UITypeEd != null)

 				if (surrogates.Contains(UITypeEd.GetType ()))

-					return instantiateEditor((Type) surrogates[UITypeEd.GetType()], parentRow);
+					return instantiateEditor((Type) surrogates[UITypeEd.GetType()], parentRow);

 			*/

 

 			//does a registered GTK# editor support this natively?

 			Type editType = pd.PropertyType;

 			if (editors.ContainsKey (editType))

-				return editors [editType];
-			
+				return editors [editType];

+			

 			//editors that edit derived types

-			//TODO: find most derived type?
-			foreach (var kvp in inheritingEditors)
+			//TODO: find most derived type?

+			foreach (var kvp in inheritingEditors)

 				if (editType.IsSubclassOf (kvp.Key))

 					return kvp.Value;

-
-			if (pd.PropertyType.IsEnum) {
+

+			if (pd.PropertyType.IsEnum) {

 				if (pd.PropertyType.IsDefined (typeof(FlagsAttribute), true))

-					return typeof(FlagsEditorCell);
-				return typeof(EnumerationEditorCell);
-			}
-			
+					return typeof(FlagsEditorCell);

+				return typeof(EnumerationEditorCell);

+			}

+			

 			//collections with items of single type that aren't just objects

-			if (typeof(System.Collections.IList).IsAssignableFrom (editType)) {
-				// Iterate through all properties since there may be more than one indexer.
-				if (GetCollectionItemType (editType) != null)
-					return typeof (CollectionEditor);
-			}
+			if (typeof(System.Collections.IList).IsAssignableFrom (editType)) {

+				// Iterate through all properties since there may be more than one indexer.

+				if (GetCollectionItemType (editType) != null)

+					return typeof (CollectionEditor);

+			}

 			

 			//TODO: support simple SWF collection editor derivatives that just override Types available

 			// and reflect protected Type[] NewItemTypes {get;} to get types

 			//if (UITypeEd is System.ComponentModel.Design.CollectionEditor)

-			//	((System.ComponentModel.Design.CollectionEditor)UITypeEd).
-
-			//can we use a type converter with a built-in editor?
+			//	((System.ComponentModel.Design.CollectionEditor)UITypeEd).

+

+			//can we use a type converter with a built-in editor?

 			TypeConverter tc = pd.Converter;

 

 			//TODO: find best match, not first

 			foreach (var kvp in editors)

 				if (tc.CanConvertFrom (kvp.Key) && tc.CanConvertTo (kvp.Key))

-					return kvp.Value;
-					
-			foreach (var kvp in inheritingEditors)
+					return kvp.Value;

+					

+			foreach (var kvp in inheritingEditors)

 				if (tc.CanConvertFrom (kvp.Key) && tc.CanConvertTo (kvp.Key))

 					return kvp.Value;

 

 			if (tc.CanConvertTo (typeof(string)) || tc.GetStandardValuesSupported (context)) {

-				return typeof(TextEditor);

+				return typeof(PropertyTextEditor);

 			}

 

 			//nothing found - just display type

 			return null;

-		}
-		
-		public static Type GetCollectionItemType (Type colType)
-		{
-			foreach (PropertyInfo member in colType.GetProperties ()) {
-				if (member.Name == "Item") {
+		}

+		

+		public static Type GetCollectionItemType (Type colType)

+		{

+			foreach (PropertyInfo member in colType.GetProperties ()) {

+				if (member.Name == "Item") {

 					if (member.PropertyType != typeof (object))

-						return member.PropertyType;
-				}
-			}
+						return member.PropertyType;

+				}

+			}

 			return null;

 		}

 	}

-}
+}

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs
index c727deb565..7aa4c1407a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs
@@ -30,7 +30,6 @@ using System;
 using System.ComponentModel;
 using Gdk;
 using Gtk;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components.PropertyGrid
 {
@@ -161,27 +160,27 @@ namespace MonoDevelop.Components.PropertyGrid
 			}
 		}
 		
-		/// <summary>

-		/// Whether the editor should show a button.

-		/// </summary>

-		public virtual bool DialogueEdit {

-			get { return false; }

-		}

-

-		/// <summary>

-		/// If the property is read-only, is is usually not edited. If the editor

-		/// can edit sub-properties of a read-only complex object, this must return true.

-		/// <remarks>The default value is false.</remarks>

-		/// </summary>

-		/// <returns>True if the editor can edit read-only properties</returns>

-		public virtual bool EditsReadOnlyObject {

-			get { return false; }

-		}

-		
-		public virtual void LaunchDialogue ()

-		{

+		/// <summary>
+		/// Whether the editor should show a button.
+		/// </summary>
+		public virtual bool DialogueEdit {
+			get { return false; }
+		}
+
+		/// <summary>
+		/// If the property is read-only, is is usually not edited. If the editor
+		/// can edit sub-properties of a read-only complex object, this must return true.
+		/// <remarks>The default value is false.</remarks>
+		/// </summary>
+		/// <returns>True if the editor can edit read-only properties</returns>
+		public virtual bool EditsReadOnlyObject {
+			get { return false; }
+		}
+		
+		public virtual void LaunchDialogue ()
+		{
 			if (DialogueEdit)
-				throw new NotImplementedException ();

+				throw new NotImplementedException ();
 		}
 	}
 	
@@ -358,15 +357,15 @@ namespace MonoDevelop.Components.PropertyGrid
 			this.cell = cell;
 			Spacing = 3;
 			PackStart (new CellRendererWidget (cell, context), true, true, 0);
-			Label buttonLabel = new Label ();

-			buttonLabel.UseMarkup = true;

-			buttonLabel.Xpad = 0; buttonLabel.Ypad = 0;

-			buttonLabel.Markup = "<span size=\"small\">...</span>";

-			Button dialogueButton = new Button (buttonLabel);

-			dialogueButton.Clicked += DialogueButtonClicked;

+			Label buttonLabel = new Label ();
+			buttonLabel.UseMarkup = true;
+			buttonLabel.Xpad = 0; buttonLabel.Ypad = 0;
+			buttonLabel.Markup = "<span size=\"small\">...</span>";
+			Button dialogueButton = new Button (buttonLabel);
+			dialogueButton.Clicked += DialogueButtonClicked;
 			PackStart (dialogueButton, false, false, 0);
 			this.ModifyBg (StateType.Normal, this.Style.White);
-			ShowAll ();

+			ShowAll ();
 		}
 		
 		void DialogueButtonClicked (object s, EventArgs args)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs
index dbccc8252f..bbbdc96e16 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs
@@ -30,7 +30,6 @@ using System.ComponentModel;
 using System.Collections.Generic;
 using Cairo;
 using System.Linq;
-using Mono.TextEditor;
 using MonoDevelop.Core;
 
 namespace MonoDevelop.Components.PropertyGrid
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Theming/GtkTheme.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Theming/GtkTheme.cs
index 95af7f02ab..8dba0ef095 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Theming/GtkTheme.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Theming/GtkTheme.cs
@@ -29,7 +29,6 @@
 using System;
 using Cairo;
 using Gtk;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components.Theming
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs
index 0b948cd7d0..3a21270833 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs
@@ -33,7 +33,6 @@ using System.Runtime.InteropServices;
 using Gdk;
 using Cairo;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CompactScrolledWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CompactScrolledWindow.cs
index aef0dcf873..e6f0c23f4b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CompactScrolledWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CompactScrolledWindow.cs
@@ -25,7 +25,6 @@
 // THE SOFTWARE.
 
 using System;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsGtk.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsGtk.cs
index 52607bf131..035a36cb79 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsGtk.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsGtk.cs
@@ -50,7 +50,7 @@ namespace MonoDevelop.Components
 			if (menu == null)
 				throw new ArgumentNullException ("menu");
 
-			Mono.TextEditor.GtkWorkarounds.ShowContextMenu (menu, parent, evt);
+			GtkWorkarounds.ShowContextMenu (menu, parent, evt);
 		}
 
 		static Gtk.MenuItem CreateMenuItem (ContextMenuItem item)
@@ -93,7 +93,7 @@ namespace MonoDevelop.Components
 					var img = new ImageView (item.Image);
 					img.ShowAll ();
 					imageItem.Image = img;
-					GtkWorkarounds.ForceImageOnMenuItem (imageItem);
+					Xwt.GtkBackend.GtkWorkarounds.ForceImageOnMenuItem (imageItem);
 				}
 			}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuTreeView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuTreeView.cs
index a0e32d669e..c6ea099579 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuTreeView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuTreeView.cs
@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Control.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Control.cs
index dda73fc351..2cd9d466c5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Control.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Control.cs
@@ -43,6 +43,8 @@ namespace MonoDevelop.Components
 
 		public Control (object widget)
 		{
+			if (widget == null)
+				throw new ArgumentNullException ("widget");
 			this.nativeWidget = widget;
 		}
 
@@ -63,7 +65,9 @@ namespace MonoDevelop.Components
 				if (!(w is T))
 					w = ConvertToType (typeof(T), w);
 				if (w is Gtk.Widget) {
-					var c = new CommandRouterContainer ((Gtk.Widget)w, this, true);
+					var gtkWidget = (Gtk.Widget)w;
+					var c = new CommandRouterContainer (gtkWidget, this, true);
+					c.FocusChain = new [] { gtkWidget };
 					c.Show ();
 					nativeWidget = c;
 					c.Destroyed += delegate {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs
index 1f02fdce8a..df6e49c424 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs
@@ -29,7 +29,6 @@ using System.ComponentModel;
 using Gtk;
 
 using MonoDevelop.Ide;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkGestures.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkGestures.cs
new file mode 100644
index 0000000000..a819fc0f74
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkGestures.cs
@@ -0,0 +1,252 @@
+//
+// GtkGestures.cs
+//
+// Author:
+//       Michael Hutchinson <mhutch@xamarin.com>
+//
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Runtime.InteropServices;
+using Gdk;
+
+namespace MonoDevelop.Components
+{
+	public static class GtkGestures
+	{
+		const int GDK_GESTURE_MAGNIFY = 37;
+		const int GDK_GESTURE_ROTATE  = 38;
+		const int GDK_GESTURE_SWIPE   = 39;

+

+		[DllImport (PangoUtil.LIBGDK, CallingConvention = CallingConvention.Cdecl)]
+		static extern bool gdk_quartz_supports_gesture_events ();
+
+		static bool isSupported;
+
+		static GtkGestures ()
+		{
+			if (MonoDevelop.Core.Platform.IsMac) {
+				try {
+					isSupported = gdk_quartz_supports_gesture_events ();
+				} catch (EntryPointNotFoundException) {
+				}
+			}
+		}
+
+		public static bool IsSupported { get { return isSupported; } }
+
+		public static void AddGestureMagnifyHandler (this Gtk.Widget widget, EventHandler<GestureMagnifyEventArgs> handler)
+		{
+			if (!isSupported)
+				throw new NotSupportedException ();
+			var signal = GLib.Signal.Lookup (widget, "gesture-magnify-event", typeof(GestureMagnifyEventArgs));
+			signal.AddDelegate (new EventHandler<GestureMagnifyEventArgs> (handler));
+		}
+
+		public static void AddGestureRotateHandler (this Gtk.Widget widget, EventHandler<GestureRotateEventArgs> handler)
+		{
+			if (!isSupported)
+				throw new NotSupportedException ();
+			var signal = GLib.Signal.Lookup (widget, "gesture-rotate-event", typeof(GestureRotateEventArgs));
+			signal.AddDelegate (new EventHandler<GestureRotateEventArgs> (handler));
+		}
+
+		public static void AddGestureSwipeHandler (this Gtk.Widget widget, EventHandler<GestureSwipeEventArgs> handler)
+		{
+			if (!isSupported)
+				throw new NotSupportedException ();
+			var signal = GLib.Signal.Lookup (widget, "gesture-swipe-event", typeof(GestureSwipeEventArgs));
+			signal.AddDelegate (new EventHandler<GestureSwipeEventArgs> (handler));
+		}
+	}
+
+	public unsafe class GestureMagnifyEventArgs : GLib.SignalArgs
+	{
+		//have to force pack=4, or Mono aligns doubles to 8 bytes
+		[StructLayout (LayoutKind.Sequential, Pack=4)]
+		struct GdkEventGestureMagnify
+		{
+			public Gdk.EventType type;
+			public IntPtr window;
+			public sbyte send_event;
+			public uint time;
+			public double x, y;
+			public uint state;
+			public double magnification;
+			public IntPtr device;
+			public double x_root, y_root;
+		}
+
+		// I tried to mimic the GTK# pattern of having a subclassed Event object on the EventArgs, but I gave up on
+		// figuring out how to get GTK# to marshal the event to a custom GestureMagnifyEvent class. Instead we just
+		// lift all the accessors up to the args class and dereference the handle directly.
+		GdkEventGestureMagnify *evt {
+			get {
+				var handle = ((Event)Args[0]).Handle;
+				return (GdkEventGestureMagnify *) handle;
+			}
+		}
+
+		public Gdk.Window Window {
+			get {
+				return (Gdk.Window) GLib.Object.GetObject (evt->window);
+			}
+		}
+
+		public Device Device {
+			get {
+				return (Device) GLib.Object.GetObject (evt->device);
+			}
+		}
+
+		public uint Time { get { return evt->time; } }
+		public double X { get { return evt->x; } }
+		public double Y { get { return evt->y; } }
+		public ModifierType State { get { return (ModifierType) evt->state; } }
+		public double Magnification { get { return evt->magnification; } }
+		public double XRoot { get { return evt->x_root; } }
+		public double YRoot { get { return evt->y_root; } }
+	}
+
+	public unsafe class GestureRotateEventArgs : GLib.SignalArgs
+	{
+		[StructLayout (LayoutKind.Sequential, Pack=4)]
+		struct GdkEventGestureRotate
+		{
+			public Gdk.EventType type;
+			public IntPtr window;
+			public sbyte send_event;
+			public uint time;
+			public double x, y;
+			public uint state;
+			public double rotation;
+			public IntPtr device;
+			public double x_root, y_root;
+		}
+
+		GdkEventGestureRotate *evt {
+			get {
+				var handle = ((Event)Args[0]).Handle;
+				return (GdkEventGestureRotate *) handle;
+			}
+		}
+
+		public Gdk.Window Window {
+			get {
+				return (Gdk.Window) GLib.Object.GetObject (evt->window);
+			}
+		}
+
+		public Device Device {
+			get {
+				return (Device) GLib.Object.GetObject (evt->device);
+			}
+		}
+
+		public uint Time { get { return evt->time; } }
+		public double X { get { return evt->x; } }
+		public double Y { get { return evt->y; } }
+		public ModifierType State { get { return (ModifierType) evt->state; } }
+		public double Rotation { get { return evt->rotation; } }
+		public double XRoot { get { return evt->x_root; } }
+		public double YRoot { get { return evt->y_root; } }
+	}
+
+	public unsafe class GestureSwipeEventArgs : GLib.SignalArgs
+	{
+		[StructLayout (LayoutKind.Sequential, Pack=4)]
+		struct GdkEventGestureSwipe
+		{
+			public Gdk.EventType type;
+			public IntPtr window;
+			public sbyte send_event;
+			public uint time;
+			public double x, y;
+			public uint state;
+			public double delta_x, delta_y;
+			public IntPtr device;
+			public double x_root, y_root;
+		}
+
+		GdkEventGestureSwipe *evt {
+			get {
+				var handle = ((Event)Args[0]).Handle;
+				return (GdkEventGestureSwipe *) handle;
+			}
+		}
+
+		public Gdk.Window Window {
+			get {
+				return (Gdk.Window) GLib.Object.GetObject (evt->window);
+			}
+		}
+
+		public Device Device {
+			get {
+				return (Device) GLib.Object.GetObject (evt->device);
+			}
+		}
+
+		public uint Time { get { return evt->time; } }
+		public double X { get { return evt->x; } }
+		public double Y { get { return evt->y; } }
+		public ModifierType State { get { return (ModifierType) evt->state; } }
+		public double DeltaX { get { return evt->delta_x; } }
+		public double DeltaY { get { return evt->delta_y; } }
+		public double XRoot { get { return evt->x_root; } }
+		public double YRoot { get { return evt->y_root; } }
+	}
+
+	/*
+	void PrintOffsets ()
+	{
+		GdkEventGestureMagnify *v = (GdkEventGestureMagnify *)0;
+		Console.WriteLine ("type          {0}", (int)&(v->type));
+		Console.WriteLine ("window        {0}", (int)&(v->window));
+		Console.WriteLine ("send_event    {0}", (int)&(v->send_event));
+		Console.WriteLine ("time          {0}", (int)&(v->time));
+		Console.WriteLine ("x             {0}", (int)&(v->x));
+		Console.WriteLine ("y             {0}", (int)&(v->y));
+		Console.WriteLine ("state         {0}", (int)&(v->state));
+		Console.WriteLine ("magnification {0}", (int)&(v->magnification));
+		Console.WriteLine ("x_root        {0}", (int)&(v->x_root));
+		Console.WriteLine ("y_root        {0}", (int)&(v->y_root));
+	}
+
+	// gcc -m32 test.c `pkg-config --cflags gtk+-2.0`
+	#include <gtk/gtk.h>
+
+	int main (int argc, char* argv)
+	{
+		GdkEventGestureMagnify *v = (GdkEventGestureMagnify *)0;
+		printf ("type          %d\n", (int)&(v->type));
+		printf ("window        %d\n", (int)&(v->window));
+		printf ("send_event    %d\n", (int)&(v->send_event));
+		printf ("time          %d\n", (int)&(v->time));
+		printf ("x             %d\n", (int)&(v->x));
+		printf ("y             %d\n", (int)&(v->y));
+		printf ("state         %d\n", (int)&(v->state));
+		printf ("magnification %d\n", (int)&(v->magnification));
+		printf ("x_root        %d\n", (int)&(v->x_root));
+		printf ("y_root        %d\n", (int)&(v->y_root));
+	}
+	*/
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs
index 5818c33e5b..a083d352f2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs
@@ -88,6 +88,19 @@ namespace MonoDevelop.Components
 			return c.ToGdkColor ();
 		}
 
+		/// <summary>
+		/// Makes a color lighter or darker
+		/// </summary>
+		/// <param name='lightAmount'>
+		/// Amount of lightness to add. If the value is positive, the color will be lighter,
+		/// if negative it will be darker. Value must be between 0 and 1.
+		/// </param>
+		public static HslColor AddLight (this HslColor color, double lightAmount)
+		{
+			color.L += lightAmount;
+			return color;
+		}
+
 		public static Cairo.Color AddLight (this Cairo.Color color, double lightAmount)
 		{
 			var c = color.ToXwtColor ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs
new file mode 100644
index 0000000000..398ae0e0e9
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs
@@ -0,0 +1,1275 @@
+//
+// GtkWorkarounds.cs
+//
+// Authors: Jeffrey Stedfast <jeff@xamarin.com>
+//
+// Copyright (C) 2011 Xamarin Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Reflection.Emit;
+using Gtk;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor.Highlighting;
+using System.Text.RegularExpressions;
+
+namespace MonoDevelop.Components
+{
+	public static class GtkWorkarounds
+	{
+		const string LIBOBJC ="/usr/lib/libobjc.dylib";
+		const string USER32DLL = "User32.dll";
+
+		[DllImport (LIBOBJC, EntryPoint = "sel_registerName")]
+		static extern IntPtr sel_registerName (string selector);
+
+		[DllImport (LIBOBJC, EntryPoint = "objc_getClass")]
+		static extern IntPtr objc_getClass (string klass);
+
+		[DllImport (LIBOBJC, EntryPoint = "objc_msgSend")]
+		static extern IntPtr objc_msgSend_IntPtr (IntPtr klass, IntPtr selector);
+
+		[DllImport (LIBOBJC, EntryPoint = "objc_msgSend")]
+		static extern void objc_msgSend_void_bool (IntPtr klass, IntPtr selector, bool arg);
+
+		[DllImport (LIBOBJC, EntryPoint = "objc_msgSend")]
+		static extern bool objc_msgSend_bool (IntPtr klass, IntPtr selector);
+
+		[DllImport (LIBOBJC, EntryPoint = "objc_msgSend")]
+		static extern int objc_msgSend_NSInt32_NSInt32 (IntPtr klass, IntPtr selector, int arg);
+
+		[DllImport (LIBOBJC, EntryPoint = "objc_msgSend")]
+		static extern long objc_msgSend_NSInt64_NSInt64 (IntPtr klass, IntPtr selector, long arg);
+
+		[DllImport (LIBOBJC, EntryPoint = "objc_msgSend")]
+		static extern uint objc_msgSend_NSUInt32 (IntPtr klass, IntPtr selector);
+
+		[DllImport (LIBOBJC, EntryPoint = "objc_msgSend")]
+		static extern ulong objc_msgSend_NSUInt64 (IntPtr klass, IntPtr selector);
+
+		[DllImport (LIBOBJC, EntryPoint = "objc_msgSend_stret")]
+		static extern void objc_msgSend_CGRect32 (out CGRect32 rect, IntPtr klass, IntPtr selector);
+
+		[DllImport (LIBOBJC, EntryPoint = "objc_msgSend_stret")]
+		static extern void objc_msgSend_CGRect64 (out CGRect64 rect, IntPtr klass, IntPtr selector);
+
+		[DllImport (PangoUtil.LIBQUARTZ)]
+		static extern IntPtr gdk_quartz_window_get_nswindow (IntPtr window);
+
+		[DllImport (PangoUtil.LIBQUARTZ)]
+		static extern bool gdk_window_has_embedded_nsview_focus (IntPtr window);
+
+		struct CGRect32
+		{
+			public float X, Y, Width, Height;
+		}
+
+		struct CGRect64
+		{
+			public double X, Y, Width, Height;
+
+			public CGRect64 (CGRect32 rect32)
+			{
+				X = rect32.X;
+				Y = rect32.Y;
+				Width = rect32.Width;
+				Height = rect32.Height;
+			}
+		}
+
+		static IntPtr cls_NSScreen;
+		static IntPtr sel_screens, sel_objectEnumerator, sel_nextObject, sel_frame, sel_visibleFrame,
+		sel_requestUserAttention, sel_setHasShadow, sel_invalidateShadow;
+		static IntPtr sharedApp;
+		static IntPtr cls_NSEvent;
+		static IntPtr sel_modifierFlags;
+
+		const int NSCriticalRequest = 0;
+		const int NSInformationalRequest = 10;
+
+		static System.Reflection.MethodInfo glibObjectGetProp, glibObjectSetProp;
+
+		public static int GtkMinorVersion = 12, GtkMicroVersion = 0;
+		static bool oldMacKeyHacks = false;
+
+		static GtkWorkarounds ()
+		{
+			if (Platform.IsMac) {
+				InitMac ();
+			}
+
+			var flags = System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic;
+			glibObjectSetProp = typeof (GLib.Object).GetMethod ("SetProperty", flags);
+			glibObjectGetProp = typeof (GLib.Object).GetMethod ("GetProperty", flags);
+
+			foreach (int i in new [] { 24, 22, 20, 18, 16, 14 }) {
+				if (Gtk.Global.CheckVersion (2, (uint)i, 0) == null) {
+					GtkMinorVersion = i;
+					break;
+				}
+			}
+
+			for (int i = 1; i < 20; i++) {
+				if (Gtk.Global.CheckVersion (2, (uint)GtkMinorVersion, (uint)i) == null) {
+					GtkMicroVersion = i;
+				} else {
+					break;
+				}
+			}
+
+			//opt into the fixes on GTK+ >= 2.24.8
+			if (Platform.IsMac) {
+				try {
+					gdk_quartz_set_fix_modifiers (true);
+				} catch (EntryPointNotFoundException) {
+					oldMacKeyHacks = true;
+				}
+			}
+
+			keymap.KeysChanged += delegate {
+				mappedKeys.Clear ();
+			};
+		}
+
+		static void InitMac ()
+		{
+			cls_NSScreen = objc_getClass ("NSScreen");
+			cls_NSEvent = objc_getClass ("NSEvent");
+			sel_screens = sel_registerName ("screens");
+			sel_objectEnumerator = sel_registerName ("objectEnumerator");
+			sel_nextObject = sel_registerName ("nextObject");
+			sel_visibleFrame = sel_registerName ("visibleFrame");
+			sel_frame = sel_registerName ("frame");
+			sel_requestUserAttention = sel_registerName ("requestUserAttention:");
+			sel_modifierFlags = sel_registerName ("modifierFlags");
+			sel_setHasShadow = sel_registerName ("setHasShadow:");
+			sel_invalidateShadow = sel_registerName ("invalidateShadow");
+			sharedApp = objc_msgSend_IntPtr (objc_getClass ("NSApplication"), sel_registerName ("sharedApplication"));
+		}
+
+		static Gdk.Rectangle MacGetUsableMonitorGeometry (Gdk.Screen screen, int monitor)
+		{
+			IntPtr array = objc_msgSend_IntPtr (cls_NSScreen, sel_screens);
+			IntPtr iter = objc_msgSend_IntPtr (array, sel_objectEnumerator);
+			Gdk.Rectangle ygeometry = screen.GetMonitorGeometry (monitor);
+			Gdk.Rectangle xgeometry = screen.GetMonitorGeometry (0);
+			IntPtr scrn;
+			int i = 0;
+
+			while ((scrn = objc_msgSend_IntPtr (iter, sel_nextObject)) != IntPtr.Zero && i < monitor)
+				i++;
+
+			if (scrn == IntPtr.Zero)
+				return screen.GetMonitorGeometry (monitor);
+
+			CGRect64 visible, frame;
+
+			if (IntPtr.Size == 8) {
+				objc_msgSend_CGRect64 (out visible, scrn, sel_visibleFrame);
+				objc_msgSend_CGRect64 (out frame, scrn, sel_frame);
+			} else {
+				CGRect32 visible32, frame32;
+				objc_msgSend_CGRect32 (out visible32, scrn, sel_visibleFrame);
+				objc_msgSend_CGRect32 (out frame32, scrn, sel_frame);
+				visible = new CGRect64 (visible32);
+				frame = new CGRect64 (frame32);
+			}
+
+			// Note: Frame and VisibleFrame rectangles are relative to monitor 0, but we need absolute
+			// coordinates.
+			visible.X += xgeometry.X;
+			frame.X += xgeometry.X;
+
+			// VisibleFrame.Y is the height of the Dock if it is at the bottom of the screen, so in order
+			// to get the menu height, we just figure out the difference between the visibleFrame height
+			// and the actual frame height, then subtract the Dock height.
+			//
+			// We need to swap the Y offset with the menu height because our callers expect the Y offset
+			// to be from the top of the screen, not from the bottom of the screen.
+			double x, y, width, height;
+
+			if (visible.Height < frame.Height) {
+				double dockHeight = visible.Y - frame.Y;
+				double menubarHeight = (frame.Height - visible.Height) - dockHeight;
+
+				height = frame.Height - menubarHeight - dockHeight;
+				y = ygeometry.Y + menubarHeight;
+			} else {
+				height = frame.Height;
+				y = ygeometry.Y;
+			}
+
+			// Takes care of the possibility of the Dock being positioned on the left or right edge of the screen.
+			width = System.Math.Min (visible.Width, frame.Width);
+			x = System.Math.Max (visible.X, frame.X);
+
+			return new Gdk.Rectangle ((int) x, (int) y, (int) width, (int) height);
+		}
+
+		static void MacRequestAttention (bool critical)
+		{
+			int kind = critical?  NSCriticalRequest : NSInformationalRequest;
+			if (IntPtr.Size == 8) {
+				objc_msgSend_NSInt64_NSInt64 (sharedApp, sel_requestUserAttention, kind);
+			} else {
+				objc_msgSend_NSInt32_NSInt32 (sharedApp, sel_requestUserAttention, kind);
+			}
+		}
+
+		// Note: we can't reuse RectangleF because the layout is different...
+		[StructLayout (LayoutKind.Sequential)]
+		struct Rect {
+			public int Left;
+			public int Top;
+			public int Right;
+			public int Bottom;
+
+			public int X { get { return Left; } }
+			public int Y { get { return Top; } }
+			public int Width { get { return Right - Left; } }
+			public int Height { get { return Bottom - Top; } }
+		}
+
+		const int MonitorInfoFlagsPrimary = 0x01;
+
+		[StructLayout (LayoutKind.Sequential)]
+		unsafe struct MonitorInfo {
+			public int Size;
+			public Rect Frame;         // Monitor
+			public Rect VisibleFrame;  // Work
+			public int Flags;
+			public fixed byte Device[32];
+		}
+
+		[UnmanagedFunctionPointer (CallingConvention.Winapi)]
+		delegate int EnumMonitorsCallback (IntPtr hmonitor, IntPtr hdc, IntPtr prect, IntPtr user_data);
+
+		[DllImport (USER32DLL)]
+		extern static int EnumDisplayMonitors (IntPtr hdc, IntPtr clip, EnumMonitorsCallback callback, IntPtr user_data);
+
+		[DllImport (USER32DLL)]
+		extern static int GetMonitorInfoA (IntPtr hmonitor, ref MonitorInfo info);
+
+		static Gdk.Rectangle WindowsGetUsableMonitorGeometry (Gdk.Screen screen, int monitor_id)
+		{
+			Gdk.Rectangle geometry = screen.GetMonitorGeometry (monitor_id);
+			List<MonitorInfo> screens = new List<MonitorInfo> ();
+
+			EnumDisplayMonitors (IntPtr.Zero, IntPtr.Zero, delegate (IntPtr hmonitor, IntPtr hdc, IntPtr prect, IntPtr user_data) {
+				var info = new MonitorInfo ();
+
+				unsafe {
+					info.Size = sizeof (MonitorInfo);
+				}
+
+				GetMonitorInfoA (hmonitor, ref info);
+
+				// In order to keep the order the same as Gtk, we need to put the primary monitor at the beginning.
+				if ((info.Flags & MonitorInfoFlagsPrimary) != 0)
+					screens.Insert (0, info);
+				else
+					screens.Add (info);
+
+				return 1;
+			}, IntPtr.Zero);
+
+			MonitorInfo monitor = screens[monitor_id];
+			Rect visible = monitor.VisibleFrame;
+			Rect frame = monitor.Frame;
+
+			// Rebase the VisibleFrame off of Gtk's idea of this monitor's geometry (since they use different coordinate systems)
+			int x = geometry.X + (visible.Left - frame.Left);
+			int width = visible.Width;
+
+			int y = geometry.Y + (visible.Top - frame.Top);
+			int height = visible.Height;
+
+			return new Gdk.Rectangle (x, y, width, height);
+		}
+
+		public static Gdk.Rectangle GetUsableMonitorGeometry (this Gdk.Screen screen, int monitor)
+		{
+			if (Platform.IsWindows)
+				return WindowsGetUsableMonitorGeometry (screen, monitor);
+
+			if (Platform.IsMac)
+				return MacGetUsableMonitorGeometry (screen, monitor);
+
+			return screen.GetMonitorGeometry (monitor);
+		}
+
+		public static int RunDialogWithNotification (Gtk.Dialog dialog)
+		{
+			if (Platform.IsMac)
+				MacRequestAttention (dialog.Modal);
+
+			return dialog.Run ();
+		}
+
+		public static void PresentWindowWithNotification (this Gtk.Window window)
+		{
+			window.Present ();
+
+			if (Platform.IsMac) {
+				var dialog = window as Gtk.Dialog;
+				MacRequestAttention (dialog == null? false : dialog.Modal);
+			}
+		}
+
+		public static GLib.Value GetProperty (this GLib.Object obj, string name)
+		{
+			return (GLib.Value) glibObjectGetProp.Invoke (obj, new object[] { name });
+		}
+
+		public static void SetProperty (this GLib.Object obj, string name, GLib.Value value)
+		{
+			glibObjectSetProp.Invoke (obj, new object[] { name, value });
+		}
+
+		public static bool TriggersContextMenu (this Gdk.EventButton evt)
+		{
+			return evt.Type == Gdk.EventType.ButtonPress && IsContextMenuButton (evt);
+		}
+
+		public static bool IsContextMenuButton (this Gdk.EventButton evt)
+		{
+			if (evt.Button == 3 &&
+				(evt.State & (Gdk.ModifierType.Button1Mask | Gdk.ModifierType.Button2Mask)) == 0)
+				return true;
+
+			if (Platform.IsMac) {
+				if (!oldMacKeyHacks &&
+					evt.Button == 1 &&
+					(evt.State & Gdk.ModifierType.ControlMask) != 0 &&
+					(evt.State & (Gdk.ModifierType.Button2Mask | Gdk.ModifierType.Button3Mask)) == 0)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static Gdk.ModifierType GetCurrentKeyModifiers ()
+		{
+			if (Platform.IsMac) {
+				Gdk.ModifierType mtype = Gdk.ModifierType.None;
+				ulong mod;
+				if (IntPtr.Size == 8) {
+					mod = objc_msgSend_NSUInt64 (cls_NSEvent, sel_modifierFlags);
+				} else {
+					mod = objc_msgSend_NSUInt32 (cls_NSEvent, sel_modifierFlags);
+				}
+				if ((mod & (1 << 17)) != 0)
+					mtype |= Gdk.ModifierType.ShiftMask;
+				if ((mod & (1 << 18)) != 0)
+					mtype |= Gdk.ModifierType.ControlMask;
+				if ((mod & (1 << 19)) != 0)
+					mtype |= Gdk.ModifierType.Mod1Mask; // Alt key
+				if ((mod & (1 << 20)) != 0)
+					mtype |= Gdk.ModifierType.Mod2Mask; // Command key
+				return mtype;
+			}
+			else {
+				Gdk.ModifierType mtype;
+				Gtk.Global.GetCurrentEventState (out mtype);
+				return mtype;
+			}
+		}
+
+		public static void GetPageScrollPixelDeltas (this Gdk.EventScroll evt, double pageSizeX, double pageSizeY,
+			out double deltaX, out double deltaY)
+		{
+			if (!GetEventScrollDeltas (evt, out deltaX, out deltaY)) {
+				var direction = evt.Direction;
+				deltaX = deltaY = 0;
+				if (pageSizeY != 0 && (direction == Gdk.ScrollDirection.Down || direction == Gdk.ScrollDirection.Up)) {
+					deltaY = System.Math.Pow (pageSizeY, 2.0 / 3.0);
+					deltaX = 0.0;
+					if (direction == Gdk.ScrollDirection.Up)
+						deltaY = -deltaY;
+				} else if (pageSizeX != 0) {
+					deltaX = System.Math.Pow (pageSizeX, 2.0 / 3.0);
+					deltaY = 0.0;
+					if (direction == Gdk.ScrollDirection.Left)
+						deltaX = -deltaX;
+				}
+			}
+		}
+
+		public static void AddValueClamped (this Gtk.Adjustment adj, double value)
+		{
+			adj.Value = System.Math.Max (adj.Lower, System.Math.Min (adj.Value + value, adj.Upper - adj.PageSize));
+		}
+
+		[DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)]
+		extern static bool gdk_event_get_scroll_deltas (IntPtr eventScroll, out double deltaX, out double deltaY);
+		static bool scrollDeltasNotSupported;
+
+		public static bool GetEventScrollDeltas (Gdk.EventScroll evt, out double deltaX, out double deltaY)
+		{
+			if (!scrollDeltasNotSupported) {
+				try {
+					return gdk_event_get_scroll_deltas (evt.Handle, out deltaX, out deltaY);
+				} catch (EntryPointNotFoundException) {
+					scrollDeltasNotSupported = true;
+				}
+			}
+			deltaX = deltaY = 0;
+			return false;
+		}
+
+		/// <summary>Shows a context menu.</summary>
+		/// <param name='menu'>The menu.</param>
+		/// <param name='parent'>The parent widget.</param>
+		/// <param name='evt'>The mouse event. May be null if triggered by keyboard.</param>
+		/// <param name='caret'>The caret/selection position within the parent, if the EventButton is null.</param>
+		public static void ShowContextMenu (Gtk.Menu menu, Gtk.Widget parent, Gdk.EventButton evt, Gdk.Rectangle caret)
+		{
+			Gtk.MenuPositionFunc posFunc = null;
+
+			if (parent != null) {
+				menu.AttachToWidget (parent, null);
+				menu.Hidden += (sender, e) => {
+					if (menu.AttachWidget != null)
+						menu.Detach ();
+				};
+				posFunc = delegate (Gtk.Menu m, out int x, out int y, out bool pushIn) {
+					Gdk.Window window = evt != null? evt.Window : parent.GdkWindow;
+					window.GetOrigin (out x, out y);
+					var alloc = parent.Allocation;
+					if (evt != null) {
+						x += (int) evt.X;
+						y += (int) evt.Y;
+					} else if (caret.X >= alloc.X && caret.Y >= alloc.Y) {
+						x += caret.X;
+						y += caret.Y + caret.Height;
+					} else {
+						x += alloc.X;
+						y += alloc.Y;
+					}
+					Gtk.Requisition request = m.SizeRequest ();
+					var screen = parent.Screen;
+					Gdk.Rectangle geometry = GetUsableMonitorGeometry (screen, screen.GetMonitorAtPoint (x, y));
+
+					//whether to push or flip menus that would extend offscreen
+					//FIXME: this is the correct behaviour for mac, check other platforms
+					bool flip_left = true;
+					bool flip_up   = false;
+
+					if (x + request.Width > geometry.X + geometry.Width) {
+						if (flip_left) {
+							x -= request.Width;
+						} else {
+							x = geometry.X + geometry.Width - request.Width;
+						}
+
+						if (x < geometry.Left)
+							x = geometry.Left;
+					}
+
+					if (y + request.Height > geometry.Y + geometry.Height) {
+						if (flip_up) {
+							y -= request.Height;
+						} else {
+							y = geometry.Y + geometry.Height - request.Height;
+						}
+
+						if (y < geometry.Top)
+							y = geometry.Top;
+					}
+
+					pushIn = false;
+				};
+			}
+
+			uint time;
+			uint button;
+
+			if (evt == null) {
+				time = Gtk.Global.CurrentEventTime;
+				button = 0;
+			} else {
+				time = evt.Time;
+				button = evt.Button;
+			}
+
+			//HACK: work around GTK menu issues on mac when passing button to menu.Popup
+			//some menus appear and immediately hide, and submenus don't activate
+			if (Platform.IsMac) {
+				button = 0;
+			}
+
+			menu.Popup (null, null, posFunc, button, time);
+		}
+
+		public static void ShowContextMenu (Gtk.Menu menu, Gtk.Widget parent, Gdk.EventButton evt)
+		{
+			ShowContextMenu (menu, parent, evt, Gdk.Rectangle.Zero);
+		}
+
+		public static void ShowContextMenu (Gtk.Menu menu, Gtk.Widget parent, Gdk.Rectangle caret)
+		{
+			ShowContextMenu (menu, parent, null, caret);
+		}
+
+		struct MappedKeys
+		{
+			public Gdk.Key Key;
+			public Gdk.ModifierType State;
+			public KeyboardShortcut[] Shortcuts;
+		}
+
+		//introduced in GTK 2.20
+		[DllImport (PangoUtil.LIBGDK, CallingConvention = CallingConvention.Cdecl)]
+		extern static bool gdk_keymap_add_virtual_modifiers (IntPtr keymap, ref Gdk.ModifierType state);
+
+		//Custom patch in Mono Mac w/GTK+ 2.24.8+
+		[DllImport (PangoUtil.LIBGDK, CallingConvention = CallingConvention.Cdecl)]
+		extern static bool gdk_quartz_set_fix_modifiers (bool fix);
+
+		static Gdk.Keymap keymap = Gdk.Keymap.Default;
+		static Dictionary<ulong,MappedKeys> mappedKeys = new Dictionary<ulong,MappedKeys> ();
+
+		/// <summary>Map raw GTK key input to work around platform bugs and decompose accelerator keys</summary>
+		/// <param name='evt'>The raw key event</param>
+		/// <param name='key'>The composed key</param>
+		/// <param name='state'>The composed modifiers</param>
+		/// <param name='shortcuts'>All the key/modifier decompositions that can be used as accelerators</param>
+		public static void MapKeys (Gdk.EventKey evt, out Gdk.Key key, out Gdk.ModifierType state,
+			out KeyboardShortcut[] shortcuts)
+		{
+			//this uniquely identifies the raw key
+			ulong id;
+			unchecked {
+				id = (((ulong)(uint)evt.State) | (((ulong)evt.HardwareKeycode) << 32) | (((ulong)evt.Group) << 48));
+			}
+
+			bool remapKey = Platform.IsWindows && evt.HardwareKeycode == 0;
+			MappedKeys mapped;
+			if (remapKey || !mappedKeys.TryGetValue (id, out mapped))
+				mappedKeys[id] = mapped = MapKeys (evt);
+
+			shortcuts = mapped.Shortcuts;
+			state = mapped.State;
+			key = mapped.Key;
+
+			if (remapKey) {
+				key = (Gdk.Key)evt.KeyValue;
+			}
+		}
+
+		static MappedKeys MapKeys (Gdk.EventKey evt)
+		{
+			MappedKeys mapped;
+			Gdk.ModifierType modifier = evt.State;
+			byte grp = evt.Group;
+
+			if (GtkMinorVersion >= 20) {
+				gdk_keymap_add_virtual_modifiers (keymap.Handle, ref modifier);
+			}
+
+			//full key mapping
+			uint keyval;
+			int effectiveGroup, level;
+			Gdk.ModifierType consumedModifiers;
+			TranslateKeyboardState (evt, modifier, grp, out keyval, out effectiveGroup,
+				out level, out consumedModifiers);
+			mapped.Key = (Gdk.Key)keyval;
+			mapped.State = FixMacModifiers (evt.State & ~consumedModifiers, grp);
+
+			//decompose the key into accel combinations
+			var accelList = new List<KeyboardShortcut> ();
+
+			const Gdk.ModifierType accelMods = Gdk.ModifierType.ShiftMask | Gdk.ModifierType.Mod1Mask
+				| Gdk.ModifierType.ControlMask | Gdk.ModifierType.SuperMask |Gdk.ModifierType.MetaMask;
+
+			//all accels ignore the lock key
+			modifier &= ~Gdk.ModifierType.LockMask;
+
+			//fully decomposed
+			TranslateKeyboardState (evt, Gdk.ModifierType.None, 0,
+				out keyval, out effectiveGroup, out level, out consumedModifiers);
+			accelList.Add (new KeyboardShortcut ((Gdk.Key)keyval, FixMacModifiers (modifier, grp) & accelMods));
+
+			//with shift composed
+			if ((modifier & Gdk.ModifierType.ShiftMask) != 0) {
+				keymap.TranslateKeyboardState (evt.HardwareKeycode, Gdk.ModifierType.ShiftMask, 0,
+					out keyval, out effectiveGroup, out level, out consumedModifiers);
+
+				if (Platform.IsWindows && evt.HardwareKeycode == 0) {
+					keyval = (ushort)evt.KeyValue;
+				}
+
+				// Prevent consumption of non-Shift modifiers (that we didn't even provide!)
+				consumedModifiers &= Gdk.ModifierType.ShiftMask;
+
+				var m = FixMacModifiers ((modifier & ~consumedModifiers), grp) & accelMods;
+				AddIfNotDuplicate (accelList, new KeyboardShortcut ((Gdk.Key)keyval, m));
+			}
+
+			//with group 1 composed
+			if (grp == 1) {
+				TranslateKeyboardState (evt, modifier & ~Gdk.ModifierType.ShiftMask, 1,
+					out keyval, out effectiveGroup, out level, out consumedModifiers);
+
+				// Prevent consumption of Shift modifier (that we didn't even provide!)
+				consumedModifiers &= ~Gdk.ModifierType.ShiftMask;
+
+				var m = FixMacModifiers ((modifier & ~consumedModifiers), 0) & accelMods;
+				AddIfNotDuplicate (accelList, new KeyboardShortcut ((Gdk.Key)keyval, m));
+			}
+
+			//with group 1 and shift composed
+			if (grp == 1 && (modifier & Gdk.ModifierType.ShiftMask) != 0) {
+				TranslateKeyboardState (evt, modifier, 1,
+					out keyval, out effectiveGroup, out level, out consumedModifiers);
+				var m = FixMacModifiers ((modifier & ~consumedModifiers), 0) & accelMods;
+				AddIfNotDuplicate (accelList, new KeyboardShortcut ((Gdk.Key)keyval, m));
+			}
+
+			//and also allow the fully mapped key as an accel
+			AddIfNotDuplicate (accelList, new KeyboardShortcut (mapped.Key, mapped.State & accelMods));
+
+			mapped.Shortcuts = accelList.ToArray ();
+			return mapped;
+		}
+
+		// Workaround for bug "Bug 688247 - Ctrl+Alt key not work on windows7 with bootcamp on a Mac Book Pro"
+		// Ctrl+Alt should behave like right alt key - unfortunately TranslateKeyboardState doesn't handle it. 
+		static void TranslateKeyboardState (Gdk.EventKey evt, Gdk.ModifierType state, int group, out uint keyval,
+			out int effective_group, out int level, out Gdk.ModifierType consumed_modifiers)
+		{
+			uint hardware_keycode = evt.HardwareKeycode;
+
+			if (Platform.IsWindows) {
+				const Gdk.ModifierType ctrlAlt = Gdk.ModifierType.ControlMask | Gdk.ModifierType.Mod1Mask;
+				if ((state & ctrlAlt) == ctrlAlt) {
+					state = (state & ~ctrlAlt) | Gdk.ModifierType.Mod2Mask;
+					group = 1;
+				}
+				// Case: Caps lock on + shift + key 
+				// See: Bug 8069 - [UI Refresh] If caps lock is on, holding the shift key prevents typed characters from appearing
+				if (state.HasFlag (Gdk.ModifierType.ShiftMask)) {
+					state &= ~Gdk.ModifierType.ShiftMask;
+				}
+			}
+
+			keymap.TranslateKeyboardState (hardware_keycode, state, group, out keyval, out effective_group,
+				out level, out consumed_modifiers);
+
+			if (Platform.IsWindows && hardware_keycode == 0) {
+				keyval = evt.KeyValue;
+			}
+		}
+
+		static Gdk.ModifierType FixMacModifiers (Gdk.ModifierType mod, byte grp)
+		{
+			if (!oldMacKeyHacks)
+				return mod;
+
+			// Mac GTK+ maps the command key to the Mod1 modifier, which usually means alt/
+			// We map this instead to meta, because the Mac GTK+ has mapped the cmd key
+			// to the meta key (yay inconsistency!). IMO super would have been saner.
+			if ((mod & Gdk.ModifierType.Mod1Mask) != 0) {
+				mod ^= Gdk.ModifierType.Mod1Mask;
+				mod |= Gdk.ModifierType.MetaMask;
+			}
+
+			//some versions of GTK map opt as mod5, which converts to the virtual super modifier
+			if ((mod & (Gdk.ModifierType.Mod5Mask | Gdk.ModifierType.SuperMask)) != 0) {
+				mod ^= (Gdk.ModifierType.Mod5Mask | Gdk.ModifierType.SuperMask);
+				mod |= Gdk.ModifierType.Mod1Mask;
+			}
+
+			// When opt modifier is active, we need to decompose this to make the command appear correct for Mac.
+			// In addition, we can only inspect whether the opt/alt key is pressed by examining
+			// the key's "group", because the Mac GTK+ treats opt as a group modifier and does
+			// not expose it as an actual GDK modifier.
+			if (grp == (byte) 1) {
+				mod |= Gdk.ModifierType.Mod1Mask;
+			}
+
+			return mod;
+		}
+
+		static void AddIfNotDuplicate<T> (List<T> list, T item) where T : IEquatable<T>
+		{
+			for (int i = 0; i < list.Count; i++) {
+				if (list[i].Equals (item))
+					return;
+			}
+			list.Add (item);
+		}
+
+		[System.Runtime.InteropServices.DllImport (PangoUtil.LIBGDK, CallingConvention = CallingConvention.Cdecl)]
+		static extern IntPtr gdk_win32_drawable_get_handle (IntPtr drawable);
+
+		enum DwmWindowAttribute
+		{
+			NcRenderingEnabled = 1,
+			NcRenderingPolicy,
+			TransitionsForceDisabled,
+			AllowNcPaint,
+			CaptionButtonBounds,
+			NonClientRtlLayout,
+			ForceIconicRepresentation,
+			Flip3DPolicy,
+			ExtendedFrameBounds,
+			HasIconicBitmap,
+			DisallowPeek,
+			ExcludedFromPeek,
+			Last,
+		}
+
+		struct Win32Rect
+		{
+			public int Left, Top, Right, Bottom;
+
+			public Win32Rect (int left, int top, int right, int bottom)
+			{
+				this.Left = left;
+				this.Top = top;
+				this.Right = right;
+				this.Bottom = bottom;
+			}
+		}
+
+		[DllImport ("dwmapi.dll")]
+		static extern int DwmGetWindowAttribute (IntPtr hwnd, DwmWindowAttribute attribute, out Win32Rect value, int valueSize);
+
+		[DllImport ("dwmapi.dll")]
+		static extern int DwmIsCompositionEnabled (out bool enabled);
+
+		[DllImport (USER32DLL)]
+		static extern bool GetWindowRect (IntPtr hwnd, out Win32Rect rect);
+
+		public static void SetImCursorLocation (Gtk.IMContext ctx, Gdk.Window clientWindow, Gdk.Rectangle cursor)
+		{
+			// work around GTK+ Bug 663096 - Windows IME position is wrong when Aero glass is enabled
+			// https://bugzilla.gnome.org/show_bug.cgi?id=663096
+			if (Platform.IsWindows && System.Environment.OSVersion.Version.Major >= 6) {
+				bool enabled;
+				if (DwmIsCompositionEnabled (out enabled) == 0 && enabled) {
+					var hwnd = gdk_win32_drawable_get_handle (clientWindow.Toplevel.Handle);
+					Win32Rect rect;
+					// this module gets the WINVER=6 version of GetWindowRect, which returns the correct value
+					if (GetWindowRect (hwnd, out rect)) {
+						int x, y;
+						clientWindow.Toplevel.GetPosition (out x, out y);
+						cursor.X = cursor.X - x + rect.Left;
+						cursor.Y = cursor.Y - y + rect.Top - cursor.Height;
+					}
+				}
+			}
+			ctx.CursorLocation = cursor;
+		}
+
+		/// <summary>X coordinate of the pixels inside the right edge of the rectangle</summary>
+		/// <remarks>Workaround for inconsistency of Right property between GTK# versions</remarks>
+		public static int RightInside (this Gdk.Rectangle rect)
+		{
+			return rect.X + rect.Width - 1;
+		}
+
+		/// <summary>Y coordinate of the pixels inside the bottom edge of the rectangle</summary>
+		/// <remarks>Workaround for inconsistency of Bottom property between GTK# versions#</remarks>
+		public static int BottomInside (this Gdk.Rectangle rect)
+		{
+			return rect.Y + rect.Height - 1;
+		}
+
+		/// <summary>
+		/// Shows or hides the shadow of the window rendered by the native toolkit
+		/// </summary>
+		public static void ShowNativeShadow (Gtk.Window window, bool show)
+		{
+			if (Platform.IsMac) {
+				var ptr = gdk_quartz_window_get_nswindow (window.GdkWindow.Handle);
+				objc_msgSend_void_bool (ptr, sel_setHasShadow, show);
+			}
+		}
+
+		public static void UpdateNativeShadow (Gtk.Window window)
+		{
+			if (!Platform.IsMac)
+				return;
+
+			var ptr = gdk_quartz_window_get_nswindow (window.GdkWindow.Handle);
+			objc_msgSend_IntPtr (ptr, sel_invalidateShadow);
+		}
+
+		public static bool HasNSTextFieldFocus (Gdk.Window window)
+		{
+			if (Platform.IsMac) {
+				try {
+					return gdk_window_has_embedded_nsview_focus (window.Handle);
+				} catch (Exception e) {
+					return false;
+				}
+			} else {
+				return false;
+			}
+		}
+
+		[DllImport (PangoUtil.LIBGTKGLUE, CallingConvention = CallingConvention.Cdecl)]
+		static extern void gtksharp_container_leak_fixed_marker ();
+
+		static HashSet<Type> fixedContainerTypes;
+		static Dictionary<IntPtr,ForallDelegate> forallCallbacks;
+		static bool containerLeakFixed;
+
+		// Works around BXC #3801 - Managed Container subclasses are incorrectly resurrected, then leak.
+		// It does this by registering an alternative callback for gtksharp_container_override_forall, which
+		// ignores callbacks if the wrapper no longer exists. This means that the objects no longer enter a
+		// finalized->release->dispose->re-wrap resurrection cycle.
+		// We use a dynamic method to access internal/private GTK# API in a performant way without having to track
+		// per-instance delegates.
+		public static void FixContainerLeak (Gtk.Container c)
+		{
+			if (containerLeakFixed) {
+				return;
+			}
+
+			FixContainerLeak (c.GetType ());
+		}
+
+		static void FixContainerLeak (Type t)
+		{
+			if (containerLeakFixed) {
+				return;
+			}
+
+			if (fixedContainerTypes == null) {
+				try {
+					gtksharp_container_leak_fixed_marker ();
+					containerLeakFixed = true;
+					return;
+				} catch (EntryPointNotFoundException) {
+				}
+				fixedContainerTypes = new HashSet<Type>();
+				forallCallbacks = new Dictionary<IntPtr, ForallDelegate> ();
+			}
+
+			if (!fixedContainerTypes.Add (t)) {
+				return;
+			}
+
+			//need to fix the callback for the type and all the managed supertypes
+			var lookupGType = typeof (GLib.Object).GetMethod ("LookupGType", BindingFlags.Static | BindingFlags.NonPublic);
+			do {
+				var gt = (GLib.GType) lookupGType.Invoke (null, new[] { t });
+				var cb = CreateForallCallback (gt.Val);
+				forallCallbacks[gt.Val] = cb;
+				gtksharp_container_override_forall (gt.Val, cb);
+				t = t.BaseType;
+			} while (fixedContainerTypes.Add (t) && t.Assembly != typeof (Gtk.Container).Assembly);
+		}
+
+		static ForallDelegate CreateForallCallback (IntPtr gtype)
+		{
+			var dm = new DynamicMethod (
+				"ContainerForallCallback",
+				typeof(void),
+				new Type[] { typeof(IntPtr), typeof(bool), typeof(IntPtr), typeof(IntPtr) },
+				typeof(GtkWorkarounds).Module,
+				true);
+
+			var invokerType = typeof(Gtk.Container.CallbackInvoker);
+
+			//this was based on compiling a similar method and disassembling it
+			ILGenerator il = dm.GetILGenerator ();
+			var IL_002b = il.DefineLabel ();
+			var IL_003f = il.DefineLabel ();
+			var IL_0060 = il.DefineLabel ();
+			var label_return = il.DefineLabel ();
+
+			var loc_container = il.DeclareLocal (typeof(Gtk.Container));
+			var loc_obj = il.DeclareLocal (typeof(object));
+			var loc_invoker = il.DeclareLocal (invokerType);
+			var loc_ex = il.DeclareLocal (typeof(Exception));
+
+			//check that the type is an exact match
+			// prevent stack overflow, because the callback on a more derived type will handle everything
+			il.Emit (OpCodes.Ldarg_0);
+			il.Emit (OpCodes.Call, typeof(GLib.ObjectManager).GetMethod ("gtksharp_get_type_id", BindingFlags.Static | BindingFlags.NonPublic));
+
+			il.Emit (OpCodes.Ldc_I8, gtype.ToInt64 ());
+			il.Emit (OpCodes.Newobj, typeof (IntPtr).GetConstructor (new Type[] { typeof (Int64) }));
+			il.Emit (OpCodes.Call, typeof (IntPtr).GetMethod ("op_Equality", BindingFlags.Static | BindingFlags.Public));
+			il.Emit (OpCodes.Brfalse, label_return);
+
+			il.BeginExceptionBlock ();
+			il.Emit (OpCodes.Ldnull);
+			il.Emit (OpCodes.Stloc, loc_container);
+			il.Emit (OpCodes.Ldsfld, typeof (GLib.Object).GetField ("Objects", BindingFlags.Static | BindingFlags.NonPublic));
+			il.Emit (OpCodes.Ldarg_0);
+			il.Emit (OpCodes.Box, typeof (IntPtr));
+			il.Emit (OpCodes.Callvirt, typeof (System.Collections.Hashtable).GetProperty ("Item").GetGetMethod ());
+			il.Emit (OpCodes.Stloc, loc_obj);
+			il.Emit (OpCodes.Ldloc, loc_obj);
+			il.Emit (OpCodes.Brfalse, IL_002b);
+
+			var tref = typeof (GLib.Object).Assembly.GetType ("GLib.ToggleRef");
+			il.Emit (OpCodes.Ldloc, loc_obj);
+			il.Emit (OpCodes.Castclass, tref);
+			il.Emit (OpCodes.Callvirt, tref.GetProperty ("Target").GetGetMethod ());
+			il.Emit (OpCodes.Isinst, typeof (Gtk.Container));
+			il.Emit (OpCodes.Stloc, loc_container);
+
+			il.MarkLabel (IL_002b);
+			il.Emit (OpCodes.Ldloc, loc_container);
+			il.Emit (OpCodes.Brtrue, IL_003f);
+
+			il.Emit (OpCodes.Ldarg_0);
+			il.Emit (OpCodes.Ldarg_1);
+			il.Emit (OpCodes.Ldarg_2);
+			il.Emit (OpCodes.Ldarg_3);
+			il.Emit (OpCodes.Call, typeof (Gtk.Container).GetMethod ("gtksharp_container_base_forall", BindingFlags.Static | BindingFlags.NonPublic));
+			il.Emit (OpCodes.Br, IL_0060);
+
+			il.MarkLabel (IL_003f);
+			il.Emit (OpCodes.Ldloca_S, 2);
+			il.Emit (OpCodes.Ldarg_2);
+			il.Emit (OpCodes.Ldarg_3);
+			il.Emit (OpCodes.Call, invokerType.GetConstructor (
+				BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof (IntPtr), typeof (IntPtr) }, null));
+			il.Emit (OpCodes.Ldloc, loc_container);
+			il.Emit (OpCodes.Ldarg_1);
+			il.Emit (OpCodes.Ldloc, loc_invoker);
+			il.Emit (OpCodes.Box, invokerType);
+			il.Emit (OpCodes.Ldftn, invokerType.GetMethod ("Invoke"));
+			il.Emit (OpCodes.Newobj, typeof (Gtk.Callback).GetConstructor (
+				BindingFlags.Instance | BindingFlags.Public, null, new Type[] { typeof (object), typeof (IntPtr) }, null));
+			var forallMeth = typeof (Gtk.Container).GetMethod ("ForAll",
+				BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof (bool), typeof (Gtk.Callback) }, null);
+			il.Emit (OpCodes.Callvirt, forallMeth);
+
+			il.MarkLabel (IL_0060);
+
+			il.BeginCatchBlock (typeof (Exception));
+			il.Emit (OpCodes.Stloc, loc_ex);
+			il.Emit (OpCodes.Ldloc, loc_ex);
+			il.Emit (OpCodes.Ldc_I4_0);
+			il.Emit (OpCodes.Call, typeof (GLib.ExceptionManager).GetMethod ("RaiseUnhandledException"));
+			il.Emit (OpCodes.Leave, label_return);
+			il.EndExceptionBlock ();
+
+			il.MarkLabel (label_return);
+			il.Emit (OpCodes.Ret);
+
+			return (ForallDelegate) dm.CreateDelegate (typeof (ForallDelegate));
+		}
+
+		[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+		delegate void ForallDelegate (IntPtr container, bool include_internals, IntPtr cb, IntPtr data);
+
+		[DllImport(PangoUtil.LIBGTKGLUE, CallingConvention = CallingConvention.Cdecl)]
+		static extern void gtksharp_container_override_forall (IntPtr gtype, ForallDelegate cb);
+
+		const string urlRegexStr = @"(http|ftp)s?\:\/\/[\w\d\.,;_/\-~%@()+:?&^=#!]*[\w\d/]";
+		static readonly Regex UrlRegex  = new Regex (urlRegexStr, RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+
+		public static string MarkupLinks (string text)
+		{
+			if (GtkMinorVersion < 18)
+				return text;
+			return UrlRegex.Replace (text, MatchToUrl);
+		}
+
+		static string MatchToUrl (System.Text.RegularExpressions.Match m)
+		{
+			var s = m.ToString ();
+			return String.Format ("<a href='{0}'>{1}</a>", s, s.Replace ("_", "__"));
+		}
+
+		public static void SetLinkHandler (this Gtk.Label label, Action<string> urlHandler)
+		{
+			if (GtkMinorVersion >= 18)
+				new UrlHandlerClosure (urlHandler).ConnectTo (label);
+		}
+
+		//create closure manually so we can apply ConnectBefore
+		class UrlHandlerClosure
+		{
+			Action<string> urlHandler;
+
+			public UrlHandlerClosure (Action<string> urlHandler)
+			{
+				this.urlHandler = urlHandler;
+			}
+
+			[GLib.ConnectBefore]
+			void HandleLink (object sender, ActivateLinkEventArgs args)
+			{
+				urlHandler (args.Url);
+				args.RetVal = true;
+			}
+
+			public void ConnectTo (Gtk.Label label)
+			{
+				var signal = GLib.Signal.Lookup (label, "activate-link", typeof(ActivateLinkEventArgs));
+				signal.AddDelegate (new EventHandler<ActivateLinkEventArgs> (HandleLink));
+			}
+
+			class ActivateLinkEventArgs : GLib.SignalArgs
+			{
+				public string Url { get { return (string)base.Args [0]; } }
+			}
+		}
+
+		static bool canSetOverlayScrollbarPolicy = true;
+
+		[DllImport (PangoUtil.LIBQUARTZ)]
+		static extern void gtk_scrolled_window_set_overlay_policy (IntPtr sw, Gtk.PolicyType hpolicy, Gtk.PolicyType vpolicy);
+
+		[DllImport (PangoUtil.LIBQUARTZ)]
+		static extern void gtk_scrolled_window_get_overlay_policy (IntPtr sw, out Gtk.PolicyType hpolicy, out Gtk.PolicyType vpolicy);
+
+		public static void SetOverlayScrollbarPolicy (Gtk.ScrolledWindow sw, Gtk.PolicyType hpolicy, Gtk.PolicyType vpolicy)
+		{
+			if (!canSetOverlayScrollbarPolicy) {
+				return;
+			}
+			try {
+				gtk_scrolled_window_set_overlay_policy (sw.Handle, hpolicy, vpolicy);
+				return;
+			} catch (DllNotFoundException) {
+			} catch (EntryPointNotFoundException) {
+			}
+		}
+
+		public static void GetOverlayScrollbarPolicy (Gtk.ScrolledWindow sw, out Gtk.PolicyType hpolicy, out Gtk.PolicyType vpolicy)
+		{
+			if (!canSetOverlayScrollbarPolicy) {
+				hpolicy = vpolicy = 0;
+				return;
+			}
+			try {
+				gtk_scrolled_window_get_overlay_policy (sw.Handle, out hpolicy, out vpolicy);
+				return;
+			} catch (DllNotFoundException) {
+			} catch (EntryPointNotFoundException) {
+			}
+			hpolicy = vpolicy = 0;
+			canSetOverlayScrollbarPolicy = false;
+		}
+
+		[DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)]
+		static extern bool gtk_tree_view_get_tooltip_context (IntPtr raw, ref int x, ref int y, bool keyboard_tip, out IntPtr model, out IntPtr path, IntPtr iter);
+
+		//the GTK# version of this has 'out' instead of 'ref', preventing passing the x,y values in
+		public static bool GetTooltipContext (this TreeView tree, ref int x, ref int y, bool keyboardTip,
+			out TreeModel model, out TreePath path, out Gtk.TreeIter iter)
+		{
+			IntPtr intPtr = Marshal.AllocHGlobal (Marshal.SizeOf (typeof(TreeIter)));
+			IntPtr handle;
+			IntPtr intPtr2;
+			bool result = gtk_tree_view_get_tooltip_context (tree.Handle, ref x, ref y, keyboardTip, out handle, out intPtr2, intPtr);
+			model = TreeModelAdapter.GetObject (handle, false);
+			path = intPtr2 == IntPtr.Zero ? null : ((TreePath)GLib.Opaque.GetOpaque (intPtr2, typeof(TreePath), false));
+			iter = TreeIter.New (intPtr);
+			Marshal.FreeHGlobal (intPtr);
+			return result;
+		}
+
+		static bool supportsHiResIcons = true;
+
+		[DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)]
+		static extern void gtk_icon_source_set_scale (IntPtr source, double scale);
+
+		[DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)]
+		static extern void gtk_icon_source_set_scale_wildcarded (IntPtr source, bool setting);
+
+		[DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)]
+		static extern double gtk_widget_get_scale_factor (IntPtr widget);
+
+		[DllImport (PangoUtil.LIBGDK, CallingConvention = CallingConvention.Cdecl)]
+		static extern double gdk_screen_get_monitor_scale_factor (IntPtr widget, int monitor);
+
+		[DllImport (PangoUtil.LIBGOBJECT, CallingConvention = CallingConvention.Cdecl)]
+		static extern IntPtr g_object_get_data (IntPtr source, string name);
+
+		[DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)]
+		static extern IntPtr gtk_icon_set_render_icon_scaled (IntPtr handle, IntPtr style, int direction, int state, int size, IntPtr widget, IntPtr intPtr, ref double scale);
+
+		public static bool SetSourceScale (Gtk.IconSource source, double scale)
+		{
+			if (!supportsHiResIcons)
+				return false;
+
+			try {
+				gtk_icon_source_set_scale (source.Handle, scale);
+				return true;
+			} catch (DllNotFoundException) {
+			} catch (EntryPointNotFoundException) {
+			}
+			supportsHiResIcons = false;
+			return false;
+		}
+
+		public static bool SetSourceScaleWildcarded (Gtk.IconSource source, bool setting)
+		{
+			if (!supportsHiResIcons)
+				return false;
+
+			try {
+				gtk_icon_source_set_scale_wildcarded (source.Handle, setting);
+				return true;
+			} catch (DllNotFoundException) {
+			} catch (EntryPointNotFoundException) {
+			}
+			supportsHiResIcons = false;
+			return false;
+		}
+
+		public static Gdk.Pixbuf Get2xVariant (Gdk.Pixbuf px)
+		{
+			if (!supportsHiResIcons)
+				return null;
+
+			try {
+				IntPtr res = g_object_get_data (px.Handle, "gdk-pixbuf-2x-variant");
+				if (res != IntPtr.Zero && res != px.Handle)
+					return (Gdk.Pixbuf) GLib.Object.GetObject (res);
+				else
+					return null;
+			} catch (DllNotFoundException) {
+			} catch (EntryPointNotFoundException) {
+			}
+			supportsHiResIcons = false;
+			return null;
+		}
+
+		public static void Set2xVariant (Gdk.Pixbuf px, Gdk.Pixbuf variant2x)
+		{
+		}
+
+		public static double GetScaleFactor (Gtk.Widget w)
+		{
+			if (!supportsHiResIcons)
+				return 1;
+
+			try {
+				return gtk_widget_get_scale_factor (w.Handle);
+			} catch (DllNotFoundException) {
+			} catch (EntryPointNotFoundException) {
+			}
+			supportsHiResIcons = false;
+			return 1;
+		}
+
+		public static double GetScaleFactor (this Gdk.Screen screen, int monitor)
+		{
+			if (!supportsHiResIcons)
+				return 1;
+
+			try {
+				return gdk_screen_get_monitor_scale_factor (screen.Handle, monitor);
+			} catch (DllNotFoundException) {
+			} catch (EntryPointNotFoundException) {
+			}
+			supportsHiResIcons = false;
+			return 1;
+		}
+
+		public static double GetScaleFactor ()
+		{
+			return GetScaleFactor (Gdk.Screen.Default, 0);
+		}
+
+		public static double GetPixelScale ()
+		{
+			if (Platform.IsWindows)
+				return GetScaleFactor ();
+			else
+				return 1d;
+		}
+
+		public static Gdk.Pixbuf RenderIcon (this Gtk.IconSet iconset, Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail, double scale)
+		{
+			if (scale == 1d)
+				return iconset.RenderIcon (style, direction, state, size, widget, detail);
+
+			if (!supportsHiResIcons)
+				return null;
+
+			try {
+				IntPtr intPtr = GLib.Marshaller.StringToPtrGStrdup (detail);
+				IntPtr o = gtk_icon_set_render_icon_scaled (iconset.Handle, (style != null) ? style.Handle : IntPtr.Zero, (int)direction, (int)state, (int)size, (widget != null) ? widget.Handle : IntPtr.Zero, intPtr, ref scale);
+				Gdk.Pixbuf result = (Gdk.Pixbuf) GLib.Object.GetObject (o);
+				GLib.Marshaller.Free (intPtr);
+				return result;
+			} catch (DllNotFoundException) {
+			} catch (EntryPointNotFoundException) {
+			}
+			supportsHiResIcons = false;
+			return null;
+		}
+	}
+
+	public struct KeyboardShortcut : IEquatable<KeyboardShortcut>
+	{
+		public static readonly KeyboardShortcut Empty = new KeyboardShortcut ((Gdk.Key) 0, (Gdk.ModifierType) 0);
+
+		Gdk.ModifierType modifier;
+		Gdk.Key key;
+
+		public KeyboardShortcut (Gdk.Key key, Gdk.ModifierType modifier)
+		{
+			this.modifier = modifier;
+			this.key = key;
+		}
+
+		public Gdk.Key Key {
+			get { return key; }
+		}
+
+		public Gdk.ModifierType Modifier {
+			get { return modifier; }
+		}
+
+		public bool IsEmpty {
+			get { return Key == (Gdk.Key) 0; }
+		}
+
+		public override bool Equals (object obj)
+		{
+			return obj is KeyboardShortcut && this.Equals ((KeyboardShortcut) obj);
+		}
+
+		public override int GetHashCode ()
+		{
+			//FIXME: we're only using a few bits of mod and mostly the lower bits of key - distribute it better
+			return (int) Key ^ (int) Modifier;
+		}
+
+		public bool Equals (KeyboardShortcut other)
+		{
+			return other.Key == Key && other.Modifier == Modifier;
+		}
+	}
+
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs
index d1de2f1c9f..a4f1fec7b4 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs
@@ -37,7 +37,7 @@ namespace MonoDevelop.Components
 
 		public HPanedThin ()
 		{
-			Mono.TextEditor.GtkWorkarounds.FixContainerLeak (this);
+			GtkWorkarounds.FixContainerLeak (this);
 			handle = new CustomPanedHandle (this);
 			handle.Parent = this;
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs
index 6edbdf9213..c34e0eda46 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs
@@ -25,7 +25,6 @@
 // THE SOFTWARE.
 using System;
 using Gtk;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HelperMethods.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HelperMethods.cs
new file mode 100644
index 0000000000..5b758e5a50
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HelperMethods.cs
@@ -0,0 +1,136 @@
+// HelperMethods.cs
+// 
+// Cut & paste from PangoCairoHelper.
+//
+// Author:
+//   Aaron Bockover <abockover@novell.com>
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Components
+{
+	public static class HelperMethods
+	{
+		[DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
+		static extern void pango_cairo_show_layout (IntPtr cr, IntPtr layout);
+
+		public static void ShowLayout (this Cairo.Context cr, Pango.Layout layout)
+		{
+			pango_cairo_show_layout (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
+		}
+
+		[DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_cairo_create_layout (IntPtr cr);
+
+		public static Pango.Layout CreateLayout (this Cairo.Context cr)
+		{
+			IntPtr raw_ret = pango_cairo_create_layout (cr == null ? IntPtr.Zero : cr.Handle);
+			return GLib.Object.GetObject (raw_ret) as Pango.Layout;
+		}
+
+		[DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
+		static extern void pango_cairo_layout_path (IntPtr cr, IntPtr layout);
+
+		public static void LayoutPath (this Cairo.Context cr, Pango.Layout layout)
+		{
+			pango_cairo_layout_path (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
+		}
+
+		[DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
+		static extern void pango_cairo_context_set_resolution (IntPtr pango_context, double dpi);
+
+		public static void ContextSetResolution (this Pango.Context context, double dpi)
+		{
+			pango_cairo_context_set_resolution (context == null ? IntPtr.Zero : context.Handle, dpi);
+		}
+
+		[DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_layout_get_context (IntPtr layout);
+
+		public static string GetColorString (Gdk.Color color)
+		{
+			return string.Format ("#{0:X02}{1:X02}{2:X02}", color.Red / 256, color.Green / 256, color.Blue / 256);
+		}
+
+		public static Pango.Context LayoutGetContext (this Pango.Layout layout)
+		{
+			IntPtr handle = pango_layout_get_context (layout.Handle);
+			return handle.Equals (IntPtr.Zero) ? null : GLib.Object.GetObject (handle) as Pango.Context;
+		}
+		
+		public static void DrawLine (this Cairo.Context cr, Cairo.Color color, double x1, double y1, double x2, double y2)
+		{
+			cr.SetSourceColor (color);
+			cr.MoveTo (x1, y1);
+			cr.LineTo (x2, y2);
+			cr.Stroke ();
+		}
+		
+		public static void Line (this Cairo.Context cr, double x1, double y1, double x2, double y2)
+		{
+			cr.MoveTo (x1, y1);
+			cr.LineTo (x2, y2);
+		}
+		
+		public static void SharpLineX (this Cairo.Context cr, double x1, double y1, double x2, double y2)
+		{
+			cr.MoveTo (x1 + 0.5, y1);
+			cr.LineTo (x2 + 0.5, y2);
+		}
+		
+		public static void SharpLineY (this Cairo.Context cr, double x1, double y1, double x2, double y2)
+		{
+			cr.MoveTo (x1, y1 + 0.5);
+			cr.LineTo (x2, y2 + 0.5);
+		}
+
+		public static void SetSourceColor (this Cairo.Context cr, Cairo.Color color)
+		{
+			cr.SetSourceRGBA (color.R, color.G, color.B, color.A);
+		}
+
+		//this is needed for building against old Mono.Cairo versions
+		[Obsolete]
+		public static void SetSource (this Cairo.Context cr, Cairo.Pattern pattern)
+		{
+			cr.Pattern = pattern;
+		}
+
+		[Obsolete]
+		public static Cairo.Surface GetTarget (this Cairo.Context cr)
+		{
+			return cr.Target;
+		}
+
+		[Obsolete]
+		public static void Dispose (this Cairo.Context cr)
+		{
+			((IDisposable)cr).Dispose ();
+		}
+	}
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HslColor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HslColor.cs
new file mode 100644
index 0000000000..7e56d747d1
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HslColor.cs
@@ -0,0 +1,292 @@
+// 
+// HslColor.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Gdk;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Components
+{
+	public struct HslColor
+	{
+		public double H {
+			get;
+			set;
+		}
+		
+		public double S {
+			get;
+			set;
+		}
+		
+		public double L {
+			get;
+			set;
+		}
+
+		public double Alpha {
+			get;
+			set;
+		}
+		
+		void ToRgb(out double r, out double g, out double b)
+		{
+			if (L == 0) {
+				r = g = b = 0;
+				return;
+			}
+			
+			if (S == 0) {
+				r = g = b = L;
+			} else {
+				double temp2 = L <= 0.5 ? L * (1.0 + S) : L + S -(L * S);
+				double temp1 = 2.0 * L - temp2;
+				
+				double[] t3 = new double[] { H + 1.0 / 3.0, H, H - 1.0 / 3.0};
+				double[] clr= new double[] { 0, 0, 0};
+				for (int i = 0; i < 3; i++) {
+					if (t3[i] < 0)
+						t3[i] += 1.0;
+					if (t3[i] > 1)
+						t3[i]-=1.0;
+					if (6.0 * t3[i] < 1.0)
+						clr[i] = temp1 + (temp2 - temp1) * t3[i] * 6.0;
+					else if (2.0 * t3[i] < 1.0)
+						clr[i] = temp2;
+					else if (3.0 * t3[i] < 2.0)
+						clr[i] = (temp1 + (temp2 - temp1) * ((2.0 / 3.0) - t3[i]) * 6.0);
+					else
+						clr[i] = temp1;
+				}
+				
+				r = clr[0];
+				g = clr[1];
+				b = clr[2];
+			}
+		}
+		
+		public static implicit operator Color (HslColor hsl)
+		{
+			double r = 0, g = 0, b = 0;
+			hsl.ToRgb (out r, out g, out b);
+			return new Color ((byte)(255 * r), 
+			                  (byte)(255 * g), 
+			                  (byte)(255 * b));
+		}
+		
+		public static implicit operator Cairo.Color (HslColor hsl)
+		{
+			double r = 0, g = 0, b = 0;
+			hsl.ToRgb (out r, out g, out b);
+			return new Cairo.Color (r, g, b, hsl.Alpha);
+		}
+
+		public static implicit operator HslColor (Color color)
+		{
+			return new HslColor (color);
+		}
+		
+		public static implicit operator HslColor (Cairo.Color color)
+		{
+			return new HslColor (color);
+		}
+
+		#if MAC
+
+		public static implicit operator HslColor (AppKit.NSColor color)
+		{
+			return new HslColor ((double)color.RedComponent, (double)color.GreenComponent, (double)color.BlueComponent);
+		}
+
+		public static implicit operator AppKit.NSColor (HslColor hsl)
+		{
+			double r = 0, g = 0, b = 0;
+			hsl.ToRgb (out r, out g, out b);
+			return AppKit.NSColor.FromDeviceRgba ((nfloat)r, (nfloat)g, (nfloat)b, (nfloat)hsl.Alpha);
+		}
+
+
+		public static implicit operator CoreGraphics.CGColor (HslColor hsl)
+		{
+			double r = 0, g = 0, b = 0;
+			hsl.ToRgb (out r, out g, out b);
+			return new CoreGraphics.CGColor ((nfloat)r, (nfloat)g, (nfloat)b, (nfloat)hsl.Alpha);
+		}
+		#endif
+
+		
+		public static HslColor FromHsl (double h, double s, double l)
+		{
+			return new HslColor {
+				H = h,
+				S = s,
+				L = l,
+				Alpha = 1.0d
+			};
+		}
+
+		public uint ToPixel ()
+		{
+			double r, g, b;
+			ToRgb(out r, out g, out b);
+			uint rv = (uint)(r * 255);
+			uint gv = (uint)(g * 255);
+			uint bv = (uint)(b * 255);
+			return rv << 16 | gv << 8 | bv;
+		}
+
+		public static HslColor FromPixel (uint pixel)
+		{
+			var r = ((pixel >> 16) & 0xFF) / 255.0;
+			var g = ((pixel >> 8) & 0xFF) / 255.0;
+			var b = (pixel & 0xFF) / 255.0;
+			return new HslColor (r, g, b);
+		}
+		
+		public HslColor (double r, double g, double b, double a = 1.0) : this ()
+		{
+			double v = System.Math.Max (r, g);
+			v = System.Math.Max (v, b);
+
+			double m = System.Math.Min (r, g);
+			m = System.Math.Min (m, b);
+			
+			this.L = (m + v) / 2.0;
+			if (this.L <= 0.0)
+				return;
+			double vm = v - m;
+			this.S = vm;
+			
+			if (this.S > 0.0) {
+				this.S /= (this.L <= 0.5) ? (v + m) : (2.0 - v - m);
+			} else {
+				return;
+			}
+			
+			double r2 = (v - r) / vm;
+			double g2 = (v - g) / vm;
+			double b2 = (v - b) / vm;
+			
+			if (r == v) {
+				this.H = (g == m ? 5.0 + b2 : 1.0 - g2);
+			} else if (g == v) {
+				this.H = (b == m ? 1.0 + r2 : 3.0 - b2);
+			} else {
+				this.H = (r == m ? 3.0 + g2 : 5.0 - r2);
+			}
+			this.H /= 6.0;
+
+			this.Alpha = a;
+		}
+		
+		public HslColor (Color color) : this (color.Red / (double)ushort.MaxValue, color.Green / (double)ushort.MaxValue, color.Blue / (double)ushort.MaxValue)
+		{
+			Alpha = 1.0;
+		}
+		
+		public HslColor (Cairo.Color color) : this (color.R, color.G, color.B, color.A)
+		{
+		}
+		
+		public static HslColor Parse (string color)
+		{
+			Gdk.Color col = new Gdk.Color (0, 0, 0);
+			Gdk.Color.Parse (color, ref col);
+			return (HslColor)col;
+		}
+
+		public static double Brightness (HslColor c)
+		{
+			return Brightness ((Cairo.Color)c);
+		}
+
+		public static double Brightness (Cairo.Color c)
+		{
+			double r = c.R;
+			double g = c.G;
+			double b = c.B;
+			return System.Math.Sqrt (r * .241 + g * .691 + b * .068);
+		}
+
+		public static double Brightness (Gdk.Color c)
+		{
+			double r = c.Red / (double)ushort.MaxValue;
+			double g = c.Green / (double)ushort.MaxValue;
+			double b = c.Blue / (double)ushort.MaxValue;
+			return System.Math.Sqrt (r * .241 + g * .691 + b * .068);
+		}
+		
+		public static List<HslColor> GenerateHighlightColors (HslColor backGround, HslColor foreGround, int n)
+		{
+			double bgH = (backGround.H == 0 && backGround.S == 0) ? 2 / 3.0 : backGround.H;
+			var result = new List<HslColor> ();
+			for (int i = 0; i < n; i++) {
+				double h = bgH + (i + 1.0) / (double)n;
+				
+				// for monochromatic backround the h value doesn't matter
+				if (i + 1 == n && !(backGround.H == 0 && backGround.S == 0))
+					h = bgH + 0.5;
+				
+				if (h > 1.0)
+					h -= 1.0;
+					
+				double s = 0.85;
+				double l = 0.5;
+				if (backGround.H == 0 && backGround.S == 0 && backGround.L < 0.5)
+					l = 0.8;
+				result.Add (HslColor.FromHsl (h, s, l));
+			}
+			return result;
+		}
+		
+		public override string ToString ()
+		{
+			return string.Format ("[HslColor: H={0}, S={1}, L={2}, A={3}]", H, S, L, Alpha);
+		}
+
+		public string ToPangoString ()
+		{
+			var resultColor = (Cairo.Color)this;
+			return string.Format ("#{0:x2}{1:x2}{2:x2}",
+				(int)(resultColor.R * 255),
+				(int)(resultColor.G * 255), 
+				(int)(resultColor.B * 255));
+		}
+
+
+		public string ToMarkup ()
+		{
+			if (Alpha == 1.0)
+				return ToPangoString ();
+			var resultColor = (Cairo.Color)this;
+			return string.Format ("#{0:x2}{1:x2}{2:x2}{3:x2}",
+				(int)(resultColor.R * 255),
+				(int)(resultColor.G * 255), 
+				(int)(resultColor.B * 255), 
+				(int)(resultColor.A * 255));
+		}
+	}
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ImageView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ImageView.cs
index 5851edf92f..8b9bc5a851 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ImageView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ImageView.cs
@@ -70,7 +70,7 @@ namespace MonoDevelop.Components
 		}
 
 		double IconScale {
-			get { return Mono.TextEditor.GtkWorkarounds.GetPixelScale (); }
+			get { return GtkWorkarounds.GetPixelScale (); }
 		}
 
 		protected override void OnSizeRequested (ref Gtk.Requisition requisition)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MiniButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MiniButton.cs
index 34a646b8e4..715045bf8c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MiniButton.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MiniButton.cs
@@ -26,7 +26,6 @@
 
 using System;
 using Gtk;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PangoUtil.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PangoUtil.cs
new file mode 100644
index 0000000000..86de702f7f
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PangoUtil.cs
@@ -0,0 +1,260 @@
+// 
+// PangoUtils.cs
+//  
+// Author:
+//       Michael Hutchinson <mhutchinson@novell.com>
+// 
+// Copyright (c) 2010 Novell, Inc. (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Gtk;
+using System.Runtime.InteropServices;
+
+namespace MonoDevelop.Components
+{
+	public static class PangoUtil
+	{
+		internal const string LIBGTK          = "libgtk-win32-2.0-0.dll";
+		internal const string LIBATK          = "libatk-1.0-0.dll";
+		internal const string LIBGLIB         = "libglib-2.0-0.dll";
+		internal const string LIBGDK          = "libgdk-win32-2.0-0.dll";
+		internal const string LIBGOBJECT      = "libgobject-2.0-0.dll";
+		internal const string LIBPANGO        = "libpango-1.0-0.dll";
+		internal const string LIBPANGOCAIRO   = "libpangocairo-1.0-0.dll";
+		internal const string LIBQUARTZ       = "libgtk-quartz-2.0.dylib";
+		internal const string LIBGTKGLUE      = "gtksharpglue-2";
+		
+		/// <summary>
+		/// This doesn't leak Pango layouts, unlike some other ways to create them in GTK# &lt;= 2.12.11
+		/// </summary>
+		public static Pango.Layout CreateLayout (Widget widget)
+		{
+			var ptr = gtk_widget_create_pango_layout (widget.Handle, IntPtr.Zero);
+			return ptr == IntPtr.Zero? null : new Pango.Layout (ptr);
+		}
+
+		public static Pango.Layout CreateLayout (Widget widget, string text)
+		{
+			IntPtr textPtr = text == null? IntPtr.Zero : GLib.Marshaller.StringToPtrGStrdup (text);
+			
+			var ptr = gtk_widget_create_pango_layout (widget.Handle, textPtr);
+			
+			if (textPtr != IntPtr.Zero)
+				GLib.Marshaller.Free (textPtr);
+			
+			return ptr == IntPtr.Zero? null : new Pango.Layout (ptr);
+		}
+		
+		public static Pango.Layout CreateLayout (PrintContext context)
+		{
+			var ptr = gtk_print_context_create_pango_layout (context.Handle);
+			return ptr == IntPtr.Zero? null : new Pango.Layout (ptr);
+		}
+		
+		[DllImport (LIBGTK, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr gtk_widget_create_pango_layout (IntPtr widget, IntPtr text);
+		
+		[DllImport (LIBGTK, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr gtk_print_context_create_pango_layout (IntPtr context);
+	}
+	
+	/// <summary>
+	/// This creates a Pango list and applies attributes to it with *much* less overhead than the GTK# version.
+	/// </summary>
+	class FastPangoAttrList : IDisposable
+	{
+		IntPtr list;
+		
+		public FastPangoAttrList ()
+		{
+			list = pango_attr_list_new ();
+		}
+		
+		public void AddStyleAttribute (Pango.Style style, uint start, uint end)
+		{
+			Add (pango_attr_style_new (style), start, end);
+		}
+		
+		public void AddWeightAttribute (Pango.Weight weight, uint start, uint end)
+		{
+			Add (pango_attr_weight_new (weight), start, end);
+		}
+		
+		public void AddForegroundAttribute (Gdk.Color color, uint start, uint end)
+		{
+			Add (pango_attr_foreground_new (color.Red, color.Green, color.Blue), start, end);
+		}
+		
+		public void AddBackgroundAttribute (Gdk.Color color, uint start, uint end)
+		{
+			Add (pango_attr_background_new (color.Red, color.Green, color.Blue), start, end);
+		}
+		
+		public void AddUnderlineAttribute (Pango.Underline underline, uint start, uint end)
+		{
+			Add (pango_attr_underline_new (underline), start, end);
+		}
+		
+		void Add (IntPtr attribute, uint start, uint end)
+		{
+			unsafe {
+				PangoAttribute *attPtr = (PangoAttribute *) attribute;
+				attPtr->start_index = start;
+				attPtr->end_index = end;
+			}
+			pango_attr_list_insert (list, attribute);
+		}
+
+		/// <summary>
+		/// Like Splice, except it only offsets/clamps the inserted items, doesn't affect items already in the list.
+		/// </summary>
+		public void InsertOffsetList (Pango.AttrList atts, uint startOffset, uint endOffset)
+		{
+			//HACK: atts.Iterator.Attrs broken (throws NRE), so manually P/Invoke
+			var iter = pango_attr_list_get_iterator (atts.Handle);
+			try {
+				do {
+					IntPtr list = pango_attr_iterator_get_attrs (iter);
+					try {
+						int len = g_slist_length (list);
+						for (uint i = 0; i < len; i++) {
+							IntPtr val = g_slist_nth_data (list, i);
+							AddOffsetCopy (val, startOffset, endOffset);
+						}
+					} finally {
+						g_slist_free (list);
+					}
+				} while (pango_attr_iterator_next (iter));
+			} finally {
+				pango_attr_iterator_destroy (iter);
+			}
+		}
+
+		void AddOffsetCopy (IntPtr attr, uint startOffset, uint endOffset)
+		{
+			var copy = pango_attribute_copy (attr);
+			unsafe {
+				PangoAttribute *attPtr = (PangoAttribute *) copy;
+				attPtr->start_index = startOffset + attPtr->start_index;
+				attPtr->end_index = System.Math.Min (endOffset, startOffset + attPtr->end_index);
+			}
+			pango_attr_list_insert (list, copy);
+		}
+		
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_attr_style_new (Pango.Style style);
+		
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_attr_stretch_new (Pango.Stretch stretch);
+		
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_attr_weight_new (Pango.Weight weight);
+		
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_attr_foreground_new (ushort red, ushort green, ushort blue);
+		
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_attr_background_new (ushort red, ushort green, ushort blue);
+		
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_attr_underline_new (Pango.Underline underline);
+		
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_attr_list_new ();
+
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern void pango_attr_list_unref (IntPtr list);
+		
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern void pango_attr_list_insert (IntPtr list, IntPtr attr);
+		
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern void pango_layout_set_attributes (IntPtr layout, IntPtr attrList);
+		
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern void pango_attr_list_splice (IntPtr attr_list, IntPtr other, Int32 pos, Int32 len);
+
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_attribute_copy (IntPtr attr);
+
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_attr_list_get_iterator (IntPtr list);
+		
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern bool pango_attr_iterator_next (IntPtr iterator);
+
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern void pango_attr_iterator_destroy (IntPtr iterator);
+
+		[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
+		static extern IntPtr pango_attr_iterator_get_attrs (IntPtr iterator);
+
+		[DllImport (PangoUtil.LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
+		private static extern int g_slist_length (IntPtr l);
+
+		[DllImport (PangoUtil.LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
+		private static extern IntPtr g_slist_nth_data (IntPtr l, uint n);
+
+		[DllImport (PangoUtil.LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
+		private static extern void g_slist_free (IntPtr l);
+
+		public void Splice (Pango.AttrList attrs, int pos, int len)
+		{
+			pango_attr_list_splice (list, attrs.Handle, pos, len);
+		}
+		
+		public void AssignTo (Pango.Layout layout)
+		{
+			pango_layout_set_attributes (layout.Handle, list);
+		}
+
+		[StructLayout (LayoutKind.Sequential)]
+		struct PangoAttribute
+		{
+			public IntPtr klass;
+			public uint start_index;
+			public uint end_index;
+		}
+		
+		public void Dispose ()
+		{
+			if (list != IntPtr.Zero) {
+				GC.SuppressFinalize (this);
+				Destroy ();
+			}
+		}
+		
+		//NOTE: the list destroys all its attributes when the ref count reaches zero
+		void Destroy ()
+		{
+			pango_attr_list_unref (list);
+			list = IntPtr.Zero;
+		}
+		
+		~FastPangoAttrList ()
+		{
+			GLib.Idle.Add (delegate {
+				Destroy ();
+				return false;
+			});
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs
index 8ff221923e..d90d8d8a81 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs
@@ -25,15 +25,13 @@
 // THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 using Gtk;
 using Gdk;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Components
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs
index 04d0d9f32b..97423f16c6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs
@@ -27,7 +27,6 @@ using System;
 using Gtk;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
-using Mono.TextEditor;
 using Gdk;
 using Xwt.Motion;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindowTheme.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindowTheme.cs
index d477f4700b..29bf1dcc25 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindowTheme.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindowTheme.cs
@@ -27,8 +27,9 @@ using System;
 using Gtk;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
-using Mono.TextEditor;
 using Gdk;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
 
 namespace MonoDevelop.Components
 {
@@ -264,7 +265,7 @@ namespace MonoDevelop.Components
 			Font = Pango.FontDescription.FromString ("Normal");
 		}
 
-		public void SetSchemeColors (Mono.TextEditor.Highlighting.ColorScheme scheme)
+		public void SetSchemeColors (ColorScheme scheme)
 		{
 			TopColor = scheme.TooltipText.Background.AddLight (0.03);
 			BottomColor = scheme.TooltipText.Background;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs
index 44bd4e78ed..188f400dd3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs
@@ -31,7 +31,6 @@ using System;
 using Gtk;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SectionList.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SectionList.cs
index 02688602d0..6ea647114b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SectionList.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SectionList.cs
@@ -29,7 +29,6 @@ using System.Collections.Generic;
 using Gtk;
 using Gdk;
 using Cairo;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Components
 {
@@ -91,7 +90,7 @@ namespace MonoDevelop.Components
 		
 		public SectionList ()
 		{
-			Mono.TextEditor.GtkWorkarounds.FixContainerLeak (this);
+			GtkWorkarounds.FixContainerLeak (this);
 			
 			this.WidgetFlags |= WidgetFlags.NoWindow;
 			WidthRequest = 100;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs
index d6c04f907a..a60edb358e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs
@@ -30,7 +30,6 @@ using System.ComponentModel;
 using System.Drawing.Design;
 using Cairo;
 using Gtk;
-using Mono.TextEditor;
 using System.Linq;
 
 namespace MonoDevelop.Components
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs
index e5685f27af..95036e0cbe 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs
@@ -26,12 +26,10 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 
 using MonoDevelop.Ide;
 using Gtk;
 using Gdk;
-using Mono.TextEditor.PopupWindow;
 
 namespace MonoDevelop.Components
 {
@@ -41,7 +39,7 @@ namespace MonoDevelop.Components
 		
 		public string LinkColor {
 			get {
-				var color = Mono.TextEditor.HslColor.GenerateHighlightColors (Style.Background (State), Style.Text (State), 3)[2];
+				var color = HslColor.GenerateHighlightColors (Style.Background (State), Style.Text (State), 3)[2];
 				return color.ToPangoString ();
 			}
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs
index 838c04f970..ac607fda01 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs
@@ -34,7 +34,7 @@ namespace MonoDevelop.Components
 
 		public VPanedThin ()
 		{
-			Mono.TextEditor.GtkWorkarounds.FixContainerLeak (this);
+			GtkWorkarounds.FixContainerLeak (this);
 			handle = new CustomPanedHandle (this);
 			handle.Parent = this;
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/WindowTransparencyDecorator.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/WindowTransparencyDecorator.cs
new file mode 100644
index 0000000000..9b8e8526d8
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/WindowTransparencyDecorator.cs
@@ -0,0 +1,116 @@
+//
+// WindowTransparencyDecorator.cs
+//
+// Author:
+//   Michael Hutchinson <mhutch@xamarin.com>
+//
+// Based on code derived from Banshee.Widgets.EllipsizeLabel
+// by Aaron Bockover (aaron@aaronbock.net)
+//
+// Copyright (C) 2005-2008 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+using Gtk;
+using Gdk;
+
+namespace MonoDevelop.Components
+{
+	public class WindowTransparencyDecorator
+	{
+		Gtk.Window window;
+		bool semiTransparent;
+		bool snooperInstalled;
+		uint snooperID;
+		const double opacity = 0.2;
+
+		WindowTransparencyDecorator (Gtk.Window window)
+		{
+			this.window = window;
+
+			window.Shown += ShownHandler;
+			window.Hidden += HiddenHandler;
+			window.Destroyed += DestroyedHandler;
+		}
+
+		public static WindowTransparencyDecorator Attach (Gtk.Window window)
+		{
+			return new WindowTransparencyDecorator (window);
+		}
+
+		public void Detach ()
+		{
+			if (window == null)
+				return;
+
+			//remove the snooper
+			HiddenHandler (null,  null);
+
+			//annul allreferences between this and the window
+			window.Shown -= ShownHandler;
+			window.Hidden -= HiddenHandler;
+			window.Destroyed -= DestroyedHandler;
+			window = null;
+		}
+
+		void ShownHandler (object sender, EventArgs args)
+		{
+			if (!snooperInstalled)
+				snooperID = Gtk.Key.SnooperInstall (TransparencyKeySnooper);
+			snooperInstalled = true;
+
+			//NOTE: we unset transparency when showing, instead of when hiding
+			//because the latter case triggers a metacity+compositing bug that shows the window again
+			SemiTransparent = false;
+		}
+
+		void HiddenHandler (object sender, EventArgs args)
+		{
+			if (snooperInstalled)
+				Gtk.Key.SnooperRemove (snooperID);
+			snooperInstalled = false;
+		}
+
+		void DestroyedHandler (object sender, EventArgs args)
+		{
+			Detach ();
+		}
+
+		int TransparencyKeySnooper (Gtk.Widget widget, EventKey evnt)
+		{
+			if (evnt != null && evnt.Key == Gdk.Key.Control_L || evnt.Key == Gdk.Key.Control_R)
+				SemiTransparent = (evnt.Type == Gdk.EventType.KeyPress);
+			return 0; //FALSE
+		}
+
+		bool SemiTransparent {
+			set {
+				if (semiTransparent != value) {
+					semiTransparent = value;
+					window.Opacity = semiTransparent? opacity : 1.0;
+				}
+			}
+		}
+	}
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CodeCompletionContextEventArgs.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CodeCompletionContextEventArgs.cs
index a658f30b05..5d455b0bb3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CodeCompletionContextEventArgs.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CodeCompletionContextEventArgs.cs
@@ -29,7 +29,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 {
 	public class CodeCompletionContextEventArgs : EventArgs
 	{
-		public ICompletionWidget Widget {
+		internal ICompletionWidget Widget {
 			get;
 			set;
 		}
@@ -44,7 +44,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			set;
 		}
 		
-		public CodeCompletionContextEventArgs (ICompletionWidget widget, CodeCompletionContext codeCompletionContext, string completedWord)
+		internal CodeCompletionContextEventArgs (ICompletionWidget widget, CodeCompletionContext codeCompletionContext, string completedWord)
 		{
 			this.Widget = widget;
 			this.CodeCompletionContext = codeCompletionContext;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionCategory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionCategory.cs
new file mode 100644
index 0000000000..fc88fd62b2
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionCategory.cs
@@ -0,0 +1,50 @@
+//
+// CompletionCategory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Ide.CodeCompletion
+{
+	public abstract class CompletionCategory : IComparable<CompletionCategory>
+	{
+		public string DisplayText { get; set; }
+
+		public string Icon { get; set; }
+
+		protected CompletionCategory ()
+		{
+		}
+
+		protected CompletionCategory (string displayText, string icon)
+		{
+			this.DisplayText = displayText;
+			this.Icon = icon;
+		}
+
+		public abstract int CompareTo (CompletionCategory other);
+	}
+
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionData.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionData.cs
index 2303d06b5e..e93c4687d0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionData.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionData.cs
@@ -30,11 +30,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.Completion;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Ide.CodeCompletion
 {
-	public class CompletionData : ICompletionData, IComparable
+	public class CompletionData : IComparable
 	{
 		protected CompletionData () {}
 		
@@ -43,6 +43,13 @@ namespace MonoDevelop.Ide.CodeCompletion
 		public virtual string Description { get; set; }
 		public virtual string CompletionText { get; set; }
 
+		/// <summary>
+		/// int.MaxValue == highest prioriy,
+		/// -int.MaxValue == lowest priority
+		/// </summary>
+		/// <value>The priority group.</value>
+		public virtual int PriorityGroup { get { return 0; } }
+
 		public virtual string GetDisplayDescription (bool isSelected)
 		{
 			return null;
@@ -70,13 +77,13 @@ namespace MonoDevelop.Ide.CodeCompletion
 			}
 		}
 		
-		public virtual IEnumerable<ICompletionData> OverloadedData {
+		public virtual IReadOnlyList<CompletionData> OverloadedData {
 			get {
 				throw new InvalidOperationException ();
 			}
 		}
 		
-		public virtual void AddOverload (ICompletionData data)
+		public virtual void AddOverload (CompletionData data)
 		{
 			throw new InvalidOperationException ();
 		}
@@ -102,7 +109,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			return result;
 		}
 
-		public virtual void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+		public virtual void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
 			var currentWord = GetCurrentWord (window);
 			window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, currentWord, CompletionText);
@@ -117,12 +124,12 @@ namespace MonoDevelop.Ide.CodeCompletion
 
 		public virtual int CompareTo (object obj)
 		{
-			if (!(obj is ICompletionData))
+			if (!(obj is CompletionData))
 				return 0;
-			return Compare (this, (ICompletionData)obj);
+			return Compare (this, (CompletionData)obj);
 		}
 
-		public static int Compare (ICompletionData a, ICompletionData b)
+		public static int Compare (CompletionData a, CompletionData b)
 		{
 			var result =  ((a.DisplayFlags & DisplayFlags.Obsolete) == (b.DisplayFlags & DisplayFlags.Obsolete)) ? StringComparer.OrdinalIgnoreCase.Compare (a.DisplayText, b.DisplayText) : (a.DisplayFlags & DisplayFlags.Obsolete) != 0 ? 1 : -1;
 			if (result == 0) {
@@ -133,7 +140,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 				if (aIsImport && !bIsImport)
 					return 1;
 				if (aIsImport && bIsImport)
-					return StringComparer.Ordinal.Compare (a.Description, b.Description);
+					return StringComparer.Ordinal.Compare (((CompletionData)a).Description, ((CompletionData)b).Description);
 				var ca = a as CompletionData;
 				var cb = b as CompletionData;
 				if (ca != null && cb != null && !ca.Icon.IsNull && !cb.Icon.IsNull) {
@@ -144,5 +151,19 @@ namespace MonoDevelop.Ide.CodeCompletion
 		}
 
 		#endregion
+
+		protected string ApplyDiplayFlagsFormatting (string markup)
+		{
+			if (!HasOverloads && (DisplayFlags & DisplayFlags.Obsolete) != 0 || HasOverloads && OverloadedData.All (data => (data.DisplayFlags & DisplayFlags.Obsolete) != 0))
+				return "<s>" + markup + "</s>";
+			if ((DisplayFlags & DisplayFlags.MarkedBold) != 0)
+				return "<b>" + markup + "</b>";
+			return markup;
+		}
+
+		public virtual string GetDisplayTextMarkup ()
+		{
+			return ApplyDiplayFlagsFormatting (GLib.Markup.EscapeText (DisplayText));
+		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionDataList.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionDataList.cs
index 2311475497..e0c21b8177 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionDataList.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionDataList.cs
@@ -30,12 +30,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.Completion;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Ide.CodeCompletion
 {
-	public interface ICompletionDataList : IList<ICompletionData>
+	public interface ICompletionDataList : IList<CompletionData>
 	{
+		int TriggerWordLength { get; }
+
 		bool IsSorted { get; }
 		bool AutoCompleteUniqueMatch { get; }
 		bool AutoCompleteEmptyMatch { get; }
@@ -44,8 +46,8 @@ namespace MonoDevelop.Ide.CodeCompletion
 		bool AutoSelect { get; }
 		string DefaultCompletionString { get; }
 		CompletionSelectionMode CompletionSelectionMode { get; }
-		void Sort (Comparison<ICompletionData> comparison);
-		void Sort (IComparer<ICompletionData> comparison);
+		void Sort (Comparison<CompletionData> comparison);
+		void Sort (IComparer<CompletionData> comparison);
 		
 		IEnumerable<ICompletionKeyHandler> KeyHandler { get; }
 		
@@ -56,8 +58,8 @@ namespace MonoDevelop.Ide.CodeCompletion
 	
 	public interface ICompletionKeyHandler
 	{
-		bool PreProcessKey (CompletionListWindow listWindow, Gdk.Key key, char keyChar, Gdk.ModifierType modifier, out KeyActions keyAction);
-		bool PostProcessKey (CompletionListWindow listWindow, Gdk.Key key, char keyChar, Gdk.ModifierType modifier, out KeyActions keyAction);
+		bool PreProcessKey (CompletionListWindow listWindow, KeyDescriptor descriptor, out KeyActions keyAction);
+		bool PostProcessKey (CompletionListWindow listWindow, KeyDescriptor descriptor, out KeyActions keyAction);
 	}
 	
 	public enum CompletionSelectionMode {
@@ -65,10 +67,12 @@ namespace MonoDevelop.Ide.CodeCompletion
 		OwnTextField
 	}
 	
-	public class CompletionDataList : List<ICompletionData>, ICompletionDataList
+	public class CompletionDataList : List<CompletionData>, ICompletionDataList
 	{
+		public int TriggerWordLength { get; set; }
+
 		public bool IsSorted { get; set; }
-		public IComparer<ICompletionData> Comparer { get; set; }
+		public IComparer<CompletionData> Comparer { get; set; }
 		
 		public bool AutoCompleteUniqueMatch { get; set; }
 		public string DefaultCompletionString { get; set; }
@@ -87,7 +91,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			this.AutoSelect = true;
 		}
 		
-		public CompletionDataList (IEnumerable<ICompletionData> data) : base(data)
+		public CompletionDataList (IEnumerable<CompletionData> data) : base(data)
 		{
 			this.AutoSelect = true;
 		}
@@ -144,7 +148,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			return false;
 		}
 		
-		public void RemoveWhere (Func<ICompletionData,bool> shouldRemove)
+		public void RemoveWhere (Func<CompletionData,bool> shouldRemove)
 		{
 			for (int i = 0; i < this.Count;) {
 				if (shouldRemove (this[i]))
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs
index 224fa14b54..d31732a305 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs
@@ -32,8 +32,8 @@ using Gtk;
 using MonoDevelop.Core;
 using MonoDevelop.Components;
 using System.Linq;
-using ICSharpCode.NRefactory.Completion;
-using Mono.TextEditor.PopupWindow;
+using MonoDevelop.Ide.Editor.Extension;
+using System.ComponentModel;
 
 namespace MonoDevelop.Ide.CodeCompletion
 {
@@ -42,11 +42,11 @@ namespace MonoDevelop.Ide.CodeCompletion
 		const int declarationWindowMargin = 3;
 
 		TooltipInformationWindow declarationviewwindow;
-		ICompletionData currentData;
+		CompletionData currentData;
 		Widget parsingMessage;
 		int initialWordLength;
 		int previousWidth = -1, previousHeight = -1;
-		
+
 		public CodeCompletionContext CodeCompletionContext {
 			get;
 			set;
@@ -60,7 +60,6 @@ namespace MonoDevelop.Ide.CodeCompletion
 		}
 		
 		IMutableCompletionDataList mutableList;
-		ICompletionDataList completionDataList;
 		public ICompletionDataList CompletionDataList {
 			get { return completionDataList; }
 			set {
@@ -93,7 +92,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 						List.QueueDraw ();
 					};
 					previewEntry.KeyPressEvent += delegate(object o, KeyPressEventArgs args) {
-						var keyAction = PreProcessKey (args.Event.Key, (char)args.Event.KeyValue, args.Event.State);
+						var keyAction = PreProcessKey (KeyDescriptor.FromGtk (args.Event.Key, (char)args.Event.KeyValue, args.Event.State));
 						if (keyAction.HasFlag (KeyActions.Complete))
 							CompleteWord ();
 
@@ -189,61 +188,81 @@ namespace MonoDevelop.Ide.CodeCompletion
 			base.OnDestroyed ();
 		}
 
-		public void PostProcessKeyEvent (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public void PostProcessKeyEvent (KeyDescriptor descriptor)
 		{
 			KeyActions ka = KeyActions.None;
 			bool keyHandled = false;
-			foreach (var handler in CompletionDataList.KeyHandler) {
-				if (handler.PostProcessKey (this, key, keyChar, modifier, out ka)) {
-					keyHandled = true;
-					break;
+			if (CompletionDataList != null) {
+				foreach (var handler in CompletionDataList.KeyHandler) {
+					if (handler.PostProcessKey (this, descriptor, out ka)) {
+						keyHandled = true;
+						break;
+					}
 				}
 			}
 			
 			if (!keyHandled)
-				ka = PostProcessKey (key, keyChar, modifier);
+				ka = PostProcessKey (descriptor);
 			if ((ka & KeyActions.Complete) != 0) 
-				CompleteWord (ref ka, key, keyChar, modifier);
-			if ((ka & KeyActions.CloseWindow) != 0)
+				CompleteWord (ref ka, descriptor);
+			if ((ka & KeyActions.CloseWindow) != 0) {
 				CompletionWindowManager.HideWindow ();
+				OnWindowClosed (EventArgs.Empty);
+			}
+		}
+
+		/// <summary>
+		/// For unit test purposes.
+		/// </summary>
+		[EditorBrowsableAttribute(EditorBrowsableState.Never)]
+		internal event EventHandler WindowClosed;
+
+		protected virtual void OnWindowClosed (EventArgs e)
+		{
+			var handler = WindowClosed;
+			if (handler != null)
+				handler (this, e);
 		}
 		
 		public void ToggleCategoryMode ()
 		{
-			List.InCategoryMode = !List.InCategoryMode;
+			ListWidget.EnableCompletionCategoryMode.Set (!ListWidget.EnableCompletionCategoryMode.Value); 
+			List.UpdateCategoryMode ();
 			ResetSizes ();
 			List.QueueDraw ();
 		}
 		
-		public bool PreProcessKeyEvent (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public bool PreProcessKeyEvent (KeyDescriptor descriptor)
 		{
-			if (key == Gdk.Key.Escape) {
+			if (descriptor.SpecialKey == SpecialKey.Escape) {
 				CompletionWindowManager.HideWindow ();
 				return true;
 			}
 
 			KeyActions ka = KeyActions.None;
 			bool keyHandled = false;
-			foreach (ICompletionKeyHandler handler in CompletionDataList.KeyHandler) {
-				if (handler.PreProcessKey (this, key, keyChar, modifier, out ka)) {
-					keyHandled = true;
-					break;
+			if (CompletionDataList != null) {
+				foreach (ICompletionKeyHandler handler in CompletionDataList.KeyHandler) {
+					if (handler.PreProcessKey (this, descriptor, out ka)) {
+						keyHandled = true;
+						break;
+					}
 				}
 			}
-			
 			if (!keyHandled)
-				ka = PreProcessKey (key, keyChar, modifier);
+				ka = PreProcessKey (descriptor);
 			if ((ka & KeyActions.Complete) != 0)
-				CompleteWord (ref ka, key, keyChar, modifier);
+				CompleteWord (ref ka, descriptor);
 
-			if ((ka & KeyActions.CloseWindow) != 0)
+			if ((ka & KeyActions.CloseWindow) != 0) {
 				CompletionWindowManager.HideWindow ();
+				OnWindowClosed (EventArgs.Empty);
+			}
 
 			if ((ka & KeyActions.Ignore) != 0)
 				return true;
-			
 			if ((ka & KeyActions.Process) != 0) {
-				if (key == Gdk.Key.Left || key == Gdk.Key.Right) {
+				if (descriptor.SpecialKey == SpecialKey.Left || descriptor.SpecialKey == SpecialKey.Right) {
 					// Close if there's a modifier active EXCEPT lock keys and Modifiers
 					// Makes an exception for Mod1Mask (usually alt), shift, control, meta and super
 					// This prevents the window from closing if the num/scroll/caps lock are active
@@ -252,19 +271,21 @@ namespace MonoDevelop.Ide.CodeCompletion
 //					if ((modifier & ~(Gdk.ModifierType.LockMask | (Gdk.ModifierType.ModifierMask & ~(Gdk.ModifierType.ShiftMask | Gdk.ModifierType.Mod1Mask | Gdk.ModifierType.ControlMask | Gdk.ModifierType.MetaMask | Gdk.ModifierType.SuperMask)))) != 0) {
 					// this version doesn't work for my system - seems that I've a modifier active
 					// that gdk doesn't know about. How about the 2nd version - should close on left/rigt + shift/mod1/control/meta/super
-					if ((modifier & (Gdk.ModifierType.ShiftMask | Gdk.ModifierType.Mod1Mask | Gdk.ModifierType.ControlMask | Gdk.ModifierType.MetaMask | Gdk.ModifierType.SuperMask)) != 0) {
+					if ((descriptor.ModifierKeys & (ModifierKeys.Shift | ModifierKeys.Alt | ModifierKeys.Control | ModifierKeys.Command)) != 0) {
 						CompletionWindowManager.HideWindow ();
+						OnWindowClosed (EventArgs.Empty);
 						return false;
 					}
 					
 					if (declarationviewwindow != null && declarationviewwindow.Multiple) {
-						if (key == Gdk.Key.Left)
+						if (descriptor.SpecialKey == SpecialKey.Left)
 							declarationviewwindow.OverloadLeft ();
 						else
 							declarationviewwindow.OverloadRight ();
 						UpdateDeclarationView ();
 					} else {
 						CompletionWindowManager.HideWindow ();
+						OnWindowClosed (EventArgs.Empty);
 						return false;
 					}
 					return true;
@@ -286,8 +307,8 @@ namespace MonoDevelop.Ide.CodeCompletion
 		{
 			if (list == null)
 				throw new ArgumentNullException ("list");
-			if (completionContext == null)
-				throw new ArgumentNullException ("completionContext");
+			if (completionWidget == null)
+				throw new ArgumentNullException ("completionWidget");
 			if (completionContext == null)
 				throw new ArgumentNullException ("completionContext");
 			if (mutableList != null) {
@@ -355,9 +376,9 @@ namespace MonoDevelop.Ide.CodeCompletion
 			return false;
 		}
 		
-		class DataItemComparer : IComparer<ICompletionData>
+		class DataItemComparer : IComparer<CompletionData>
 		{
-			public int Compare (ICompletionData a, ICompletionData b)
+			public int Compare (CompletionData a, CompletionData b)
 			{
 				if (a is IComparable && b is IComparable)
 					return ((IComparable)a).CompareTo (b);
@@ -365,7 +386,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			}
 		}
 
-		IComparer<ICompletionData> GetComparerForCompletionList (ICompletionDataList dataList)
+		IComparer<CompletionData> GetComparerForCompletionList (ICompletionDataList dataList)
 		{
 			var concrete = dataList as CompletionDataList;
 			return concrete != null && concrete.Comparer != null ? concrete.Comparer : new DataItemComparer ();
@@ -443,23 +464,40 @@ namespace MonoDevelop.Ide.CodeCompletion
 		public bool CompleteWord ()
 		{
 			KeyActions ka = KeyActions.None;
-			return CompleteWord (ref ka, (Gdk.Key)0, '\0', Gdk.ModifierType.None);
+			return CompleteWord (ref ka, KeyDescriptor.Empty);
 		}
-		
-		public bool CompleteWord (ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+
+		internal bool IsInCompletion { get; set;  }
+
+		public bool CompleteWord (ref KeyActions ka, KeyDescriptor descriptor)
 		{
 			if (SelectedItem == -1 || completionDataList == null)
 				return false;
 			var item = completionDataList [SelectedItem];
 			if (item == null)
 				return false;
-			// first close the completion list, then insert the text.
-			// this is required because that's the logical event chain, otherwise things could be messed up
-			CloseCompletionList ();
-			((CompletionData)item).InsertCompletionText (this, ref ka, closeChar, keyChar, modifier);
-			AddWordToHistory (PartialWord, item.CompletionText);
-			OnWordCompleted (new CodeCompletionContextEventArgs (CompletionWidget, CodeCompletionContext, item.CompletionText));
-			return true;
+			IsInCompletion = true; 
+			try {

+				// first close the completion list, then insert the text.

+				// this is required because that's the logical event chain, otherwise things could be messed up

+				CloseCompletionList ();

+				/*			var cdItem = (CompletionData)item;
+							cdItem.InsertCompletionText (this, ref ka, closeChar, keyChar, modifier);
+							AddWordToHistory (PartialWord, cdItem.CompletionText);
+							OnWordCompleted (new CodeCompletionContextEventArgs (CompletionWidget, CodeCompletionContext, cdItem.CompletionText));
+							*/

+				if (item.HasOverloads && declarationviewwindow.CurrentOverload >= 0 && declarationviewwindow.CurrentOverload < item.OverloadedData.Count) {
+					item.OverloadedData[declarationviewwindow.CurrentOverload].InsertCompletionText (this, ref ka, descriptor);
+				} else {
+					item.InsertCompletionText (this, ref ka, descriptor);
+				}
+				cache.CommitCompletionData (item);
+				OnWordCompleted (new CodeCompletionContextEventArgs (CompletionWidget, CodeCompletionContext, item.DisplayText));
+			} finally {
+				IsInCompletion = false;
+				CompletionWindowManager.HideWindow ();
+			}
+            return true;
 		}
 		
 		protected virtual void OnWordCompleted (CodeCompletionContextEventArgs e)
@@ -587,17 +625,17 @@ namespace MonoDevelop.Ide.CodeCompletion
 				return false;
 			var data = completionDataList [selectedItem];
 
-			IEnumerable<ICompletionData> filteredOverloads;
+			IEnumerable<CompletionData> filteredOverloads;
 			if (data.HasOverloads) {
 				filteredOverloads = data.OverloadedData;
 			} else {
-				filteredOverloads = new ICompletionData[] { data };
+				filteredOverloads = new CompletionData[] { data };
 			}
 
 			EnsureDeclarationViewWindow ();
 			if (data != currentData) {
 				declarationviewwindow.Clear ();
-				var overloads = new List<ICompletionData> (filteredOverloads);
+				var overloads = new List<CompletionData> (filteredOverloads);
 				foreach (var overload in overloads) {
 					declarationviewwindow.AddOverload ((CompletionData)overload);
 				}
@@ -626,7 +664,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			return false;
 		}
 		
-		protected override void ResetState ()
+		protected internal override void ResetState ()
 		{
 			StartOffset = 0;
 			previousWidth = previousHeight = -1;
@@ -663,28 +701,27 @@ namespace MonoDevelop.Ide.CodeCompletion
 
 		bool IListDataProvider.HasMarkup (int n)
 		{
-			return (completionDataList [n].DisplayFlags & (DisplayFlags.Obsolete | DisplayFlags.MarkedBold)) != 0;
+			return true;
 		}
 		
 		//NOTE: we only ever return markup for items marked as obsolete
 		string IListDataProvider.GetMarkup (int n)
 		{
 			var completionData = completionDataList[n];
-			if (!completionData.HasOverloads && (completionData.DisplayFlags & DisplayFlags.Obsolete) != 0 || 
-				completionData.HasOverloads && completionData.OverloadedData.All (data => (data.DisplayFlags & DisplayFlags.Obsolete) != 0))
-				return "<s>" + GLib.Markup.EscapeText (completionDataList[n].DisplayText) + "</s>";
-			
-			if ((completionData.DisplayFlags & DisplayFlags.MarkedBold) != 0)
-				return "<b>" + GLib.Markup.EscapeText (completionDataList[n].DisplayText) + "</b>";
-			return GLib.Markup.EscapeText (completionDataList[n].DisplayText);
+			return completionData.GetDisplayTextMarkup ();
 		}
 		
 		string IListDataProvider.GetCompletionText (int n)
 		{
-			return completionDataList[n].CompletionText;
+			return ((CompletionData)completionDataList[n]).CompletionText;
+		}
+
+		CompletionData IListDataProvider.GetCompletionData (int n)
+		{
+			return completionDataList[n];
 		}
 
-		IComparer<ICompletionData> defaultComparer;
+		IComparer<CompletionData> defaultComparer;
 
 		int IListDataProvider.CompareTo (int n, int m)
 		{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionWindowManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionWindowManager.cs
index ab723739b3..b383b7b65d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionWindowManager.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionWindowManager.cs
@@ -27,6 +27,7 @@
 using System;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Ide.CodeCompletion
 {
@@ -80,20 +81,22 @@ namespace MonoDevelop.Ide.CodeCompletion
 		}
 		
 		// ext may be null, but then parameter completion don't work
-		public static bool ShowWindow (CompletionTextEditorExtension ext, char firstChar, ICompletionDataList list, ICompletionWidget completionWidget, CodeCompletionContext completionContext)
+		internal static bool ShowWindow (CompletionTextEditorExtension ext, char firstChar, ICompletionDataList list, ICompletionWidget completionWidget, CodeCompletionContext completionContext)
 		{
 			try {
 				if (ext != null) {
-					int inserted = ext.document.Editor.EnsureCaretIsNotVirtual ();
+					int inserted = ext.Editor.EnsureCaretIsNotVirtual ();
 					if (inserted > 0)
-						completionContext.TriggerOffset = ext.document.Editor.Caret.Offset;
+						completionContext.TriggerOffset = ext.Editor.CaretOffset;
 				}
 				if (wnd == null) {
 					wnd = new CompletionListWindow ();
 					wnd.WordCompleted += HandleWndWordCompleted;
 				}
-				if (ext != null)
-					wnd.TransientFor = ext.document.Editor.Parent.Toplevel as Gtk.Window;
+				if (ext != null) {
+					var widget = ext.Editor.GetNativeWidget<Gtk.Widget> ();
+					wnd.TransientFor = widget?.Parent?.Toplevel as Gtk.Window;
+				}
 				wnd.Extension = ext;
 				try {
 					if (!wnd.ShowListWindow (firstChar, list, completionWidget, completionContext)) {
@@ -136,21 +139,22 @@ namespace MonoDevelop.Ide.CodeCompletion
 			OnWindowClosed (EventArgs.Empty);
 		}
 		
-		public static bool PreProcessKeyEvent (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public static bool PreProcessKeyEvent (KeyDescriptor descriptor)
 		{
 			if (!IsVisible)
 				return false;
-			if (keyChar != '\0') {
+			if (descriptor.KeyChar != '\0') {
 				wnd.EndOffset = wnd.StartOffset + wnd.CurrentPartialWord.Length + 1;
 			}
-			return wnd.PreProcessKeyEvent (key, keyChar, modifier);
+			return wnd.PreProcessKeyEvent (descriptor);
 		}
 
 		public static void UpdateCursorPosition ()
 		{
 			if (!IsVisible)
 				return;
-
+			if (wnd.IsInCompletion)
+				return;
 			var caretOffset = wnd.CompletionWidget.CaretOffset;
 			if (caretOffset < wnd.StartOffset || caretOffset > wnd.EndOffset)
 				HideWindow ();
@@ -164,11 +168,11 @@ namespace MonoDevelop.Ide.CodeCompletion
 			}
 		}
 
-		public static void PostProcessKeyEvent (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public static void PostProcessKeyEvent (KeyDescriptor descriptor)
 		{
 			if (!IsVisible)
 				return;
-			wnd.PostProcessKeyEvent (key, keyChar, modifier);
+			wnd.PostProcessKeyEvent (descriptor);
 		}
 
 		public static void RepositionWindow ()
@@ -184,7 +188,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 				return;
 			ParameterInformationWindowManager.UpdateWindow (wnd.Extension, wnd.CompletionWidget);
 			if (wnd.Extension != null)
-				wnd.Extension.document.Editor.FixVirtualIndentation ();
+				wnd.Extension.Editor.FixVirtualIndentation ();
 			wnd.HideWindow ();
 			OnWindowClosed (EventArgs.Empty);
 			//DestroyWindow ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/IRefactoringContext.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/DisplayFlags.cs
index c14b46e8fc..0450a0f7d2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/IRefactoringContext.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/DisplayFlags.cs
@@ -1,10 +1,10 @@
 //
-// IRefactoringContext.cs
+// DisplayFlags.cs
 //
 // Author:
 //       Mike Krüger <mkrueger@xamarin.com>
 //
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,16 +26,17 @@
 
 using System;
 
-namespace MonoDevelop.Ide.TypeSystem
+namespace MonoDevelop.Ide.CodeCompletion
 {
-	/// <summary>
-	/// Base interface for refactoring contexts
-	/// </summary>
-	public interface IRefactoringContext
+	[Flags]
+	public enum DisplayFlags
 	{
-		/// <summary>
-		/// Creates a refactoring script.
-		/// </summary>
-		IDisposable CreateScript ();
+		None = 0,
+		Hidden = 1,
+		Obsolete = 2,
+		DescriptionHasMarkup = 4,
+		NamedArgument = 8,
+		IsImportCompletion = 16,
+		MarkedBold = 32
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ICompletionWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ICompletionWidget.cs
index 668359506a..1824432bb9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ICompletionWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ICompletionWidget.cs
@@ -31,29 +31,33 @@ using Gtk;
 
 namespace MonoDevelop.Ide.CodeCompletion
 {
-	public interface ICompletionWidget
+	interface ICompletionWidget
 	{
-		CodeCompletionContext CurrentCodeCompletionContext {
+		CodeCompletionContext CurrentCodeCompletionContext
+		{
 			get;
 		}
 
-		int CaretOffset { get;}
+		int CaretOffset { get; set; }
 		int TextLength { get; }
 		int SelectedLength { get; }
 		string GetText (int startOffset, int endOffset);
-		
+
 		char GetChar (int offset);
-		
+
 		void Replace (int offset, int count, string text);
-		
+
 		Gtk.Style GtkStyle { get; }
+		double ZoomLevel { get; }
 
 		CodeCompletionContext CreateCodeCompletionContext (int triggerOffset);
 		string GetCompletionText (CodeCompletionContext ctx);
 		void SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word);
-		
+
 		void SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word, int completeWordOffset);
-		
+
+		void AddSkipChar (int cursorPosition, char c);
+
 		event EventHandler CompletionContextChanged;
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs
index 0b607df034..72367422a9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs
@@ -30,12 +30,14 @@ using System.Linq;
 using Gdk;
 using Gtk;
 using Pango;
-using ICSharpCode.NRefactory.Completion;
-using Mono.TextEditor;
-using Mono.TextEditor.Highlighting;
+using ICSharpCode.NRefactory6.CSharp.Completion;
 using MonoDevelop.Components;
 using MonoDevelop.Ide.Fonts;
-using MonoDevelop.Ide.Gui.Content;

+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor;
+using System.ComponentModel.Design;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.Ide.Editor.Extension;
 using MonoDevelop.Core;
 
 namespace MonoDevelop.Ide.CodeCompletion
@@ -95,26 +97,27 @@ namespace MonoDevelop.Ide.CodeCompletion
 		public bool CloseOnSquareBrackets {
 			get;
 			set;
-		}

-

-		public readonly static PropertyWrapper<bool> EnableCompletionCategoryMode = PropertyService.Wrap("EnableCompletionCategoryMode", false);

-

+		}
+
+		public readonly static PropertyWrapper<bool> EnableCompletionCategoryMode = PropertyService.Wrap("EnableCompletionCategoryMode", false);
+
 		public bool InCategoryMode {
-			get { return EnableCompletionCategoryMode; }
-			set {
-				EnableCompletionCategoryMode.Set(value);
+			get { return EnableCompletionCategoryMode && categories.Count > 1; }
+		}
 
-				CalcVisibleRows ();
-				if (value)
-					SelectFirstItemInCategory ();
-			}
+		internal void UpdateCategoryMode ()
+		{
+			CalcVisibleRows ();
+			if (InCategoryMode)
+				SelectFirstItemInCategory ();
 		}
+
 		public int CategoryCount {
 			get { return this.categories.Count; }
 		}
 
 		ICompletionWidget completionWidget;
-		public ICompletionWidget CompletionWidget {
+		internal ICompletionWidget CompletionWidget {
 			get {
 				return completionWidget;
 			}
@@ -141,14 +144,11 @@ namespace MonoDevelop.Ide.CodeCompletion
 			// TODO: Add font property to ICompletionWidget;
 			if (itemFont != null)
 				itemFont.Dispose ();
-			itemFont = FontService.GetFontDescription ("Editor").Copy ();
-			var provider = CompletionWidget as ITextEditorDataProvider;
-			if (provider != null) {
-				var newSize = (itemFont.Size * provider.GetTextEditorData ().Options.Zoom);
-				if (newSize > 0) {
-					itemFont.Size = (int)newSize;
-					layout.FontDescription = itemFont;
-				}
+			itemFont = FontService.MonospaceFont.Copy ();
+			var newSize = (itemFont.Size * (completionWidget != null ? this.completionWidget.ZoomLevel : 1));
+			if (newSize > 0) {
+				itemFont.Size = (int)newSize;
+				layout.FontDescription = itemFont;
 			}
 		}
 
@@ -380,9 +380,17 @@ namespace MonoDevelop.Ide.CodeCompletion
 
 		public bool SelectionEnabled {
 			get {
-				return AutoSelect && (AutoCompleteEmptyMatch || !string.IsNullOrEmpty (CompletionString));
+				return AutoSelect && (AutoCompleteEmptyMatch || !IsEmptyMatch (CompletionString));
 			}
 		}
+
+		static bool IsEmptyMatch (string completionString)
+		{
+			if (string.IsNullOrEmpty (completionString))
+				return true;
+			var ch = completionString [0];
+			return char.IsDigit (ch);
+		}
 		
 		protected override bool OnButtonPressEvent (EventButton e)
 		{
@@ -656,7 +664,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			});
 			categories = newCategories;
 
-			SelectFirstItemInCategory ();
+			//SelectFirstItemInCategory ();
 			CalcVisibleRows ();
 			SetAdjustments ();
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs
index 97f12ae487..0a2edce515 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs
@@ -25,21 +25,20 @@
 //
 //
 
-using Gtk;
-using Gdk;
-using Pango;
 using System;
-using System.Xml;
-using System.Linq;
-using System.Text;
 using System.Collections.Generic;
 using MonoDevelop.Core.Text;
-using ICSharpCode.NRefactory.Completion;
-using Mono.TextEditor;
+using ICSharpCode.NRefactory6.CSharp.Completion;
 using MonoDevelop.Ide.Gui.Content;
+using System.Linq;
+using Gdk;
+using Gtk;
+using MonoDevelop.Core.Text;
 using MonoDevelop.Components;
-using Mono.TextEditor.Highlighting;
-using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Ide.CodeCompletion
 {
@@ -60,7 +59,9 @@ namespace MonoDevelop.Ide.CodeCompletion
 		ListWidget list;
 		Widget footer;
 		protected VBox vbox;
-		
+		internal MruCache cache = new MruCache();
+		protected ICompletionDataList completionDataList;
+
 		public CompletionTextEditorExtension Extension {
 			get;
 			set;
@@ -129,7 +130,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 		/// This method is used to set the completion window to it's inital state.
 		/// This is required for re-using the window object.
 		/// </summary>
-		protected virtual void ResetState ()
+		protected internal virtual void ResetState ()
 		{
 			HideWhenWordDeleted = false;
 			lastCommitCharEndoffset = -1;
@@ -226,7 +227,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			set;
 		}
 
-		public ICompletionWidget CompletionWidget {
+		internal ICompletionWidget CompletionWidget {
 			get {
 				return list.CompletionWidget;
 			}
@@ -273,20 +274,21 @@ namespace MonoDevelop.Ide.CodeCompletion
 			private set;
 		}
 
-		public KeyActions PostProcessKey (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public KeyActions PostProcessKey (KeyDescriptor descriptor)
 		{
-			if (StartOffset > CompletionWidget.CaretOffset)
+			if (CompletionWidget == null || StartOffset > CompletionWidget.CaretOffset) // CompletionWidget == null may happen in unit tests.
 				return KeyActions.CloseWindow | KeyActions.Process;
 
 			if (HideWhenWordDeleted && StartOffset >= CompletionWidget.CaretOffset)
 				return KeyActions.CloseWindow | KeyActions.Process;
-			switch (key) {
-			case Gdk.Key.BackSpace:
+			switch (descriptor.SpecialKey) {
+			case SpecialKey.BackSpace:
 				ResetSizes ();
 				UpdateWordSelection ();
 				return KeyActions.Process;
 			}
-			
+			var keyChar = descriptor.KeyChar;
+
 			const string commitChars = " <>()[]{}=+-*/%~&^|!.,;:";
 			if (keyChar == '[' && CloseOnSquareBrackets)
 				return KeyActions.Process | KeyActions.CloseWindow;
@@ -306,13 +308,13 @@ namespace MonoDevelop.Ide.CodeCompletion
 					if (!text.ToUpper ().StartsWith (curword.ToUpper (), StringComparison.Ordinal))
 						match = -1;	 
 				}
-				if (match >= 0 && !hasMismatches && keyChar != '<') {
+				if (match >= 0 && !hasMismatches && keyChar != '<' && keyChar != ' ') {
 					ResetSizes ();
 					UpdateWordSelection ();
 					return KeyActions.Process;
 				}
-				if (keyChar == '.')
-					list.AutoSelect = list.AutoCompleteEmptyMatch = true;
+//				if (keyChar == '.')
+//					list.AutoSelect = list.AutoCompleteEmptyMatch = true;
 				lastCommitCharEndoffset = CompletionWidget.CaretOffset - 1;
 
 				if (list.SelectionEnabled && CompletionCharacters.CompleteOn (keyChar)) {
@@ -322,30 +324,47 @@ namespace MonoDevelop.Ide.CodeCompletion
 				}
 				return KeyActions.CloseWindow | KeyActions.Process;
 			}
-			
+
+			if (char.IsPunctuation (descriptor.KeyChar) && descriptor.KeyChar != '_') {
+				if (descriptor.KeyChar == ':') {
+					foreach (var item in FilteredItems) {
+						if (DataProvider.GetText (item).EndsWith (descriptor.KeyChar.ToString (), StringComparison.Ordinal)) {
+							list.SelectedItem = item;
+							return KeyActions.Complete | KeyActions.CloseWindow | KeyActions.Ignore;
+						}
+					}
+				} else {
+					var selectedItem = list.SelectedItem;
+					if (selectedItem < 0 || selectedItem >= DataProvider.ItemCount)
+						return KeyActions.CloseWindow;
+					if (!DataProvider.GetText (selectedItem).Substring (0, CurrentPartialWord.Length) .EndsWith (descriptor.KeyChar.ToString (), StringComparison.Ordinal))
+						return KeyActions.Process | KeyActions.CloseWindow;
+				}
+			}
 			return KeyActions.Process;
 		}
 		
-		public KeyActions PreProcessKey (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public KeyActions PreProcessKey (KeyDescriptor descriptor)
 		{
-			switch (key) {
-			case Gdk.Key.Home:
-				if ((modifier & ModifierType.ShiftMask) == ModifierType.ShiftMask)
+			switch (descriptor.SpecialKey) {
+			case SpecialKey.Home:
+				if ((descriptor.ModifierKeys & ModifierKeys.Shift) == ModifierKeys.Shift)
 					return KeyActions.Process;
 				List.SelectionFilterIndex = 0;
 				return KeyActions.Ignore;
-			case Gdk.Key.End:
-				if ((modifier & ModifierType.ShiftMask) == ModifierType.ShiftMask)
+			case SpecialKey.End:
+				if ((descriptor.ModifierKeys & ModifierKeys.Shift) == ModifierKeys.Shift)
 					return KeyActions.Process;
 				List.SelectionFilterIndex = List.filteredItems.Count - 1;
 				return KeyActions.Ignore;
 				
-			case Gdk.Key.Up:
-				if ((modifier & Gdk.ModifierType.ShiftMask) == Gdk.ModifierType.ShiftMask) {
+			case SpecialKey.Up:
+				if ((descriptor.ModifierKeys & ModifierKeys.Shift) == ModifierKeys.Shift) {
 					if (!SelectionEnabled /*&& !CompletionWindowManager.ForceSuggestionMode*/)
 						AutoCompleteEmptyMatch = AutoSelect = true;
 					if (!List.InCategoryMode) {
-						List.InCategoryMode = true;
+						ListWidget.EnableCompletionCategoryMode.Set (true);
+						List.UpdateCategoryMode ();
 						return KeyActions.Ignore;
 					}
 					List.MoveToCategory (-1);
@@ -360,25 +379,23 @@ namespace MonoDevelop.Ide.CodeCompletion
 				}
 				return KeyActions.Ignore;
 
-			case Gdk.Key.Tab:
+			case SpecialKey.Tab:
 				//tab always completes current item even if selection is disabled
 				if (!AutoSelect)
 					AutoSelect = true;
-				goto case Gdk.Key.Return;
+				goto case SpecialKey.Return;
 
-			case Gdk.Key.Return:
-			case Gdk.Key.ISO_Enter:
-			case Gdk.Key.Key_3270_Enter:
-			case Gdk.Key.KP_Enter:
+			case SpecialKey.Return:
 				lastCommitCharEndoffset = CompletionWidget.CaretOffset;
-				WasShiftPressed = (modifier & ModifierType.ShiftMask) == ModifierType.ShiftMask;
+				WasShiftPressed = (descriptor.ModifierKeys & ModifierKeys.Shift) == ModifierKeys.Shift;
 				return KeyActions.Complete | KeyActions.Ignore | KeyActions.CloseWindow;
-			case Gdk.Key.Down:
-				if ((modifier & Gdk.ModifierType.ShiftMask) == Gdk.ModifierType.ShiftMask) {
+			case SpecialKey.Down:
+				if ((descriptor.ModifierKeys & ModifierKeys.Shift) == ModifierKeys.Shift) {
 					if (!SelectionEnabled /*&& !CompletionWindowManager.ForceSuggestionMode*/)
 						AutoCompleteEmptyMatch = AutoSelect = true;
 					if (!List.InCategoryMode) {
-						List.InCategoryMode = true;
+						ListWidget.EnableCompletionCategoryMode.Set (true);
+						List.UpdateCategoryMode ();
 						return KeyActions.Ignore;
 					}
 					List.MoveToCategory (1);
@@ -394,8 +411,8 @@ namespace MonoDevelop.Ide.CodeCompletion
 				}
 				return KeyActions.Ignore;
 
-			case Gdk.Key.Page_Up:
-				if ((modifier & ModifierType.ShiftMask) == ModifierType.ShiftMask)
+			case SpecialKey.PageUp:
+				if ((descriptor.ModifierKeys & ModifierKeys.Shift) == ModifierKeys.Shift)
 					return KeyActions.Process;
 				if (list.filteredItems.Count < 2)
 					return KeyActions.CloseWindow | KeyActions.Process;
@@ -403,8 +420,8 @@ namespace MonoDevelop.Ide.CodeCompletion
 				list.MoveCursor (-8);
 				return KeyActions.Ignore;
 
-			case Gdk.Key.Page_Down:
-				if ((modifier & ModifierType.ShiftMask) == ModifierType.ShiftMask)
+			case SpecialKey.PageDown:
+				if ((descriptor.ModifierKeys & ModifierKeys.Shift) == ModifierKeys.Shift)
 					return KeyActions.Process;
 				if (list.filteredItems.Count < 2)
 					return KeyActions.CloseWindow | KeyActions.Process;
@@ -412,42 +429,42 @@ namespace MonoDevelop.Ide.CodeCompletion
 				list.MoveCursor (8);
 				return KeyActions.Ignore;
 
-			case Gdk.Key.Left:
+			case SpecialKey.Left:
 				//if (curPos == 0) return KeyActions.CloseWindow | KeyActions.Process;
 				//curPos--;
 				return KeyActions.Process;
 
-			case Gdk.Key.Right:
+			case SpecialKey.Right:
 				//if (curPos == word.Length) return KeyActions.CloseWindow | KeyActions.Process;
 				//curPos++;
 				return KeyActions.Process;
 
-			case Gdk.Key.Caps_Lock:
-			case Gdk.Key.Num_Lock:
-			case Gdk.Key.Scroll_Lock:
-				return KeyActions.Ignore;
-
-			case Gdk.Key.Control_L:
-			case Gdk.Key.Control_R:
-			case Gdk.Key.Alt_L:
-			case Gdk.Key.Alt_R:
-			case Gdk.Key.Shift_L:
-			case Gdk.Key.Shift_R:
-			case Gdk.Key.ISO_Level3_Shift:
-				// AltGr
-				return KeyActions.Process;
+//			case Gdk.Key.Caps_Lock:
+//			case Gdk.Key.Num_Lock:
+//			case Gdk.Key.Scroll_Lock:
+//				return KeyActions.Ignore;
+//
+//			case Gdk.Key.Control_L:
+//			case Gdk.Key.Control_R:
+//			case Gdk.Key.Alt_L:
+//			case Gdk.Key.Alt_R:
+//			case Gdk.Key.Shift_L:
+//			case Gdk.Key.Shift_R:
+//			case Gdk.Key.ISO_Level3_Shift:
+//				// AltGr
+//				return KeyActions.Process;
 			}
-			if (keyChar == '\0')
+			if (descriptor.KeyChar == '\0')
 				return KeyActions.Process;
 
-			if (keyChar == ' ' && (modifier & ModifierType.ShiftMask) == ModifierType.ShiftMask)
+			if (descriptor.KeyChar == ' ' && (descriptor.ModifierKeys & ModifierKeys.Shift) == ModifierKeys.Shift)
 				return KeyActions.CloseWindow | KeyActions.Process;
 
 			// special case end with punctuation like 'param:' -> don't input double punctuation, otherwise we would end up with 'param::'
-			if (char.IsPunctuation (keyChar) && keyChar != '_') {
-				if (keyChar == ':') {
+			if (char.IsPunctuation (descriptor.KeyChar) && descriptor.KeyChar != '_') {
+				if (descriptor.KeyChar == ':') {
 					foreach (var item in FilteredItems) {
-						if (DataProvider.GetText (item).EndsWith (keyChar.ToString (), StringComparison.Ordinal)) {
+						if (DataProvider.GetText (item).EndsWith (descriptor.KeyChar.ToString (), StringComparison.Ordinal)) {
 							list.SelectedItem = item;
 							return KeyActions.Complete | KeyActions.CloseWindow | KeyActions.Ignore;
 						}
@@ -456,14 +473,12 @@ namespace MonoDevelop.Ide.CodeCompletion
 					var selectedItem = list.SelectedItem;
 					if (selectedItem < 0 || selectedItem >= DataProvider.ItemCount)
 						return KeyActions.CloseWindow;
-					if (DataProvider.GetText (selectedItem).EndsWith (keyChar.ToString (), StringComparison.Ordinal)) {
+					if (DataProvider.GetText (selectedItem).EndsWith (descriptor.KeyChar.ToString (), StringComparison.Ordinal)) {
 						return KeyActions.Complete | KeyActions.CloseWindow | KeyActions.Ignore;
 					}
 				}
 			}
 
-
-
 	/*		//don't input letters/punctuation etc when non-shift modifiers are active
 			bool nonShiftModifierActive = ((Gdk.ModifierType.ControlMask | Gdk.ModifierType.MetaMask
 				| Gdk.ModifierType.Mod1Mask | Gdk.ModifierType.SuperMask)
@@ -544,75 +559,69 @@ namespace MonoDevelop.Ide.CodeCompletion
 		{
 			// default - word with highest match rating in the list.
 			hasMismatches = true;
-			if (partialWord == null)
-				return -1;
-			
 			int idx = -1;
-			var matcher = CompletionMatcher.CreateCompletionMatcher (partialWord);
-			string bestWord = null;
-			int bestRank = int.MinValue;
-			int bestIndex = 0;
+
+			StringMatcher matcher = null;
 			if (!string.IsNullOrEmpty (partialWord)) {
+				matcher = CompletionMatcher.CreateCompletionMatcher (partialWord);
+				string bestWord = null;
+				int bestRank = int.MinValue;
+				int bestIndex = 0;
+				int bestIndexPriority = int.MinValue;
 				for (int i = 0; i < list.filteredItems.Count; i++) {
-					int index = list.filteredItems[i];
-					string text = DataProvider.GetText (index);
+					int index = list.filteredItems [i];
+					var data = DataProvider.GetCompletionData (index);
+					if (bestIndexPriority > data.PriorityGroup)
+						continue;
+					string text = data.DisplayText;
 					int rank;
 					if (!matcher.CalcMatchRank (text, out rank))
 						continue;
-					if (rank > bestRank) {
+					if (rank > bestRank || data.PriorityGroup > bestIndexPriority) {
 						bestWord = text;
 						bestRank = rank;
 						bestIndex = i;
+						bestIndexPriority = data.PriorityGroup;
 					}
 				}
+
+				if (bestWord != null) {
+					idx = bestIndex;
+					hasMismatches = false;
+					// exact match found.
+					if (string.Compare (bestWord, partialWord ?? "", true) == 0)
+						return idx;
+				}
 			}
-			if (bestWord != null) {
-				idx = bestIndex;
-				hasMismatches = false;
-				// exact match found.
-				if (string.Compare (bestWord, partialWord ?? "", true) == 0) 
-					return idx;
+
+			CompletionData currentData;
+			int bestMruIndex;
+			if (idx >= 0) {
+				currentData = completionDataList [list.filteredItems [idx]];
+				bestMruIndex = cache.GetIndex (currentData);
+			} else {
+				bestMruIndex = int.MaxValue;
+				currentData = null;
 			}
-			
-			if (string.IsNullOrEmpty (partialWord) || partialWord.Length <= 2) {
-				// Search for history matches.
-				string historyWord;
-				if (wordHistory.TryGetValue (partialWord, out historyWord)) {
-					for (int xIndex = 0; xIndex < list.filteredItems.Count; xIndex++) {
-						string currentWord = DataProvider.GetCompletionText (list.filteredItems[xIndex]);
-						if (currentWord == historyWord) {
-							idx = xIndex;
-							break;
+
+			for (int i = 0; i < list.filteredItems.Count; i++) {
+				var mruData = completionDataList [list.filteredItems [i]];
+				int curMruIndex = cache.GetIndex (mruData);
+				if (curMruIndex == 1)
+					continue;
+				if (curMruIndex < bestMruIndex) {
+					int r1 = 0, r2 = 0;
+					if (currentData == null || matcher != null && matcher.CalcMatchRank (mruData.DisplayText, out r1) && matcher.CalcMatchRank (currentData.DisplayText, out r2)) {
+						if (r1 >= r2) {
+							bestMruIndex = curMruIndex;
+							idx = i;
+							currentData = mruData;
 						}
 					}
 				}
 			}
-			return idx;
-		}
 
-		static Dictionary<string,string> wordHistory = new Dictionary<string,string> ();
-		static List<string> partalWordHistory = new List<string> ();
-		const int maxHistoryLength = 500;
-		protected void AddWordToHistory (string partialWord, string word)
-		{
-			if (!wordHistory.ContainsKey (partialWord)) {
-				wordHistory.Add (partialWord, word);
-				partalWordHistory.Add (partialWord);
-				while (partalWordHistory.Count > maxHistoryLength) {
-					string first = partalWordHistory [0];
-					partalWordHistory.RemoveAt (0);
-					wordHistory.Remove (first);
-				}
-			} else {
-				partalWordHistory.Remove (partialWord);
-				partalWordHistory.Add (partialWord);
-				wordHistory [partialWord] = word;
-			}
-		}
-		public static void ClearHistory ()
-		{
-			wordHistory.Clear ();
-			partalWordHistory.Clear ();
+			return idx;
 		}
 
 		void SelectEntry (int n)
@@ -698,6 +707,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 		CompletionCategory GetCompletionCategory (int n);
 		bool HasMarkup (int n);
 		string GetCompletionText (int n);
+		CompletionData GetCompletionData (int n);
 		string GetDescription (int n, bool isSelected);
 		string GetRightSideDescription (int n, bool isSelected);
 		Xwt.Drawing.Image GetIcon (int n);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/MemberCompletionData.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/MemberCompletionData.cs
index f5c3cdc31e..1d33b4ee7b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/MemberCompletionData.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/MemberCompletionData.cs
@@ -25,7 +25,6 @@
 // THE SOFTWARE.
 
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
 
 namespace MonoDevelop.Ide.CodeCompletion
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/MruCache.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/MruCache.cs
new file mode 100644
index 0000000000..90e679af3f
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/MruCache.cs
@@ -0,0 +1,67 @@
+//
+// MruCache.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.CodeCompletion
+{
+	class MruCache
+	{
+		const int MaxItems = 42;
+
+		readonly List<string> lastItems = new List<string> (MaxItems);
+		readonly object mruLock = new object ();
+
+		public void CommitCompletionData (CompletionData item)
+		{
+			lock (mruLock) {
+				var removed = lastItems.Remove (item.DisplayText);
+				if (!removed && lastItems.Count == MaxItems)
+					lastItems.RemoveAt (0);
+
+				lastItems.Add (item.DisplayText);
+			}
+		}
+
+		/// <summary>
+		/// Lower is better. 1 == not in list.
+		/// </summary>
+		public int GetIndex (CompletionData item)
+		{
+			lock (mruLock) {
+				var index = lastItems.IndexOf (item.DisplayText);
+				return -index;
+			}
+		}
+
+		public void Clear ()
+		{
+			lock (mruLock) {
+				lastItems.Clear ();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/MutableCompletionDataList.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/MutableCompletionDataList.cs
index 871134a1c8..69488e2d04 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/MutableCompletionDataList.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/MutableCompletionDataList.cs
@@ -61,32 +61,24 @@ namespace MonoDevelop.Ide.CodeCompletion
 		
 		public event EventHandler Changing {
 			add {
-				if (changing == null)
-					TypeSystemService.ParseOperationStarted += HandleParseOperationStarted;
 				changing += value;
 			}
 			remove {
 				changing -= value;
-				if (changing == null)
-					TypeSystemService.ParseOperationStarted -= HandleParseOperationStarted;
 			}
 		}
 		
 		public event EventHandler Changed {
 			add {
-				if (changed == null)
-					TypeSystemService.ParseOperationFinished += HandleParseOperationFinished;
 				changed += value;
 			}
 			remove {
 				changed -= value;
-				if (changed == null)
-					TypeSystemService.ParseOperationFinished -= HandleParseOperationFinished;
 			}
 		}
 		
 		public bool IsChanging {
-			get { return TypeSystemService.IsParsing; }
+			get { return false; }
 		}
 		
 		protected virtual void OnChanging ()
@@ -117,10 +109,6 @@ namespace MonoDevelop.Ide.CodeCompletion
 		{
 			if (!disposed) {
 				disposed = true;
-				if (changing != null)
-					TypeSystemService.ParseOperationStarted -= HandleParseOperationStarted;
-				if (changed != null)
-					TypeSystemService.ParseOperationFinished -= HandleParseOperationFinished;
 			}
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterDataProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterDataProvider.cs
deleted file mode 100644
index 3d1b0811b9..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterDataProvider.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// ParameterDataProvider.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.Completion;
-
-namespace MonoDevelop.Ide.CodeCompletion
-{
-	public abstract class ParameterDataProvider : IParameterDataProvider
-	{
-		public ParameterDataProvider (int startOffset)
-		{
-			this.startOffset = startOffset;
-		}
-
-		public virtual TooltipInformation CreateTooltipInformation (int overload, int currentParameter, bool smartWrap)
-		{
-			return new TooltipInformation ();
-		}
-
-		#region IParameterDataProvider implementation
-
-		string IParameterDataProvider.GetHeading (int overload, string[] parameterDescription, int currentParameter)
-		{
-			throw new NotImplementedException ();
-		}
-
-		string IParameterDataProvider.GetDescription (int overload, int currentParameter)
-		{
-			throw new NotImplementedException ();
-		}
-
-		string IParameterDataProvider.GetParameterDescription (int overload, int paramIndex)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public abstract int GetParameterCount (int overload);
-		public abstract bool AllowParameterList (int overload);
-		public abstract string GetParameterName (int overload, int paramIndex);
-
-		public abstract int Count {
-			get;
-		}
-
-		readonly int startOffset;
-		public int StartOffset {
-			get {
-				return startOffset;
-			}
-		}
-
-		#endregion
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedSymbolsHandler.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterHintingData.cs
index 50c204a767..aa2077c177 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedSymbolsHandler.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterHintingData.cs
@@ -1,10 +1,10 @@
 //
-// FindDerivedSymbolsHandler.cs
+// ParameterDataProvider.cs
 //
 // Author:
 //       Mike Krüger <mkrueger@xamarin.com>
 //
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,44 +24,44 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.FindInFiles;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Analysis;
-using MonoDevelop.Ide.TypeSystem;
-using System.Collections.Generic;
+using ICSharpCode.NRefactory.Completion;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
 using System.Linq;
-using System.Threading.Tasks;
-using MonoDevelop.Projects;
+using System.Collections.Generic;
 using System.Threading;
-using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide.Editor;
 
-namespace MonoDevelop.Refactoring
+namespace MonoDevelop.Ide.CodeCompletion
 {
-	class FindDerivedSymbolsHandler 
+	public abstract class ParameterHintingData
 	{
-		readonly IMember member;
+		public ISymbol Symbol {
+			get;
+			private set;
+		}
 
-		public FindDerivedSymbolsHandler (IMember member)
+		protected ParameterHintingData (ISymbol symbol)
 		{
-			this.member = member;
+			Symbol = symbol;
+		}
+
+		public abstract int ParameterCount {
+			get;
 		}
 
-		public bool IsValid {
-			get {
-				if (IdeApp.ProjectOperations.CurrentSelectedSolution == null)
-					return false;
-				if (TypeSystemService.GetProject (member) == null)
-					return false;
-				return member.IsVirtual || member.IsAbstract || member.DeclaringType.Kind == TypeKind.Interface;
-			}
+		public abstract bool IsParameterListAllowed {
+			get;
 		}
 
-		public void Run ()
+		public abstract string GetParameterName (int parameter);
+
+		public virtual TooltipInformation CreateTooltipInformation (TextEditor editor, DocumentContext ctx, int currentParameter, bool smartWrap)
 		{
-			FindDerivedClassesHandler.FindDerivedMembers (member);
+			return new TooltipInformation ();
 		}
 	}
 }
-
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterHintingResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterHintingResult.cs
new file mode 100644
index 0000000000..dba4aedf0c
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterHintingResult.cs
@@ -0,0 +1,88 @@
+//
+// ParameterHintingResult.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.CodeCompletion
+{
+	public class ParameterHintingResult : IReadOnlyList<ParameterHintingData>
+	{
+		public static readonly ParameterHintingResult Empty = new ParameterHintingResult (new List<ParameterHintingData> (), -1);
+
+		protected readonly List<ParameterHintingData> data;
+		/// <summary>
+		/// Gets the start offset of the parameter expression node.
+		/// </summary>
+		public int StartOffset { 
+			get;
+			private set;
+		}
+
+		protected ParameterHintingResult (int startOffset)
+		{
+			this.data = new List<ParameterHintingData> ();
+			this.StartOffset = startOffset;
+		}
+
+		public ParameterHintingResult (List<ParameterHintingData> data, int startOffset)
+		{
+			this.data = data;
+			this.StartOffset = startOffset;
+		}
+
+		#region IEnumerable implementation
+		public IEnumerator<ParameterHintingData> GetEnumerator ()
+		{
+			return data.GetEnumerator ();
+		}
+		#endregion
+
+		#region IEnumerable implementation
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator ()
+		{
+			return data.GetEnumerator ();
+		}
+		#endregion
+
+		#region IReadOnlyList implementation
+		public ParameterHintingData this [int index] {
+			get {
+				return data [index];
+			}
+		}
+		#endregion
+
+		#region IReadOnlyCollection implementation
+		public int Count {
+			get {
+				return data.Count;
+			}
+		}
+		#endregion
+	}
+
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs
index 14c2042e07..40278f4734 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs
@@ -25,16 +25,15 @@
 //
 //
 
-
 using System;
-using System.Text;
 using MonoDevelop.Core;
 using Gtk;
 using MonoDevelop.Components;
-using ICSharpCode.NRefactory.Completion;
 using MonoDevelop.Ide.Gui.Content;
-using System.Collections.Generic;
 using MonoDevelop.Ide.Fonts;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Ide.CodeCompletion
 {
@@ -74,7 +73,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			this.AllowGrow = false;
 			this.CanFocus = false;
 			this.CanDefault = false;
-			Mono.TextEditor.PopupWindow.WindowTransparencyDecorator.Attach (this);
+			WindowTransparencyDecorator.Attach (this);
 
 			headlabel = new MonoDevelop.Components.FixedWidthWrapLabel ();
 			headlabel.Indent = -20;
@@ -96,7 +95,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			vb2.Spacing = 4;
 			vb2.PackStart (hb, true, true, 0);
 			ContentBox.Add (vb2);
-			var scheme = Mono.TextEditor.Highlighting.SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme);
+			var scheme = SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme);
 			Theme.SetSchemeColors (scheme);
 
 			foreColor = scheme.PlainText.Foreground;
@@ -107,22 +106,24 @@ namespace MonoDevelop.Ide.CodeCompletion
 		}
 
 		int lastParam = -2;
-		public void ShowParameterInfo (ParameterDataProvider provider, int overload, int _currentParam, int maxSize)
+		TooltipInformation currentTooltipInformation;
+
+		public void ShowParameterInfo (ParameterHintingResult provider, int overload, int _currentParam, int maxSize)
 		{
 			if (provider == null)
 				throw new ArgumentNullException ("provider");
-			int numParams = System.Math.Max (0, provider.GetParameterCount (overload));
+			int numParams = System.Math.Max (0, provider[overload].ParameterCount);
 			var currentParam = System.Math.Min (_currentParam, numParams - 1);
 			if (numParams > 0 && currentParam < 0)
 				currentParam = 0;
-			if (lastParam == currentParam) {
+			if (lastParam == currentParam && (currentTooltipInformation != null)) {
 				return;
 			}
 
 			lastParam = currentParam;
 			ClearDescriptions ();
-			var o = provider.CreateTooltipInformation (overload, currentParam, false);
-
+			var parameterHintingData = (ParameterHintingData)provider [overload];
+			currentTooltipInformation = parameterHintingData.CreateTooltipInformation (ext.Editor, ext.DocumentContext, currentParam, false);
 			Theme.NumPages = provider.Count;
 			Theme.CurrentPage = overload;
 			if (provider.Count > 1) {
@@ -130,17 +131,17 @@ namespace MonoDevelop.Ide.CodeCompletion
 				Theme.PagerVertical = true;
 			}
 
-			headlabel.Markup = o.SignatureMarkup;
+			headlabel.Markup = currentTooltipInformation.SignatureMarkup;
 			headlabel.Visible = true;
 			if (Theme.DrawPager)
 				headlabel.WidthRequest = headlabel.RealWidth + 70;
 			
-			foreach (var cat in o.Categories) {
+			foreach (var cat in currentTooltipInformation.Categories) {
 				descriptionBox.PackStart (CreateCategory (cat.Item1, cat.Item2), true, true, 4);
 			}
 			
-			if (!string.IsNullOrEmpty (o.SummaryMarkup)) {
-				descriptionBox.PackStart (CreateCategory (GettextCatalog.GetString ("Summary"), o.SummaryMarkup), true, true, 4);
+			if (!string.IsNullOrEmpty (currentTooltipInformation.SummaryMarkup)) {
+				descriptionBox.PackStart (CreateCategory (GettextCatalog.GetString ("Summary"), currentTooltipInformation.SummaryMarkup), true, true, 4);
 			}
 			descriptionBox.ShowAll ();
 			QueueResize ();
@@ -185,6 +186,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 		public void ChangeOverload ()
 		{
 			lastParam = -2;
+			currentTooltipInformation = null;
 		}
 		
 		public void HideParameterInfo ()
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs
index 64c53b4f5f..f3de5195a4 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs
@@ -31,8 +31,8 @@ using System.Collections;
 using System.Collections.Generic;
 using Gtk;
 using Gdk;
-using ICSharpCode.NRefactory.Completion;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Ide.CodeCompletion
 {
@@ -47,7 +47,8 @@ namespace MonoDevelop.Ide.CodeCompletion
 
 		static ParameterInformationWindowManager ()
 		{
-			IdeApp.Workbench.RootWindow.Destroyed += (sender, e) => DestroyWindow ();
+			if (IdeApp.Workbench != null)
+				IdeApp.Workbench.RootWindow.Destroyed += (sender, e) => DestroyWindow ();
 		}
 
 		static void DestroyWindow ()
@@ -60,14 +61,14 @@ namespace MonoDevelop.Ide.CodeCompletion
 		
 		// Called when a key is pressed in the editor.
 		// Returns false if the key press has to continue normal processing.
-		public static bool ProcessKeyEvent (CompletionTextEditorExtension ext, ICompletionWidget widget, Gdk.Key key, Gdk.ModifierType modifier)
+		internal static bool ProcessKeyEvent (CompletionTextEditorExtension ext, ICompletionWidget widget, KeyDescriptor descriptor)
 		{
 			if (methods.Count == 0)
 				return false;
 
 			MethodData cmd = methods [methods.Count - 1];
-			
-			if (key == Gdk.Key.Down) {
+
+			if (descriptor.SpecialKey == SpecialKey.Down) {
 				if (cmd.MethodProvider.Count <= 1)
 					return false;
 				if (cmd.CurrentOverload < cmd.MethodProvider.Count - 1)
@@ -77,7 +78,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 				window.ChangeOverload ();
 				UpdateWindow (ext, widget);
 				return true;
-			} else if (key == Gdk.Key.Up) {
+			} else if (descriptor.SpecialKey == SpecialKey.Up) {
 				if (cmd.MethodProvider.Count <= 1)
 					return false;
 				if (cmd.CurrentOverload > 0)
@@ -88,18 +89,18 @@ namespace MonoDevelop.Ide.CodeCompletion
 				UpdateWindow (ext, widget);
 				return true;
 			}
-			else if (key == Gdk.Key.Escape) {
+			else if (descriptor.SpecialKey == SpecialKey.Escape) {
 				HideWindow (ext, widget);
 				return true;
 			}
 			return false;
 		}
 		
-		public static void PostProcessKeyEvent (CompletionTextEditorExtension ext, ICompletionWidget widget, Gdk.Key key, Gdk.ModifierType modifier)
+		internal static void PostProcessKeyEvent (CompletionTextEditorExtension ext, ICompletionWidget widget, KeyDescriptor descriptor)
 		{
 		}
 
-		public static void UpdateCursorPosition (CompletionTextEditorExtension ext, ICompletionWidget widget)
+		internal static void UpdateCursorPosition (CompletionTextEditorExtension ext, ICompletionWidget widget)
 		{	
 			// Called after the key has been processed by the editor
 			if (methods.Count == 0)
@@ -124,12 +125,12 @@ namespace MonoDevelop.Ide.CodeCompletion
 			UpdateWindow (ext, widget);
 		}
 
-		public static void RepositionWindow (CompletionTextEditorExtension ext, ICompletionWidget widget)
+		internal static void RepositionWindow (CompletionTextEditorExtension ext, ICompletionWidget widget)
 		{
 			UpdateWindow (ext, widget);
 		}
 		
-		public static void ShowWindow (CompletionTextEditorExtension ext, ICompletionWidget widget, CodeCompletionContext ctx, ParameterDataProvider provider)
+		internal static void ShowWindow (CompletionTextEditorExtension ext, ICompletionWidget widget, CodeCompletionContext ctx, ParameterHintingResult provider)
 		{
 			if (provider.Count == 0)
 				return;
@@ -147,7 +148,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			UpdateWindow (ext, widget);
 		}
 		
-		public static void HideWindow (CompletionTextEditorExtension ext, ICompletionWidget widget)
+		internal static void HideWindow (CompletionTextEditorExtension ext, ICompletionWidget widget)
 		{
 			methods.Clear ();
 			if (window != null)
@@ -162,7 +163,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			return methods [methods.Count - 1].CurrentOverload;
 		}
 		
-		public static IParameterDataProvider GetCurrentProvider ()
+		public static ParameterHintingResult GetCurrentProvider ()
 		{
 			if (methods.Count == 0)
 				return null;
@@ -284,7 +285,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 		
 	class MethodData
 	{
-		public ParameterDataProvider MethodProvider;
+		public ParameterHintingResult MethodProvider;
 		public CodeCompletionContext CompletionContext;
 		int currentOverload;
 		public int CurrentOverload {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs
index d9847fb2b9..528bb4a685 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs
@@ -30,7 +30,8 @@ using System.Collections.Generic;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Fonts;
 using System.Linq;
-using Mono.TextEditor.PopupWindow;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
 
 namespace MonoDevelop.Ide.CodeCompletion
 {
@@ -225,7 +226,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 
 		internal void SetDefaultScheme ()
 		{
-			var scheme = Mono.TextEditor.Highlighting.SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme);
+			var scheme = SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme);
 			Theme.SetSchemeColors (scheme);
 			foreColor = scheme.PlainText.Foreground;
 			headLabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ());
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatter.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatter.cs
index 6160c8b056..450441cb1a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatter.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatter.cs
@@ -26,12 +26,9 @@
 
 using System;
 using MonoDevelop.Projects.Policies;
-using Mono.TextEditor;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.CodeFormatting
 {
@@ -96,16 +93,24 @@ namespace MonoDevelop.Ide.CodeFormatting
 		/// <summary>
 		/// Formats a text document directly with insert/remove operations.
 		/// </summary>
-		public void OnTheFlyFormat (MonoDevelop.Ide.Gui.Document doc, int startOffset, int endOffset)
+		public void OnTheFlyFormat (TextEditor editor, DocumentContext documentContext, int startOffset, int endOffset)
 		{
 			var adv = formatter as IAdvancedCodeFormatter;
 			if (adv == null || !adv.SupportsOnTheFlyFormatting)
 				throw new InvalidOperationException ("On the fly formatting not supported");
 			
-			adv.OnTheFlyFormat (doc, startOffset, endOffset);
+			adv.OnTheFlyFormat (editor, documentContext, startOffset, endOffset);
 		}
-		
-		public void CorrectIndenting (PolicyContainer policyParent, TextEditorData data, int line)
+
+		/// <summary>
+		/// Formats a text document directly with insert/remove operations.
+		/// </summary>
+		public void OnTheFlyFormat (MonoDevelop.Ide.Gui.Document doc, int startOffset, int endOffset)
+		{
+			OnTheFlyFormat (doc.Editor, doc, startOffset, endOffset);
+		}
+
+		public void CorrectIndenting (PolicyContainer policyParent, TextEditor data, int line)
 		{
 			var adv = formatter as IAdvancedCodeFormatter;
 			if (adv == null || !adv.SupportsCorrectingIndent)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatterService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatterService.cs
index 834881f688..aa483788ef 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatterService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatterService.cs
@@ -29,6 +29,8 @@ using System.Linq;
 using System.Collections.Generic;
 using Mono.Addins;
 using MonoDevelop.Projects.Policies;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Ide.CodeFormatting
 {
@@ -68,5 +70,23 @@ namespace MonoDevelop.Ide.CodeFormatting
 			
 			return null;
 		}
+
+		public static void Format (TextEditor editor, DocumentContext ctx, ISegment segment)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (ctx == null)
+				throw new ArgumentNullException ("ctx");
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			var fmt = GetFormatter (editor.MimeType);
+			if (fmt == null)
+				return;
+			if (fmt.SupportsOnTheFlyFormatting) {
+				fmt.OnTheFlyFormat (editor, ctx, segment.Offset, segment.EndOffset);
+				return;
+			}
+			editor.Text = fmt.FormatText (ctx.HasProject ? ctx.Project.Policies : null, editor.Text, segment.Offset, segment.EndOffset);
+		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingCommands.cs
index 4ff1fd707a..507f74250a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingCommands.cs
@@ -28,7 +28,7 @@ using System;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Core;
-using Mono.TextEditor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Ide.CodeFormatting
 {
@@ -66,7 +66,7 @@ namespace MonoDevelop.Ide.CodeFormatting
 
 			if (formatter.SupportsOnTheFlyFormatting) {
 				using (var undo = doc.Editor.OpenUndoGroup ()) {
-					formatter.OnTheFlyFormat (doc, 0, doc.Editor.Length);
+					formatter.OnTheFlyFormat (doc.Editor, doc, 0, doc.Editor.Length);
 				}
 			} else {
 				var text = doc.Editor.Text;
@@ -74,9 +74,8 @@ namespace MonoDevelop.Ide.CodeFormatting
 				if (formattedText == null || formattedText == text)
 					return;
 
-				doc.Editor.Replace (0, text.Length, formattedText);
+				doc.Editor.ReplaceText (0, text.Length, formattedText);
 			}
-			doc.Editor.Document.CommitUpdateAll ();
 		}
 	}
 	
@@ -96,26 +95,26 @@ namespace MonoDevelop.Ide.CodeFormatting
 			if (formatter == null)
 				return;
 
-			TextSegment selection;
+			ISegment selection;
 			var editor = doc.Editor;
 			if (editor.IsSomethingSelected) {
 				selection = editor.SelectionRange;
 			} else {
-				selection = editor.GetLine (editor.Caret.Line).Segment;
+				selection = editor.GetLine (editor.CaretLocation.Line);
 			}
 			
 			using (var undo = editor.OpenUndoGroup ()) {
 				var version = editor.Version;
 
 				if (formatter.SupportsOnTheFlyFormatting) {
-					formatter.OnTheFlyFormat (doc, selection.Offset, selection.EndOffset);
+					formatter.OnTheFlyFormat (doc.Editor, doc, selection.Offset, selection.EndOffset);
 				} else {
 					var pol = doc.Project != null ? doc.Project.Policies : null;
 					try {
 						var editorText = editor.Text;
 						string text = formatter.FormatText (pol, editorText, selection.Offset, selection.EndOffset);
 						if (text != null && editorText.Substring (selection.Offset, selection.Length) != text) {
-							editor.Replace (selection.Offset, selection.Length, text);
+							editor.ReplaceText (selection.Offset, selection.Length, text);
 						}
 					} catch (Exception e) {
 						LoggingService.LogError ("Error during format.", e); 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/IAdvancedCodeFormatter.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/IAdvancedCodeFormatter.cs
index 3b5e4321af..42e9cebec8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/IAdvancedCodeFormatter.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/IAdvancedCodeFormatter.cs
@@ -26,11 +26,9 @@
 
 using System;
 using System.Collections.Generic;
-using Mono.TextEditor;
 using MonoDevelop.Projects.Policies;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Gui;
 
 namespace MonoDevelop.Ide.CodeFormatting
 {
@@ -39,10 +37,21 @@ namespace MonoDevelop.Ide.CodeFormatting
 		bool SupportsOnTheFlyFormatting { get; }
 		bool SupportsCorrectingIndent { get; }
 		
-		void CorrectIndenting (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, TextEditorData textEditorData, int line);
-		
-		void OnTheFlyFormat (MonoDevelop.Ide.Gui.Document doc, int startOffset, int endOffset);
+		void CorrectIndenting (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, TextEditor textEditorData, int line);
 		
+		void OnTheFlyFormat (TextEditor editor, DocumentContext context, int startOffset, int endOffset);
+	}
+
+	public static class AdvancedCodeFormatterExtensions
+	{
+		public static void OnTheFlyFormat (this IAdvancedCodeFormatter formatter, Document document, int startOffset, int endOffset)
+		{
+			if (formatter == null)
+				throw new ArgumentNullException ("formatter");
+			formatter.OnTheFlyFormat (document.Editor, document, startOffset, endOffset);
+		}
+
+
 	}
 	
 	public abstract class AbstractAdvancedFormatter : AbstractCodeFormatter, IAdvancedCodeFormatter
@@ -50,13 +59,18 @@ namespace MonoDevelop.Ide.CodeFormatting
 		public virtual bool SupportsOnTheFlyFormatting { get { return false; } }
 		public virtual bool SupportsCorrectingIndent { get { return false; } }
 		
-		public virtual void OnTheFlyFormat (MonoDevelop.Ide.Gui.Document doc, int startOffset, int endOffset)
+		public virtual void OnTheFlyFormat (TextEditor editor, DocumentContext context, int startOffset, int endOffset)
 		{
 			throw new NotSupportedException ();
 		}
-		
+
+		public void OnTheFlyFormat (Document doc, int startOffset, int endOffset)
+		{
+			OnTheFlyFormat (doc.Editor, doc, startOffset, endOffset);
+		}
+
 		public virtual void CorrectIndenting (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain,
-			TextEditorData data, int line)
+			TextEditor data, int line)
 		{
 			throw new NotSupportedException ();
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs
index cd4b4c4c64..726c3ae0d3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs
@@ -33,9 +33,11 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
 using MonoDevelop.Core;
-using Mono.TextEditor;
-using Mono.TextEditor.PopupWindow;
 using MonoDevelop.Ide.CodeFormatting;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using System.Linq;
+using MonoDevelop.Ide.Gui;
 
 namespace MonoDevelop.Ide.CodeTemplates
 {
@@ -134,34 +136,34 @@ namespace MonoDevelop.Ide.CodeTemplates
 			return string.Format("[CodeTemplate: Group={0}, Shortcut={1}, CodeTemplateType={2}, MimeType={3}, Description={4}, Code={5}]", Group, Shortcut, CodeTemplateType, MimeType, Description, Code);
 		}
 		
-		static int FindPrevWordStart (TextEditorData editor, int offset)
+		static int FindPrevWordStart (TextEditor editor, int offset)
 		{
 			while (--offset >= 0 && !Char.IsWhiteSpace (editor.GetCharAt (offset))) 
 				;
 			return ++offset;
 		}
 		
-		public static string GetWordBeforeCaret (TextEditorData editor)
+		public static string GetWordBeforeCaret (TextEditor editor)
 		{
-			int offset = editor.Caret.Offset;
+			int offset = editor.CaretOffset;
 			int start  = FindPrevWordStart (editor, offset);
 			return editor.GetTextBetween (start, offset);
 		}
 		
-		static int DeleteWordBeforeCaret (TextEditorData editor)
+		static int DeleteWordBeforeCaret (TextEditor editor)
 		{
-			int offset = editor.Caret.Offset;
+			int offset = editor.CaretOffset;
 			int start  = FindPrevWordStart (editor, offset);
-			editor.Remove (start, offset - start);
+			editor.RemoveText (start, offset - start);
 			return start;
 		}
 		
-		static Regex variableRegEx = new Regex ("\\$([^$]*)\\$", RegexOptions.Compiled);
+		static System.Text.RegularExpressions.Regex variableRegEx = new System.Text.RegularExpressions.Regex ("\\$([^$]*)\\$", RegexOptions.Compiled);
 		
 		public List<string> ParseVariables (string code)
 		{
 			var result = new List<string> ();
-			foreach (Match match in variableRegEx.Matches (code)) {
+			foreach (System.Text.RegularExpressions.Match match in variableRegEx.Matches (code)) {
 				string name = match.Groups[1].Value;
 				if (name == "end" || name == "selected" || string.IsNullOrEmpty (name) || name.Trim ().Length == 0)
 					continue;
@@ -211,9 +213,9 @@ namespace MonoDevelop.Ide.CodeTemplates
 			var result = new TemplateResult ();
 			var sb = new StringBuilder ();
 			int lastOffset = 0;
-			string code = context.Document.Editor.FormatString (context.InsertPosition, context.TemplateCode);
+			string code = context.Editor.FormatString (context.InsertPosition, context.TemplateCode);
 			result.TextLinks = new List<TextLink> ();
-			foreach (Match match in variableRegEx.Matches (code)) {
+			foreach (System.Text.RegularExpressions.Match match in variableRegEx.Matches (code)) {
 				string name = match.Groups [1].Value;
 				sb.Append (code.Substring (lastOffset, match.Index - lastOffset));
 				lastOffset = match.Index + match.Length;
@@ -230,7 +232,7 @@ namespace MonoDevelop.Ide.CodeTemplates
 				}
 				if (!variableDecarations.ContainsKey (name))
 					continue;
-				TextLink link = result.TextLinks.Find (l => l.Name == name);
+				var link = result.TextLinks.Find (l => l.Name == name);
 				bool isNew = link == null;
 				if (isNew) {
 					link = new TextLink (name);
@@ -271,13 +273,13 @@ namespace MonoDevelop.Ide.CodeTemplates
 			sb.Append (code.Substring (lastOffset, code.Length - lastOffset));
 			
 			// format & indent template code
-			var data = new TextEditorData ();
+			var data = TextEditorFactory.CreateNewDocument ();
 			data.Text = sb.ToString ();
-			data.Document.TextReplaced += delegate(object sender, DocumentChangeEventArgs e) {
-				int delta = e.ChangeDelta;
+			data.TextChanged += delegate(object sender, MonoDevelop.Core.Text.TextChangeEventArgs e) {
+				int delta = e.InsertionLength - e.RemovalLength;
 
 				foreach (var link in result.TextLinks) {
-					link.Links = new List<TextSegment> (link.Links.AdjustSegments (e));
+					link.Links = link.Links.AdjustSegments (e).ToList ();
 				}
 				if (result.CaretEndOffset > e.Offset)
 					result.CaretEndOffset += delta;
@@ -285,7 +287,6 @@ namespace MonoDevelop.Ide.CodeTemplates
 
 			IndentCode (data, context.LineIndent);
 			result.Code = data.Text;
-			data.Dispose ();
 			return result;
 		}
 
@@ -319,12 +320,12 @@ namespace MonoDevelop.Ide.CodeTemplates
 			return result.ToString ();
 		}
 
-		static void IndentCode (TextEditorData data, string lineIndent)
+		static void IndentCode (ITextDocument data, string lineIndent)
 		{
 			for (int i = 1; i < data.LineCount; i++) {
 				var line = data.GetLine (i + 1);
 				if (line.Length > 0)
-					data.Insert (line.Offset, lineIndent);
+					data.InsertText (line.Offset, lineIndent);
 			}
 		}
 		
@@ -345,10 +346,10 @@ namespace MonoDevelop.Ide.CodeTemplates
 		
 		string RemoveIndent (string text, string indent)
 		{
-			var doc = new TextDocument ();
+			var doc = TextEditorFactory.CreateNewDocument ();
 			doc.Text = text;
 			var result = new StringBuilder ();
-			foreach (DocumentLine line in doc.Lines) {
+			foreach (var line in doc.GetLines ()) {
 				string curLineIndent = line.GetIndentation (doc);
 				int offset = Math.Min (curLineIndent.Length, indent.Length);
 				result.Append (doc.GetTextBetween (line.Offset + offset, line.EndOffsetIncludingDelimiter));
@@ -358,58 +359,64 @@ namespace MonoDevelop.Ide.CodeTemplates
 		
 		string Reindent (string text, string indent)
 		{
-			var doc = new TextDocument ();
+			var doc = TextEditorFactory.CreateNewDocument ();
 			doc.Text = text;
 			var result = new StringBuilder ();
-			foreach (DocumentLine line in doc.Lines) {
+			foreach (var line in doc.GetLines ()) {
 				if (result.Length > 0)
 					result.Append (indent);
 				result.Append (doc.GetTextAt (line.SegmentIncludingDelimiter));
 			}
 			return result.ToString ();
 		}
-		
+
 		public void Insert (MonoDevelop.Ide.Gui.Document document)
 		{
-			var handler = document.GetContent<ICodeTemplateHandler> ();
+			Insert (document.Editor, document);
+		}
+
+		public void Insert (TextEditor editor, DocumentContext context)
+		{
+			var handler = context.GetContent<ICodeTemplateHandler> ();
 			if (handler != null) {
-				handler.InsertTemplate (this, document);
+				handler.InsertTemplate (this, editor, context);
 			} else {
-				InsertTemplateContents (document);
+				InsertTemplateContents (editor, context);
 			}	
 		}
 		
 		/// <summary>
 		/// Don't use this unless you're implementing ICodeTemplateWidget. Use Insert instead.
 		/// </summary>
-		public TemplateResult InsertTemplateContents (MonoDevelop.Ide.Gui.Document document)
+		public TemplateResult InsertTemplateContents (TextEditor editor, DocumentContext context)
 		{
-			Mono.TextEditor.TextEditorData data = document.Editor;
+			var data = editor;
 			
-			int offset = data.Caret.Offset;
+			int offset = data.CaretOffset;
 //			string leadingWhiteSpace = GetLeadingWhiteSpace (editor, editor.CursorLine);
 			
-			var context = new TemplateContext {
+			var templateCtx = new TemplateContext {
 				Template = this,
-				Document = document,
-				ParsedDocument = document.ParsedDocument != null ? document.ParsedDocument.ParsedFile : null,
-				InsertPosition = data.Caret.Location,
-				LineIndent = data.Document.GetLineIndent (data.Caret.Line),
+				DocumentContext = context,
+				Editor = editor,
+				//ParsedDocument = context.ParsedDocument != null ? context.ParsedDocument.ParsedFile : null,
+				InsertPosition = data.CaretLocation,
+				LineIndent = data.GetLineIndent (data.CaretLocation.Line),
 				TemplateCode = Code
 			};
 
 			if (data.IsSomethingSelected) {
 				int start = data.SelectionRange.Offset;
-				while (Char.IsWhiteSpace (data.Document.GetCharAt (start))) {
+				while (Char.IsWhiteSpace (data.GetCharAt (start))) {
 					start++;
 				}
 				int end = data.SelectionRange.EndOffset;
-				while (Char.IsWhiteSpace (data.Document.GetCharAt (end - 1))) {
+				while (Char.IsWhiteSpace (data.GetCharAt (end - 1))) {
 					end--;
 				}
-				context.LineIndent = data.Document.GetLineIndent (data.Document.OffsetToLineNumber (start));
-				context.SelectedText = RemoveIndent (data.Document.GetTextBetween (start, end), context.LineIndent);
-				data.Remove (start, end - start);
+				templateCtx.LineIndent = data.GetLineIndent (data.OffsetToLineNumber (start));
+				templateCtx.SelectedText = RemoveIndent (data.GetTextBetween (start, end), templateCtx.LineIndent);
+				data.RemoveText (start, end - start);
 				offset = start;
 			} else {
 				string word = GetWordBeforeCaret (data).Trim ();
@@ -417,9 +424,9 @@ namespace MonoDevelop.Ide.CodeTemplates
 					offset = DeleteWordBeforeCaret (data);
 			}
 			
-			TemplateResult template = FillVariables (context);
+			TemplateResult template = FillVariables (templateCtx);
 			template.InsertPosition = offset;
-			document.Editor.Insert (offset, template.Code);
+			editor.InsertText (offset, template.Code);
 			
 			int newoffset;
 			if (template.CaretEndOffset >= 0) {
@@ -428,13 +435,13 @@ namespace MonoDevelop.Ide.CodeTemplates
 				newoffset = offset + template.Code.Length; 
 			}
 
-			document.Editor.Caret.Location = document.Editor.OffsetToLocation (newoffset) ;
+			editor.CaretLocation = editor.OffsetToLocation (newoffset) ;
 
 			var prettyPrinter = CodeFormatterService.GetFormatter (data.MimeType);
 			if (prettyPrinter != null) {
 				int endOffset = template.InsertPosition + template.Code.Length;
 				var oldVersion = data.Version;
-				prettyPrinter.OnTheFlyFormat (document, template.InsertPosition, endOffset);
+				prettyPrinter.OnTheFlyFormat (editor, context, template.InsertPosition, endOffset);
 				foreach (var textLink in template.TextLinks) {
 					for (int i = 0; i < textLink.Links.Count; i++) {
 						var segment = textLink.Links [i];
@@ -446,6 +453,12 @@ namespace MonoDevelop.Ide.CodeTemplates
 			return template;
 		}
 
+		public TemplateResult InsertTemplateContents (Document document)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			return InsertTemplateContents (document.Editor, document);
+		}
 #region I/O
 		public const string Node        = "CodeTemplate";
 		const string HeaderNode          = "Header";
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs
index 3f19b81ce7..6edaa60d6e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs
@@ -28,20 +28,22 @@ using System;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.CodeTemplates
 {
 	public interface ICodeTemplateHandler
 	{
-		void InsertTemplate (CodeTemplate template, Document document);
+		void InsertTemplate (CodeTemplate template, TextEditor editor, DocumentContext context);
 	}
 	
 	public class CodeTemplateCompletionData : CompletionData
 	{
-		Document doc;
-		CodeTemplate template;
+		readonly TextEditorExtension doc;
+		readonly CodeTemplate template;
 		
-		public CodeTemplateCompletionData (Document doc, CodeTemplate template)
+		public CodeTemplateCompletionData (TextEditorExtension doc, CodeTemplate template)
 		{
 			this.doc      = doc;
 			this.template = template;
@@ -51,9 +53,9 @@ namespace MonoDevelop.Ide.CodeTemplates
 			this.Description = template.Shortcut + Environment.NewLine + GettextCatalog.GetString (template.Description);
 		}
 		
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
-			template.Insert (doc);
+			template.Insert (doc.Editor, doc.DocumentContext);
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateListDataProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateListDataProvider.cs
index 1487ce6806..30a94e91ef 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateListDataProvider.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateListDataProvider.cs
@@ -24,9 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using System;
 using System.Collections.Generic;
-using Mono.TextEditor.PopupWindow;
 
 namespace MonoDevelop.Ide.CodeTemplates
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
index f259dfdf67..a454de6047 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
@@ -31,6 +31,7 @@ using Gtk;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.CodeTemplates
 {
@@ -41,14 +42,15 @@ namespace MonoDevelop.Ide.CodeTemplates
 		Gtk.TreeStore templateStore;
 		CellRendererText   templateCellRenderer;
 		CellRendererImage pixbufCellRenderer;
-		Mono.TextEditor.TextEditor textEditor = new Mono.TextEditor.TextEditor ();
-		Mono.TextEditor.TextEditorOptions options;
+		TextEditor textEditor = TextEditorFactory.CreateNewEditor ();
+		ITextEditorOptions options;
 		
 		public CodeTemplatePanelWidget (OptionsDialog parent)
 		{
 			this.Build();
-			scrolledwindow1.Add (textEditor);
-			textEditor.ShowAll ();
+			Gtk.Widget control = textEditor;
+			scrolledwindow1.Add (control);
+			control.ShowAll ();
 			
 			templateStore = new TreeStore (typeof (CodeTemplate), typeof (string), typeof (string));
 			
@@ -73,13 +75,9 @@ namespace MonoDevelop.Ide.CodeTemplates
 			
 			treeviewCodeTemplates.ExpandAll ();
 			treeviewCodeTemplates.Selection.Changed += HandleChanged;
-			
-			options = new MonoDevelop.Ide.Gui.CommonTextEditorOptions ();
-			options.ShowLineNumberMargin = false;
-			options.ShowFoldMargin = false;
-			options.ShowIconMargin = false;
-			textEditor.Options = options;
-			textEditor.Document.ReadOnly = true;
+
+			textEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+			textEditor.IsReadOnly = true;
 			this.buttonAdd.Clicked += ButtonAddClicked;
 			this.buttonEdit.Clicked += ButtonEditClicked;
 			this.buttonRemove.Clicked += ButtonRemoveClicked;
@@ -188,10 +186,10 @@ namespace MonoDevelop.Ide.CodeTemplates
 				CodeTemplate template = templateStore.GetValue (iter, 0) as CodeTemplate;
 				if (template != null) {
 					textEditor.ClearSelection ();
-					textEditor.Document.MimeType = template.MimeType;
-					textEditor.Document.Text     = template.Code;
+					textEditor.MimeType = template.MimeType;
+					textEditor.Text     = template.Code;
 				} else {
-					textEditor.Document.Text = "";
+					textEditor.Text = "";
 				}
 			}
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs
index f81346e749..eedfa7e058 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs
@@ -32,6 +32,8 @@ using Gtk;
  
 using MonoDevelop.Core;
 using Gdk;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 
 namespace MonoDevelop.Ide.CodeTemplates
@@ -41,8 +43,8 @@ namespace MonoDevelop.Ide.CodeTemplates
 	public partial class EditTemplateDialog : Gtk.Dialog
 	{
 		CodeTemplate template;
-		Mono.TextEditor.TextEditor textEditor = new Mono.TextEditor.TextEditor ();
-		Mono.TextEditor.TextEditorOptions options;
+		TextEditor textEditor = TextEditorFactory.CreateNewEditor ();
+		ITextEditorOptions options;
 		
 		ListStore variablesListStore;
 		List<CodeTemplateVariable> variables = new List<CodeTemplateVariable> ();
@@ -59,24 +61,20 @@ namespace MonoDevelop.Ide.CodeTemplates
 			this.comboboxentryGroups.Entry.Text = template.Group ?? "";
 			this.comboboxentryMime.Entry.Text = template.MimeType ?? "";
 			this.entryDescription.Text = template.Description ?? "";
-			this.textEditor.Document.MimeType = template.MimeType;
-			this.textEditor.Document.Text = template.Code;
+			this.textEditor.MimeType = template.MimeType;
+			this.textEditor.Text = template.Code;
 			
 			checkbuttonExpansion.Active = (template.CodeTemplateType & CodeTemplateType.Expansion) == CodeTemplateType.Expansion;
 			checkbuttonSurroundWith.Active = (template.CodeTemplateType & CodeTemplateType.SurroundsWith) == CodeTemplateType.SurroundsWith;
 			
-			scrolledwindow1.Child = textEditor;
-			textEditor.ShowAll ();
-			textEditor.Caret.PositionChanged += CaretPositionChanged;
-			options = new Mono.TextEditor.TextEditorOptions ();
-			options.ShowLineNumberMargin = false;
-			options.ShowFoldMargin = false;
-			options.ShowIconMargin = false;
-			options.ColorScheme = IdeApp.Preferences.ColorScheme;
-			textEditor.Options = options;
-			
-			HashSet<string> mimeTypes = new HashSet<string> ();
-			HashSet<string> groups    = new HashSet<string> ();
+			Gtk.Widget control = textEditor;
+			scrolledwindow1.Child = control;
+			control.ShowAll ();
+			textEditor.CaretPositionChanged += CaretPositionChanged;
+			textEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+
+			var mimeTypes = new HashSet<string> ();
+			var groups    = new HashSet<string> ();
 			foreach (CodeTemplate ct in CodeTemplateService.Templates) {
 				mimeTypes.Add (ct.MimeType);
 				groups.Add (ct.Group);
@@ -89,7 +87,7 @@ namespace MonoDevelop.Ide.CodeTemplates
 			foreach (string group in groups) {
 				comboboxentryGroups.AppendText (group);
 			}
-			textEditor.Document.TextReplaced += DocumentTextReplaced;
+			textEditor.TextChanged += DocumentTextReplaced;
 			this.buttonOk.Clicked += ButtonOkClicked;
 			
 			checkbuttonWhiteSpaces.Hide ();
@@ -140,7 +138,7 @@ namespace MonoDevelop.Ide.CodeTemplates
 			template.Group = this.comboboxentryGroups.Entry.Text;
 			template.MimeType = this.comboboxentryMime.Entry.Text;
 			template.Description = this.entryDescription.Text;
-			template.Code = this.textEditor.Document.Text;
+			template.Code = this.textEditor.Text;
 			variables.ForEach (v => template.AddVariable (v));
 			template.CodeTemplateType = CodeTemplateType.Unknown;
 			if (checkbuttonExpansion.Active)
@@ -149,9 +147,9 @@ namespace MonoDevelop.Ide.CodeTemplates
 				template.CodeTemplateType |= CodeTemplateType.SurroundsWith;
 		}
 
-		void DocumentTextReplaced (object sender, Mono.TextEditor.DocumentChangeEventArgs e)
+		void DocumentTextReplaced (object sender, TextChangeEventArgs e)
 		{
-			List<string> vars = template.ParseVariables (textEditor.Document.Text);
+			List<string> vars = template.ParseVariables (textEditor.Text);
 			foreach (string var in vars) {
 				if (!variables.Any (v => v.Name == var) && !template.Variables.Any (v => v.Name == var)) {
 					variables.Add (new CodeTemplateVariable (var) {
@@ -170,13 +168,13 @@ namespace MonoDevelop.Ide.CodeTemplates
 		}
 
 
-		void CaretPositionChanged (object sender, Mono.TextEditor.DocumentLocationEventArgs e)
+		void CaretPositionChanged (object sender, EventArgs e)
 		{
 			comboboxVariables.Active = -1;
-			int offset = textEditor.Caret.Offset;
+			int offset = textEditor.CaretOffset;
 			int start = offset;
-			while (start >= 0 && start < textEditor.Document.TextLength) { // caret offset may be behind the text
-				char ch = textEditor.Document.GetCharAt (start);
+			while (start >= 0 && start < textEditor.Length) { // caret offset may be behind the text
+				char ch = textEditor.GetCharAt (start);
 				if (ch == '$')
 					break;
 				if (!char.IsLetterOrDigit (ch) && ch != '_')
@@ -185,16 +183,16 @@ namespace MonoDevelop.Ide.CodeTemplates
 			}
 			
 			int end = offset;
-			while (end < textEditor.Document.TextLength) {
-				char ch = textEditor.Document.GetCharAt (end);
+			while (end < textEditor.Length) {
+				char ch = textEditor.GetCharAt (end);
 				if (ch == '$')
 					break;
 				if (!char.IsLetterOrDigit (ch) && ch != '_')
 					return;
 				end++;
 			}
-			if (start >= 0 && end < textEditor.Document.TextLength) {
-				string varName = textEditor.Document.GetTextBetween (start, end).Trim ('$');
+			if (start >= 0 && end < textEditor.Length) {
+				string varName = textEditor.GetTextBetween (start, end).Trim ('$');
 				TreeIter iter;
 				if (variablesListStore.GetIterFirst (out iter)) {
 					int i = -1;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs
index 721f645107..9e3fba71fe 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs
@@ -26,17 +26,19 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Text.RegularExpressions;
 
 using MonoDevelop.Ide.Gui.Content;
-using Mono.TextEditor.PopupWindow;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.Completion;
 using MonoDevelop.Ide.CodeCompletion;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using MonoDevelop.Ide.Tasks;
+using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Ide.CodeTemplates
 {
@@ -47,17 +49,15 @@ namespace MonoDevelop.Ide.CodeTemplates
 			set;
 		}
 		
-		public ICompilation Compilation {
+		public SemanticModel Compilation {
 			get {
-				return Document.Compilation;
+				var analysisDocument = DocumentContext.ParsedDocument;
+				if (analysisDocument == null)
+					return null;
+				return analysisDocument.GetAst<SemanticModel> ();
 			}
 		}
-		
-		public IUnresolvedFile ParsedDocument {
-			get;
-			set;
-		}
-		
+
 		public DocumentLocation InsertPosition {
 			get;
 			set;
@@ -78,7 +78,12 @@ namespace MonoDevelop.Ide.CodeTemplates
 			set;
 		}
 		
-		public MonoDevelop.Ide.Gui.Document Document {
+		public DocumentContext DocumentContext {
+			get;
+			set;
+		}
+
+		public TextEditor Editor {
 			get;
 			set;
 		}
@@ -93,36 +98,28 @@ namespace MonoDevelop.Ide.CodeTemplates
 		
 		public string GetCurrentClassName ()
 		{
-			if (CurrentContext.ParsedDocument == null)
-				return null;
-			IUnresolvedTypeDefinition type = null;
-			var provider = CurrentContext.Document.GetContent<ITextEditorMemberPositionProvider>();
-			if (provider == null) {
-				type = CurrentContext.ParsedDocument.GetInnermostTypeDefinition (CurrentContext.InsertPosition.Line, CurrentContext.InsertPosition.Column);
-			} else {
-				type = provider.GetTypeAt (CurrentContext.Document.Editor.LocationToOffset (CurrentContext.InsertPosition));
-			}
-			
-			if (type == null)
+			var compilation = CurrentContext.Compilation;
+			if (compilation == null)
 				return null;
-			return type.Name;
+			var enclosingSymbol = compilation.GetEnclosingSymbol (CurrentContext.Editor.CaretOffset);
+
+			if (!(enclosingSymbol is ITypeSymbol))
+				enclosingSymbol = enclosingSymbol.ContainingType;
+
+			return enclosingSymbol != null ? enclosingSymbol.Name : null;
 		}
 		
 		public string GetConstructorModifier ()
 		{
-			if (CurrentContext.ParsedDocument == null)
+			var compilation = CurrentContext.Compilation;
+			if (compilation == null)
 				return null;
-			IUnresolvedTypeDefinition type = null;
-			var provider = CurrentContext.Document.GetContent<ITextEditorMemberPositionProvider>();
-			if (provider == null) {
-				type = CurrentContext.ParsedDocument.GetInnermostTypeDefinition (CurrentContext.InsertPosition.Line, CurrentContext.InsertPosition.Column);
-			} else {
-				type = provider.GetTypeAt (CurrentContext.Document.Editor.LocationToOffset (CurrentContext.InsertPosition));
-			}
-			
-			if (type == null)
-				return "";
-			return type.IsStatic ? "static " : "public ";
+			var enclosingSymbol = compilation.GetEnclosingSymbol (CurrentContext.Editor.CaretOffset);
+
+			if (!(enclosingSymbol is ITypeSymbol))
+				enclosingSymbol = enclosingSymbol.ContainingType;
+
+			return enclosingSymbol != null && enclosingSymbol.IsStatic ? "static " : "public ";
 		}
 		
 		public string GetLengthProperty (Func<string, string> callback, string varName)
@@ -132,29 +129,27 @@ namespace MonoDevelop.Ide.CodeTemplates
 			
 			string var = callback (varName);
 			
-			ITextEditorResolver textEditorResolver = CurrentContext.Document.GetContent <ITextEditorResolver> ();
+			ITextEditorResolver textEditorResolver = CurrentContext.DocumentContext.GetContent <ITextEditorResolver> ();
 			if (textEditorResolver != null) {
-				var result = textEditorResolver.GetLanguageItem (CurrentContext.Document.Editor.Document.LocationToOffset (CurrentContext.InsertPosition), var);
-				if (result.Type.IsReferenceType.HasValue && !result.Type.IsReferenceType.Value)
-					return "Length";
+				var result = textEditorResolver.GetLanguageItem (CurrentContext.Editor.LocationToOffset (CurrentContext.InsertPosition), var);
+				if (result != null) {
+					var returnType = result.GetReturnType ();
+					if (returnType != null && !returnType.IsReferenceType)
+						return "Length";
+				}
 			}
 			return "Count";
 		}
 		
-		IType GetElementType (IType result)
+		ITypeSymbol GetElementType (ITypeSymbol type)
 		{
-			foreach (var baseType in result.GetAllBaseTypes ()) {
-				var baseTypeDef = baseType.GetDefinition();
-				if (baseTypeDef != null && baseTypeDef.Name == "IEnumerable") {
-					if (baseTypeDef.Namespace == "System.Collections.Generic" && baseTypeDef.TypeParameterCount == 1) {
-						if (baseType.TypeArguments.Count > 0)
-							return baseType.TypeArguments[0];
-					} else if (baseTypeDef.Namespace == "System.Collections" && baseTypeDef.TypeParameterCount == 0) {
-						return CurrentContext.Compilation.FindType (KnownTypeCode.Object);
-					}
+			foreach (var baseType in type.AllInterfaces) {
+				if (baseType != null && baseType.Name == "IEnumerable") {
+					if (baseType.TypeArguments.Length > 0)
+						return baseType.TypeArguments[0];
 				}
 			}
-			return new UnknownType ("", "", 0);
+			return type;
 		}
 		
 		
@@ -162,70 +157,59 @@ namespace MonoDevelop.Ide.CodeTemplates
 		{
 			if (callback == null)
 				return "var";
-			
+			var compilation = CurrentContext.Compilation;
+			if (compilation == null)
+				return null;
+		
 			string var = callback (varName);
-			ITextEditorResolver textEditorResolver = CurrentContext.Document.GetContent <ITextEditorResolver> ();
-			if (textEditorResolver != null) {
-				var result = textEditorResolver.GetLanguageItem (CurrentContext.Document.Editor.Caret.Offset, var);
-				if (result != null) {
-					var componentType = GetElementType (result.Type);
-					if (componentType.Kind != TypeKind.Unknown) {
-						var generator = CodeGenerator.CreateGenerator (CurrentContext.Document);
-						if (generator != null)
-							return generator.GetShortTypeString (CurrentContext.Document, componentType);
-					}
-				}
-			}
-			
+
+			var offset = CurrentContext.Editor.CaretOffset;
+			var sym = compilation.LookupSymbols (offset).First (s => s.Name == var);
+			if (sym == null)
+				return "var";
+			var rt = sym.GetReturnType ();
+			if (rt != null)
+				return rt.ToMinimalDisplayString (compilation, offset);
 			return "var";
 		}
-		MonoDevelop.Ide.CodeCompletion.ICompletionDataList list;
+
+		ICompletionDataList list;
 		public IListDataProvider<string> GetCollections ()
 		{
 			var result = new List<CodeTemplateVariableValue> ();
-			var ext = CurrentContext.Document.GetContent <CompletionTextEditorExtension> ();
+			var ext = CurrentContext.DocumentContext.GetContent <CompletionTextEditorExtension> ();
 			if (ext != null) {
 				if (list == null)
 					list = ext.CodeCompletionCommand (
-						CurrentContext.Document.GetContent <MonoDevelop.Ide.CodeCompletion.ICompletionWidget> ().CurrentCodeCompletionContext);
+						CurrentContext.DocumentContext.GetContent <MonoDevelop.Ide.CodeCompletion.ICompletionWidget> ().CurrentCodeCompletionContext);
 				
-				foreach (object o in list) {
-					var data = o as IEntityCompletionData;
-					if (data == null)
-						continue;
-					
-					if (data.Entity is IMember) {
-						var m = data.Entity as IMember;
-						if (GetElementType (m.ReturnType).Kind != TypeKind.Unknown) {
-							if (m is IMethod) {
-								if (((IMethod)m).Parameters.Count == 0)
-									result.Add (new CodeTemplateVariableValue (m.Name + " ()", ((CompletionData)data).Icon));
-								continue;
-							}
-
-							result.Add (new CodeTemplateVariableValue (m.Name, ((CompletionData)data).Icon));
+				foreach (var data in list.OfType<ISymbolCompletionData> ()) {
+					if (GetElementType (data.Symbol.GetReturnType ()).TypeKind != TypeKind.Error) {
+						var method = data as IMethodSymbol;
+						if (method != null) {
+							if (method.Parameters.Length == 0)
+								result.Add (new CodeTemplateVariableValue (data.Symbol.Name + " ()", ((CompletionData)data).Icon));
+							continue;
 						}
+
+						result.Add (new CodeTemplateVariableValue (data.Symbol.Name, ((CompletionData)data).Icon));
 					}
 				}
 				
-				foreach (object o in list) {
-					var data = o as IEntityCompletionData;
-					if (data == null)
-						continue;
-					if (data.Entity is IParameter) {
-						var m = data.Entity as IParameter;
-						if (GetElementType (m.Type).Kind != TypeKind.Unknown)
+				foreach (var data in list.OfType<ISymbolCompletionData> ()) {
+					var m = data.Symbol as IParameterSymbol;
+					if (m != null) {
+						if (GetElementType (m.Type).TypeKind != TypeKind.Error)
 							result.Add (new CodeTemplateVariableValue (m.Name, ((CompletionData)data).Icon));
 					}
 				}
 				
-				foreach (object o in list) {
-					var data = o as IVariableCompletionData;
-					if (data == null)
+				foreach (var sym in list.OfType<ISymbolCompletionData> ()) {
+					var m = sym.Symbol as ILocalSymbol;
+					if (m == null)
 						continue;
-					var m = data.Variable;
-					if (GetElementType (m.Type).Kind != TypeKind.Unknown)
-						result.Add (new CodeTemplateVariableValue (m.Name, ((CompletionData)data).Icon));
+					if (GetElementType (m.Type).TypeKind != TypeKind.Error)
+						result.Add (new CodeTemplateVariableValue (m.Name, ((CompletionData)m).Icon));
 				}
 			}
 			return new CodeTemplateListDataProvider (result);
@@ -233,7 +217,8 @@ namespace MonoDevelop.Ide.CodeTemplates
 		
 		public string GetSimpleTypeName (string fullTypeName)
 		{
-			if (CurrentContext.ParsedDocument == null)
+			var compilation = CurrentContext.Compilation;
+			if (compilation == null)
 				return fullTypeName.Replace ("#", ".");
 			string ns = "";
 			string name = "";
@@ -249,31 +234,21 @@ namespace MonoDevelop.Ide.CodeTemplates
 			
 			idx = name.IndexOf ('.');
 			if (idx >= 0) {
-				member = name.Substring (idx);
+				member = name.Substring (idx + 1);
 				name = name.Substring (0, idx);
 			}
 
-			var type = new GetClassTypeReference (ns, name, 0).Resolve (new SimpleTypeResolveContext (CurrentContext.Document.Compilation.MainAssembly));
-			bool stripAttribute = false;
-			if (type == null || type.Kind == TypeKind.Unknown) {
-				type = new GetClassTypeReference (ns, name + "Attribute", 0).Resolve (
-					new SimpleTypeResolveContext (CurrentContext.Document.Compilation.MainAssembly)
-				);	
-				stripAttribute = true;
-			}
-			if (type == null || type.Kind == TypeKind.Unknown)
-				return fullTypeName.Replace ("#", ".");
-			var generator = CodeGenerator.CreateGenerator (CurrentContext.Document);
-			if (generator != null) {
-				var result = generator.GetShortTypeString (CurrentContext.Document, type) + member;
-				if (stripAttribute && result.EndsWith ("Attribute", StringComparison.Ordinal))
-				    result = result.Substring (0, result.Length - "Attribute".Length);
-				return result;
+			var metadataName = string.IsNullOrEmpty (ns) ? name : ns + "." + name;
+			var type = compilation.Compilation.GetTypeByMetadataName (metadataName);
+			if (type != null) {
+				var minimalName = type.ToMinimalDisplayString (compilation, CurrentContext.Editor.CaretOffset);
+				return string.IsNullOrEmpty (member) ? minimalName :  minimalName + "." + member;
 			}
 			return fullTypeName.Replace ("#", ".");
 		}
 		
-		static Regex functionRegEx = new Regex ("([^(]*)\\(([^(]*)\\)", RegexOptions.Compiled);
+
+		static System.Text.RegularExpressions.Regex functionRegEx = new System.Text.RegularExpressions.Regex ("([^(]*)\\(([^(]*)\\)", RegexOptions.Compiled);
 		
 		
 		// We should use reflection here (but for 5 functions it doesn't hurt) !!! - Mike
@@ -294,7 +269,7 @@ namespace MonoDevelop.Ide.CodeTemplates
 		public virtual IListDataProvider<string> RunFunction (TemplateContext context, Func<string, string> callback, string function)
 		{
 			this.CurrentContext = context;
-			Match match = functionRegEx.Match (function);
+			var match = functionRegEx.Match (function);
 			if (!match.Success)
 				return null;
 			string name = match.Groups[1].Value;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ParsedFileEventArgs.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/IListDataProvider.cs
index 50300be800..b1d02b8310 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ParsedFileEventArgs.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/IListDataProvider.cs
@@ -1,10 +1,10 @@
 // 
-// ParsedFileEventArgs.cs
+// IListDataProvider.cs
 //  
 // Author:
 //       Mike Krüger <mkrueger@novell.com>
 // 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,20 +25,27 @@
 // THE SOFTWARE.
 
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
+using System.Collections.Generic;
 
-namespace MonoDevelop.Ide.TypeSystem
+namespace MonoDevelop.Ide.CodeTemplates
 {
-	public class ParsedFileEventArgs : EventArgs
+	public interface IListDataProvider<T>
 	{
-		public IUnresolvedFile File {
-			get;
-			private set;
+		int Count {
+			get; 
 		}
-
-		public ParsedFileEventArgs (IUnresolvedFile file)
-		{
-			this.File = file;
+		
+		T this[int index] { 
+			get;
 		}
+		
+		Xwt.Drawing.Image GetIcon (int index);
+		string GetText (int index);
+	}
+	
+	public interface IMarkupListDataProvider<T> : IListDataProvider<T>
+	{
+		bool HasMarkup (int index);
+		string GetMarkup (int index);
 	}
-}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/CustomStringTagProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/CustomStringTagProvider.cs
index b39ae14707..15f096ced4 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/CustomStringTagProvider.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/CustomStringTagProvider.cs
@@ -87,17 +87,17 @@ namespace MonoDevelop.Ide.Commands
 					
 				case "CURLINE":
 					if (wb.ActiveDocument != null && wb.ActiveDocument.Editor != null)
-						return wb.ActiveDocument.Editor.Caret.Line;
+						return wb.ActiveDocument.Editor.CaretLocation.Line;
 					return null;
 					
 				case "CURCOLUMN":
 					if (wb.ActiveDocument != null && wb.ActiveDocument.Editor != null)
-						return wb.ActiveDocument.Editor.Caret.Column;
+						return wb.ActiveDocument.Editor.CaretLocation.Column;
 					return null;
 					
 				case "CUROFFSET":
 					if (wb.ActiveDocument != null && wb.ActiveDocument.Editor != null)
-						return wb.ActiveDocument.Editor.Caret.Offset;
+						return wb.ActiveDocument.Editor.CaretOffset;
 					return null;
 					
 				case "CURTEXT":
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs
index 1ebdb497bd..49e2fab704 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs
@@ -287,7 +287,7 @@ namespace MonoDevelop.Ide.Commands
 		{
 			Document doc = IdeApp.Workbench.ActiveDocument;
 			string header = MonoDevelop.Ide.StandardHeader.StandardHeaderService.GetHeader (doc.Project, doc.Name, false);
-			doc.Editor.Insert (0, header + "\n");
+			doc.Editor.InsertText (0, header + "\n");
 		}
 		
 		protected override void Update (CommandInfo info)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
index 82dab65f80..0c654ba2e9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
@@ -38,6 +38,7 @@ using Gtk;
 using MonoDevelop.Ide.Projects;
 using MonoDevelop.Ide.Desktop;
 using System.Linq;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Ide.Commands
 {
@@ -365,7 +366,7 @@ namespace MonoDevelop.Ide.Commands
 		protected override void Run (object dataItem)
 		{
 			string filename = (string)dataItem;
-			Gdk.ModifierType mtype = Mono.TextEditor.GtkWorkarounds.GetCurrentKeyModifiers ();
+			Gdk.ModifierType mtype = GtkWorkarounds.GetCurrentKeyModifiers ();
 			bool inWorkspace = (mtype & Gdk.ModifierType.ControlMask) != 0;
 			IdeApp.Workspace.OpenWorkspaceItem (filename, !inWorkspace);
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
index 1464202903..8e2fa052bb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
@@ -338,7 +338,7 @@ namespace MonoDevelop.Ide.Commands
 			if (h == null || !IdeApp.ProjectOperations.CurrentRunOperation.IsCompleted)
 				return;
 
-			IdeApp.ProjectOperations.Execute (target);
+			IdeApp.ProjectOperations.Execute (target, h);
 		}
 	}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/TextEditorCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/TextEditorCommands.cs
index fa09268349..eaa9fcd823 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/TextEditorCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/TextEditorCommands.cs
@@ -91,7 +91,11 @@ namespace MonoDevelop.Ide.Commands
 		DuplicateLine,
 		
 		ToggleCompletionSuggestionMode,
-		ToggleBlockSelectionMode
+		ToggleBlockSelectionMode,
+
+		DynamicAbbrev,
+
+		PulseCaret
 	}
 	
 	public class ToggleCompletionSuggestionModeHandler : CommandHandler
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
index 9d3d19c798..36d6161f18 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
@@ -378,7 +378,7 @@ namespace MonoDevelop.Ide.Commands
 
 		protected override void Run ()
 		{
-			IdeApp.Workbench.ActiveDocument.Editor.SetCaretTo (IdeApp.Workbench.ActiveDocument.Editor.Caret.Line, IdeApp.Workbench.ActiveDocument.Editor.Caret.Column);
+			IdeApp.Workbench.ActiveDocument.Editor.StartCaretPulseAnimation ();
 		}
 
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AbstractUsagesExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AbstractUsagesExtension.cs
new file mode 100644
index 0000000000..ec5fd72ee1
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AbstractUsagesExtension.cs
@@ -0,0 +1,246 @@
+//
+// AbstractUsagesExtension.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Gui.Content;
+using System.Collections.Generic;
+using System.Linq;
+using MonoDevelop.Ide.FindInFiles;
+using System.Threading;
+using System.Threading.Tasks;
+using MonoDevelop.Core;
+using System.Diagnostics.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.Ide.Editor.Extension
+{
+	public abstract class UsageProviderEditorExtension : TextEditorExtension
+	{
+		public abstract IEnumerable<Usage> Usages {
+			get;
+		}
+
+		public event EventHandler UsagesUpdated;
+
+		protected void OnUsagesUpdated (EventArgs e)
+		{
+			var handler = UsagesUpdated;
+			if (handler != null)
+				handler (this, e);
+		}
+	}
+
+	/// <summary>
+	/// Provides a base class for implementing highlighting of usages inside the text editor.
+	/// </summary>
+	public abstract class AbstractUsagesExtension<T> : UsageProviderEditorExtension
+	{
+		[SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+		protected static readonly List<MemberReference> EmptyList = new List<MemberReference> ();
+
+		CancellationTokenSource tooltipCancelSrc = new CancellationTokenSource ();
+		List<ITextSegmentMarker> markers = new List<ITextSegmentMarker> ();
+
+		public IList<ITextSegmentMarker> Markers {
+			get {
+				return markers;
+			}
+		}
+
+		uint popupTimer;
+
+		protected override void Initialize ()
+		{
+			Editor.CaretPositionChanged += HandleTextEditorDataCaretPositionChanged;
+			Editor.TextChanged += HandleTextEditorDataDocumentTextReplaced;
+			Editor.SelectionChanged += HandleTextEditorDataSelectionChanged;
+		}
+
+		void HandleTextEditorDataSelectionChanged (object sender, EventArgs e)
+		{
+			if (Editor.IsSomethingSelected)
+				RemoveMarkers ();
+		}
+
+		void HandleTextEditorDataDocumentTextReplaced (object sender, TextChangeEventArgs e)
+		{
+			RemoveMarkers ();
+		}
+
+		public override void Dispose ()
+		{
+			CancelTooltip ();
+
+			Editor.SelectionChanged -= HandleTextEditorDataSelectionChanged;
+			Editor.CaretPositionChanged -= HandleTextEditorDataCaretPositionChanged;
+			Editor.TextChanged -= HandleTextEditorDataDocumentTextReplaced;
+			base.Dispose ();
+			RemoveTimer ();
+		}
+
+		public bool IsTimerOnQueue {
+			get {
+				return popupTimer != 0;
+			}
+		}
+
+		public void ForceUpdate ()
+		{
+			RemoveTimer ();
+			DelayedTooltipShow ();
+		}
+
+		/// <summary>
+		/// Tries to resolve inside the current location inside tho document.
+		/// </summary>
+		/// <returns><c>true</c>, if resolve was successful, <c>false</c> otherwise.</returns>
+		/// <param name="token">A cancellation token to cancel the operation.</param>
+		protected abstract Task<T> ResolveAsync (CancellationToken token);
+		
+
+		/// <summary>
+		/// Gets all references from a given resolve result. Note that this method is called on a background thread.
+		/// </summary>
+		/// <returns>The references.</returns>
+		/// <param name="resolveResult">The resolve result given in 'TryResolve'.</param>
+		/// <param name="token">A cancellation token to cancel the operation.</param>
+		protected abstract IEnumerable<MemberReference> GetReferences (T resolveResult, CancellationToken token);
+
+		async void DelayedTooltipShow ()
+		{
+			try {
+				CancelTooltip ();
+				
+				var token = tooltipCancelSrc.Token;
+
+				T result = await ResolveAsync (token);
+				if (token.IsCancellationRequested) {
+					ClearQuickTasks ();
+					return;
+				}
+
+				Task.Run (delegate {
+					var list = GetReferences (result, token).ToList ();
+					if (!token.IsCancellationRequested) {
+						Gtk.Application.Invoke (delegate {
+							if (!token.IsCancellationRequested)
+								ShowReferences (list);
+						});
+					}
+				});
+
+			} catch (Exception e) {
+				LoggingService.LogError ("Unhandled Exception in HighlightingUsagesExtension", e);
+			} finally {
+				popupTimer = 0;
+			}
+		}
+
+		void RemoveTimer ()
+		{
+			if (popupTimer != 0) {
+				GLib.Source.Remove (popupTimer);
+				popupTimer = 0;
+			}
+		}
+
+		void HandleTextEditorDataCaretPositionChanged (object sender, EventArgs e)
+		{
+			if (!DefaultSourceEditorOptions.Instance.EnableHighlightUsages)
+				return;
+			if (!Editor.IsSomethingSelected && markers.Any (m => m.Contains (Editor.CaretOffset)))
+				return;
+			RemoveMarkers ();
+			RemoveTimer ();
+			if (!Editor.IsSomethingSelected)
+				popupTimer = GLib.Timeout.Add (1000, () => { DelayedTooltipShow (); return false; } );
+		}
+
+		void ClearQuickTasks ()
+		{
+			//UsagesSegments.Clear ();
+			if (usages.Count > 0) {
+				usages.Clear ();
+				OnUsagesUpdated (EventArgs.Empty);
+			}
+		}
+
+		void CancelTooltip ()
+		{
+			tooltipCancelSrc.Cancel ();
+			tooltipCancelSrc = new CancellationTokenSource ();
+		}
+
+		void RemoveMarkers ()
+		{
+			if (markers.Count == 0)
+				return;
+			// TextEditorData.Parent.TextViewMargin.AlphaBlendSearchResults = false;
+			foreach (var marker in markers) {
+				Editor.RemoveMarker (marker);
+			}
+			markers.Clear ();
+		}
+
+		void ShowReferences (IEnumerable<MemberReference> references)
+		{
+			RemoveMarkers ();
+			var lineNumbers = new HashSet<int> ();
+			usages.Clear ();
+			var editor = Editor;
+			if (editor != null /*&& editor.TextViewMargin != null*/) {
+				if (references != null) {
+					foreach (var r in references) {
+						if (r == null)
+							continue;
+						var start = r.Offset;
+						var end = r.Offset + r.Length;
+						if (end > editor.Length)
+							continue;
+						var usage = new Usage (TextSegment.FromBounds (start, end), r.ReferenceUsageType);
+						usages.Add (usage);
+						var marker = TextMarkerFactory.CreateUsageMarker (editor, usage);
+						markers.Add (marker);
+						lineNumbers.Add (editor.OffsetToLineNumber (start));
+						editor.AddMarker (marker);
+					}
+				}
+			}
+			OnUsagesUpdated (EventArgs.Empty);
+		}
+
+		#region IUsageProvider implementation
+
+		readonly List<Usage> usages = new List<Usage> ();
+		public override IEnumerable<Usage> Usages {
+			get {
+				return usages;
+			}
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
index 87562cd44b..2425d511de 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
@@ -33,143 +33,177 @@ using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Commands;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.CodeTemplates;
-using ICSharpCode.NRefactory.Completion;
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
+using System.Threading;
+using Gtk;
 
-namespace MonoDevelop.Ide.Gui.Content
+namespace MonoDevelop.Ide.Editor.Extension
 {
-	public class CompletionTextEditorExtension: TextEditorExtension
+	public class CompletionTextEditorExtension : TextEditorExtension
 	{
-		CodeCompletionContext currentCompletionContext;
-
-		bool autoHideCompletionWindow = true, autoHideParameterWindow = true;
+		protected CodeCompletionContext currentCompletionContext;
 
+		bool autoHideCompletionWindow = true, autoHideParameterWindow = true;

+

 		#region Completion related IDE
-//		public readonly static PropertyWrapper<bool> EnableCodeCompletion = PropertyService.Wrap ("EnableCodeCompletion", true);
-//		public readonly static PropertyWrapper<bool> EnableParameterInsight = PropertyService.Wrap ("EnableParameterInsight", true);
+		//		public readonly static PropertyWrapper<bool> EnableCodeCompletion = PropertyService.Wrap ("EnableCodeCompletion", true);

+		//		public readonly static PropertyWrapper<bool> EnableParameterInsight = PropertyService.Wrap ("EnableParameterInsight", true);

 		public readonly static PropertyWrapper<bool> EnableAutoCodeCompletion = PropertyService.Wrap ("EnableAutoCodeCompletion", true);
 		public readonly static PropertyWrapper<bool> AddImportedItemsToCompletionList = PropertyService.Wrap ("AddImportedItemsToCompletionList", false);
 		public readonly static PropertyWrapper<bool> IncludeKeywordsInCompletionList = PropertyService.Wrap ("IncludeKeywordsInCompletionList", true);
 		public readonly static PropertyWrapper<bool> IncludeCodeSnippetsInCompletionList = PropertyService.Wrap ("IncludeCodeSnippetsInCompletionList", true);
 		public readonly static PropertyWrapper<bool> AddParenthesesAfterCompletion = PropertyService.Wrap ("AddParenthesesAfterCompletion", false);
 		public readonly static PropertyWrapper<bool> AddOpeningOnly = PropertyService.Wrap ("AddOpeningOnly", false);
-		public readonly static PropertyWrapper<int>  CompletionListRows = PropertyService.Wrap ("CompletionListRows", 7);
+		public readonly static int CompletionListRows = 7;
 
 		public readonly static PropertyWrapper<bool> FilterCompletionListByEditorBrowsable = PropertyService.Wrap ("FilterCompletionListByEditorBrowsable", true);
-		public readonly static PropertyWrapper<bool> IncludeEditorBrowsableAdvancedMembers = PropertyService.Wrap ("IncludeEditorBrowsableAdvancedMembers", true);
-
+		public readonly static PropertyWrapper<bool> IncludeEditorBrowsableAdvancedMembers = PropertyService.Wrap ("IncludeEditorBrowsableAdvancedMembers", true);

+

 		#endregion
-
-		public ICompletionWidget CompletionWidget {
+

+		internal ICompletionWidget CompletionWidget
+		{
 			get;
 			set;
 		}
 
 
-		public virtual string CompletionLanguage {
-			get {
+		public virtual string CompletionLanguage
+		{
+			get
+			{
 				return "Other";
 			}
 		}
 
 		public void ShowCompletion (ICompletionDataList completionList)
 		{
-			currentCompletionContext = CompletionWidget.CreateCodeCompletionContext (Document.Editor.Caret.Offset);
+			currentCompletionContext = CompletionWidget.CreateCodeCompletionContext (Editor.CaretOffset);
 			int cpos, wlen;
 			if (!GetCompletionCommandOffset (out cpos, out wlen)) {
-				cpos = Document.Editor.Caret.Offset;
+				cpos = Editor.CaretOffset;
 				wlen = 0;
 			}
 			currentCompletionContext.TriggerOffset = cpos;
 			currentCompletionContext.TriggerWordLength = wlen;
-			
+
 			CompletionWindowManager.ShowWindow (this, '\0', completionList, CompletionWidget, currentCompletionContext);
 		}
-
-		// When a key is pressed, and before the key is processed by the editor, this method will be invoked.
-		// Return true if the key press should be processed by the editor.
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		CancellationTokenSource completionTokenSrc = new CancellationTokenSource ();
+		CancellationTokenSource parameterHintingSrc = new CancellationTokenSource ();

+		// When a key is pressed, and before the key is processed by the editor, this method will be invoked.

+		// Return true if the key press should be processed by the editor.

+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
 			bool res;
 			if (currentCompletionContext != null) {
-				if (CompletionWindowManager.PreProcessKeyEvent (key, keyChar, modifier)) {
-					CompletionWindowManager.PostProcessKeyEvent (key, keyChar, modifier);
-					autoHideCompletionWindow = true;
-					// in named parameter case leave the parameter window open.
-					autoHideParameterWindow = keyChar != ':';
+				if (CompletionWindowManager.PreProcessKeyEvent (descriptor)) {
+					CompletionWindowManager.PostProcessKeyEvent (descriptor);
+					autoHideCompletionWindow = true;

+					// in named parameter case leave the parameter window open.

+					autoHideParameterWindow = descriptor.KeyChar != ':';
 					if (!autoHideParameterWindow && ParameterInformationWindowManager.IsWindowVisible)
-						ParameterInformationWindowManager.PostProcessKeyEvent (this, CompletionWidget, key, modifier);
-					
+						ParameterInformationWindowManager.PostProcessKeyEvent (this, CompletionWidget, descriptor);
+
 					return false;
 				}
 				autoHideCompletionWindow = autoHideParameterWindow = false;
 			}
-			
+
 			if (ParameterInformationWindowManager.IsWindowVisible) {
-				if (ParameterInformationWindowManager.ProcessKeyEvent (this, CompletionWidget, key, modifier))
+				if (ParameterInformationWindowManager.ProcessKeyEvent (this, CompletionWidget, descriptor))
 					return false;
 				autoHideCompletionWindow = autoHideParameterWindow = false;
-			}
-			
-			//			int oldPos = Editor.CursorPosition;
-			//			int oldLen = Editor.TextLength;
-			res = base.KeyPress (key, keyChar, modifier);
-			
-			CompletionWindowManager.PostProcessKeyEvent (key, keyChar, modifier);
-			
-			var ignoreMods = Gdk.ModifierType.ControlMask | Gdk.ModifierType.MetaMask
-					| Gdk.ModifierType.Mod1Mask | Gdk.ModifierType.SuperMask;
-			// Handle parameter completion
+			}

+

+			//			int oldPos = Editor.CursorPosition;

+			//			int oldLen = Editor.TextLength;

+			res = base.KeyPress (descriptor);
+
+			CompletionWindowManager.PostProcessKeyEvent (descriptor);
+
+			var ignoreMods = ModifierKeys.Control | ModifierKeys.Alt
+				| ModifierKeys.Command;

+			// Handle parameter completion

 			if (ParameterInformationWindowManager.IsWindowVisible) {
-				ParameterInformationWindowManager.PostProcessKeyEvent (this, CompletionWidget, key, modifier);
+				ParameterInformationWindowManager.PostProcessKeyEvent (this, CompletionWidget, descriptor);
 			}
 
-			if ((modifier & ignoreMods) != 0)
-				return res;
-			
-			// don't complete on block selection
-			if (/*!EnableCodeCompletion ||*/ Document.Editor.SelectionMode == Mono.TextEditor.SelectionMode.Block)
-				return res;
-			
+			if ((descriptor.ModifierKeys & ignoreMods) != 0)
+				return res;

+

+			// don't complete on block selection

+			if (/*!EnableCodeCompletion ||*/ Editor.SelectionMode == MonoDevelop.Ide.Editor.SelectionMode.Block)
+				return res;

+

 			// Handle code completion
-			if (keyChar != '\0' && CompletionWidget != null && !CompletionWindowManager.IsVisible) {
+			if (descriptor.KeyChar != '\0' && CompletionWidget != null && !CompletionWindowManager.IsVisible) {
 				currentCompletionContext = CompletionWidget.CurrentCodeCompletionContext;
-				int triggerWordLength = currentCompletionContext.TriggerWordLength;
-				ICompletionDataList completionList = HandleCodeCompletion (currentCompletionContext, keyChar,
-				                                                           ref triggerWordLength);
-				if (triggerWordLength > 0 && (triggerWordLength < Editor.Caret.Offset
-					|| (triggerWordLength == 1 && Editor.Caret.Offset == 1))) {
-					currentCompletionContext
-						= CompletionWidget.CreateCodeCompletionContext (Editor.Caret.Offset - triggerWordLength);
-					currentCompletionContext.TriggerWordLength = triggerWordLength;
-				}
-				if (completionList != null) {
-					if (!CompletionWindowManager.ShowWindow (this, keyChar, completionList, CompletionWidget, currentCompletionContext))
+				completionTokenSrc.Cancel ();
+				completionTokenSrc = new CancellationTokenSource ();
+				var token = completionTokenSrc.Token;
+				var caretOffset = Editor.CaretOffset;
+				try {
+					var task = HandleCodeCompletionAsync (currentCompletionContext, descriptor.KeyChar, token);
+					if (task != null) {
+						var result = task.Result;
+						if (result != null) {
+							int triggerWordLength = result.TriggerWordLength;
+
+							if (triggerWordLength > 0 && (triggerWordLength < caretOffset
+								|| (triggerWordLength == 1 && caretOffset == 1))) {
+								currentCompletionContext = CompletionWidget.CreateCodeCompletionContext (caretOffset - triggerWordLength);
+								currentCompletionContext.TriggerWordLength = triggerWordLength;
+							}
+
+							if (!CompletionWindowManager.ShowWindow (this, descriptor.KeyChar, result, CompletionWidget, currentCompletionContext))
+								currentCompletionContext = null;
+						} else {
+							currentCompletionContext = null;
+						}
+					} else {
 						currentCompletionContext = null;
-				} else {
+					}
+				} catch (TaskCanceledException) {
+					currentCompletionContext = null;
+				} catch (AggregateException) {
 					currentCompletionContext = null;
 				}
 			}
-			
-			if (/*EnableParameterInsight &&*/ CompletionWidget != null) {
+
+			if (CompletionWidget != null) {
 				CodeCompletionContext ctx = CompletionWidget.CurrentCodeCompletionContext;
-				var paramProvider = HandleParameterCompletion (ctx, keyChar);
-				if (paramProvider != null)
-					ParameterInformationWindowManager.ShowWindow (this, CompletionWidget, ctx, paramProvider);
-			}
-/*			autoHideCompletionWindow = true;
-			autoHideParameterWindow = keyChar != ':';*/
+				parameterHintingSrc.Cancel ();
+				parameterHintingSrc = new CancellationTokenSource ();
+				var token = parameterHintingSrc.Token;
+				try {
+					var task = HandleParameterCompletionAsync (ctx, descriptor.KeyChar, token);
+					if (task != null) {
+						var result = task.Result;
+						if (result != null) {
+							ParameterInformationWindowManager.ShowWindow (this, CompletionWidget, ctx, result);
+						}
+					}
+				} catch (TaskCanceledException) {
+				} catch (AggregateException) {
+				}
+
+			}

+			/*			autoHideCompletionWindow = true;
+						autoHideParameterWindow = keyChar != ':';*/

 			return res;
 		}
-		
+
 		protected void ShowCompletion (ICompletionDataList completionList, int triggerWordLength, char keyChar)
 		{
-			if (Document.Editor.SelectionMode == Mono.TextEditor.SelectionMode.Block)
+			if (Editor.SelectionMode == SelectionMode.Block)
 				return;
 			if (CompletionWidget != null && currentCompletionContext == null) {
 				currentCompletionContext = CompletionWidget.CurrentCodeCompletionContext;
-				if (triggerWordLength > 0 && triggerWordLength < Editor.Caret.Offset) {
+				if (triggerWordLength > 0 && triggerWordLength < Editor.CaretOffset) {
 					currentCompletionContext =
-						CompletionWidget.CreateCodeCompletionContext (Editor.Caret.Offset - triggerWordLength);	
+						CompletionWidget.CreateCodeCompletionContext (Editor.CaretOffset - triggerWordLength);
 					currentCompletionContext.TriggerWordLength = triggerWordLength;
 				}
 				if (completionList != null)
@@ -179,12 +213,12 @@ namespace MonoDevelop.Ide.Gui.Content
 			}
 			autoHideCompletionWindow = autoHideParameterWindow = true;
 		}
-		
+
 		public virtual int GetCurrentParameterIndex (int startOffset)
 		{
 			return -1;
 		}
-		
+
 
 		protected void OnCompletionContextChanged (object o, EventArgs a)
 		{
@@ -195,24 +229,24 @@ namespace MonoDevelop.Ide.Gui.Content
 			ParameterInformationWindowManager.UpdateCursorPosition (this, CompletionWidget);
 		}
 
-		[CommandUpdateHandler (TextEditorCommands.ShowCompletionWindow)]
+		[CommandUpdateHandler(TextEditorCommands.ShowCompletionWindow)]
 		internal void OnUpdateCompletionCommand (CommandInfo info)
 		{
 			info.Bypass = !CanRunCompletionCommand () && !CompletionWindowManager.IsVisible;
 		}
-		
-		[CommandUpdateHandler (TextEditorCommands.ShowParameterCompletionWindow)]
+
+		[CommandUpdateHandler(TextEditorCommands.ShowParameterCompletionWindow)]
 		internal void OnUpdateParameterCompletionCommand (CommandInfo info)
 		{
 			info.Bypass = !CanRunParameterCompletionCommand ();
 		}
-		
-		[CommandHandler (TextEditorCommands.ShowCompletionWindow)]
+
+		[CommandHandler(TextEditorCommands.ShowCompletionWindow)]
 		public virtual void RunCompletionCommand ()
 		{
-			if (Document.Editor.SelectionMode == Mono.TextEditor.SelectionMode.Block)
+			if (Editor.SelectionMode == SelectionMode.Block)
 				return;
-			
+
 			if (CompletionWindowManager.IsVisible) {
 				CompletionWindowManager.Wnd.ToggleCategoryMode ();
 				return;
@@ -220,7 +254,7 @@ namespace MonoDevelop.Ide.Gui.Content
 			ICompletionDataList completionList = null;
 			int cpos, wlen;
 			if (!GetCompletionCommandOffset (out cpos, out wlen)) {
-				cpos = Editor.Caret.Offset;
+				cpos = Editor.CaretOffset;
 				wlen = 0;
 			}
 			currentCompletionContext = CompletionWidget.CreateCodeCompletionContext (cpos);
@@ -231,20 +265,20 @@ namespace MonoDevelop.Ide.Gui.Content
 			else
 				currentCompletionContext = null;
 		}
-		
-		[CommandHandler (TextEditorCommands.ShowCodeTemplateWindow)]
+
+		[CommandHandler(TextEditorCommands.ShowCodeTemplateWindow)]
 		public virtual void RunShowCodeTemplatesWindow ()
 		{
 			ICompletionDataList completionList = null;
 			int cpos, wlen;
 			if (!GetCompletionCommandOffset (out cpos, out wlen)) {
-				cpos = Editor.Caret.Offset;
+				cpos = Editor.CaretOffset;
 				wlen = 0;
 			}
-			
+
 			var ctx = CompletionWidget.CreateCodeCompletionContext (cpos);
 			ctx.TriggerWordLength = wlen;
-			completionList = Document.Editor.IsSomethingSelected ? ShowCodeSurroundingsCommand (ctx) : ShowCodeTemplatesCommand (ctx);
+			completionList = Editor.IsSomethingSelected ? ShowCodeSurroundingsCommand (ctx) : ShowCodeTemplatesCommand (ctx);
 			if (completionList == null) {
 				return;
 			}
@@ -256,74 +290,72 @@ namespace MonoDevelop.Ide.Gui.Content
 			wnd.Extension = this;
 			wnd.ShowListWindow ((char)0, completionList, CompletionWidget, ctx);
 		}
-		
-		[CommandUpdateHandler (TextEditorCommands.ShowCodeTemplateWindow)]
+
+		[CommandUpdateHandler(TextEditorCommands.ShowCodeTemplateWindow)]
 		internal void OnUpdateShowCodeTemplatesWindow (CommandInfo info)
 		{
 			ICompletionDataList completionList = null;
 			int cpos, wlen;
 			if (!GetCompletionCommandOffset (out cpos, out wlen)) {
-				cpos = Editor.Caret.Offset;
+				cpos = Editor.CaretOffset;
 				wlen = 0;
 			}
 			try {
 				var ctx = CompletionWidget.CreateCodeCompletionContext (cpos);
 				ctx.TriggerWordLength = wlen;
-				completionList = Document.Editor.IsSomethingSelected ? ShowCodeSurroundingsCommand (ctx) : ShowCodeTemplatesCommand (ctx);
+				completionList = Editor.IsSomethingSelected ? ShowCodeSurroundingsCommand (ctx) : ShowCodeTemplatesCommand (ctx);
 
 				info.Bypass = completionList == null;
-				info.Text = Document.Editor.IsSomethingSelected ? GettextCatalog.GetString ("_Surround With...") : GettextCatalog.GetString ("I_nsert Template...");
+				info.Text = Editor.IsSomethingSelected ? GettextCatalog.GetString ("_Surround With...") : GettextCatalog.GetString ("I_nsert Template...");
 			} catch (Exception e) {
 				LoggingService.LogError ("Error while update show code templates window", e);
 				info.Bypass = true;
 			}
 		}
-	
-		
-		[CommandHandler (TextEditorCommands.ShowParameterCompletionWindow)]
+
+
+		[CommandHandler(TextEditorCommands.ShowParameterCompletionWindow)]
 		public virtual void RunParameterCompletionCommand ()
 		{
-			if (Document.Editor.SelectionMode == Mono.TextEditor.SelectionMode.Block || CompletionWidget == null)
+			if (Editor.SelectionMode == SelectionMode.Block || CompletionWidget == null)
 				return;
-			ParameterDataProvider cp = null;
-			int cpos;
-			if (!GetParameterCompletionCommandOffset (out cpos))
-				cpos = Editor.Caret.Offset;
+			ParameterHintingResult cp = null;
+			int cpos = Editor.CaretOffset;
 			CodeCompletionContext ctx = CompletionWidget.CreateCodeCompletionContext (cpos);
 			cp = ParameterCompletionCommand (ctx);
 			if (cp != null) {
 				ParameterInformationWindowManager.ShowWindow (this, CompletionWidget, ctx, cp);
-				ParameterInformationWindowManager.PostProcessKeyEvent (this, CompletionWidget, Gdk.Key.F, Gdk.ModifierType.None);
+				ParameterInformationWindowManager.PostProcessKeyEvent (this, CompletionWidget, KeyDescriptor.FromGtk (Gdk.Key.F, 'f', Gdk.ModifierType.None));
 			}
 		}
-		
+
 		public virtual bool CanRunCompletionCommand ()
 		{
 			return (CompletionWidget != null && currentCompletionContext == null);
 		}
-		
+
 		public virtual bool CanRunParameterCompletionCommand ()
 		{
 			return (CompletionWidget != null && !ParameterInformationWindowManager.IsWindowVisible);
 		}
-		
-		
-		public virtual ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext,
-		                                                         char completionChar, ref int triggerWordLength)
+
+		static readonly ICompletionDataList emptyList = new CompletionDataList ();
+
+		public virtual Task<ICompletionDataList> HandleCodeCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
-			return null;
+			return Task.FromResult (emptyList);
 		}
-		
-		public virtual ParameterDataProvider HandleParameterCompletion (CodeCompletionContext completionContext, char completionChar)
+
+		public virtual Task<ParameterHintingResult> HandleParameterCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
-			return null;
-		}
-		
-		// return false if completion can't be shown
+			return Task.FromResult (ParameterHintingResult.Empty);
+		}

+

+		// return false if completion can't be shown

 		public virtual bool GetCompletionCommandOffset (out int cpos, out int wlen)
 		{
 			cpos = wlen = 0;
-			int pos = Editor.Caret.Offset - 1;
+			int pos = Editor.CaretOffset - 1;
 			while (pos >= 0) {
 				char c = Editor.GetCharAt (pos);
 				if (!char.IsLetterOrDigit (c) && c != '_')
@@ -332,11 +364,11 @@ namespace MonoDevelop.Ide.Gui.Content
 			}
 			if (pos == -1)
 				return false;
-			
+
 			pos++;
 			cpos = pos;
 			int len = Editor.Length;
-			
+
 			while (pos < len) {
 				char c = Editor.GetCharAt (pos);
 				if (!char.IsLetterOrDigit (c) && c != '_')
@@ -347,45 +379,40 @@ namespace MonoDevelop.Ide.Gui.Content
 			return true;
 		}
 
-		public virtual bool GetParameterCompletionCommandOffset (out int cpos)
-		{
-			cpos = 0;
-			return false;
-		}
-		
+
 		public virtual ICompletionDataList ShowCodeSurroundingsCommand (CodeCompletionContext completionContext)
 		{
 			CompletionDataList list = new CompletionDataList ();
 			list.AutoSelect = true;
 			list.AutoCompleteEmptyMatch = true;
 			list.CompletionSelectionMode = CompletionSelectionMode.OwnTextField;
-			var templateWidget = Document.GetContent<ICodeTemplateContextProvider> ();
+			var templateWidget = DocumentContext.GetContent<ICodeTemplateContextProvider> ();
 			CodeTemplateContext ctx = CodeTemplateContext.Standard;
 			if (templateWidget != null)
 				ctx = templateWidget.GetCodeTemplateContext ();
-			foreach (CodeTemplate template in CodeTemplateService.GetCodeTemplatesForFile (Document.FileName)) {
-				if ((template.CodeTemplateType & CodeTemplateType.SurroundsWith) == CodeTemplateType.SurroundsWith)  {
+			foreach (CodeTemplate template in CodeTemplateService.GetCodeTemplatesForFile (DocumentContext.Name)) {
+				if ((template.CodeTemplateType & CodeTemplateType.SurroundsWith) == CodeTemplateType.SurroundsWith) {
 					if (ctx == template.CodeTemplateContext)
-						list.Add (new CodeTemplateCompletionData (Document, template));
+						list.Add (new CodeTemplateCompletionData (this, template));
 				}
 			}
 			return list;
 		}
-		
+
 		public virtual ICompletionDataList ShowCodeTemplatesCommand (CodeCompletionContext completionContext)
 		{
 			CompletionDataList list = new CompletionDataList ();
 			list.AutoSelect = true;
 			list.AutoCompleteEmptyMatch = true;
 			list.CompletionSelectionMode = CompletionSelectionMode.OwnTextField;
-			foreach (CodeTemplate template in CodeTemplateService.GetCodeTemplatesForFile (Document.FileName)) {
-				if (template.CodeTemplateType != CodeTemplateType.SurroundsWith)  {
-					list.Add (new CodeTemplateCompletionData (Document, template));
+			foreach (CodeTemplate template in CodeTemplateService.GetCodeTemplatesForFile (DocumentContext.Name)) {
+				if (template.CodeTemplateType != CodeTemplateType.SurroundsWith) {
+					list.Add (new CodeTemplateCompletionData (this, template));
 				}
 			}
 			return list;
 		}
-		
+		const int CompletionTimeoutInMs = 500;
 		
 		public virtual ICompletionDataList CodeCompletionCommand (CodeCompletionContext completionContext)
 		{
@@ -395,15 +422,25 @@ namespace MonoDevelop.Ide.Gui.Content
 			int pos = completionContext.TriggerOffset;
 			if (pos > 0) {
 				char ch = Editor.GetCharAt (pos - 1);
-				int triggerWordLength = completionContext.TriggerWordLength;
-				ICompletionDataList completionList = HandleCodeCompletion (completionContext, ch, ref triggerWordLength);
-				if (completionList != null)
-					return completionList;
+				var csc = new CancellationTokenSource (CompletionTimeoutInMs);
+				try {
+					var task = HandleCodeCompletionAsync (completionContext, ch, csc.Token);
+					if (task == null)
+						return null;
+					task.Wait (csc.Token);
+					if (!task.IsCompleted)
+						return null;
+					var completionList = task.Result;
+					if (completionList != null)
+						return completionList;
+				} catch (TaskCanceledException) {
+				} catch (AggregateException) {
+				}
 			}
 			return null;
 		}
 		
-		public virtual ParameterDataProvider ParameterCompletionCommand (CodeCompletionContext completionContext)
+		public virtual ParameterHintingResult ParameterCompletionCommand (CodeCompletionContext completionContext)
 		{
 			// This default implementation of ParameterCompletionCommand calls HandleParameterCompletion providing
 			// the char at the cursor position. If it returns a provider, just return it.
@@ -411,22 +448,34 @@ namespace MonoDevelop.Ide.Gui.Content
 			int pos = completionContext.TriggerOffset;
 			if (pos <= 0)
 				return null;
-			var cp = HandleParameterCompletion (completionContext, Editor.Document.GetCharAt (pos - 1));
-			if (cp != null)
-				return cp;
+			var csc = new CancellationTokenSource (CompletionTimeoutInMs);
+			try {
+				var task = HandleParameterCompletionAsync (completionContext, Editor.GetCharAt (pos - 1), csc.Token);
+				if (task == null)
+					return null;
+				task.Wait (csc.Token);
+				if (!task.IsCompleted)
+					return null;
+				var cp = task.Result;
+				if (cp != null)
+					return cp;
+			} catch (TaskCanceledException) {
+			} catch (AggregateException) {
+			}
 			return null;
 		}
 
-		public virtual int GuessBestMethodOverload (IParameterDataProvider provider, int currentOverload)
+		public virtual int GuessBestMethodOverload (ParameterHintingResult provider, int currentOverload)
 		{
 			int cparam = GetCurrentParameterIndex (provider.StartOffset);
 
-			if (cparam > provider.GetParameterCount (currentOverload) && !provider.AllowParameterList (currentOverload)) {
+			var currentHintingData = provider [currentOverload];
+			if (cparam > currentHintingData.ParameterCount && !currentHintingData.IsParameterListAllowed) {
 				// Look for an overload which has more parameters
 				int bestOverload = -1;
 				int bestParamCount = int.MaxValue;
 				for (int n=0; n<provider.Count; n++) {
-					int pc = provider.GetParameterCount (n);
+					int pc = provider[n].ParameterCount;
 					if (pc < bestParamCount && pc >= cparam) {
 						bestOverload = n;
 						bestParamCount = pc;
@@ -434,7 +483,7 @@ namespace MonoDevelop.Ide.Gui.Content
 				}
 				if (bestOverload == -1) {
 					for (int n=0; n<provider.Count; n++) {
-						if (provider.AllowParameterList (n)) {
+						if (provider[n].IsParameterListAllowed) {
 							bestOverload = n;
 							break;
 						}
@@ -445,32 +494,37 @@ namespace MonoDevelop.Ide.Gui.Content
 			return -1;
 		}
 		
-		void HandlePaste (int insertionOffset, string text, int insertedChars)
-		{
-			ParameterInformationWindowManager.HideWindow (this, CompletionWidget);
-			CompletionWindowManager.HideWindow ();
-		}
-
-		void HandleFocusOutEvent (object o, Gtk.FocusOutEventArgs args)
-		{
-			ParameterInformationWindowManager.HideWindow (this, CompletionWidget);
-			CompletionWindowManager.HideWindow ();
-		}
+//		void HandlePaste (int insertionOffset, string text, int insertedChars)
+//		{
+//			ParameterInformationWindowManager.HideWindow (this, CompletionWidget);
+//			CompletionWindowManager.HideWindow ();
+//		}
+//
+//		void HandleFocusOutEvent (object o, Gtk.FocusOutEventArgs args)
+//		{
+//			ParameterInformationWindowManager.HideWindow (this, CompletionWidget);
+//			CompletionWindowManager.HideWindow ();
+//		}
 
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 			CompletionWindowManager.WindowClosed += HandleWindowClosed;
-			CompletionWidget = Document.GetContent <ICompletionWidget> ();
+			CompletionWidget = DocumentContext.GetContent <ICompletionWidget> ();
 			if (CompletionWidget != null)
 				CompletionWidget.CompletionContextChanged += OnCompletionContextChanged;
-			document.Editor.Caret.PositionChanged += HandlePositionChanged;
-			document.Editor.Paste += HandlePaste;
-			if (document.Editor.Parent != null)
-				document.Editor.Parent.TextArea.FocusOutEvent += HandleFocusOutEvent;
+			Editor.CaretPositionChanged += HandlePositionChanged;
+//			document.Editor.Paste += HandlePaste;
+//			if (document.Editor.Parent != null)
+//				document.Editor.Parent.TextArea.FocusOutEvent += HandleFocusOutEvent;
+		}
+
+		internal void InternalInitialize ()
+		{
+			Initialize ();
 		}
 
-		void HandlePositionChanged (object sender, Mono.TextEditor.DocumentLocationEventArgs e)
+		void HandlePositionChanged (object sender, EventArgs e)
 		{
 			CompletionWindowManager.UpdateCursorPosition ();
 		}
@@ -488,10 +542,10 @@ namespace MonoDevelop.Ide.Gui.Content
 				ParameterInformationWindowManager.HideWindow (this, CompletionWidget);
 
 				disposed = true;
-				if (document.Editor.Parent != null)
-					document.Editor.Parent.TextArea.FocusOutEvent -= HandleFocusOutEvent;
-				document.Editor.Paste -= HandlePaste;
-				document.Editor.Caret.PositionChanged -= HandlePositionChanged;
+//				if (document.Editor.Parent != null)
+//					document.Editor.Parent.TextArea.FocusOutEvent -= HandleFocusOutEvent;
+//				document.Editor.Paste -= HandlePaste;
+				Editor.CaretPositionChanged -= HandlePositionChanged;
 				CompletionWindowManager.WindowClosed -= HandleWindowClosed;
 				if (CompletionWidget != null)
 					CompletionWidget.CompletionContextChanged -= OnCompletionContextChanged;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/IQuickTaskProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/IQuickTaskProvider.cs
index 0350a92b3b..62a4b236d4 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/IQuickTaskProvider.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/IQuickTaskProvider.cs
@@ -27,7 +27,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MonoDevelop.SourceEditor.QuickTasks
+namespace MonoDevelop.Ide.Editor.Extension
 {
 	public interface IQuickTaskProvider
 	{
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ICodeActionProviderSource.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/IndentationTracker.cs
index 155c74d767..25e47fa9ad 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ICodeActionProviderSource.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/IndentationTracker.cs
@@ -1,5 +1,5 @@
 // 
-// ICodeActionProviderSource.cs
+// IndentationTracker.cs
 //  
 // Author:
 //       Mike Krüger <mkrueger@xamarin.com>
@@ -23,19 +23,18 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System.Collections.Generic;
+using MonoDevelop.Core.Text;
 
-namespace MonoDevelop.CodeActions
+namespace MonoDevelop.Ide.Editor.Extension
 {
 	/// <summary>
-	/// A code action provider source provides a way for language backends to add a set of generated code action providers.
+	/// The indentation tracker is for giving the editor information about virtual line indentations.
 	/// </summary>
-	public interface ICodeActionProviderSource
+	public abstract class IndentationTracker
 	{
 		/// <summary>
-		/// Gets the providers.
+		/// Gets the indentation string for a given line.
 		/// </summary>
-		IEnumerable<CodeActionProvider> GetProviders ();
+		public abstract string GetIndentationString (int lineNumber);
 	}
-}
-
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/KeyDescriptor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/KeyDescriptor.cs
new file mode 100644
index 0000000000..743364b33b
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/KeyDescriptor.cs
@@ -0,0 +1,222 @@
+//
+// KeyDescriptor.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+#if MAC
+using AppKit;
+#endif
+
+namespace MonoDevelop.Ide.Editor.Extension
+{
+	public struct KeyDescriptor
+	{
+		public static KeyDescriptor Empty = new KeyDescriptor (SpecialKey.None, '\0', ModifierKeys.None);
+
+		public readonly SpecialKey SpecialKey;
+		public readonly char KeyChar;
+		public readonly ModifierKeys ModifierKeys;
+
+		KeyDescriptor (SpecialKey specialKey, char keyChar, ModifierKeys modifierKeys)
+		{
+			SpecialKey = specialKey;
+			KeyChar = keyChar;
+			ModifierKeys = modifierKeys;
+		}
+
+		public override string ToString ()
+		{
+			return string.Format ("[KeyDescriptor: SpecialKey={0}, KeyChar={1}, ModifierKeys={2}]", SpecialKey, KeyChar, ModifierKeys);
+		}
+
+		#region GTK
+		public static KeyDescriptor FromGtk (Gdk.Key key, char ch, Gdk.ModifierType state)
+		{
+			return new KeyDescriptor (ConvertKey (key), ch, ConvertModifiers (state));
+		}
+
+		static SpecialKey ConvertKey (Gdk.Key key)
+		{
+			switch (key) {
+			case Gdk.Key.BackSpace:
+				return SpecialKey.BackSpace;
+			case Gdk.Key.Tab:
+			case Gdk.Key.KP_Tab:
+			case Gdk.Key.ISO_Left_Tab:
+				return SpecialKey.Tab;
+			case Gdk.Key.Return:
+			case Gdk.Key.KP_Enter:
+			case Gdk.Key.ISO_Enter:
+				return SpecialKey.Return;
+			case Gdk.Key.Escape:
+				return SpecialKey.Escape;
+			case Gdk.Key.space:
+			case Gdk.Key.KP_Space:
+				return SpecialKey.Space;
+			case Gdk.Key.Page_Up:
+			case Gdk.Key.KP_Page_Up:
+				return SpecialKey.PageUp;
+			case Gdk.Key.Page_Down:
+			case Gdk.Key.KP_Page_Down:
+				return SpecialKey.PageDown;
+			case Gdk.Key.End:
+			case Gdk.Key.KP_End:
+				return SpecialKey.End;
+			case Gdk.Key.Begin:
+			case Gdk.Key.KP_Begin:
+				return SpecialKey.Begin;
+			case Gdk.Key.Home:
+			case Gdk.Key.KP_Home:
+				return SpecialKey.Home;
+			case Gdk.Key.Left:
+			case Gdk.Key.KP_Left:
+				return SpecialKey.Left;
+			case Gdk.Key.Up:
+			case Gdk.Key.KP_Up:
+				return SpecialKey.Up;
+			case Gdk.Key.Right:
+			case Gdk.Key.KP_Right:
+				return SpecialKey.Right;
+			case Gdk.Key.Down:
+			case Gdk.Key.KP_Down:
+				return SpecialKey.Down;
+			case Gdk.Key.Delete:
+			case Gdk.Key.KP_Delete:
+				return SpecialKey.Delete;
+			}
+			return SpecialKey.None;
+		}
+
+		static ModifierKeys ConvertModifiers (Gdk.ModifierType s)
+		{
+			ModifierKeys m = ModifierKeys.None;
+			if ((s & Gdk.ModifierType.ShiftMask) != 0)
+				m |= ModifierKeys.Shift;
+			if ((s & Gdk.ModifierType.ControlMask) != 0)
+				m |= ModifierKeys.Control;
+			if ((s & Gdk.ModifierType.Mod1Mask) != 0)
+				m |= ModifierKeys.Alt;
+			if ((s & Gdk.ModifierType.Mod2Mask) != 0)
+				m |= ModifierKeys.Command;
+			return m;
+		}
+		#endregion
+
+		#if MAC
+
+		public static KeyDescriptor FromMac (char ch, NSEventModifierMask state)
+		{
+			var specialKey = ConvertKey (ref ch);
+			var keyDescriptor = new KeyDescriptor (specialKey, ch, ConvertModifiers (state));
+			return keyDescriptor;
+		}
+
+		static SpecialKey ConvertKey (ref char ch)
+		{
+			if (ch == '\n' || ch == '\r') {
+				ch = '\0';
+				return SpecialKey.Return;
+			}
+			if (ch == '\t') {
+				ch = '\0';
+				return SpecialKey.Tab;
+			}
+			if (ch == '\b' || ch == (char)127) {
+				ch = '\0';
+				return SpecialKey.BackSpace;
+			}
+			if (ch == (char)27) {
+				ch = '\0';
+				return SpecialKey.Escape;
+			}
+			switch ((NSKey)ch) {
+			case NSKey.Delete:
+				ch = '\0';
+				return SpecialKey.BackSpace;
+			case NSKey.Tab:
+				ch = '\0';
+				return SpecialKey.Tab;
+			case NSKey.Return:
+			case NSKey.KeypadEnter:
+				ch = '\0';
+				return SpecialKey.Return;
+			case NSKey.Escape:
+				ch = '\0';
+				return SpecialKey.Escape;
+			case NSKey.Space:
+				ch = '\0';
+				return SpecialKey.Space;
+			case NSKey.PageUp:
+				ch = '\0';
+				return SpecialKey.PageUp;
+			case NSKey.PageDown:
+				ch = '\0';
+				return SpecialKey.PageDown;
+			case NSKey.End:
+				ch = '\0';
+				return SpecialKey.End;
+			case NSKey.Begin:
+				ch = '\0';
+				return SpecialKey.Begin;
+			case NSKey.Home:
+				ch = '\0';
+				return SpecialKey.Home;
+			case NSKey.LeftArrow:
+				ch = '\0';
+				return SpecialKey.Left;
+			case NSKey.UpArrow:
+				ch = '\0';
+				return SpecialKey.Up;
+			case NSKey.RightArrow:
+				ch = '\0';
+				return SpecialKey.Right;
+			case NSKey.DownArrow:
+				ch = '\0';
+				return SpecialKey.Down;
+			case NSKey.DeleteChar:
+				ch = '\0';
+				return SpecialKey.Delete;
+			}
+			return SpecialKey.None;
+		}
+
+
+
+		static ModifierKeys ConvertModifiers (NSEventModifierMask e)
+		{
+			var m = ModifierKeys.None;
+			if ((e & NSEventModifierMask.ControlKeyMask) != 0)
+				m |= ModifierKeys.Control;
+			if ((e & NSEventModifierMask.AlternateKeyMask) != 0)
+				m |= ModifierKeys.Alt;
+			if ((e & NSEventModifierMask.CommandKeyMask) != 0)
+				m |= ModifierKeys.Command;
+			if ((e & NSEventModifierMask.ShiftKeyMask) != 0)
+				m |= ModifierKeys.Shift;
+			return m;
+		}
+		#endif
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/ModifierKeys.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/ModifierKeys.cs
new file mode 100644
index 0000000000..4b902cdf0f
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/ModifierKeys.cs
@@ -0,0 +1,40 @@
+//
+// ModifierKeys.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Ide.Editor.Extension
+{
+	[Flags]
+	public enum ModifierKeys
+	{
+		None = 0,
+		Alt = 0x1 << 0,
+		Control = 0x1 << 1,
+		Shift = 0x1 << 2,
+		Command = 0x1 << 3
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTask.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/QuickTask.cs
index 15bd3982ad..96162525b1 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTask.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/QuickTask.cs
@@ -26,19 +26,16 @@
 
 using System;
 using Gtk;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using Gdk;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Components.Commands;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.Refactoring;
+using Microsoft.CodeAnalysis;
 
-namespace MonoDevelop.SourceEditor.QuickTasks
+namespace MonoDevelop.Ide.Editor.Extension
 {
-	
-	public class QuickTask
+	public sealed class QuickTask
 	{
 		Lazy<string> description;
 		public string Description {
@@ -47,24 +44,24 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			}
 		}
 		
-		public TextLocation Location {
+		public int Location {
 			get;
 			private set;
 		}
 		
-		public Severity Severity {
+		public DiagnosticSeverity Severity {
 			get;
 			private set;
 		}
 		
-		public QuickTask (Func<string> descriptionFunc, TextLocation location, Severity severity)
+		public QuickTask (Func<string> descriptionFunc, int location, DiagnosticSeverity severity)
 		{
 			this.description = new Lazy<string> (descriptionFunc);
 			this.Location = location;
 			this.Severity = severity;
 		}
 
-		public QuickTask (string description, TextLocation location, Severity severity)
+		public QuickTask (string description, int location, DiagnosticSeverity severity)
 		{
 			this.description = new Lazy<string> (() => description);
 			this.Location = location;
@@ -76,5 +73,4 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			return string.Format ("[QuickTask: Description={0}, Location={1}, Severity={2}]", Description, Location, Severity);
 		}
 	}
-	
 }
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DefaultCodeIssueCategories.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/SelectionSurroundingProvider.cs
index 68f473ed32..903e05a6ba 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DefaultCodeIssueCategories.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/SelectionSurroundingProvider.cs
@@ -1,21 +1,21 @@
-// 
-// DefaultInspectionCategories.cs
-//  
+//
+// ISelectionSurroundingProvider.cs
+//
 // Author:
 //       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,21 +24,34 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using MonoDevelop.Core;
+using MonoDevelop.Components.PropertyGrid.PropertyEditors;
 
-namespace MonoDevelop.CodeIssues
+namespace MonoDevelop.Ide.Editor.Extension
 {
 	/// <summary>
-	/// Default code issue categories provide strings to common categories used in the code issue options panel.
+	/// A selection surrounding provider handles a special handling how the text editor behaves when the user
+	/// types a key with a selection. The selection can be surrounded instead of beeing replaced.
 	/// </summary>
-	public static class DefaultCodeIssueCategories
+	public abstract class SelectionSurroundingProvider	
 	{
-		public readonly static string Improvements      = GettextCatalog.GetString ("Code Improvements");
-		public readonly static string CodeQualityIssues = GettextCatalog.GetString ("Code Quality Issues");
-		public readonly static string ConstraintViolations = GettextCatalog.GetString ("Constraint Violations");
-		public readonly static string Redundancies = GettextCatalog.GetString ("Redundancies");
-		public readonly static string Opportunities = GettextCatalog.GetString ("Language Usage Opportunities");
-		public readonly static string Notifications = GettextCatalog.GetString ("Code Notifications");
+		/// <summary>
+		/// Gets the selection surroundings for a given unicode key.
+		/// </summary>
+		/// <returns>
+		/// true, if the key is valid for a surrounding action.
+		/// </returns>
+		/// <param name='unicodeKey'>
+		/// The key to handle.
+		/// </param>
+		/// <param name='start'>
+		/// The start of the surrounding
+		/// </param>
+		/// <param name='end'>
+		/// The end of the surrounding
+		/// </param>
+		public abstract bool GetSelectionSurroundings (uint unicodeKey, out string start, out string end);
+
+		public abstract void HandleSpecialSelectionKey (uint unicodeKey);
 	}
 }
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/SpecialKey.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/SpecialKey.cs
new file mode 100644
index 0000000000..5157fec2b5
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/SpecialKey.cs
@@ -0,0 +1,49 @@
+//
+// SpecialKey.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Ide.Editor.Extension
+{
+	public enum SpecialKey
+	{
+		None,
+		BackSpace = 0xff08,
+		Tab = 0xff09,
+		Return = 0xff0d,
+		Escape = 0xff1b,
+		Space = 0x20,
+		PageUp = 0xff55,
+		PageDown = 0xff56,
+		End = 0xff57,
+		Begin = 0xff58,
+		Home = 0xff50,
+		Left = 0xff51,
+		Up = 0xff52,
+		Right = 0xff53,
+		Down = 0xff54,
+		Delete = 0xffff
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/TextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/TextEditorExtension.cs
new file mode 100644
index 0000000000..6dcb523e19
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/TextEditorExtension.cs
@@ -0,0 +1,107 @@
+//
+// AbstractEditorExtension.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.Ide.Editor.Extension
+{
+	public abstract class TextEditorExtension : ICommandRouter, IDisposable
+	{
+		public DocumentContext DocumentContext {
+			get;
+			protected set;
+		}
+
+		public TextEditor Editor {
+			get;
+			protected set;
+		}
+
+		internal TextEditorExtension Next {
+			get;
+			set;
+		}
+
+		protected internal void Initialize (TextEditor editor, DocumentContext context)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (context == null)
+				throw new ArgumentNullException ("context");
+			if (DocumentContext != null)
+				throw new InvalidOperationException ("Extension is already initialized.");
+			DocumentContext = context;
+			Editor = editor;
+			Initialize ();
+		}
+
+		protected virtual void Initialize ()
+		{
+		}
+
+		public virtual bool IsValidInContext (DocumentContext context)
+		{
+			return true;
+		}
+
+		/// <summary>
+		/// Return true if the key press should be processed by the editor.
+		/// When a key is pressed, and before the key is processed by the editor, this method will be invoked.
+		/// </summary>
+		public virtual bool KeyPress (KeyDescriptor descriptor)
+		{
+			return Next == null || Next.KeyPress (descriptor);
+		}
+
+		public virtual void Dispose ()
+		{
+		}
+
+		void CheckInitialized ()
+		{
+			if (DocumentContext == null)
+				throw new InvalidOperationException ("Editor extension not yet initialized");
+		}
+
+		object ICommandRouter.GetNextCommandTarget ()
+		{
+			return Next;
+		}
+	}
+
+	class TextEditorExtensionMarker : TextEditorExtension
+	{
+		public override bool IsValidInContext (DocumentContext context)
+		{
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/TextPasteHandler.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/TextPasteHandler.cs
new file mode 100644
index 0000000000..ee3518ecc0
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/TextPasteHandler.cs
@@ -0,0 +1,64 @@
+//
+// TextPasteHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.Ide.Editor.Extension
+{
+	/// <summary>
+	/// The text paste handler can do formattings to a text that is about to be pasted
+	/// into the text document.
+	/// </summary>
+	public abstract class TextPasteHandler
+	{
+		/// <summary>
+		/// Formats plain text that is inserted at a specified offset.
+		/// </summary>
+		/// <returns>
+		/// The text that will get inserted at that position.
+		/// </returns>
+		/// <param name="offset">The offset where the text will be inserted.</param>
+		/// <param name="text">The text to be inserted.</param>
+		/// <param name="copyData">Additional data in case the text was copied from a Mono.TextEditor.</param>
+		public abstract string FormatPlainText(int offset, string text, byte[] copyData);
+
+		/// <summary>
+		/// Gets the copy data for a specific segment inside the document. This can contain meta data about the text pasted.
+		/// For example 'text pasted from string'.
+		/// </summary>
+		/// <param name = "offset">The copy offset.</param>
+		/// <param name = "length">The length of the copied text.</param>
+		public abstract byte[] GetCopyData(int offset, int length);
+
+		/// <summary>
+		/// This is called after text was pasted. This is useful for creating an additional undo step for the paste command.
+		/// </summary>
+		/// <param name="offset">The offset the text was pasted at.</param>
+		/// <param name="length">The length of the text pasted.</param>
+		public abstract void PostFomatPastedText (int offset, int length);
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/IUsageProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/Usage.cs
index b3d38082fd..ea8dade4d3 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/IUsageProvider.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/Usage.cs
@@ -26,30 +26,24 @@
 
 using System;
 using System.Collections.Generic;
-using Mono.TextEditor;
+using ICSharpCode.NRefactory;
+using MonoDevelop.Core.Text;
 using MonoDevelop.Ide.FindInFiles;
 
-namespace MonoDevelop.SourceEditor.QuickTasks
+namespace MonoDevelop.Ide.Editor.Extension
 {
-
-	public struct Usage
+	public sealed class Usage : AbstractSegment
 	{
-		public DocumentLocation Location;
-		public ReferenceUsageType UsageType;
+		public readonly ReferenceUsageType UsageType;
 
-		public Usage (DocumentLocation location, ReferenceUsageType usageType)
+		public Usage (TextSegment segment, ReferenceUsageType usageType) : base (segment.Offset, segment.Length)
 		{
-			this.Location = location;
-			this.UsageType = usageType;
+			UsageType = usageType;
 		}
-	}
 
-	public interface IUsageProvider
-	{
-		IEnumerable<Usage> Usages {
-			get;
+		public Usage (int offset, int length, ReferenceUsageType usageType) : base (offset, length)
+		{
+			UsageType = usageType;
 		}
-
-		event EventHandler UsagesUpdated;
 	}
-}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/AmbientColor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/AmbientColor.cs
new file mode 100644
index 0000000000..b65a66a3de
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/AmbientColor.cs
@@ -0,0 +1,188 @@
+//
+// AmbientColor.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+using System.Xml.XPath;
+using System.Reflection;
+using MonoDevelop.Components;
+
+namespace MonoDevelop.Ide.Editor.Highlighting
+{
+	public sealed class AmbientColor
+	{
+		public string Name { get; private set; }
+		public readonly List<Tuple<string, HslColor>> Colors = new List<Tuple<string, HslColor>> ();
+
+		public HslColor Color {
+			get {
+				return GetColor ("color");
+			}
+			set {
+				for (int i = 0; i < Colors.Count; i++) {
+					var t = Colors [i];
+					if (t.Item1 == "color") {
+						Colors [i] = Tuple.Create ("color", value);
+						return;
+					}
+				}
+				Colors.Add (Tuple.Create ("color", value));
+			}
+		}
+
+		public HslColor SecondColor {
+			get {
+				return GetColor ("secondcolor");
+			}
+			set {
+				for (int i = 0; i < Colors.Count; i++) {
+					var t = Colors [i];
+					if (t.Item1 == "secondcolor") {
+						Colors [i] = Tuple.Create ("secondcolor", value);
+						return;
+					}
+				}
+				Colors.Add (Tuple.Create ("secondcolor", value));
+			}
+		}
+
+		public bool HasSecondColor {
+			get {
+				return Colors.Any (c => c.Item1 == "secondcolor");
+			}
+		}
+
+		public HslColor BorderColor {
+			get {
+				return GetColor ("bordercolor");
+			}
+			set {
+				for (int i = 0; i < Colors.Count; i++) {
+					var t = Colors [i];
+					if (t.Item1 == "bordercolor") {
+						Colors [i] = Tuple.Create ("bordercolor", value);
+						return;
+					}
+				}
+				Colors.Add (Tuple.Create ("bordercolor", value));
+			}
+		}
+
+		public bool HasBorderColor {
+			get {
+				return Colors.Any (c => c.Item1 == "bordercolor");
+			}
+		}
+
+		public HslColor GetColor (string name)
+		{
+			foreach (var color in Colors) {
+				if (color.Item1 == name)
+					return color.Item2;
+			}
+
+			return new HslColor (0, 0, 0);
+		}
+
+		public static AmbientColor Create (XElement element, Dictionary<string, HslColor> palette)
+		{
+			var result = new AmbientColor ();
+			foreach (var node in element.DescendantNodes ()) {
+				if (node.NodeType == System.Xml.XmlNodeType.Element) {
+					var el = (XElement)node;
+					switch (el.Name.LocalName) {
+					case "name":
+						result.Name = el.Value;
+						break;
+					default:
+						result.Colors.Add (Tuple.Create (el.Name.LocalName, ColorScheme.ParsePaletteColor (palette, el.Value)));
+						break;
+					}
+				}
+			}
+			
+			return result;
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (obj == null)
+				return false;
+			if (ReferenceEquals (this, obj))
+				return true;
+			if (obj.GetType () != typeof(AmbientColor))
+				return false;
+			AmbientColor other = (AmbientColor)obj;
+			return Colors.Equals (other.Colors) && Name == other.Name;
+		}
+
+		public override int GetHashCode ()
+		{
+			unchecked {
+				return (Colors != null ? Colors.GetHashCode () : 0) ^ (Name != null ? Name.GetHashCode () : 0);
+			}
+		}
+		
+
+		public static AmbientColor Import (Dictionary<string, ColorScheme.VSSettingColor> colors, string vsSetting)
+		{
+			var result = new AmbientColor ();
+			var attrs = vsSetting.Split (',');
+			foreach (var attr in attrs) {
+				var info = attr.Split ('=');
+				if (info.Length != 2)
+					continue;
+				var idx = info [1].LastIndexOf ('/');
+				var source = info [1].Substring (0, idx);
+				var dest   = info [1].Substring (idx + 1);
+
+				ColorScheme.VSSettingColor color;
+				if (!colors.TryGetValue (source, out color))
+					continue;
+				result.Name = color.Name;
+				string colorString;
+				switch (dest) {
+				case "Foreground":
+					colorString = color.Foreground;
+					break;
+				case "Background":
+					colorString = color.Background;
+					break;
+				default:
+					throw new InvalidDataException ("Invalid attribute source: " + dest);
+				}
+				result.Colors.Add (Tuple.Create (info [0], ColorScheme.ImportVsColor (colorString)));
+			}
+			if (result.Colors.Count == 0)
+				return null;
+			return result;
+		}
+	}
+	
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ChunkStyle.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ChunkStyle.cs
new file mode 100644
index 0000000000..bed02ad91d
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ChunkStyle.cs
@@ -0,0 +1,186 @@
+//
+// ChunkStyle.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Xml.Linq;
+using MonoDevelop.Components;
+
+namespace MonoDevelop.Ide.Editor.Highlighting
+{
+	public sealed class ChunkStyle
+	{
+		public string Name { get; set; }
+		public HslColor Foreground { get; set; }
+		public HslColor Background { get; set; }
+
+		public bool TransparentForeground {
+			get {
+				return Foreground.Alpha == 0.0;
+
+			}
+		}
+		public bool TransparentBackground {
+			get {
+				return Background.Alpha == 0.0;
+			}
+		}
+
+		public Xwt.Drawing.FontWeight FontWeight { get; set; }
+
+		public Xwt.Drawing.FontStyle FontStyle { get; set; }
+
+		[Obsolete("Will be removed - use FontWeight")]
+		public bool Bold {
+			get {
+				return FontWeight == Xwt.Drawing.FontWeight.Bold;
+			}
+		}
+		
+		[Obsolete("Will be removed - use FontStyle")]
+		public bool Italic {
+			get {
+				return FontStyle == Xwt.Drawing.FontStyle.Italic;
+			}
+		}
+		
+		public bool Underline {
+			get; set;
+		}
+
+		public ChunkStyle ()
+		{
+			Foreground = Background = new HslColor (0, 0, 0, 0);
+			FontWeight = Xwt.Drawing.FontWeight.Normal;
+			FontStyle = Xwt.Drawing.FontStyle.Normal;
+		}
+
+		public ChunkStyle (ChunkStyle baseStyle)
+		{
+			this.Name = baseStyle.Name;
+			this.Foreground = baseStyle.Foreground;
+			this.Background = baseStyle.Background;
+			this.FontWeight = baseStyle.FontWeight;
+			this.FontStyle = baseStyle.FontStyle;
+			this.Underline = baseStyle.Underline;
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (obj == null)
+				return false;
+			if (ReferenceEquals (this, obj))
+				return true;
+			if (obj.GetType () != typeof(ChunkStyle))
+				return false;
+			ChunkStyle other = (ChunkStyle)obj;
+			return Name == other.Name && Foreground.Equals (other.Foreground) && Background.Equals (other.Background) && FontWeight == other.FontWeight && FontStyle == other.FontStyle;
+		}
+
+		public override int GetHashCode ()
+		{
+			unchecked {
+				return (Name != null ? Name.GetHashCode () : 0) ^ Foreground.GetHashCode () ^ Background.GetHashCode () ^ FontWeight.GetHashCode () ^ FontStyle.GetHashCode ();
+			}
+		}
+
+		public static ChunkStyle Create (XElement element, Dictionary<string, HslColor> palette)
+		{
+			var result = new ChunkStyle ();
+
+			foreach (var node in element.DescendantNodes ()) {
+				if (node.NodeType == System.Xml.XmlNodeType.Element) {
+					var el = (XElement)node;
+					switch (el.Name.LocalName) {
+					case "name":
+						result.Name = el.Value;
+						break;
+					case "fore":
+						result.Foreground = ColorScheme.ParsePaletteColor (palette, el.Value);
+						break;
+					case "back":
+						result.Background = ColorScheme.ParsePaletteColor (palette, el.Value);
+						break;
+					case "weight":
+						Xwt.Drawing.FontWeight weight;
+						if (!Enum.TryParse<Xwt.Drawing.FontWeight> (el.Value, true, out weight)) 
+							throw new InvalidDataException (el.Value + " is no valid text weight values are: " + string.Join (",", Enum.GetNames (typeof(Xwt.Drawing.FontWeight))) );
+						result.FontWeight = weight;
+						break;
+					case "style":
+						Xwt.Drawing.FontStyle style;
+						if (!Enum.TryParse<Xwt.Drawing.FontStyle> (el.Value, true, out style)) 
+							throw new InvalidDataException (el.Value + " is no valid text weight values are: " + string.Join (",", Enum.GetNames (typeof(Xwt.Drawing.FontStyle))) );
+						result.FontStyle = style;
+						break;
+					default:
+						throw new InvalidDataException ("Invalid element in text color:" + el.Name);
+					}
+				}
+			}
+
+			return result;
+		}
+
+		public Gdk.GC CreateBgGC (Gdk.Drawable drawable)
+		{
+			return new Gdk.GC (drawable) { RgbBgColor = (HslColor)Foreground, RgbFgColor = (HslColor)Background };
+		}
+		
+		public Gdk.GC CreateFgGC (Gdk.Drawable drawable)
+		{
+			return new Gdk.GC (drawable) { RgbBgColor = (HslColor)Background, RgbFgColor = (HslColor)Foreground };
+		}
+
+		public override string ToString ()
+		{
+			return string.Format ("[ChunkStyle: Name={0}, CairoColor={1}, CairoBackgroundColor={2}, FontWeight={3}, FontStyle={4}]", Name, Foreground, Background, FontWeight, FontStyle);
+		}
+
+		public static ChunkStyle Import (string name, ColorScheme.VSSettingColor vsc)
+		{
+			var textColor = new ChunkStyle ();
+			textColor.Name = name;
+			if (!string.IsNullOrEmpty (vsc.Foreground) && vsc.Foreground != "0x02000000") {
+				textColor.Foreground = ColorScheme.ImportVsColor (vsc.Foreground);
+				if (textColor.TransparentForeground && name != "Selected Text" && name != "Selected Text(Inactive)")
+					textColor.Foreground = new HslColor (0, 0, 0);
+			}
+			if (!string.IsNullOrEmpty (vsc.Background) && vsc.Background != "0x02000000")
+				textColor.Background = ColorScheme.ImportVsColor (vsc.Background);
+			if (vsc.BoldFont)
+				textColor.FontWeight = Xwt.Drawing.FontWeight.Bold;
+			return textColor;
+		}
+
+		public ChunkStyle Clone ()
+		{
+			return (ChunkStyle)this.MemberwiseClone ();
+		}
+	}
+	
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/PreProcessorDefine.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColorDescriptionAttribute.cs
index 45f3b48a2d..d69e2013c9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/PreProcessorDefine.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColorDescriptionAttribute.cs
@@ -1,9 +1,10 @@
-// PreProcessorDefine.cs
+//
+// ColorDescriptionAttribute.cs
 //
 // Author:
-//   Mike Krüger <mkrueger@novell.com>
+//       Mike Krüger <mkrueger@xamarin.com>
 //
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -22,37 +23,25 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-//
+
 using System;
-using ICSharpCode.NRefactory;
 
-namespace MonoDevelop.Ide.TypeSystem
+namespace MonoDevelop.Ide.Editor.Highlighting
 {
-	public class PreProcessorDefine
+	public sealed class ColorDescriptionAttribute : Attribute
 	{
-		public string Define {
-			get;
-			set;
-		}
-		
-		public TextLocation Location {
-			get;
-			set;
-		}
-		
-		public PreProcessorDefine ()
-		{
-		}
-		
-		public PreProcessorDefine (string define, TextLocation location)
+		public string Name { get; private set; }
+		public string Description { get; set; }
+		public string VSSetting { get; set; }
+
+		public ColorDescriptionAttribute (string name)
 		{
-			this.Define = define;
-			this.Location = location;
+			Name = name;
 		}
-		
+
 		public override string ToString ()
 		{
-			return string.Format ("[PreProcessorDefine: Define={0}, Location={1}]", Define, Location);
+			return string.Format ("[ColorDescriptionAttribute: Name={0}, Description={1}, VSSetting={2}]", Name, Description, VSSetting);
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColorScheme.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColorScheme.cs
new file mode 100644
index 0000000000..6714d9abe9
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColorScheme.cs
@@ -0,0 +1,1030 @@
+//
+// ColorScheme.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+using System.Xml.XPath;
+using System.Reflection;
+using System.Text;
+using System.Xml;
+using MonoDevelop.Components;
+
+namespace MonoDevelop.Ide.Editor.Highlighting
+{
+	public sealed class ColorScheme
+	{
+		public string Name { get; set; }
+		public string Description { get; set; }
+		public string Originator { get; set; }
+		public string BaseScheme { get; set; }
+		public string FileName { get; set; }
+
+		#region Ambient Colors
+
+		[ColorDescription("Background(Read Only)",VSSetting="color=Plain Text/Background")]
+		public AmbientColor BackgroundReadOnly { get; private set; }
+
+		[ColorDescription("Search result background")]
+		public AmbientColor SearchResult { get; private set; }
+
+		[ColorDescription("Search result background (highlighted)")]
+		public AmbientColor SearchResultMain { get; private set; }
+
+		[ColorDescription("Fold Square", VSSetting="color=outlining.verticalrule/Foreground")]
+		public AmbientColor FoldLineColor { get; private set; }
+
+		[ColorDescription("Fold Cross", VSSetting="color=outlining.square/Foreground,secondcolor=outlining.square/Background")]
+		public AmbientColor FoldCross { get; private set; }
+
+		[ColorDescription("Indentation Guide")] // not defined
+		public AmbientColor IndentationGuide { get; private set; }
+
+		[ColorDescription("Indicator Margin", VSSetting="color=Indicator Margin/Background")]
+		public AmbientColor IndicatorMargin { get; private set; }
+
+		[ColorDescription("Indicator Margin(Separator)", VSSetting="color=Indicator Margin/Background")]
+		public AmbientColor IndicatorMarginSeparator { get; private set; }
+
+		[ColorDescription("Tooltip Border")]
+		public AmbientColor TooltipBorder { get; private set; }
+
+		[ColorDescription("Tooltip Pager Top")]
+		public AmbientColor TooltipPagerTop { get; private set; }
+
+		[ColorDescription("Tooltip Pager Bottom")]
+		public AmbientColor TooltipPagerBottom { get; private set; }
+
+		[ColorDescription("Tooltip Pager Triangle")]
+		public AmbientColor TooltipPagerTriangle { get; private set; }
+
+		[ColorDescription("Tooltip Pager Text")]
+		public AmbientColor TooltipPagerText { get; private set; }
+
+		[ColorDescription("Notification Border")]
+		public AmbientColor NotificationBorder { get; private set; }
+
+		[ColorDescription("Bookmarks")]
+		public AmbientColor Bookmarks { get; private set; }
+
+		[ColorDescription("Underline(Error)", VSSetting="color=Syntax Error/Foreground")]
+		public AmbientColor UnderlineError { get; private set; }
+
+		[ColorDescription("Underline(Warning)", VSSetting="color=Warning/Foreground")]
+		public AmbientColor UnderlineWarning { get; private set; }
+
+		[ColorDescription("Underline(Suggestion)", VSSetting="color=Other Error/Foreground")]
+		public AmbientColor UnderlineSuggestion { get; private set; }
+
+		[ColorDescription("Underline(Hint)", VSSetting="color=Other Error/Foreground")]
+		public AmbientColor UnderlineHint { get; private set; }
+
+		[ColorDescription("Quick Diff(Dirty)")]
+		public AmbientColor QuickDiffDirty { get; private set; }
+
+		[ColorDescription("Quick Diff(Changed)")]
+		public AmbientColor QuickDiffChanged { get; private set; }
+
+		[ColorDescription("Brace Matching(Rectangle)", VSSetting="color=Brace Matching (Rectangle)/Background,secondcolor=Brace Matching (Rectangle)/Foreground")]
+		public AmbientColor BraceMatchingRectangle { get; private set; }
+
+		[ColorDescription("Usages(Rectangle)", VSSetting="color=MarkerFormatDefinition/HighlightedReference/Background,secondcolor=MarkerFormatDefinition/HighlightedReference/Background,bordercolor=MarkerFormatDefinition/HighlightedReference/Background")]
+		public AmbientColor UsagesRectangle { get; private set; }
+
+		[ColorDescription("Changing usages(Rectangle)", VSSetting="color=MarkerFormatDefinition/HighlightedReference/Background,secondcolor=MarkerFormatDefinition/HighlightedReference/Background,bordercolor=MarkerFormatDefinition/HighlightedReference/Background")]
+		public AmbientColor ChangingUsagesRectangle { get; private set; }
+
+		[ColorDescription("Breakpoint Marker", VSSetting = "color=Breakpoint (Enabled)/Background")]
+		public AmbientColor BreakpointMarker { get; private set; }
+
+		[ColorDescription("Breakpoint Marker(Invalid)", VSSetting = "color=Breakpoint (Disabled)/Background")]
+		public AmbientColor BreakpointMarkerInvalid { get; private set; }
+
+		[ColorDescription("Breakpoint Marker(Disabled)")]
+		public AmbientColor BreakpointMarkerDisabled { get; private set; }
+
+		[ColorDescription("Debugger Current Line Marker", VSSetting = "color=Current Statement/Background")]
+		public AmbientColor DebuggerCurrentLineMarker { get; private set; }
+
+		[ColorDescription("Debugger Stack Line Marker")]
+		public AmbientColor DebuggerStackLineMarker { get; private set; }
+
+		[ColorDescription("Primary Link", VSSetting = "color=Refactoring Dependent Field/Background" )]
+		public AmbientColor PrimaryTemplate { get; private set; }
+
+		[ColorDescription("Primary Link(Highlighted)", VSSetting = "color=Refactoring Current Field/Background")]
+		public AmbientColor PrimaryTemplateHighlighted { get; private set; }
+
+		[ColorDescription("Secondary Link")] // not defined
+		public AmbientColor SecondaryTemplate { get; private set; }
+
+		[ColorDescription("Secondary Link(Highlighted)")] // not defined
+		public AmbientColor SecondaryTemplateHighlighted { get; private set; }
+
+		[ColorDescription("Current Line Marker", VSSetting = "color=CurrentLineActiveFormat/Background,secondcolor=CurrentLineActiveFormat/Foreground")]
+		public AmbientColor LineMarker { get; private set; }
+
+		[ColorDescription("Current Line Marker(Inactive)", VSSetting = "color=CurrentLineInactiveFormat/Background,secondcolor=CurrentLineInactiveFormat/Foreground")]
+		public AmbientColor LineMarkerInactive { get; private set; }
+
+		[ColorDescription("Column Ruler")] // not defined
+		public AmbientColor Ruler { get; private set; }
+
+		[ColorDescription("Completion Matching Substring")]
+		public AmbientColor CompletionHighlight { get; private set; }
+
+		[ColorDescription("Completion Border")]
+		public AmbientColor CompletionBorder { get; private set; }
+
+		[ColorDescription("Completion Border(Inactive)")]
+		public AmbientColor CompletionInactiveBorder { get; private set; }
+
+		[ColorDescription("Message Bubble Error Marker")]
+		public AmbientColor MessageBubbleErrorMarker { get; private set; }
+
+		[ColorDescription("Message Bubble Error Tag")]
+		public AmbientColor MessageBubbleErrorTag { get; private set; }
+
+		[ColorDescription("Message Bubble Error Tooltip")]
+		public AmbientColor MessageBubbleErrorTooltip { get; private set; }
+
+		[ColorDescription("Message Bubble Error Line")]
+		public AmbientColor MessageBubbleErrorLine { get; private set; }
+
+		[ColorDescription("Message Bubble Error Counter")]
+		public AmbientColor MessageBubbleErrorCounter { get; private set; }
+
+		[ColorDescription("Message Bubble Error IconMargin")]
+		public AmbientColor MessageBubbleErrorIconMargin { get; private set; }
+
+		[ColorDescription("Message Bubble Warning Marker")]
+		public AmbientColor MessageBubbleWarningMarker { get; private set; }
+
+		[ColorDescription("Message Bubble Warning Tag")]
+		public AmbientColor MessageBubbleWarningTag { get; private set; }
+
+		[ColorDescription("Message Bubble Warning Tooltip")]
+		public AmbientColor MessageBubbleWarningTooltip { get; private set; }
+
+		[ColorDescription("Message Bubble Warning Line")]
+		public AmbientColor MessageBubbleWarningLine { get; private set; }
+
+		[ColorDescription("Message Bubble Warning Counter")]
+		public AmbientColor MessageBubbleWarningCounter { get; private set; }
+
+		[ColorDescription("Message Bubble Warning IconMargin")]
+		public AmbientColor MessageBubbleWarningIconMargin { get; private set; }
+
+		#endregion
+
+		#region Text Colors
+
+		public const string PlainTextKey = "Plain Text";
+
+		[ColorDescription(PlainTextKey, VSSetting = "Plain Text")]
+		public ChunkStyle PlainText { get; private set; }
+
+		public const string SelectedTextKey = "Selected Text";
+		[ColorDescription(SelectedTextKey, VSSetting = "Selected Text")]
+		public ChunkStyle SelectedText { get; private set; }
+
+		public const string SelectedInactiveTextKey = "Selected Text(Inactive)";
+		[ColorDescription(SelectedInactiveTextKey, VSSetting = "Inactive Selected Text")]
+		public ChunkStyle SelectedInactiveText { get; private set; }
+
+		public const string CollapsedTextKey = "Collapsed Text";
+		[ColorDescription(CollapsedTextKey, VSSetting = "Collapsible Text")]
+		public ChunkStyle CollapsedText { get; private set; }
+
+		public const string LineNumbersKey = "Line Numbers";
+		[ColorDescription(LineNumbersKey, VSSetting = "Line Numbers")]
+		public ChunkStyle LineNumbers { get; private set; }
+
+		public const string PunctuationKey = "Punctuation";
+		[ColorDescription(PunctuationKey, VSSetting = "Operator")]
+		public ChunkStyle Punctuation { get; private set; }
+
+		public const string PunctuationForBracketsKey = "Punctuation(Brackets)";
+		[ColorDescription(PunctuationForBracketsKey, VSSetting = "Plain Text")]
+		public ChunkStyle PunctuationForBrackets { get; private set; }
+
+		public const string CommentsSingleLineKey = "Comment(Line)";
+		[ColorDescription(CommentsSingleLineKey, VSSetting = "Comment")]
+		public ChunkStyle CommentsSingleLine { get; private set; }
+
+		public const string CommentsBlockKey = "Comment(Block)";
+		[ColorDescription(CommentsBlockKey, VSSetting = "Comment")]
+		public ChunkStyle CommentsBlock { get; private set; }
+
+		public const string CommentsForDocumentationKey = "Comment(Doc)";
+		[ColorDescription(CommentsForDocumentationKey, VSSetting = "XML Doc Comment")]
+		public ChunkStyle CommentsForDocumentation { get; private set; }
+
+		public const string CommentsForDocumentationTagsKey = "Comment(DocTag)";
+		[ColorDescription(CommentsForDocumentationTagsKey, VSSetting = "XML Doc Tag")]
+		public ChunkStyle CommentsForDocumentationTags { get; private set; }
+
+		public const string CommentTagsKey = "Comment Tag";
+		[ColorDescription(CommentTagsKey, VSSetting = "Comment")]
+		public ChunkStyle CommentTags { get; private set; }
+
+		public const string ExcludedCodeKey = "Excluded Code";
+		[ColorDescription(ExcludedCodeKey, VSSetting = "Excluded Code")]
+		public ChunkStyle ExcludedCode { get; private set; }
+
+		public const string StringKey = "String";
+		[ColorDescription(StringKey, VSSetting = "String")]
+		public ChunkStyle String { get; private set; }
+
+		public const string StringEscapeSequenceKey = "String(Escape)";
+		[ColorDescription(StringEscapeSequenceKey, VSSetting = "String")]
+		public ChunkStyle StringEscapeSequence { get; private set; }
+
+		public const string StringVerbatimKey = "String(C# @ Verbatim)";
+		[ColorDescription(StringVerbatimKey, VSSetting = "String(C# @ Verbatim)")]
+		public ChunkStyle StringVerbatim { get; private set; }
+
+		public const string NumberKey = "Number";
+		[ColorDescription(NumberKey, VSSetting = "Number")]
+		public ChunkStyle Number { get; private set; }
+
+		public const string PreprocessorKey = "Preprocessor";
+		[ColorDescription(PreprocessorKey, VSSetting = "Preprocessor Keyword")]
+		public ChunkStyle Preprocessor { get; private set; }
+
+		public const string PreprocessorRegionNameKey = "Preprocessor(Region Name)";
+		[ColorDescription(PreprocessorRegionNameKey, VSSetting = "Plain Text")]
+		public ChunkStyle PreprocessorRegionName { get; private set; }
+
+		public const string XmlTextKey = "Xml Text";
+		[ColorDescription(XmlTextKey, VSSetting = "XML Text")]
+		public ChunkStyle XmlText { get; private set; }
+
+		public const string XmlDelimiterKey = "Xml Delimiter";
+		[ColorDescription(XmlDelimiterKey, VSSetting = "XML Delimiter")]
+		public ChunkStyle XmlDelimiter { get; private set; }
+
+		public const string XmlNameKey = "Xml Name";
+		[ColorDescription(XmlNameKey, VSSetting ="XML Name")]
+		public ChunkStyle XmlName { get; private set; }
+
+		public const string XmlAttributeKey = "Xml Attribute";
+		[ColorDescription(XmlAttributeKey, VSSetting = "XML Attribute")]
+		public ChunkStyle XmlAttribute { get; private set; }
+
+		public const string XmlAttributeQuotesKey = "Xml Attribute Quotes";
+		[ColorDescription(XmlAttributeQuotesKey, VSSetting = "XML Attribute Quotes")]
+		public ChunkStyle XmlAttributeQuotes { get; private set; }
+
+		public const string XmlAttributeValueKey = "Xml Attribute Value";
+		[ColorDescription(XmlAttributeValueKey, VSSetting = "XML Attribute Value")]
+		public ChunkStyle XmlAttributeValue { get; private set; }
+
+		public const string XmlCommentKey = "Xml Comment";
+		[ColorDescription(XmlCommentKey, VSSetting = "XML Comment")]
+		public ChunkStyle XmlComment { get; private set; }
+
+		public const string XmlCDataSectionKey = "Xml CData Section";
+		[ColorDescription(XmlCDataSectionKey, VSSetting = "XML CData Section")]
+		public ChunkStyle XmlCDataSection { get; private set; }
+
+		public const string TooltipTextKey = "Tooltip Text";
+		[ColorDescription(TooltipTextKey)] // not defined in vs.net
+		public ChunkStyle TooltipText { get; private set; }
+
+		public const string NotificationTextKey = "Notification Text";
+		[ColorDescription(NotificationTextKey)] // not defined in vs.net
+		public ChunkStyle NotificationText { get; private set; }
+
+		public const string CompletionTextKey = "Completion Text";
+		[ColorDescription(CompletionTextKey)] //not defined in vs.net
+		public ChunkStyle CompletionText { get; private set; }
+
+		public const string CompletionSelectedTextKey = "Completion Selected Text";
+		[ColorDescription(CompletionSelectedTextKey)] //not defined in vs.net
+		public ChunkStyle CompletionSelectedText { get; private set; }
+
+		public const string CompletionSelectedInactiveTextKey = "Completion Selected Text(Inactive)";
+		[ColorDescription(CompletionSelectedInactiveTextKey)] //not defined in vs.net
+		public ChunkStyle CompletionSelectedInactiveText { get; private set; }
+
+		public const string KeywordAccessorsKey = "Keyword(Access)";
+		[ColorDescription(KeywordAccessorsKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordAccessors { get; private set; }
+
+		public const string KeywordTypesKey = "Keyword(Type)";
+		[ColorDescription(KeywordTypesKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordTypes { get; private set; }
+
+		public const string KeywordOperatorsKey = "Keyword(Operator)";
+		[ColorDescription(KeywordOperatorsKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordOperators { get; private set; }
+
+		public const string KeywordSelectionKey = "Keyword(Selection)";
+		[ColorDescription(KeywordSelectionKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordSelection { get; private set; }
+
+		public const string KeywordIterationKey = "Keyword(Iteration)";
+		[ColorDescription(KeywordIterationKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordIteration { get; private set; }
+
+		public const string KeywordJumpKey = "Keyword(Jump)";
+		[ColorDescription(KeywordJumpKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordJump { get; private set; }
+
+		public const string KeywordContextKey = "Keyword(Context)";
+		[ColorDescription(KeywordContextKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordContext { get; private set; }
+
+		public const string KeywordExceptionKey = "Keyword(Exception)";
+		[ColorDescription(KeywordExceptionKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordException { get; private set; }
+
+		public const string KeywordModifiersKey = "Keyword(Modifiers)";
+		[ColorDescription(KeywordModifiersKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordModifiers { get; private set; }
+
+		public const string KeywordConstantsKey = "Keyword(Constants)";
+		[ColorDescription(KeywordConstantsKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordConstants { get; private set; }
+
+		public const string KeywordVoidKey = "Keyword(Void)";
+		[ColorDescription(KeywordVoidKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordVoid { get; private set; }
+
+		public const string KeywordNamespaceKey = "Keyword(Namespace)";
+		[ColorDescription(KeywordNamespaceKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordNamespace { get; private set; }
+
+		public const string KeywordPropertyKey = "Keyword(Property)";
+		[ColorDescription(KeywordPropertyKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordProperty { get; private set; }
+
+		public const string KeywordDeclarationKey = "Keyword(Declaration)";
+		[ColorDescription(KeywordDeclarationKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordDeclaration { get; private set; }
+
+		public const string KeywordParameterKey = "Keyword(Parameter)";
+		[ColorDescription(KeywordParameterKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordParameter { get; private set; }
+
+		public const string KeywordOperatorDeclarationKey = "Keyword(Operator Declaration)";
+		[ColorDescription(KeywordOperatorDeclarationKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordOperatorDeclaration { get; private set; }
+
+		public const string KeywordOtherKey = "Keyword(Other)";
+		[ColorDescription(KeywordOtherKey, VSSetting = "Keyword")]
+		public ChunkStyle KeywordOther { get; private set; }
+
+		public const string UserTypesKey = "User Types";
+		[ColorDescription(UserTypesKey, VSSetting = "User Types")]
+		public ChunkStyle UserTypes { get; private set; }
+
+		public const string UserTypesEnumsKey = "User Types(Enums)";
+		[ColorDescription(UserTypesEnumsKey, VSSetting = "User Types(Enums)")]
+		public ChunkStyle UserTypesEnums { get; private set; }
+
+		public const string UserTypesInterfacesKey = "User Types(Interfaces)";
+		[ColorDescription(UserTypesInterfacesKey, VSSetting = "User Types(Interfaces)")]
+		public ChunkStyle UserTypesInterfaces { get; private set; }
+
+		public const string UserTypesDelegatesKey = "User Types(Delegates)";
+		[ColorDescription(UserTypesDelegatesKey, VSSetting = "User Types(Delegates)")]
+		public ChunkStyle UserTypesDelegates { get; private set; }
+
+		public const string UserTypesValueTypesKey = "User Types(Value types)";
+		[ColorDescription(UserTypesValueTypesKey, VSSetting = "User Types(Value types)")]
+		public ChunkStyle UserTypesValueTypes { get; private set; }
+
+		public const string UserTypesTypeParametersKey = "User Types(Type parameters)";
+		[ColorDescription(UserTypesTypeParametersKey, VSSetting = "User Types(Type parameters)")]
+		public ChunkStyle UserTypesTypeParameters { get; private set; }
+
+		public const string UserFieldUsageKey = "User Field Usage";
+		[ColorDescription(UserFieldUsageKey, VSSetting = "Identifier")]
+		public ChunkStyle UserFieldUsage { get; private set; }
+
+		public const string UserFieldDeclarationKey = "User Field Declaration";
+		[ColorDescription(UserFieldDeclarationKey, VSSetting = "Identifier")]
+		public ChunkStyle UserFieldDeclaration { get; private set; }
+
+		public const string UserPropertyUsageKey = "User Property Usage";
+		[ColorDescription(UserPropertyUsageKey, VSSetting = "Identifier")]
+		public ChunkStyle UserPropertyUsage { get; private set; }
+
+		public const string UserPropertyDeclarationKey = "User Property Declaration";
+		[ColorDescription(UserPropertyDeclarationKey, VSSetting = "Identifier")]
+		public ChunkStyle UserPropertyDeclaration { get; private set; }
+
+		public const string UserEventUsageKey = "User Event Usage";
+		[ColorDescription(UserEventUsageKey, VSSetting = "Identifier")]
+		public ChunkStyle UserEventUsage { get; private set; }
+
+		public const string UserEventDeclarationKey = "User Event Declaration";
+		[ColorDescription(UserEventDeclarationKey, VSSetting = "Identifier")]
+		public ChunkStyle UserEventDeclaration { get; private set; }
+
+		public const string UserMethodUsageKey = "User Method Usage";
+		[ColorDescription(UserMethodUsageKey, VSSetting = "Identifier")]
+		public ChunkStyle UserMethodUsage { get; private set; }
+
+		public const string UserMethodDeclarationKey = "User Method Declaration";
+		[ColorDescription(UserMethodDeclarationKey, VSSetting = "Identifier")]
+		public ChunkStyle UserMethodDeclaration { get; private set; }
+
+		public const string UserParameterUsageKey = "User Parameter Usage";
+		[ColorDescription(UserParameterUsageKey, VSSetting = "Identifier")]
+		public ChunkStyle UserParameterUsage { get; private set; }
+
+		public const string UserParameterDeclarationKey = "User Parameter Declaration";
+		[ColorDescription(UserParameterDeclarationKey, VSSetting = "Identifier")]
+		public ChunkStyle UserParameterDeclaration { get; private set; }
+
+		public const string UserVariableUsageKey = "User Variable Usage";
+		[ColorDescription(UserVariableUsageKey, VSSetting = "Identifier")]
+		public ChunkStyle UserVariableUsage { get; private set; }
+
+		public const string UserVariableDeclarationKey = "User Variable Declaration";
+		[ColorDescription(UserVariableDeclarationKey, VSSetting = "Identifier")]
+		public ChunkStyle UserVariableDeclaration { get; private set; }
+
+		public const string SyntaxErrorKey = "Syntax Error";
+		[ColorDescription(SyntaxErrorKey, VSSetting = "Syntax Error")]
+		public ChunkStyle SyntaxError { get; private set; }
+
+		public const string StringFormatItemsKey = "String Format Items";
+		[ColorDescription(StringFormatItemsKey, VSSetting = "String")]
+		public ChunkStyle StringFormatItems { get; private set; }
+
+		public const string BreakpointTextKey = "Breakpoint Text";
+		[ColorDescription(BreakpointTextKey, VSSetting = "Breakpoint (Enabled)")]
+		public ChunkStyle BreakpointText { get; private set; }
+
+		public const string DebuggerCurrentLineKey = "Debugger Current Statement";
+		[ColorDescription(DebuggerCurrentLineKey, VSSetting = "Current Statement")]
+		public ChunkStyle DebuggerCurrentLine { get; private set; }
+
+		public const string DebuggerStackLineKey = "Debugger Stack Line";
+		[ColorDescription(DebuggerStackLineKey)] // not defined
+		public ChunkStyle DebuggerStackLine { get; private set; }
+
+		public const string DiffLineAddedKey = "Diff Line(Added)";
+		[ColorDescription(DiffLineAddedKey)] //not defined
+		public ChunkStyle DiffLineAdded { get; private set; }
+
+		public const string DiffLineRemovedKey = "Diff Line(Removed)";
+		[ColorDescription(DiffLineRemovedKey)] //not defined
+		public ChunkStyle DiffLineRemoved { get; private set; }
+
+		public const string DiffLineChangedKey = "Diff Line(Changed)";
+		[ColorDescription(DiffLineChangedKey)] //not defined
+		public ChunkStyle DiffLineChanged { get; private set; }
+
+		public const string DiffHeaderKey = "Diff Header";
+		[ColorDescription(DiffHeaderKey)] //not defined
+		public ChunkStyle DiffHeader { get; private set; }
+
+		public const string DiffHeaderSeparatorKey = "Diff Header(Separator)";
+		[ColorDescription(DiffHeaderSeparatorKey)] //not defined
+		public ChunkStyle DiffHeaderSeparator { get; private set; }
+
+		public const string DiffHeaderOldKey = "Diff Header(Old)";
+		[ColorDescription(DiffHeaderOldKey)] //not defined
+		public ChunkStyle DiffHeaderOld { get; private set; }
+
+		public const string DiffHeaderNewKey = "Diff Header(New)";
+		[ColorDescription(DiffHeaderNewKey)] //not defined
+		public ChunkStyle DiffHeaderNew { get; private set; }
+
+		public const string DiffLocationKey = "Diff Location";
+		[ColorDescription(DiffLocationKey)] //not defined
+		public ChunkStyle DiffLocation { get; private set; }
+
+		public const string HtmlAttributeNameKey = "Html Attribute Name";
+		[ColorDescription(HtmlAttributeNameKey, VSSetting="HTML Attribute")]
+		public ChunkStyle HtmlAttributeName { get; private set; }
+
+		public const string HtmlAttributeValueKey = "Html Attribute Value";
+		[ColorDescription(HtmlAttributeValueKey, VSSetting="HTML Attribute Value")]
+		public ChunkStyle HtmlAttributeValue { get; private set; }
+
+		public const string HtmlCommentKey = "Html Comment";
+		[ColorDescription(HtmlCommentKey, VSSetting="HTML Comment")]
+		public ChunkStyle HtmlComment { get; private set; }
+
+		public const string HtmlElementNameKey = "Html Element Name";
+		[ColorDescription(HtmlElementNameKey, VSSetting="HTML Element Name")]
+		public ChunkStyle HtmlElementName { get; private set; }
+
+		public const string HtmlEntityKey = "Html Entity";
+		[ColorDescription(HtmlEntityKey, VSSetting="HTML Entity")]
+		public ChunkStyle HtmlEntity { get; private set; }
+
+		public const string HtmlOperatorKey = "Html Operator";
+		[ColorDescription(HtmlOperatorKey, VSSetting="HTML Operator")]
+		public ChunkStyle HtmlOperator { get; private set; }
+
+		public const string HtmlServerSideScriptKey = "Html Server-Side Script";
+		[ColorDescription(HtmlServerSideScriptKey, VSSetting="HTML Server-Side Script")]
+		public ChunkStyle HtmlServerSideScript { get; private set; }
+
+		public const string HtmlTagDelimiterKey = "Html Tag Delimiter";
+		[ColorDescription(HtmlTagDelimiterKey, VSSetting="HTML Tag Delimiter")]
+		public ChunkStyle HtmlTagDelimiter { get; private set; }
+
+		public const string RazorCodeKey = "Razor Code";
+		[ColorDescription(RazorCodeKey, VSSetting="Razor Code")]
+		public ChunkStyle RazorCode { get; private set; }
+
+		public const string CssCommentKey = "Css Comment";
+		[ColorDescription(CssCommentKey, VSSetting="CSS Comment")]
+		public ChunkStyle CssComment { get; private set; }
+
+		public const string CssPropertyNameKey = "Css Property Name";
+		[ColorDescription(CssPropertyNameKey, VSSetting="CSS Property Name")]
+		public ChunkStyle CssPropertyName { get; private set; }
+
+		public const string CssPropertyValueKey = "Css Property Value";
+		[ColorDescription(CssPropertyValueKey, VSSetting="CSS Property Value")]
+		public ChunkStyle CssPropertyValue { get; private set; }
+
+		public const string CssSelectorKey = "Css Selector";
+		[ColorDescription(CssSelectorKey, VSSetting="CSS Selector")]
+		public ChunkStyle CssSelector { get; private set; }
+
+		public const string CssStringValueKey = "Css String Value";
+		[ColorDescription(CssStringValueKey, VSSetting="CSS String Value")]
+		public ChunkStyle CssStringValue { get; private set; }
+
+		public const string CssKeywordKey = "Css Keyword";
+		[ColorDescription(CssKeywordKey, VSSetting="CSS Keyword")]
+		public ChunkStyle CssKeyword { get; private set; }
+
+		public const string ScriptCommentKey = "Script Comment";
+		[ColorDescription(ScriptCommentKey, VSSetting="Script Comment")]
+		public ChunkStyle ScriptComment { get; private set; }
+
+		public const string ScriptIdentifierKey = "Script Identifier";
+		[ColorDescription(ScriptIdentifierKey, VSSetting="Script Identifier")]
+		public ChunkStyle ScriptIdentifier { get; private set; }
+
+		public const string ScriptKeywordKey = "Script Keyword";
+		[ColorDescription(ScriptKeywordKey, VSSetting="Script Keyword")]
+		public ChunkStyle ScriptKeyword { get; private set; }
+
+		public const string ScriptNumberKey = "Script Number";
+		[ColorDescription(ScriptNumberKey, VSSetting="Script Number")]
+		public ChunkStyle ScriptNumber { get; private set; }
+
+		public const string ScriptOperatorKey = "Script Operator";
+		[ColorDescription(ScriptOperatorKey, VSSetting="Script Operator")]
+		public ChunkStyle ScriptOperator { get; private set; }
+
+		public const string ScriptStringKey = "Script String";
+		[ColorDescription(ScriptStringKey, VSSetting="Script String")]
+		public ChunkStyle ScriptString { get; private set; }
+
+		#endregion
+
+		public class PropertyDecsription
+		{
+			public readonly PropertyInfo Info;
+			public readonly ColorDescriptionAttribute Attribute;
+
+			public PropertyDecsription (PropertyInfo info, ColorDescriptionAttribute attribute)
+			{
+				this.Info = info;
+				this.Attribute = attribute;
+			}
+		}
+
+		static Dictionary<string, PropertyDecsription> textColors = new Dictionary<string, PropertyDecsription> ();
+
+		public static IEnumerable<PropertyDecsription> TextColors {
+			get {
+				return textColors.Values;
+			}
+		}
+
+		static Dictionary<string, PropertyDecsription> ambientColors = new Dictionary<string, PropertyDecsription> ();
+
+		public static IEnumerable<PropertyDecsription> AmbientColors {
+			get {
+				return ambientColors.Values;
+			}
+		}
+
+		static ColorScheme ()
+		{
+			foreach (var property in typeof(ColorScheme).GetProperties ()) {
+				var description = property.GetCustomAttributes (false).FirstOrDefault (p => p is ColorDescriptionAttribute) as ColorDescriptionAttribute;
+				if (description == null)
+					continue;
+				if (property.PropertyType == typeof (ChunkStyle)) {
+					textColors.Add (description.Name, new PropertyDecsription (property, description));
+				} else {
+					ambientColors.Add (description.Name, new PropertyDecsription (property, description));
+				}
+			}
+		}
+
+		public ColorScheme Clone ()
+		{
+			var result = new ColorScheme () {
+				Name = this.Name,
+				BaseScheme = this.BaseScheme,
+				Originator = this.Originator,
+				Description = this.Description
+			};
+			result.CopyValues (this);
+			return result;
+		}
+
+		static HslColor ParseColor (string value)
+		{
+			if (value.Length == 9 && value.StartsWith ("#", StringComparison.Ordinal)) {
+				double r = ((double) int.Parse (value.Substring (1,2), System.Globalization.NumberStyles.HexNumber)) / 255;
+				double g = ((double) int.Parse (value.Substring (3,2), System.Globalization.NumberStyles.HexNumber)) / 255;
+				double b = ((double) int.Parse (value.Substring (5,2), System.Globalization.NumberStyles.HexNumber)) / 255;
+				double a = ((double) int.Parse (value.Substring (7,2), System.Globalization.NumberStyles.HexNumber)) / 255;
+				return new HslColor (r, g, b, a);
+			}
+			return HslColor.Parse (value);
+		}
+
+		public static HslColor ParsePaletteColor (Dictionary<string, HslColor> palette, string value)
+		{
+			HslColor result;
+			if (palette.TryGetValue (value, out result))
+				return result;
+			return ParseColor (value);
+		}
+
+		public ChunkStyle GetChunkStyle (string color)
+		{
+			if (color == null)
+				return GetChunkStyle ("Plain Text");
+			PropertyDecsription val;
+			if (!textColors.TryGetValue (color, out val)) {
+				Console.WriteLine ("Chunk style : " + color + " is undefined.");
+				return GetChunkStyle ("Plain Text");
+			}
+			return val.Info.GetValue (this, null) as ChunkStyle;
+		}
+
+		void CopyValues (ColorScheme baseScheme)
+		{
+			foreach (var color in textColors.Values)
+				color.Info.SetValue (this, color.Info.GetValue (baseScheme, null), null);
+			foreach (var color in ambientColors.Values)
+				color.Info.SetValue (this, color.Info.GetValue (baseScheme, null), null);
+		}
+
+		public static ColorScheme LoadFrom (Stream stream)
+		{
+			var result = new ColorScheme ();
+			var reader = System.Runtime.Serialization.Json.JsonReaderWriterFactory.CreateJsonReader (stream, new System.Xml.XmlDictionaryReaderQuotas ());
+
+			var root = XElement.Load(reader);
+
+			// The fields we'd like to extract
+			result.Name = root.XPathSelectElement("name").Value;
+
+			if (result.Name != "Default")
+				result.CopyValues (SyntaxModeService.DefaultColorStyle);
+
+			var version = Version.Parse (root.XPathSelectElement("version").Value);
+			if (version.Major != 1)
+				return null;
+			var el = root.XPathSelectElement ("description");
+			if (el != null)
+				result.Description = el.Value;
+			el = root.XPathSelectElement ("originator");
+			if (el != null)
+				result.Originator = el.Value;
+			el = root.XPathSelectElement ("baseScheme");
+			if (el != null)
+				result.BaseScheme = el.Value;
+
+			if (result.BaseScheme != null) {
+				var baseScheme = SyntaxModeService.GetColorStyle (result.BaseScheme);
+				if (baseScheme != null)
+					result.CopyValues (baseScheme);
+			}
+
+			var palette = new Dictionary<string, HslColor> ();
+			foreach (var color in root.XPathSelectElements("palette/*")) {
+				var name = color.XPathSelectElement ("name").Value;
+				if (palette.ContainsKey (name))
+					throw new InvalidDataException ("Duplicate palette color definition for: " + name);
+				palette.Add (
+					name,
+					ParseColor (color.XPathSelectElement ("value").Value)
+				);
+			}
+
+			foreach (var colorElement in root.XPathSelectElements("//colors/*")) {
+				var color = AmbientColor.Create (colorElement, palette);
+				PropertyDecsription info;
+				if (!ambientColors.TryGetValue (color.Name, out info)) {
+					Console.WriteLine ("Ambient color:" + color.Name + " not found.");
+					continue;
+				}
+				info.Info.SetValue (result, color, null);
+			}
+
+			foreach (var textColorElement in root.XPathSelectElements("//text/*")) {
+				var color = ChunkStyle.Create (textColorElement, palette);
+				PropertyDecsription info;
+				if (!textColors.TryGetValue (color.Name, out info)) {
+					Console.WriteLine ("Text color:" + color.Name + " not found.");
+					continue;
+				}
+				info.Info.SetValue (result, color, null);
+			}
+
+			// Check scheme
+			bool valid = true;
+			foreach (var color in textColors.Values) {
+				if (color.Info.GetValue (result, null) == null) {
+					Console.WriteLine (color.Attribute.Name + " == null");
+					valid = false;
+				}
+			}
+			foreach (var color in ambientColors.Values) {
+				if (color.Info.GetValue (result, null) == null) {
+					Console.WriteLine (color.Attribute.Name + " == null");
+					valid = false;
+				}
+			}
+			if (!valid)
+				throw new InvalidDataException ("Scheme " + result.Name + " is not valid.");
+			return result;
+		}
+
+		public static string ColorToMarkup (HslColor color)
+		{
+			return color.ToMarkup ();
+		}
+
+
+		public void Save (string fileName)
+		{
+			using (var writer = new StreamWriter (fileName)) {
+				writer.WriteLine ("{");
+				writer.WriteLine ("\t\"name\":\"{0}\",", Name);
+				writer.WriteLine ("\t\"version\":\"1.0\",");
+				if (!string.IsNullOrEmpty (Description))
+					writer.WriteLine ("\t\"description\":\"{0}\",", Description);
+				if (!string.IsNullOrEmpty (Originator))
+					writer.WriteLine ("\t\"originator\":\"{0}\",", Originator);
+				if (!string.IsNullOrEmpty (BaseScheme))
+					writer.WriteLine ("\t\"baseScheme\":\"{0}\",", BaseScheme);
+
+				var baseStyle = SyntaxModeService.GetColorStyle (BaseScheme ?? "Default");
+
+				writer.WriteLine ("\t\"colors\":[");
+				bool first = true;
+				foreach (var ambient in ambientColors) {
+					var thisValue = ambient.Value.Info.GetValue (this, null) as AmbientColor;
+					if (thisValue == null)
+						continue;
+					var baseValue = ambient.Value.Info.GetValue (baseStyle, null) as AmbientColor;
+					if (thisValue.Equals (baseValue)) {
+						continue;
+					}
+
+					var colorString = new StringBuilder ();
+					foreach (var color in thisValue.Colors) {
+						if (colorString.Length > 0)
+							colorString.Append (", ");
+						colorString.Append (string.Format ("\"{0}\":\"{1}\"", color.Item1, ColorToMarkup (color.Item2)));
+					}
+					if (colorString.Length == 0) {
+						Console.WriteLine ("Invalid ambient color :" + thisValue);
+						continue;
+					}
+					if (!first) {
+						writer.WriteLine (",");
+					} else {
+						first = false;
+					}
+					writer.Write ("\t\t{");
+					writer.Write ("\"name\": \"{0}\", {1}", ambient.Value.Attribute.Name, colorString);
+					writer.Write (" }");
+				}
+
+				writer.WriteLine ("\t],");
+				first = true;
+				writer.WriteLine ("\t\"text\":[");
+				foreach (var textColor in textColors) {
+					var thisValue = textColor.Value.Info.GetValue (this, null) as ChunkStyle;
+					if (thisValue == null)
+						continue;
+					var baseValue = textColor.Value.Info.GetValue (baseStyle, null) as ChunkStyle;
+					if (thisValue.Equals (baseValue)) {
+						continue;
+					}
+					var colorString = new StringBuilder ();
+					if (!thisValue.TransparentForeground)
+						colorString.Append (string.Format ("\"fore\":\"{0}\"", ColorToMarkup (thisValue.Foreground)));
+					if (!thisValue.TransparentBackground) {
+						if (colorString.Length > 0)
+							colorString.Append (", ");
+						colorString.Append (string.Format ("\"back\":\"{0}\"", ColorToMarkup (thisValue.Background)));
+					}
+					if (thisValue.FontWeight != Xwt.Drawing.FontWeight.Normal) {
+						if (colorString.Length > 0)
+							colorString.Append (", ");
+						colorString.Append (string.Format ("\"weight\":\"{0}\"", thisValue.FontWeight));
+					}
+					if (thisValue.FontStyle != Xwt.Drawing.FontStyle.Normal) {
+						if (colorString.Length > 0)
+							colorString.Append (", ");
+						colorString.Append (string.Format ("\"style\":\"{0}\"", thisValue.FontStyle));
+					}
+					if (!first) {
+						writer.WriteLine (",");
+					} else {
+						first = false;
+					}
+					writer.Write ("\t\t{");
+					if (colorString.Length == 0) {
+						writer.Write ("\"name\": \"{0}\"", textColor.Value.Attribute.Name);
+					} else {
+						writer.Write ("\"name\": \"{0}\", {1}", textColor.Value.Attribute.Name, colorString);
+					}
+					writer.Write (" }");
+				}
+				writer.WriteLine ();
+				writer.WriteLine ("\t]");
+
+				writer.WriteLine ("}");
+			}
+		}
+
+		internal static HslColor ImportVsColor (string colorString)
+		{
+			if (colorString == "0x02000000")
+				return new HslColor (0, 0, 0, 0);
+			string color = "#" + colorString.Substring (8, 2) + colorString.Substring (6, 2) + colorString.Substring (4, 2);
+			return HslColor.Parse (color);
+		}
+
+		public class VSSettingColor
+		{
+			public string Name { get; private set; }
+			public string Foreground { get; private set; }
+			public string Background { get; private set; }
+			public bool BoldFont { get; private set; }
+
+			public static VSSettingColor Create (XmlReader reader)
+			{
+				return new VSSettingColor {
+					Name = reader.GetAttribute ("Name"),
+					Foreground = reader.GetAttribute ("Foreground"),
+					Background = reader.GetAttribute ("Background"),
+					BoldFont = reader.GetAttribute ("BoldFont") == "Yes"
+				};
+			}
+		}
+
+		public static HslColor AlphaBlend (HslColor fore, HslColor back, double alpha)
+		{
+			var fc = (Cairo.Color)fore;
+			var bc = (Cairo.Color)back;
+			return new HslColor (
+				(1.0 - alpha) * bc.R + alpha * fc.R,
+				(1.0 - alpha) * bc.G + alpha * fc.G,
+				(1.0 - alpha) * bc.B + alpha * fc.B);
+		}
+
+		public static ColorScheme Import (string fileName, Stream stream)
+		{
+			var result = new ColorScheme ();
+			result.Name = Path.GetFileNameWithoutExtension (fileName);
+			result.Description = "Imported color scheme";
+			result.Originator = "Imported from " + fileName;
+
+			var colors = new Dictionary<string, VSSettingColor> ();
+			using (var reader = XmlReader.Create (stream)) {
+				while (reader.Read ()) {
+					if (reader.LocalName == "Item") {
+						var color = VSSettingColor.Create (reader);
+						if (colors.ContainsKey (color.Name)) {
+							Console.WriteLine ("Warning: {0} is defined twice in vssettings.", color.Name);
+							continue;
+						}
+						colors[color.Name] = color;
+					}
+				}
+			}
+
+
+			HashSet<string> importedAmbientColors = new HashSet<string> ();
+			// convert ambient colors
+			foreach (var ambient in ambientColors.Values) {
+				if (!string.IsNullOrEmpty (ambient.Attribute.VSSetting)) {
+					var import = AmbientColor.Import (colors, ambient.Attribute.VSSetting);
+					if (import != null) {
+						importedAmbientColors.Add (import.Name);
+						ambient.Info.SetValue (result, import, null);
+						continue;
+					}
+				}
+			}
+
+			// convert text colors
+			foreach (var vsc in colors.Values) {
+				bool found = false;
+				foreach (var color in textColors) {
+					if (color.Value.Attribute.VSSetting == null)
+						continue;
+					var split = color.Value.Attribute.VSSetting.Split ('?');
+					foreach (var s in split) {
+						if (s == vsc.Name) {
+							/*	if (vsc.Foreground == "0x02000000" && vsc.Background == "0x02000000") {
+								color.Value.Info.SetValue (result, result.PlainText, null);
+								found = true;
+								continue;
+							}*/
+							var textColor = ChunkStyle.Import (color.Value.Attribute.Name, vsc);
+							if (textColor != null) {
+								color.Value.Info.SetValue (result, textColor, null);
+								found = true;
+							}
+						}
+					}
+				}
+				if (!found && !importedAmbientColors.Contains (vsc.Name))
+					Console.WriteLine (vsc.Name + " not imported!");
+			}
+
+			result.IndentationGuide = new AmbientColor ();
+			result.IndentationGuide.Colors.Add (Tuple.Create ("color", AlphaBlend (result.PlainText.Foreground, result.PlainText.Background, 0.3)));
+
+			result.TooltipText = result.PlainText.Clone ();
+			var h = (HslColor)result.TooltipText.Background;
+			h.L += 0.01;
+			result.TooltipText.Background = h;
+
+			result.TooltipPagerTop = new AmbientColor ();
+			result.TooltipPagerTop.Colors.Add (Tuple.Create ("color", result.TooltipText.Background));
+
+			result.TooltipPagerBottom = new AmbientColor ();
+			result.TooltipPagerBottom.Colors.Add (Tuple.Create ("color", result.TooltipText.Background));
+
+			result.TooltipPagerTriangle = new AmbientColor ();
+			result.TooltipPagerTriangle.Colors.Add (Tuple.Create ("color", AlphaBlend (result.PlainText.Foreground, result.PlainText.Background, 0.8)));
+
+			result.TooltipBorder = new AmbientColor ();
+			result.TooltipBorder.Colors.Add (Tuple.Create ("color", AlphaBlend (result.PlainText.Foreground, result.PlainText.Background, 0.5)));
+
+			var defaultStyle = SyntaxModeService.GetColorStyle (HslColor.Brightness (result.PlainText.Background) < 0.5 ? "Monokai" : "Default");
+
+			foreach (var color in textColors.Values) {
+				if (color.Info.GetValue (result, null) == null)
+					color.Info.SetValue (result, color.Info.GetValue (defaultStyle, null), null);
+			}
+			foreach (var color in ambientColors.Values) {
+				if (color.Info.GetValue (result, null) == null) 
+					color.Info.SetValue (result, color.Info.GetValue (defaultStyle, null), null);
+			}
+			if (result.PlainText.TransparentForeground)
+				result.PlainText.Foreground = new HslColor (0, 0, 0);
+			return result;
+		}
+
+		public HslColor GetForeground (ChunkStyle chunkStyle)
+		{
+			if (chunkStyle.TransparentForeground)
+				return PlainText.Foreground;
+			return chunkStyle.Foreground;
+		}
+
+	}
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColoredSegment.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColoredSegment.cs
new file mode 100644
index 0000000000..9f67c54602
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColoredSegment.cs
@@ -0,0 +1,59 @@
+//
+// ColoredSegment.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Core.Text;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.Editor.Highlighting
+{
+	/// <summary>
+	/// A colored segment is used in the highlighter to specify a color scheme style to a specfic part of text.
+	/// </summary>
+	public sealed class ColoredSegment : AbstractSegment
+	{
+		readonly string colorStyleKey;
+
+		//// <summary>
+		/// Gets the color style. The style is looked up in the current color scheme.
+		/// </summary>
+		public string ColorStyleKey {
+			get {
+				return colorStyleKey;
+			}
+		}
+
+		public ColoredSegment (int offset, int length, string colorStyleKey) : base (offset, length)
+		{
+			this.colorStyleKey = colorStyleKey;
+		}
+
+		public ColoredSegment (ISegment segment, string colorStyleKey) : base (segment)
+		{
+			this.colorStyleKey = colorStyleKey;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ConditionalRegion.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/IStreamProvider.cs
index f0d1bb4c98..97126a1219 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ConditionalRegion.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/IStreamProvider.cs
@@ -1,4 +1,4 @@
-// ConditionalRegion.cs
+// IXmlProvider.cs
 //
 // Author:
 //   Mike Krüger <mkrueger@novell.com>
@@ -23,66 +23,75 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 //
+
 using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using System.IO;
+using System.Reflection;
+using System.Xml;
 
-namespace MonoDevelop.Ide.TypeSystem
+namespace MonoDevelop.Ide.Editor.Highlighting
 {
-	[Serializable]
-	public class ConditionBlock
+	public interface IStreamProvider
 	{
-		public string Flag {
-			get;
-			set;
-		}
-		
-		public DomRegion Region {
-			get;
-			set;
+		Stream Open ();
+	}
+
+	[Obsolete("Do not use this anymore. Use ResourceStreamProvider.")]
+	public class ResourceXmlProvider : ResourceStreamProvider
+	{
+		public ResourceXmlProvider (Assembly assembly, string manifestResourceName) : base(assembly, manifestResourceName)
+		{
+
 		}
+	}
+	public class ResourceStreamProvider : IStreamProvider
+	{
+		Assembly assembly;
+		string   manifestResourceName;
 		
-		public TextLocation Start {
-			get;
-			set;
+		public string ManifestResourceName {
+			get {
+				return manifestResourceName;
+			}
 		}
 		
-		public TextLocation End {
-			get;
-			set;
+		public Assembly Assembly {
+			get {
+				return assembly;
+			}
 		}
 		
-		public ConditionBlock (string flag) : this (flag, TextLocation.Empty)
+		public ResourceStreamProvider (Assembly assembly, string manifestResourceName)
 		{
+			this.assembly             = assembly;
+			this.manifestResourceName = manifestResourceName;
 		}
-
-		public ConditionBlock (string flag, TextLocation start)
+		
+		public Stream Open ()
 		{
-			this.Flag = flag;
-			this.Start = start;
-			this.Region = DomRegion.Empty;
+			return assembly.GetManifestResourceStream (this.ManifestResourceName);
 		}
 	}
 	
-	[Serializable]
-	public class ConditionalRegion : ConditionBlock
+	public class UrlStreamProvider : IStreamProvider
 	{
-		public DomRegion ElseBlock {
-			get;
-			set;
-		}
+		string  url;
 		
-		List<ConditionBlock> conditionBlocks = new List<ConditionBlock> ();
-
-		public List<ConditionBlock> ConditionBlocks {
+		public string Url {
 			get {
-				return conditionBlocks;
+				return url;
 			}
 		}
 		
-		public ConditionalRegion (string flag) : base (flag)
+		public UrlStreamProvider (string url)
 		{
+			this.url = url;
+		}
+		
+		public Stream Open ()
+		{
+			return File.OpenRead (url);
 		}
 	}
+	
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/SemanticHighlighting.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/SemanticHighlighting.cs
new file mode 100644
index 0000000000..f0f27f39f6
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/SemanticHighlighting.cs
@@ -0,0 +1,76 @@
+//
+// SemanticHighlighting.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.Editor.Highlighting
+{	
+	/// <summary>
+	/// Semantic highlighting adds the ability to add highlighting for things that require
+	/// a background parser to be colored. For example type names.
+	/// </summary>
+	public abstract class SemanticHighlighting : IDisposable
+	{
+		protected readonly internal TextEditor editor;
+		protected readonly internal DocumentContext documentContext;
+
+		protected SemanticHighlighting (TextEditor editor, DocumentContext documentContext)
+		{
+			this.editor = editor;
+			this.documentContext = documentContext;
+			this.documentContext.DocumentParsed += HandleDocumentParsed;
+		}
+
+		protected abstract void DocumentParsed ();
+
+		public void NotifySemanticHighlightingUpdate ()
+		{
+			var handler = SemanticHighlightingUpdated;
+			if (handler != null)
+				handler (this, EventArgs.Empty);
+		}
+
+		/// <summary>
+		/// Colorize the specified offset, count and colorizeCallback.
+		/// </summary>
+		/// <param name="segment">The area to run the colorizer in.</param>
+		public abstract IEnumerable<ColoredSegment> GetColoredSegments (ISegment segment);
+
+		void HandleDocumentParsed (object sender, EventArgs e)
+		{
+			if (DefaultSourceEditorOptions.Instance.EnableSemanticHighlighting)
+				DocumentParsed (); 
+		}
+
+		public void Dispose ()
+		{
+			documentContext.DocumentParsed -= HandleDocumentParsed;
+		}
+
+		internal event EventHandler SemanticHighlightingUpdated;
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/SyntaxModeService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/SyntaxModeService.cs
new file mode 100644
index 0000000000..539bcc5c6a
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/SyntaxModeService.cs
@@ -0,0 +1,216 @@
+// SyntaxModeService.cs
+//
+// Author:
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (c) 2007 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using System.Xml;
+using System.Xml.Schema;
+using System.Linq;
+using Mono.Addins;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.Ide.Editor.Highlighting
+{
+	public static class SyntaxModeService
+	{
+		static Dictionary<string, ColorScheme> styles      = new Dictionary<string, ColorScheme> ();
+		static Dictionary<string, IStreamProvider> styleLookup      = new Dictionary<string, IStreamProvider> ();
+
+		public static string[] Styles {
+			get {
+				List<string> result = new List<string> ();
+				foreach (string style in styles.Keys) {
+					if (!result.Contains (style))
+						result.Add (style);
+				}
+				foreach (string style in styleLookup.Keys) {
+					if (!result.Contains (style))
+						result.Add (style);
+				}
+				return result.ToArray ();
+			}
+		}
+
+		public static ColorScheme GetColorStyle (string name)
+		{
+			if (styles.ContainsKey (name))
+				return styles [name];
+			if (styleLookup.ContainsKey (name)) {
+				LoadStyle (name);
+				return GetColorStyle (name);
+			}
+			return GetColorStyle ("Default");
+		}
+
+		public static IStreamProvider GetProvider (ColorScheme style)
+		{
+			if (styleLookup.ContainsKey (style.Name)) 
+				return styleLookup[style.Name];
+			return null;
+		}
+		
+		static void LoadStyle (string name)
+		{
+			if (!styleLookup.ContainsKey (name))
+				throw new System.ArgumentException ("Style " + name + " not found", "name");
+			var provider = styleLookup [name];
+			styleLookup.Remove (name); 
+			var stream = provider.Open ();
+			try {
+				if (provider is UrlStreamProvider) {
+					var usp = provider as UrlStreamProvider;
+					if (usp.Url.EndsWith (".vssettings", StringComparison.Ordinal)) {
+						styles [name] = ColorScheme.Import (usp.Url, stream);
+					} else {
+						styles [name] = ColorScheme.LoadFrom (stream);
+					}
+					styles [name].FileName = usp.Url;
+				} else {
+					styles [name] = ColorScheme.LoadFrom (stream);
+				}
+			} catch (Exception e) {
+				throw new IOException ("Error while loading style :" + name, e);
+			} finally {
+				stream.Close ();
+			}
+		}
+		
+
+		public static void Remove (ColorScheme style)
+		{
+			if (styleLookup.ContainsKey (style.Name))
+				styleLookup.Remove (style.Name);
+
+			foreach (var kv in styles) {
+				if (kv.Value == style) {
+					styles.Remove (kv.Key); 
+					return;
+				}
+			}
+		}
+		
+
+		public static List<ValidationEventArgs> ValidateStyleFile (string fileName)
+		{
+			List<ValidationEventArgs> result = new List<ValidationEventArgs> ();
+			return result;
+		}
+
+
+		public static void LoadStylesAndModes (string path)
+		{
+			foreach (string file in Directory.GetFiles (path)) {
+				if (file.EndsWith (".json", StringComparison.Ordinal)) {
+					using (var stream = File.OpenRead (file)) {
+						string styleName = ScanStyle (stream);
+						if (!string.IsNullOrEmpty (styleName)) {
+							styleLookup [styleName] = new UrlStreamProvider (file);
+						} else {
+							Console.WriteLine ("Invalid .json syntax sheme file : " + file);
+						}
+					}
+				} else if (file.EndsWith (".vssettings", StringComparison.Ordinal)) {
+					using (var stream = File.OpenRead (file)) {
+						string styleName = Path.GetFileNameWithoutExtension (file);
+						styleLookup [styleName] = new UrlStreamProvider (file);
+					}
+				}
+			}
+		}
+
+		public static void LoadStylesAndModes (Assembly assembly)
+		{
+			foreach (string resource in assembly.GetManifestResourceNames ()) {
+				if (resource.EndsWith ("Style.json", StringComparison.Ordinal)) {
+					using (Stream stream = assembly.GetManifestResourceStream (resource)) {
+						string styleName = ScanStyle (stream);
+						styleLookup [styleName] = new ResourceStreamProvider (assembly, resource);
+					}
+				}
+			}
+		}
+		static System.Text.RegularExpressions.Regex nameRegex = new System.Text.RegularExpressions.Regex ("\\s*\"name\"\\s*:\\s*\"(.*)\"\\s*,");
+
+		static string ScanStyle (Stream stream)
+		{
+			try {
+				var file = new StreamReader (stream);
+				file.ReadLine ();
+				var nameLine = file.ReadLine ();
+				var match = nameRegex.Match (nameLine);
+				if (!match.Success)
+					return null;
+				return match.Groups[1].Value;
+			} catch (Exception e) {
+				Console.WriteLine ("Error while scanning json:");
+				Console.WriteLine (e);
+				return null;
+			}
+		}
+
+		public static void AddStyle (ColorScheme style)
+		{
+			styles [style.Name] = style;
+		}
+
+		public static void AddStyle (IStreamProvider provider)
+		{
+			using (var stream = provider.Open ()) {
+				string styleName = ScanStyle (stream);
+				styleLookup [styleName] = provider;
+			}
+		}
+
+		public static void RemoveStyle (IStreamProvider provider)
+		{
+			using (var stream = provider.Open ()) {
+				string styleName = ScanStyle (stream);
+				styleLookup.Remove (styleName);
+			}
+		}
+		
+		public static ColorScheme DefaultColorStyle {
+			get {
+				return GetColorStyle ("Default");
+			}
+		}
+		
+		static SyntaxModeService ()
+		{
+			var textEditorAssembly = Assembly.Load ("Mono.TextEditor");
+			if (textEditorAssembly != null) {
+				LoadStylesAndModes (textEditorAssembly);
+			} else {
+				LoggingService.LogError ("Can't lookup Mono.TextEditor assembly. Default styles won't be loaded.");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/TemplateCodon.cs
index c9a574ac82..bd57ac22d0 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/TemplateCodon.cs
@@ -28,12 +28,11 @@ using System;
 using System.Xml;
 
 using Mono.Addins;
-using Mono.TextEditor.Highlighting;
 
-namespace MonoDevelop.SourceEditor.Extension
+namespace MonoDevelop.Ide.Editor.Highlighting
 {
 	[ExtensionNode (Description="A template for color and syntax shemes.")]
-	public class TemplateCodon : ExtensionNode, Mono.TextEditor.Highlighting.IStreamProvider
+	class TemplateCodon : ExtensionNode, IStreamProvider
 	{
 		[NodeAttribute("resource", "Name of the resource where the template is stored.")]
 		string resource;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateExtensionNodeLoader.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/TemplateExtensionNodeLoader.cs
index 8989591d6f..ddf704e991 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateExtensionNodeLoader.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/TemplateExtensionNodeLoader.cs
@@ -25,10 +25,10 @@
 //
 
 using System;
-using Mono.TextEditor.Highlighting;
 using Mono.Addins;
+using MonoDevelop.Ide.Editor.Highlighting;
 
-namespace MonoDevelop.SourceEditor.Extension
+namespace MonoDevelop.Ide.Editor.Highlighting
 {
 	public static class TemplateExtensionNodeLoader
 	{
@@ -39,29 +39,17 @@ namespace MonoDevelop.SourceEditor.Extension
 			if (initialized)
 				return;
 			initialized = true;
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/SourceEditor2/SyntaxModes", OnSyntaxModeExtensionChanged);
 			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/SourceEditor2/Styles", OnStylesExtensionChanged);
 		}
-
-		static void OnSyntaxModeExtensionChanged (object s, ExtensionNodeEventArgs args)
-		{
-			TemplateCodon codon = (TemplateCodon)args.ExtensionNode;
-			if (args.Change == ExtensionChange.Add) {
-				Mono.TextEditor.Highlighting.SyntaxModeService.AddSyntaxMode (codon);
-			} else {
-				Mono.TextEditor.Highlighting.SyntaxModeService.RemoveSyntaxMode (codon);
-			}
-		}
 		
 		static void OnStylesExtensionChanged (object s, ExtensionNodeEventArgs args)
 		{
 			TemplateCodon codon = (TemplateCodon)args.ExtensionNode;
 			if (args.Change == ExtensionChange.Add) {
-				Mono.TextEditor.Highlighting.SyntaxModeService.AddStyle (codon);
+				SyntaxModeService.AddStyle (codon);
 			} else {
-				Mono.TextEditor.Highlighting.SyntaxModeService.RemoveStyle (codon);
+				SyntaxModeService.RemoveStyle (codon);
 			}
 		}
-		
 	}
-}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Util/Diff.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Util/Diff.cs
new file mode 100644
index 0000000000..364b0f2288
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Util/Diff.cs
@@ -0,0 +1,587 @@
+//
+// Diff.cs
+//
+// Author:
+//       Matthias Hertel, http://www.mathertel.de//
+//       some tweaks made by Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (c) by Matthias Hertel, http://www.mathertel.de//
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// diff.cs: A port of the algorythm to C#
+// Copyright (c) by Matthias Hertel, http://www.mathertel.de
+// This work is licensed under a BSD style license. See http://www.mathertel.de/License.aspx
+//
+// This Class implements the Difference Algorithm published in
+// "An O(ND) Difference Algorithm and its Variations" by Eugene Myers
+// Algorithmica Vol. 1 No. 2, 1986, p 251.
+//
+// There are many C, Java, Lisp implementations public available but they all seem to come
+// from the same source (diffutils) that is under the (unfree) GNU public License
+// and cannot be reused as a sourcecode for a commercial application.
+// There are very old C implementations that use other (worse) algorithms.
+// Microsoft also published sourcecode of a diff-tool (windiff) that uses some tree data.
+// Also, a direct transfer from a C source to C# is not easy because there is a lot of pointer
+// arithmetic in the typical C solutions and i need a managed solution.
+// These are the reasons why I implemented the original published algorithm from the scratch and
+// make it avaliable without the GNU license limitations.
+// I do not need a high performance diff tool because it is used only sometimes.
+// I will do some performace tweaking when needed.
+//
+// The algorithm itself is comparing 2 arrays of numbers so when comparing 2 text documents
+// each line is converted into a (hash) number. See DiffText().
+//
+// Some chages to the original algorithm:
+// The original algorithm was described using a recursive approach and comparing zero indexed arrays.
+// Extracting sub-arrays and rejoining them is very performance and memory intensive so the same
+// (readonly) data arrays are passed arround together with their lower and upper bounds.
+// This circumstance makes the LCS and SMS functions more complicate.
+// I added some code to the LCS function to get a fast response on sub-arrays that are identical,
+// completely deleted or inserted.
+//
+// The result from a comparisation is stored in 2 arrays that flag for modified (deleted or inserted)
+// lines in the 2 data arrays. These bits are then analysed to produce a array of Hunk objects.
+//
+// Further possible optimizations:
+// (first rule: don't do it; second: don't do it yet)
+// The arrays DataA and DataB are passed as parameters, but are never changed after the creation
+// so they can be members of the class to avoid the paramter overhead.
+// In SMS is a lot of boundary arithmetic in the for-D and for-k loops that can be done by increment
+// and decrement of local variables.
+// The DownVector and UpVector arrays are alywas created and destroyed each time the SMS gets called.
+// It is possible to reuse tehm when transfering them to members of the class.
+// See TODO: hints.
+//
+// Changes:
+// 2002.09.20 There was a "hang" in some situations.
+// Now I undestand a little bit more of the SMS algorithm.
+// There have been overlapping boxes; that where analyzed partial differently.
+// One return-point is enough.
+// A assertion was added in CreateDiffs when in debug-mode, that counts the number of equal (no modified) lines in both arrays.
+// They must be identical.
+//
+// 2003.02.07 Out of bounds error in the Up/Down vector arrays in some situations.
+// The two vetors are now accessed using different offsets that are adjusted using the start k-Line.
+// A test case is added.
+//
+// 2006.03.05 Some documentation and a direct Diff entry point.
+//
+// 2006.03.08 Refactored the API to static methods on the Diff class to make usage simpler.
+// 2006.03.10 using the standard Debug class for self-test now.
+//            compile with: csc /target:exe /out:diffTest.exe /d:DEBUG /d:TRACE /d:SELFTEST Diff.cs
+// 2007.01.06 license agreement changed to a BSD style license.
+// 2007.06.03 added the Optimize method.
+// 2007.09.23 UpVector and DownVector optimization by Jan Stoklasa ().
+// 2008.05.31 Adjusted the testing code that failed because of the Optimize method (not a bug in the diff algorithm).
+// 2008.10.08 Fixing a test case and adding a new test case.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace MonoDevelop.Ide.Editor.Util
+{
+	/// <summary>
+	/// A DiffHunk represents a single change in a diff between two files.
+	/// </summary>
+	public struct DiffHunk
+	{
+		public static readonly DiffHunk Empty = new DiffHunk (0, 0, 0, 0);
+
+		/// <summary>
+		/// Gets a value indicating whether this instance is empty.
+		/// </summary>
+		/// <value><c>true</c> if this instance is empty; otherwise, <c>false</c>.</value>
+		public bool IsEmpty {
+			get {
+				return InsertStart <= 0;
+			}
+		}
+
+		// TODO: Add option to change this value.
+		internal readonly int Context;
+
+		/// <summary>
+		/// Line number where the insertion starts.
+		/// </summary>
+		public readonly int InsertStart;
+
+		/// <summary>
+		/// Line number where the removal starts.
+		/// </summary>
+		public readonly int RemoveStart;
+
+		/// <summary>
+		/// Number of lines removed.
+		/// </summary>
+		public readonly int Removed;
+
+		/// <summary>
+		/// Number of lines inserted.
+		/// </summary>
+		public readonly int Inserted;
+
+		public DiffHunk (int removeStart, int insertStart, int removed, int inserted)
+		{
+			this.InsertStart = insertStart;
+			this.RemoveStart = removeStart;
+			this.Removed = removed;
+			this.Inserted = inserted;
+			this.Context = 3;
+		}
+
+		public int DistanceTo(DiffHunk other)
+		{
+			return other.RemoveStart - (this.RemoveStart + this.Removed);
+		}
+
+		public bool Overlaps(DiffHunk other)
+		{
+			return DistanceTo (other) < this.Context * 2;
+		}
+
+		public static bool operator ==(DiffHunk left, DiffHunk right)
+		{
+			return left.InsertStart == right.InsertStart && left.RemoveStart == right.RemoveStart &&
+				left.Removed == right.Removed && left.Inserted == right.Inserted;
+		}
+	
+		public static bool operator !=(DiffHunk left, DiffHunk right)
+		{
+			return !(left == right);
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (!(obj is DiffHunk))
+				return false;
+			return ((DiffHunk)obj) == this;
+		}
+		
+		public override int GetHashCode ()
+		{
+			return InsertStart ^ RemoveStart ^ Inserted ^ Removed;
+		}
+		
+		public override string ToString ()
+		{
+			if (IsEmpty)
+				return"[Hunk: Empty]";
+			return string.Format ("[Hunk: InsertStart={0}, RemoveStart={1}, Removed={2}, Inserted={3}]", InsertStart, RemoveStart, Removed, Inserted);
+		}
+	}
+	
+	sealed class Diff
+	{
+		/// <summary>
+		/// Shortest Middle Snake Return Data
+		/// </summary>
+		struct SMSRD
+		{
+			internal int x, y;
+		}
+
+		static void Optimize<T> (DiffData<T> data)
+		{
+			int startPos = 0;
+			while (startPos < data.Length) {
+				while (startPos < data.Length && data.Modified[startPos] == false)
+					startPos++;
+				int endPos = startPos;
+				while (endPos < data.Length && data.Modified[endPos] == true)
+					endPos++;
+
+				if (endPos < data.Length && data.Data[startPos].Equals (data.Data[endPos])) {
+					data.Modified[startPos] = false;
+					data.Modified[endPos] = true;
+				} else {
+					startPos = endPos;
+				}
+			}
+		}
+
+		public static IEnumerable<DiffHunk> CharDiff (string left, string right)
+		{
+			return GetDiff (left != null ? left.ToCharArray () : new char[0], right != null ? right.ToCharArray () : new char[0]);
+		}
+
+		public static IEnumerable<DiffHunk> GetDiff<T> (T[] baseArray, T[] changedArray)
+		{
+			// The A-Version of the data (original data) to be compared.
+			var dataA = new DiffData<T> (baseArray);
+
+			// The B-Version of the data (modified data) to be compared.
+			var dataB = new DiffData<T> (changedArray);
+
+			int MAX = dataA.Length + dataB.Length + 1;
+			// vector for the (0,0) to (x,y) search
+			int[] downVector = new int[2 * MAX + 2];
+			// vector for the (u,v) to (N,M) search
+			int[] upVector = new int[2 * MAX + 2];
+
+			LCS (dataA, 0, dataA.Length, dataB, 0, dataB.Length, downVector, upVector);
+			return CreateDiffs (dataA, dataB);
+		}
+		
+		/// <summary>Scan the tables of which lines are inserted and deleted,
+		/// producing an edit script in forward order.
+		/// </summary>
+		/// dynamic array
+		static IEnumerable<DiffHunk> CreateDiffs<T> (DiffData<T> baseData, DiffData<T> changedData)
+		{
+			int lineA = 0;
+			int lineB = 0;
+			while (lineA < baseData.Length || lineB < changedData
+		.Length) {
+				if (lineA < baseData.Length && !baseData.Modified[lineA] && lineB < changedData
+		.Length && !changedData
+		.Modified[lineB]) {
+					// equal lines
+					lineA++;
+					lineB++;
+
+				} else {
+					// maybe deleted and/or inserted lines
+					int startA = lineA;
+					int startB = lineB;
+
+					while (lineA < baseData.Length && (lineB >= changedData
+		.Length || baseData.Modified[lineA]))
+						// while (LineA < DataA.Length && DataA.Modified[LineA])
+						lineA++;
+
+					while (lineB < changedData
+		.Length && (lineA >= baseData.Length || changedData
+		.Modified[lineB]))
+						// while (LineB < DataB.Length && DataB.Modified[LineB])
+						lineB++;
+
+					if (startA < lineA || startB < lineB) {
+						// store a new difference-item
+						yield return new DiffHunk (startA + 1, startB + 1, lineA - startA, lineB - startB);
+					}
+					// if
+				}
+				// if
+			}
+			// while
+		}
+
+		/// <summary>
+		/// This is the algorithm to find the Shortest Middle Snake (SMS).
+		/// </summary>
+		/// <param name="dataA">sequence A</param>
+		/// <param name="lowerA">lower bound of the actual range in DataA</param>
+		/// <param name="upperA">upper bound of the actual range in DataA (exclusive)</param>
+		/// <param name="dataB">sequence B</param>
+		/// <param name="lowerB">lower bound of the actual range in DataB</param>
+		/// <param name="upperB">upper bound of the actual range in DataB (exclusive)</param>
+		/// <param name="downVector">a vector for the (0,0) to (x,y) search. Passed as a parameter for speed reasons.</param>
+		/// <param name="upVector">a vector for the (u,v) to (N,M) search. Passed as a parameter for speed reasons.</param>
+		/// <returns>a MiddleSnakeData record containing x,y and u,v</returns>
+		static SMSRD SMS<T> (DiffData<T> dataA, int lowerA, int upperA, DiffData<T> dataB, int lowerB, int upperB, int[] downVector, int[] upVector)
+		{
+			SMSRD ret;
+			int MAX = dataA.Length + dataB.Length + 1;
+
+			int downK = lowerA - lowerB;
+			// the k-line to start the forward search
+			int upK = upperA - upperB;
+			// the k-line to start the reverse search
+			int delta = (upperA - lowerA) - (upperB - lowerB);
+			bool oddDelta = (delta & 1) != 0;
+
+			// The vectors in the publication accepts negative indexes. the vectors implemented here are 0-based
+			// and are access using a specific offset: UpOffset UpVector and DownOffset for DownVektor
+			int downOffset = MAX - downK;
+			int upOffset = MAX - upK;
+
+			int MaxD = ((upperA - lowerA + upperB - lowerB) / 2) + 1;
+
+			// Debug.Write(2, "SMS", String.Format("Search the box: A[{0}-{1}] to B[{2}-{3}]", LowerA, UpperA, LowerB, UpperB));
+
+			// init vectors
+			downVector[downOffset + downK + 1] = lowerA;
+			upVector[upOffset + upK - 1] = upperA;
+
+			for (int D = 0; D <= MaxD; D++) {
+
+				// Extend the forward path.
+				for (int k = downK - D; k <= downK + D; k += 2) {
+					// Debug.Write(0, "SMS", "extend forward path " + k.ToString());
+
+					// find the only or better starting point
+					int x, y;
+					if (k == downK - D) {
+						x = downVector[downOffset + k + 1];
+						// down
+					} else {
+						x = downVector[downOffset + k - 1] + 1;
+						// a step to the right
+						if (k < downK + D && downVector[downOffset + k + 1] >= x)
+							x = downVector[downOffset + k + 1];
+						// down
+					}
+					y = x - k;
+
+					// find the end of the furthest reaching forward D-path in diagonal k.
+					while (x < upperA && y < upperB && dataA.Data[x].Equals (dataB.Data[y])) {
+						x++;
+						y++;
+					}
+					downVector[downOffset + k] = x;
+
+					// overlap ?
+					if (oddDelta && upK - D < k && k < upK + D) {
+						if (upVector[upOffset + k] <= downVector[downOffset + k]) {
+							ret.x = downVector[downOffset + k];
+							ret.y = downVector[downOffset + k] - k;
+							// ret.u = UpVector[UpOffset + k];      // 2002.09.20: no need for 2 points
+							// ret.v = UpVector[UpOffset + k] - k;
+							return (ret);
+						}
+						// if
+					}
+					// if
+				}
+				// for k
+				// Extend the reverse path.
+				for (int k = upK - D; k <= upK + D; k += 2) {
+					// Debug.Write(0, "SMS", "extend reverse path " + k.ToString());
+
+					// find the only or better starting point
+					int x, y;
+					if (k == upK + D) {
+						x = upVector[upOffset + k - 1];
+						// up
+					} else {
+						x = upVector[upOffset + k + 1] - 1;
+						// left
+						if (k > upK - D && upVector[upOffset + k - 1] < x)
+							x = upVector[upOffset + k - 1];
+						// up
+					}
+					// if
+					y = x - k;
+
+					while (x > lowerA && y > lowerB && dataA.Data[x - 1].Equals (dataB.Data[y - 1])) {
+						x--;
+						y--;
+						// diagonal
+					}
+					upVector[upOffset + k] = x;
+
+					// overlap ?
+					if (!oddDelta && downK - D <= k && k <= downK + D) {
+						if (upVector[upOffset + k] <= downVector[downOffset + k]) {
+							ret.x = downVector[downOffset + k];
+							ret.y = downVector[downOffset + k] - k;
+							// ret.u = UpVector[UpOffset + k];     // 2002.09.20: no need for 2 points
+							// ret.v = UpVector[UpOffset + k] - k;
+							return (ret);
+						}
+						// if
+					}
+					// if
+				}
+				// for k
+			}
+			// for D
+			throw new ApplicationException ("the algorithm should never come here.");
+		}
+		// SMS
+
+		/// <summary>
+		/// This is the divide-and-conquer implementation of the longest common-subsequence (LCS)
+		/// algorithm.
+		/// The published algorithm passes recursively parts of the A and B sequences.
+		/// To avoid copying these arrays the lower and upper bounds are passed while the sequences stay constant.
+		/// </summary>
+		/// <param name="dataA">sequence A</param>
+		/// <param name="lowerA">lower bound of the actual range in DataA</param>
+		/// <param name="upperA">upper bound of the actual range in DataA (exclusive)</param>
+		/// <param name="dataB">sequence B</param>
+		/// <param name="lowerB">lower bound of the actual range in DataB</param>
+		/// <param name="upperB">upper bound of the actual range in DataB (exclusive)</param>
+		/// <param name="downVector">a vector for the (0,0) to (x,y) search. Passed as a parameter for speed reasons.</param>
+		/// <param name="upVector">a vector for the (u,v) to (N,M) search. Passed as a parameter for speed reasons.</param>
+		static void LCS<T> (DiffData<T> dataA, int lowerA, int upperA, DiffData<T> dataB, int lowerB, int upperB, int[] downVector, int[] upVector)
+		{
+			// Fast walkthrough equal lines at the start
+			while (lowerA < upperA && lowerB < upperB && dataA.Data[lowerA].Equals (dataB.Data[lowerB])) {
+				lowerA++;
+				lowerB++;
+			}
+
+			// Fast walkthrough equal lines at the end
+			while (lowerA < upperA && lowerB < upperB && dataA.Data[upperA - 1].Equals (dataB.Data[upperB - 1])) {
+				--upperA;
+				--upperB;
+			}
+
+			if (lowerA == upperA) {
+				// mark as inserted lines.
+				while (lowerB < upperB)
+					dataB.Modified[lowerB++] = true;
+
+			} else if (lowerB == upperB) {
+				// mark as deleted lines.
+				while (lowerA < upperA)
+					dataA.Modified[lowerA++] = true;
+
+			} else {
+				// Find the middle snakea and length of an optimal path for A and B
+				SMSRD smsrd = SMS (dataA, lowerA, upperA, dataB, lowerB, upperB, downVector, upVector);
+				// Debug.Write(2, "MiddleSnakeData", String.Format("{0},{1}", smsrd.x, smsrd.y));
+
+				// The path is from LowerX to (x,y) and (x,y) to UpperX
+				LCS (dataA, lowerA, smsrd.x, dataB, lowerB, smsrd.y, downVector, upVector);
+				LCS (dataA, smsrd.x, upperA, dataB, smsrd.y, upperB, downVector, upVector);
+				// 2002.09.20: no need for 2 points
+			}
+		}
+		// LCS()
+
+		static void WriteHunks (Queue<DiffHunk> qh, IReadonlyTextDocument baseDocument, IReadonlyTextDocument changedDocument, StringBuilder sb)
+		{
+			DiffHunk item;
+			int remStart;
+			int insStart;
+			int distance = 0;
+
+			do {
+				item = qh.Dequeue ();
+				remStart = System.Math.Max (1, item.RemoveStart - (distance != 0 ? distance : item.Context));
+				insStart = System.Math.Max (1, item.InsertStart - (distance != 0 ? distance : item.Context));
+
+				for (int i = System.Math.Min (remStart, insStart); i < item.RemoveStart; i++) {
+					sb.AppendLine (" " + baseDocument.GetLineText (i, false));
+				}
+				for (int i = item.RemoveStart; i < item.RemoveStart + item.Removed; i++) {
+					sb.AppendLine ("-" + baseDocument.GetLineText (i, false));
+				}
+				for (int i = item.InsertStart; i < item.InsertStart + item.Inserted; i++) {
+					sb.AppendLine ("+" + changedDocument.GetLineText (i, false));
+				}
+
+				if (qh.Count != 0)
+					distance = item.DistanceTo (qh.Peek ());
+			} while (qh.Count != 0);
+
+			int remEnd = System.Math.Min (baseDocument.LineCount, item.RemoveStart + item.Removed + item.Context);
+			for (int i = item.RemoveStart + item.Removed; i < remEnd; i++) {
+				sb.AppendLine (" " + baseDocument.GetLineText (i, false));
+			}
+		}
+
+		public static string GetDiffString (IReadonlyTextDocument baseDocument, IReadonlyTextDocument changedDocument)
+		{
+			return GetDiffString (baseDocument.GetDiff (changedDocument), baseDocument, changedDocument, baseDocument.FileName, changedDocument.FileName);
+		}
+
+		public static string GetDiffString (IEnumerable<DiffHunk> diff, IReadonlyTextDocument baseDocument, IReadonlyTextDocument changedDocument, string baseFileName, string changedFileName)
+		{
+			if (diff == null)
+				return "";
+
+			StringBuilder sb = new StringBuilder ();
+			IEnumerator<DiffHunk> he = diff.GetEnumerator ();
+			he.MoveNext ();
+
+			Queue<DiffHunk> qh = new Queue<DiffHunk> ();
+			DiffHunk current;
+			DiffHunk next;
+
+			if (he.Current.IsEmpty)
+				return "";
+
+			sb.AppendLine ("--- " + baseFileName);
+			sb.AppendLine ("+++ " + changedFileName);
+
+			current = he.Current;
+
+			qh.Enqueue (current);
+			int remStart = System.Math.Max (1, current.RemoveStart - current.Context);
+			int remEnd = System.Math.Min (baseDocument.LineCount, current.RemoveStart + current.Removed + current.Context);
+			int insStart = System.Math.Max (1, current.InsertStart - current.Context);
+			int insEnd = System.Math.Min (changedDocument.LineCount, current.InsertStart + current.Inserted + current.Context);
+
+			while (he.MoveNext ()) {
+				next = he.Current;
+
+				if (current.Overlaps (next)) {
+					// Change upper bounds.
+					remEnd = System.Math.Min (baseDocument.LineCount, next.RemoveStart + next.Removed + next.Context);
+					insEnd = System.Math.Min (changedDocument.LineCount, next.InsertStart + next.Inserted + next.Context);
+				} else {
+					sb.AppendLine ("@@ -" + remStart + "," + (remEnd - remStart) + " +" + insStart + "," + (insEnd - insStart) + " @@");
+					WriteHunks (qh, baseDocument, changedDocument, sb);
+
+					remStart = System.Math.Max (1, next.RemoveStart - next.Context);
+					remEnd = System.Math.Min (baseDocument.LineCount, next.RemoveStart + next.Removed + next.Context);
+					insStart = System.Math.Max (1, next.InsertStart - next.Context);
+					insEnd = System.Math.Min (changedDocument.LineCount, next.InsertStart + next.Inserted + next.Context);
+				}
+				qh.Enqueue (next);
+
+				current = next;
+			}
+
+			if (qh.Count != 0) {
+				sb.AppendLine ("@@ -" + remStart + "," + (remEnd - remStart) + " +" + insStart + "," + (insEnd - insStart) + " @@");
+				WriteHunks (qh, baseDocument, changedDocument, sb);
+			}
+			return sb.ToString ();
+		}
+	}
+	
+	/// <summary>Data on one input file being compared.
+	/// </summary>
+	class DiffData<T>
+	{
+		/// <summary>Number of elements (lines).</summary>
+		public readonly int Length;
+
+		/// <summary>Buffer of numbers that will be compared.</summary>
+		public readonly T[] Data;
+
+		/// <summary>
+		/// Array of booleans that flag for modified data.
+		/// This is the result of the diff.
+		/// This means deletedA in the first Data or inserted in the second Data.
+		/// </summary>
+		public readonly bool[] Modified;
+
+		/// <summary>
+		/// Initialize the Diff-Data buffer.
+		/// </summary>
+		/// <param name="initData">reference to the buffer</param>
+		public DiffData (T[] initData)
+		{
+			Data = initData;
+			Length = initData.Length;
+			Modified = new bool[Length + 2];
+		}
+		// DiffData
+	}
+	// class DiffData
+}
+// namespace
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Util/SimpleBracketMatcher.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Util/SimpleBracketMatcher.cs
new file mode 100644
index 0000000000..b7cc92bb45
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Util/SimpleBracketMatcher.cs
@@ -0,0 +1,273 @@
+//
+// SimpleBracketMatcher.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Editor.Highlighting;
+
+namespace MonoDevelop.Ide.Editor.Util
+{
+	public static class SimpleBracketMatcher
+	{
+		const string openBrackets = "([{<";
+		const string closingBrackets = ")]}>";
+
+
+		public static int GetMatchingBracketOffset (IReadonlyTextDocument document, int offset)
+		{
+			if (offset < 0 || offset >= document.Length)
+				return -1;
+			char ch = document.GetCharAt (offset);
+			int bracket = openBrackets.IndexOf (ch);
+			int result;
+			if (bracket >= 0) {
+				result = SearchMatchingBracketForward (document, offset + 1, closingBrackets [bracket], openBrackets [bracket]);
+			} else {
+				bracket = closingBrackets.IndexOf (ch);
+				if (bracket >= 0) {
+					result = SearchMatchingBracketBackward (document, offset - 1, openBrackets [bracket], closingBrackets [bracket]);
+				} else {
+					result = -1;
+				}
+			}
+			return result;
+		}
+
+		static readonly string [] emptyList = new string [0];
+		static string [] GetList (IReadonlyTextDocument document, string name)
+		{
+			return TextEditorFactory.GetSyntaxProperties (document.MimeType, name) ?? emptyList;
+		}
+
+		static int StartsWithListMember (IReadonlyTextDocument document, IList<string> list, int offset)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			if (list == null)
+				throw new ArgumentNullException ("list");
+			for (int i = 0; i < list.Count; i++) {
+				string item = list [i];
+				if (offset + item.Length < document.Length) {
+					if (document.GetTextAt (offset, item.Length) == item)
+						return i;
+				}
+			}
+			return -1;
+		}
+
+		static int SearchMatchingBracketForward (IReadonlyTextDocument document, int offset, char openBracket, char closingBracket)
+		{
+			bool isInBlockComment = false;
+			bool isInLineComment = false;
+			int curStringQuote = -1;
+
+			bool startsInLineComment = StartsInLineComment (document, offset);
+
+			var lineComments = GetList (document, "LineComment");
+			var blockCommentStarts = GetList (document, "BlockCommentStart");
+			var blockCommentEnds = GetList (document, "BlockCommentEnd");
+			var stringQuotes = GetList (document, "StringQuote");
+			int depth = -1;
+			while (offset >= 0 && offset < document.Length) {
+				if (curStringQuote < 0) {
+					// check line comments
+					if (!isInBlockComment && !isInLineComment)
+						isInLineComment = StartsWithListMember (document, lineComments, offset) >= 0;
+
+					// check block comments
+					if (!isInLineComment) {
+						if (!isInBlockComment) {
+							isInBlockComment = StartsWithListMember (document, blockCommentStarts, offset) >= 0;
+						} else {
+							isInBlockComment = StartsWithListMember (document, blockCommentEnds, offset) < 0;
+						}
+					}
+				}
+
+				if (!isInBlockComment && !isInLineComment) {
+					int i = StartsWithListMember (document, stringQuotes, offset);
+					if (i >= 0) {
+						if (curStringQuote >= 0) {
+							if (curStringQuote == i)
+								curStringQuote = -1;
+						} else {
+							curStringQuote = i;
+						}
+					}
+				}
+
+				char ch = document.GetCharAt (offset);
+				switch (ch) {
+				case '\n':
+				case '\r':
+					if (startsInLineComment)
+						return -1;
+					isInLineComment = false;
+					break;
+				default:
+					if (ch == closingBracket) {
+						if (!(isInLineComment || curStringQuote >= 0 || isInBlockComment))
+							--depth;
+					} else if (ch == openBracket) {
+						if (!(isInLineComment || curStringQuote >= 0 || isInBlockComment)) {
+							++depth;
+							if (depth == 0)
+								return offset;
+						}
+					}
+					break;
+				}
+				offset++;
+			}
+			return -1;
+		}
+
+		static bool StartsInLineComment (IReadonlyTextDocument document, int offset)
+		{
+			IList<string> lineComments = GetList (document, "LineComment");
+			var line = document.GetLineByOffset (offset);
+			for (int i = line.Offset; i < offset; i++) {
+				if (StartsWithListMember (document, lineComments, i) >= 0)
+					return true;
+			}
+			return false;
+		}
+
+		static int GetLastSourceCodePosition (IReadonlyTextDocument document, int lineOffset)
+		{
+			var line = document.GetLineByOffset (lineOffset);
+			bool isInBlockComment = false;
+			bool isInLineComment = false;
+			int curStringQuote = -1;
+
+			IList<string> lineComments = GetList (document, "LineComment");
+			IList<string> blockCommentStarts = GetList (document, "BlockCommentStart");
+			IList<string> blockCommentEnds = GetList (document, "BlockCommentEnd");
+			IList<string> stringQuotes = GetList (document, "StringQuote");
+
+			for (int i = 0; i < line.Length; i++) {
+				int offset = line.Offset + i;
+				// check line comments
+				if (!isInBlockComment && curStringQuote < 0) {
+					isInLineComment = StartsWithListMember (document, lineComments, offset) >= 0;
+					if (isInLineComment)
+						return System.Math.Min (offset, lineOffset);
+				}
+				// check block comments
+				if (!isInLineComment && curStringQuote < 0) {
+					if (!isInBlockComment) {
+						isInBlockComment = StartsWithListMember (document, blockCommentStarts, offset) >= 0;
+					} else {
+						isInBlockComment = StartsWithListMember (document, blockCommentEnds, offset) < 0;
+					}
+				}
+
+				if (!isInBlockComment && !isInLineComment) {
+					int j = StartsWithListMember (document, stringQuotes, offset);
+					if (j >= 0) {
+						if (curStringQuote >= 0) {
+							if (curStringQuote == j)
+								curStringQuote = -1;
+						} else {
+							curStringQuote = j;
+						}
+					}
+				}
+			}
+			return lineOffset;
+		}
+
+		static int SearchMatchingBracketBackward (IReadonlyTextDocument document, int offset, char openBracket, char closingBracket)
+		{
+			bool isInBlockComment = false;
+			bool isInLineComment = false;
+			int curStringQuote = -1;
+
+			IList<string> blockCommentStarts = GetList (document, "BlockCommentStart");
+			IList<string> blockCommentEnds = GetList (document, "BlockCommentEnd");
+			IList<string> stringQuotes = GetList (document, "StringQuote");
+
+			bool startsInLineComment = StartsInLineComment (document, offset);
+			int depth = -1;
+
+			if (!startsInLineComment)
+				offset = GetLastSourceCodePosition (document, offset);
+
+			while (offset >= 0 && offset < document.Length) {
+				char ch = document.GetCharAt (offset);
+
+				// check block comments
+				if (!isInLineComment && curStringQuote < 0) {
+					if (!isInBlockComment) {
+						isInBlockComment = StartsWithListMember (document, blockCommentEnds, offset) >= 0;
+					} else {
+						isInBlockComment = StartsWithListMember (document, blockCommentStarts, offset) < 0;
+					}
+				}
+
+				if (!isInBlockComment && !isInLineComment) {
+					int i = StartsWithListMember (document, stringQuotes, offset);
+					if (i >= 0) {
+						if (curStringQuote >= 0) {
+							if (curStringQuote == i)
+								curStringQuote = -1;
+						} else {
+							curStringQuote = i;
+						}
+					}
+				}
+
+				switch (ch) {
+				case '\n':
+				case '\r':
+					if (startsInLineComment)
+						return -1;
+					offset--;
+					while (offset > 0 && (document.GetCharAt (offset) == '\n' || document.GetCharAt (offset) == '\r')) {
+						offset--;
+					}
+					offset = GetLastSourceCodePosition (document, offset) + 1;
+					break;
+				default:
+					if (ch == closingBracket) {
+						if (!(curStringQuote >= 0 || isInBlockComment))
+							--depth;
+					} else if (ch == openBracket) {
+						if (!(curStringQuote >= 0 || isInBlockComment)) {
+							++depth;
+							if (depth == 0)
+								return offset;
+						}
+					}
+					break;
+				}
+				offset--;
+			}
+			return -1;
+		}
+	}
+
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Util/SimpleReadonlyDocument.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Util/SimpleReadonlyDocument.cs
new file mode 100644
index 0000000000..2b03c40335
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Util/SimpleReadonlyDocument.cs
@@ -0,0 +1,414 @@
+//
+// SimpleReadonlyDocument.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MonoDevelop.Core;
+using System.Threading;
+
+namespace MonoDevelop.Ide.Editor.Util
+{
+	/// <summary>
+	/// A simple and fast implementation for a read only text document.
+	/// </summary>
+	public class SimpleReadonlyDocument : IReadonlyTextDocument
+	{
+		readonly ITextSource textSource;
+		readonly List<Delimiter> delimiters = new List<Delimiter> ();
+
+		SimpleReadonlyDocument (ITextSource readOnlyTextSource, string fileName, string mimeType)
+		{
+			textSource = readOnlyTextSource;
+			FileName = fileName;
+			MimeType = mimeType;
+			Initalize (readOnlyTextSource.Text);
+		}
+
+		/// <summary>
+		/// Creates a new readonly document. Note that the text source is not copied - it needs to be read only.
+		/// </summary>
+		/// <returns>The readonly document async.</returns>
+		/// <param name="readOnlyTextSource">Read only text source.</param>
+		/// <param name="fileName">File name.</param>
+		public static Task<IReadonlyTextDocument> CreateReadonlyDocumentAsync (ITextSource readOnlyTextSource, string fileName = null, string mimeType = null, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return Task.Run (delegate {
+				return (IReadonlyTextDocument)new SimpleReadonlyDocument (readOnlyTextSource, fileName, mimeType);
+			}, cancellationToken);
+		}
+
+		void Initalize (string text)
+		{
+			int offset = 0;
+			while (true) {
+				var delimiter = NextDelimiter (text, offset);
+				if (delimiter.IsInvalid)
+					break;
+
+				delimiters.Add (delimiter);
+
+				offset = delimiter.EndOffset;
+			}
+		}
+
+		static unsafe Delimiter NextDelimiter (string text, int offset)
+		{
+			fixed (char* start = text) {
+				char* p = start + offset;
+				char* endPtr = start + text.Length;
+
+				while (p < endPtr) {
+					switch (*p) {
+					case NewLine.CR:
+						char* nextp = p + 1;
+						if (nextp < endPtr && *nextp == NewLine.LF)
+							return new Delimiter ((int)(p - start), UnicodeNewline.CRLF);
+						return new Delimiter ((int)(p - start), UnicodeNewline.CR);
+					case NewLine.LF:
+						return new Delimiter ((int)(p - start), UnicodeNewline.LF);
+					case NewLine.NEL:
+						return new Delimiter ((int)(p - start), UnicodeNewline.NEL);
+					case NewLine.VT:
+						return new Delimiter ((int)(p - start), UnicodeNewline.VT);
+					case NewLine.FF:
+						return new Delimiter ((int)(p - start), UnicodeNewline.FF);
+					case NewLine.LS:
+						return new Delimiter ((int)(p - start), UnicodeNewline.LS);
+					case NewLine.PS:
+						return new Delimiter ((int)(p - start), UnicodeNewline.PS);
+					}
+					p++;
+				}
+				return Delimiter.Invalid;
+			}
+		}
+
+		struct Delimiter
+		{
+			public static readonly Delimiter Invalid = new Delimiter (-1, 0);
+
+			public readonly int Offset;
+			public readonly UnicodeNewline UnicodeNewline;
+
+			public int Length {
+				get {
+					return UnicodeNewline == UnicodeNewline.CRLF ? 2 : 1;
+				}
+			}
+
+			public int EndOffset {
+				get { return Offset + Length; }
+			}
+
+			public bool IsInvalid {
+				get {
+					return Offset < 0;
+				}
+			}
+
+			public Delimiter (int offset, UnicodeNewline unicodeNewline)
+			{
+				Offset = offset;
+				UnicodeNewline = unicodeNewline;
+			}
+		}
+
+		int OffsetToLineNumber (int offset)
+		{
+			for (int i = 0; i < delimiters.Count; i++) {
+				var delimiter = delimiters[i];
+				if (offset <= delimiter.Offset)
+					return i + 1;
+			}
+			return delimiters.Count + 1;
+		}
+
+		#region IReadonlyTextDocument implementation
+
+		/// <inheritdoc/>
+		public int LocationToOffset (int line, int column)
+		{
+			if (line > LineCount || line < DocumentLocation.MinLine)
+				return -1;
+			var documentLine = GetLine (line);
+			return Math.Min (Length, documentLine.Offset + Math.Max (0, Math.Min (documentLine.Length, column - 1)));
+		}
+
+		/// <inheritdoc/>
+		public DocumentLocation OffsetToLocation (int offset)
+		{
+			int lineNr = OffsetToLineNumber (offset);
+			if (lineNr < 1)
+				return DocumentLocation.Empty;
+			var line = GetLine (lineNr);
+			var col = Math.Max (1, Math.Min (line.LengthIncludingDelimiter, offset - line.Offset) + 1);
+			return new DocumentLocation (lineNr, col);
+		}
+
+		/// <inheritdoc/>
+		public IDocumentLine GetLine (int number)
+		{
+			number--;
+			if (number < 0)
+				return null;
+			int startOffset = number > 0 ? delimiters[number - 1].EndOffset : 0;
+			int endOffset;
+			UnicodeNewline newLine;
+			if (number < delimiters.Count) {
+				endOffset = delimiters[number].EndOffset;
+				newLine = delimiters[number].UnicodeNewline;
+			} else {
+				endOffset = Length;
+				newLine = UnicodeNewline.Unknown;
+			}
+			return new SimpleLineSegment (this, number + 1, startOffset, endOffset - startOffset, newLine);
+		}
+
+		sealed class SimpleLineSegment : IDocumentLine
+		{
+			readonly SimpleReadonlyDocument splitter;
+
+			public SimpleLineSegment (SimpleReadonlyDocument splitter, int lineNumber, int offset, int length, UnicodeNewline newLine)
+			{
+				this.splitter = splitter;
+				LineNumber = lineNumber;
+				LengthIncludingDelimiter = length;
+				UnicodeNewline = newLine;
+				Offset = offset;
+			}
+
+			#region IDocumentLine implementation
+
+			public int LengthIncludingDelimiter {
+				get;
+				private set;
+			}
+
+			public int EndOffsetIncludingDelimiter {
+				get {
+					return Offset + LengthIncludingDelimiter;
+				}
+			}
+
+			public ISegment SegmentIncludingDelimiter {
+				get {
+					return new TextSegment (Offset, LengthIncludingDelimiter);
+				}
+			}
+
+			public UnicodeNewline UnicodeNewline {
+				get;
+				private set;
+			}
+
+			public int DelimiterLength {
+				get {
+					switch (UnicodeNewline) {
+					case UnicodeNewline.Unknown:
+						return 0;
+					case UnicodeNewline.CRLF:
+						return 2;
+					default:
+						return 1;
+					}
+				}
+			}
+
+			public int LineNumber {
+				get;
+				private set;
+			}
+
+			public IDocumentLine PreviousLine {
+				get {
+					if (LineNumber == 1)
+						return null;
+					return splitter.GetLine (LineNumber - 1);
+				}
+			}
+
+			public IDocumentLine NextLine {
+				get {
+					if (LineNumber >= splitter.LineCount)
+						return null;
+					return splitter.GetLine (LineNumber + 1);
+				}
+			}
+
+			public bool IsDeleted {
+				get {
+					return false;
+				}
+			}
+			#endregion
+
+			#region ISegment implementation
+
+			public int Offset {
+				get;
+				private set;
+			}
+
+			public int Length {
+				get {
+					return LengthIncludingDelimiter - DelimiterLength;
+				}
+			}
+
+			public int EndOffset {
+				get {
+					return Offset + Length;
+				}
+			}
+			#endregion
+		}
+
+		/// <inheritdoc/>
+		public IDocumentLine GetLineByOffset (int offset)
+		{
+			return GetLine (OffsetToLineNumber (offset));
+		}
+
+		/// <inheritdoc/>
+		public bool IsReadOnly {
+			get {
+				return true;
+			}
+		}
+
+		/// <inheritdoc/>
+		public FilePath FileName {
+			get;
+			private set;
+		}
+
+		/// <inheritdoc/>
+		public string MimeType {
+			get;
+			private set;
+		}
+
+		/// <inheritdoc/>
+		public int LineCount {
+			get {
+				return delimiters.Count + 1;
+			}
+		}
+		#endregion
+
+		#region ITextSource implementation
+
+		/// <inheritdoc/>
+		public char GetCharAt (int offset)
+		{
+			return textSource.GetCharAt (offset);
+		}
+
+		public char this [int offset] {
+			get {
+				return textSource.GetCharAt (offset);
+			}
+		}
+
+		/// <inheritdoc/>
+		public string GetTextAt (int offset, int length)
+		{
+			return textSource.GetTextAt (offset, length);
+		}
+
+		/// <inheritdoc/>
+		public System.IO.TextReader CreateReader ()
+		{
+			return textSource.CreateReader ();
+		}
+
+		/// <inheritdoc/>
+		public System.IO.TextReader CreateReader (int offset, int length)
+		{
+			return textSource.CreateReader (offset, length);
+		}
+
+		/// <inheritdoc/>
+		public void WriteTextTo (System.IO.TextWriter writer)
+		{
+			textSource.WriteTextTo (writer);
+		}
+
+		/// <inheritdoc/>
+		public void WriteTextTo (System.IO.TextWriter writer, int offset, int length)
+		{
+			textSource.WriteTextTo (writer, offset, length);
+		}
+
+		/// <inheritdoc/>
+		public ITextSourceVersion Version {
+			get {
+				return textSource.Version;
+			}
+		}
+
+		/// <inheritdoc/>
+		public bool UseBOM {
+			get {
+				return textSource.UseBOM;
+			}
+		}
+
+		/// <inheritdoc/>
+		public System.Text.Encoding Encoding {
+			get {
+				return textSource.Encoding;
+			}
+		}
+
+		/// <inheritdoc/>
+		public int Length {
+			get {
+				return textSource.Length;
+			}
+		}
+
+		/// <inheritdoc/>
+		public string Text {
+			get {
+				return textSource.Text;
+			}
+		}
+
+		public ITextSource CreateSnapshot ()
+		{
+			return this;
+		}
+
+		public ITextSource CreateSnapshot (int offset, int length)
+		{
+			return new StringTextSource (Text.Substring (offset, length));
+		}
+		#endregion
+
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AutoSave.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/AutoSave.cs
index c96c5161bb..a0eacc97ef 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AutoSave.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/AutoSave.cs
@@ -30,9 +30,14 @@ using System.IO;
 using System.Threading;
 using MonoDevelop.Core;
 using Gtk;
+using MonoDevelop.Core.Text;
 
-namespace MonoDevelop.SourceEditor
+namespace MonoDevelop.Ide.Editor
 {
+	/// <summary>
+	/// This class handles the auto save mechanism for open files.
+	/// It should only be used by editor implementations.
+	/// </summary>
 	static class AutoSave
 	{
 		//FIXME: is this path a good one? wouldn't it be better to put autosaves beside the files anyway?
@@ -62,6 +67,9 @@ namespace MonoDevelop.SourceEditor
 			return newFileName;
 		}
 
+		/// <summary>
+		/// Returns true if an auto save exists for the given file name.
+		/// </summary>
 		public static bool AutoSaveExists (string fileName)
 		{
 			if (!autoSaveEnabled)
@@ -83,19 +91,16 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 
-		static void CreateAutoSave (string fileName, string content)
+		static void CreateAutoSave (string fileName, ITextSource content)
 		{
 			if (!autoSaveEnabled)
 				return;
 			try {
 				// Directory may have removed/unmounted. Therefore this operation is not guaranteed to work.
-				string tmpFile = Path.GetTempFileName ();
-				File.WriteAllText (tmpFile, content);
-
 				var autosaveFileName = GetAutoSaveFileName (fileName);
 				if (File.Exists (autosaveFileName))
 					File.Delete (autosaveFileName);
-				File.Move (tmpFile, autosaveFileName);
+				content.WriteTextTo (autosaveFileName);
 				Counters.AutoSavedFiles++;
 			} catch (Exception e) {
 				LoggingService.LogError ("Error in auto save while creating: " + fileName +". Disableing auto save.", e);
@@ -103,27 +108,25 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 
-#region AutoSave
+		#region AutoSave
 		class FileContent
 		{
 			public string FileName;
-			public Mono.TextEditor.TextDocument Content;
+			public ITextSource Content;
 
-			public FileContent (string fileName, Mono.TextEditor.TextDocument content)
+			public FileContent (string fileName, ITextSource content)
 			{
 				this.FileName = fileName;
 				this.Content = content;
 			}
 		}
+		static readonly AutoResetEvent resetEvent = new AutoResetEvent (false);
 
 		public static bool Running {
 			get {
 				return autoSaveThreadRunning;
 			}
 		}
-
-		static readonly AutoResetEvent resetEvent = new AutoResetEvent (false);
-		static readonly AutoResetEvent saveEvent = new AutoResetEvent (false);
 		static bool autoSaveThreadRunning = false;
 		static Thread autoSaveThread;
 		static Queue<FileContent> queue = new Queue<FileContent> ();
@@ -149,33 +152,35 @@ namespace MonoDevelop.SourceEditor
 					// Don't create an auto save for unsaved files.
 					if (string.IsNullOrEmpty (content.FileName))
 						continue;
-					string text = null;
-					bool set = false;
-					Application.Invoke (delegate {
-						try {
-							text = content.Content.Text;
-							set = true;
-						} catch (Exception e) {
-							LoggingService.LogError ("Exception in auto save thread.", e);
-							return;
-						} finally {
-							saveEvent.Set();
-						}
-					}
-					);
-					saveEvent.WaitOne ();
-					if (set)
-						CreateAutoSave (content.FileName, text);
+					CreateAutoSave (content.FileName, content.Content);
 				}
 			}
 		}
 
-		public static string LoadAutoSave (string fileName)
+		/// <summary>
+		/// Loads the content from an auto save file and removes the auto save file.
+		/// </summary>
+		public static ITextSource LoadAndRemoveAutoSave (string fileName)
+		{
+			string autoSaveFileName = GetAutoSaveFileName (fileName);
+			var result = StringTextSource.ReadFrom (autoSaveFileName);
+			AutoSave.RemoveAutoSaveFile (fileName);
+			return result;
+		}
+
+		/// <summary>
+		/// Loads the content from an auto save file.
+		/// </summary>
+		public static ITextSource LoadAutoSave (string fileName)
 		{
 			string autoSaveFileName = GetAutoSaveFileName (fileName);
-			return Mono.TextEditor.Utils.TextFileUtility.ReadAllText (autoSaveFileName);
+			return StringTextSource.ReadFrom (autoSaveFileName);
 		}
 
+		/// <summary>
+		/// Removes the auto save file.
+		/// </summary>
+		/// <param name="fileName">The file name for which the auto save file should be removed.</param>
 		public static void RemoveAutoSaveFile (string fileName)
 		{
 			if (!autoSaveEnabled)
@@ -193,19 +198,19 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 
-		public static void InformAutoSaveThread (Mono.TextEditor.TextDocument content)
+		internal static void InformAutoSaveThread (ITextSource content, string fileName, bool isDirty)
 		{
 			if (content == null || !autoSaveEnabled)
 				return;
-			if (content.IsDirty) {
-				queue.Enqueue (new FileContent (content.FileName, content));
+			if (isDirty) {
+				queue.Enqueue (new FileContent (fileName, content));
 				resetEvent.Set ();
 			} else {
-				RemoveAutoSaveFile (content.FileName);
+				RemoveAutoSaveFile (fileName);
 			}
 		}
 
-		public static void DisableAutoSave ()
+		static void DisableAutoSave ()
 		{
 			autoSaveThreadRunning = false;
 			if (autoSaveThread != null) {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DynamicAbbrevHandler.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Commands/DynamicAbbrevHandler.cs
index db50031bb3..08306da514 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DynamicAbbrevHandler.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Commands/DynamicAbbrevHandler.cs
@@ -30,9 +30,9 @@ using MonoDevelop.Ide.Gui;
 using System.Collections.Generic;
 using MonoDevelop.Ide;
 
-namespace MonoDevelop.SourceEditor
+namespace MonoDevelop.Ide.Editor
 {
-	public class DynamicAbbrevHandler : CommandHandler
+	class DynamicAbbrevHandler : CommandHandler
 	{
 		enum AbbrevState {
 			SearchBackward,
@@ -41,7 +41,7 @@ namespace MonoDevelop.SourceEditor
 			CycleThroughFoundWords
 		}
 		
-		static SourceEditorView lastView = null;
+		static TextEditor       lastView = null;
 		static string           lastAbbrev = null;
 		static int              lastTriggerOffset = 0;
 		static int              lastInsertPos = 0;
@@ -51,62 +51,62 @@ namespace MonoDevelop.SourceEditor
 		
 		protected override void Run (object data)
 		{
-			MonoDevelop.Ide.Gui.Document doc = IdeApp.Workbench.ActiveDocument;
+			var doc = IdeApp.Workbench.ActiveDocument;
 			if (doc == null)
 				return;
-			SourceEditorView view = IdeApp.Workbench.ActiveDocument.GetContent<SourceEditorView> ();
-			if (view == null)
+			var editor = doc.Editor;
+			if (editor == null)
 				return;
 			
 			string abbrevWord;
 			int offset;
 			int startOffset;
 			
-			if (lastView == view && view.TextEditor.Caret.Offset == lastTriggerOffset) {
+			if (lastView == editor && editor.CaretOffset == lastTriggerOffset) {
 				abbrevWord = lastAbbrev;
 				offset = lastStartOffset;
 			} else {
-				abbrevWord = GetWordBeforeCaret (view.TextEditor);
+				abbrevWord = GetWordBeforeCaret (editor);
 				lastAbbrev = abbrevWord;
-				offset = view.TextEditor.Caret.Offset - abbrevWord.Length - 1;
+				offset = editor.CaretOffset - abbrevWord.Length - 1;
 				lastInsertPos = lastTriggerOffset = offset + 1;
 				foundWords.Clear ();
 				foundWords.Add (abbrevWord);
 				curState = AbbrevState.SearchBackward;
 			}
 			
-			lastView = view;
+			lastView = editor;
 			switch (curState) {
 			case AbbrevState.SearchBackward:
 				while (offset > 0) {
-					if (IsMatchAt (view, offset, abbrevWord)) {
-						int endOffset = SearchEndPos (offset, view);
-						string curWord = view.TextEditor.Document.GetTextBetween (offset, endOffset);
+					if (IsMatchAt (editor, offset, abbrevWord)) {
+						int endOffset = SearchEndPos (offset, editor);
+						string curWord = editor.GetTextBetween (offset, endOffset);
 						if (foundWords.Contains (curWord)) {
 							offset--;
 							continue;
 						}
 						foundWords.Add (curWord);
-						ReplaceWord (view, curWord);
+						ReplaceWord (editor, curWord);
 						lastStartOffset = offset - 1;
 						return;
 					}
 					offset--;
 				}
-				offset = view.TextEditor.Caret.Offset;
+				offset = editor.CaretOffset;
 				curState = AbbrevState.SearchForward;
 				goto case AbbrevState.SearchForward;
 			case AbbrevState.SearchForward:
-				while (offset < view.TextEditor.Document.TextLength) {
-					if (IsMatchAt (view, offset, abbrevWord)) {
-						int endOffset = SearchEndPos (offset, view);
-						string curWord = view.TextEditor.Document.GetTextBetween (offset, endOffset);
+				while (offset < editor.Length) {
+					if (IsMatchAt (editor, offset, abbrevWord)) {
+						int endOffset = SearchEndPos (offset, editor);
+						string curWord = editor.GetTextBetween (offset, endOffset);
 						if (foundWords.Contains (curWord)) {
 							offset++;
 							continue;
 						}
 						foundWords.Add (curWord);
-						ReplaceWord (view, curWord);
+						ReplaceWord (editor, curWord);
 						lastStartOffset = offset + 1;
 						return;
 					}
@@ -116,13 +116,13 @@ namespace MonoDevelop.SourceEditor
 				goto case AbbrevState.SearchOtherBuffers;
 			case AbbrevState.SearchOtherBuffers:
 				foreach (Document curDoc in IdeApp.Workbench.Documents) {
-					SourceEditorView otherView = curDoc.GetContent<SourceEditorView> ();
-					if (curDoc == doc || otherView == null || otherView.Document == null)
+					var otherView = curDoc.GetContent<TextEditor> ();
+					if (curDoc == doc || otherView == null)
 						continue;
-					for (int i = 0; i < otherView.Document.TextLength; i++) {
+					for (int i = 0; i < otherView.Length; i++) {
 						if (IsMatchAt (otherView, i, abbrevWord)) {
 							int endOffset = SearchEndPos (i, otherView);
-							string curWord = otherView.TextEditor.Document.GetTextBetween (i, endOffset);
+							string curWord = otherView.GetTextBetween (i, endOffset);
 							if (foundWords.Contains (curWord))
 								continue;
 							foundWords.Add (curWord);
@@ -132,13 +132,13 @@ namespace MonoDevelop.SourceEditor
 				curState = AbbrevState.CycleThroughFoundWords;
 				goto case AbbrevState.CycleThroughFoundWords;
 			case AbbrevState.CycleThroughFoundWords:
-				int index = foundWords.IndexOf (view.TextEditor.Document.GetTextAt (lastInsertPos, view.TextEditor.Caret.Offset - lastInsertPos));
+				int index = foundWords.IndexOf (editor.GetTextAt (lastInsertPos, editor.CaretOffset - lastInsertPos));
 				if (index < 0)
 					break;
 				startOffset = offset;
 				offset = startOffset + foundWords[index].Length;
 				index = (index + foundWords.Count + 1) % foundWords.Count;
-				ReplaceWord (view, foundWords[index]);
+				ReplaceWord (editor, foundWords[index]);
 				break;
 			}
 		}
@@ -148,12 +148,12 @@ namespace MonoDevelop.SourceEditor
 			return char.IsLetterOrDigit (ch) || ch == '_';
 		}
 		
-		static string GetWordBeforeCaret (MonoDevelop.SourceEditor.ExtensibleTextEditor editor)
+		static string GetWordBeforeCaret (TextEditor editor)
 		{
-			int startOffset = editor.Caret.Offset;
+			int startOffset = editor.CaretOffset;
 			int offset = startOffset - 1;
 			while (offset > 0) {
-				char ch = editor.Document.GetCharAt (offset);
+				char ch = editor.GetCharAt (offset);
 				if (!IsIdentifierPart (ch)) {
 					offset++;
 					break;
@@ -162,34 +162,32 @@ namespace MonoDevelop.SourceEditor
 			}
 			if (offset >= startOffset)
 				return "";
-			return editor.Document.GetTextBetween (offset, startOffset);
+			return editor.GetTextBetween (offset, startOffset);
 		}
 		
-		static void ReplaceWord (MonoDevelop.SourceEditor.SourceEditorView view, string curWord)
+		static void ReplaceWord (TextEditor editor, string curWord)
 		{
-			view.TextEditor.Replace (lastInsertPos, view.TextEditor.Caret.Offset - lastInsertPos, curWord);
-			view.TextEditor.Document.CommitLineUpdate (view.TextEditor.Caret.Line);
-			lastTriggerOffset = view.TextEditor.Caret.Offset;
+			editor.ReplaceText (lastInsertPos, editor.CaretOffset - lastInsertPos, curWord);
+			lastTriggerOffset = editor.CaretOffset;
 		}
 		
-		static int SearchEndPos (int offset, MonoDevelop.SourceEditor.SourceEditorView view)
+		static int SearchEndPos (int offset, TextEditor editor)
 		{
-			while (offset < view.TextEditor.Document.TextLength && IsIdentifierPart (view.TextEditor.Document.GetCharAt (offset))) {
+			while (offset < editor.Length && IsIdentifierPart (editor.GetCharAt (offset))) {
 				offset++;
 			}
 			return offset;
 		}
 		
-		static bool IsMatchAt (MonoDevelop.SourceEditor.SourceEditorView view, int offset, string abbrevWord)
+		static bool IsMatchAt (TextEditor editor, int offset, string abbrevWord)
 		{
-			if (offset + abbrevWord.Length >= view.TextEditor.Document.TextLength)
+			if (offset + abbrevWord.Length >= editor.Length)
 				return false;
-			if (offset > 0 && IsIdentifierPart (view.TextEditor.Document.GetCharAt (offset - 1)))
+			if (offset > 0 && IsIdentifierPart (editor.GetCharAt (offset - 1)))
 				return false;
-			if (offset + abbrevWord.Length < view.TextEditor.Document.TextLength && !IsIdentifierPart (view.TextEditor.Document.GetCharAt (offset + abbrevWord.Length)))
+			if (offset + abbrevWord.Length < editor.Length && !IsIdentifierPart (editor.GetCharAt (offset + abbrevWord.Length)))
 				return false;
-			return view.TextEditor.Document.GetTextAt (offset, abbrevWord.Length) == abbrevWord;
+			return editor.GetTextAt (offset, abbrevWord.Length) == abbrevWord;
 		}
 	}
-}
- 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/CustomEditorOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/CustomEditorOptions.cs
new file mode 100644
index 0000000000..a3932167e2
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/CustomEditorOptions.cs
@@ -0,0 +1,186 @@
+//
+// ChangeableEditorOptions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public sealed class CustomEditorOptions : ITextEditorOptions
+	{
+		#region ITextEditorOptions implementation
+		public WordFindStrategy WordFindStrategy {
+			get;
+			set;
+		}
+
+		public bool TabsToSpaces {
+			get;
+			set;
+		}
+
+		public int IndentationSize {
+			get;
+			set;
+		}
+
+		public int TabSize {
+			get;
+			set;
+		}
+
+		public bool ShowIconMargin {
+			get;
+			set;
+		}
+
+		public bool ShowLineNumberMargin {
+			get;
+			set;
+		}
+
+		public bool ShowFoldMargin {
+			get;
+			set;
+		}
+
+		public bool HighlightCaretLine {
+			get;
+			set;
+		}
+
+		public int RulerColumn {
+			get;
+			set;
+		}
+
+		public bool ShowRuler {
+			get;
+			set;
+		}
+
+		public IndentStyle IndentStyle {
+			get;
+			set;
+		}
+
+		public bool OverrideDocumentEolMarker {
+			get;
+			set;
+		}
+
+		public bool EnableSyntaxHighlighting {
+			get;
+			set;
+		}
+
+		public bool RemoveTrailingWhitespaces {
+			get;
+			set;
+		}
+
+		public bool WrapLines {
+			get;
+			set;
+		}
+
+		public string FontName {
+			get;
+			set;
+		}
+
+		public string GutterFontName {
+			get;
+			set;
+		}
+
+		public string ColorScheme {
+			get;
+			set;
+		}
+
+		public string DefaultEolMarker {
+			get;
+			set;
+		}
+
+		public bool GenerateFormattingUndoStep {
+			get;
+			set;
+		}
+
+		public ShowWhitespaces ShowWhitespaces {
+			get;
+			set;
+		}
+
+		public IncludeWhitespaces IncludeWhitespaces {
+			get;
+			set;
+		}
+		#endregion
+
+		public CustomEditorOptions ()
+		{
+			this.ColorScheme = "Default";
+			this.TabSize = this.IndentationSize = 4;
+			this.DefaultEolMarker = "\n";
+		}
+
+		public CustomEditorOptions (ITextEditorOptions initializeFrom)
+		{
+			if (initializeFrom == null)
+				throw new ArgumentNullException (nameof (initializeFrom));
+			WordFindStrategy = initializeFrom.WordFindStrategy;
+			TabsToSpaces = initializeFrom.TabsToSpaces;
+			IndentationSize = initializeFrom.IndentationSize;
+			TabSize = initializeFrom.TabSize;
+			ShowIconMargin = initializeFrom.ShowIconMargin;
+			ShowLineNumberMargin = initializeFrom.ShowLineNumberMargin;
+			ShowFoldMargin = initializeFrom.ShowFoldMargin;
+			HighlightCaretLine = initializeFrom.HighlightCaretLine;
+			RulerColumn = initializeFrom.RulerColumn;
+			ShowRuler = initializeFrom.ShowRuler;
+			IndentStyle = initializeFrom.IndentStyle;
+			OverrideDocumentEolMarker = initializeFrom.OverrideDocumentEolMarker;
+			EnableSyntaxHighlighting = initializeFrom.EnableSyntaxHighlighting;
+			RemoveTrailingWhitespaces = initializeFrom.RemoveTrailingWhitespaces;
+			WrapLines = initializeFrom.WrapLines;
+			FontName = initializeFrom.FontName;
+			GutterFontName = initializeFrom.GutterFontName;
+			ColorScheme = initializeFrom.ColorScheme;
+			DefaultEolMarker = initializeFrom.DefaultEolMarker;
+			GenerateFormattingUndoStep = initializeFrom.GenerateFormattingUndoStep;
+			ShowWhitespaces = initializeFrom.ShowWhitespaces;
+			IncludeWhitespaces = initializeFrom.IncludeWhitespaces;
+		}
+
+		#region IDisposable implementation
+		public void Dispose ()
+		{
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs
new file mode 100644
index 0000000000..1e83737769
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs
@@ -0,0 +1,785 @@
+//
+// DefaultSourceEditorOptions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Fonts;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.Ide.Editor
+{
+	[Obsolete ("Use WordNavigationStyle")]
+	public enum ControlLeftRightMode
+	{
+		MonoDevelop,
+		Emacs,
+		SharpDevelop
+	}
+
+	public enum WordNavigationStyle
+	{
+		Unix,
+		Windows
+	}
+
+	public enum LineEndingConversion {
+		Ask,
+		LeaveAsIs,
+		ConvertAlways
+	}
+	
+	/// <summary>
+	/// This class contains all text editor options from ITextEditorOptions and additional options
+	/// the text editor frontend may use.  
+	/// </summary>
+	public sealed class DefaultSourceEditorOptions : ITextEditorOptions
+	{
+		static DefaultSourceEditorOptions instance;
+		//static TextStylePolicy defaultPolicy;
+		static bool inited;
+
+		public static DefaultSourceEditorOptions Instance {
+			get { return instance; }
+		}
+
+		public static ITextEditorOptions PlainEditor {
+			get;
+			private set;
+		}
+
+		static DefaultSourceEditorOptions ()
+		{
+			Init ();
+		}
+
+		public static void Init ()
+		{
+			if (inited)
+				return;
+			inited = true;
+
+			var policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> ("text/plain");
+			instance = new DefaultSourceEditorOptions (policy);
+			MonoDevelop.Projects.Policies.PolicyService.DefaultPolicies.PolicyChanged += instance.HandlePolicyChanged;
+
+			PlainEditor = new PlainEditorOptions ();
+		}
+
+		class PlainEditorOptions : ITextEditorOptions
+		{
+			#region IDisposable implementation
+
+			void IDisposable.Dispose ()
+			{
+				// nothing
+			}
+
+			#endregion
+
+			#region ITextEditorOptions implementation
+
+			WordFindStrategy ITextEditorOptions.WordFindStrategy {
+				get {
+					return DefaultSourceEditorOptions.Instance.WordFindStrategy;
+				}
+			}
+
+			bool ITextEditorOptions.TabsToSpaces {
+				get {
+					return DefaultSourceEditorOptions.Instance.TabsToSpaces;
+				}
+			}
+
+			int ITextEditorOptions.IndentationSize {
+				get {
+					return DefaultSourceEditorOptions.Instance.IndentationSize;
+				}
+			}
+
+			int ITextEditorOptions.TabSize {
+				get {
+					return DefaultSourceEditorOptions.Instance.TabSize;
+				}
+			}
+
+			bool ITextEditorOptions.ShowIconMargin {
+				get {
+					return false;
+				}
+			}
+
+			bool ITextEditorOptions.ShowLineNumberMargin {
+				get {
+					return false;
+				}
+			}
+
+			bool ITextEditorOptions.ShowFoldMargin {
+				get {
+					return false;
+				}
+			}
+
+			bool ITextEditorOptions.HighlightCaretLine {
+				get {
+					return DefaultSourceEditorOptions.Instance.HighlightCaretLine;
+				}
+			}
+
+			int ITextEditorOptions.RulerColumn {
+				get {
+					return DefaultSourceEditorOptions.Instance.RulerColumn;
+				}
+			}
+
+			bool ITextEditorOptions.ShowRuler {
+				get {
+					return false;
+				}
+			}
+
+			IndentStyle ITextEditorOptions.IndentStyle {
+				get {
+					return DefaultSourceEditorOptions.Instance.IndentStyle;
+				}
+			}
+
+			bool ITextEditorOptions.OverrideDocumentEolMarker {
+				get {
+					return false;
+				}
+			}
+
+			bool ITextEditorOptions.EnableSyntaxHighlighting {
+				get {
+					return DefaultSourceEditorOptions.Instance.EnableSyntaxHighlighting;
+				}
+			}
+
+			bool ITextEditorOptions.RemoveTrailingWhitespaces {
+				get {
+					return DefaultSourceEditorOptions.Instance.RemoveTrailingWhitespaces;
+				}
+			}
+
+			bool ITextEditorOptions.WrapLines {
+				get {
+					return DefaultSourceEditorOptions.Instance.WrapLines;
+				}
+			}
+
+			string ITextEditorOptions.FontName {
+				get {
+					return DefaultSourceEditorOptions.Instance.FontName;
+				}
+			}
+
+			string ITextEditorOptions.GutterFontName {
+				get {
+					return DefaultSourceEditorOptions.Instance.GutterFontName;
+				}
+			}
+
+			string ITextEditorOptions.ColorScheme {
+				get {
+					return DefaultSourceEditorOptions.Instance.ColorScheme;
+				}
+			}
+
+			string ITextEditorOptions.DefaultEolMarker {
+				get {
+					return DefaultSourceEditorOptions.Instance.DefaultEolMarker;
+				}
+			}
+
+			bool ITextEditorOptions.GenerateFormattingUndoStep {
+				get {
+					return DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep;
+				}
+			}
+
+			ShowWhitespaces ITextEditorOptions.ShowWhitespaces {
+				get {
+					return ShowWhitespaces.Never;
+				}
+			}
+
+			IncludeWhitespaces ITextEditorOptions.IncludeWhitespaces {
+				get {
+					return DefaultSourceEditorOptions.Instance.IncludeWhitespaces;
+				}
+			}
+
+			#endregion
+
+
+		}
+
+		void HandlePolicyChanged (object sender, MonoDevelop.Projects.Policies.PolicyChangedEventArgs args)
+		{
+			TextStylePolicy pol = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> ("text/plain");
+			UpdateStylePolicy (pol);
+		}
+
+		DefaultSourceEditorOptions (TextStylePolicy currentPolicy)
+		{
+			var defaultControlMode = (ControlLeftRightMode)Enum.Parse (typeof(ControlLeftRightMode), DesktopService.DefaultControlLeftRightBehavior);
+			controlLeftRightMode = new PropertyWrapper<ControlLeftRightMode> ("ControlLeftRightMode", defaultControlMode);
+			
+			WordNavigationStyle defaultWordNavigation = WordNavigationStyle.Unix;
+			if (Platform.IsWindows || controlLeftRightMode.Value == ControlLeftRightMode.SharpDevelop) {
+				defaultWordNavigation = WordNavigationStyle.Windows;
+			}
+			wordNavigationStyle = new PropertyWrapper<WordNavigationStyle> ("WordNavigationStyle", defaultWordNavigation);
+			
+			UpdateStylePolicy (currentPolicy);
+			FontService.RegisterFontChangedCallback ("Editor", UpdateFont);
+			FontService.RegisterFontChangedCallback ("MessageBubbles", UpdateFont);
+		}
+
+		void UpdateFont ()
+		{
+			this.OnChanged (EventArgs.Empty);
+		}
+
+		void UpdateStylePolicy (MonoDevelop.Ide.Gui.Content.TextStylePolicy currentPolicy)
+		{
+			defaultEolMarker = TextStylePolicy.GetEolMarker (currentPolicy.EolMarker);
+			tabsToSpaces          = currentPolicy.TabsToSpaces; // PropertyService.Get ("TabsToSpaces", false);
+			indentationSize       = currentPolicy.TabWidth; //PropertyService.Get ("TabIndent", 4);
+			rulerColumn           = currentPolicy.FileWidth; //PropertyService.Get ("RulerColumn", 80);
+			allowTabsAfterNonTabs = !currentPolicy.NoTabsAfterNonTabs; //PropertyService.Get ("AllowTabsAfterNonTabs", true);
+			removeTrailingWhitespaces = currentPolicy.RemoveTrailingWhitespace; //PropertyService.Get ("RemoveTrailingWhitespaces", true);
+		}
+
+		public ITextEditorOptions WithTextStyle (MonoDevelop.Ide.Gui.Content.TextStylePolicy policy)
+		{
+			if (policy == null)
+				throw new ArgumentNullException ("policy");
+			var result = (DefaultSourceEditorOptions)MemberwiseClone ();
+			result.UpdateStylePolicy (policy);
+			result.Changed = null;
+			return result;
+		}
+
+		#region new options
+
+		public bool EnableAutoCodeCompletion {
+			get { return CompletionTextEditorExtension.EnableAutoCodeCompletion; }
+			set { CompletionTextEditorExtension.EnableAutoCodeCompletion.Set (value); }
+		}
+
+		PropertyWrapper<bool> defaultRegionsFolding = new PropertyWrapper<bool> ("DefaultRegionsFolding", false);
+		public bool DefaultRegionsFolding {
+			get {
+				return defaultRegionsFolding;
+			}
+			set {
+				if (defaultRegionsFolding.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+		
+		PropertyWrapper<bool> defaultCommentFolding = new PropertyWrapper<bool> ("DefaultCommentFolding", true);
+		public bool DefaultCommentFolding {
+			get {
+				return defaultCommentFolding;
+			}
+			set {
+				if (defaultCommentFolding.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<bool> enableSemanticHighlighting = new PropertyWrapper<bool> ("EnableSemanticHighlighting", true);
+		public bool EnableSemanticHighlighting {
+			get {
+				return enableSemanticHighlighting;
+			}
+			set {
+				if (enableSemanticHighlighting.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<bool> tabIsReindent = new PropertyWrapper<bool> ("TabIsReindent", false);
+		public bool TabIsReindent {
+			get {
+				return tabIsReindent;
+			}
+			set {
+				if (tabIsReindent.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<bool> autoInsertMatchingBracket = new PropertyWrapper<bool> ("AutoInsertMatchingBracket", false);
+		public bool AutoInsertMatchingBracket {
+			get {
+				return autoInsertMatchingBracket;
+			}
+			set {
+				if (autoInsertMatchingBracket.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<bool> smartSemicolonPlacement = new PropertyWrapper<bool> ("SmartSemicolonPlacement", false);
+		public bool SmartSemicolonPlacement {
+			get {
+				return smartSemicolonPlacement;
+			}
+			set {
+				if (smartSemicolonPlacement.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+		
+		PropertyWrapper<bool> underlineErrors = new PropertyWrapper<bool> ("UnderlineErrors", true);
+		public bool UnderlineErrors {
+			get {
+				return underlineErrors; 
+			}
+			set {
+				if (underlineErrors.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<IndentStyle> indentStyle = new PropertyWrapper<IndentStyle> ("IndentStyle", IndentStyle.Smart);
+		public IndentStyle IndentStyle {
+			get {
+				return indentStyle;
+			}
+			set {
+				if (indentStyle.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<bool> enableHighlightUsages = new PropertyWrapper<bool> ("EnableHighlightUsages", false);
+		public bool EnableHighlightUsages {
+			get {
+				return enableHighlightUsages;
+			}
+			set {
+				if (enableHighlightUsages.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+		
+		PropertyWrapper<LineEndingConversion> lineEndingConversion = new PropertyWrapper<LineEndingConversion> ("LineEndingConversion", LineEndingConversion.Ask);
+		public LineEndingConversion LineEndingConversion {
+			get {
+				return lineEndingConversion;
+			}
+			set {
+				if (lineEndingConversion.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		#endregion
+
+		PropertyWrapper<bool> useViModes = new PropertyWrapper<bool> ("UseViModes", true);
+		public bool UseViModes {
+			get {
+				return useViModes;
+			}
+			set {
+				if (useViModes.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<bool> onTheFlyFormatting = new PropertyWrapper<bool> ("OnTheFlyFormatting", true);
+		public bool OnTheFlyFormatting {
+			get {
+				return onTheFlyFormatting;
+			}
+			set {
+				if (onTheFlyFormatting.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		#region ITextEditorOptions
+		string defaultEolMarker = Environment.NewLine;
+		public string DefaultEolMarker {
+			get {
+				return defaultEolMarker;
+			}
+			set {
+				if (defaultEolMarker != value) {
+					defaultEolMarker = value;
+					OnChanged (EventArgs.Empty);
+				}
+			}
+		}
+
+		PropertyWrapper<ControlLeftRightMode> controlLeftRightMode;
+		[Obsolete("Use WordNavigationStyle")]
+		public ControlLeftRightMode ControlLeftRightMode {
+			get {
+				return controlLeftRightMode;
+			}
+			set {
+				if (controlLeftRightMode.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+		
+		PropertyWrapper<WordNavigationStyle> wordNavigationStyle;
+		public WordNavigationStyle WordNavigationStyle {
+			get {
+				return wordNavigationStyle;
+			}
+			set {
+				if (wordNavigationStyle.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		public WordFindStrategy WordFindStrategy {
+			get {
+				if (useViModes) {
+					return WordFindStrategy.Vim;
+				}
+				switch (WordNavigationStyle) {
+				case WordNavigationStyle.Windows:
+					return WordFindStrategy.SharpDevelop;
+				default:
+					return WordFindStrategy.Emacs;
+				}
+			}
+			set {
+				throw new System.NotImplementedException ();
+			}
+		}
+		
+		bool allowTabsAfterNonTabs = true;
+		public bool AllowTabsAfterNonTabs {
+			get {
+				return allowTabsAfterNonTabs;
+			}
+			set {
+				if (allowTabsAfterNonTabs != value) {
+					PropertyService.Set ("AllowTabsAfterNonTabs", value);
+					allowTabsAfterNonTabs = value;
+					OnChanged (EventArgs.Empty);
+				}
+			}
+		}
+		
+		bool tabsToSpaces = false;
+		public bool TabsToSpaces {
+			get {
+				return tabsToSpaces;
+			}
+			set {
+				if (tabsToSpaces != value) {
+					PropertyService.Set ("TabsToSpaces", value);
+					tabsToSpaces = value;
+					OnChanged (EventArgs.Empty);
+				}
+			}
+		}
+		
+		int indentationSize = 4;
+		public int IndentationSize {
+			get {
+				return indentationSize;
+			}
+			set {
+				if (indentationSize != value) {
+					PropertyService.Set ("TabIndent", value);
+					indentationSize = value;
+					OnChanged (EventArgs.Empty);
+				}
+			}
+		}
+
+		
+		public string IndentationString {
+			get {
+				return TabsToSpaces ? new string (' ', this.TabSize) : "\t";
+			}
+		}
+		
+		public int TabSize {
+			get {
+				return IndentationSize;
+			}
+			set {
+				IndentationSize = value;
+			}
+		}
+
+		
+		bool removeTrailingWhitespaces = true;
+		public bool RemoveTrailingWhitespaces {
+			get {
+				return removeTrailingWhitespaces;
+			}
+			set {
+				if (removeTrailingWhitespaces != value) {
+					PropertyService.Set ("RemoveTrailingWhitespaces", value);
+					OnChanged (EventArgs.Empty);
+					removeTrailingWhitespaces = value;
+				}
+			}
+		}
+		
+		PropertyWrapper<bool> showLineNumberMargin = new PropertyWrapper<bool> ("ShowLineNumberMargin", true);
+		public bool ShowLineNumberMargin {
+			get {
+				return showLineNumberMargin;
+			}
+			set {
+				if (showLineNumberMargin.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+		
+		PropertyWrapper<bool> showFoldMargin = new PropertyWrapper<bool> ("ShowFoldMargin", false);
+		public bool ShowFoldMargin {
+			get {
+				return showFoldMargin;
+			}
+			set {
+				if (showFoldMargin.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+		
+		bool showIconMargin = true;
+		public bool ShowIconMargin {
+			get {
+				return showIconMargin;
+			}
+			set {
+				if (showIconMargin != value) {
+					PropertyService.Set ("ShowIconMargin", value);
+					showIconMargin = value;
+					OnChanged (EventArgs.Empty);
+				}
+			}
+		}
+		
+		PropertyWrapper<bool> highlightCaretLine = new PropertyWrapper<bool> ("HighlightCaretLine", false);
+		public bool HighlightCaretLine {
+			get {
+				return highlightCaretLine;
+			}
+			set {
+				if (highlightCaretLine.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<bool> enableSyntaxHighlighting = new PropertyWrapper<bool> ("EnableSyntaxHighlighting", true);
+		public bool EnableSyntaxHighlighting {
+			get {
+				return enableSyntaxHighlighting;
+			}
+			set {
+				if (enableSyntaxHighlighting.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<bool> highlightMatchingBracket = new PropertyWrapper<bool> ("HighlightMatchingBracket", true);
+		public bool HighlightMatchingBracket {
+			get {
+				return highlightMatchingBracket;
+			}
+			set {
+				if (highlightMatchingBracket.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		int  rulerColumn = 80;
+
+		public int RulerColumn {
+			get {
+				return rulerColumn;
+			}
+			set {
+				if (rulerColumn != value) {
+					PropertyService.Set ("RulerColumn", value);
+					rulerColumn = value;
+					OnChanged (EventArgs.Empty);
+				}
+			}
+		}
+		
+		PropertyWrapper<bool> showRuler = new PropertyWrapper<bool> ("ShowRuler", true);
+		public bool ShowRuler {
+			get {
+				return showRuler;
+			}
+			set {
+				if (showRuler.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<bool> enableAnimations = new PropertyWrapper<bool> ("EnableAnimations", true);
+		public bool EnableAnimations {
+			get { 
+				return enableAnimations; 
+			}
+			set {
+				if (enableAnimations.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+		
+		PropertyWrapper<bool> drawIndentationMarkers = new PropertyWrapper<bool> ("DrawIndentationMarkers", false);
+		public bool DrawIndentationMarkers {
+			get {
+				return drawIndentationMarkers;
+			}
+			set {
+				if (drawIndentationMarkers.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<bool> wrapLines = new PropertyWrapper<bool> ("WrapLines", false);
+		public bool WrapLines {
+			get {
+				return wrapLines;
+			}
+			set {
+				if (wrapLines.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<bool> enableQuickDiff = new PropertyWrapper<bool> ("EnableQuickDiff", false);
+		public bool EnableQuickDiff {
+			get {
+				return enableQuickDiff;
+			}
+			set {
+				if (enableQuickDiff.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		public string FontName {
+			get {
+				return FontService.FilterFontName (FontService.GetUnderlyingFontName ("Editor"));
+			}
+			set {
+				throw new InvalidOperationException ("Set font through font service");
+			}
+		}
+
+		public string GutterFontName {
+			get {
+				return FontService.FilterFontName (FontService.GetUnderlyingFontName ("Editor"));
+			}
+			set {
+				throw new InvalidOperationException ("Set font through font service");
+			}
+		}
+		
+		PropertyWrapper<string> colorScheme = new PropertyWrapper<string> ("ColorScheme", "Default");
+		public string ColorScheme {
+			get {
+				return colorScheme;
+			}
+			set {
+				if (colorScheme.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+		
+		PropertyWrapper<bool> generateFormattingUndoStep = new PropertyWrapper<bool> ("GenerateFormattingUndoStep", false);
+		public bool GenerateFormattingUndoStep {
+			get {
+				return generateFormattingUndoStep;
+			}
+			set {
+				if (generateFormattingUndoStep.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+		
+		bool overrideDocumentEolMarker = false;
+		public bool OverrideDocumentEolMarker {
+			get {
+				return overrideDocumentEolMarker;
+			}
+			set {
+				if (overrideDocumentEolMarker != value) {
+					overrideDocumentEolMarker = value;
+					OnChanged (EventArgs.Empty);
+				}
+			}
+		}
+
+		PropertyWrapper<ShowWhitespaces> showWhitespaces = new PropertyWrapper<ShowWhitespaces> ("ShowWhitespaces", ShowWhitespaces.Never);
+		public ShowWhitespaces ShowWhitespaces {
+			get {
+				return showWhitespaces;
+			}
+			set {
+				if (showWhitespaces.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		PropertyWrapper<IncludeWhitespaces> includeWhitespaces = new PropertyWrapper<IncludeWhitespaces> ("IncludeWhitespaces", IncludeWhitespaces.All);
+		public IncludeWhitespaces IncludeWhitespaces {
+			get {
+				return includeWhitespaces;
+			}
+			set {
+				if (includeWhitespaces.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+		#endregion
+		
+		public void Dispose ()
+		{
+			FontService.RemoveCallback (UpdateFont);
+		}
+
+		protected void OnChanged (EventArgs args)
+		{
+			if (Changed != null)
+				Changed (null, args);
+		}
+
+		public event EventHandler Changed;
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentContext.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentContext.cs
new file mode 100644
index 0000000000..58cac26e26
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentContext.cs
@@ -0,0 +1,158 @@
+//
+// DocumentContext.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Projects;
+using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.TypeSystem;
+using System.Threading.Tasks;
+using System.Threading;
+using Microsoft.CodeAnalysis.Options;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Editor.Projection;
+
+namespace MonoDevelop.Ide.Editor
+{
+	/// <summary>
+	/// A document context puts a textual document in a semantic context inside a project and gives access
+	/// to the parse information of the textual document.
+	/// </summary>
+	public abstract class DocumentContext
+	{
+		/// <summary>
+		/// The name of the document. It's the file name for files on disc. 
+		/// For unsaved files that name is different.
+		/// </summary>
+		public abstract string Name
+		{
+			get;
+		}
+
+		/// <summary>
+		/// Project != null
+		/// </summary>
+		public virtual bool HasProject
+		{
+			get { return Project != null; }
+		}
+
+		/// <summary>
+		/// Gets the project this context is in.
+		/// </summary>
+		public abstract Project Project
+		{
+			get;
+		}
+
+		public Microsoft.CodeAnalysis.Workspace RoslynWorkspace
+		{
+			get;
+			protected set;
+		}
+
+		/// <summary>
+		/// Returns the roslyn document for this document. This may return <c>null</c> if it's no compileable document.
+		/// Even if it's a C# file.
+		/// </summary>
+		public abstract Microsoft.CodeAnalysis.Document AnalysisDocument
+		{
+			get;
+		}
+
+		/// <summary>
+		/// The parsed document. Contains all syntax information about the text.
+		/// </summary>
+		public abstract ParsedDocument ParsedDocument
+		{
+			get;
+		}
+
+		/// <summary>
+		/// If true, the document is part of the ProjectContent.
+		/// </summary>
+		public virtual bool IsCompileableInProject
+		{
+			get
+			{
+				return true;
+			}
+		}
+
+		public virtual T GetContent<T>() where T : class
+		{
+			var t = this as T;
+			if (t != null)
+				return t;
+			return null;
+		}
+
+		public virtual IEnumerable<T> GetContents<T>() where T : class
+		{
+			var t = this as T;
+			if (t != null)
+				yield return t;
+		}
+
+		/// <summary>
+		/// This is called after the ParsedDocument updated.
+		/// </summary>
+		public event EventHandler DocumentParsed;
+
+		protected void OnDocumentParsed (EventArgs e)
+		{
+			var handler = DocumentParsed;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		public abstract void AttachToProject (Project project);
+
+		/// <summary>
+		/// Forces a reparse of the document. This call doesn't block the ui thread. 
+		/// The next call to ParsedDocument will give always the current parsed document but may block the UI thread.
+		/// </summary>
+		public abstract void ReparseDocument ();
+
+		public abstract OptionSet GetOptionSet ();
+
+		public abstract ParsedDocument UpdateParseDocument ();
+
+		// TODO: IMO that needs to be handled differently (this is atm only used in the ASP.NET binding)
+		// Maybe using the file service. Files can be changed/saved w/o beeing opened.
+		public event EventHandler Saved;
+
+		protected virtual void OnSaved (EventArgs e)
+		{
+			var handler = Saved;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		internal virtual Task<IReadOnlyList<Editor.Projection.Projection>> GetPartialProjectionsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentLocation.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentLocation.cs
new file mode 100644
index 0000000000..7e95e9df8e
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentLocation.cs
@@ -0,0 +1,241 @@
+//
+// DocumentLocation.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace MonoDevelop.Ide.Editor
+{
+	/// <summary>
+	/// A line/column position.
+	/// Text editor lines/columns are counted started from one.
+	/// </summary>
+	/// <remarks>
+	/// The document provides the methods <see cref="Editor.IDocument.GetLocation"/> and
+	/// <see cref="Editor.IDocument.GetOffset(TextLocation)"/> to convert between offsets and TextLocations.
+	/// </remarks>
+	[Serializable]
+	[TypeConverter(typeof(DocumentLocationConverter))]
+	public struct DocumentLocation : IComparable<DocumentLocation>, IEquatable<DocumentLocation>
+	{
+		/// <summary>
+		/// Represents no text location (0, 0).
+		/// </summary>
+		public static readonly DocumentLocation Empty = new DocumentLocation(0, 0);
+
+		/// <summary>
+		/// Constant of the minimum line.
+		/// </summary>
+		public const int MinLine   = 1;
+
+		/// <summary>
+		/// Constant of the minimum column.
+		/// </summary>
+		public const int MinColumn = 1;
+
+		/// <summary>
+		/// Creates a TextLocation instance.
+		/// </summary>
+		public DocumentLocation(int line, int column)
+		{
+			this.line = line;
+			this.column = column;
+		}
+
+		int column, line;
+
+		/// <summary>
+		/// Gets the line number.
+		/// </summary>
+		public int Line {
+			get { return line; }
+		}
+
+		/// <summary>
+		/// Gets the column number.
+		/// </summary>
+		public int Column {
+			get { return column; }
+		}
+
+		/// <summary>
+		/// Gets whether the TextLocation instance is empty.
+		/// </summary>
+		public bool IsEmpty {
+			get {
+				return column < MinLine && line < MinColumn;
+			}
+		}
+
+		/// <summary>
+		/// Gets a string representation for debugging purposes.
+		/// </summary>
+		public override string ToString()
+		{
+			return string.Format(CultureInfo.InvariantCulture, "(Line {1}, Col {0})", this.column, this.line);
+		}
+
+		/// <summary>
+		/// Gets a hash code.
+		/// </summary>
+		public override int GetHashCode()
+		{
+			return unchecked (column << 20 ^ line);
+		}
+
+		/// <summary>
+		/// Equality test.
+		/// </summary>
+		public override bool Equals(object obj)
+		{
+			if (!(obj is DocumentLocation)) return false;
+			return (DocumentLocation)obj == this;
+		}
+
+		/// <summary>
+		/// Equality test.
+		/// </summary>
+		public bool Equals(DocumentLocation other)
+		{
+			return this == other;
+		}
+
+		/// <summary>
+		/// Equality test.
+		/// </summary>
+		public static bool operator ==(DocumentLocation left, DocumentLocation right)
+		{
+			return left.column == right.column && left.line == right.line;
+		}
+
+		/// <summary>
+		/// Inequality test.
+		/// </summary>
+		public static bool operator !=(DocumentLocation left, DocumentLocation right)
+		{
+			return left.column != right.column || left.line != right.line;
+		}
+
+		/// <summary>
+		/// Compares two text locations.
+		/// </summary>
+		public static bool operator <(DocumentLocation left, DocumentLocation right)
+		{
+			if (left.line < right.line)
+				return true;
+			else if (left.line == right.line)
+				return left.column < right.column;
+			else
+				return false;
+		}
+
+		/// <summary>
+		/// Compares two text locations.
+		/// </summary>
+		public static bool operator >(DocumentLocation left, DocumentLocation right)
+		{
+			if (left.line > right.line)
+				return true;
+			else if (left.line == right.line)
+				return left.column > right.column;
+			else
+				return false;
+		}
+
+		/// <summary>
+		/// Compares two text locations.
+		/// </summary>
+		public static bool operator <=(DocumentLocation left, DocumentLocation right)
+		{
+			return !(left > right);
+		}
+
+		/// <summary>
+		/// Compares two text locations.
+		/// </summary>
+		public static bool operator >=(DocumentLocation left, DocumentLocation right)
+		{
+			return !(left < right);
+		}
+
+		public static implicit operator Microsoft.CodeAnalysis.Text.LinePosition (DocumentLocation location)
+		{
+			return new Microsoft.CodeAnalysis.Text.LinePosition (location.Line - 1, location.Column - 1);
+		}
+
+		public static implicit operator DocumentLocation(Microsoft.CodeAnalysis.Text.LinePosition location)
+		{
+			return new DocumentLocation (location.Line + 1, location.Character + 1);
+		}
+
+		/// <summary>
+		/// Compares two text locations.
+		/// </summary>
+		public int CompareTo(DocumentLocation other)
+		{
+			if (this == other)
+				return 0;
+			if (this < other)
+				return -1;
+			else
+				return 1;
+		}
+	}
+
+	public class DocumentLocationConverter : TypeConverter
+	{
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+		{
+			return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
+		}
+
+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+		{
+			return destinationType == typeof(DocumentLocation) || base.CanConvertTo(context, destinationType);
+		}
+
+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+		{
+			if (value is string) {
+				string[] parts = ((string)value).Split(';', ',');
+				if (parts.Length == 2) {
+					return new DocumentLocation(int.Parse(parts[0]), int.Parse(parts[1]));
+				}
+			}
+			return base.ConvertFrom(context, culture, value);
+		}
+
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{
+			if (value is DocumentLocation) {
+				var loc = (DocumentLocation)value;
+				return loc.Line + ";" + loc.Column;
+			}
+			return base.ConvertTo(context, culture, value, destinationType);
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentRegion.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentRegion.cs
new file mode 100644
index 0000000000..ff5863936b
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentRegion.cs
@@ -0,0 +1,181 @@
+// 
+// DocumentRegion.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using Microsoft.CodeAnalysis;
+
+namespace MonoDevelop.Ide.Editor
+{
+	/// <summary>
+	/// An (Begin, End) pair representing a document span. It's a TextSegment working with lines &amp; columns instead of offsets.
+	/// </summary>
+	public struct DocumentRegion : IEquatable<DocumentRegion>
+	{
+		public static readonly DocumentRegion Empty = new DocumentRegion (0, 0, 0, 0);
+
+		/// <summary>
+		/// Gets a value indicating whether this DocumentRegion is empty.
+		/// </summary>
+		public bool IsEmpty {
+			get {
+				return beginLine < 1;
+			}
+		}
+
+		readonly int beginLine;
+		public int BeginLine {
+			get {
+				return beginLine;
+			}
+		}
+
+		readonly int beginColumn;
+		public int BeginColumn {
+			get {
+				return beginColumn;
+			}
+		}
+
+		readonly int endLine;
+		public int EndLine {
+			get {
+				return endLine;
+			}
+		}
+
+		readonly int endColumn;
+		public int EndColumn {
+			get {
+				return endColumn;
+			}
+		}
+
+		public DocumentLocation Begin {
+			get {
+				return new DocumentLocation (BeginLine, BeginColumn);
+			}
+		}
+		
+		public DocumentLocation End {
+			get {
+				return new DocumentLocation (EndLine, EndColumn);
+			}
+		}
+
+		public DocumentRegion (int beginLine, int beginColumn, int endLine, int endColumn)
+		{
+			this.beginLine = beginLine;
+			this.beginColumn = beginColumn;
+			this.endLine = endLine;
+			this.endColumn = endColumn;
+		}
+		
+		public DocumentRegion (DocumentLocation begin, DocumentLocation end)
+		{
+			beginLine = begin.Line;
+			beginColumn = begin.Column;
+			endLine = end.Line;
+			endColumn = end.Column;
+		}
+
+		public bool Contains (DocumentLocation location)
+		{
+			return Begin <= location && location < End;
+		}
+		
+		public bool Contains (int line, int column)
+		{
+			return Contains (new DocumentLocation (line, column));
+		}
+
+		public bool IsInside (DocumentLocation location)
+		{
+			return Begin <= location && location <= End;
+		}
+
+		public bool IsInside (int line, int column)
+		{
+			return IsInside (new DocumentLocation (line, column));
+		}
+
+		public override bool Equals (object obj)
+		{
+			return obj is DocumentRegion && Equals ((DocumentRegion)obj);
+		}
+
+		public override int GetHashCode ()
+		{
+			return unchecked (Begin.GetHashCode () ^ End.GetHashCode ());
+		}
+
+		public bool Equals (DocumentRegion other)
+		{
+			return Begin == other.Begin && End == other.End;
+		}
+
+		public static bool operator == (DocumentRegion left, DocumentRegion right)
+		{
+			return left.Equals(right);
+		}
+		
+		public static bool operator != (DocumentRegion left, DocumentRegion right)
+		{
+			return !left.Equals(right);
+		}
+
+		public TextSegment GetSegment (TextEditor document)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			var begin = document.LocationToOffset (Begin);
+			var end = document.LocationToOffset (End);
+			return new TextSegment (begin, end - begin);
+		}
+
+		public static implicit operator Microsoft.CodeAnalysis.Text.LinePositionSpan (DocumentRegion location)
+		{
+			return new Microsoft.CodeAnalysis.Text.LinePositionSpan (location.Begin, location.End);
+		}
+
+		public static implicit operator DocumentRegion(Microsoft.CodeAnalysis.Text.LinePositionSpan location)
+		{
+			return new DocumentRegion (location.Start, location.End);
+		}
+
+
+		public static implicit operator DocumentRegion(FileLinePositionSpan location)
+		{
+			return new DocumentRegion (location.StartLinePosition, location.EndLinePosition);
+		}
+
+
+		public override string ToString ()
+		{
+			return string.Format ("[DocumentRegion: Begin={0}, End={1}]", Begin, End);
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditActions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditActions.cs
new file mode 100644
index 0000000000..a72688c0e2
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditActions.cs
@@ -0,0 +1,516 @@
+//
+// EditActions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Text;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor.Util;
+
+namespace MonoDevelop.Ide.Editor
+{
+	/// <summary>
+	/// This class contains some common actions for the text editor.
+	/// </summary>
+	public static class EditActions
+	{
+		public static void MoveCaretDown (TextEditor editor)
+		{
+			editor.EditorActionHost.MoveCaretDown ();
+		}
+
+		public static void MoveCaretUp (TextEditor editor)
+		{
+			editor.EditorActionHost.MoveCaretUp ();
+		}
+
+		public static void MoveCaretRight (TextEditor editor)
+		{
+			editor.EditorActionHost.MoveCaretRight ();
+		}
+
+		public static void MoveCaretLeft (TextEditor editor)
+		{
+			editor.EditorActionHost.MoveCaretLeft ();
+		}
+
+		public static void MoveCaretToLineEnd (TextEditor editor)
+		{
+			editor.EditorActionHost.MoveCaretToLineEnd ();
+		}
+
+		public static void MoveCaretToLineStart (TextEditor editor)
+		{
+			editor.EditorActionHost.MoveCaretToLineStart ();
+		}
+
+		public static void MoveCaretToDocumentStart (TextEditor editor)
+		{
+			editor.EditorActionHost.MoveCaretToDocumentStart ();
+		}
+
+		public static void MoveCaretToDocumentEnd (TextEditor editor)
+		{
+			editor.EditorActionHost.MoveCaretToDocumentEnd ();
+		}
+
+		public static void Backspace (TextEditor editor)
+		{
+			editor.EditorActionHost.Backspace ();
+		}
+
+		public static void Delete (TextEditor editor)
+		{
+			editor.EditorActionHost.Delete ();
+		}
+
+		public static void ClipboardCopy (TextEditor editor)
+		{
+			editor.EditorActionHost.ClipboardCopy ();
+		}
+
+		public static void ClipboardCut (TextEditor editor)
+		{
+			editor.EditorActionHost.ClipboardCut ();
+		}
+
+		public static void ClipboardPaste (TextEditor editor)
+		{
+			editor.EditorActionHost.ClipboardPaste ();
+		}
+
+
+
+		public static void SelectAll (TextEditor editor)
+		{
+			editor.EditorActionHost.SelectAll ();
+		}
+
+		public static void NewLine (TextEditor editor)
+		{
+			editor.EditorActionHost.NewLine ();
+		}
+
+		public static void PageUp (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.PageUp ();
+		}
+
+		public static void PageDown (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.PageDown ();
+		}
+
+		public static void Undo (TextEditor editor)
+		{
+			editor.EditorActionHost.Undo ();
+		}
+
+		public static void Redo (TextEditor editor)
+		{
+			editor.EditorActionHost.Redo ();
+		}
+
+		public static void DeleteCurrentLine (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.DeleteCurrentLine ();
+		}
+
+		public static void DeleteCurrentLineToEnd (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.DeleteCurrentLineToEnd ();
+		}
+
+		public static void ScrollLineUp (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.ScrollLineUp ();
+		}
+
+		public static void ScrollLineDown (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.ScrollLineDown ();
+		}
+
+		public static void ScrollPageUp (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.ScrollPageUp ();
+		}
+
+		public static void ScrollPageDown (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.ScrollPageDown ();
+		}
+
+		public static void GotoMatchingBrace (TextEditor textEditor)
+		{
+			var offset = SimpleBracketMatcher.GetMatchingBracketOffset (textEditor, textEditor.CaretOffset);
+			if (offset > 0)
+				textEditor.CaretOffset = offset;
+		}
+
+		public static void MovePrevWord (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.MovePrevWord ();
+		}
+
+		public static void MoveNextWord (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.MoveNextWord ();
+		}
+
+		public static void MovePrevSubWord (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.MovePrevSubWord ();
+		}
+
+		public static void MoveNextSubWord (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.MoveNextSubWord ();
+		}
+
+
+		public static void TransposeCharacters (TextEditor textEditor)
+		{
+			// Code from Mono.TextEditor.MiscActions.TransposeCharacters
+			if (textEditor.CaretOffset == 0)
+				return;
+			var line = textEditor.GetLine (textEditor.CaretLine);
+			if (line == null)
+				return;
+			using (var undoGroup = textEditor.OpenUndoGroup ()) {
+				int transposeOffset = textEditor.CaretOffset - 1;
+				char ch;
+				if (textEditor.CaretColumn == 0) {
+					var lineAbove = textEditor.GetLine (textEditor.CaretLine - 1);
+					if (lineAbove.Length == 0 && line.Length == 0)
+						return;
+
+					if (line.Length != 0) {
+						ch = textEditor.GetCharAt (textEditor.CaretOffset);
+						textEditor.RemoveText (textEditor.CaretOffset, 1);
+						textEditor.InsertText (lineAbove.Offset + lineAbove.Length, ch.ToString ());
+						return;
+					}
+
+					int lastCharOffset = lineAbove.Offset + lineAbove.Length - 1;
+					ch = textEditor.GetCharAt (lastCharOffset);
+					textEditor.RemoveText (lastCharOffset, 1);
+					textEditor.InsertAtCaret (ch.ToString ());
+					return;
+				}
+
+				int offset = textEditor.CaretOffset;
+				if (textEditor.CaretColumn >= line.Length + 1) {
+					offset = line.Offset + line.Length - 1;
+					transposeOffset = offset - 1;
+					// case one char in line:
+					if (transposeOffset < line.Offset) {
+						var lineAbove = textEditor.GetLine (textEditor.CaretLine - 1);
+						transposeOffset = lineAbove.Offset + lineAbove.Length;
+						ch = textEditor.GetCharAt (offset);
+						textEditor.RemoveText (offset, 1);
+						textEditor.InsertText (transposeOffset, ch.ToString ());
+						textEditor.CaretOffset = line.Offset;
+						return;
+					}
+				}
+
+				ch = textEditor.GetCharAt (offset);
+				textEditor.ReplaceText (offset, 1, textEditor.GetCharAt (transposeOffset).ToString ());
+				textEditor.ReplaceText (transposeOffset, 1, ch.ToString ());
+				if (textEditor.CaretColumn < line.Length + 1)
+					textEditor.CaretOffset = offset + 1;
+			}
+		}
+
+		public static void DuplicateCurrentLine (TextEditor textEditor)
+		{
+			// Code from Mono.TextEditor.MiscActions.DuplicateLine
+			using (var undoGroup = textEditor.OpenUndoGroup ()) {
+				if (textEditor.IsSomethingSelected) {
+					var selectedText = textEditor.SelectedText;
+					textEditor.ClearSelection ();
+					textEditor.InsertAtCaret (selectedText);
+				} else {
+					var line = textEditor.GetLine (textEditor.CaretLine);
+					if (line == null)
+						return;
+					textEditor.InsertText (line.Offset, textEditor.GetTextAt (line.SegmentIncludingDelimiter));
+				}
+			}
+		}
+
+		public static void JoinLines (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.JoinLines ();
+		}
+
+		public static void RecenterEditor (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.RecenterEditor ();
+		}
+
+		public static void StartCaretPulseAnimation (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.StartCaretPulseAnimation ();
+		}
+
+		public static void DeleteNextSubword (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.DeleteNextSubword ();
+		}
+
+		public static void DeletePreviousSubword (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.DeletePreviousSubword ();
+		}
+
+		public static void DeleteNextWord (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.DeleteNextWord ();
+		}
+
+		public static void DeletePreviousWord (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.DeletePreviousWord ();
+		}
+
+		public static void InsertNewLinePreserveCaretPosition (TextEditor textEditor)
+		{
+			if (textEditor.IsReadOnly)
+				return;
+			using (var undoGroup = textEditor.OpenUndoGroup ()) {
+				var loc = textEditor.CaretLocation;
+				InsertNewLine (textEditor);
+				textEditor.CaretLocation = loc;
+			}
+		}
+
+		public static void InsertNewLineAtEnd (TextEditor textEditor)
+		{
+			if (textEditor.IsReadOnly)
+				return;
+			using (var undoGroup = textEditor.OpenUndoGroup ()) {
+				MoveCaretToLineEnd (textEditor);
+				InsertNewLine (textEditor);
+			}
+		}
+
+		public static void InsertNewLine (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.InsertNewLine ();
+		}
+
+		public static void RemoveTab (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.RemoveTab ();
+		}
+
+		public static void InsertTab (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.InsertTab ();
+		}
+
+		public static void SwitchCaretMode (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.SwitchCaretMode ();
+		}
+
+		public static void MoveBlockUp (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.MoveBlockUp ();
+		}
+
+		public static void MoveBlockDown (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.MoveBlockDown ();
+		}
+
+		public static void ToggleBlockSelectionMode (TextEditor textEditor)
+		{
+			textEditor.EditorActionHost.ToggleBlockSelectionMode ();
+		}
+
+		public static void IndentSelection (TextEditor editor)
+		{
+			editor.EditorActionHost.IndentSelection ();
+		}
+
+		public static void UnIndentSelection (TextEditor editor)
+		{
+			editor.EditorActionHost.UnIndentSelection ();
+		}
+
+		#region SelectionActions
+
+		static void RunSelectionAction (TextEditor textEditor, Action<TextEditor> action)
+		{
+			using (var undo = textEditor.OpenUndoGroup ()) {
+				var anchor = textEditor.IsSomethingSelected ? textEditor.SelectionAnchorOffset : textEditor.CaretOffset;
+				action (textEditor);
+				textEditor.SetSelection (anchor, textEditor.CaretOffset);
+			}
+		}
+
+		public static void SelectionMoveToDocumentEnd (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MoveCaretToDocumentEnd);
+		}
+
+		public static void ExpandSelectionToLine (TextEditor textEditor)
+		{
+			// from Mono.TextEditor.SelectionActions.ExpandSelectionToLine
+			using (var undoGroup = textEditor.OpenUndoGroup ()) {
+				var curLineSegment = textEditor.GetLine (textEditor.CaretLine).SegmentIncludingDelimiter;
+				var range = textEditor.SelectionRange;
+				var selection = TextSegment.FromBounds (
+					System.Math.Min (range.Offset, curLineSegment.Offset),
+					System.Math.Max (range.EndOffset, curLineSegment.EndOffset));
+				textEditor.CaretOffset = selection.EndOffset;
+				textEditor.SelectionRange = selection;
+			}
+		}
+
+		public static void SelectionMoveToDocumentStart (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MoveCaretToDocumentStart);
+		}
+
+		public static void SelectionMoveLineEnd (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MoveCaretToLineEnd);
+		}
+
+		public static void SelectionMoveLineStart (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MoveCaretToLineStart);
+		}
+
+		public static void SelectionMoveDown (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MoveCaretDown);
+		}
+
+		public static void SelectionMoveUp (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MoveCaretUp);
+		}
+
+		public static void SelectionPageUp (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, PageUp);
+		}
+
+		public static void SelectionPageDown (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, PageDown);
+		}
+
+		public static void SelectionMovePrevSubWord (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MovePrevSubWord);
+		}
+
+		public static void SelectionMoveNextSubWord (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MoveNextSubWord);
+		}
+
+		public static void SelectionMoveLeft (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MoveCaretLeft);
+		}
+
+		public static void SelectionMoveRight (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MoveCaretRight);
+		}
+
+		public static void SelectionMovePrevWord (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MovePrevWord);
+		}
+
+		public static void SelectionMoveNextWord (TextEditor textEditor)
+		{
+			RunSelectionAction (textEditor, MoveNextWord);
+		}
+
+		public static void SortSelectedLines (TextEditor textEditor)
+		{
+			var selectionRegion = textEditor.SelectionRegion;
+			var start = selectionRegion.Begin;
+			var end = selectionRegion.End;
+			var caret = textEditor.CaretLocation;
+
+			int startLine = start.Line;
+			int endLine = end.Line;
+			if (startLine == endLine)
+				return;
+
+			int length = 0;
+			var lines = new string[endLine - startLine + 1];
+			for (int i = startLine; i <= endLine; i++) {
+				//get lines *with* line endings
+				var lineText = textEditor.GetLineText (i, true);
+				lines [i - startLine] = lineText;
+				length += lineText.Length;
+			}
+
+			var linesUnsorted = new string[lines.Length];
+
+			Array.Sort (lines, StringComparer.Ordinal);
+
+			bool changed = false;
+			for (int i = 0; i <= lines.Length; i++) {
+				//can't simply use reference comparison as Array.Sort is not stable
+				if (string.Equals (lines [i], linesUnsorted [i], StringComparison.Ordinal)) {
+					continue;
+				}
+				changed = true;
+				break;
+			}
+			if (!changed)
+				return;
+
+
+			var sb = new StringBuilder ();
+			for (int i = 0; i < lines.Length; i++) {
+				sb.Append (lines [i]);
+			}
+
+			var startOffset = textEditor.LocationToOffset (startLine, 1);
+			textEditor.ReplaceText (startOffset, length, sb.ToString ());
+
+			textEditor.CaretLocation = LimitColumn (textEditor, caret);
+			textEditor.SetSelection (LimitColumn (textEditor, start), LimitColumn (textEditor, end));
+		}
+
+		static DocumentLocation LimitColumn (TextEditor data, DocumentLocation loc)
+		{
+			return new DocumentLocation (loc.Line, System.Math.Min (loc.Column, data.GetLine (loc.Line).Length + 1));
+		}
+		#endregion
+	}
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/FileSettingsStore.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/FileSettingsStore.cs
new file mode 100644
index 0000000000..bec7ddd1b6
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/FileSettingsStore.cs
@@ -0,0 +1,73 @@
+//
+// FileSettingsStore.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public static class FileSettingsStore
+	{
+		public class Settings
+		{
+			public int CaretOffset { get; set; }
+
+			public double vAdjustment { get; set; }
+
+			public double hAdjustment { get; set; }
+
+			public Dictionary<int, bool> FoldingStates = new Dictionary<int, bool> ();
+
+			public override string ToString ()
+			{
+				return string.Format ("[Settings: CaretOffset={0}, vAdjustment={1}, hAdjustment={2}]", CaretOffset, vAdjustment, hAdjustment);
+			}
+		}
+
+		static Dictionary<string, Settings> settingStore = new Dictionary<string, Settings> ();
+
+		public static bool TryGetValue (string contentName, out Settings settings)
+		{
+			if (contentName == null)
+				throw new ArgumentNullException ("contentName");
+			return settingStore.TryGetValue (contentName, out settings);
+		}
+
+		public static void Store (string contentName, Settings settings)
+		{
+			if (contentName == null)
+				throw new ArgumentNullException ("contentName");
+			if (settings == null)
+				throw new ArgumentNullException ("settings");
+			settingStore [contentName] = settings;
+		}
+
+		public static void Remove (string fileName)
+		{
+			settingStore.Remove (fileName);
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/FoldSegmentFactory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/FoldSegmentFactory.cs
new file mode 100644
index 0000000000..468defb00f
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/FoldSegmentFactory.cs
@@ -0,0 +1,86 @@
+//
+// FoldSegmentFactory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public static class FoldSegmentFactory
+	{
+		public static IFoldSegment CreateFoldSegment (TextEditor editor, int offset, int length, bool isCollapsed = false, string collapsedText = "...", FoldingType foldingType = FoldingType.Unknown)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			var result =  editor.CreateFoldSegment (offset, length, isCollapsed);
+			result.CollapsedText = collapsedText;
+			result.FoldingType = foldingType;
+			return result;
+		}
+
+		public static IFoldSegment CreateFoldSegment (TextEditor editor, ISegment segment, bool isCollapsed = false, string collapsedText = "...", FoldingType foldingType = FoldingType.Unknown)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return CreateFoldSegment (editor, segment.Offset, segment.Length, isCollapsed, collapsedText, foldingType);
+		}
+
+		public static IFoldSegment CreateFoldSegment (TextEditor editor, int offset, int length, string collapsedText = "...", FoldingType foldingType = FoldingType.Unknown)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			return CreateFoldSegment (editor, offset, length, false, collapsedText, foldingType);
+		}
+
+		public static IFoldSegment CreateFoldSegment (TextEditor editor, ISegment segment, string collapsedText = "...", FoldingType foldingType = FoldingType.Unknown)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return CreateFoldSegment (editor, segment.Offset, segment.Length, false, collapsedText, foldingType);
+		}
+
+		public static IFoldSegment CreateFoldSegment (TextEditor editor, int offset, int length, FoldingType foldingType = FoldingType.Unknown)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			return CreateFoldSegment (editor, offset, length, false, "...", foldingType);
+		}
+
+		public static IFoldSegment CreateFoldSegment (TextEditor editor, ISegment segment, FoldingType foldingType = FoldingType.Unknown)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return CreateFoldSegment (editor, segment.Offset, segment.Length, false, "...", foldingType);
+		}
+
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IDocumentLine.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IDocumentLine.cs
new file mode 100644
index 0000000000..7135d74dad
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IDocumentLine.cs
@@ -0,0 +1,118 @@
+//
+// IDocumentLine.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using System.Text;
+using MonoDevelop.Ide.Editor.Highlighting;
+
+namespace MonoDevelop.Ide.Editor
+{
+	/// <summary>
+	/// A line inside a <see cref="ITextDocument"/>.
+	/// </summary>
+	public interface IDocumentLine : ISegment
+	{
+		/// <summary>
+		/// Gets the length of the line including the line delimiter.
+		/// </summary>
+		int LengthIncludingDelimiter {
+			get;
+		}
+
+		int EndOffsetIncludingDelimiter {
+			get;
+		}
+
+		/// <summary>
+		/// Gets the text segment of the line including the line delimiter.
+		/// </summary>
+		ISegment SegmentIncludingDelimiter {
+			get;
+		}
+
+		/// <summary>
+		/// Gets the unicode newline for this line. Returns UnicodeNewline.Unknown for no new line (in the last line of the document)
+		/// </summary>EndOffsetIncludingDelimiterEndOffsetIncludingDelimiter
+		UnicodeNewline UnicodeNewline {
+			get;
+		}
+
+		/// <summary>
+		/// Gets the length of the line terminator.
+		/// Returns 1 or 2; or 0 at the end of the document.
+		/// </summary>
+		int DelimiterLength { get; }
+
+		/// <summary>
+		/// Gets the number of this line.
+		/// The first line has the number 1.
+		/// </summary>
+		int LineNumber { get; }
+
+		/// <summary>
+		/// Gets the previous line. Returns null if this is the first line in the document.
+		/// </summary>
+		IDocumentLine PreviousLine { get; }
+
+		/// <summary>
+		/// Gets the next line. Returns null if this is the last line in the document.
+		/// </summary>
+		IDocumentLine NextLine { get; }
+
+		/// <summary>
+		/// Gets whether the line was deleted.
+		/// </summary>
+		bool IsDeleted { get; }
+	}
+
+	public static class DocumentLineExt
+	{
+		/// <summary>
+		/// This method gets the line indentation.
+		/// </summary>
+		/// <param name = "line"></param>
+		/// <param name="doc">
+		/// The <see cref="IReadonlyTextDocument"/> the line belongs to.
+		/// </param>
+		/// <returns>
+		/// The indentation of the line (all whitespace chars up to the first non ws char).
+		/// </returns>
+		public static string GetIndentation (this IDocumentLine line, IReadonlyTextDocument  doc)
+		{
+			var result = new StringBuilder ();
+			int offset = line.Offset;
+			int max = Math.Min (offset + line.LengthIncludingDelimiter, doc.Length);
+			for (int i = offset; i < max; i++) {
+				char ch = doc.GetCharAt (i);
+				if (ch != ' ' && ch != '\t')
+					break;
+				result.Append (ch);
+			}
+			return result.ToString ();
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IFoldSegment.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IFoldSegment.cs
new file mode 100644
index 0000000000..d1708faf36
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IFoldSegment.cs
@@ -0,0 +1,74 @@
+//
+// IFoldSegment.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using System.Web.UI.WebControls;
+
+namespace MonoDevelop.Ide.Editor
+{
+	/// <summary>
+	/// Represents the origin for a fold segment
+	/// </summary>
+	public enum FoldingType {
+		Unknown,
+		Region,
+		TypeDefinition,
+		TypeMember,
+		Comment
+	}
+
+	/// <summary>
+	/// A fold segment represents a collapsible region inside the text editor.
+	/// </summary>
+	public interface IFoldSegment : ISegment
+	{
+		/// <summary>
+		/// Gets or sets a value indicating whether this fold segment is collapsed.
+		/// </summary>
+		bool IsCollapsed {
+			get;
+			set;
+		}
+
+		/// <summary>
+		/// Gets or sets the collapsed text. This is displayed when the folding is collapsed instead of the collapsed region.
+		/// </summary>
+		string CollapsedText {
+			get;
+			set;
+		}
+
+		/// <summary>
+		/// Gets or sets the type of the folding. This type gives some info about where this folding segment
+		/// originates from.
+		/// </summary>
+		FoldingType FoldingType {
+			get;
+			set;
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IReadonlyTextDocument.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IReadonlyTextDocument.cs
new file mode 100644
index 0000000000..616e2fd1d1
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IReadonlyTextDocument.cs
@@ -0,0 +1,246 @@
+//
+// IReadonlyTextDocument.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Core.Text;
+using System.Collections.Generic;
+using System.Text;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor.Util;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public interface IReadonlyTextDocument : ITextSource
+	{
+		bool IsReadOnly { get; }
+
+		FilePath FileName { get; }
+
+		string MimeType { get; }
+
+		/// <summary>
+		/// Gets the number of lines in the document.
+		/// </summary>
+		int LineCount { get; }
+
+		int LocationToOffset (int line, int column);
+
+		DocumentLocation OffsetToLocation (int offset);
+
+		IDocumentLine GetLine (int lineNumber);
+
+		IDocumentLine GetLineByOffset (int offset);
+	}
+
+	public static class ReadonlyTextDocumentExtensions
+	{
+		/// <summary>
+		/// Retrieves the text for a portion of the document.
+		/// </summary>
+		/// <exception cref="ArgumentOutOfRangeException">offset or length is outside the valid range.</exception>
+		public static string GetTextAt(this IReadonlyTextDocument source, ISegment segment)
+		{
+			if (source == null)
+				throw new ArgumentNullException ("source");
+			return source.GetTextAt (segment.Offset, segment.Length);
+		}
+
+		public static IEnumerable<IDocumentLine> GetLines (this IReadonlyTextDocument document)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			return document.GetLinesStartingAt (1);
+		}
+
+		public static IEnumerable<IDocumentLine> GetLinesBetween (this IReadonlyTextDocument document, int startLine, int endLine)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			if (startLine < 1 || startLine > document.LineCount)
+				throw new ArgumentOutOfRangeException ("startLine", startLine, string.Format ("value should be between 1 and {0}", document.LineCount));
+			if (endLine < 1 || endLine > document.LineCount)
+				throw new ArgumentOutOfRangeException ("endLine", endLine, string.Format ("value should be between 1 and {0}", document.LineCount));
+
+			var curLine = document.GetLine (startLine);
+			int count = endLine - startLine;
+			while (curLine != null && count --> 0) {
+				yield return curLine;
+				curLine = curLine.NextLine;
+			}
+		}
+
+		public static IEnumerable<IDocumentLine> GetLinesStartingAt (this IReadonlyTextDocument document, int startLine)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			if (startLine < 1 || startLine > document.LineCount)
+				throw new ArgumentOutOfRangeException ("startLine", startLine, string.Format ("value should be between 1 and {0}", document.LineCount));
+			var curLine = document.GetLine (startLine);
+			while (curLine != null) {
+				yield return curLine;
+				curLine = curLine.NextLine;
+			}
+		}
+
+		public static IEnumerable<IDocumentLine> GetLinesReverseStartingAt (this IReadonlyTextDocument document, int startLine)
+		{
+			if (startLine < 1 || startLine > document.LineCount)
+				throw new ArgumentOutOfRangeException ("startLine", startLine, string.Format ("value should be between 1 and {0}", document.LineCount));
+			var curLine = document.GetLine (startLine);
+			while (curLine != null) {
+				yield return curLine;
+				curLine = curLine.PreviousLine;
+			}
+		}
+
+		public static string GetTextBetween (this IReadonlyTextDocument document, int startLine, int startColumn, int endLine, int endColumn)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			return document.GetTextBetween (new DocumentLocation (startLine, startColumn), new DocumentLocation (endLine, endColumn));
+		}
+
+		public static string GetLineIndent (this IReadonlyTextDocument document, int lineNumber)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			return document.GetLineIndent (document.GetLine (lineNumber));
+		}
+
+		public static string GetLineIndent (this IReadonlyTextDocument document, IDocumentLine segment)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return segment.GetIndentation (document);
+		}
+
+		public static string GetLineText (this IReadonlyTextDocument document, IDocumentLine line, bool includeDelimiter = false)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			if (line == null)
+				throw new ArgumentNullException ("line");
+			return document.GetTextAt (includeDelimiter ? line.SegmentIncludingDelimiter : line);
+		}
+
+		public static string GetLineText (this IReadonlyTextDocument document, int lineNumber, bool includeDelimiter = false)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			var line = document.GetLine (lineNumber);
+			return document.GetTextAt (includeDelimiter ? line.SegmentIncludingDelimiter : line);
+		}
+
+		static int[] GetDiffCodes (IReadonlyTextDocument document, ref int codeCounter, Dictionary<string, int> codeDictionary, bool includeEol)
+		{
+			int i = 0;
+			var result = new int[document.LineCount];
+			foreach (var line in document.GetLinesStartingAt (1)) {
+				string lineText = document.GetTextAt (line.Offset, includeEol ? line.LengthIncludingDelimiter : line.Length);
+				int curCode;
+				if (!codeDictionary.TryGetValue (lineText, out curCode)) {
+					codeDictionary[lineText] = curCode = ++codeCounter;
+				}
+				result[i] = curCode;
+				i++;
+			}
+			return result;
+		}
+
+		public static IEnumerable<DiffHunk> GetDiff (this IReadonlyTextDocument document, IReadonlyTextDocument changedDocument, bool includeEol = true)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			if (changedDocument == null)
+				throw new ArgumentNullException ("changedDocument");
+			var codeDictionary = new Dictionary<string, int> ();
+			int codeCounter = 0;
+			return Diff.GetDiff<int> (GetDiffCodes (document, ref codeCounter, codeDictionary, includeEol),
+				GetDiffCodes (changedDocument, ref codeCounter, codeDictionary, includeEol));
+		}
+
+		public static string GetDiffAsString (this IReadonlyTextDocument document, IReadonlyTextDocument changedDocument, bool includeEol = true)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			if (changedDocument == null)
+				throw new ArgumentNullException ("changedDocument");
+			return Diff.GetDiffString (GetDiff (document, changedDocument, includeEol), document, changedDocument, document.FileName, changedDocument.FileName);
+		}
+
+		public static int OffsetToLineNumber (this IReadonlyTextDocument document, int offset)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			if (offset < 0 || offset > document.Length)
+				throw new ArgumentOutOfRangeException ("offset", string.Format ("offset should be between 0 and <={0} but was {1}.", document.Length, offset));
+			return document.OffsetToLocation (offset).Line;
+		}
+
+		public static int LocationToOffset (this IReadonlyTextDocument document, DocumentLocation location)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			return document.LocationToOffset (location.Line, location.Column);
+		}
+
+		public static string GetTextBetween (this IReadonlyTextDocument document, int startOffset, int endOffset)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			if (startOffset < 0 || startOffset > document.Length)
+				throw new ArgumentNullException ("startOffset");
+			if (endOffset < 0 || endOffset > document.Length)
+				throw new ArgumentNullException ("endOffset");
+			if (startOffset > endOffset)
+				throw new InvalidOperationException ();
+			return document.GetTextAt (startOffset, endOffset - startOffset);
+		}
+
+		public static string GetTextBetween (this IReadonlyTextDocument document, DocumentLocation start, DocumentLocation end)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			return document.GetTextBetween (document.LocationToOffset (start), document.LocationToOffset (end));
+		}
+
+		public static string GetEolMarker (this IReadonlyTextDocument document)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			string eol = null;
+			if (document.LineCount > 0) {
+				var line = document.GetLine (1);
+				if (line.DelimiterLength > 0) 
+					eol = document.GetTextAt (line.Length, line.DelimiterLength);
+			}
+
+			return !string.IsNullOrEmpty (eol) ? eol : DefaultSourceEditorOptions.Instance.DefaultEolMarker;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextDocument.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextDocument.cs
new file mode 100644
index 0000000000..b2ed856224
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextDocument.cs
@@ -0,0 +1,140 @@
+//
+// ITextDocument.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Core.Text;
+using System.Text;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public interface ITextDocument : IReadonlyTextDocument
+	{
+		/// <summary>
+		/// Gets/Sets the text of the whole document..
+		/// </summary>
+		new string Text { get; set; } // hides ITextSource.Text to add the setter
+
+		/// <summary>
+		/// Gets or Sets a character at the specified position in the document.
+		/// </summary>
+		/// <paramref name="offset">The index of the character to get.</paramref>
+		/// <exception cref="ArgumentOutOfRangeException">Offset is outside the valid range (0 to TextLength-1).</exception>
+		/// <returns>The character at the specified position.</returns>
+		/// <remarks>This is the same as Text[offset], but is more efficient because
+		///  it doesn't require creating a String object.</remarks>
+		new char this [int offset] { get; set; }
+
+		new bool IsReadOnly { get; set; }
+
+		new FilePath FileName { get; set; }
+
+		new string MimeType { get; set; }
+
+		new bool UseBOM { get; set; }
+
+		new Encoding Encoding { get; set; }
+
+		void InsertText (int offset, string text);
+
+		void InsertText (int offset, ITextSource text);
+
+		void RemoveText (int offset, int length);
+
+		void ReplaceText (int offset, int length, string value);
+
+		void ReplaceText (int offset, int length, ITextSource value);
+
+		bool IsInAtomicUndo {
+			get;
+		}
+
+		IDisposable OpenUndoGroup();
+
+		/// <summary>
+		/// This event is called directly before a change is applied to the document.
+		/// </summary>
+		/// <remarks>
+		/// It is invalid to modify the document within this event handler.
+		/// Aborting the change (by throwing an exception) is likely to cause corruption of data structures
+		/// that listen to the Changing and Changed events.
+		/// </remarks>
+		event EventHandler<TextChangeEventArgs> TextChanging;
+
+		/// <summary>
+		/// This event is called directly after a change is applied to the document.
+		/// </summary>
+		/// <remarks>
+		/// It is invalid to modify the document within this event handler.
+		/// Aborting the event handler (by throwing an exception) is likely to cause corruption of data structures
+		/// that listen to the Changing and Changed events.
+		/// </remarks>
+		event EventHandler<TextChangeEventArgs> TextChanged;
+
+		event EventHandler FileNameChanged;
+		event EventHandler MimeTypeChanged;
+
+		/// <summary>
+		/// Creates an immutable snapshot of this document.
+		/// </summary>
+		IReadonlyTextDocument CreateDocumentSnapshot();
+
+//		event EventHandler<LineEventArgs> LineChanged;
+//		event EventHandler<LineEventArgs> LineInserted;
+//		event EventHandler<LineEventArgs> LineRemoved;
+	}
+
+	public static class DocumentExtensions
+	{
+		public static void RemoveText (this ITextDocument document, ISegment segment)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			document.RemoveText (segment.Offset, segment.Length);
+		}
+
+		public static void ReplaceText (this ITextDocument document, ISegment segment, string value)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			document.ReplaceText (segment.Offset, segment.Length, value);
+		}
+
+		public static void ReplaceText (this ITextDocument document, ISegment segment, ITextSource textSource)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			document.ReplaceText (segment.Offset, segment.Length, textSource);
+		}
+
+		public static void Save (this ITextDocument document)
+		{
+			if (document == null)
+				throw new ArgumentNullException ("document");
+			document.WriteTextTo (document.FileName); 
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextEditorOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextEditorOptions.cs
new file mode 100644
index 0000000000..223f2cf2ec
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextEditorOptions.cs
@@ -0,0 +1,124 @@
+//
+// ITextEditorOptions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor.Highlighting;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public enum IndentStyle
+	{
+		/// <summary>
+		/// No indentation occurs
+		/// </summary>
+		None,
+
+		/// <summary>
+		/// The indentation from the line above will be
+		/// taken to indent the current line
+		/// </summary>
+		Auto, 
+
+		/// <summary>
+		/// Intelligent, context sensitive indentation will occur
+		/// </summary>
+		Smart,
+
+		/// <summary>
+		/// Intelligent, context sensitive indentation that minimizes whitespaces will occur
+		/// </summary>
+		Virtual
+	}
+
+	public enum ShowWhitespaces {
+		Never,
+		Selection,
+		Always
+	}
+
+	[Flags]
+	public enum IncludeWhitespaces {
+		None        = 0,
+		Space       = 1,
+		Tab         = 2,
+		LineEndings = 4,
+		All         = Space | Tab | LineEndings
+	}
+
+	public interface ITextEditorOptions : IDisposable
+	{
+		WordFindStrategy WordFindStrategy { get; }
+
+		bool TabsToSpaces { get; }
+		int IndentationSize { get; }
+		int TabSize { get; }
+		bool ShowIconMargin { get; }
+		bool ShowLineNumberMargin { get; }
+		bool ShowFoldMargin { get; }
+		bool HighlightCaretLine { get; }
+		int RulerColumn { get; }
+		bool ShowRuler { get; }
+		IndentStyle IndentStyle { get; }
+		bool OverrideDocumentEolMarker { get; }
+		bool EnableSyntaxHighlighting { get; }
+		bool RemoveTrailingWhitespaces { get; }
+		
+		bool WrapLines { get; }
+
+		string FontName { get; }
+
+		string GutterFontName { get; }
+
+		string ColorScheme { get;  }
+
+		string DefaultEolMarker { get; }
+
+		bool GenerateFormattingUndoStep { get; }
+
+		ShowWhitespaces ShowWhitespaces { get; }
+
+		IncludeWhitespaces IncludeWhitespaces { get; }
+	}
+
+	public static class TextEditorOptionsExtension
+	{
+		public static ColorScheme GetColorStyle (this ITextEditorOptions options)
+		{
+			if (options == null)
+				throw new ArgumentNullException ("options");
+			return SyntaxModeService.GetColorStyle (options.ColorScheme);
+		}
+
+		/// <summary>
+		/// Gets the indentation string for a single indent.
+		/// </summary>
+		public static string GetIndentationString (this ITextEditorOptions options)
+		{
+			if (options == null)
+				throw new ArgumentNullException ("options");
+			return options.TabsToSpaces ? new string (' ', options.IndentationSize) : "\t";
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextLineMarker.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextLineMarker.cs
new file mode 100644
index 0000000000..982033e951
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextLineMarker.cs
@@ -0,0 +1,80 @@
+//
+// ITextLineMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public interface ITextLineMarker
+	{
+		IDocumentLine Line {
+			get;
+		}
+
+		bool IsVisible {
+			get;
+			set;
+		}
+
+		object Tag {
+			get;
+			set;
+		}
+	}
+
+	public enum UrlType {
+		Unknown,
+		Url,
+		Email
+	}
+
+	public interface IUrlTextLineMarker : ITextLineMarker
+	{
+		UrlType UrlType {
+			get;
+		}
+
+		string Url {
+			get;
+		}
+	}
+
+	public interface ICurrentDebugLineTextMarker :  ITextLineMarker
+	{
+
+	}
+
+	public interface IMessageBubbleLineMarker : ITextLineMarker
+	{
+		int TaskCount { get; }
+
+		MonoDevelop.Ide.Tasks.TaskListEntry PrimaryTask { get; set; }
+
+		IEnumerable<MonoDevelop.Ide.Tasks.TaskListEntry> Tasks { get; }
+
+		void AddTask (MonoDevelop.Ide.Tasks.TaskListEntry task);
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextSegmentMarker.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextSegmentMarker.cs
new file mode 100644
index 0000000000..625f960988
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextSegmentMarker.cs
@@ -0,0 +1,86 @@
+//
+// ITextSegmentMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public interface ITextSegmentMarker : ISegment
+	{
+		bool IsVisible {
+			get;
+			set;
+		}
+
+		object Tag {
+			get;
+			set;
+		}
+
+		event EventHandler<TextMarkerMouseEventArgs> MousePressed;
+		event EventHandler<TextMarkerMouseEventArgs> MouseHover;
+	}
+
+	public enum TextSegmentMarkerEffect {
+		/// <summary>
+		/// The region is marked as waved underline.
+		/// </summary>
+		WavedLine,
+
+		/// <summary>
+		/// The region is marked as dotted line.
+		/// </summary>
+		DottedLine,
+
+		/// <summary>
+		/// The text is grayed out.
+		/// </summary>
+		GrayOut
+	}
+
+	public interface IGenericTextSegmentMarker : ITextSegmentMarker
+	{
+		TextSegmentMarkerEffect Effect { get; }
+
+		HslColor Color { get; set; }
+	}
+
+	public interface IErrorMarker : ITextSegmentMarker
+	{
+		Error Error { get; }
+	}
+
+	public interface ISmartTagMarker : ITextSegmentMarker
+	{
+		bool IsInsideSmartTag (double x, double y);
+
+		bool IsInsideWindow (Gtk.MotionNotifyEventArgs args);
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IUnitTestMarker.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IUnitTestMarker.cs
new file mode 100644
index 0000000000..0350ff9839
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/IUnitTestMarker.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public interface IUnitTestMarker : ITextLineMarker
+	{
+		UnitTestLocation UnitTest { get; }
+
+		void UpdateState ();
+	}
+
+	public abstract class UnitTestMarkerHost
+	{
+		public abstract Xwt.Drawing.Image GetStatusIcon (string unitTestIdentifier, string caseId = null);
+		public abstract bool IsFailure (string unitTestIdentifier, string caseId = null);
+		public abstract string GetMessage (string unitTestIdentifier, string caseId = null);
+		public abstract bool HasResult (string unitTestIdentifier, string caseId = null);
+
+		public abstract void PopupContextMenu (UnitTestLocation unitTest, int x, int y);
+	}
+
+	public class UnitTestLocation
+	{
+		public int Offset { get; set; }
+		public bool IsFixture { get; set; }
+		public string UnitTestIdentifier { get; set; }
+		public bool IsIgnored { get; set; }
+
+		public List<string> TestCases = new List<string> ();
+
+		public UnitTestLocation (int offset)
+		{
+			Offset = offset;
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionCursorEventArgs.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionCursorEventArgs.cs
new file mode 100644
index 0000000000..2f5996cc6a
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionCursorEventArgs.cs
@@ -0,0 +1,51 @@
+//
+// InsertionCursorEventArgs.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Ide.Editor
+{
+	[Serializable]
+	public sealed class InsertionCursorEventArgs : EventArgs
+	{
+		public bool Success {
+			get;
+			private set;
+		}
+
+		public InsertionPoint InsertionPoint {
+			get;
+			private set;
+		}
+
+		public InsertionCursorEventArgs (bool success, InsertionPoint insertionPoint)
+		{
+			Success = success;
+			InsertionPoint = insertionPoint;
+		}
+	}
+
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionModeOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionModeOptions.cs
new file mode 100644
index 0000000000..c65e4cea08
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionModeOptions.cs
@@ -0,0 +1,88 @@
+//
+// InsertionModeOptions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.Editor
+{
+	/// <summary>
+	/// This class contains information the editor needs to initiate the insertion mode.
+	/// </summary>
+	public sealed class InsertionModeOptions
+	{
+		/// <summary>
+		/// A user visible string describing this operation.
+		/// </summary>
+		public string Operation {
+			get;
+			private set;
+		}
+
+		/// <summary>
+		/// The list of insertion points that are used for the insertion mode. The caret is only able to move between
+		/// the insertion points.
+		/// </summary>
+		public IList<InsertionPoint> InsertionPoints {
+			get;
+			private set;
+		}
+
+		/// <summary>
+		/// That's the action that is started after the insertion mode ended.
+		/// </summary>
+		public Action<InsertionCursorEventArgs> ModeExitedAction {
+			get;
+			set;
+		}
+
+		/// <summary>
+		/// Gets or sets the first selected insertion point. The default value is 0.
+		/// </summary>
+		public int FirstSelectedInsertionPoint {
+			get;
+			set;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="MonoDevelop.Ide.Editor.InsertionModeOptions"/> class.
+		/// </summary>
+		/// <param name="operation">A user visible string describing this operation.</param>
+		/// <param name="insertionPoints">The list of insertion points that are used for the insertion mode.</param>
+		/// <param name="modeExitedAction">The action that is started after the exit mode ended.</param>
+		public InsertionModeOptions (string operation, IList<InsertionPoint> insertionPoints, Action<InsertionCursorEventArgs> modeExitedAction)
+		{
+			if (operation == null)
+				throw new ArgumentNullException ("operation");
+			if (insertionPoints == null)
+				throw new ArgumentNullException ("insertionPoints");
+			if (modeExitedAction == null)
+				throw new ArgumentNullException ("modeExitedAction");
+			Operation = operation;
+			InsertionPoints = insertionPoints;
+			ModeExitedAction = modeExitedAction;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionPoint.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionPoint.cs
new file mode 100644
index 0000000000..7bf2808146
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionPoint.cs
@@ -0,0 +1,119 @@
+//
+// InsertionPoint.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.CodeFormatting;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public enum NewLineInsertion
+	{
+		None,
+		Eol,
+		BlankLine
+	}
+
+	public sealed class InsertionPoint 
+	{
+		public DocumentLocation Location {
+			get;
+			set;
+		}
+
+		public NewLineInsertion LineBefore { get; set; }
+		public NewLineInsertion LineAfter { get; set; }
+
+		public InsertionPoint (DocumentLocation location, NewLineInsertion lineBefore, NewLineInsertion lineAfter)
+		{
+			this.Location = location;
+			this.LineBefore = lineBefore;
+			this.LineAfter = lineAfter;
+		}
+
+		public override string ToString ()
+		{
+			return string.Format ("[InsertionPoint: Location={0}, LineBefore={1}, LineAfter={2}]", Location, LineBefore, LineAfter);
+		}
+
+		public void InsertNewLine (ITextDocument editor, NewLineInsertion insertion, ref int offset)
+		{
+			string str = null;
+			switch (insertion) {
+			case NewLineInsertion.Eol:
+				str = editor.GetEolMarker ();
+				break;
+			case NewLineInsertion.BlankLine:
+				str = editor.GetEolMarker () + editor.GetEolMarker ();
+				break;
+			default:
+				return;
+		}
+
+			editor.InsertText (offset, str);
+			offset += str.Length;
+		}
+
+		public int Insert (TextEditor editor, DocumentContext ctx, string text)
+		{
+			int offset = editor.LocationToOffset (Location);
+			using (var undo = editor.OpenUndoGroup ()) {
+				
+				var line = editor.GetLineByOffset (offset);
+				int insertionOffset = line.Offset + Location.Column - 1;
+				offset = insertionOffset;
+				InsertNewLine (editor, LineBefore, ref offset);
+				int result = offset - insertionOffset;
+
+				editor.InsertText (offset, text);
+				offset += text.Length;
+				InsertNewLine (editor, LineAfter, ref offset);
+				CodeFormatterService.Format (editor, ctx, TextSegment.FromBounds (insertionOffset - 1, offset));
+				return result;
+			}
+		}
+
+		public int Insert (ITextDocument editor, string text)
+		{
+			int offset = editor.LocationToOffset (Location);
+			using (var undo = editor.OpenUndoGroup ()) {
+
+				// TODO: Run formatter !!!
+				// text = editor.FormatString (Location, text);
+
+				var line = editor.GetLineByOffset (offset);
+				int insertionOffset = line.Offset + Location.Column - 1;
+				offset = insertionOffset;
+				InsertNewLine (editor, LineBefore, ref offset);
+				int result = offset - insertionOffset;
+
+				editor.InsertText (offset, text);
+				offset += text.Length;
+				InsertNewLine (editor, LineAfter, ref offset);
+				return result;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/IEditorActionHost.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/IEditorActionHost.cs
new file mode 100644
index 0000000000..f95b0607fe
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/IEditorActionHost.cs
@@ -0,0 +1,123 @@
+//
+// ITextEditor.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.Ide.Editor
+{
+	interface IEditorActionHost
+	{
+		void SwitchCaretMode ();
+
+		void InsertTab ();
+
+		void RemoveTab ();
+
+		void InsertNewLine ();
+
+		void DeletePreviousWord ();
+
+		void DeleteNextWord ();
+
+		void DeletePreviousSubword ();
+
+		void DeleteNextSubword ();
+
+		void StartCaretPulseAnimation ();
+
+		void RecenterEditor ();
+
+		void JoinLines ();
+
+		void MoveNextSubWord ();
+
+		void MovePrevSubWord ();
+
+		void MoveNextWord ();
+
+		void MovePrevWord ();
+
+		void PageUp ();
+
+		void PageDown ();
+
+		void MoveCaretDown ();
+
+		void MoveCaretUp ();
+
+		void MoveCaretRight ();
+
+		void MoveCaretLeft ();
+
+		void MoveCaretToLineEnd ();
+
+		void MoveCaretToLineStart ();
+
+		void MoveCaretToDocumentStart ();
+
+		void MoveCaretToDocumentEnd ();
+
+		void Backspace ();
+
+		void Delete ();
+
+		void ClipboardCopy ();
+
+		void ClipboardCut ();
+
+		void ClipboardPaste ();
+
+		void SelectAll ();
+
+		void NewLine ();
+
+		void Undo ();
+
+		void Redo ();
+
+		void DeleteCurrentLine ();
+
+		void DeleteCurrentLineToEnd ();
+
+		void ScrollLineUp ();
+
+		void ScrollLineDown ();
+
+		void ScrollPageUp ();
+
+		void ScrollPageDown ();
+
+		void MoveBlockUp ();
+
+		void MoveBlockDown ();
+
+		void ToggleBlockSelectionMode ();
+
+		void IndentSelection ();
+
+		void UnIndentSelection ();
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextEditorFactory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextEditorFactory.cs
new file mode 100644
index 0000000000..4b88445dab
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextEditorFactory.cs
@@ -0,0 +1,44 @@
+//
+// ITextEditorFactory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.Ide.Editor
+{
+	interface ITextEditorFactory
+	{
+		ITextDocument CreateNewDocument ();
+		ITextDocument CreateNewDocument (ITextSource textSource, string fileName, string mimeType);
+
+		IReadonlyTextDocument CreateNewReadonlyDocument (ITextSource textSource, string fileName, string mimeType);
+
+		ITextEditorImpl CreateNewEditor ();
+		ITextEditorImpl CreateNewEditor (IReadonlyTextDocument document);
+
+		string[] GetSyntaxProperties (string mimeType, string name);
+	}
+	
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextEditorImpl.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextEditorImpl.cs
new file mode 100644
index 0000000000..4b299a40ef
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextEditorImpl.cs
@@ -0,0 +1,244 @@
+//
+// ITextEditorImpl.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.Components;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public enum EditMode
+	{
+		Edit,
+		TextLink,
+		CursorInsertion
+	}
+
+	/// <summary>
+	/// A skip char is a character in the editor at a defined position that is skipped when this
+	/// exact character is pressed at the character position. That's useful for inserting automatically generated brackets without
+	/// interfering with the typing flow.
+	/// </summary>
+	public struct SkipChar
+	{
+		/// <summary>
+		/// Gets the offset.
+		/// </summary>
+		public readonly int Offset;
+
+		/// <summary>
+		/// Gets the char.
+		/// </summary>
+		public readonly char Char;
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="MonoDevelop.Ide.Editor.SkipChar"/> struct.
+		/// </summary>
+		/// <param name="offset">The offset of the char.</param>
+		/// <param name="ch">The character</param>
+		public SkipChar (int offset, char ch)
+		{
+			Offset = offset;
+			Char = ch;
+		}
+
+		/// <summary>
+		/// Returns a <see cref="System.String"/> that represents the current <see cref="MonoDevelop.Ide.Editor.SkipChar"/>.
+		/// </summary>
+		/// <returns>A <see cref="System.String"/> that represents the current <see cref="MonoDevelop.Ide.Editor.SkipChar"/>.</returns>
+		public override string ToString ()
+		{
+			return string.Format ("[SkipChar: Offset={0}, Char={1}]", Offset, Char);
+		}
+	}
+
+	interface ITextEditorImpl : IViewContent, IDisposable
+	{
+		EditMode EditMode { get; }
+
+		ITextEditorOptions Options { get; set; }
+
+		IReadonlyTextDocument Document { get; set; }
+
+		DocumentLocation CaretLocation { get; set; }
+
+		SemanticHighlighting SemanticHighlighting { get; set; }
+
+		int CaretOffset { get; set; }
+
+		bool IsSomethingSelected { get; }
+
+		SelectionMode SelectionMode { get; }
+
+		ISegment SelectionRange { get; set; }
+		int SelectionAnchorOffset { get; set; }
+		int SelectionLeadOffset { get; set; }
+
+		DocumentRegion SelectionRegion { get; set; }
+
+		void SetSelection (int anchorOffset, int leadOffset);
+
+		event EventHandler SelectionChanged;
+
+		event EventHandler CaretPositionChanged;
+
+		event EventHandler BeginMouseHover;
+
+		event EventHandler VAdjustmentChanged;
+
+		event EventHandler HAdjustmentChanged;
+
+		void ClearSelection ();
+
+		void CenterToCaret ();
+
+		void StartCaretPulseAnimation ();
+
+		int EnsureCaretIsNotVirtual ();
+
+		void FixVirtualIndentation ();
+
+		IEditorActionHost Actions { get; }
+
+		ITextMarkerFactory TextMarkerFactory { get; }
+
+		event EventHandler BeginAtomicUndoOperation;
+
+		event EventHandler EndAtomicUndoOperation;
+
+		object CreateNativeControl ();
+
+		void RunWhenLoaded (Action action);
+
+		string FormatString (int offset, string code);
+
+		void StartInsertionMode (InsertionModeOptions insertionModeOptions);
+
+		void StartTextLinkMode (TextLinkModeOptions textLinkModeOptions);
+
+		double LineHeight { get; }
+
+		DocumentLocation PointToLocation (double xp, double yp, bool endAtEol = false);
+
+		Xwt.Point LocationToPoint (int line, int column);
+
+		void AddMarker (IDocumentLine line, ITextLineMarker lineMarker);
+
+		void RemoveMarker (ITextLineMarker lineMarker);
+
+		void ScrollTo (int offset);
+
+		void CenterTo (int offset);
+
+		IList<SkipChar> SkipChars
+		{
+			get;
+		}
+
+		void AddSkipChar (int offset, char ch);
+
+		string GetVirtualIndentationString (int lineNumber);
+
+		IEnumerable<ITextLineMarker> GetLineMarkers (IDocumentLine line);
+
+		#region Text segment markers
+
+		IEnumerable<ITextSegmentMarker> GetTextSegmentMarkersAt (ISegment segment);
+
+		IEnumerable<ITextSegmentMarker> GetTextSegmentMarkersAt (int offset);
+
+		/// <summary>
+		/// Adds a marker to the document.
+		/// </summary>
+		void AddMarker (ITextSegmentMarker marker);
+
+		/// <summary>
+		/// Removes a marker from the document.
+		/// </summary>
+		/// <returns><c>true</c>, if marker was removed, <c>false</c> otherwise.</returns>
+		/// <param name="marker">Marker.</param>
+		bool RemoveMarker (ITextSegmentMarker marker);
+
+		#endregion
+
+		IFoldSegment CreateFoldSegment (int offset, int length, bool isFolded = false);
+
+		void SetFoldings (IEnumerable<IFoldSegment> foldings);
+
+		IEnumerable<IFoldSegment> GetFoldingsContaining (int offset);
+
+		IEnumerable<IFoldSegment> GetFoldingsIn (int offset, int length);
+
+		string GetPangoMarkup (int offset, int length);
+
+		void SetIndentationTracker (IndentationTracker indentationTracker);
+		void SetSelectionSurroundingProvider (SelectionSurroundingProvider surroundingProvider);
+		void SetTextPasteHandler (TextPasteHandler textPasteHandler);
+
+		event EventHandler<LineEventArgs> LineChanged;
+		event EventHandler<LineEventArgs> LineInserted;
+		event EventHandler<LineEventArgs> LineRemoved;
+
+		#region Internal use only API (do not mirror in TextEditor)
+
+		TextEditorExtension EditorExtension
+		{
+			get;
+			set;
+		}
+
+		IEnumerable<TooltipProvider> TooltipProvider
+		{
+			get;
+		}
+
+		void ClearTooltipProviders ();
+
+		void AddTooltipProvider (TooltipProvider provider);
+
+		void RemoveTooltipProvider (TooltipProvider provider);
+
+		Xwt.Point GetEditorWindowOrigin ();
+
+		Xwt.Rectangle GetEditorAllocation ();
+
+		void InformLoadComplete ();
+
+		void SetUsageTaskProviders (IEnumerable<UsageProviderEditorExtension> providers);
+
+		void SetQuickTaskProviders (IEnumerable<IQuickTaskProvider> providers);
+		#endregion
+
+		double ZoomLevel { get; set; }
+		event EventHandler ZoomLevelChanged;
+
+		void AddOverlay (Control messageOverlayContent, Func<int> sizeFunc);
+		void RemoveOverlay (Control messageOverlayContent);
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextMarkerFactory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextMarkerFactory.cs
new file mode 100644
index 0000000000..9c870c9874
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextMarkerFactory.cs
@@ -0,0 +1,58 @@
+//
+// ITextMarkerFactory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public enum LinkRequest
+	{
+		SameView,
+		RequestNewView
+	}
+
+	interface ITextMarkerFactory
+	{
+		#region Line marker
+		IUrlTextLineMarker CreateUrlTextMarker (TextEditor editor, IDocumentLine line, string value, UrlType url, string syntax, int startCol, int endCol);
+		ICurrentDebugLineTextMarker CreateCurrentDebugLineTextMarker (TextEditor editor);
+		ITextLineMarker CreateAsmLineMarker (TextEditor editor);
+		IUnitTestMarker CreateUnitTestMarker (TextEditor editor, UnitTestMarkerHost host, UnitTestLocation unitTestLocation);
+		IMessageBubbleLineMarker CreateMessageBubbleLineMarker (TextEditor editor);
+		#endregion
+
+		#region Segment marker
+		ITextSegmentMarker CreateUsageMarker (TextEditor editor, Usage usage);
+		ITextSegmentMarker CreateLinkMarker (TextEditor editor, int offset, int length, Action<LinkRequest> activateLink);
+
+		IGenericTextSegmentMarker CreateGenericTextSegmentMarker (TextEditor editor, TextSegmentMarkerEffect effect, int offset, int length);
+		ISmartTagMarker CreateSmartTagMarker (TextEditor editor, int offset, DocumentLocation realLocation);
+		IErrorMarker CreateErrorMarker (TextEditor editor, Error info, int offset, int length);
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/LineEventArgs.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/LineEventArgs.cs
new file mode 100644
index 0000000000..3dd6e0cc56
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/LineEventArgs.cs
@@ -0,0 +1,48 @@
+//
+// LineEventArgs.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public class LineEventArgs : System.EventArgs
+	{
+		readonly IDocumentLine line;
+
+		public IDocumentLine Line {
+			get {
+				return line;
+			}
+		}
+
+		public LineEventArgs (IDocumentLine line)
+		{
+			if (line == null)
+				throw new ArgumentNullException ("line");
+			this.line = line;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/MessageBubbles/MessageBubbleCommands.cs
index 2f28478563..2e81dbf847 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/MessageBubbles/MessageBubbleCommands.cs
@@ -28,10 +28,11 @@ using MonoDevelop.Ide;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Core;
 	
-namespace MonoDevelop.SourceEditor
+namespace MonoDevelop.Ide.Editor
 {
-	public enum MessageBubbleCommands
+	enum MessageBubbleCommands
 	{
+		Toggle,
 		HideIssues,
 		ToggleIssues
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/IProjectionExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/IProjectionExtension.cs
new file mode 100644
index 0000000000..b995eaabe1
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/IProjectionExtension.cs
@@ -0,0 +1,39 @@
+//
+// IProjectionExtension.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.Editor.Projection
+{
+	interface IProjectionExtension
+	{
+		IReadOnlyList<Projection> Projections {
+			get;
+			set;
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedCompletionExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedCompletionExtension.cs
new file mode 100644
index 0000000000..91f4b820a9
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedCompletionExtension.cs
@@ -0,0 +1,433 @@
+//
+// ProjectedCompletionExtension.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Ide.Editor.Extension;
+using System.Collections.Generic;
+using MonoDevelop.Ide.CodeCompletion;
+
+
+namespace MonoDevelop.Ide.Editor.Projection
+{
+	sealed class ProjectedCompletionExtension : CompletionTextEditorExtension, IProjectionExtension
+	{
+		DocumentContext ctx;
+		IReadOnlyList<Projection> projections;
+
+		public IReadOnlyList<Projection> Projections {
+			get {
+				return projections;
+			}
+			set {
+				projections = value;
+			}
+		}
+
+		public ProjectedCompletionExtension (DocumentContext ctx, IReadOnlyList<Projection> projections)
+		{
+			if (projections == null)
+				throw new ArgumentNullException ("projections");
+			this.ctx = ctx;
+			this.projections = projections;
+		}
+
+		public override bool IsValidInContext (DocumentContext context)
+		{
+			var pctx = context as ProjectedDocumentContext;
+			if (pctx == null)
+				return false;
+			return pctx.ProjectedEditor.GetContent<CompletionTextEditorExtension> () != null;
+		}
+
+		Projection GetProjectionAt (int offset)
+		{
+			foreach (var projection in projections) {
+				foreach (var seg in projection.ProjectedSegments) {
+					if (seg.ContainsOriginal (offset)) {
+						projection.ProjectedEditor.CaretOffset = seg.FromOriginalToProjected (offset);
+						return projection;
+					}
+				}
+			}
+			return null;
+		}
+
+		CompletionTextEditorExtension GetExtensionAt (int offset)
+		{
+			var projection = GetProjectionAt (offset);
+			if (projection != null) {
+				var result = projection.ProjectedEditor.GetContent<CompletionTextEditorExtension> ();
+				if (result != null) {
+					result.CompletionWidget = new ProjectedCompletionWidget (CompletionWidget, projection);
+				}
+				return result;
+			}
+			return null;
+		}
+
+		class ProjectedCompletionWidget : ICompletionWidget
+		{
+			readonly ICompletionWidget completionWidget;
+			readonly Projection projection;
+
+			public ProjectedCompletionWidget (ICompletionWidget completionWidget, Projection projection)
+			{
+				if (completionWidget == null)
+					throw new ArgumentNullException ("completionWidget");
+				if (projection == null)
+					throw new ArgumentNullException ("projection");
+				this.projection = projection;
+				this.completionWidget = completionWidget;
+			}
+
+			#region ICompletionWidget implementation
+			public double ZoomLevel {
+				get {
+					return completionWidget.ZoomLevel;
+				}
+			}
+
+			event EventHandler ICompletionWidget.CompletionContextChanged {
+				add {
+					completionWidget.CompletionContextChanged += value;
+				}
+				remove {
+					completionWidget.CompletionContextChanged -= value;
+				}
+			}
+
+			string ICompletionWidget.GetText (int startOffset, int endOffset)
+			{
+				return projection.ProjectedEditor.GetTextBetween (startOffset, endOffset);
+			}
+
+			char ICompletionWidget.GetChar (int offset)
+			{
+				return projection.ProjectedEditor.GetCharAt (offset);
+			}
+
+			void ICompletionWidget.Replace (int offset, int count, string text)
+			{
+				foreach (var seg in projection.ProjectedSegments) {
+					if (seg.ContainsProjected (offset)) {
+						offset = seg.FromProjectedToOriginal (offset);
+						break;
+					}
+				}
+
+				completionWidget.Replace (offset, count, text);
+			}
+
+			int ConvertOffset (int triggerOffset)
+			{
+				int result = triggerOffset;
+				foreach (var seg in projection.ProjectedSegments) {
+					if (seg.ContainsProjected (result)) {
+						result = seg.FromProjectedToOriginal (result);
+						break;
+					}
+				}
+				return result;
+			}
+
+			int ProjectOffset (int offset)
+			{
+				int result = offset;
+				foreach (var seg in projection.ProjectedSegments) {
+					if (seg.ContainsOriginal (result)) {
+						result = seg.FromOriginalToProjected (result);
+						break;
+					}
+				}
+				return result;
+
+			}
+
+			CodeCompletionContext ICompletionWidget.CreateCodeCompletionContext (int triggerOffset)
+			{
+				var originalTriggerOffset = ConvertOffset (triggerOffset);
+				var completionContext = completionWidget.CreateCodeCompletionContext (originalTriggerOffset);
+				return ConvertContext (completionContext, projection);
+			}
+
+			string ICompletionWidget.GetCompletionText (CodeCompletionContext ctx)
+			{
+				return completionWidget.GetCompletionText (ImportContext (ctx, projection));
+			}
+
+			void ICompletionWidget.SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word)
+			{
+				completionWidget.SetCompletionText (ImportContext (ctx, projection), partial_word, complete_word);
+			}
+
+			void ICompletionWidget.SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word, int completeWordOffset)
+			{
+				completionWidget.SetCompletionText (ImportContext (ctx, projection), partial_word, complete_word, completeWordOffset);
+			}
+
+			void ICompletionWidget.AddSkipChar (int cursorPosition, char c)
+			{
+				completionWidget.AddSkipChar (ProjectOffset (cursorPosition), c);
+			}
+
+			CodeCompletionContext ICompletionWidget.CurrentCodeCompletionContext {
+				get {
+					return ConvertContext (completionWidget.CurrentCodeCompletionContext, projection);
+				}
+			}
+
+			int ICompletionWidget.CaretOffset {
+				get {
+					return ConvertOffset (completionWidget.CaretOffset);
+				}
+				set {
+					completionWidget.CaretOffset = ProjectOffset (value);
+				}
+			}
+
+			int ICompletionWidget.TextLength {
+				get {
+					return projection.ProjectedEditor.Length;
+				}
+			}
+
+			int ICompletionWidget.SelectedLength {
+				get {
+					return completionWidget.SelectedLength;
+				}
+			}
+
+			Gtk.Style ICompletionWidget.GtkStyle {
+				get {
+					return completionWidget.GtkStyle;
+				}
+			}
+			#endregion
+		}
+
+		CompletionTextEditorExtension GetCurrentExtension ()
+		{
+			return GetExtensionAt (Editor.CaretOffset);
+		}
+
+		public override bool CanRunCompletionCommand ()
+		{
+			var projectedExtension = GetCurrentExtension ();
+			if (projectedExtension == null)
+				return false;
+			return projectedExtension.CanRunCompletionCommand ();
+		}
+
+		public override MonoDevelop.Ide.CodeCompletion.ICompletionDataList CodeCompletionCommand (MonoDevelop.Ide.CodeCompletion.CodeCompletionContext completionContext)
+		{
+			var projectedExtension = GetExtensionAt (completionContext.TriggerOffset);
+			if (projectedExtension == null)
+				return null;
+			return projectedExtension.CodeCompletionCommand (ConvertContext (completionContext));
+		}
+
+		public override bool CanRunParameterCompletionCommand ()
+		{
+			var projectedExtension = GetCurrentExtension ();
+			if (projectedExtension == null)
+				return false;
+			return projectedExtension.CanRunParameterCompletionCommand ();
+		}
+
+		public override string CompletionLanguage {
+			get {
+				var projectedExtension = GetCurrentExtension ();
+				if (projectedExtension == null)
+					return base.CompletionLanguage;
+				return projectedExtension.CompletionLanguage;
+			}
+		}
+
+		public override bool GetCompletionCommandOffset (out int cpos, out int wlen)
+		{
+			var projectedExtension = GetCurrentExtension ();
+			if (projectedExtension == null) {
+				cpos = 0;
+				wlen = 0;
+				return false;
+			}
+			return projectedExtension.GetCompletionCommandOffset (out cpos, out wlen);
+		}
+
+		public override int GetCurrentParameterIndex (int startOffset)
+		{
+			var projectedExtension = GetExtensionAt (startOffset);
+			if (projectedExtension == null)
+				return -1;
+			return projectedExtension.GetCurrentParameterIndex (startOffset);
+		}
+
+		public override int GuessBestMethodOverload (ParameterHintingResult provider, int currentOverload)
+		{
+			var projectedExtension = GetCurrentExtension ();
+			if (projectedExtension == null)
+				return -1;
+			return projectedExtension.GuessBestMethodOverload (provider, currentOverload);
+		}
+
+		public override System.Threading.Tasks.Task<MonoDevelop.Ide.CodeCompletion.ICompletionDataList> HandleCodeCompletionAsync (MonoDevelop.Ide.CodeCompletion.CodeCompletionContext completionContext, char completionChar, System.Threading.CancellationToken token)
+		{
+			var projectedExtension = GetExtensionAt (completionContext.TriggerOffset);
+			if (projectedExtension == null)
+				return null;
+
+			return projectedExtension.HandleCodeCompletionAsync (ConvertContext (completionContext), completionChar, token);
+		}
+
+		public override System.Threading.Tasks.Task<ParameterHintingResult> HandleParameterCompletionAsync (MonoDevelop.Ide.CodeCompletion.CodeCompletionContext completionContext, char completionChar, System.Threading.CancellationToken token)
+		{
+			var projectedExtension = GetExtensionAt (completionContext.TriggerOffset);
+			if (projectedExtension == null)
+				return null;
+			return projectedExtension.HandleParameterCompletionAsync (ConvertContext (completionContext), completionChar, token);
+		}
+
+		public override bool KeyPress (KeyDescriptor descriptor)
+		{
+			projections = ctx.GetPartialProjectionsAsync ().Result;
+			var projectedExtension = GetCurrentExtension();
+			if (projectedExtension != null)
+				return projectedExtension.KeyPress (descriptor);
+			return base.KeyPress (descriptor);
+		}
+
+		public override ParameterHintingResult ParameterCompletionCommand (MonoDevelop.Ide.CodeCompletion.CodeCompletionContext completionContext)
+		{
+			var projectedExtension = GetExtensionAt (completionContext.TriggerOffset);
+			if (projectedExtension == null)
+				return null;
+			return projectedExtension.ParameterCompletionCommand (ConvertContext (completionContext));
+		}
+
+		public override void RunCompletionCommand ()
+		{
+			var projectedExtension = GetCurrentExtension();
+			if (projectedExtension == null)
+				return;
+			projectedExtension.RunCompletionCommand ();
+		}
+
+		public override void RunParameterCompletionCommand ()
+		{
+			var projectedExtension = GetCurrentExtension();
+			if (projectedExtension == null)
+				return;
+			
+			projectedExtension.RunParameterCompletionCommand ();
+		}
+
+		public override void RunShowCodeTemplatesWindow ()
+		{
+			var projectedExtension = GetCurrentExtension();
+			if (projectedExtension == null)
+				return;
+			projectedExtension.RunShowCodeTemplatesWindow ();
+		}
+
+		public override MonoDevelop.Ide.CodeCompletion.ICompletionDataList ShowCodeSurroundingsCommand (MonoDevelop.Ide.CodeCompletion.CodeCompletionContext completionContext)
+		{
+			var projectedExtension = GetExtensionAt (completionContext.TriggerOffset);
+			if (projectedExtension == null)
+				return null;
+			return projectedExtension.ShowCodeSurroundingsCommand (ConvertContext (completionContext));
+		}
+
+		public override MonoDevelop.Ide.CodeCompletion.ICompletionDataList ShowCodeTemplatesCommand (MonoDevelop.Ide.CodeCompletion.CodeCompletionContext completionContext)
+		{
+			var projectedExtension = GetExtensionAt (completionContext.TriggerOffset);
+			if (projectedExtension == null)
+				return null;
+			return projectedExtension.ShowCodeTemplatesCommand (ConvertContext (completionContext));
+		}
+
+		CodeCompletionContext ConvertContext (CodeCompletionContext completionContext)
+		{
+			var projection = GetProjectionAt (completionContext.TriggerOffset);
+			return ConvertContext (completionContext, projection);
+		}
+			
+		static CodeCompletionContext ConvertContext (CodeCompletionContext completionContext, Projection projection)
+		{
+			int offset = completionContext.TriggerOffset;
+			int line = completionContext.TriggerLine;
+			int lineOffset = completionContext.TriggerLineOffset;
+
+			if (projection != null) {
+				foreach (var seg in projection.ProjectedSegments) {
+					if (seg.ContainsOriginal (offset)) {
+						offset = seg.FromOriginalToProjected (offset);
+						var loc = projection.ProjectedEditor.OffsetToLocation (offset);
+						line = loc.Line;
+						lineOffset = loc.Column - 1;
+					}
+				}
+			}
+
+			return new MonoDevelop.Ide.CodeCompletion.CodeCompletionContext {
+				TriggerOffset = offset,
+				TriggerLine = line,
+				TriggerLineOffset  = lineOffset,
+				TriggerXCoord  = completionContext.TriggerXCoord,
+				TriggerYCoord  = completionContext.TriggerYCoord,
+				TriggerTextHeight  = completionContext.TriggerTextHeight,
+				TriggerWordLength  = completionContext.TriggerWordLength
+			};
+		}
+
+		static CodeCompletionContext ImportContext (CodeCompletionContext completionContext, Projection projection)
+		{
+			int offset = completionContext.TriggerOffset;
+			int line = completionContext.TriggerLine;
+			int lineOffset = completionContext.TriggerLineOffset;
+
+			if (projection != null) {
+				foreach (var seg in projection.ProjectedSegments) {
+					if (seg.ContainsProjected (offset)) {
+						offset = seg.FromProjectedToOriginal (offset);
+						var loc = projection.ProjectedEditor.OffsetToLocation (offset);
+						line = loc.Line;
+						lineOffset = loc.Column - 1;
+					}
+				}
+			}
+
+			return new MonoDevelop.Ide.CodeCompletion.CodeCompletionContext {
+				TriggerOffset = offset,
+				TriggerLine = line,
+				TriggerLineOffset  = lineOffset,
+				TriggerXCoord  = completionContext.TriggerXCoord,
+				TriggerYCoord  = completionContext.TriggerYCoord,
+				TriggerTextHeight  = completionContext.TriggerTextHeight,
+				TriggerWordLength  = completionContext.TriggerWordLength
+			};
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedDocumentContext.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedDocumentContext.cs
new file mode 100644
index 0000000000..4571fefeb8
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedDocumentContext.cs
@@ -0,0 +1,143 @@
+//
+// ProjectedDocumentContext.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using System.Collections.Immutable;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.Ide.Editor.Projection
+{
+
+	class ProjectedDocumentContext : DocumentContext
+	{
+		DocumentContext originalContext;
+		TextEditor projectedEditor;
+		ParsedDocument parsedDocument;
+
+		public TextEditor ProjectedEditor {
+			get {
+				return projectedEditor;
+			}
+		}
+
+		public DocumentContext OriginalContext {
+			get {
+				return originalContext;
+			}
+		}
+
+		Microsoft.CodeAnalysis.Document projectedDocument;
+
+		public ProjectedDocumentContext (TextEditor projectedEditor, DocumentContext originalContext)
+		{
+			if (projectedEditor == null)
+				throw new ArgumentNullException ("projectedEditor");
+			if (originalContext == null)
+				throw new ArgumentNullException ("originalContext");
+			this.projectedEditor = projectedEditor;
+			this.originalContext = originalContext;
+
+			if (originalContext.Project != null) {
+				var originalProjectId = TypeSystemService.GetProjectId (originalContext.Project);
+				if (originalProjectId != null) {
+					var originalProject = TypeSystemService.Workspace.CurrentSolution.GetProject (originalProjectId);
+					if (originalProject != null) {
+						projectedDocument = originalProject.AddDocument (
+							projectedEditor.FileName,
+							projectedEditor
+						);
+					}
+				}
+			}
+
+			projectedEditor.TextChanged += delegate(object sender, TextChangeEventArgs e) {
+				if (projectedDocument != null)
+					projectedDocument = projectedDocument.WithText (projectedEditor);
+				ReparseDocument ();
+			};
+
+			ReparseDocument ();
+		}
+
+		#region implemented abstract members of DocumentContext
+		public override void AttachToProject (MonoDevelop.Projects.Project project)
+		{
+		}
+
+		public override void ReparseDocument ()
+		{
+			var options = new ParseOptions {
+				FileName = projectedEditor.FileName,
+				Content = projectedEditor,
+				Project = Project,
+				RoslynDocument = projectedDocument
+			}; 
+			parsedDocument = TypeSystemService.ParseFile (options, projectedEditor.MimeType).Result;
+
+			base.OnDocumentParsed (EventArgs.Empty);
+		}
+
+		public override Microsoft.CodeAnalysis.Options.OptionSet GetOptionSet ()
+		{
+			return originalContext.GetOptionSet ();
+		}
+
+		public override MonoDevelop.Ide.TypeSystem.ParsedDocument UpdateParseDocument ()
+		{
+			ReparseDocument ();
+			return parsedDocument;
+		}
+
+		public override string Name {
+			get {
+				return projectedEditor.FileName;
+			}
+		}
+
+		public override MonoDevelop.Projects.Project Project {
+			get {
+				return originalContext.Project;
+			}
+		}
+
+		public override Microsoft.CodeAnalysis.Document AnalysisDocument {
+			get {
+
+				return projectedDocument;
+			}
+		}
+
+		public override MonoDevelop.Ide.TypeSystem.ParsedDocument ParsedDocument {
+			get {
+				return parsedDocument;
+			}
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedFilterCompletionTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedFilterCompletionTextEditorExtension.cs
new file mode 100644
index 0000000000..15b3ecfc61
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedFilterCompletionTextEditorExtension.cs
@@ -0,0 +1,186 @@
+//
+// ProjectedFilterCompletionTextEditorExtension.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.Ide.Editor.Projection
+{
+	sealed class ProjectedFilterCompletionTextEditorExtension : CompletionTextEditorExtension, IProjectionExtension
+	{
+		CompletionTextEditorExtension completionTextEditorExtension;
+		IReadOnlyList<Projection> projections;
+
+		IReadOnlyList<Projection> IProjectionExtension.Projections {
+			get {
+				return projections;
+			}
+			set {
+				projections = value;
+			}
+		}
+
+		public ProjectedFilterCompletionTextEditorExtension (CompletionTextEditorExtension completionTextEditorExtension, IReadOnlyList<Projection> projections)
+		{
+			this.completionTextEditorExtension = completionTextEditorExtension;
+			this.projections = projections;
+		}
+
+		bool IsInProjection ()
+		{
+			int offset = Editor.CaretOffset;
+			foreach (var p in projections) {
+				foreach (var seg in p.ProjectedSegments) {
+					if (seg.ContainsOriginal (offset))
+						return true;
+				}
+			}
+			return false;
+		}
+
+		public override bool KeyPress (KeyDescriptor descriptor)
+		{
+			if (IsInProjection())
+				return Next == null || Next.KeyPress (descriptor);
+			return completionTextEditorExtension.KeyPress (descriptor);
+		}
+
+		public override bool IsValidInContext (DocumentContext context)
+		{
+			if (IsInProjection())
+				return false;
+			return completionTextEditorExtension.IsValidInContext (context);
+		}
+
+		public override int GetCurrentParameterIndex (int startOffset)
+		{
+			if (IsInProjection())
+				return -1;
+			return completionTextEditorExtension.GetCurrentParameterIndex (startOffset);
+		}
+
+		public override string CompletionLanguage {
+			get {
+				return completionTextEditorExtension.CompletionLanguage;
+			}
+		}
+
+		public override void RunCompletionCommand ()
+		{
+			if (IsInProjection ())
+				return;
+			completionTextEditorExtension.RunCompletionCommand ();
+		}
+
+		public override void RunShowCodeTemplatesWindow ()
+		{
+			if (IsInProjection ())
+				return;
+			completionTextEditorExtension.RunShowCodeTemplatesWindow ();
+		}
+
+		public override void RunParameterCompletionCommand ()
+		{
+			if (IsInProjection ())
+				return;
+			completionTextEditorExtension.RunParameterCompletionCommand ();
+		}
+
+		public override bool CanRunCompletionCommand ()
+		{
+			if (IsInProjection ())
+				return false;
+			return completionTextEditorExtension.CanRunCompletionCommand ();
+		}
+
+		public override bool CanRunParameterCompletionCommand ()
+		{
+			if (IsInProjection ())
+				return false;
+			return completionTextEditorExtension.CanRunParameterCompletionCommand ();
+		}
+
+		public override System.Threading.Tasks.Task<CodeCompletion.ICompletionDataList> HandleCodeCompletionAsync (CodeCompletion.CodeCompletionContext completionContext, char completionChar, System.Threading.CancellationToken token)
+		{
+			return completionTextEditorExtension.HandleCodeCompletionAsync (completionContext, completionChar, token);
+		}
+
+		public override System.Threading.Tasks.Task<CodeCompletion.ParameterHintingResult> HandleParameterCompletionAsync (CodeCompletion.CodeCompletionContext completionContext, char completionChar, System.Threading.CancellationToken token)
+		{
+			return completionTextEditorExtension.HandleParameterCompletionAsync (completionContext, completionChar, token);
+		}
+
+		public override bool GetCompletionCommandOffset (out int cpos, out int wlen)
+		{
+			if (IsInProjection ()) {
+				cpos = 0; wlen = 0;
+				return false;
+			}
+			return completionTextEditorExtension.GetCompletionCommandOffset (out cpos, out wlen);
+		}
+
+		public override CodeCompletion.ICompletionDataList ShowCodeSurroundingsCommand (CodeCompletion.CodeCompletionContext completionContext)
+		{
+			if (IsInProjection ()) return null;
+			return completionTextEditorExtension.ShowCodeSurroundingsCommand (completionContext);
+		}
+
+		public override CodeCompletion.ICompletionDataList ShowCodeTemplatesCommand (CodeCompletion.CodeCompletionContext completionContext)
+		{
+			if (IsInProjection ()) return null;
+			return completionTextEditorExtension.ShowCodeTemplatesCommand (completionContext);
+		}
+
+		public override CodeCompletion.ICompletionDataList CodeCompletionCommand (CodeCompletion.CodeCompletionContext completionContext)
+		{
+			if (IsInProjection ()) return null;
+			return completionTextEditorExtension.CodeCompletionCommand (completionContext);
+		}
+
+		public override CodeCompletion.ParameterHintingResult ParameterCompletionCommand (CodeCompletion.CodeCompletionContext completionContext)
+		{
+			if (IsInProjection ()) return null;
+			return completionTextEditorExtension.ParameterCompletionCommand (completionContext);
+		}
+
+		public override int GuessBestMethodOverload (CodeCompletion.ParameterHintingResult provider, int currentOverload)
+		{
+			if (IsInProjection ()) return -1;
+			return completionTextEditorExtension.GuessBestMethodOverload (provider, currentOverload);
+		}
+
+		protected override void Initialize ()
+		{
+			completionTextEditorExtension.InternalInitialize ();
+		}
+
+		public override void Dispose ()
+		{
+			completionTextEditorExtension.Dispose ();
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedSegment.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedSegment.cs
new file mode 100644
index 0000000000..8a49d40ca3
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedSegment.cs
@@ -0,0 +1,89 @@
+//
+// ProjectedSegment.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.Ide.Editor.Projection
+{
+	public struct ProjectedSegment 
+	{
+		public int Offset {
+			get;
+			private set;
+		}
+
+		public int ProjectedOffset {
+			get;
+			private set;
+		}
+
+		public int Length {
+			get;
+			private set;
+		}
+
+		public ProjectedSegment (int offset, int projectedOffset, int length)
+			: this ()
+		{
+			this.Offset = offset;
+			this.ProjectedOffset = projectedOffset;
+			this.Length = length;
+		}
+
+		public bool ContainsOriginal (int offset)
+		{
+			return Offset <= offset && offset < Offset + Length;
+		}
+
+		public bool ContainsProjected (int offset)
+		{
+			return ProjectedOffset <= offset && offset < ProjectedOffset + Length;
+		}
+
+		public bool IsInOriginal (ISegment segment)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+
+			return segment.Contains(Offset) && segment.Contains (Offset + Length); 
+		}
+
+		public ISegment FromOriginalToProjected (ISegment segment)
+		{
+			return new TextSegment (segment.Offset - Offset + ProjectedOffset, segment.Length);
+		}
+
+		public int FromOriginalToProjected (int offset)
+		{
+			return offset - Offset + ProjectedOffset;
+		}
+
+		public int FromProjectedToOriginal (int offset)
+		{
+			return offset + Offset - ProjectedOffset;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedSemanticHighlighting.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedSemanticHighlighting.cs
new file mode 100644
index 0000000000..82ceb984a2
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedSemanticHighlighting.cs
@@ -0,0 +1,98 @@
+//
+// ProjectedSemanticHighlighting.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using MonoDevelop.Ide.Editor.Highlighting;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.Editor.Projection
+{
+	sealed class ProjectedSemanticHighlighting : SemanticHighlighting
+	{
+		List<Projection> projections;
+
+		public ProjectedSemanticHighlighting (TextEditor editor, DocumentContext documentContext, IEnumerable<Projection> projections) : base (editor, documentContext)
+		{
+			this.projections = new List<Projection> (projections);
+			foreach (var p in this.projections) {
+				if (p.ProjectedEditor.SemanticHighlighting == null)
+					continue;
+				p.ProjectedEditor.SemanticHighlighting.SemanticHighlightingUpdated += HandleSemanticHighlightingUpdated;
+			}
+		}
+
+		public void UpdateProjection (IEnumerable<Projection>  projections)
+		{
+			foreach (var p in this.projections) {
+				if (p.ProjectedEditor.SemanticHighlighting == null)
+					continue;
+				p.ProjectedEditor.SemanticHighlighting.SemanticHighlightingUpdated -= HandleSemanticHighlightingUpdated;
+			}
+			this.projections = new List<Projection> (projections);
+			foreach (var p in this.projections) {
+				if (p.ProjectedEditor.SemanticHighlighting == null)
+					continue;
+				p.ProjectedEditor.SemanticHighlighting.SemanticHighlightingUpdated += HandleSemanticHighlightingUpdated;
+			}
+		}
+
+		void HandleSemanticHighlightingUpdated (object sender, EventArgs e)
+		{
+			NotifySemanticHighlightingUpdate ();
+		}
+
+		protected override void DocumentParsed ()
+		{
+			NotifySemanticHighlightingUpdate ();
+		}
+
+		public override IEnumerable<ColoredSegment> GetColoredSegments (MonoDevelop.Core.Text.ISegment segment)
+		{
+			foreach (Projection p in projections) {
+				foreach (var seg in p.ProjectedSegments) {
+					if (seg.IsInOriginal (segment)) {
+						if (p.ProjectedEditor.SemanticHighlighting == null)
+							continue;
+
+						int delta = segment.EndOffset - (seg.Offset + seg.Length);
+						int len = seg.Length;
+						if (delta < 0) {
+							len += delta;
+						}
+						foreach (var cs in p.ProjectedEditor.SemanticHighlighting.GetColoredSegments (new MonoDevelop.Core.Text.TextSegment (seg.ProjectedOffset, len))) {
+							yield return new ColoredSegment (cs.Offset - seg.ProjectedOffset + seg.Offset, cs.Length, cs.ColorStyleKey);
+
+						}
+						foreach (var cs in GetColoredSegments (MonoDevelop.Core.Text.TextSegment.FromBounds (seg.Offset + len, segment.EndOffset)))
+							yield return cs;
+						yield break;
+					}
+				}
+			}
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedTooltipProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedTooltipProvider.cs
new file mode 100644
index 0000000000..bb50723ae7
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedTooltipProvider.cs
@@ -0,0 +1,95 @@
+//
+// ProjectedTooltipProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Components;
+
+namespace MonoDevelop.Ide.Editor.Projection
+{
+	sealed class ProjectedTooltipProvider  : TooltipProvider
+	{
+		readonly TextEditor editor;
+		readonly DocumentContext ctx;
+		readonly Projection projection;
+		readonly TooltipProvider projectedTooltipProvider;
+
+		public ProjectedTooltipProvider (TextEditor editor, DocumentContext ctx, Projection projection, TooltipProvider projectedTooltipProvider)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (ctx == null)
+				throw new ArgumentNullException ("ctx");
+			if (projection == null)
+				throw new ArgumentNullException ("projection");
+			if (projectedTooltipProvider == null)
+				throw new ArgumentNullException ("projectedTooltipProvider");
+			this.projectedTooltipProvider = projectedTooltipProvider;
+			this.projection = projection;
+			this.editor = editor;
+			this.ctx = ctx;
+		}
+
+		public override TooltipItem GetItem (TextEditor editor, DocumentContext ctx, int offset)
+		{
+			foreach (var pseg in projection.ProjectedSegments) {
+				if (pseg.ContainsOriginal (offset)) {
+					var result = projectedTooltipProvider.GetItem (projection.ProjectedEditor, projection.ProjectedContext, pseg.FromOriginalToProjected (offset));
+					if (result == null)
+						return null;
+					result.Offset = pseg.FromProjectedToOriginal (result.Offset);
+					return result;
+				}
+			}
+			return null;
+		}
+
+		public override bool IsInteractive (TextEditor editor, Control tipWindow)
+		{
+			return projectedTooltipProvider.IsInteractive (editor, tipWindow);
+		}
+
+		public override void ShowTooltipWindow (TextEditor editor, Control tipWindow, TooltipItem item, Gdk.ModifierType modifierState, int mouseX, int mouseY)
+		{
+			projectedTooltipProvider.ShowTooltipWindow (editor, tipWindow, item, modifierState, mouseX, mouseY);
+		}
+
+		public override void GetRequiredPosition (TextEditor editor, Control tipWindow, out int requiredWidth, out double xalign)
+		{
+			projectedTooltipProvider.GetRequiredPosition (editor, tipWindow, out requiredWidth, out xalign);
+		}
+
+		public override Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Gdk.ModifierType modifierState)
+		{
+			foreach (var pseg in projection.ProjectedSegments) {
+				if (pseg.ContainsOriginal (offset)) {
+					return projectedTooltipProvider.CreateTooltipWindow (projection.ProjectedEditor, projection.ProjectedContext, item, pseg.FromOriginalToProjected (offset), modifierState);
+				}
+			}
+			return null;
+		}
+
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/Projection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/Projection.cs
new file mode 100644
index 0000000000..8698e57c4c
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/Projection.cs
@@ -0,0 +1,130 @@
+//
+// Projection.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using System.Collections.Immutable;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.TypeSystem;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.Editor.Projection
+{
+	public sealed class Projection
+	{
+		public ITextDocument Document { get; private set; }
+
+		SegmentTree<ProjectedTreeSegment> originalProjections  = new SegmentTree<ProjectedTreeSegment> ();
+		SegmentTree<ProjectedTreeSegment> projectedProjections = new SegmentTree<ProjectedTreeSegment> ();
+
+		class ProjectedTreeSegment : TreeSegment
+		{
+			public ProjectedTreeSegment LinkedTo { get; set; }
+
+			public ProjectedTreeSegment (int offset, int length) : base (offset, length)
+			{
+			}
+		}
+
+		public IEnumerable<ProjectedSegment> ProjectedSegments {
+			get {
+				foreach (var treeSeg in originalProjections) {
+					yield return new ProjectedSegment (treeSeg.Offset, treeSeg.LinkedTo.Offset, treeSeg.Length);
+				}
+			}
+		}
+
+		TextEditor projectedEditor;
+
+		internal TextEditor ProjectedEditor
+		{
+			get
+			{
+				return projectedEditor;
+			}
+		}
+
+		ProjectedDocumentContext projectedDocumentContext;
+		TextEditor attachedEditor;
+
+		internal DocumentContext ProjectedContext {
+			get {
+				return projectedDocumentContext;
+			}
+		}
+
+		public TextEditor CreateProjectedEditor (DocumentContext originalContext)
+		{
+			if (projectedEditor == null) {
+				projectedEditor = TextEditorFactory.CreateNewEditor (Document);
+				projectedDocumentContext = new ProjectedDocumentContext (projectedEditor, originalContext);
+				projectedEditor.InitializeExtensionChain (projectedDocumentContext);
+				projectedProjections.InstallListener (projectedEditor);
+			}
+			return projectedEditor;
+		}
+
+		public Projection (ITextDocument document, IReadOnlyList<ProjectedSegment> projectedSegments)
+		{
+			if (document == null)
+				throw new ArgumentNullException (nameof (document));
+			this.Document = document;
+
+			for (int i = 0; i < projectedSegments.Count; i++) {
+				var p = projectedSegments [i];
+				var original = new ProjectedTreeSegment (p.Offset, p.Length);
+				var projected =  new ProjectedTreeSegment (p.ProjectedOffset, p.Length);
+				original.LinkedTo = projected;
+				projected.LinkedTo = original;
+				originalProjections.Add (original);
+				projectedProjections.Add (projected);
+			}
+		}
+
+		internal void Dettach ()
+		{
+			attachedEditor.TextChanged -= HandleTextChanged;
+		}
+
+		internal void Attach (TextEditor textEditor)
+		{
+			attachedEditor = textEditor;
+			attachedEditor.TextChanged += HandleTextChanged;
+		}
+
+		void HandleTextChanged (object sender, TextChangeEventArgs e)
+		{
+			foreach (var segment in originalProjections) {
+				if (segment.Contains (e.Offset)) {
+					var projectedOffset = e.Offset - segment.Offset + segment.LinkedTo.Offset;
+					projectedEditor.ReplaceText (projectedOffset, e.RemovalLength, e.InsertedText);
+				}
+			}
+
+			originalProjections.UpdateOnTextReplace (sender, e);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/SegmentTree.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/SegmentTree.cs
new file mode 100644
index 0000000000..e22632c0b9
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/SegmentTree.cs
@@ -0,0 +1,801 @@
+// 
+// SegmentTree.cs
+//  
+// Author:
+//       mkrueger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MonoDevelop.Core.Text;
+using System.Text;
+using System.Web.UI.WebControls;
+using System.Diagnostics;
+
+namespace MonoDevelop.Ide.Editor
+{
+	/// <summary>
+	/// A segment tree contains overlapping segments and get all segments overlapping a segment. It's implemented as a augmented interval tree
+	/// described in Cormen et al. (2001, Section 14.3: Interval trees, pp. 311–317).
+	/// </summary>
+	public class SegmentTree<T> : TextSegmentTree, ICollection<T> where T : TreeSegment
+	{
+		readonly RedBlackTree tree = new RedBlackTree ();
+		
+		ITextDocument ownerDocument;
+
+		public int Count {
+			get {
+				return tree.Count;
+			}
+		}
+		
+		public IEnumerator<T> GetEnumerator ()
+		{
+			var root = tree.Root;
+			if (root == null)
+				yield break;
+			var node = root.OuterLeft;
+			while (node != null) {
+				yield return (T)node;
+				node = node.NextNode;
+			}
+		}
+
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator ()
+		{
+			return GetEnumerator ();
+		}
+
+		public bool Contains (T item)
+		{
+			return this.Any (item.Equals);
+		}
+
+		public void CopyTo (T[] array, int arrayIndex)
+		{
+			Debug.Assert (array != null);
+			Debug.Assert (0 <= arrayIndex && arrayIndex < array.Length);
+			int i = arrayIndex;
+			foreach (T value in this)
+				array[i++] = value;
+		}
+
+		bool ICollection<T>.IsReadOnly {
+			get {
+				return false;
+			}
+		}
+
+		public void Add (T item)
+		{
+			InternalAdd (item); 
+		}
+
+		public bool Remove (T item)
+		{
+			return InternalRemove (item);
+		}
+		
+		public void Clear ()
+		{
+			tree.Clear ();
+		}
+
+		public IEnumerable<T> GetSegmentsAt (int offset)
+		{
+			return GetSegmentsOverlapping (offset, 0);
+		}
+
+		public IEnumerable<T> GetSegmentsOverlapping (ISegment segment)
+		{
+			if (segment.Offset < 0)
+				return Enumerable.Empty<T> ();
+			return GetSegmentsOverlapping (segment.Offset, segment.Length);
+		}
+
+		public IEnumerable<T> GetSegmentsOverlapping (int offset, int length)
+		{
+			if (tree.Root == null)
+				yield break;
+			var intervalStack = new Stack<Interval> ();
+			intervalStack.Push (new Interval (tree.Root, offset, offset + length));
+			while (intervalStack.Count > 0) {
+				var interval = intervalStack.Pop ();
+				if (interval.end < 0) 
+					continue;
+
+				var node = interval.node;
+				int nodeStart = interval.start - node.DistanceToPrevNode;
+				int nodeEnd = interval.end - node.DistanceToPrevNode;
+				var leftNode = node.Left;
+				if (leftNode != null) {
+					nodeStart -= leftNode.TotalLength;
+					nodeEnd -= leftNode.TotalLength;
+				}
+
+				if (node.DistanceToMaxEnd < nodeStart) 
+					continue;
+
+				if (leftNode != null)
+					intervalStack.Push (new Interval (leftNode, interval.start, interval.end));
+
+				if (nodeEnd < 0) 
+					continue;
+
+				if (nodeStart <= node.Length)
+					yield return (T)node;
+
+				var rightNode = node.Right;
+				if (rightNode != null) 
+					intervalStack.Push (new Interval (rightNode, nodeStart, nodeEnd));
+			}
+		}
+
+		public void InstallListener (ITextDocument doc)
+		{
+			if (ownerDocument != null)
+				throw new InvalidOperationException ("Segment tree already installed");
+			ownerDocument = doc;
+			doc.TextChanged += UpdateOnTextReplace;
+		}
+
+		public void RemoveListener ()
+		{
+			if (ownerDocument == null)
+				throw new InvalidOperationException ("Segment tree is not installed");
+			ownerDocument.TextChanged -= UpdateOnTextReplace;
+			ownerDocument = null;
+		}
+
+		internal void UpdateOnTextReplace (object sender, TextChangeEventArgs e)
+		{
+			if (e.RemovalLength == 0) {
+				var length = e.InsertionLength;
+				foreach (var segment in GetSegmentsAt (e.Offset).Where (s => s.Offset < e.Offset && e.Offset < s.EndOffset)) {
+					segment.Length += length;
+					segment.UpdateAugmentedData ();
+				}
+				var node = SearchFirstSegmentWithStartAfter (e.Offset);
+				if (node != null) {
+					node.DistanceToPrevNode += length;
+					node.UpdateAugmentedData ();
+				}
+				return;
+			}
+			int delta = e.ChangeDelta;
+			foreach (var segment in new List<T> (GetSegmentsOverlapping (e.Offset, e.RemovalLength))) {
+				if (segment.Offset < e.Offset) {
+					if (segment.EndOffset >= e.Offset + e.RemovalLength) {
+						segment.Length += delta;
+					} else {
+						segment.Length = e.Offset - segment.Offset;
+					}
+					segment.UpdateAugmentedData ();
+					continue;
+				}
+				int remainingLength = segment.EndOffset - (e.Offset + e.RemovalLength);
+				InternalRemove (segment);
+				if (remainingLength > 0) {
+					segment.Offset = e.Offset + e.RemovalLength;
+					segment.Length = remainingLength;
+					InternalAdd (segment);
+				}
+			}
+			var next = SearchFirstSegmentWithStartAfter (e.Offset + 1);
+
+			if (next != null) {
+				next.DistanceToPrevNode += delta;
+				next.UpdateAugmentedData ();
+			}
+		}
+
+		void InternalAdd (TreeSegment node)
+		{
+			if (node == null)
+				throw new ArgumentNullException ("node");
+			if (node.segmentTree != null)
+				throw new InvalidOperationException ("Node already attached.");
+
+			node.segmentTree = this;
+
+
+			int insertionOffset = node.Offset;
+			node.DistanceToMaxEnd = node.Length;
+
+			if (tree.Root == null) {
+				tree.Count = 1;
+				tree.Root = (T)node;
+				node.TotalLength = node.DistanceToPrevNode;
+				return;
+			}
+
+			if (insertionOffset < tree.Root.TotalLength) {
+				var n = SearchNode (ref insertionOffset);
+				node.TotalLength = node.DistanceToPrevNode = insertionOffset;
+				n.DistanceToPrevNode -= insertionOffset;
+				tree.InsertBefore (n, node);
+				return;
+			}
+
+			node.DistanceToPrevNode = node.TotalLength = insertionOffset - tree.Root.TotalLength;
+			tree.InsertRight (tree.Root.OuterRight, node);
+		}
+
+		bool InternalRemove (TreeSegment node)
+		{
+			if (node.segmentTree == null)
+				return false;
+			if (node.segmentTree != this)
+				throw new InvalidOperationException ("Tried to remove tree segment from wrong tree.");
+			var calculatedOffset = node.Offset;
+			var next = node.NextNode;
+			if (next != null)
+				next.DistanceToPrevNode += node.DistanceToPrevNode;
+			tree.Remove (node);
+			if (next != null)
+				next.UpdateAugmentedData ();
+			node.segmentTree = null;
+			node.Parent = node.Left = node.Right = null;
+			node.DistanceToPrevNode = calculatedOffset;
+			return true;
+		}
+
+		TreeSegment SearchFirstSegmentWithStartAfter (int startOffset)
+		{
+			if (tree.Root == null)
+				return null;
+			if (startOffset <= 0)
+				return tree.Root.OuterLeft;
+			var result = SearchNode (ref startOffset);
+			while (startOffset == 0) {
+				var pre = result == null ? tree.Root.OuterRight : result.PrevNode;
+				if (pre == null)
+					return null;
+				startOffset += pre.DistanceToPrevNode;
+				result = pre;
+			}
+			return result;
+		}
+
+		TreeSegment SearchNode (ref int offset)
+		{
+			TreeSegment n = tree.Root;
+			while (true) {
+				if (n.Left != null) {
+					if (offset < n.Left.TotalLength) {
+						n = n.Left;
+						continue;
+					}
+					offset -= n.Left.TotalLength;
+				}
+				if (offset < n.DistanceToPrevNode) 
+					return n; 
+				offset -= n.DistanceToPrevNode; 
+				if (n.Right == null) 
+					return null;
+				n = n.Right;
+			}
+		}
+
+		#region TextSegmentTree implementation
+
+		void TextSegmentTree.Add (TreeSegment segment)
+		{
+			InternalAdd (segment);
+		}
+
+		bool TextSegmentTree.Remove (TreeSegment segment)
+		{
+			return InternalRemove (segment);
+		}
+
+		#endregion
+		
+		const bool Black = false;
+		const bool Red = true;
+		
+		struct Interval 
+		{
+			internal TreeSegment node;
+			internal int start, end;
+
+			public Interval (TreeSegment node,int start,int end)
+			{
+				this.node = node;
+				this.start = start;
+				this.end = end;
+			}
+
+			public override string ToString ()
+			{
+				return string.Format ("[Interval: start={0},end={1}]", start, end);
+			}
+		}
+		
+		sealed class RedBlackTree
+		{
+			public T Root { get; set; }
+
+			public void InsertBefore (TreeSegment node, TreeSegment newNode)
+			{
+				if (node.Left == null) {
+					InsertLeft (node, newNode);
+				} else {
+					InsertRight (node.Left.OuterRight, newNode);
+				}
+			}
+
+			public void InsertLeft (TreeSegment parentNode, TreeSegment newNode)
+			{
+				parentNode.Left = newNode;
+				newNode.Parent = parentNode;
+				newNode.Color = Red;
+				parentNode.UpdateAugmentedData ();
+				FixTreeOnInsert (newNode);
+				Count++;
+			}
+
+			public void InsertRight (TreeSegment parentNode, TreeSegment newNode)
+			{
+				parentNode.Right = newNode;
+				newNode.Parent = parentNode;
+				newNode.Color = Red;
+				parentNode.UpdateAugmentedData ();
+				FixTreeOnInsert (newNode);
+				Count++;
+			}
+
+			void FixTreeOnInsert (TreeSegment node)
+			{
+				var parent = node.Parent;
+				if (parent == null) {
+					node.Color = Black;
+					return;
+				}
+
+				if (parent.Color == Black)
+					return;
+				var uncle = node.Uncle;
+				TreeSegment grandParent = parent.Parent;
+
+				if (uncle != null && uncle.Color == Red) {
+					parent.Color = Black;
+					uncle.Color = Black;
+					grandParent.Color = Red;
+					FixTreeOnInsert (grandParent);
+					return;
+				}
+
+				if (node == parent.Right && parent == grandParent.Left) {
+					RotateLeft (parent);
+					node = node.Left;
+				} else if (node == parent.Left && parent == grandParent.Right) {
+					RotateRight (parent);
+					node = node.Right;
+				}
+
+				parent = node.Parent;
+				grandParent = parent.Parent;
+
+				parent.Color = Black;
+				grandParent.Color = Red;
+				if (node == parent.Left && parent == grandParent.Left) {
+					RotateRight (grandParent);
+				} else {
+					RotateLeft (grandParent);
+				}
+			}
+
+			void RotateLeft (TreeSegment node)
+			{
+				TreeSegment right = node.Right;
+				Replace (node, right);
+				node.Right = right.Left;
+				if (node.Right != null)
+					node.Right.Parent = node;
+				right.Left = node;
+				node.Parent = right;
+				node.UpdateAugmentedData ();
+				node.Parent.UpdateAugmentedData ();
+			}
+
+			void RotateRight (TreeSegment node)
+			{
+				TreeSegment left = node.Left;
+				Replace (node, left);
+				node.Left = left.Right;
+				if (node.Left != null)
+					node.Left.Parent = node;
+				left.Right = node;
+				node.Parent = left;
+				node.UpdateAugmentedData ();
+				node.Parent.UpdateAugmentedData ();
+			}
+
+			void Replace (TreeSegment oldNode, TreeSegment newNode)
+			{
+				if (newNode != null)
+					newNode.Parent = oldNode.Parent;
+				if (oldNode.Parent == null) {
+					Root = (T)newNode;
+				} else {
+					if (oldNode.Parent.Left == oldNode)
+						oldNode.Parent.Left = newNode;
+					else
+						oldNode.Parent.Right = newNode;
+					oldNode.Parent.UpdateAugmentedData ();
+				}
+			}
+
+			public void Remove (TreeSegment node)
+			{
+				if (node.Left != null && node.Right != null) {
+					var outerLeft = node.Right.OuterLeft;
+					InternalRemove (outerLeft);
+					Replace (node, outerLeft);
+
+					outerLeft.Color = node.Color;
+					outerLeft.Left = node.Left;
+					if (outerLeft.Left != null)
+						outerLeft.Left.Parent = outerLeft;
+
+					outerLeft.Right = node.Right;
+					if (outerLeft.Right != null)
+						outerLeft.Right.Parent = outerLeft;
+					outerLeft.UpdateAugmentedData ();
+					return;
+				}
+				InternalRemove (node);
+			}
+
+			void InternalRemove (TreeSegment node)
+			{
+				if (node.Left != null && node.Right != null) {
+					var outerLeft = node.Right.OuterLeft;
+					InternalRemove (outerLeft);
+					Replace (node, outerLeft);
+
+					outerLeft.Color = node.Color;
+					outerLeft.Left = node.Left;
+					if (outerLeft.Left != null)
+						outerLeft.Left.Parent = outerLeft;
+
+					outerLeft.Right = node.Right;
+					if (outerLeft.Right != null)
+						outerLeft.Right.Parent = outerLeft;
+					outerLeft.UpdateAugmentedData ();
+					return;
+				}
+				Count--;
+				// node has only one child
+				TreeSegment child = node.Left ?? node.Right;
+
+				Replace (node, child);
+
+				if (node.Color == Black && child != null) {
+					if (child.Color == Red) {
+						child.Color = Black;
+					} else {
+						DeleteOneChild (child);
+					}
+				}
+			}
+
+			static bool GetColorSafe (TreeSegment node)
+			{
+				return node != null ? node.Color : Black;
+			}
+
+			void DeleteOneChild (TreeSegment node)
+			{
+				// case 1
+				if (node == null || node.Parent == null)
+					return;
+
+				var parent = node.Parent;
+				var sibling = node.Sibling;
+				if (sibling == null)
+					return;
+
+				// case 2
+				if (sibling.Color == Red) {
+					parent.Color = Red;
+					sibling.Color = Black;
+					if (node == parent.Left) {
+						RotateLeft (parent);
+					} else {
+						RotateRight (parent);
+					}
+					sibling = node.Sibling;
+					if (sibling == null)
+						return;
+				}
+
+				// case 3
+				if (parent.Color == Black && sibling.Color == Black && GetColorSafe (sibling.Left) == Black && GetColorSafe (sibling.Right) == Black) {
+					sibling.Color = Red;
+					DeleteOneChild (parent);
+					return;
+				}
+
+				// case 4
+				if (parent.Color == Red && sibling.Color == Black && GetColorSafe (sibling.Left) == Black && GetColorSafe (sibling.Right) == Black) {
+					sibling.Color = Red;
+					parent.Color = Black;
+					return;
+				}
+
+				// case 5
+				if (node == parent.Left && sibling.Color == Black && GetColorSafe (sibling.Left) == Red && GetColorSafe (sibling.Right) == Black) {
+					sibling.Color = Red;
+					if (sibling.Left != null)
+						sibling.Left.Color = Black;
+					RotateRight (sibling);
+				} else if (node == parent.Right && sibling.Color == Black && GetColorSafe (sibling.Right) == Red && GetColorSafe (sibling.Left) == Black) {
+					sibling.Color = Red;
+					if (sibling.Right != null)
+						sibling.Right.Color = Black;
+					RotateLeft (sibling);
+				}
+
+				// case 6
+				sibling = node.Sibling;
+				if (sibling == null)
+					return;
+				sibling.Color = parent.Color;
+				parent.Color = Black;
+				if (node == parent.Left) {
+					if (sibling.Right != null)
+						sibling.Right.Color = Black;
+					RotateLeft (parent);
+				} else {
+					if (sibling.Left != null)
+						sibling.Left.Color = Black;
+					RotateRight (parent);
+				}
+			}
+
+			public int Count { get; set; }
+
+			public void Clear ()
+			{
+				Root = null;
+				Count = 0;
+			}
+
+			static string GetIndent (int level)
+			{
+				return new String ('\t', level);
+			}
+
+			static void AppendNode (StringBuilder builder, TreeSegment node, int indent)
+			{
+				builder.Append (GetIndent (indent) + "Node (" + (node.Color == Red ? "r" : "b") + "):" + node + Environment.NewLine);
+				builder.Append (GetIndent (indent) + "Left: ");
+				if (node.Left != null) {
+					builder.Append (Environment.NewLine);
+					AppendNode (builder, node.Left, indent + 1);
+				} else {
+					builder.Append ("null");
+				}
+
+				builder.Append (Environment.NewLine);
+				builder.Append (GetIndent (indent) + "Right: ");
+				if (node.Right != null) {
+					builder.Append (Environment.NewLine);
+					AppendNode (builder, node.Right, indent + 1);
+				} else {
+					builder.Append ("null");
+				}
+			}
+
+			public override string ToString ()
+			{
+				if (Root == null)
+					return "<null>";
+				var result = new StringBuilder ();
+				AppendNode (result, Root, 0);
+				return result.ToString ();
+			}
+		}
+	}
+
+	interface TextSegmentTree
+	{
+		void Add (TreeSegment segment);
+		bool Remove (TreeSegment segment);
+	}
+
+	public class TreeSegment : ISegment
+	{
+		public int Offset {
+			get {
+				if (segmentTree == null)
+					return DistanceToPrevNode;
+
+				var curNode = this;
+				int offset = curNode.DistanceToPrevNode;
+				if (curNode.Left != null)
+					offset += curNode.Left.TotalLength;
+				while (curNode.Parent != null) {
+					if (curNode == curNode.Parent.Right) {
+						if (curNode.Parent.Left != null)
+							offset += curNode.Parent.Left.TotalLength;
+						offset += curNode.Parent.DistanceToPrevNode;
+					}
+					curNode = curNode.Parent;
+				}
+				return offset;
+			}
+			set {
+				if (segmentTree != null)
+					segmentTree.Remove (this);
+				DistanceToPrevNode = value;
+				if (segmentTree != null)
+					segmentTree.Add (this);
+			}
+		}
+
+		public int Length {
+			get;
+			set;
+		}
+
+		public int EndOffset {
+			get {
+				return Offset + Length;
+			}
+		}
+
+		protected TreeSegment ()
+		{
+		}
+
+		public TreeSegment (int offset, int length)
+		{
+			Offset = offset;
+			Length = length;
+		}
+
+		public TreeSegment (ISegment segment) : this (segment.Offset, segment.Length)
+		{
+		}
+
+		#region Internal API
+		internal TextSegmentTree segmentTree;
+		internal TreeSegment Parent, Left, Right;
+		internal bool Color;
+		
+		// TotalLength = DistanceToPrevNode + Left.DistanceToPrevNode + Right.DistanceToPrevNode
+		internal int TotalLength;
+
+		internal int DistanceToPrevNode;
+
+		// DistanceToMaxEnd = Max (Length, left.DistanceToMaxEnd + Max (left.Offset, right.Offset) - Offset)
+		internal int DistanceToMaxEnd;
+		
+		internal void UpdateAugmentedData ()
+		{
+			int totalLength = DistanceToPrevNode;
+			int distanceToMaxEnd = Length;
+
+			if (Left != null) {
+				totalLength += Left.TotalLength;
+				int leftdistance = Left.DistanceToMaxEnd - DistanceToPrevNode;
+				if (Left.Right != null)
+					leftdistance -= Left.Right.TotalLength;
+				if (leftdistance > distanceToMaxEnd)
+					distanceToMaxEnd = leftdistance;
+			}
+
+			if (Right != null) {
+				totalLength += Right.TotalLength;
+				int rightdistance = Right.DistanceToMaxEnd + Right.DistanceToPrevNode;
+				if (Right.Left != null)
+					rightdistance += Right.Left.TotalLength;
+				if (rightdistance > distanceToMaxEnd)
+					distanceToMaxEnd = rightdistance;
+			}
+
+			if (TotalLength != totalLength || DistanceToMaxEnd != distanceToMaxEnd) {
+				TotalLength = totalLength;
+				DistanceToMaxEnd = distanceToMaxEnd;
+				if (Parent != null)
+					Parent.UpdateAugmentedData ();
+			}
+		}
+
+		internal TreeSegment Sibling {
+			get {
+				if (Parent == null)
+					return null;
+				return this == Parent.Left ? Parent.Right : Parent.Left;
+			}
+		}
+
+		internal TreeSegment OuterLeft {
+			get {
+				TreeSegment result = this;
+				while (result.Left != null)
+					result = result.Left;
+				return result;
+			}
+		}
+
+		internal TreeSegment OuterRight {
+			get {
+				TreeSegment result = this;
+				while (result.Right != null) {
+					result = result.Right;
+				}
+				return result;
+			}
+		}
+
+		internal TreeSegment Grandparent {
+			get {
+				return Parent != null ? Parent.Parent : null;
+			}
+		}
+
+		internal TreeSegment Uncle {
+			get {
+				TreeSegment grandparent = Grandparent;
+				if (grandparent == null)
+					return null;
+				return Parent == grandparent.Left ? grandparent.Right : grandparent.Left;
+			}
+		}
+
+		internal TreeSegment NextNode {
+			get {
+				if (Right == null) {
+					TreeSegment curNode = this;
+					TreeSegment oldNode;
+					do {
+						oldNode = curNode;
+						curNode = curNode.Parent;
+					} while (curNode != null && curNode.Right == oldNode);
+					return curNode;
+				}
+				return Right.OuterLeft;
+			}
+		}
+
+		internal TreeSegment PrevNode {
+			get {
+				if (Left == null) {
+					TreeSegment curNode = this;
+					TreeSegment oldNode;
+					do {
+						oldNode = curNode;
+						curNode = curNode.Parent;
+					} while (curNode != null && curNode.Left == oldNode);
+					return curNode;
+				}
+				return Left.OuterRight;
+			}
+		}
+		#endregion
+	}
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/SelectionMode.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/SelectionMode.cs
new file mode 100644
index 0000000000..71b981f189
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/SelectionMode.cs
@@ -0,0 +1,33 @@
+//
+// SelectionMode.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace MonoDevelop.Ide.Editor
+{
+	public enum SelectionMode {
+		Normal,
+		Block
+	}
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs
new file mode 100644
index 0000000000..444f64fd04
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs
@@ -0,0 +1,1260 @@
+//
+// ITextEditor.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using System.Collections.Generic;
+using System.Text;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Editor.Extension;
+using System.IO;
+using MonoDevelop.Ide.Editor.Highlighting;
+using Mono.Addins;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Extensions;
+using System.Linq;
+using MonoDevelop.Components;
+using System.ComponentModel;
+using MonoDevelop.Ide.TypeSystem;
+using System.Threading;
+using MonoDevelop.Ide.Editor.Projection;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public sealed class TextEditor : Control, ITextDocument, IDisposable
+	{
+		readonly ITextEditorImpl textEditorImpl;
+		IReadonlyTextDocument ReadOnlyTextDocument { get { return textEditorImpl.Document; } }
+		ITextDocument ReadWriteTextDocument { get { return (ITextDocument)textEditorImpl.Document; } }
+
+		public ITextSourceVersion Version {
+			get {
+				return ReadOnlyTextDocument.Version;
+			}
+		}
+
+		FileTypeCondition fileTypeCondition = new FileTypeCondition ();
+
+		List<TooltipExtensionNode> allProviders = new List<TooltipExtensionNode> ();
+
+		void OnTooltipProviderChanged (object s, ExtensionNodeEventArgs a)
+		{
+			TooltipProvider provider;
+			try {
+				var extensionNode = a.ExtensionNode as TooltipExtensionNode;
+				allProviders.Add (extensionNode);
+				if (extensionNode.IsValidFor (MimeType))
+					return;
+				provider = (TooltipProvider) extensionNode.CreateInstance ();
+			} catch (Exception e) {
+				LoggingService.LogError ("Can't create tooltip provider:"+ a.ExtensionNode, e);
+				return;
+			}
+			if (a.Change == ExtensionChange.Add) {
+				textEditorImpl.AddTooltipProvider (provider);
+			} else {
+				textEditorImpl.RemoveTooltipProvider (provider);
+			}
+		}
+
+		public event EventHandler SelectionChanged {
+			add { textEditorImpl.SelectionChanged += value; }
+			remove { textEditorImpl.SelectionChanged -= value; }
+		}
+
+		public event EventHandler CaretPositionChanged {
+			add { textEditorImpl.CaretPositionChanged += value; }
+			remove { textEditorImpl.CaretPositionChanged -= value; }
+		}
+
+		public event EventHandler BeginAtomicUndoOperation {
+			add { textEditorImpl.BeginAtomicUndoOperation += value; }
+			remove { textEditorImpl.BeginAtomicUndoOperation -= value; }
+		}
+
+		public event EventHandler EndAtomicUndoOperation {
+			add { textEditorImpl.EndAtomicUndoOperation += value; }
+			remove { textEditorImpl.EndAtomicUndoOperation -= value; }
+		}
+
+		public event EventHandler<TextChangeEventArgs> TextChanging {
+			add { ReadWriteTextDocument.TextChanging += value; }
+			remove { ReadWriteTextDocument.TextChanging -= value; }
+		}
+
+		public event EventHandler<TextChangeEventArgs> TextChanged {
+			add { ReadWriteTextDocument.TextChanged += value; }
+			remove { ReadWriteTextDocument.TextChanged -= value; }
+		}
+
+		public event EventHandler BeginMouseHover {
+			add { textEditorImpl.BeginMouseHover += value; }
+			remove { textEditorImpl.BeginMouseHover -= value; }
+		}
+
+		public event EventHandler VAdjustmentChanged {
+			add { textEditorImpl.VAdjustmentChanged += value; }
+			remove { textEditorImpl.VAdjustmentChanged -= value; }
+		}
+
+		public event EventHandler HAdjustmentChanged {
+			add { textEditorImpl.HAdjustmentChanged += value; }
+			remove { textEditorImpl.HAdjustmentChanged -= value; }
+		}
+		public char this[int offset] {
+			get {
+				return ReadOnlyTextDocument [offset];
+			}
+			set {
+				ReadWriteTextDocument [offset] = value;
+			}
+		}
+
+//		public event EventHandler<LineEventArgs> LineChanged {
+//			add { textEditorImpl.LineChanged += value; }
+//			remove { textEditorImpl.LineChanged -= value; }
+//		}
+//
+//		public event EventHandler<LineEventArgs> LineInserted {
+//			add { textEditorImpl.LineInserted += value; }
+//			remove { textEditorImpl.LineInserted -= value; }
+//		}
+//
+//		public event EventHandler<LineEventArgs> LineRemoved {
+//			add { textEditorImpl.LineRemoved += value; }
+//			remove { textEditorImpl.LineRemoved -= value; }
+//		}
+
+		public ITextEditorOptions Options {
+			get {
+				return textEditorImpl.Options;
+			}
+			set {
+				textEditorImpl.Options = value;
+				OnOptionsChanged (EventArgs.Empty);
+			}
+		}
+
+		public event EventHandler OptionsChanged;
+
+		void OnOptionsChanged (EventArgs e)
+		{
+			var handler = OptionsChanged;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		public EditMode EditMode {
+			get {
+				return textEditorImpl.EditMode;
+			}
+		}
+
+		public DocumentLocation CaretLocation {
+			get {
+				return textEditorImpl.CaretLocation;
+			}
+			set {
+				textEditorImpl.CaretLocation = value;
+			}
+		}
+
+		public SemanticHighlighting SemanticHighlighting {
+			get {
+				return textEditorImpl.SemanticHighlighting;
+			}
+			set {
+				textEditorImpl.SemanticHighlighting = value;
+			}
+		}
+
+		public int CaretLine {
+			get {
+				return CaretLocation.Line;
+			}
+			set {
+				CaretLocation = new DocumentLocation (value, CaretColumn);
+			}
+		}
+
+		public int CaretColumn {
+			get {
+				return CaretLocation.Column;
+			}
+			set {
+				CaretLocation = new DocumentLocation (CaretLine, value);
+			}
+		}
+
+		public int CaretOffset {
+			get {
+				return textEditorImpl.CaretOffset;
+			}
+			set {
+				textEditorImpl.CaretOffset = value;
+			}
+		}
+
+		public bool IsReadOnly {
+			get {
+				return ReadOnlyTextDocument.IsReadOnly;
+			}
+			set {
+				ReadWriteTextDocument.IsReadOnly = value;
+			}
+		}
+
+		public bool IsSomethingSelected {
+			get {
+				return textEditorImpl.IsSomethingSelected;
+			}
+		}
+
+		public SelectionMode SelectionMode {
+			get {
+				return textEditorImpl.SelectionMode;
+			}
+		}
+
+		public ISegment SelectionRange {
+			get {
+				return textEditorImpl.SelectionRange;
+			}
+			set {
+				textEditorImpl.SelectionRange = value;
+			}
+		}
+
+		public DocumentRegion SelectionRegion {
+			get {
+				return textEditorImpl.SelectionRegion;
+			}
+			set {
+				textEditorImpl.SelectionRegion = value;
+			}
+		}
+		
+		public int SelectionAnchorOffset {
+			get {
+				return textEditorImpl.SelectionAnchorOffset;
+			}
+			set {
+				textEditorImpl.SelectionAnchorOffset = value;
+			}
+		}
+
+		public int SelectionLeadOffset {
+			get {
+				return textEditorImpl.SelectionLeadOffset;
+			}
+			set {
+				textEditorImpl.SelectionLeadOffset = value;
+			}
+		}
+
+		public string SelectedText {
+			get {
+				return IsSomethingSelected ? ReadOnlyTextDocument.GetTextAt (SelectionRange) : null;
+			}
+			set {
+				var selection = SelectionRange;
+				ReplaceText (selection, value);
+				SelectionRange = new TextSegment (selection.Offset, value.Length);
+			}
+		}
+
+		public bool IsInAtomicUndo {
+			get {
+				return ReadWriteTextDocument.IsInAtomicUndo;
+			}
+		}
+
+		public double LineHeight {
+			get {
+				return textEditorImpl.LineHeight;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the type of the MIME.
+		/// </summary>
+		/// <value>The type of the MIME.</value>
+		public string MimeType {
+			get {
+				return ReadOnlyTextDocument.MimeType;
+			}
+			set {
+				ReadWriteTextDocument.MimeType = value;
+			}
+		}
+
+		public event EventHandler MimeTypeChanged {
+			add { ReadWriteTextDocument.MimeTypeChanged += value; }
+			remove { ReadWriteTextDocument.MimeTypeChanged -= value; }
+		}
+
+		public string Text {
+			get {
+				return ReadOnlyTextDocument.Text;
+			}
+			set {
+				ReadWriteTextDocument.Text = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets the eol marker. On a text editor always use that and not GetEolMarker.
+		/// The EOL marker of the document may get overwritten my the one from the options.
+		/// </summary>
+		public string EolMarker {
+			get {
+				if (Options.OverrideDocumentEolMarker)
+					return Options.DefaultEolMarker;
+				return ReadOnlyTextDocument.GetEolMarker ();
+			}
+		}
+
+		public bool UseBOM {
+			get {
+				return ReadOnlyTextDocument.UseBOM;
+			}
+			set {
+				ReadWriteTextDocument.UseBOM = value;
+			}
+		}
+
+		public Encoding Encoding {
+			get {
+				return ReadOnlyTextDocument.Encoding;
+			}
+			set {
+				ReadWriteTextDocument.Encoding = value;
+			}
+		}
+
+		public int LineCount {
+			get {
+				return ReadOnlyTextDocument.LineCount;
+			}
+		}
+
+		/// <summary>
+		/// Gets the name of the file the document is stored in.
+		/// Could also be a non-existent dummy file name or null if no name has been set.
+		/// </summary>
+		public FilePath FileName {
+			get {
+				return ReadOnlyTextDocument.FileName;
+			}
+			set {
+				ReadWriteTextDocument.FileName = value;
+			}
+		}
+
+		public event EventHandler FileNameChanged {
+			add {
+				ReadWriteTextDocument.FileNameChanged += value;
+			}
+			remove {
+				ReadWriteTextDocument.FileNameChanged -= value;
+			}
+		}
+
+		public int Length {
+			get {
+				return ReadOnlyTextDocument.Length;
+			}
+		}
+
+		public double ZoomLevel {
+			get {
+				return textEditorImpl.ZoomLevel;
+			}
+			set {
+				textEditorImpl.ZoomLevel = value;
+			}
+		}
+
+		public event EventHandler ZoomLevelChanged {
+			add {
+				textEditorImpl.ZoomLevelChanged += value;
+			}
+			remove {
+				textEditorImpl.ZoomLevelChanged -= value;
+			}
+		}
+
+		public IDisposable OpenUndoGroup ()
+		{
+			return ReadWriteTextDocument.OpenUndoGroup ();
+		}
+
+		public void SetSelection (int anchorOffset, int leadOffset)
+		{
+			textEditorImpl.SetSelection (anchorOffset, leadOffset);
+		}
+
+		public void SetSelection (DocumentLocation anchor, DocumentLocation lead)
+		{
+			SetSelection (LocationToOffset (anchor), LocationToOffset (lead));
+		}
+
+		public void SetCaretLocation (DocumentLocation location, bool usePulseAnimation = false)
+		{
+			CaretLocation = location;
+			ScrollTo (CaretLocation);
+			if (usePulseAnimation)
+				StartCaretPulseAnimation ();
+		}
+
+		public void SetCaretLocation (int line, int col, bool usePulseAnimation = false)
+		{
+			CaretLocation = new DocumentLocation (line, col);
+			CenterTo (CaretLocation);
+			if (usePulseAnimation)
+				StartCaretPulseAnimation ();
+		}
+
+		public void ClearSelection ()
+		{
+			textEditorImpl.ClearSelection ();
+		}
+
+		public void CenterToCaret ()
+		{
+			textEditorImpl.CenterToCaret ();
+		}
+
+		public void StartCaretPulseAnimation ()
+		{
+			textEditorImpl.StartCaretPulseAnimation ();
+		}
+
+		public int EnsureCaretIsNotVirtual ()
+		{
+			return textEditorImpl.EnsureCaretIsNotVirtual ();
+		}
+
+		public void FixVirtualIndentation ()
+		{
+			textEditorImpl.FixVirtualIndentation ();
+		}
+
+		public void RunWhenLoaded (Action action)
+		{
+			if (action == null)
+				throw new ArgumentNullException ("action");
+			textEditorImpl.RunWhenLoaded (action);
+		}
+
+		public string FormatString (DocumentLocation insertPosition, string code)
+		{
+			return textEditorImpl.FormatString (LocationToOffset (insertPosition), code);
+		}
+
+		public string FormatString (int offset, string code)
+		{
+			return textEditorImpl.FormatString (offset, code);
+		}
+
+		public void StartInsertionMode (InsertionModeOptions insertionModeOptions)
+		{
+			if (insertionModeOptions == null)
+				throw new ArgumentNullException ("insertionModeOptions");
+			textEditorImpl.StartInsertionMode (insertionModeOptions);
+		}
+
+		public void StartTextLinkMode (TextLinkModeOptions textLinkModeOptions)
+		{
+			if (textLinkModeOptions == null)
+				throw new ArgumentNullException ("textLinkModeOptions");
+			textEditorImpl.StartTextLinkMode (textLinkModeOptions);
+		}
+
+		public void InsertAtCaret (string text)
+		{
+			InsertText (CaretOffset, text);
+		}
+
+		public DocumentLocation PointToLocation (double xp, double yp, bool endAtEol = false)
+		{
+			return textEditorImpl.PointToLocation (xp, yp, endAtEol);
+		}
+
+		public Xwt.Point LocationToPoint (DocumentLocation location)
+		{
+			return textEditorImpl.LocationToPoint (location.Line, location.Column);
+		} 
+
+		public Xwt.Point LocationToPoint (int line, int column)
+		{
+			return textEditorImpl.LocationToPoint (line, column);
+		}
+
+		public string GetLineText (int line, bool includeDelimiter = false)
+		{
+			var segment = GetLine (line);
+			return GetTextAt (includeDelimiter ? segment.SegmentIncludingDelimiter : segment);
+		}
+
+		public int LocationToOffset (int line, int column)
+		{
+			return ReadOnlyTextDocument.LocationToOffset (new DocumentLocation (line, column));
+		}
+
+		public int LocationToOffset (DocumentLocation location)
+		{
+			return ReadOnlyTextDocument.LocationToOffset (location);
+		}
+
+		public DocumentLocation OffsetToLocation (int offset)
+		{
+			return ReadOnlyTextDocument.OffsetToLocation (offset);
+		}
+
+		public void InsertText (int offset, string text)
+		{
+			ReadWriteTextDocument.InsertText (offset, text);
+		}
+
+		public void InsertText (int offset, ITextSource text)
+		{
+			ReadWriteTextDocument.InsertText (offset, text);
+		}
+
+		public void RemoveText (int offset, int count)
+		{
+			RemoveText (new TextSegment (offset, count)); 
+		}
+
+		public void RemoveText (ISegment segment)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			ReadWriteTextDocument.RemoveText (segment);
+		}
+
+		public void ReplaceText (int offset, int count, string value)
+		{
+			ReadWriteTextDocument.ReplaceText (offset, count, value);
+		}
+
+		public void ReplaceText (int offset, int count, ITextSource value)
+		{
+			ReadWriteTextDocument.ReplaceText (offset, count, value);
+		}
+
+		public void ReplaceText (ISegment segment, string value)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			ReadWriteTextDocument.ReplaceText (segment.Offset, segment.Length, value);
+		}
+
+		public void ReplaceText (ISegment segment, ITextSource value)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			ReadWriteTextDocument.ReplaceText (segment.Offset, segment.Length, value);
+		}
+
+		public IDocumentLine GetLine (int lineNumber)
+		{
+			return ReadOnlyTextDocument.GetLine (lineNumber);
+		}
+
+		public IDocumentLine GetLineByOffset (int offset)
+		{
+			return ReadOnlyTextDocument.GetLineByOffset (offset);
+		}
+
+		public int OffsetToLineNumber (int offset)
+		{
+			return ReadOnlyTextDocument.OffsetToLineNumber (offset);
+		}
+
+		public void AddMarker (IDocumentLine line, ITextLineMarker lineMarker)
+		{
+			if (line == null)
+				throw new ArgumentNullException ("line");
+			if (lineMarker == null)
+				throw new ArgumentNullException ("lineMarker");
+			textEditorImpl.AddMarker (line, lineMarker);
+		}
+
+		public void AddMarker (int lineNumber, ITextLineMarker lineMarker)
+		{
+			if (lineMarker == null)
+				throw new ArgumentNullException ("lineMarker");
+			AddMarker (GetLine (lineNumber), lineMarker);
+		}
+
+		public void RemoveMarker (ITextLineMarker lineMarker)
+		{
+			if (lineMarker == null)
+				throw new ArgumentNullException ("lineMarker");
+			textEditorImpl.RemoveMarker (lineMarker);
+		}
+
+		public IEnumerable<ITextLineMarker> GetLineMarkers (IDocumentLine line)
+		{
+			if (line == null)
+				throw new ArgumentNullException ("line");
+			return textEditorImpl.GetLineMarkers (line);
+		}
+
+		public IEnumerable<ITextSegmentMarker> GetTextSegmentMarkersAt (ISegment segment)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return textEditorImpl.GetTextSegmentMarkersAt (segment);
+		}
+
+		public IEnumerable<ITextSegmentMarker> GetTextSegmentMarkersAt (int offset)
+		{
+			return textEditorImpl.GetTextSegmentMarkersAt (offset);
+		}
+
+		public void AddMarker (ITextSegmentMarker marker)
+		{
+			if (marker == null)
+				throw new ArgumentNullException ("marker");
+			textEditorImpl.AddMarker (marker);
+		}
+
+		public bool RemoveMarker (ITextSegmentMarker marker)
+		{
+			if (marker == null)
+				throw new ArgumentNullException ("marker");
+			return textEditorImpl.RemoveMarker (marker);
+		}
+
+		public void SetFoldings (IEnumerable<IFoldSegment> foldings)
+		{
+			if (foldings == null)
+				throw new ArgumentNullException ("foldings");
+			textEditorImpl.SetFoldings (foldings);
+		}
+
+
+		public IEnumerable<IFoldSegment> GetFoldingsContaining (int offset)
+		{
+			return textEditorImpl.GetFoldingsContaining (offset);
+		}
+
+		public IEnumerable<IFoldSegment> GetFoldingsIn (ISegment segment)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return textEditorImpl.GetFoldingsIn (segment.Offset, segment.Length);
+		}
+
+		/// <summary>
+		/// Gets a character at the specified position in the document.
+		/// </summary>
+		/// <paramref name="offset">The index of the character to get.</paramref>
+		/// <exception cref="ArgumentOutOfRangeException">Offset is outside the valid range (0 to TextLength-1).</exception>
+		/// <returns>The character at the specified position.</returns>
+		/// <remarks>This is the same as Text[offset], but is more efficient because
+		///  it doesn't require creating a String object.</remarks>
+		public char GetCharAt (int offset)
+		{
+			return ReadOnlyTextDocument.GetCharAt (offset); 
+		}
+
+		public string GetTextAt (int offset, int length)
+		{
+			return ReadOnlyTextDocument.GetTextAt (offset, length);
+		}
+
+		public string GetTextAt (ISegment segment)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return ReadOnlyTextDocument.GetTextAt (segment);
+		}
+
+		public IReadonlyTextDocument CreateDocumentSnapshot ()
+		{
+			return ReadWriteTextDocument.CreateDocumentSnapshot ();
+		}
+
+		public string GetVirtualIndentationString (int lineNumber)
+		{
+			if (lineNumber < 1 || lineNumber > LineCount)
+				throw new ArgumentOutOfRangeException ("lineNumber");
+			return textEditorImpl.GetVirtualIndentationString (lineNumber);
+		}
+
+		public string GetVirtualIndentationString (IDocumentLine line)
+		{
+			if (line == null)
+				throw new ArgumentNullException ("line");
+			return textEditorImpl.GetVirtualIndentationString (line.LineNumber);
+		}
+
+		public int GetVirtualIndentationColumn (int lineNumber)
+		{
+			if (lineNumber < 1 || lineNumber > LineCount)
+				throw new ArgumentOutOfRangeException ("lineNumber");
+			return 1 + textEditorImpl.GetVirtualIndentationString (lineNumber).Length;
+		}
+
+		public int GetVirtualIndentationColumn (IDocumentLine line)
+		{
+			if (line == null)
+				throw new ArgumentNullException ("line");
+			return 1 + textEditorImpl.GetVirtualIndentationString (line.LineNumber).Length;
+		}
+
+		public TextReader CreateReader ()
+		{
+			return ReadOnlyTextDocument.CreateReader ();
+		}
+
+		public TextReader CreateReader (int offset, int length)
+		{
+			return ReadOnlyTextDocument.CreateReader (offset, length);
+		}
+
+		public ITextSource CreateSnapshot ()
+		{
+			return ReadOnlyTextDocument.CreateSnapshot ();
+		}
+
+		public ITextSource CreateSnapshot (int offset, int length)
+		{
+			return ReadOnlyTextDocument.CreateSnapshot (offset, length);
+		}
+
+		public ITextSource CreateSnapshot (ISegment segment)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return ReadOnlyTextDocument.CreateSnapshot (segment.Offset, segment.Length);
+		}
+
+		public void WriteTextTo (TextWriter writer)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			ReadOnlyTextDocument.WriteTextTo (writer);
+		}
+
+		public void WriteTextTo (TextWriter writer, int offset, int length)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			ReadOnlyTextDocument.WriteTextTo (writer, offset, length);
+		}
+
+		public void ScrollTo (int offset)
+		{
+			textEditorImpl.ScrollTo (offset);
+		}
+
+		public void ScrollTo (DocumentLocation loc)
+		{
+			ScrollTo (LocationToOffset (loc));
+		}
+
+		public void CenterTo (int offset)
+		{
+			textEditorImpl.CenterTo (offset);
+		}
+
+		public void CenterTo (DocumentLocation loc)
+		{
+			CenterTo (LocationToOffset (loc));
+		}
+
+		[EditorBrowsable(EditorBrowsableState.Advanced)]
+		public void SetIndentationTracker (IndentationTracker indentationTracker)
+		{
+			textEditorImpl.SetIndentationTracker (indentationTracker);
+		}
+
+		[EditorBrowsable(EditorBrowsableState.Advanced)]
+		public void SetSelectionSurroundingProvider (SelectionSurroundingProvider surroundingProvider)
+		{
+			textEditorImpl.SetSelectionSurroundingProvider (surroundingProvider);
+		}
+
+		[EditorBrowsable(EditorBrowsableState.Advanced)]
+		public void SetTextPasteHandler (TextPasteHandler textPasteHandler)
+		{
+			textEditorImpl.SetTextPasteHandler (textPasteHandler);
+		}
+
+		public IList<SkipChar> SkipChars {
+			get {
+				return textEditorImpl.SkipChars;
+			}
+		}
+
+		/// <summary>
+		/// Skip chars are 
+		/// </summary>
+		public void AddSkipChar (int offset, char ch)
+		{
+			textEditorImpl.AddSkipChar (offset, ch);
+		}
+
+		protected override void Dispose (bool disposing)
+		{
+			if (disposing) {
+				DetachExtensionChain ();
+				textEditorImpl.Dispose ();
+			}
+			base.Dispose (disposing);
+		}
+
+		protected override object CreateNativeWidget ()
+		{
+			return textEditorImpl.CreateNativeControl ();
+		}
+
+		#region Internal API
+		ExtensionContext extensionContext;
+
+		internal ExtensionContext ExtensionContext {
+			get {
+				return extensionContext;
+			}
+			set {
+				if (extensionContext != null) {
+					extensionContext.RemoveExtensionNodeHandler ("MonoDevelop/SourceEditor2/TooltipProviders", OnTooltipProviderChanged);
+//					textEditorImpl.ClearTooltipProviders ();
+				}
+				extensionContext = value;
+				if (extensionContext != null)
+					extensionContext.AddExtensionNodeHandler ("MonoDevelop/SourceEditor2/TooltipProviders", OnTooltipProviderChanged);
+			}
+		}
+
+		internal IEditorActionHost EditorActionHost {
+			get {
+				return textEditorImpl.Actions;
+			}
+		}
+
+		internal ITextMarkerFactory TextMarkerFactory {
+			get {
+				return textEditorImpl.TextMarkerFactory;
+			}
+		}
+
+		internal TextEditor (ITextEditorImpl textEditorImpl)
+		{
+			if (textEditorImpl == null)
+				throw new ArgumentNullException ("textEditorImpl");
+			this.textEditorImpl = textEditorImpl;
+			commandRouter = new InternalCommandRouter (this);
+			fileTypeCondition.SetFileName (FileName);
+			ExtensionContext = AddinManager.CreateExtensionContext ();
+			ExtensionContext.RegisterCondition ("FileType", fileTypeCondition);
+
+			FileNameChanged += delegate {
+				fileTypeCondition.SetFileName (FileName);
+			};
+
+			MimeTypeChanged += delegate {
+				textEditorImpl.ClearTooltipProviders ();
+				foreach (var extensionNode in allProviders) {
+					if (extensionNode.IsValidFor (MimeType))
+						textEditorImpl.AddTooltipProvider ((TooltipProvider) extensionNode.CreateInstance ());
+				}
+			};
+		}
+
+		TextEditorViewContent viewContent;
+		internal IViewContent GetViewContent ()
+		{
+			if (viewContent == null) {
+				viewContent = new TextEditorViewContent (this, textEditorImpl);
+			}
+
+			return viewContent;
+		}
+
+		internal IFoldSegment CreateFoldSegment (int offset, int length, bool isFolded = false)
+		{
+			return textEditorImpl.CreateFoldSegment (offset, length, isFolded);
+		}
+		#endregion
+
+		#region Editor extensions
+		InternalCommandRouter commandRouter;
+		class InternalCommandRouter : MonoDevelop.Components.Commands.IMultiCastCommandRouter
+		{
+			readonly TextEditor editor;
+
+			public InternalCommandRouter (TextEditor editor)
+			{
+				this.editor = editor;
+			}
+			
+			#region IMultiCastCommandRouter implementation
+
+			System.Collections.IEnumerable MonoDevelop.Components.Commands.IMultiCastCommandRouter.GetCommandTargets ()
+			{
+				yield return editor.textEditorImpl;
+				yield return editor.textEditorImpl.EditorExtension;
+			}
+			#endregion
+		}
+
+		internal object CommandRouter {
+			get {
+				return commandRouter;
+			}
+		}
+
+		DocumentContext documentContext;
+		internal DocumentContext DocumentContext {
+			get {
+				return documentContext;
+			}
+			set {
+				documentContext = value;
+				OnDocumentContextChanged (EventArgs.Empty);
+			}
+		}
+
+		public event EventHandler DocumentContextChanged;
+
+		void OnDocumentContextChanged (EventArgs e)
+		{
+			if (DocumentContext != null) {
+				textEditorImpl.SetQuickTaskProviders (DocumentContext.GetContents<IQuickTaskProvider> ());
+				textEditorImpl.SetUsageTaskProviders (DocumentContext.GetContents<UsageProviderEditorExtension> ());
+			} else {
+				textEditorImpl.SetQuickTaskProviders (Enumerable.Empty<IQuickTaskProvider> ());
+				textEditorImpl.SetUsageTaskProviders (Enumerable.Empty<UsageProviderEditorExtension> ());
+			}
+			var handler = DocumentContextChanged;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		internal void InitializeExtensionChain (DocumentContext documentContext)
+		{
+			if (documentContext == null)
+				throw new ArgumentNullException ("documentContext");
+			DetachExtensionChain ();
+			var extensions = ExtensionContext.GetExtensionNodes ("/MonoDevelop/Ide/TextEditorExtensions", typeof(TextEditorExtensionNode));
+			TextEditorExtension last = null;
+			var mimetypeChain = DesktopService.GetMimeTypeInheritanceChainForFile (FileName).ToArray ();
+			foreach (TextEditorExtensionNode extNode in extensions) {
+				if (!extNode.Supports (FileName, mimetypeChain))
+					continue;
+				TextEditorExtension ext;
+				try {
+					var instance = extNode.CreateInstance ();
+					ext = instance as TextEditorExtension;
+					if (ext == null)
+						continue;
+				} catch (Exception e) {
+					LoggingService.LogError ("Error while creating text editor extension :" + extNode.Id + "(" + extNode.Type +")", e); 
+					continue;
+				}
+				if (ext.IsValidInContext (documentContext)) {
+					if (last != null) {
+						last.Next = ext;
+						last = ext;
+					} else {
+						textEditorImpl.EditorExtension = last = ext;
+					}
+					ext.Initialize (this, documentContext);
+				}
+			}
+			this.DocumentContext = documentContext;
+		}
+
+		void DetachExtensionChain ()
+		{
+			var editorExtension = textEditorImpl.EditorExtension;
+			while (editorExtension != null) {
+				try {
+					editorExtension.Dispose ();
+				} catch (Exception ex) {
+					LoggingService.LogError ("Exception while disposing extension:" + editorExtension, ex);
+				}
+				editorExtension = editorExtension.Next;
+			}
+			textEditorImpl.EditorExtension = null;
+		}
+
+		public T GetContent<T> () where T : class
+		{
+			T result = textEditorImpl as T;
+			if (result != null)
+				return result;
+			var ext = textEditorImpl.EditorExtension;
+			while (ext != null) {
+				result = ext as T;
+				if (result != null)
+					return result;
+				ext = ext.Next;
+			}
+			return null;
+		}
+
+		public IEnumerable<T> GetContents<T> () where T : class
+		{
+			T result = textEditorImpl as T;
+			if (result != null)
+				yield return result;
+			var ext = textEditorImpl.EditorExtension;
+			while (ext != null) {
+				result = ext as T;
+				if (result != null)
+					yield return result;
+				ext = ext.Next;
+			}
+		}
+		#endregion
+
+		public string GetPangoMarkup (int offset, int length)
+		{
+			return textEditorImpl.GetPangoMarkup (offset, length);
+		}
+
+		public string GetPangoMarkup (ISegment segment)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return textEditorImpl.GetPangoMarkup (segment.Offset, segment.Length);
+		}
+
+		public static implicit operator Microsoft.CodeAnalysis.Text.SourceText (TextEditor editor)
+		{
+			return new MonoDevelopSourceText (editor);
+		}
+
+
+		#region Annotations
+		// Annotations: points either null (no annotations), to the single annotation,
+		// or to an AnnotationList.
+		// Once it is pointed at an AnnotationList, it will never change (this allows thread-safety support by locking the list)
+
+		object annotations;
+		sealed class AnnotationList : List<object>, ICloneable
+		{
+			// There are two uses for this custom list type:
+			// 1) it's private, and thus (unlike List<object>) cannot be confused with real annotations
+			// 2) It allows us to simplify the cloning logic by making the list behave the same as a clonable annotation.
+			public AnnotationList (int initialCapacity) : base(initialCapacity)
+			{
+			}
+
+			public object Clone ()
+			{
+				lock (this) {
+					AnnotationList copy = new AnnotationList (this.Count);
+					for (int i = 0; i < this.Count; i++) {
+						object obj = this [i];
+						ICloneable c = obj as ICloneable;
+						copy.Add (c != null ? c.Clone () : obj);
+					}
+					return copy;
+				}
+			}
+		}
+
+		public void AddAnnotation (object annotation)
+		{
+			if (annotation == null)
+				throw new ArgumentNullException ("annotation");
+			retry: // Retry until successful
+			object oldAnnotation = Interlocked.CompareExchange (ref this.annotations, annotation, null);
+			if (oldAnnotation == null) {
+				return; // we successfully added a single annotation
+			}
+			AnnotationList list = oldAnnotation as AnnotationList;
+			if (list == null) {
+				// we need to transform the old annotation into a list
+				list = new AnnotationList (4);
+				list.Add (oldAnnotation);
+				list.Add (annotation);
+				if (Interlocked.CompareExchange (ref this.annotations, list, oldAnnotation) != oldAnnotation) {
+					// the transformation failed (some other thread wrote to this.annotations first)
+					goto retry;
+				}
+			} else {
+				// once there's a list, use simple locking
+				lock (list) {
+					list.Add (annotation);
+				}
+			}
+		}
+
+		public void RemoveAnnotations<T> () where T : class
+		{
+			retry: // Retry until successful
+			object oldAnnotations = this.annotations;
+			var list = oldAnnotations as AnnotationList;
+			if (list != null) {
+				lock (list)
+					list.RemoveAll (obj => obj is T);
+			} else if (oldAnnotations is T) {
+				if (Interlocked.CompareExchange (ref this.annotations, null, oldAnnotations) != oldAnnotations) {
+					// Operation failed (some other thread wrote to this.annotations first)
+					goto retry;
+				}
+			}
+		}
+
+		public T Annotation<T> () where T: class
+		{
+			object annotations = this.annotations;
+			var list = annotations as AnnotationList;
+			if (list != null) {
+				lock (list) {
+					foreach (object obj in list) {
+						T t = obj as T;
+						if (t != null)
+							return t;
+					}
+					return null;
+				}
+			}
+			return annotations as T;
+		}
+
+		/// <summary>
+		/// Gets all annotations stored on this AstNode.
+		/// </summary>
+		public IEnumerable<object> Annotations {
+			get {
+				object annotations = this.annotations;
+				AnnotationList list = annotations as AnnotationList;
+				if (list != null) {
+					lock (list) {
+						return list.ToArray ();
+					}
+				}
+				if (annotations != null)
+					return new [] { annotations };
+				return Enumerable.Empty<object> ();
+			}
+		}
+		#endregion
+
+		List<ProjectedTooltipProvider> projectedProviders = new List<ProjectedTooltipProvider> ();
+		IReadOnlyList<MonoDevelop.Ide.Editor.Projection.Projection> projections = null;
+
+		public void SetOrUpdateProjections (DocumentContext ctx, IReadOnlyList<MonoDevelop.Ide.Editor.Projection.Projection> projections, DisabledProjectionFeatures disabledFeatures = DisabledProjectionFeatures.None)
+		{
+			if (ctx == null)
+				throw new ArgumentNullException ("ctx");
+			if (this.projections != null) {
+				foreach (var projection in this.projections) {
+					projection.Dettach ();
+				}
+			}
+			this.projections = projections;
+			if (projections != null) {
+				foreach (var projection in projections) {
+					projection.Attach (this);
+				}
+			}
+
+			if ((disabledFeatures & DisabledProjectionFeatures.SemanticHighlighting) != DisabledProjectionFeatures.SemanticHighlighting) {
+					if (SemanticHighlighting is ProjectedSemanticHighlighting) {
+					((ProjectedSemanticHighlighting)SemanticHighlighting).UpdateProjection (projections);
+				} else {
+					SemanticHighlighting = new ProjectedSemanticHighlighting (this, ctx, projections);
+				}
+			}
+
+			if ((disabledFeatures & DisabledProjectionFeatures.Tooltips) != DisabledProjectionFeatures.Tooltips) {
+					projectedProviders.ForEach (textEditorImpl.RemoveTooltipProvider);
+				projectedProviders = new List<ProjectedTooltipProvider> ();
+				foreach (var projection in projections) {
+					foreach (var tp in projection.ProjectedEditor.textEditorImpl.TooltipProvider) {
+						var newProvider = new ProjectedTooltipProvider (this, ctx, projection, tp);
+						projectedProviders.Add (newProvider);
+						textEditorImpl.AddTooltipProvider (newProvider);
+					}
+				}
+			}
+			InitializeProjectionExtensions (ctx, disabledFeatures);
+		}
+
+		bool projectionsAdded = false;
+		void InitializeProjectionExtensions (DocumentContext ctx, DisabledProjectionFeatures disabledFeatures)
+		{
+			if (projectionsAdded) {
+				TextEditorExtension ext = textEditorImpl.EditorExtension;
+				while (ext != null && ext.Next != null) {
+					var pext = ext as IProjectionExtension;
+					if (pext != null) {
+						pext.Projections = projections;
+					}
+					ext = ext.Next;
+				}
+				return;
+			}
+
+			if (projections.Count == 0)
+				return;
+
+			TextEditorExtension lastExtension = textEditorImpl.EditorExtension;
+			while (lastExtension != null && lastExtension.Next != null) {
+				var completionTextEditorExtension = lastExtension.Next as CompletionTextEditorExtension;
+				if (completionTextEditorExtension != null) {
+					var projectedFilterExtension = new ProjectedFilterCompletionTextEditorExtension (completionTextEditorExtension, projections) { Next = completionTextEditorExtension.Next };
+					lastExtension.Next = projectedFilterExtension;
+					projectedFilterExtension.Initialize (this, DocumentContext);
+				}
+				lastExtension = lastExtension.Next;
+			}
+
+			// no extensions -> no projections needed
+			if (textEditorImpl.EditorExtension == null)
+				return;
+
+			if ((disabledFeatures & DisabledProjectionFeatures.Completion) != DisabledProjectionFeatures.Completion) {
+				var projectedCompletionExtension = new ProjectedCompletionExtension (ctx, projections);
+				projectedCompletionExtension.Next = textEditorImpl.EditorExtension;
+
+				textEditorImpl.EditorExtension = projectedCompletionExtension;
+				projectedCompletionExtension.Initialize (this, DocumentContext);
+			}
+			projectionsAdded = true;
+		}
+
+		public void AddOverlay (Control messageOverlayContent, Func<int> sizeFunc)
+		{
+			textEditorImpl.AddOverlay (messageOverlayContent, sizeFunc);
+		}
+
+		public void RemoveOverlay (Control messageOverlayContent)
+		{
+			textEditorImpl.RemoveOverlay (messageOverlayContent);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorDisplayBinding.cs
index 704ca02a68..1fe76c43a0 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorDisplayBinding.cs
@@ -1,9 +1,10 @@
-// SourceEditorDisplayBinding.cs
+//
+// TextEditorDisplayBinding.cs
 //
 // Author:
-//   Mike Krüger <mkrueger@novell.com>
+//       Mike Krüger <mkrueger@xamarin.com>
 //
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -22,18 +23,17 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
 using System;
-using System.IO;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Codons;
+using System.IO;
 using MonoDevelop.Projects;
+using System.ComponentModel;
+using MonoDevelop.Ide.Editor.Highlighting;
 
-namespace MonoDevelop.SourceEditor
+namespace MonoDevelop.Ide.Editor
 {
-	public class SourceEditorDisplayBinding : IViewDisplayBinding
+	public class TextEditorDisplayBinding : IViewDisplayBinding
 	{
 		static bool IsInitialized = false;
 
@@ -42,8 +42,8 @@ namespace MonoDevelop.SourceEditor
 				return UserProfile.Current.UserDataRoot.Combine ("HighlightingSchemes");
 			}
 		}
-		
-		static SourceEditorDisplayBinding ()
+
+		static TextEditorDisplayBinding ()
 		{
 			InitSourceEditor ();
 		}
@@ -53,14 +53,15 @@ namespace MonoDevelop.SourceEditor
 			if (IsInitialized)
 				return;
 			IsInitialized = true;
-			
-			MonoDevelop.SourceEditor.Extension.TemplateExtensionNodeLoader.Init ();
+
+			// MonoDevelop.SourceEditor.Extension.TemplateExtensionNodeLoader.Init ();
 			DefaultSourceEditorOptions.Init ();
-			SyntaxModeService.EnsureLoad ();
+			// SyntaxModeService.EnsureLoad ();
 			LoadCustomStylesAndModes ();
 		}
-		
-		internal static void LoadCustomStylesAndModes ()
+
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public static void LoadCustomStylesAndModes ()
 		{
 			bool success = true;
 			if (!Directory.Exists (SyntaxModePath)) {
@@ -72,7 +73,7 @@ namespace MonoDevelop.SourceEditor
 				}
 			}
 			if (success)
-				Mono.TextEditor.Highlighting.SyntaxModeService.LoadStylesAndModes (SyntaxModePath);
+				SyntaxModeService.LoadStylesAndModes (SyntaxModePath);
 		}
 
 		public string Name {
@@ -94,7 +95,11 @@ namespace MonoDevelop.SourceEditor
 
 		public IViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
 		{
-			return new SourceEditorView ();
+			var editor = TextEditorFactory.CreateNewEditor ();
+			editor.MimeType = mimeType;
+			editor.GetViewContent ().Project = ownerProject;
+			editor.GetViewContent ().ContentName = fileName;
+			return editor.GetViewContent (); 
 		}
 
 		public bool CanHandleFile (string fileName)
@@ -106,4 +111,4 @@ namespace MonoDevelop.SourceEditor
 			get { return true; }
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorFactory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorFactory.cs
new file mode 100644
index 0000000000..6d54b8060b
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorFactory.cs
@@ -0,0 +1,95 @@
+//
+// DocumentFactory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using MonoDevelop.Core.Text;
+using Mono.Addins;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public static class TextEditorFactory
+	{
+		static ITextEditorFactory currentFactory;
+
+		static TextEditorFactory ()
+		{
+			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/SourceEditor2/EditorFactory", delegate(object sender, ExtensionNodeEventArgs args) {
+				switch (args.Change) {
+				case ExtensionChange.Add:
+					if (currentFactory == null)
+						currentFactory = (ITextEditorFactory)args.ExtensionObject;
+					break;
+				}
+			});
+		}
+
+		public static ITextDocument CreateNewDocument ()
+		{
+			return currentFactory.CreateNewDocument ();
+		}
+
+		public static ITextDocument CreateNewDocument (ITextSource textSource, string fileName, string mimeType = null)
+		{
+			if (textSource == null)
+				throw new System.ArgumentNullException ("textSource");
+			return currentFactory.CreateNewDocument (textSource, fileName, mimeType); 
+		}
+
+		public static ITextDocument LoadDocument (string fileName, string mimeType = null)
+		{
+			if (fileName == null)
+				throw new System.ArgumentNullException ("fileName");
+			return currentFactory.CreateNewDocument (StringTextSource.ReadFrom (fileName), fileName, mimeType); 
+		}
+
+		public static IReadonlyTextDocument CreateNewReadonlyDocument (ITextSource textSource, string fileName, string mimeType = null)
+		{
+			if (textSource == null)
+				throw new System.ArgumentNullException ("textSource");
+			return currentFactory.CreateNewDocument (textSource, fileName, mimeType); 
+		}
+
+		public static TextEditor CreateNewEditor ()
+		{
+			return new TextEditor (currentFactory.CreateNewEditor ());
+		}
+
+		public static TextEditor CreateNewEditor (IReadonlyTextDocument document)
+		{
+			if (document == null)
+				throw new System.ArgumentNullException ("document");
+			return new TextEditor (currentFactory.CreateNewEditor (document));
+		}
+
+		public static string[] GetSyntaxProperties (string mimeType, string name)
+		{
+			if (mimeType == null)
+				throw new System.ArgumentNullException ("mimeType");
+			if (name == null)
+				throw new System.ArgumentNullException ("name");
+			return currentFactory.GetSyntaxProperties (mimeType, name);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs
new file mode 100644
index 0000000000..2305687ba2
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs
@@ -0,0 +1,1233 @@
+//
+// TextEditorViewContent.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide.Commands;
+using System.Collections;
+using System.Collections.Generic;
+using MonoDevelop.Ide.TypeSystem;
+using System.IO;
+using MonoDevelop.Core.Text;
+using System.Text;
+using Gtk;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+using MonoDevelop.Ide.Editor.Extension;
+using ICSharpCode.NRefactory.Refactoring;
+using MonoDevelop.Components;
+using MonoDevelop.Core;
+using System.Threading.Tasks;
+using System.Threading;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Gdk;
+using MonoDevelop.Ide.CodeFormatting;
+
+namespace MonoDevelop.Ide.Editor
+{
+	/// <summary>
+	/// The TextEditor object needs to be available through IBaseViewContent.GetContent therefore we need to insert a 
+	/// decorator in between.
+	/// </summary>
+	class TextEditorViewContent : IViewContent, ICommandRouter, IQuickTaskProvider
+	{
+		readonly TextEditor textEditor;
+		readonly ITextEditorImpl textEditorImpl;
+
+		DocumentContext currentContext;
+		MonoDevelop.Projects.Policies.PolicyContainer policyContainer;
+
+		public TextEditorViewContent (TextEditor textEditor, ITextEditorImpl textEditorImpl)
+		{
+			if (textEditor == null)
+				throw new ArgumentNullException ("textEditor");
+			if (textEditorImpl == null)
+				throw new ArgumentNullException ("textEditorImpl");
+			this.textEditor = textEditor;
+			this.textEditorImpl = textEditorImpl;
+			this.textEditor.MimeTypeChanged += UpdateTextEditorOptions;
+			DefaultSourceEditorOptions.Instance.Changed += UpdateTextEditorOptions;
+			this.textEditor.DocumentContextChanged += delegate {
+				if (currentContext != null)
+					currentContext.DocumentParsed -= HandleDocumentParsed;
+				currentContext = textEditor.DocumentContext;
+				currentContext.DocumentParsed += HandleDocumentParsed;
+			};
+		}
+
+		void HandleDirtyChanged (object sender, EventArgs e)
+		{
+			InformAutoSave ();
+		}
+
+		void HandleTextChanged (object sender, MonoDevelop.Core.Text.TextChangeEventArgs e)
+		{
+			InformAutoSave ();
+		}
+
+		void UpdateTextEditorOptions (object sender, EventArgs e)
+		{
+			UpdateStyleParent (Project, textEditor.MimeType);
+		}
+
+		uint autoSaveTimer = 0;
+
+		void InformAutoSave ()
+		{
+			RemoveAutoSaveTimer ();
+			autoSaveTimer = GLib.Timeout.Add (500, delegate {
+				AutoSave.InformAutoSaveThread (textEditor.CreateSnapshot (), textEditor.FileName, textEditorImpl.IsDirty);
+				autoSaveTimer = 0;
+				return false;
+			});
+		}
+
+
+		void RemoveAutoSaveTimer ()
+		{
+			if (autoSaveTimer == 0)
+				return;
+			GLib.Source.Remove (autoSaveTimer);
+			autoSaveTimer = 0;
+		}
+
+		void RemovePolicyChangeHandler ()
+		{
+			if (policyContainer != null)
+				policyContainer.PolicyChanged -= HandlePolicyChanged;
+		}
+
+		void UpdateStyleParent (MonoDevelop.Projects.Project styleParent, string mimeType)
+		{
+			RemovePolicyChangeHandler ();
+
+			if (string.IsNullOrEmpty (mimeType))
+				mimeType = "text/plain";
+
+			var mimeTypes = DesktopService.GetMimeTypeInheritanceChain (mimeType);
+
+			if (styleParent != null)
+				policyContainer = styleParent.Policies;
+			else
+				policyContainer = MonoDevelop.Projects.Policies.PolicyService.DefaultPolicies;
+			var currentPolicy = policyContainer.Get<TextStylePolicy> (mimeTypes);
+
+			policyContainer.PolicyChanged += HandlePolicyChanged;
+			textEditor.Options = DefaultSourceEditorOptions.Instance.WithTextStyle (currentPolicy);
+		}
+
+		void HandlePolicyChanged (object sender, MonoDevelop.Projects.Policies.PolicyChangedEventArgs args)
+		{
+			var mimeTypes = DesktopService.GetMimeTypeInheritanceChain (textEditor.MimeType);
+			var currentPolicy = policyContainer.Get<TextStylePolicy> (mimeTypes);
+			textEditor.Options = DefaultSourceEditorOptions.Instance.WithTextStyle (currentPolicy);
+		}
+
+		void HandleDocumentParsed (object sender, EventArgs e)
+		{
+			var ctx = (DocumentContext)sender;
+			src.Cancel ();
+			src = new CancellationTokenSource ();
+			var token = src.Token;
+			Task.Run (() => {
+				try {
+					UpdateErrorUndelines (ctx.ParsedDocument, token);
+					UpdateQuickTasks (ctx.ParsedDocument, token);
+					UpdateFoldings (ctx.ParsedDocument, false, token);
+				} catch (OperationCanceledException) {
+					// ignore
+				}
+			}, token);
+		}
+
+		#region Error handling
+		List<IErrorMarker> errors = new List<IErrorMarker> ();
+		uint resetTimerId;
+
+		void RemoveErrorUndelinesResetTimerId ()
+		{
+			if (resetTimerId > 0) {
+				GLib.Source.Remove (resetTimerId);
+				resetTimerId = 0;
+			}
+		}
+
+		void RemoveErrorUnderlines ()
+		{
+			errors.ForEach (err => textEditor.RemoveMarker (err));
+			errors.Clear ();
+		}
+
+		void UnderLineError (MonoDevelop.Ide.TypeSystem.Error info)
+		{
+			var error = TextMarkerFactory.CreateErrorMarker (textEditor, info);
+			textEditor.AddMarker (error); 
+			errors.Add (error);
+		}
+
+		async void UpdateErrorUndelines (ParsedDocument parsedDocument, CancellationToken token)
+		{
+			if (!DefaultSourceEditorOptions.Instance.UnderlineErrors || parsedDocument == null)
+				return;
+			try {
+				var errors = await parsedDocument.GetErrorsAsync(token).ConfigureAwait (false);
+				Application.Invoke (delegate {
+					if (token.IsCancellationRequested)
+						return;
+					RemoveErrorUndelinesResetTimerId ();
+					const uint timeout = 500;
+					resetTimerId = GLib.Timeout.Add (timeout, delegate {
+						if (token.IsCancellationRequested) {
+							resetTimerId = 0;
+							return false;
+						}
+						RemoveErrorUnderlines ();
+						// Else we underline the error
+						if (errors != null) {
+							foreach (var error in errors) {
+								UnderLineError (error);
+							}
+						}
+						resetTimerId = 0;
+						return false;
+					});
+				});
+			} catch (OperationCanceledException) {
+				// ignore
+			}
+		}
+		#endregion
+		CancellationTokenSource src = new CancellationTokenSource ();
+		void UpdateFoldings (ParsedDocument parsedDocument, bool firstTime = false, CancellationToken token = default (CancellationToken))
+		{
+			if (parsedDocument == null || !textEditor.Options.ShowFoldMargin)
+				return;
+			// don't update parsed documents that contain errors - the foldings from there may be invalid.
+			if (parsedDocument.HasErrors)
+				return;
+			var caretLocation = textEditor.CaretLocation;
+			try {
+				var foldSegments = new List<IFoldSegment> ();
+
+				foreach (FoldingRegion region in parsedDocument.GetFoldingsAsync(token).Result) {
+					if (token.IsCancellationRequested)
+						return;
+					var type = FoldingType.Unknown;
+					bool setFolded = false;
+					bool folded = false;
+					//decide whether the regions should be folded by default
+					switch (region.Type) {
+					case FoldType.Member:
+						type = FoldingType.TypeMember;
+						break;
+					case FoldType.Type:
+						type = FoldingType.TypeDefinition;
+						break;
+					case FoldType.UserRegion:
+						type = FoldingType.Region;
+						setFolded = DefaultSourceEditorOptions.Instance.DefaultRegionsFolding;
+						folded = true;
+						break;
+					case FoldType.Comment:
+						type = FoldingType.Comment;
+						setFolded = DefaultSourceEditorOptions.Instance.DefaultCommentFolding;
+						folded = true;
+						break;
+					case FoldType.CommentInsideMember:
+						type = FoldingType.Comment;
+						setFolded = DefaultSourceEditorOptions.Instance.DefaultCommentFolding;
+						folded = false;
+						break;
+					case FoldType.Undefined:
+						setFolded = true;
+						folded = region.IsFoldedByDefault;
+						break;
+					}
+					var start = textEditor.LocationToOffset (region.Region.Begin);
+					var end = textEditor.LocationToOffset (region.Region.End);
+					var marker = textEditor.CreateFoldSegment (start, end - start);
+					foldSegments.Add (marker);
+					marker.CollapsedText = region.Name;
+					marker.FoldingType = type;
+					//and, if necessary, set its fold state
+					if (marker != null && setFolded && firstTime) {
+						// only fold on document open, later added folds are NOT folded by default.
+						marker.IsCollapsed = folded;
+						continue;
+					}
+					if (marker != null && region.Region.Contains (caretLocation.Line, caretLocation.Column))
+						marker.IsCollapsed = false;
+				}
+				if (firstTime) {
+					textEditor.SetFoldings (foldSegments);
+				} else {
+					Application.Invoke (delegate {
+						if (!token.IsCancellationRequested)
+							textEditor.SetFoldings (foldSegments);
+					});
+				}
+			} catch (Exception ex) {
+				LoggingService.LogError ("Unhandled exception in ParseInformationUpdaterWorkerThread", ex);
+			}
+		}
+
+		void RunFirstTimeFoldUpdate (string text)
+		{
+			if (string.IsNullOrEmpty (text)) 
+				return;
+			ParsedDocument parsedDocument = null;
+
+			var foldingParser = TypeSystemService.GetFoldingParser (textEditor.MimeType);
+			if (foldingParser != null) {
+				parsedDocument = foldingParser.Parse (textEditor.FileName, text);
+			} else {
+				var normalParser = TypeSystemService.GetParser (textEditor.MimeType);
+				if (normalParser != null) {
+					parsedDocument = normalParser.Parse (new MonoDevelop.Ide.TypeSystem.ParseOptions { FileName = textEditor.FileName, Content = new StringTextSource (text) }).Result;
+				}
+			}
+			if (parsedDocument != null) {
+				UpdateFoldings (parsedDocument, true);
+			}
+		}
+
+
+		#region IViewFContent implementation
+
+		event EventHandler IViewContent.ContentNameChanged {
+			add {
+				textEditorImpl.ContentNameChanged += value;
+			}
+			remove {
+				textEditorImpl.ContentNameChanged -= value;
+			}
+		}
+
+		event EventHandler IViewContent.ContentChanged {
+			add {
+				textEditorImpl.ContentChanged += value;
+			}
+			remove {
+				textEditorImpl.ContentChanged -= value;
+			}
+		}
+
+		event EventHandler IViewContent.DirtyChanged {
+			add {
+				textEditorImpl.DirtyChanged += value;
+			}
+			remove {
+				textEditorImpl.DirtyChanged -= value;
+			}
+		}
+
+		event EventHandler IViewContent.BeforeSave {
+			add {
+				textEditorImpl.BeforeSave += value;
+			}
+			remove {
+				textEditorImpl.BeforeSave -= value;
+			}
+		}
+
+		void IViewContent.Load (FileOpenInformation fileOpenInformation)
+		{
+			this.textEditorImpl.DirtyChanged -= HandleDirtyChanged;
+			this.textEditor.TextChanged -= HandleTextChanged;
+			textEditorImpl.Load (fileOpenInformation);
+			RunFirstTimeFoldUpdate (textEditor.Text);
+			this.textEditor.TextChanged += HandleTextChanged;
+			this.textEditorImpl.DirtyChanged += HandleDirtyChanged;
+		}
+		
+		void IViewContent.Load (string fileName)
+		{
+			this.textEditorImpl.DirtyChanged -= HandleDirtyChanged;
+			this.textEditor.TextChanged -= HandleTextChanged;
+			textEditorImpl.Load (new FileOpenInformation (fileName));
+			RunFirstTimeFoldUpdate (textEditor.Text);
+			this.textEditor.TextChanged += HandleTextChanged;
+			this.textEditorImpl.DirtyChanged += HandleDirtyChanged;
+		}
+
+		void IViewContent.LoadNew (System.IO.Stream content, string mimeType)
+		{
+			textEditor.MimeType = mimeType;
+			string text = null;
+			if (content != null) {
+				Encoding encoding;
+				bool hadBom;
+				text = TextFileUtility.GetText (content, out encoding, out hadBom);
+				textEditor.Text = text;
+				textEditor.Encoding = encoding;
+				textEditor.UseBOM = hadBom;
+			}
+			RunFirstTimeFoldUpdate (text);
+			textEditorImpl.InformLoadComplete ();
+		}
+
+		void IViewContent.Save (FileSaveInformation fileSaveInformation)
+		{
+			if (!string.IsNullOrEmpty (fileSaveInformation.FileName))
+				AutoSave.RemoveAutoSaveFile (fileSaveInformation.FileName);
+			textEditorImpl.Save (fileSaveInformation);
+		}
+
+		void IViewContent.Save (string fileName)
+		{
+			if (!string.IsNullOrEmpty (fileName))
+				AutoSave.RemoveAutoSaveFile (fileName);
+			textEditorImpl.Save (new FileSaveInformation (fileName));
+		}
+
+		void IViewContent.Save ()
+		{
+			if (!string.IsNullOrEmpty (textEditorImpl.ContentName))
+				AutoSave.RemoveAutoSaveFile (textEditorImpl.ContentName);
+			textEditorImpl.Save ();
+		}
+
+		void IViewContent.DiscardChanges ()
+		{
+			if (!string.IsNullOrEmpty (textEditorImpl.ContentName))
+				AutoSave.RemoveAutoSaveFile (textEditorImpl.ContentName);
+			textEditorImpl.DiscardChanges ();
+		}
+
+		public MonoDevelop.Projects.Project Project {
+			get {
+				return textEditorImpl.Project;
+			}
+			set {
+				textEditorImpl.Project = value;
+				UpdateTextEditorOptions (null, null);
+			}
+		}
+
+		string IViewContent.PathRelativeToProject {
+			get {
+				return textEditorImpl.PathRelativeToProject;
+			}
+		}
+
+		string IViewContent.ContentName {
+			get {
+				return textEditorImpl.ContentName;
+			}
+			set {
+				textEditorImpl.ContentName = value;
+			}
+		}
+
+		string IViewContent.UntitledName {
+			get {
+				return textEditorImpl.UntitledName;
+			}
+			set {
+				textEditorImpl.UntitledName = value;
+			}
+		}
+
+		string IViewContent.StockIconId {
+			get {
+				return textEditorImpl.StockIconId;
+			}
+		}
+
+		bool IViewContent.IsUntitled {
+			get {
+				return textEditorImpl.IsUntitled;
+			}
+		}
+
+		bool IViewContent.IsViewOnly {
+			get {
+				return textEditorImpl.IsViewOnly;
+			}
+		}
+
+		bool IViewContent.IsFile {
+			get {
+				return textEditorImpl.IsFile;
+			}
+		}
+
+		bool IViewContent.IsDirty {
+			get {
+				return textEditorImpl.IsDirty;
+			}
+			set {
+				textEditorImpl.IsDirty = value;
+			}
+		}
+
+		bool IViewContent.IsReadOnly {
+			get {
+				return textEditorImpl.IsReadOnly;
+			}
+		}
+
+		#endregion
+
+		#region IBaseViewContent implementation
+		object IBaseViewContent.GetContent (Type type)
+		{
+			if (type.IsAssignableFrom (typeof(TextEditor)))
+				return textEditor;
+			var ext = textEditorImpl.EditorExtension;
+			while (ext != null) {
+				if (type.IsInstanceOfType (ext))
+					return ext;
+				ext = ext.Next;
+			}
+			return textEditorImpl.GetContent (type);
+		}
+
+		public virtual IEnumerable<T> GetContents<T> () where T : class
+		{
+			if (typeof(T) == typeof(TextEditor)) {
+				yield return (T)(object)textEditor;
+				yield break;
+			}
+			var result = this as T;
+			if (result != null) {
+				yield return result;
+			}
+			var ext = textEditorImpl.EditorExtension;
+			while (ext != null) {
+				result = ext as T;
+				if (result != null) {
+					yield return result;
+				}
+				ext = ext.Next;
+			}
+			foreach (var cnt in textEditorImpl.GetContents<T> ()) {
+				yield return cnt;
+			}
+		}
+
+		bool IBaseViewContent.CanReuseView (string fileName)
+		{
+			return textEditorImpl.CanReuseView (fileName);
+		}
+
+		void IBaseViewContent.RedrawContent ()
+		{
+			textEditorImpl.RedrawContent ();
+		}
+
+		IWorkbenchWindow IBaseViewContent.WorkbenchWindow {
+			get {
+				return textEditorImpl.WorkbenchWindow;
+			}
+			set {
+				textEditorImpl.WorkbenchWindow = value;
+			}
+		}
+
+		Gtk.Widget IBaseViewContent.Control {
+			get {
+				return textEditor;
+			}
+		}
+
+		string IBaseViewContent.TabPageLabel {
+			get {
+				return textEditorImpl.TabPageLabel;
+			}
+		}
+
+		#endregion
+
+		#region IDisposable implementation
+
+		void IDisposable.Dispose ()
+		{
+			DefaultSourceEditorOptions.Instance.Changed -= UpdateTextEditorOptions;
+			RemovePolicyChangeHandler ();
+			RemoveAutoSaveTimer ();
+			RemoveErrorUndelinesResetTimerId ();
+			textEditorImpl.Dispose ();
+		}
+
+		#endregion
+
+		#region ICommandRouter implementation
+
+		object ICommandRouter.GetNextCommandTarget ()
+		{
+			return textEditorImpl;
+		}
+
+		#endregion
+	
+		#region Commands
+		void ToggleCodeCommentWithBlockComments ()
+		{
+			var blockStarts = TextEditorFactory.GetSyntaxProperties (textEditor.MimeType, "BlockCommentStart");
+			var blockEnds = TextEditorFactory.GetSyntaxProperties (textEditor.MimeType, "BlockCommentEnd");
+			if (blockStarts == null || blockEnds == null || blockStarts.Length == 0 || blockEnds.Length == 0)
+				return;
+
+			string blockStart = blockStarts[0];
+			string blockEnd = blockEnds[0];
+
+			using (var undo = textEditor.OpenUndoGroup ()) {
+				IDocumentLine startLine;
+				IDocumentLine endLine;
+
+				if (textEditor.IsSomethingSelected) {
+					startLine = textEditor.GetLineByOffset (textEditor.SelectionRange.Offset);
+					endLine = textEditor.GetLineByOffset (textEditor.SelectionRange.EndOffset);
+				} else {
+					startLine = endLine = textEditor.GetLine (textEditor.CaretLine);
+				}
+				string startLineText = textEditor.GetTextAt (startLine.Offset, startLine.Length);
+				string endLineText = textEditor.GetTextAt (endLine.Offset, endLine.Length);
+				if (startLineText.StartsWith (blockStart, StringComparison.Ordinal) && endLineText.EndsWith (blockEnd, StringComparison.Ordinal)) {
+					textEditor.RemoveText (endLine.Offset + endLine.Length - blockEnd.Length, blockEnd.Length);
+					textEditor.RemoveText (startLine.Offset, blockStart.Length);
+					if (textEditor.IsSomethingSelected) {
+						textEditor.SelectionAnchorOffset -= blockEnd.Length;
+					}
+				} else {
+					textEditor.InsertText (endLine.Offset + endLine.Length, blockEnd);
+					textEditor.InsertText (startLine.Offset, blockStart);
+					if (textEditor.IsSomethingSelected) {
+						textEditor.SelectionAnchorOffset += blockEnd.Length;
+					}
+				}
+			}
+		}
+
+		bool TryGetLineCommentTag (out string commentTag)
+		{
+			var lineComments = TextEditorFactory.GetSyntaxProperties (textEditor.MimeType, "LineComment");
+			if (lineComments == null || lineComments.Length == 0) {
+				commentTag = null;
+				return false;
+			}
+			commentTag = lineComments [0];
+			return true;
+		}
+
+		[CommandUpdateHandler (EditCommands.AddCodeComment)]
+		[CommandUpdateHandler (EditCommands.RemoveCodeComment)]
+		[CommandUpdateHandler (EditCommands.ToggleCodeComment)]
+		void OnUpdateToggleComment (CommandInfo info)
+		{
+			var lineComments = TextEditorFactory.GetSyntaxProperties (textEditor.MimeType, "LineComment");
+			if (lineComments != null && lineComments.Length > 0) {
+				info.Visible = true;
+				return;
+			}
+			var blockStarts = TextEditorFactory.GetSyntaxProperties (textEditor.MimeType, "BlockCommentStart");
+			var blockEnds = TextEditorFactory.GetSyntaxProperties (textEditor.MimeType, "BlockCommentEnd");
+			info.Visible = blockStarts != null && blockStarts.Length > 0 && blockEnds != null && blockEnds.Length > 0;
+		}
+
+		[CommandHandler (EditCommands.ToggleCodeComment)]
+		internal void ToggleCodeComment ()
+		{
+			string commentTag;
+			if (!TryGetLineCommentTag (out commentTag))
+				return;
+			bool comment = false;
+			foreach (var line in GetSelectedLines (textEditor)) {
+				int startOffset;
+				int offset = line.Offset;
+				if (!StartsWith (textEditor, offset, line.Length, commentTag, out startOffset)) {
+					if (startOffset - offset == line.Length) // case: line consists only of white spaces
+						continue;
+					comment = true;
+					break;
+				}
+			}
+
+			if (comment) {
+				AddCodeComment ();
+			} else {
+				RemoveCodeComment ();
+			}
+		}
+
+		static bool StartsWith (ITextSource text, int offset, int length, string commentTag, out int startOffset)
+		{
+			int max = Math.Min (offset + length, text.Length);
+			int i = offset;
+			for (; i < max; i++) {
+				char ch = text.GetCharAt (i);
+				if (ch != ' ' && ch != '\t')
+					break;
+			}
+			startOffset = i;
+			for (int j = 0; j < commentTag.Length; j++) {
+				if (text.GetCharAt (i) != commentTag [j])
+					return false;
+				i++;
+			}
+
+			return true;
+		}
+
+		static IEnumerable<IDocumentLine> GetSelectedLines (TextEditor textEditor)
+		{
+			var selection = textEditor.SelectionRange;
+			var line = textEditor.GetLineByOffset (selection.EndOffset);
+			do {
+				yield return line;
+				line = line.PreviousLine;
+			} while (line != null && line.EndOffset > selection.Offset);
+		}
+
+		[CommandHandler (EditCommands.AddCodeComment)]
+		internal void AddCodeComment ()
+		{
+			string commentTag;
+			if (!TryGetLineCommentTag (out commentTag))
+				return;
+
+			using (var undo = textEditor.OpenUndoGroup ()) {
+				var wasSelected = textEditor.IsSomethingSelected;
+				var lead = textEditor.SelectionLeadOffset;
+				var anchor = textEditor.SelectionAnchorOffset;
+				var lineAndIndents = new List<Tuple<IDocumentLine, string>>();
+				string indent = null;
+				var oldVersion = textEditor.Version;
+				foreach (var line in GetSelectedLines (textEditor)) {
+					var curIndent = line.GetIndentation (textEditor);
+					if (line.Length == curIndent.Length) {
+						lineAndIndents.Add (Tuple.Create ((IDocumentLine)null, ""));
+						continue;
+					}
+					if (indent == null || curIndent.Length < indent.Length)
+						indent = curIndent;
+					lineAndIndents.Add (Tuple.Create (line, curIndent));
+				}
+
+				foreach (var line in lineAndIndents) {
+					if (line.Item1 == null)
+						continue;
+					textEditor.InsertText (line.Item1.Offset + indent.Length, commentTag);
+				}
+				if (wasSelected) {
+					textEditor.SelectionAnchorOffset = oldVersion.MoveOffsetTo (textEditor.Version, anchor);
+					textEditor.SelectionLeadOffset = oldVersion.MoveOffsetTo (textEditor.Version, lead);
+				}
+			}
+		}
+
+		[CommandHandler (EditCommands.RemoveCodeComment)]
+		internal void RemoveCodeComment ()
+		{
+			string commentTag;
+			if (!TryGetLineCommentTag (out commentTag))
+				return;
+			
+			using (var undo = textEditor.OpenUndoGroup ()) {
+				var wasSelected = textEditor.IsSomethingSelected;
+				var lead = textEditor.SelectionLeadOffset;
+				var anchor = textEditor.SelectionAnchorOffset;
+				int lines = 0;
+				
+				IDocumentLine first = null;
+				IDocumentLine last  = null;
+				var oldVersion = textEditor.Version;
+				foreach (var line in GetSelectedLines (textEditor)) {
+					int startOffset;
+					if (StartsWith (textEditor, line.Offset, line.Length, commentTag, out startOffset)) {
+						textEditor.RemoveText (startOffset, commentTag.Length);
+						lines++;
+					}
+					
+					first = line;
+					if (last == null)
+						last = line;
+				}
+
+				if (wasSelected) {
+//					if (IdeApp.Workbench != null)
+//						CodeFormatterService.Format (textEditor, IdeApp.Workbench.ActiveDocument, TextSegment.FromBounds (first.Offset, last.EndOffset));
+
+					textEditor.SelectionAnchorOffset = oldVersion.MoveOffsetTo (textEditor.Version, anchor);
+					textEditor.SelectionLeadOffset = oldVersion.MoveOffsetTo (textEditor.Version, lead);
+				}
+			}
+		}
+
+		[CommandHandler (EditCommands.InsertGuid)]
+		void InsertGuid ()
+		{
+			textEditor.InsertAtCaret (Guid.NewGuid ().ToString ());
+		}
+
+		[CommandUpdateHandler (MessageBubbleCommands.Toggle)]
+		public void OnUpdateToggleErrorTextMarker (CommandInfo info)
+		{
+			var line = textEditor.GetLine (textEditor.CaretLine);
+			if (line == null) {
+				info.Visible = false;
+				return;
+			}
+
+			var marker = (IMessageBubbleLineMarker)textEditor.GetLineMarkers (line).FirstOrDefault (m => m is IMessageBubbleLineMarker);
+			info.Visible = marker != null;
+		}
+
+		[CommandHandler (MessageBubbleCommands.Toggle)]
+		public void OnToggleErrorTextMarker ()
+		{
+			var line = textEditor.GetLine (textEditor.CaretLine);
+			if (line == null)
+				return;
+			var marker = (IMessageBubbleLineMarker)textEditor.GetLineMarkers (line).FirstOrDefault (m => m is IMessageBubbleLineMarker);
+			if (marker != null) {
+				marker.IsVisible = !marker.IsVisible;
+			}
+		}
+		#endregion
+	
+		#region IQuickTaskProvider implementation
+		List<QuickTask> tasks = new List<QuickTask> ();
+
+		public event EventHandler TasksUpdated;
+
+		protected virtual void OnTasksUpdated (EventArgs e)
+		{
+			EventHandler handler = this.TasksUpdated;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		public IEnumerable<QuickTask> QuickTasks {
+			get {
+				return tasks;
+			}
+		}
+
+		async void UpdateQuickTasks (ParsedDocument doc, CancellationToken token)
+		{
+			var newTasks = new List<QuickTask> ();
+			if (doc != null) {
+				foreach (var cmt in await doc.GetTagCommentsAsync(token).ConfigureAwait (false)) {
+					var newTask = new QuickTask (cmt.Text, textEditor.LocationToOffset (cmt.Region.Begin.Line, cmt.Region.Begin.Column), DiagnosticSeverity.Info);
+					newTasks.Add (newTask);
+				}
+
+				foreach (var error in await doc.GetErrorsAsync(token).ConfigureAwait (false)) {
+					var newTask = new QuickTask (error.Message, textEditor.LocationToOffset (error.Region.Begin.Line, error.Region.Begin.Column), error.ErrorType == MonoDevelop.Ide.TypeSystem.ErrorType.Error ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning);
+					newTasks.Add (newTask);
+				}
+			}
+			Application.Invoke (delegate {
+				if (token.IsCancellationRequested)
+					return;
+				tasks = newTasks;
+				OnTasksUpdated (EventArgs.Empty);
+			});
+		}
+		#endregion
+
+		#region Key bindings
+
+		[CommandHandler (TextEditorCommands.LineEnd)]
+		void OnLineEnd ()
+		{
+			EditActions.MoveCaretToLineEnd (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.LineStart)]
+		void OnLineStart ()
+		{
+			EditActions.MoveCaretToLineStart (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.DeleteLeftChar)]
+		void OnDeleteLeftChar ()
+		{
+			EditActions.Backspace (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.DeleteRightChar)]
+		void OnDeleteRightChar ()
+		{
+			EditActions.Delete (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.CharLeft)]
+		void OnCharLeft ()
+		{
+			EditActions.MoveCaretLeft (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.CharRight)]
+		void OnCharRight ()
+		{
+			EditActions.MoveCaretRight (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.LineUp)]
+		void OnLineUp ()
+		{
+			EditActions.MoveCaretUp (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.LineDown)]
+		void OnLineDown ()
+		{
+			EditActions.MoveCaretDown (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.DocumentStart)]
+		void OnDocumentStart ()
+		{
+			EditActions.MoveCaretToDocumentStart (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.DocumentEnd)]
+		void OnDocumentEnd ()
+		{
+			EditActions.MoveCaretToDocumentEnd (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.PageUp)]
+		void OnPageUp ()
+		{
+			EditActions.PageUp (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.PageDown)]
+		void OnPageDown ()
+		{
+			EditActions.PageDown (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.DeleteLine)]
+		void OnDeleteLine ()
+		{
+			EditActions.DeleteCurrentLine (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.DeleteToLineEnd)]
+		void OnDeleteToLineEnd ()
+		{
+			EditActions.DeleteCurrentLineToEnd (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.ScrollLineUp)]
+		void OnScrollLineUp ()
+		{
+			EditActions.ScrollLineUp (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.ScrollLineDown)]
+		void OnScrollLineDown ()
+		{
+			EditActions.ScrollLineDown (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.ScrollPageUp)]
+		void OnScrollPageUp ()
+		{
+			EditActions.ScrollPageUp (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.ScrollPageDown)]
+		void OnScrollPageDown ()
+		{
+			EditActions.ScrollPageDown (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.GotoMatchingBrace)]
+		void OnGotoMatchingBrace ()
+		{
+			EditActions.GotoMatchingBrace (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMoveLeft)]
+		void OnSelectionMoveLeft ()
+		{
+			EditActions.SelectionMoveLeft (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMoveRight)]
+		void OnSelectionMoveRight ()
+		{
+			EditActions.SelectionMoveRight (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.MovePrevWord)]
+		void OnMovePrevWord ()
+		{
+			EditActions.MovePrevWord (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.MoveNextWord)]
+		void OnMoveNextWord ()
+		{
+			EditActions.MoveNextWord (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMovePrevWord)]
+		void OnSelectionMovePrevWord ()
+		{
+			EditActions.SelectionMovePrevWord (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMoveNextWord)]
+		void OnSelectionMoveNextWord ()
+		{
+			EditActions.SelectionMoveNextWord (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.MovePrevSubword)]
+		void OnMovePrevSubword ()
+		{
+			EditActions.MovePrevSubWord (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.MoveNextSubword)]
+		void OnMoveNextSubword ()
+		{
+			EditActions.MoveNextSubWord (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMovePrevSubword)]
+		void OnSelectionMovePrevSubword ()
+		{
+			EditActions.SelectionMovePrevSubWord (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMoveNextSubword)]
+		void OnSelectionMoveNextSubword ()
+		{
+			EditActions.SelectionMoveNextSubWord (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMoveUp)]
+		void OnSelectionMoveUp ()
+		{
+			EditActions.SelectionMoveUp (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMoveDown)]
+		void OnSelectionMoveDown ()
+		{
+			EditActions.SelectionMoveDown (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMoveHome)]
+		void OnSelectionMoveHome ()
+		{
+			EditActions.SelectionMoveLineStart (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMoveEnd)]
+		void OnSelectionMoveEnd ()
+		{
+			EditActions.SelectionMoveLineEnd (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMoveToDocumentStart)]
+		void OnSelectionMoveToDocumentStart ()
+		{
+			EditActions.SelectionMoveToDocumentStart (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.ExpandSelectionToLine)]
+		void OnExpandSelectionToLine ()
+		{
+			EditActions.ExpandSelectionToLine (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionMoveToDocumentEnd)]
+		void OnSelectionMoveToDocumentEnd ()
+		{
+			EditActions.SelectionMoveToDocumentEnd (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SwitchCaretMode)]
+		void OnSwitchCaretMode ()
+		{
+			EditActions.SwitchCaretMode (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.InsertTab)]
+		void OnInsertTab ()
+		{
+			EditActions.InsertTab (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.RemoveTab)]
+		void OnRemoveTab ()
+		{
+			EditActions.RemoveTab (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.InsertNewLine)]
+		void OnInsertNewLine ()
+		{
+			EditActions.InsertNewLine (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.InsertNewLineAtEnd)]
+		void OnInsertNewLineAtEnd ()
+		{
+			EditActions.InsertNewLineAtEnd (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.InsertNewLinePreserveCaretPosition)]
+		void OnInsertNewLinePreserveCaretPosition ()
+		{
+			EditActions.InsertNewLinePreserveCaretPosition (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.CompleteStatement)]
+		void OnCompleteStatement ()
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			var generator = CodeGenerator.CreateGenerator (doc);
+			if (generator != null) {
+				generator.CompleteStatement (doc);
+			}
+		}
+
+		[CommandHandler (TextEditorCommands.DeletePrevWord)]
+		void OnDeletePrevWord ()
+		{
+			EditActions.DeletePreviousWord (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.DeleteNextWord)]
+		void OnDeleteNextWord ()
+		{
+			EditActions.DeleteNextWord (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.DeletePrevSubword)]
+		void OnDeletePrevSubword ()
+		{
+			EditActions.DeletePreviousSubword (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.DeleteNextSubword)]
+		void OnDeleteNextSubword ()
+		{
+			EditActions.DeleteNextSubword (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionPageDownAction)]
+		void OnSelectionPageDownAction ()
+		{
+			EditActions.SelectionPageDown (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.SelectionPageUpAction)]
+		void OnSelectionPageUpAction ()
+		{
+			EditActions.SelectionPageUp (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.PulseCaret)]
+		void OnPulseCaretCommand ()
+		{
+			EditActions.StartCaretPulseAnimation (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.TransposeCharacters)]
+		void TransposeCharacters ()
+		{
+			EditActions.TransposeCharacters (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.DuplicateLine)]
+		void DuplicateLine ()
+		{	
+			EditActions.DuplicateCurrentLine (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.RecenterEditor)]
+		void RecenterEditor ()
+		{
+			EditActions.RecenterEditor (textEditor);
+		}
+
+		[CommandHandler (EditCommands.JoinWithNextLine)]
+		void JoinLines ()
+		{
+			EditActions.JoinLines (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.MoveBlockUp)]
+		void OnMoveBlockUp ()
+		{
+			EditActions.MoveBlockUp (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.MoveBlockDown)]
+		void OnMoveBlockDown ()
+		{
+			EditActions.MoveBlockDown (textEditor);
+		}
+
+		[CommandHandler (TextEditorCommands.ToggleBlockSelectionMode)]
+		void OnToggleBlockSelectionMode ()
+		{
+			EditActions.ToggleBlockSelectionMode (textEditor);
+		}
+
+		[CommandHandler (EditCommands.IndentSelection)]
+		void IndentSelection ()
+		{
+			EditActions.IndentSelection (textEditor);
+		}
+
+		[CommandHandler (EditCommands.UnIndentSelection)]
+		void UnIndentSelection ()
+		{
+			EditActions.UnIndentSelection (textEditor);
+		}
+
+
+		[CommandHandler (EditCommands.SortSelectedLines)]
+		void SortSelectedLines ()
+		{
+			EditActions.SortSelectedLines (textEditor);
+		}
+
+		[CommandUpdateHandler (EditCommands.SortSelectedLines)]
+		void UpdateSortSelectedLines (CommandInfo ci)
+		{
+			var region = textEditor.SelectionRegion;
+			ci.Enabled = region.BeginLine != region.EndLine;
+		}
+		#endregion
+
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextLink.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextLink.cs
new file mode 100644
index 0000000000..f5f25604bb
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextLink.cs
@@ -0,0 +1,136 @@
+//
+// TextLink.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.CodeTemplates;
+using MonoDevelop.Core.Text;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public sealed class TextLink : IListDataProvider<string>
+	{
+		public ISegment PrimaryLink {
+			get {
+				if (links.Count == 0)
+					return TextSegment.Invalid;
+				return links [0];
+			}
+		}
+
+		List<ISegment> links = new List<ISegment> ();
+
+		public List<ISegment> Links {
+			get {
+				return links;
+			}
+			set {
+				links = value;
+			}
+		}
+
+		public bool IsIdentifier {
+			get;
+			set;
+		}
+
+		public bool IsEditable {
+			get;
+			set;
+		}
+
+		public string Name {
+			get;
+			set;
+		}
+
+		public string CurrentText {
+			get;
+			set;
+		}
+
+		public string Tooltip {
+			get;
+			set;
+		}
+
+		public IListDataProvider<string> Values {
+			get;
+			set;
+		}
+
+		public Func<Func<string, string>, IListDataProvider<string>> GetStringFunc {
+			get;
+			set;
+		}
+
+		public TextLink (string name)
+		{
+			IsEditable = true;
+			this.Name = name;
+			this.IsIdentifier = false;
+		}
+
+		public override string ToString ()
+		{
+			return string.Format ("[TextLink: Name={0}, Links={1}, IsEditable={2}, Tooltip={3}, CurrentText={4}, Values=({5})]", 
+				Name, 
+				Links.Count, 
+				IsEditable, 
+				Tooltip, 
+				CurrentText, 
+				Values.Count);
+		}
+
+		public void AddLink (ISegment segment)
+		{
+			links.Add (segment);
+		}
+		#region IListDataProvider implementation
+		public string GetText (int n)
+		{
+			return Values != null ? Values.GetText (n) : "";
+		}
+
+		public string this [int n] {
+			get {
+				return Values != null ? Values [n] : "";
+			}
+		}
+
+		public Xwt.Drawing.Image GetIcon (int n)
+		{
+			return Values != null ? Values.GetIcon (n) : null;
+		}
+
+		public int Count {
+			get {
+				return Values != null ? Values.Count : 0;
+			}
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextLinkModeEventArgs.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextLinkModeEventArgs.cs
new file mode 100644
index 0000000000..f32d8596c9
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextLinkModeEventArgs.cs
@@ -0,0 +1,43 @@
+//
+// TextLinkModeEventArgs.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Ide.Editor
+{
+	[Serializable]
+	public sealed class TextLinkModeEventArgs : EventArgs
+	{
+		public bool Success {
+			get;
+			private set;
+		}
+
+		public TextLinkModeEventArgs (bool success)
+		{
+			this.Success = success;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextLinkModeOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextLinkModeOptions.cs
new file mode 100644
index 0000000000..ef20516cf9
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextLinkModeOptions.cs
@@ -0,0 +1,66 @@
+//
+// ITextEditorImpl.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace MonoDevelop.Ide.Editor
+{
+	/// <summary>
+	/// This class contains information the editor needs to initiate the text link mode.
+	/// </summary>
+	public sealed class TextLinkModeOptions
+	{
+		/// <summary>
+		/// The text links. Note that this property will change to IReadOnlyList in future versions.
+		/// </summary>
+		public IList<TextLink> Links { 
+			get;
+			private set;
+		}
+
+		/// <summary>
+		/// That's the action that is started after the text link mode ended.
+		/// This may be null (in that case no action is started). 
+		/// </summary>
+		public Action<TextLinkModeEventArgs> ModeExitedAction {
+			get;
+			private set;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="MonoDevelop.Ide.Editor.TextLinkModeOptions"/> class.
+		/// </summary>
+		/// <param name="links">The text links. </param>
+		/// <param name="modeExitedAction">That's the action that is started after the text link mode ended.</param>
+		public TextLinkModeOptions (IList<TextLink> links, Action<TextLinkModeEventArgs> modeExitedAction = null)
+		{
+			if (links == null)
+				throw new ArgumentNullException ("links");
+			Links = links;
+			ModeExitedAction = modeExitedAction;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextMarkerFactory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextMarkerFactory.cs
new file mode 100644
index 0000000000..a185dd93ba
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextMarkerFactory.cs
@@ -0,0 +1,121 @@
+//
+// TextMarkerFactory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.Ide.Editor
+{
+	/// <summary>
+	/// The text marker factory creates line and segment markers for the text editor.
+	/// Note that this is the only valid way of creating markers for the editor.
+	/// </summary>
+	public static class TextMarkerFactory
+	{
+		#region Line marker
+		public static IUrlTextLineMarker CreateUrlTextMarker (TextEditor editor, IDocumentLine line, string value, UrlType url, string syntax, int startCol, int endCol)
+		{
+			return editor.TextMarkerFactory.CreateUrlTextMarker (editor, line, value, url, syntax, startCol, endCol);
+		}
+
+		public static ICurrentDebugLineTextMarker CreateCurrentDebugLineTextMarker (TextEditor editor)
+		{
+			return editor.TextMarkerFactory.CreateCurrentDebugLineTextMarker (editor);
+		}
+
+		public static ITextLineMarker CreateAsmLineMarker (TextEditor editor)
+		{
+			return editor.TextMarkerFactory.CreateAsmLineMarker (editor);
+		}
+
+		public static IUnitTestMarker CreateUnitTestMarker (TextEditor editor, UnitTestMarkerHost host, UnitTestLocation unitTestLocation)
+		{
+			return editor.TextMarkerFactory.CreateUnitTestMarker (editor, host, unitTestLocation);
+		}
+
+		public static IMessageBubbleLineMarker CreateMessageBubbleLineMarker (TextEditor editor)
+		{
+			return editor.TextMarkerFactory.CreateMessageBubbleLineMarker (editor);
+		}
+
+
+		#endregion
+
+		#region Segment marker
+		public static ITextSegmentMarker CreateUsageMarker (TextEditor editor, Usage usage)
+		{
+			return editor.TextMarkerFactory.CreateUsageMarker (editor, usage);
+		}
+
+		public static ITextSegmentMarker CreateLinkMarker (TextEditor editor, int offset, int length, Action<LinkRequest> activateLink)
+		{
+			return editor.TextMarkerFactory.CreateLinkMarker (editor, offset, length, activateLink);
+		}
+
+		public static ITextSegmentMarker CreateLinkMarker (TextEditor editor, ISegment segment, Action<LinkRequest> activateLink)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return editor.TextMarkerFactory.CreateLinkMarker (editor, segment.Offset, segment.Length, activateLink);
+		}
+
+		public static IGenericTextSegmentMarker CreateGenericTextSegmentMarker (TextEditor editor, TextSegmentMarkerEffect effect, int offset, int length)
+		{
+			return editor.TextMarkerFactory.CreateGenericTextSegmentMarker (editor, effect, offset, length);
+		}
+
+		public static IGenericTextSegmentMarker CreateGenericTextSegmentMarker (TextEditor editor, TextSegmentMarkerEffect effect, ISegment segment)
+		{
+			if (segment == null)
+				throw new ArgumentNullException ("segment");
+			return editor.TextMarkerFactory.CreateGenericTextSegmentMarker (editor, effect, segment.Offset, segment.Length);
+		}
+
+		public static ISmartTagMarker CreateSmartTagMarker (TextEditor editor, int offset, DocumentLocation realLocation)
+		{
+			return editor.TextMarkerFactory.CreateSmartTagMarker (editor, offset, realLocation);
+		}
+
+		static bool IsIdentifierPart (char ch)
+		{
+			return char.IsLetterOrDigit (ch) || ch == '_';
+		}
+
+		public static IErrorMarker CreateErrorMarker (TextEditor editor, Error info)
+		{
+			int offset    = editor.LocationToOffset (info.Region.BeginLine, info.Region.BeginColumn);
+			int endOffset = editor.LocationToOffset (info.Region.EndLine, info.Region.EndColumn);
+			if (endOffset < offset) {
+				endOffset = offset + 1;
+				while (endOffset < editor.Length && IsIdentifierPart (editor.GetCharAt (endOffset)))
+					endOffset++;
+			}
+			return editor.TextMarkerFactory.CreateErrorMarker (editor, info, offset, endOffset - offset);
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextMarkerMouseEventArgs.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextMarkerMouseEventArgs.cs
new file mode 100644
index 0000000000..7a66ca5924
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextMarkerMouseEventArgs.cs
@@ -0,0 +1,49 @@
+//
+// ITextSegmentMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public abstract class TextMarkerMouseEventArgs : EventArgs
+	{
+		public abstract double X {
+			get;
+		}
+
+		public abstract double Y {
+			get;
+		}
+
+		public abstract object OverwriteCursor { get; set; }
+
+		public abstract string TooltipMarkup { get; set; }
+
+		public abstract bool TriggersContextMenu ();
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IExtensibleTextEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipExtensionNode.cs
index 94df5d0c11..d47513e925 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IExtensibleTextEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipExtensionNode.cs
@@ -1,9 +1,10 @@
-// IExtensibleTextEditor.cs
+//
+// TooltipExtensionNode.cs
 //
 // Author:
-//   Lluis Sanchez Gual <lluis@novell.com>
+//       Mike Krüger <mkrueger@xamarin.com>
 //
-// Copyright (c) 2007 Novell, Inc (http://www.novell.com)
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -22,22 +23,27 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-//
-//
 
 using System;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.CodeCompletion;
+using Mono.Addins;
 
-namespace MonoDevelop.Ide.Gui.Content
+namespace MonoDevelop.Ide.Editor
 {
-	public interface IExtensibleTextEditor: IEditableTextBuffer
+	sealed class TooltipExtensionNode : TypeExtensionNode
 	{
-		ITextEditorExtension Extension {
-			get;
+		[NodeAttribute("mimeType", false, "The mimetype that this tooltip provider can handle.")]
+		string mimeType;
+
+		public string MimeType {
+			get { return mimeType; }
+		}
+
+		internal bool IsValidFor (string mimeType)
+		{
+			return string.IsNullOrEmpty (this.mimeType) || this.mimeType == mimeType;
 		}
-		// The provided parameter is the first object of the extension chain
-		// This method should return the terminator ITextEditorExtension that
-		// will execute the default behavior (if any)
-		ITextEditorExtension AttachExtension (ITextEditorExtension extension);
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs
new file mode 100644
index 0000000000..e397e54664
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs
@@ -0,0 +1,177 @@
+//
+// TooltipProvider.cs
+//
+// Author:
+//       Lluis Sanchez <lluis@xamarin.com>
+//
+// Copyright (c) 2012 Xamarin Inc
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public sealed class TooltipItem : ISegment
+	{
+		int offset;
+		int length;
+
+		#region ISegment implementation
+
+		public int Offset {
+			get {
+				return offset;
+			}
+			internal set {
+				offset = value;
+			}
+		}
+
+		public int Length {
+			get {
+				return length;
+			}
+			internal set {
+				length = value;
+			}
+		}
+
+		public int EndOffset {
+			get {
+				return offset + length;
+			}
+		}
+
+		#endregion
+
+		public object Item { get; set; }
+
+		public TooltipItem (object item, ISegment itemSegment) 
+		{
+			if (itemSegment == null)
+				throw new ArgumentNullException ("itemSegment");
+			Item = item;
+			this.offset = itemSegment.Offset;
+			this.length = itemSegment.Length;
+		}
+
+		public TooltipItem (object item, int offset, int length)
+		{
+			Item = item;
+			this.offset = offset;
+			this.length = length;
+		}
+	}
+
+	// TODO: Improve tooltip API - that really looks messy
+	public abstract class TooltipProvider
+	{
+		public abstract TooltipItem GetItem (TextEditor editor, DocumentContext ctx, int offset);
+
+		public virtual bool IsInteractive (TextEditor editor, Control tipWindow)
+		{
+			return false;
+		}
+
+		public virtual void GetRequiredPosition (TextEditor editor, Control tipWindow, out int requiredWidth, out double xalign)
+		{
+			requiredWidth = ((Gtk.Widget)tipWindow).SizeRequest ().Width;
+			xalign = 0.5;
+		}
+
+		public virtual Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Gdk.ModifierType modifierState)
+		{
+			return null;
+		}
+
+		protected Xwt.Rectangle GetAllocation (TextEditor editor)
+		{
+			return editor.GetContent<ITextEditorImpl> ().GetEditorAllocation ();
+		}
+
+		void ShowTipInfoWindow (TextEditor editor, TooltipInformationWindow tipWindow, TooltipItem item, Gdk.ModifierType modifierState, int mouseX, int mouseY)
+		{
+			Gtk.Widget editorWidget = editor;
+
+			var startLoc = editor.OffsetToLocation (item.Offset);
+			var endLoc = editor.OffsetToLocation (item.EndOffset);
+			var p1 = editor.LocationToPoint (startLoc);
+			var p2 = editor.LocationToPoint (endLoc);
+
+			int w = (int)(p2.X - p1.X);
+
+			var caret = new Gdk.Rectangle (
+				(int)p1.X,
+				(int)p1.Y,
+				(int)w,
+				(int)editor.LineHeight
+			);
+
+			tipWindow.ShowPopup (editorWidget, caret, PopupPosition.Top);
+		}
+
+		public virtual void ShowTooltipWindow (TextEditor editor, Control tipWindow, TooltipItem item, Gdk.ModifierType modifierState, int mouseX, int mouseY)
+		{
+			if (tipWindow == null)
+				return;
+
+			var tipInfoWindow = ((Gtk.Widget)tipWindow) as TooltipInformationWindow;
+			if (tipInfoWindow != null) {
+				ShowTipInfoWindow (editor, tipInfoWindow, item, modifierState, mouseX, mouseY);
+				return;
+			}
+
+			var origin = editor.GetContent<ITextEditorImpl> ().GetEditorWindowOrigin ();
+
+			int w;
+			double xalign;
+			GetRequiredPosition (editor, tipWindow, out w, out xalign);
+			w += 10;
+
+			var allocation = GetAllocation (editor);
+			int x = (int)(mouseX + origin.X + allocation.X);
+			int y = (int)(mouseY + origin.Y + allocation.Y);
+			Gtk.Widget widget = editor;
+			var geometry = widget.Screen.GetUsableMonitorGeometry (widget.Screen.GetMonitorAtPoint (x, y));
+			
+			x -= (int) ((double) w * xalign);
+			y += 10;
+			
+			if (x + w >= geometry.X + geometry.Width)
+				x = geometry.X + geometry.Width - w;
+			if (x < geometry.Left)
+				x = geometry.Left;
+			
+			var gtkWindow = (Gtk.Window)tipWindow;
+			int h = gtkWindow.SizeRequest ().Height;
+			if (y + h >= geometry.Y + geometry.Height)
+				y = geometry.Y + geometry.Height - h;
+			if (y < geometry.Top)
+				y = geometry.Top;
+			
+			gtkWindow.Move (x, y);
+			
+			gtkWindow.ShowAll ();
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/WordFindStrategy.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/WordFindStrategy.cs
new file mode 100644
index 0000000000..d850856538
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/WordFindStrategy.cs
@@ -0,0 +1,38 @@
+//
+// WordFindStrategy.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public enum WordFindStrategy
+	{
+		MonoDevelop,
+		Emacs,
+		SharpDevelop,
+		Vim
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs
index 4d2ee32f6f..c67934a5d8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs
@@ -31,7 +31,7 @@ using MonoDevelop.Ide.Gui;
 using System.Text;
 using MonoDevelop.Core;
 using System;
-using Mono.TextEditor.Utils;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Ide.FindInFiles
 {
@@ -145,7 +145,7 @@ namespace MonoDevelop.Ide.FindInFiles
 			buffer.Insert (offset, replacement);
 			if (document != null) {
 				Gtk.Application.Invoke (delegate {
-					document.Editor.Replace (offset, length, replacement);
+					document.Editor.ReplaceText (offset, length, replacement);
 				});
 				return;
 			}
@@ -159,7 +159,8 @@ namespace MonoDevelop.Ide.FindInFiles
 						undoGroup.Dispose ();
 						undoGroup = null;
 					}
-					document.Editor.Document.CommitUpdateAll (); });
+					/*document.Editor.Document.CommitUpdateAll (); */
+				});
 				return;
 			}
 			if (buffer != null && somethingReplaced) {
@@ -167,6 +168,7 @@ namespace MonoDevelop.Ide.FindInFiles
 				TextFileUtility.WriteText (FileName, buffer.ToString (), encoding, hadBom);
 				DesktopService.SetFileAttributes (FileName, attributes);
 			}
+			FileService.NotifyFileChanged (FileName);
 			buffer = null;
 		}
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
index f4e64d6990..451299685d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
@@ -37,6 +37,11 @@ using MonoDevelop.Ide.Gui.Content;
 
 namespace MonoDevelop.Ide.FindInFiles
 {
+	public enum PathMode {
+		Absolute,
+		Hidden
+	}
+
 	public partial class FindInFilesDialog : Gtk.Dialog
 	{
 		readonly bool writeScope = true;
@@ -191,7 +196,7 @@ namespace MonoDevelop.Ide.FindInFiles
 				toggleFindInFiles.Toggle ();
 
 			if (IdeApp.Workbench.ActiveDocument != null) {
-				var view = IdeApp.Workbench.ActiveDocument.GetContent<ITextBuffer> ();
+				var view = IdeApp.Workbench.ActiveDocument.Editor;
 				if (view != null) {
 					string selectedText = FormatPatternToSelectionOption (view.SelectedText, properties.Get ("RegexSearch", false));
 					if (!string.IsNullOrEmpty (selectedText)) {
@@ -668,9 +673,17 @@ namespace MonoDevelop.Ide.FindInFiles
 
 			switch ((SearchScope) comboboxScope.Active) {
 			case SearchScope.CurrentDocument:
+				if (IdeApp.Workbench.ActiveDocument == null) {
+					MessageService.ShowError (GettextCatalog.GetString ("Currently there is no open document."));
+					return null;
+				}
 				scope = new DocumentScope ();
 				break;
 			case SearchScope.Selection:
+				if (IdeApp.Workbench.ActiveDocument == null) {
+					MessageService.ShowError (GettextCatalog.GetString ("Currently there is no open document."));
+					return null;
+				}
 				scope = new SelectionScope ();
 				break;
 			case SearchScope.WholeWorkspace:
@@ -699,6 +712,10 @@ namespace MonoDevelop.Ide.FindInFiles
 				MessageService.ShowError (GettextCatalog.GetString ("Currently there is no open solution."));
 				return null;
 			case SearchScope.AllOpenFiles:
+				if (IdeApp.Workbench.Documents.Count == 0) {
+					MessageService.ShowError (GettextCatalog.GetString ("Currently there are no open documents."));
+					return null;
+				}
 				scope = new AllOpenFilesScope ();
 				break;
 			case SearchScope.Directories: 
@@ -790,6 +807,9 @@ namespace MonoDevelop.Ide.FindInFiles
 			ThreadPool.QueueUserWorkItem (delegate {
 				CancellationTokenSource cancelSource = new CancellationTokenSource ();
 				using (SearchProgressMonitor searchMonitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, cancellationTokenSource:cancelSource)) {
+
+					searchMonitor.PathMode = scope.PathMode;
+
 					searchMonitor.ReportStatus (scope.GetDescription (options, pattern, null));
 					lock (searchesInProgress)
 						searchesInProgress.Add (cancelSource);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ISearchProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ISearchProgressMonitor.cs
index 0dacb70a51..85d7601f9b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ISearchProgressMonitor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ISearchProgressMonitor.cs
@@ -38,5 +38,6 @@ namespace MonoDevelop.Ide.FindInFiles
 		void ReportResult (SearchResult result);
 		void ReportResults (IEnumerable<SearchResult> result);
 		void ReportStatus (string resultMessage);
+		PathMode PathMode { set; }
 	}
 }
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberCollector.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberCollector.cs
index ab63fa2d69..de5119e2be 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberCollector.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberCollector.cs
@@ -1,236 +1,236 @@
-// 
-// MemberCollector.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace MonoDevelop.Ide.FindInFiles
-{
-	public static class MemberCollector
-	{
-		static bool MatchParameters (IMember a, IMember b)
-		{
-			return MatchParameters (a as IParameterizedMember, b as IParameterizedMember);
-		}
-
-		static bool MatchParameters (IParameterizedMember a, IParameterizedMember b)
-		{
-			if (a == null && b == null) return true;
-			if (a == null || b == null) return false;
-
-			return Equals (a.Compilation, a.Parameters, b.Parameters);
-		}
-
-		#region Code from NRefactory ParameterListComparer
-
-		public static bool Equals(ICompilation comp, IList<IParameter> x, IList<IParameter> y)
-		{
-			if (x == y)
-				return true;
-			if (x == null || y == null || x.Count != y.Count)
-				return false;
-			for (int i = 0; i < x.Count; i++) {
-				var a = x[i];
-				var b = y[i];
-				if (a == null && b == null)
-					continue;
-				if (a == null || b == null)
-					return false;
-
-				// We want to consider the parameter lists "Method<T>(T a)" and "Method<S>(S b)" as equal.
-				// However, the parameter types are not considered equal, as T is a different type parameter than S.
-				// In order to compare the method signatures, we will normalize all method type parameters.
-				IType aType = a.Type.AcceptVisitor(normalizationVisitor);
-				IType bType = b.Type.AcceptVisitor(normalizationVisitor);
-				bType = comp.Import (bType);
-				if (!aType.Equals(bType))
-					return false;
-			}
-			return true;
-		}
-
-		sealed class NormalizeTypeVisitor : TypeVisitor
-		{
-			public override IType VisitTypeParameter(ITypeParameter type)
-			{
-				if (type.OwnerType == SymbolKind.Method) {
-					return ICSharpCode.NRefactory.TypeSystem.Implementation.DummyTypeParameter.GetMethodTypeParameter(type.Index);
-				} else {
-					return base.VisitTypeParameter(type);
-				}
-			}
-
-			public override IType VisitTypeDefinition(ITypeDefinition type)
-			{
-				if (type.KnownTypeCode == KnownTypeCode.Object)
-					return SpecialType.Dynamic;
-				return base.VisitTypeDefinition(type);
-			}
-		}
-
-		static readonly NormalizeTypeVisitor normalizationVisitor = new NormalizeTypeVisitor();
-
-		#endregion
-
-		/// <summary>
-		/// find all base types(types that are not derived from other types) in the specified types
-		/// </summary>
-		/// <param name="types"></param>
-		/// <returns></returns>
-		public static IEnumerable<ITypeDefinition> GetBaseTypes (IEnumerable<ITypeDefinition> types)
-		{
-			if (types == null)
-				yield break;
-			types = types.ToList ();
-			if (!types.Any ())
-				yield break;
-
-			var baseType = types.FirstOrDefault ();
-			var otherTypes = new List<ITypeDefinition> ();
-
-			foreach (var type in types.Skip (1)) {
-				if (baseType.IsDerivedFrom (type)) {
-					baseType = type;
-				} else if (!type.IsDerivedFrom (baseType)) {
-					// this type is not directly related to baseType
-					otherTypes.Add (type);
-				}
-			}
-			yield return baseType;
-			foreach (var type in GetBaseTypes (otherTypes))
-				yield return type;
-		}
-
-		static IEnumerable<IMember> GetMembers (ITypeDefinition type, IMember member, bool ignoreInherited,
-												Func<IMember, bool> filter)
-		{
-			var options = ignoreInherited ? GetMemberOptions.IgnoreInheritedMembers : GetMemberOptions.None;
-			var members = type.GetMembers (m => m.Name == member.Name, options);
-
-/*			// Filter out shadowed members.
-			// class A { public string Foo { get; set; } } class B : A { public string Foo { get; set; } }
-			if (member.SymbolKind == SymbolKind.Property || !(member is IParameterizedMember)) {
-				members = members.Where (m => m == member || m.DeclaringType.Kind == TypeKind.Interface);
-			}*/
-			if (filter != null)
-				members = members.Where (filter);
-			return members;
-		}
-
-		static IEnumerable<ITypeDefinition> Import (ICompilation compilation, IEnumerable<ITypeDefinition> types)
-		{
-			return types.Select (t => compilation.Import (t));
-		}
-
-		/// <summary>
-		/// collect members with the same signature/name(if overloads are included) as the specified member
-		/// in the inheritance tree
-		/// </summary>
-		public static IEnumerable<IMember> CollectMembers (Solution solution, IMember member, ReferenceFinder.RefactoryScope scope,
-			bool includeOverloads = true, bool matchDeclaringType = false)
-		{
-			if (solution == null || member.SymbolKind == SymbolKind.Destructor || member.SymbolKind == SymbolKind.Operator)
-				return new [] { member };
-
-			if (member.SymbolKind == SymbolKind.Constructor) {
-				if (includeOverloads)
-					return member.DeclaringType.GetMembers (m => m.SymbolKind == SymbolKind.Constructor, GetMemberOptions.IgnoreInheritedMembers);
-				return new [] { member };
-			}
-
-			Func<IMember, bool> memberFilter = null;
-			if (member is IParameterizedMember && !includeOverloads)
-				memberFilter = m => MatchParameters (m, member);
-
-			var declaringType = member.DeclaringTypeDefinition;
-			if (declaringType == null)
-				return new [] { member };
-			// only collect members in declaringType
-			if (matchDeclaringType)
-				return GetMembers (declaringType, member, true, memberFilter);
-
-			if (declaringType.Kind != TypeKind.Class && declaringType.Kind != TypeKind.Interface)
-				return GetMembers (declaringType, member, false, memberFilter);
-
-			var searchTypes = new List<ITypeDefinition> ();
-			if (includeOverloads) {
-				var interfaces = from t in declaringType.GetAllBaseTypeDefinitions ()
-								 where t.Kind == TypeKind.Interface && GetMembers (t, member, true, memberFilter).Any ()
-								 select t;
-				searchTypes.AddRange (GetBaseTypes (interfaces));
-			}
-
-			if (member.DeclaringType.Kind == TypeKind.Class) {
-				var members = GetMembers (declaringType, member, false, memberFilter).ToList ();
-				if (members.Any (m => m.IsOverridable))
-					searchTypes.AddRange (GetBaseTypes (members.Select (m => m.DeclaringTypeDefinition)));
-				else if (searchTypes.Count == 0)
-					return members;
-			}
-
-			IList<ICompilation> compilations;
-			if (scope == ReferenceFinder.RefactoryScope.Solution || scope == ReferenceFinder.RefactoryScope.Unknown) {
-				var projects = SearchCollector.CollectProjects (solution, searchTypes);
-				compilations = projects.Select (TypeSystemService.GetCompilation).ToList ();
-			} else {
-				compilations = new [] { member.Compilation };
-			}
-
-			var result = new List<IMember> ();
-			var mainAssemblies = new HashSet<string> (compilations.Select (c => c.MainAssembly.AssemblyName));
-			var searchedAssemblies = new HashSet<string> ();
-			var searchedTypes = new HashSet<string> ();
-
-			foreach (var compilation in compilations) {
-				var baseTypeImports = Import(compilation, searchTypes).Where (t => t != null).ToList ();
-				if (!baseTypeImports.Any ()) continue;
-
-				foreach (var assembly in compilation.Assemblies) {
-					// search main assemblies in their projects' own compilation, to avoid possible resolving problems
-					if ((mainAssemblies.Contains(assembly.AssemblyName) && assembly != compilation.MainAssembly) ||
-						!searchedAssemblies.Add (assembly.AssemblyName))
-						continue;
-
-					foreach (var type in assembly.GetAllTypeDefinitions ()) {
-						// members in base types will also be added
-						// because IsDerivedFrom return true for a type itself
-						if (!searchedTypes.Add (type.ReflectionName) || !baseTypeImports.Any (type.IsDerivedFrom))
-							continue;
-						result.AddRange (GetMembers (type, member, true, memberFilter));
-					}
-				}
-			}
-			if (!result.Contains (member))
-				result.Add (member);
-			return result;
-		}
-	
-	}
-}
-
+//// 
+//// MemberCollector.cs
+////  
+//// Author:
+////       Mansheng Yang <lightyang0@gmail.com>
+//// 
+//// Copyright (c) 2012 Mansheng Yang
+//// 
+//// Permission is hereby granted, free of charge, to any person obtaining a copy
+//// of this software and associated documentation files (the "Software"), to deal
+//// in the Software without restriction, including without limitation the rights
+//// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//// copies of the Software, and to permit persons to whom the Software is
+//// furnished to do so, subject to the following conditions:
+//// 
+//// The above copyright notice and this permission notice shall be included in
+//// all copies or substantial portions of the Software.
+//// 
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//// THE SOFTWARE.
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using MonoDevelop.Projects;
+//using MonoDevelop.Ide.TypeSystem;
+//using ICSharpCode.NRefactory.TypeSystem;
+//
+//namespace MonoDevelop.Ide.FindInFiles
+//{
+//	public static class MemberCollector
+//	{
+//		static bool MatchParameters (IMember a, IMember b)
+//		{
+//			return MatchParameters (a as IParameterizedMember, b as IParameterizedMember);
+//		}
+//
+//		static bool MatchParameters (IParameterizedMember a, IParameterizedMember b)
+//		{
+//			if (a == null && b == null) return true;
+//			if (a == null || b == null) return false;
+//
+//			return Equals (a.Compilation, a.Parameters, b.Parameters);
+//		}
+//
+//		#region Code from NRefactory ParameterListComparer
+//
+//		public static bool Equals(ICompilation comp, IList<IParameter> x, IList<IParameter> y)
+//		{
+//			if (x == y)
+//				return true;
+//			if (x == null || y == null || x.Count != y.Count)
+//				return false;
+//			for (int i = 0; i < x.Count; i++) {
+//				var a = x[i];
+//				var b = y[i];
+//				if (a == null && b == null)
+//					continue;
+//				if (a == null || b == null)
+//					return false;
+//
+//				// We want to consider the parameter lists "Method<T>(T a)" and "Method<S>(S b)" as equal.
+//				// However, the parameter types are not considered equal, as T is a different type parameter than S.
+//				// In order to compare the method signatures, we will normalize all method type parameters.
+//				IType aType = a.Type.AcceptVisitor(normalizationVisitor);
+//				IType bType = b.Type.AcceptVisitor(normalizationVisitor);
+//				bType = comp.Import (bType);
+//				if (!aType.Equals(bType))
+//					return false;
+//			}
+//			return true;
+//		}
+//
+//		sealed class NormalizeTypeVisitor : TypeVisitor
+//		{
+//			public override IType VisitTypeParameter(ITypeParameter type)
+//			{
+//				if (type.OwnerType == SymbolKind.Method) {
+//					return ICSharpCode.NRefactory.TypeSystem.Implementation.DummyTypeParameter.GetMethodTypeParameter(type.Index);
+//				} else {
+//					return base.VisitTypeParameter(type);
+//				}
+//			}
+//
+//			public override IType VisitTypeDefinition(ITypeDefinition type)
+//			{
+//				if (type.KnownTypeCode == KnownTypeCode.Object)
+//					return SpecialType.Dynamic;
+//				return base.VisitTypeDefinition(type);
+//			}
+//		}
+//
+//		static readonly NormalizeTypeVisitor normalizationVisitor = new NormalizeTypeVisitor();
+//
+//		#endregion
+//
+//		/// <summary>
+//		/// find all base types(types that are not derived from other types) in the specified types
+//		/// </summary>
+//		/// <param name="types"></param>
+//		/// <returns></returns>
+//		public static IEnumerable<ITypeDefinition> GetBaseTypes (IEnumerable<ITypeDefinition> types)
+//		{
+//			if (types == null)
+//				yield break;
+//			types = types.ToList ();
+//			if (!types.Any ())
+//				yield break;
+//
+//			var baseType = types.FirstOrDefault ();
+//			var otherTypes = new List<ITypeDefinition> ();
+//
+//			foreach (var type in types.Skip (1)) {
+//				if (baseType.IsDerivedFrom (type)) {
+//					baseType = type;
+//				} else if (!type.IsDerivedFrom (baseType)) {
+//					// this type is not directly related to baseType
+//					otherTypes.Add (type);
+//				}
+//			}
+//			yield return baseType;
+//			foreach (var type in GetBaseTypes (otherTypes))
+//				yield return type;
+//		}
+//
+//		static IEnumerable<IMember> GetMembers (ITypeDefinition type, IMember member, bool ignoreInherited,
+//												Func<IMember, bool> filter)
+//		{
+//			var options = ignoreInherited ? GetMemberOptions.IgnoreInheritedMembers : GetMemberOptions.None;
+//			var members = type.GetMembers (m => m.Name == member.Name, options);
+//
+///*			// Filter out shadowed members.
+//			// class A { public string Foo { get; set; } } class B : A { public string Foo { get; set; } }
+//			if (member.SymbolKind == SymbolKind.Property || !(member is IParameterizedMember)) {
+//				members = members.Where (m => m == member || m.DeclaringType.Kind == TypeKind.Interface);
+//			}*/
+//			if (filter != null)
+//				members = members.Where (filter);
+//			return members;
+//		}
+//
+//		static IEnumerable<ITypeDefinition> Import (ICompilation compilation, IEnumerable<ITypeDefinition> types)
+//		{
+//			return types.Select (t => compilation.Import (t));
+//		}
+//
+//		/// <summary>
+//		/// collect members with the same signature/name(if overloads are included) as the specified member
+//		/// in the inheritance tree
+//		/// </summary>
+//		public static IEnumerable<IMember> CollectMembers (Solution solution, IMember member, ReferenceFinder.RefactoryScope scope,
+//			bool includeOverloads = true, bool matchDeclaringType = false)
+//		{
+//			if (solution == null || member.SymbolKind == SymbolKind.Destructor || member.SymbolKind == SymbolKind.Operator)
+//				return new [] { member };
+//
+//			if (member.SymbolKind == SymbolKind.Constructor) {
+//				if (includeOverloads)
+//					return member.DeclaringType.GetMembers (m => m.SymbolKind == SymbolKind.Constructor, GetMemberOptions.IgnoreInheritedMembers);
+//				return new [] { member };
+//			}
+//
+//			Func<IMember, bool> memberFilter = null;
+//			if (member is IParameterizedMember && !includeOverloads)
+//				memberFilter = m => MatchParameters (m, member);
+//
+//			var declaringType = member.DeclaringTypeDefinition;
+//			if (declaringType == null)
+//				return new [] { member };
+//			// only collect members in declaringType
+//			if (matchDeclaringType)
+//				return GetMembers (declaringType, member, true, memberFilter);
+//
+//			if (declaringType.Kind != TypeKind.Class && declaringType.Kind != TypeKind.Interface)
+//				return GetMembers (declaringType, member, false, memberFilter);
+//
+//			var searchTypes = new List<ITypeDefinition> ();
+//			if (includeOverloads) {
+//				var interfaces = from t in declaringType.GetAllBaseTypeDefinitions ()
+//								 where t.Kind == TypeKind.Interface && GetMembers (t, member, true, memberFilter).Any ()
+//								 select t;
+//				searchTypes.AddRange (GetBaseTypes (interfaces));
+//			}
+//
+//			if (member.DeclaringType.Kind == TypeKind.Class) {
+//				var members = GetMembers (declaringType, member, false, memberFilter).ToList ();
+//				if (members.Any (m => m.IsOverridable))
+//					searchTypes.AddRange (GetBaseTypes (members.Select (m => m.DeclaringTypeDefinition)));
+//				else if (searchTypes.Count == 0)
+//					return members;
+//			}
+//
+//			IList<ICompilation> compilations;
+//			if (scope == ReferenceFinder.RefactoryScope.Solution || scope == ReferenceFinder.RefactoryScope.Unknown) {
+//				var projects = SearchCollector.CollectProjects (solution, searchTypes);
+//				compilations = projects.Select (TypeSystemService.GetCompilation).ToList ();
+//			} else {
+//				compilations = new [] { member.Compilation };
+//			}
+//
+//			var result = new List<IMember> ();
+//			var mainAssemblies = new HashSet<string> (compilations.Select (c => c.MainAssembly.AssemblyName));
+//			var searchedAssemblies = new HashSet<string> ();
+//			var searchedTypes = new HashSet<string> ();
+//
+//			foreach (var compilation in compilations) {
+//				var baseTypeImports = Import(compilation, searchTypes).Where (t => t != null).ToList ();
+//				if (!baseTypeImports.Any ()) continue;
+//
+//				foreach (var assembly in compilation.Assemblies) {
+//					// search main assemblies in their projects' own compilation, to avoid possible resolving problems
+//					if ((mainAssemblies.Contains(assembly.AssemblyName) && assembly != compilation.MainAssembly) ||
+//						!searchedAssemblies.Add (assembly.AssemblyName))
+//						continue;
+//
+//					foreach (var type in assembly.GetAllTypeDefinitions ()) {
+//						// members in base types will also be added
+//						// because IsDerivedFrom return true for a type itself
+//						if (!searchedTypes.Add (type.ReflectionName) || !baseTypeImports.Any (type.IsDerivedFrom))
+//							continue;
+//						result.AddRange (GetMembers (type, member, true, memberFilter));
+//					}
+//				}
+//			}
+//			if (!result.Contains (member))
+//				result.Add (member);
+//			return result;
+//		}
+//	
+//	}
+//}
+//
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberReference.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberReference.cs
index 44936f27f4..0e1b3915ae 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberReference.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberReference.cs
@@ -25,16 +25,18 @@
 // THE SOFTWARE.
 using System;
 using ICSharpCode.NRefactory.TypeSystem;
-using Mono.TextEditor.Highlighting;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
 
 namespace MonoDevelop.Ide.FindInFiles
 {
 	[Flags]
 	public enum ReferenceUsageType {
-		Unknown = 0,
-		Read    = 1,
-		Write   = 2,
-		ReadWrite = Read | Write
+		Unknown    = 0,
+		Read       = 1,
+		Write      = 2,
+		Declariton = 4,
+		ReadWrite  = Read | Write
 	}
 
 	public class MemberReference : SearchResult
@@ -44,23 +46,24 @@ namespace MonoDevelop.Ide.FindInFiles
 				return new MonoDevelop.Ide.FindInFiles.FileProvider (FileName);
 			}
 		}
-		
-		public override  string FileName {
+		readonly string fileName;
+		public override string FileName {
 			get {
-				return Region.FileName;
+				return fileName;
 			}
 		}
 
 		public ReferenceUsageType ReferenceUsageType { get; set; }
 		public object EntityOrVariable { get; private set;}
-		public DomRegion Region { get; private set;}
 		
-		public MemberReference (object entity, DomRegion region, int offset, int length) : base (offset, length)
+		public MemberReference (object entity, string fileName, int offset, int length) : base (offset, length)
 		{
 			if (entity == null)
 				throw new System.ArgumentNullException ("entity");
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
 			EntityOrVariable = entity;
-			Region = region;
+			this.fileName = fileName;
 		}
 
 		public string GetName ()
@@ -79,7 +82,8 @@ namespace MonoDevelop.Ide.FindInFiles
 
 		public override AmbientColor GetBackgroundMarkerColor (ColorScheme style)
 		{
-			return (ReferenceUsageType & ReferenceUsageType.Write) != 0 ?
+			return (ReferenceUsageType & ReferenceUsageType.Write) != 0 ||
+				(ReferenceUsageType & ReferenceUsageType.Declariton) != 0?
 				style.ChangingUsagesRectangle :
 				style.UsagesRectangle;
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ReferencesFinder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ReferencesFinder.cs
index 9691a93978..c69477eb13 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ReferencesFinder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ReferencesFinder.cs
@@ -1,321 +1,323 @@
-// 
-// ReferenceFinder.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Mono.Addins;
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using System.Threading.Tasks;
-
-namespace MonoDevelop.Ide.FindInFiles
-{
-	public abstract class ReferenceFinder
-	{
-		public bool IncludeDocumentation {
-			get;
-			set;
-		}
-		
-		/*
-		Project project;
-		protected Project Project {
-			get {
-				if (project == null)
-					project = Content.GetProject ();
-				return project;
-			}
-		}*/
-		
-		static List<ReferenceFinderCodon> referenceFinderCodons = new List<ReferenceFinderCodon> ();
-		
-		static ReferenceFinder ()
-		{
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Ide/ReferenceFinder", delegate(object sender, ExtensionNodeEventArgs args) {
-				var codon = (ReferenceFinderCodon)args.ExtensionNode;
-				switch (args.Change) {
-				case ExtensionChange.Add:
-					referenceFinderCodons.Add (codon);
-					break;
-				case ExtensionChange.Remove:
-					referenceFinderCodons.Remove (codon);
-					break;
-				}
-			});
-		}
-		
-		static ReferenceFinder GetReferenceFinder (string mimeType)
-		{
-			var codon = referenceFinderCodons.FirstOrDefault (c => c.SupportedMimeTypes.Any (mt => mt == mimeType));
-			return codon != null ? codon.CreateFinder () : null;
-		}
-		
-		public static IEnumerable<MemberReference> FindReferences (object member, bool searchForAllOverloads, ProgressMonitor monitor = null)
-		{
-			return FindReferences (IdeApp.ProjectOperations.CurrentSelectedSolution, member, searchForAllOverloads, RefactoryScope.Unknown, monitor);
-		}
-
-		public static IEnumerable<MemberReference> FindReferences (object member, bool searchForAllOverloads, RefactoryScope scope, ProgressMonitor monitor = null)
-		{
-			return FindReferences (IdeApp.ProjectOperations.CurrentSelectedSolution, member, searchForAllOverloads, scope, monitor);
-		}
-		
-		static SearchCollector.FileList GetFileList (string fileName)
-		{
-			var doc = IdeApp.Workbench.GetDocument (fileName);
-			if (doc != null)
-				return new SearchCollector.FileList (doc.Project, doc.ProjectContent, new [] { (FilePath)fileName });
-			return null;
-		}
-
-		static IEnumerable<SearchCollector.FileList> GetFileNames (Solution solution, object node, RefactoryScope scope, 
-		                                                           ProgressMonitor monitor, IEnumerable<object> searchNodes)
-		{
-			if (!(node is IField) && !(node is IParameter) && node is IVariable || scope == RefactoryScope.File) {
-				string fileName;
-				if (node is IEntity) {
-					fileName = ((IEntity)node).Region.FileName;
-				} else if (node is ITypeParameter) {
-					fileName = ((ITypeParameter)node).Region.FileName;
-				} else {
-					fileName = ((IVariable)node).Region.FileName;
-				}
-				var fileList =  GetFileList (fileName);
-				if (fileList != null)
-					yield return fileList;
-				yield break;
-			}
-			
-			if (node is ITypeParameter) {
-				var typeParameter = node as ITypeParameter;
-				if (typeParameter.Owner != null) {
-					yield return SearchCollector.CollectDeclaringFiles (typeParameter.Owner);
-					yield break;
-				}
-				var fileList =  GetFileList (typeParameter.Region.FileName);
-				if (fileList != null)
-					yield return fileList;
-				yield break;
-			}
-			var par = node as IParameter;
-			if (par != null) {
-				node = par.Owner;
-			}
-
-			var compilationProvider = (ICompilationProvider)node;
-			switch (scope) {

-			case RefactoryScope.DeclaringType:
-				var entity = (IEntity)compilationProvider;
-				if (entity.DeclaringTypeDefinition != null)
-					yield return SearchCollector.CollectDeclaringFiles (entity.DeclaringTypeDefinition);
-				else
-					yield return SearchCollector.CollectDeclaringFiles (entity);
-				break;
-			case RefactoryScope.Project:

-				var sourceProject = TypeSystemService.GetProject (compilationProvider.Compilation.MainAssembly.UnresolvedAssembly.Location);
-				foreach (var file in SearchCollector.CollectFiles (sourceProject, searchNodes))
-					yield return file;
-				break;
-			default:
-				var files = SearchCollector.CollectFiles (solution, searchNodes).ToList ();
-				if (monitor != null)
-					monitor.BeginTask (GettextCatalog.GetString ("Searching for references in solution..."), files.Count);
-				foreach (var file in files) {
-					if (monitor != null && monitor.CancellationToken.IsCancellationRequested)
-						yield break;
-					yield return file;
-					if (monitor != null)
-						monitor.Step (1);
-				}
-				if (monitor != null)
-					monitor.EndTask ();
-				break;
-			}
-		}
-		
-		public static List<Project> GetAllReferencingProjects (Solution solution, Project sourceProject)
-		{
-			var projects = new List<Project> ();
-			projects.Add (sourceProject);
-			foreach (var project in solution.GetAllProjects ()) {
-				if (project.GetReferencedItems (ConfigurationSelector.Default).Any (prj => prj == sourceProject))
-					projects.Add (project);
-			}
-			return projects;
-		}
-
-		public static IEnumerable<MemberReference> FindReferences (Solution solution, object member, bool searchForAllOverloads, RefactoryScope scope = RefactoryScope.Unknown, ProgressMonitor monitor = null)
-		{
-			if (member == null)
-				yield break;

-			if (solution == null && member is IEntity) {

-				var project = TypeSystemService.GetProject ((member as IEntity).Compilation.MainAssembly.UnresolvedAssembly.Location);

-				if (project == null)

-					yield break;

-				solution = project.ParentSolution;

-			}
-			
-			IList<object> searchNodes = new [] { member };
-			if (member is ITypeParameter) {
-				// nothing
-			} else if (member is IType) {
-				searchNodes = CollectMembers ((IType)member).ToList<object> ();
-			} else if (member is IEntity) {
-				var e = (IEntity)member;
-				if (e.SymbolKind == SymbolKind.Destructor) {
-					foreach (var r in FindReferences (solution, e.DeclaringType, searchForAllOverloads, scope, monitor)) {
-						yield return r;
-					}
-					yield break;
-				}

-				if (member is IMember)

-					searchNodes = CollectMembers (solution, (IMember)member, scope, searchForAllOverloads).ToList<object> ();
-			}
-			// prepare references finder
-			var preparedFinders = new List<Tuple<ReferenceFinder, Project, IProjectContent, List<FilePath>>> ();
-			var curList = new List<FilePath> ();
-			int totalFiles = 0;
-			foreach (var info in GetFileNames (solution, member, scope, monitor, searchNodes)) {
-				string oldMime = null;
-				foreach (var file in info.Files) {
-					if (monitor != null && monitor.CancellationToken.IsCancellationRequested)
-						yield break;
-					
-					string mime = DesktopService.GetMimeTypeForUri (file);
-					if (mime != oldMime) {
-						var finder = GetReferenceFinder (mime);
-						if (finder == null)
-							continue;
-						
-						oldMime = mime;
-						
-						curList = new List<FilePath> ();
-						preparedFinders.Add (Tuple.Create (finder, info.Project, info.Content, curList));
-					}
-					curList.Add (file);
-					totalFiles++;
-				}
-			}
-			
-			// execute search
-			if (monitor != null)
-				monitor.BeginTask (GettextCatalog.GetString ("Analyzing files..."), totalFiles);
-			var foundOccurrences = new HashSet<Tuple<string, DomRegion>> ();
-			foreach (var tuple in preparedFinders) {
-				var finder = tuple.Item1;
-				foreach (var foundReference in finder.FindReferences (tuple.Item2, tuple.Item3, tuple.Item4, monitor, searchNodes)) {
-					if (monitor != null && monitor.CancellationToken.IsCancellationRequested)
-						yield break;
-					var tag = Tuple.Create (foundReference.FileName, foundReference.Region);
-					if (foundOccurrences.Contains (tag))
-						continue;
-					foundOccurrences.Add (tag);
-					yield return foundReference;
-				}
-			}
-			if (monitor != null)
-				monitor.EndTask ();
-		}
-
-		public abstract IEnumerable<MemberReference> FindReferences (Project project, IProjectContent content, IEnumerable<FilePath> files, ProgressMonitor monitor, IEnumerable<object> searchedMembers);

-

-		internal static IEnumerable<IMember> CollectMembers (Solution solution, IMember member, RefactoryScope scope, bool includeOverloads = true)

-		{

-			return MemberCollector.CollectMembers (solution, member, scope, includeOverloads);
-		}
-		
-		internal static IEnumerable<IEntity> CollectMembers (IType type)
-		{
-			var typeDefinition = type.GetDefinition ();
-			if (typeDefinition == null)
-				yield break;
-			yield return (IEntity)typeDefinition;
-			foreach (var c in typeDefinition.GetMembers (m => m.SymbolKind == SymbolKind.Constructor, GetMemberOptions.IgnoreInheritedMembers)) {
-				if (!c.IsSynthetic)
-					yield return c;
-			}
-
-			foreach (var m in type.GetMethods (m  => m.IsDestructor, GetMemberOptions.IgnoreInheritedMembers)) {
-				yield return m;
-			}
-		}
-
-
-		public enum RefactoryScope{ Unknown, File, DeclaringType, Solution, Project}
-//		static RefactoryScope GetScope (object o)
+//// 
+//// ReferenceFinder.cs
+////  
+//// Author:
+////       Mike Krüger <mkrueger@novell.com>
+//// 
+//// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+//// 
+//// Permission is hereby granted, free of charge, to any person obtaining a copy
+//// of this software and associated documentation files (the "Software"), to deal
+//// in the Software without restriction, including without limitation the rights
+//// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//// copies of the Software, and to permit persons to whom the Software is
+//// furnished to do so, subject to the following conditions:
+//// 
+//// The above copyright notice and this permission notice shall be included in
+//// all copies or substantial portions of the Software.
+//// 
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//// THE SOFTWARE.
+//
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using Mono.Addins;
+//using MonoDevelop.Core;
+//using MonoDevelop.Projects;
+//using ICSharpCode.NRefactory.TypeSystem;
+//using MonoDevelop.Ide.TypeSystem;
+//using System.Threading.Tasks;
+//
+//namespace MonoDevelop.Ide.FindInFiles
+//{
+//	public abstract class ReferenceFinder
+//	{
+//		public bool IncludeDocumentation {
+//			get;
+//			set;
+//		}
+//		
+//		/*
+//		Project project;
+//		protected Project Project {
+//			get {
+//				if (project == null)
+//					project = Content.GetProject ();
+//				return project;
+//			}
+//		}*/
+//		
+//		static List<ReferenceFinderCodon> referenceFinderCodons = new List<ReferenceFinderCodon> ();
+//		
+//		static ReferenceFinder ()
+//		{
+//			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Ide/ReferenceFinder", delegate(object sender, ExtensionNodeEventArgs args) {
+//				var codon = (ReferenceFinderCodon)args.ExtensionNode;
+//				switch (args.Change) {
+//				case ExtensionChange.Add:
+//					referenceFinderCodons.Add (codon);
+//					break;
+//				case ExtensionChange.Remove:
+//					referenceFinderCodons.Remove (codon);
+//					break;
+//				}
+//			});
+//		}
+//		
+//		static ReferenceFinder GetReferenceFinder (string mimeType)
+//		{
+//			var codon = referenceFinderCodons.FirstOrDefault (c => c.SupportedMimeTypes.Any (mt => mt == mimeType));
+//			return codon != null ? codon.CreateFinder () : null;
+//		}
+//		
+//		public static IEnumerable<MemberReference> FindReferences (object member, bool searchForAllOverloads, IProgressMonitor monitor = null)
+//		{
+//			return FindReferences (IdeApp.ProjectOperations.CurrentSelectedSolution, member, searchForAllOverloads, RefactoryScope.Unknown, monitor);
+//		}
+//
+//		public static IEnumerable<MemberReference> FindReferences (object member, bool searchForAllOverloads, RefactoryScope scope, IProgressMonitor monitor = null)
 //		{
-//			IEntity node = o as IEntity;
-//			if (node == null)
-//				return RefactoryScope.File;
+//			return FindReferences (IdeApp.ProjectOperations.CurrentSelectedSolution, member, searchForAllOverloads, scope, monitor);
+//		}
+//		
+//		static SearchCollector.FileList GetFileList (string fileName)
+//		{
+//			var doc = IdeApp.Workbench.GetDocument (fileName);
+//			if (doc != null)
+//				return new SearchCollector.FileList (doc.Project, null, new [] { (FilePath)fileName });
+//			return null;
+//		}
+//
+//		static IEnumerable<SearchCollector.FileList> GetFileNames (Solution solution, object node, RefactoryScope scope, 
+//		                                                           IProgressMonitor monitor, IEnumerable<object> searchNodes)
+//		{
+//			if (!(node is IField) && !(node is IParameter) && node is IVariable || scope == RefactoryScope.File) {
+//				string fileName;
+//				if (node is IEntity) {
+//					fileName = ((IEntity)node).Region.FileName;
+//				} else if (node is ITypeParameter) {
+//					fileName = ((ITypeParameter)node).Region.FileName;
+//				} else {
+//					fileName = ((IVariable)node).Region.FileName;
+//				}
+//				var fileList =  GetFileList (fileName);
+//				if (fileList != null)
+//					yield return fileList;
+//				yield break;
+//			}
 //			
-//			// TODO: RefactoringsScope.Hierarchy

-//			switch (node.Accessibility) {

-//			case Accessibility.Public:

-//			case Accessibility.Protected:

-//			case Accessibility.ProtectedOrInternal:

-//				if (node.DeclaringTypeDefinition != null) {

-//					var scope = GetScope (node.DeclaringTypeDefinition);

-//					if (scope != RefactoryScope.Solution)

-//						return RefactoryScope.Project;

-//				}

-//				return RefactoryScope.Solution;

-//			case Accessibility.Internal:

-//			case Accessibility.ProtectedAndInternal:

-//				return RefactoryScope.Project;

+//			if (node is ITypeParameter) {
+//				var typeParameter = node as ITypeParameter;
+//				if (typeParameter.Owner != null) {
+//					yield return SearchCollector.CollectDeclaringFiles (typeParameter.Owner);
+//					yield break;
+//				}
+//				var fileList =  GetFileList (typeParameter.Region.FileName);
+//				if (fileList != null)
+//					yield return fileList;
+//				yield break;
+//			}
+//			var par = node as IParameter;
+//			if (par != null) {
+//				node = par.Owner;
+//			}
+//
+//			var compilationProvider = (ICompilationProvider)node;
+//			switch (scope) {

+//			case RefactoryScope.DeclaringType:
+//				var entity = (IEntity)compilationProvider;
+//				if (entity.DeclaringTypeDefinition != null)
+//					yield return SearchCollector.CollectDeclaringFiles (entity.DeclaringTypeDefinition);
+//				else
+//					yield return SearchCollector.CollectDeclaringFiles (entity);
+//				break;
+//			case RefactoryScope.Project:

+//				var sourceProject = TypeSystemService.GetProject (compilationProvider.Compilation.MainAssembly.UnresolvedAssembly.Location);
+//				foreach (var file in SearchCollector.CollectFiles (sourceProject, searchNodes))
+//					yield return file;
+//				break;
+//			default:
+//				var files = SearchCollector.CollectFiles (solution, searchNodes).ToList ();
+//				if (monitor != null)
+//					monitor.BeginTask (GettextCatalog.GetString ("Searching for references in solution..."), files.Count);
+//				foreach (var file in files) {
+//					if (monitor != null && monitor.IsCancelRequested)
+//						yield break;
+//					yield return file;
+//					if (monitor != null)
+//						monitor.Step (1);
+//				}
+//				if (monitor != null)
+//					monitor.EndTask ();
+//				break;
+//			}
+//		}
+//		
+//		public static List<Project> GetAllReferencingProjects (Solution solution, Project sourceProject)
+//		{
+//			var projects = new List<Project> ();
+//			projects.Add (sourceProject);
+//			foreach (var project in solution.GetAllProjects ()) {
+//				if (project.GetReferencedItems (ConfigurationSelector.Default).Any (prj => prj == sourceProject))
+//					projects.Add (project);
+//			}
+//			return projects;
+//		}
+//
+//		public static IEnumerable<MemberReference> FindReferences (Solution solution, object member, bool searchForAllOverloads, RefactoryScope scope = RefactoryScope.Unknown, IProgressMonitor monitor = null)
+//		{
+//			yield break;
+//
+////			if (member == null)
+////				yield break;
+////			if (solution == null && member is IEntity) {

+////				var project = TypeSystemService.GetProject ((member as IEntity).Compilation.MainAssembly.UnresolvedAssembly.Location);

+////				if (project == null)

+////					yield break;

+////				solution = project.ParentSolution;

+////			}
+////			
+////			IList<object> searchNodes = new [] { member };
+////			if (member is ITypeParameter) {
+////				// nothing
+////			} else if (member is IType) {
+////				searchNodes = CollectMembers ((IType)member).ToList<object> ();
+////			} else if (member is IEntity) {
+////				var e = (IEntity)member;
+////				if (e.SymbolKind == SymbolKind.Destructor) {
+////					foreach (var r in FindReferences (solution, e.DeclaringType, searchForAllOverloads, scope, monitor)) {
+////						yield return r;
+////					}
+////					yield break;
+////				}

+////				if (member is IMember)

+////					searchNodes = CollectMembers (solution, (IMember)member, scope, searchForAllOverloads).ToList<object> ();
+////			}
+////			// prepare references finder
+////			var preparedFinders = new List<Tuple<ReferenceFinder, Project, IProjectContent, List<FilePath>>> ();
+////			var curList = new List<FilePath> ();
+////			int totalFiles = 0;
+////			foreach (var info in GetFileNames (solution, member, scope, monitor, searchNodes)) {
+////				string oldMime = null;
+////				foreach (var file in info.Files) {
+////					if (monitor != null && monitor.IsCancelRequested)
+////						yield break;
+////					
+////					string mime = DesktopService.GetMimeTypeForUri (file);
+////					if (mime != oldMime) {
+////						var finder = GetReferenceFinder (mime);
+////						if (finder == null)
+////							continue;
+////						
+////						oldMime = mime;
+////						
+////						curList = new List<FilePath> ();
+////						preparedFinders.Add (Tuple.Create (finder, info.Project, info.Content, curList));
+////					}
+////					curList.Add (file);
+////					totalFiles++;
+////				}
+////			}
+////			
+////			// execute search
+////			if (monitor != null)
+////				monitor.BeginTask (GettextCatalog.GetString ("Analyzing files..."), totalFiles);
+////			var foundOccurrences = new HashSet<Tuple<string, DomRegion>> ();
+////			foreach (var tuple in preparedFinders) {
+////				var finder = tuple.Item1;
+////				foreach (var foundReference in finder.FindReferences (tuple.Item2, tuple.Item3, tuple.Item4, monitor, searchNodes)) {
+////					if (monitor != null && monitor.IsCancelRequested)
+////						yield break;
+////					var tag = Tuple.Create (foundReference.FileName, foundReference.Region);
+////					if (foundOccurrences.Contains (tag))
+////						continue;
+////					foundOccurrences.Add (tag);
+////					yield return foundReference;
+////				}
+////			}
+////			if (monitor != null)
+////				monitor.EndTask ();
+//		}
+//
+//		public abstract IEnumerable<MemberReference> FindReferences (Project project, IProjectContent content, IEnumerable<FilePath> files, IProgressMonitor monitor, IEnumerable<object> searchedMembers);

+//

+//		internal static IEnumerable<IMember> CollectMembers (Solution solution, IMember member, RefactoryScope scope, bool includeOverloads = true)

+//		{

+//			return MemberCollector.CollectMembers (solution, member, scope, includeOverloads);
+//		}
+//		
+//		internal static IEnumerable<IEntity> CollectMembers (IType type)
+//		{
+//			var typeDefinition = type.GetDefinition ();
+//			if (typeDefinition == null)
+//				yield break;
+//			yield return (IEntity)typeDefinition;
+//			foreach (var c in typeDefinition.GetMembers (m => m.SymbolKind == SymbolKind.Constructor, GetMemberOptions.IgnoreInheritedMembers)) {
+//				if (!c.IsSynthetic)
+//					yield return c;
 //			}
-//			return RefactoryScope.DeclaringType;
+//
+//			foreach (var m in type.GetMethods (m  => m.IsDestructor, GetMemberOptions.IgnoreInheritedMembers)) {
+//				yield return m;
+//			}
+//		}
+//
+//
+//		public enum RefactoryScope{ Unknown, File, DeclaringType, Solution, Project}
+////		static RefactoryScope GetScope (object o)
+////		{
+////			IEntity node = o as IEntity;
+////			if (node == null)
+////				return RefactoryScope.File;
+////			
+////			// TODO: RefactoringsScope.Hierarchy

+////			switch (node.Accessibility) {

+////			case Accessibility.Public:

+////			case Accessibility.Protected:

+////			case Accessibility.ProtectedOrInternal:

+////				if (node.DeclaringTypeDefinition != null) {

+////					var scope = GetScope (node.DeclaringTypeDefinition);

+////					if (scope != RefactoryScope.Solution)

+////						return RefactoryScope.Project;

+////				}

+////				return RefactoryScope.Solution;

+////			case Accessibility.Internal:

+////			case Accessibility.ProtectedAndInternal:

+////				return RefactoryScope.Project;

+////			}
+////			return RefactoryScope.DeclaringType;
+////		}
+//	}
+//	
+//	[ExtensionNode (Description="A reference finder. The specified class needs to inherit from MonoDevelop.Projects.CodeGeneration.ReferenceFinder")]
+//	internal class ReferenceFinderCodon : TypeExtensionNode
+//	{
+//		[NodeAttribute("supportedmimetypes", "Mime types supported by this binding (to be shown in the Open File dialog)")]
+//		string[] supportedMimetypes;
+//		
+//		public string[] SupportedMimeTypes {
+//			get {
+//				return supportedMimetypes;
+//			}
+//			set {
+//				supportedMimetypes = value;
+//			}
+//		}
+//		
+//		public ReferenceFinder CreateFinder ()
+//		{
+//			return (ReferenceFinder)CreateInstance ();
+//		}
+//		
+//		public override string ToString ()
+//		{
+//			return string.Format ("[ReferenceFinderCodon: SupportedMimeTypes={0}]", SupportedMimeTypes);
 //		}
-	}
-	
-	[ExtensionNode (Description="A reference finder. The specified class needs to inherit from MonoDevelop.Projects.CodeGeneration.ReferenceFinder")]
-	internal class ReferenceFinderCodon : TypeExtensionNode
-	{
-		[NodeAttribute("supportedmimetypes", "Mime types supported by this binding (to be shown in the Open File dialog)")]
-		string[] supportedMimetypes;
-		
-		public string[] SupportedMimeTypes {
-			get {
-				return supportedMimetypes;
-			}
-			set {
-				supportedMimetypes = value;
-			}
-		}
-		
-		public ReferenceFinder CreateFinder ()
-		{
-			return (ReferenceFinder)CreateInstance ();
-		}
-		
-		public override string ToString ()
-		{
-			return string.Format ("[ReferenceFinderCodon: SupportedMimeTypes={0}]", SupportedMimeTypes);
-		}
-	}
-}
+//	}
+//}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs
index 68f55a9f4f..2ddc9dd417 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs
@@ -44,6 +44,10 @@ namespace MonoDevelop.Ide.FindInFiles
 			set;
 		}
 
+		public virtual PathMode PathMode {
+			get { return PathMode.Absolute; }
+		}
+
 		public abstract int GetTotalWork (FilterOptions filterOptions);
 		public abstract IEnumerable<FileProvider> GetFiles (ProgressMonitor monitor, FilterOptions filterOptions);
 		public abstract string GetDescription (FilterOptions filterOptions, string pattern, string replacePattern);
@@ -51,6 +55,10 @@ namespace MonoDevelop.Ide.FindInFiles
 
 	public class DocumentScope : Scope
 	{
+		public override PathMode PathMode {
+			get { return PathMode.Hidden; }
+		}
+
 		public override int GetTotalWork (FilterOptions filterOptions)
 		{
 			return 1;
@@ -73,6 +81,10 @@ namespace MonoDevelop.Ide.FindInFiles
 
 	public class SelectionScope : Scope
 	{
+		public override PathMode PathMode {
+			get { return PathMode.Hidden; }
+		}
+
 		public override int GetTotalWork (FilterOptions filterOptions)
 		{
 			return 1;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchCollector.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchCollector.cs
index e33d6099f4..053d55449f 100755
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchCollector.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchCollector.cs
@@ -1,272 +1,272 @@
-// 
-// SearchCollector.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.Ide.FindInFiles
-{
-	public class SearchCollector
-	{
-		
-		public class FileList
-		{
-			public Project Project
-			{
-				get;
-				private set;
-			}
-
-			public IProjectContent Content
-			{
-				get;
-				private set;
-			}
-
-			public IEnumerable<FilePath> Files
-			{
-				get;
-				private set;
-			}
-
-			public FileList (Project project, IProjectContent content, IEnumerable<FilePath> files)
-			{
-				Project = project;
-				Content = content;
-				Files = files;
-			}
-		}
-
-		public static IEnumerable<Project> CollectProjects (Solution solution, IEnumerable<object> entities)
-		{
-			return new SearchCollector (solution, null, entities).CollectProjects ();
-		}
-
-		public static IEnumerable<FileList> CollectFiles (Project project, IEnumerable<object> entities)
-		{
-			return new SearchCollector (project.ParentSolution, project, entities).CollectFiles ();
-		}
-
-		public static IEnumerable<FileList> CollectFiles (Solution solution, IEnumerable<object> entities)
-		{
-			return new SearchCollector (solution, null, entities).CollectFiles ();
-		}
-		
-		static IEnumerable<Project> GetAllReferencingProjects (Solution solution, string assemblyName)
-		{
-			return solution.GetAllProjects ().Where (
-				project => TypeSystemService.GetCompilation (project).Assemblies.Any (a => a.AssemblyName == assemblyName));
-		}
-
-		static FileList CollectDeclaringFiles (IEntity entity, IEnumerable<string> fileNames)
-		{
-			var project = TypeSystemService.GetProject (entity);
-			var paths = fileNames.Distinct().Select (p => (FilePath)p);
- 			return new SearchCollector.FileList (project, TypeSystemService.GetProjectContext (project), paths);
-		}
-		
-		public static FileList CollectDeclaringFiles (IEntity entity)
-		{
-			if (entity is ITypeDefinition)
-				return CollectDeclaringFiles (entity, (entity as ITypeDefinition).Parts.Select (p => p.Region.FileName));
-			if (entity is IMethod)
-				return CollectDeclaringFiles (entity, (entity as IMethod).Parts.Select (p => p.Region.FileName));
-			return CollectDeclaringFiles (entity, new [] { entity.Region.FileName });
-		}
-		
-		Project searchProject;
-		bool searchProjectAdded; // if the searchProject is added, we can stop collecting
-		Solution solution;
-		IEnumerable<object> entities;
-		bool projectOnly; // only collect projects
-		
-		IDictionary<Project, ISet<string>> collectedFiles = new Dictionary<Project, ISet<string>> ();
-		ISet<Project> collectedProjects = new HashSet<Project> ();
-		
-		ISet<string> searchedAssemblies = new HashSet<string> ();
-		ISet<Project> searchedProjects = new HashSet<Project> ();
-
-		/// <param name="searchProject">the project to search. use to null to search the whole solution</param>
-		SearchCollector (Solution solution, Project searchProject, IEnumerable<object> entities)
-		{
-			this.solution = solution;
-			this.searchProject = searchProject;
-			this.entities = entities;
-		}
-
-		IEnumerable<Project> CollectProjects ()
-		{
-			projectOnly = true;
-			foreach (var o in entities) {
-				var entity = o as IEntity;
-				if (entity != null) {
-					Collect (TypeSystemService.GetProject (entity), entity);
-					continue;
-				}
-				var par = o as IParameter;
-				if (par != null) {
-					Collect (TypeSystemService.GetProject (par.Owner), par.Owner);
-					continue;
-				}
-			}
-			return collectedProjects;
-		}
-
-		IEnumerable<FileList> CollectFiles ()
-		{
-			projectOnly = false;
-			foreach (var o in entities) {
-				if (o is INamespace) {
-					Collect (null, null);
-					continue;
-				}
-
-				var par = o as IParameter;
-				if (par != null) {
-					if (par.Owner != null) {
-						Collect (TypeSystemService.GetProject (par.Owner), par.Owner);
-					} else {
-						Collect (IdeApp.Workbench.ActiveDocument.Project, null);
-					}
-				} else {
-					var entity = o as IEntity;
-					if (entity == null)
-						continue;
-					Collect (TypeSystemService.GetProject (entity), entity);
-				}
-
-				if (searchProjectAdded) break;
-			}
-			foreach (var project in collectedProjects)
-				yield return new FileList (project, TypeSystemService.GetProjectContext (project), project.Files.Where (f => f.BuildAction == BuildAction.Compile).Select (f => f.FilePath));
-			
-			foreach (var files in collectedFiles)
-				yield return new FileList (files.Key, TypeSystemService.GetProjectContext (files.Key), files.Value.Select (f => (FilePath)f));
-		}
-
-		void AddProject (Project project)
-		{
-			if (project == null)
-				throw new ArgumentNullException ("project");
-
-			searchProjectAdded = (project == searchProject);
-
-			// remove duplicate files
-			if (collectedProjects.Add (project)) 
-				collectedFiles.Remove (project);
-		}
-
-		void AddFiles (Project project, IEnumerable<string> files)
-		{
-			if (project == null)
-				throw new ArgumentNullException ("project");
-
-			if (collectedProjects.Contains (project))
-				return;
-
-			ISet<string> fileSet;
-			if (!collectedFiles.TryGetValue (project, out fileSet)) {
-				fileSet = new HashSet<string> ();
-				collectedFiles[project] = fileSet;
-			}
-
-			foreach (var file in files)
-				fileSet.Add (file);
-		}
-
-		void Collect (Project sourceProject, IEntity entity, bool searchInProject = false)
-		{
-			if (searchedProjects.Contains(sourceProject))
-				return;
-			
-			if (searchProject != null && sourceProject != searchProject) {
-				// searching for a entity not defined in the project
-				AddProject (searchProject);
-				return;
-			}
-			
-			if (sourceProject == null) {
-				if (entity == null) {
-					foreach (var project in solution.GetAllProjects ())
-						AddProject (project);
-					return;
-				}
-				// entity is defined in a referenced assembly
-				var assemblyName = entity.ParentAssembly.AssemblyName;
-				if (!searchedAssemblies.Add (assemblyName)) 
-					return;
-				foreach (var project in GetAllReferencingProjects (solution, assemblyName))
-					AddProject (project);
-
-				return;
-			}
-
-			if (entity == null) {
-				AddProject (sourceProject);
-				return;
-			}
-
-			var declaringType = entity.DeclaringTypeDefinition;
-			// TODO: possible optimization for protected
-			switch (entity.Accessibility) {
-			case Accessibility.Public:
-			case Accessibility.Protected:
-			case Accessibility.ProtectedOrInternal:
-			case Accessibility.Internal:
-			case Accessibility.ProtectedAndInternal:
-
-				if (declaringType != null)
-					Collect (sourceProject, entity.DeclaringTypeDefinition, searchInProject);
-				else if (searchProject != null || searchInProject)
-					AddProject (sourceProject);
-				else {
-					foreach (var project in ReferenceFinder.GetAllReferencingProjects (solution, sourceProject)) {
-						if (entity.Accessibility == Accessibility.Internal || entity.Accessibility == Accessibility.ProtectedAndInternal) {
-							var wrapper = TypeSystemService.GetProjectContentWrapper (project);
-							if (wrapper == null)
-								continue;
-							if (!entity.ParentAssembly.InternalsVisibleTo (wrapper.Compilation.MainAssembly))
-								continue;
-						}
-						AddProject (project);
-					}
-				}
-				break;
-			default: // private
-				if (projectOnly)
-					AddProject (sourceProject);
-				else if (declaringType != null)
-					AddFiles (sourceProject, declaringType.Parts.Select (p => p.Region.FileName));
-				break;
-			}
-		}
-	}
-}
-
+//// 
+//// SearchCollector.cs
+////  
+//// Author:
+////       Mansheng Yang <lightyang0@gmail.com>
+//// 
+//// Copyright (c) 2012 Mansheng Yang
+//// 
+//// Permission is hereby granted, free of charge, to any person obtaining a copy
+//// of this software and associated documentation files (the "Software"), to deal
+//// in the Software without restriction, including without limitation the rights
+//// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//// copies of the Software, and to permit persons to whom the Software is
+//// furnished to do so, subject to the following conditions:
+//// 
+//// The above copyright notice and this permission notice shall be included in
+//// all copies or substantial portions of the Software.
+//// 
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//// THE SOFTWARE.
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using ICSharpCode.NRefactory.TypeSystem;
+//using MonoDevelop.Core;
+//using MonoDevelop.Projects;
+//using MonoDevelop.Ide.TypeSystem;
+//
+//namespace MonoDevelop.Ide.FindInFiles
+//{
+//	public class SearchCollector
+//	{
+//		
+//		public class FileList
+//		{
+//			public Project Project
+//			{
+//				get;
+//				private set;
+//			}
+//
+//			public IProjectContent Content
+//			{
+//				get;
+//				private set;
+//			}
+//
+//			public IEnumerable<FilePath> Files
+//			{
+//				get;
+//				private set;
+//			}
+//
+//			public FileList (Project project, IProjectContent content, IEnumerable<FilePath> files)
+//			{
+//				Project = project;
+//				Content = content;
+//				Files = files;
+//			}
+//		}
+//
+//		public static IEnumerable<Project> CollectProjects (Solution solution, IEnumerable<object> entities)
+//		{
+//			return new SearchCollector (solution, null, entities).CollectProjects ();
+//		}
+//
+//		public static IEnumerable<FileList> CollectFiles (Project project, IEnumerable<object> entities)
+//		{
+//			return new SearchCollector (project.ParentSolution, project, entities).CollectFiles ();
+//		}
+//
+//		public static IEnumerable<FileList> CollectFiles (Solution solution, IEnumerable<object> entities)
+//		{
+//			return new SearchCollector (solution, null, entities).CollectFiles ();
+//		}
+//		
+//		static IEnumerable<Project> GetAllReferencingProjects (Solution solution, string assemblyName)
+//		{
+//			return solution.GetAllProjects ().Where (
+//				project => TypeSystemService.GetCompilation (project).Assemblies.Any (a => a.AssemblyName == assemblyName));
+//		}
+//
+//		static FileList CollectDeclaringFiles (IEntity entity, IEnumerable<string> fileNames)
+//		{
+//			var project = TypeSystemService.GetProject (entity);
+//			var paths = fileNames.Distinct().Select (p => (FilePath)p);
+// 			return new SearchCollector.FileList (project, TypeSystemService.GetProjectContext (project), paths);
+//		}
+//		
+//		public static FileList CollectDeclaringFiles (IEntity entity)
+//		{
+//			if (entity is ITypeDefinition)
+//				return CollectDeclaringFiles (entity, (entity as ITypeDefinition).Parts.Select (p => p.Region.FileName));
+//			if (entity is IMethod)
+//				return CollectDeclaringFiles (entity, (entity as IMethod).Parts.Select (p => p.Region.FileName));
+//			return CollectDeclaringFiles (entity, new [] { entity.Region.FileName });
+//		}
+//		
+//		Project searchProject;
+//		bool searchProjectAdded; // if the searchProject is added, we can stop collecting
+//		Solution solution;
+//		IEnumerable<object> entities;
+//		bool projectOnly; // only collect projects
+//		
+//		IDictionary<Project, ISet<string>> collectedFiles = new Dictionary<Project, ISet<string>> ();
+//		ISet<Project> collectedProjects = new HashSet<Project> ();
+//		
+//		ISet<string> searchedAssemblies = new HashSet<string> ();
+//		ISet<Project> searchedProjects = new HashSet<Project> ();
+//
+//		/// <param name="searchProject">the project to search. use to null to search the whole solution</param>
+//		SearchCollector (Solution solution, Project searchProject, IEnumerable<object> entities)
+//		{
+//			this.solution = solution;
+//			this.searchProject = searchProject;
+//			this.entities = entities;
+//		}
+//
+//		IEnumerable<Project> CollectProjects ()
+//		{
+//			projectOnly = true;
+//			foreach (var o in entities) {
+//				var entity = o as IEntity;
+//				if (entity != null) {
+//					Collect (TypeSystemService.GetProject (entity), entity);
+//					continue;
+//				}
+//				var par = o as IParameter;
+//				if (par != null) {
+//					Collect (TypeSystemService.GetProject (par.Owner), par.Owner);
+//					continue;
+//				}
+//			}
+//			return collectedProjects;
+//		}
+//
+//		IEnumerable<FileList> CollectFiles ()
+//		{
+//			projectOnly = false;
+//			foreach (var o in entities) {
+//				if (o is INamespace) {
+//					Collect (null, null);
+//					continue;
+//				}
+//
+//				var par = o as IParameter;
+//				if (par != null) {
+//					if (par.Owner != null) {
+//						Collect (TypeSystemService.GetProject (par.Owner), par.Owner);
+//					} else {
+//						Collect (IdeApp.Workbench.ActiveDocument.Project, null);
+//					}
+//				} else {
+//					var entity = o as IEntity;
+//					if (entity == null)
+//						continue;
+//					Collect (TypeSystemService.GetProject (entity), entity);
+//				}
+//
+//				if (searchProjectAdded) break;
+//			}
+//			foreach (var project in collectedProjects)
+//				yield return new FileList (project, TypeSystemService.GetProjectContext (project), project.Files.Where (f => f.BuildAction == BuildAction.Compile).Select (f => f.FilePath));
+//			
+//			foreach (var files in collectedFiles)
+//				yield return new FileList (files.Key, TypeSystemService.GetProjectContext (files.Key), files.Value.Select (f => (FilePath)f));
+//		}
+//
+//		void AddProject (Project project)
+//		{
+//			if (project == null)
+//				throw new ArgumentNullException ("project");
+//
+//			searchProjectAdded = (project == searchProject);
+//
+//			// remove duplicate files
+//			if (collectedProjects.Add (project)) 
+//				collectedFiles.Remove (project);
+//		}
+//
+//		void AddFiles (Project project, IEnumerable<string> files)
+//		{
+//			if (project == null)
+//				throw new ArgumentNullException ("project");
+//
+//			if (collectedProjects.Contains (project))
+//				return;
+//
+//			ISet<string> fileSet;
+//			if (!collectedFiles.TryGetValue (project, out fileSet)) {
+//				fileSet = new HashSet<string> ();
+//				collectedFiles[project] = fileSet;
+//			}
+//
+//			foreach (var file in files)
+//				fileSet.Add (file);
+//		}
+//
+//		void Collect (Project sourceProject, IEntity entity, bool searchInProject = false)
+//		{
+//			if (searchedProjects.Contains(sourceProject))
+//				return;
+//			
+//			if (searchProject != null && sourceProject != searchProject) {
+//				// searching for a entity not defined in the project
+//				AddProject (searchProject);
+//				return;
+//			}
+//			
+//			if (sourceProject == null) {
+//				if (entity == null) {
+//					foreach (var project in solution.GetAllProjects ())
+//						AddProject (project);
+//					return;
+//				}
+//				// entity is defined in a referenced assembly
+//				var assemblyName = entity.ParentAssembly.AssemblyName;
+//				if (!searchedAssemblies.Add (assemblyName)) 
+//					return;
+//				foreach (var project in GetAllReferencingProjects (solution, assemblyName))
+//					AddProject (project);
+//
+//				return;
+//			}
+//
+//			if (entity == null) {
+//				AddProject (sourceProject);
+//				return;
+//			}
+//
+//			var declaringType = entity.DeclaringTypeDefinition;
+//			// TODO: possible optimization for protected
+//			switch (entity.Accessibility) {
+//			case Accessibility.Public:
+//			case Accessibility.Protected:
+//			case Accessibility.ProtectedOrInternal:
+//			case Accessibility.Internal:
+//			case Accessibility.ProtectedAndInternal:
+//
+//				if (declaringType != null)
+//					Collect (sourceProject, entity.DeclaringTypeDefinition, searchInProject);
+//				else if (searchProject != null || searchInProject)
+//					AddProject (sourceProject);
+//				else {
+//					foreach (var project in ReferenceFinder.GetAllReferencingProjects (solution, sourceProject)) {
+//						if (entity.Accessibility == Accessibility.Internal || entity.Accessibility == Accessibility.ProtectedAndInternal) {
+//							var wrapper = TypeSystemService.GetProjectContentWrapper (project);
+//							if (wrapper == null)
+//								continue;
+//							if (!entity.ParentAssembly.InternalsVisibleTo (wrapper.Compilation.MainAssembly))
+//								continue;
+//						}
+//						AddProject (project);
+//					}
+//				}
+//				break;
+//			default: // private
+//				if (projectOnly)
+//					AddProject (sourceProject);
+//				else if (declaringType != null)
+//					AddFiles (sourceProject, declaringType.Parts.Select (p => p.Region.FileName));
+//				break;
+//			}
+//		}
+//	}
+//}
+//
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs
index 69abc8f88f..aeed4d6e8d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs
@@ -52,7 +52,11 @@ namespace MonoDevelop.Ide.FindInFiles
 		{
 			outputPad.BasePath = path;
 		}
-		
+
+		public PathMode PathMode {
+			set { outputPad.PathMode = value; }
+		}
+
 		public void ReportResult (SearchResult result)
 		{
 			DispatchService.GuiDispatch (delegate {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs
index 0c70cd1b08..651aed9054 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs
@@ -26,19 +26,21 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using Mono.TextEditor.Highlighting;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
+using System.Collections.Generic;
 using MonoDevelop.Projects;
 using System.Collections.Generic;
-using System;

-

+using System;
+
 namespace MonoDevelop.Ide.FindInFiles
 {
 	public class SearchResult
 	{
 		public virtual FileProvider FileProvider { get; private set; }
 		
-		public int Offset { get; set; }

-		public int Length { get; set; }

+		public int Offset { get; set; }
+		public int Length { get; set; }
 
 		public virtual string FileName {
 			get {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultPad.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultPad.cs
index 0a9fe845e0..ad0acbb87e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultPad.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultPad.cs
@@ -82,6 +82,12 @@ namespace MonoDevelop.Ide.FindInFiles
 				widget.BasePath = value;
 			}
 		}
+
+		internal PathMode PathMode {
+			set {
+				widget.PathMode = value;
+			}
+		}
 		
 		public SearchResultPad (int instanceNum)
 		{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
index d485a97a06..3a7b9b932f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
@@ -30,9 +30,7 @@ using System.Linq;
 using Gdk;
 
 using Gtk;
-using Mono.TextEditor;
 
-using Mono.TextEditor.Highlighting;
 using System.Collections.Generic;
 using MonoDevelop.Core;
 using System.Text;
@@ -43,6 +41,10 @@ using MonoDevelop.Ide.Navigation;
 using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Components;
 using System.Threading;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor.Highlighting;
+
 
 namespace MonoDevelop.Ide.FindInFiles
 {
@@ -57,23 +59,30 @@ namespace MonoDevelop.Ide.FindInFiles
 		const int SearchResultColumn = 0;
 		const int DidReadColumn      = 1;
 		
-		Mono.TextEditor.Highlighting.ColorScheme highlightStyle;
+		ColorScheme highlightStyle;
 		
 		ScrolledWindow scrolledwindowLogView; 
 		PadTreeView treeviewSearchResults;
 		Label labelStatus;
 		TextView textviewLog;
-		
+		TreeViewColumn pathColumn;
+
 		public string BasePath {
 			get;
 			set;
 		}
-		
+
 		public CancellationTokenSource CancellationTokenSource {
 			get;
 			set;
 		}
-		
+
+		internal PathMode PathMode {
+			set {
+				pathColumn.Visible = (value != PathMode.Hidden);
+			}
+		}
+
 		public bool AllowReuse {
 			get { 
 				return !buttonStop.Sensitive && !buttonPin.Active; 
@@ -160,8 +169,7 @@ namespace MonoDevelop.Ide.FindInFiles
 			textColumn.Sizing = TreeViewColumnSizing.Fixed;
 			textColumn.FixedWidth = 300;
 
-			
-			TreeViewColumn pathColumn = treeviewSearchResults.AppendColumn (GettextCatalog.GetString ("Path"),
+			pathColumn = treeviewSearchResults.AppendColumn (GettextCatalog.GetString ("Path"),
 				                            renderer, ResultPathDataFunc);
 			pathColumn.SortColumnId = 3;
 			pathColumn.Resizable = true;
@@ -281,7 +289,10 @@ namespace MonoDevelop.Ide.FindInFiles
 				treeviewSearchResults.ScrollToPoint (0, 0);
 
 			ResultCount = 0;
-			documents = new Dictionary<string, TextDocument> ();
+			foreach (var doc in documents) {
+				doc.Value.Dispose ();
+			}
+			documents = new Dictionary<string, TextEditor> ();
 			store.Clear ();
 			labelStatus.Text = "";
 			textviewLog.Buffer.Clear ();
@@ -295,13 +306,13 @@ namespace MonoDevelop.Ide.FindInFiles
 
 		static Color AdjustColor (Color baseColor, Color color)
 		{
-			double b1 = Mono.TextEditor.HslColor.Brightness (color);
-			double b2 = Mono.TextEditor.HslColor.Brightness (baseColor);
+			double b1 = HslColor.Brightness (color);
+			double b2 = HslColor.Brightness (baseColor);
 			double delta = Math.Abs (b1 - b2);
 			if (delta < 0.1) {
-				Mono.TextEditor.HslColor color1 = color;
+				HslColor color1 = color;
 				color1.L -= 0.5;
-				if (Math.Abs (Mono.TextEditor.HslColor.Brightness (color1) - b2) < delta) {
+				if (Math.Abs (HslColor.Brightness (color1) - b2) < delta) {
 					color1 = color;
 					color1.L += 0.5;
 				}
@@ -335,7 +346,7 @@ namespace MonoDevelop.Ide.FindInFiles
 				Color color = Color.Zero;
 
 				if (Color.Parse(colorStr, ref color))
-					colorStr = SyntaxMode.ColorToPangoMarkup(AdjustColor(baseColor, color));
+					colorStr = ColorToPangoMarkup(AdjustColor(baseColor, color));
 
 				result.Append (colorStr);
 				idx = markup.IndexOf ("foreground=\"", idx, StringComparison.Ordinal);
@@ -343,8 +354,11 @@ namespace MonoDevelop.Ide.FindInFiles
 			result.Append (markup.Substring (offset, markup.Length - offset));
 			return result.ToString ();
 		}
-		
-		void DoPopupMenu (EventButton evt)
+		public static string ColorToPangoMarkup (Gdk.Color color)
+		{
+			return string.Format ("#{0:X2}{1:X2}{2:X2}", color.Red >> 8, color.Green >> 8, color.Blue >> 8);
+		}
+		void DoPopupMenu (Gdk.EventButton evt)
 		{ 
 			IdeApp.CommandService.ShowContextMenu (this.treeviewSearchResults, evt, new CommandEntrySet {
 				new CommandEntry (ViewCommands.Open),
@@ -493,6 +507,12 @@ namespace MonoDevelop.Ide.FindInFiles
 			pathRenderer.Markup = projectNameMarkup;
 		}
 
+		static int TranslateIndexToUTF8 (string text, int index)
+		{
+			byte[] bytes = Encoding.UTF8.GetBytes (text);
+			return Encoding.UTF8.GetString (bytes, 0, index).Length;
+		}
+
 		void ResultTextDataFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
 		{
 			if (TreeIter.Zero.Equals (iter))
@@ -516,31 +536,28 @@ namespace MonoDevelop.Ide.FindInFiles
 				if (searchResult.Markup == null) {
 					if (searchResult.LineNumber <= 0)
 						searchResult.LineNumber = doc.OffsetToLineNumber (searchResult.Offset); 
-					DocumentLine line = doc.GetLine (searchResult.LineNumber);
+					var line = doc.GetLine (searchResult.LineNumber);
 					if (line == null) {
 						textMarkup = "Invalid line number " + searchResult.LineNumber + " from offset: " + searchResult.Offset;
 						goto end;
 					}
 					int indent = line.GetIndentation (doc).Length;
-					var data = new Mono.TextEditor.TextEditorData (doc);
-					data.ColorStyle = highlightStyle;
+					var data =TextEditorFactory.CreateNewEditor (doc);
 					var lineText = doc.GetTextAt (line.Offset + indent, line.Length - indent);
 					int col = searchResult.Offset - line.Offset - indent;
 					// search result contained part of the indent.
 					if (col + searchResult.Length < lineText.Length)
 						lineText = doc.GetTextAt (line.Offset, line.Length);
 
-					var markup = doc.SyntaxMode != null ?
-					data.GetMarkup (line.Offset + indent, line.Length - indent, true, !isSelected, false) :
-					GLib.Markup.EscapeText (lineText);
-					searchResult.Markup = AdjustColors (markup.Replace ("\t", new string (' ', TextEditorOptions.DefaultOptions.TabSize)));
+					var markup = data.GetPangoMarkup (line.Offset + indent, line.Length - indent);
+					searchResult.Markup = AdjustColors (markup.Replace ("\t", new string (' ', data.Options.TabSize)));
 
 					if (col >= 0) {
 						uint start;
 						uint end;
 						try {
-							start = (uint)TextViewMargin.TranslateIndexToUTF8 (lineText, col);
-							end = (uint)TextViewMargin.TranslateIndexToUTF8 (lineText, Math.Min (lineText.Length, col + searchResult.Length));
+							start = (uint)TranslateIndexToUTF8 (lineText, col);
+							end = (uint)TranslateIndexToUTF8 (lineText, Math.Min (lineText.Length, col + searchResult.Length));
 						} catch (Exception e) {
 							LoggingService.LogError ("Exception while translating index to utf8 (column was:" + col + " search result length:" + searchResult.Length + " line text:" + lineText + ")", e);
 							return;
@@ -550,17 +567,16 @@ namespace MonoDevelop.Ide.FindInFiles
 					}
 				}
 
-
 				try {
 					textMarkup = searchResult.Markup;
 
 					if (!isSelected) {
 						var searchColor = searchResult.GetBackgroundMarkerColor (highlightStyle).Color;
-						double b1 = Mono.TextEditor.HslColor.Brightness (searchColor);
-						double b2 = Mono.TextEditor.HslColor.Brightness (AdjustColor (Style.Base (StateType.Normal), (Mono.TextEditor.HslColor)highlightStyle.PlainText.Foreground));
+						double b1 = HslColor.Brightness (searchColor);
+						double b2 = HslColor.Brightness (AdjustColor (Style.Base (StateType.Normal), (HslColor)highlightStyle.PlainText.Foreground));
 						double delta = Math.Abs (b1 - b2);
 						if (delta < 0.1) {
-							Mono.TextEditor.HslColor color1 = highlightStyle.SearchResult.Color;
+							var color1 = highlightStyle.SearchResult.Color;
 							if (color1.L + 0.5 > 1.0) {
 								color1.L -= 0.5;
 							} else {
@@ -626,18 +642,18 @@ namespace MonoDevelop.Ide.FindInFiles
 
 
 
-		Dictionary<string, TextDocument> documents = new Dictionary<string, TextDocument> ();
+		Dictionary<string, TextEditor> documents = new Dictionary<string, TextEditor> ();
 		
-		TextDocument GetDocument (SearchResult result)
+		TextEditor GetDocument (SearchResult result)
 		{
-			TextDocument doc;
+			TextEditor doc;
 			if (!documents.TryGetValue (result.FileName, out doc)) {
 				var content = result.FileProvider.ReadString ();
 				if (content == null)
 					return null;
-				doc = TextDocument.CreateImmutableDocument (content);
-				doc.MimeType = DesktopService.GetMimeTypeForUri (result.FileName);
-				
+
+				doc = TextEditorFactory.CreateNewEditor (TextEditorFactory.CreateNewReadonlyDocument (new StringTextSource (content), result.FileName, DesktopService.GetMimeTypeForUri (result.FileName)));
+
 				documents [result.FileName] = doc;	
 			}
 			return doc;
@@ -672,7 +688,7 @@ namespace MonoDevelop.Ide.FindInFiles
 		{
 			var result = store.GetValue (iter, SearchResultColumn) as SearchResult;
 			if (result != null) {
-				DocumentLocation loc = GetLocation (result);
+				var loc = GetLocation (result);
 				store.SetValue (iter, DidReadColumn, true);
 				IdeApp.Workbench.OpenDocument (result.FileName, loc.Line, loc.Column);
 			}
@@ -684,7 +700,7 @@ namespace MonoDevelop.Ide.FindInFiles
 			if (doc == null)
 				return DocumentLocation.Empty;
 			int lineNr = doc.OffsetToLineNumber (searchResult.Offset);
-			DocumentLine line = doc.GetLine (lineNr);
+			var line = doc.GetLine (lineNr);
 			if (line == null)
 				return DocumentLocation.Empty;
 			return new DocumentLocation (lineNr, searchResult.Offset - line.Offset + 1);
@@ -717,11 +733,11 @@ namespace MonoDevelop.Ide.FindInFiles
 				var result = store.GetValue (iter, SearchResultColumn) as SearchResult;
 				if (result == null)
 					continue;
-				DocumentLocation loc = GetLocation (result);
+				var loc = GetLocation (result);
 				var doc = GetDocument (result);
 				if (doc == null)
 					continue;
-				DocumentLine line = doc.GetLine (loc.Line);
+				var line = doc.GetLine (loc.Line);
 				
 				sb.AppendFormat ("{0} ({1}, {2}):{3}", result.FileName, loc.Line, loc.Column, doc.GetTextAt (line.Offset, line.Length));
 				sb.AppendLine ();
@@ -789,7 +805,7 @@ namespace MonoDevelop.Ide.FindInFiles
 			var doc = GetDocument (searchResult);
 			if (doc == null)
 				return null;
-			DocumentLocation location = doc.OffsetToLocation (searchResult.Offset);
+			var location = doc.OffsetToLocation (searchResult.Offset);
 			return new SearchTextFileNavigationPoint (searchResult.FileName, location.Line, location.Column);
 		}
 		
@@ -805,11 +821,11 @@ namespace MonoDevelop.Ide.FindInFiles
 				if (doc == null)
 					return null;
 				
-				var buf = doc.GetContent<IEditableTextBuffer> ();
+				var buf = doc.Editor;
 				if (buf != null) {
 					doc.DisableAutoScroll ();
 					buf.RunWhenLoaded (() => {
-						buf.SetCaretTo (Math.Max (Line, 1), Math.Max (Column, 1));
+						buf.SetCaretLocation (Math.Max (Line, 1), Math.Max (Column, 1));
 					});
 				}
 				
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
index 6d767b6f30..8ac94124be 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
@@ -30,15 +30,8 @@
 //#define TREE_VERIFY_INTEGRITY
 
 using System;
-using System.IO;
-using System.ComponentModel;
-using System.Drawing;
-using System.Diagnostics;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Xml;
-using System.Resources;
 using System.Text;
 
 using Mono.Addins;
@@ -48,7 +41,6 @@ using MonoDevelop.Ide.Commands;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Gui.Pads;
 using MonoDevelop.Projects.Extensions;
-using Mono.TextEditor;
 using System.Linq;
 using MonoDevelop.Ide.Tasks;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/PadTreeView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/PadTreeView.cs
index fed5414ad4..42da610592 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/PadTreeView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/PadTreeView.cs
@@ -26,7 +26,6 @@
 
 using System;
 using Gtk;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Ide.Gui.Components
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/DocumentStateTracker.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/DocumentStateTracker.cs
index 45303e9457..b254fac993 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/DocumentStateTracker.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/DocumentStateTracker.cs
@@ -30,7 +30,8 @@
 
 using System;
 using System.Collections.Generic;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Ide.Gui.Content
 {
@@ -40,25 +41,25 @@ namespace MonoDevelop.Ide.Gui.Content
 		T currentEngine;
 		Stack<T> cachedEngines = new Stack<T> ();
 		
-		TextEditorData editor;
+		TextEditor editor;
 		
-		public DocumentStateTracker (T engine, TextEditorData editor)
+		public DocumentStateTracker (T engine, TextEditor editor)
 		{
 			this.currentEngine = engine;
 			this.editor = editor;
-			editor.Document.TextReplaced += textChanged;
+			editor.TextChanged += textChanged;
 		}
 		
 		public void Dispose ()
 		{
-			editor.Document.TextReplaced -= textChanged;
+			editor.TextChanged -= textChanged;
 		}
 		
 		public T Engine {
 			get { return currentEngine; }
 		}
 		
-		void textChanged (object sender, DocumentChangeEventArgs args)
+		void textChanged (object sender, TextChangeEventArgs args)
 		{
 			if (args.Offset< currentEngine.Position)
 				ResetEngineToPosition (args.Offset);
@@ -85,7 +86,7 @@ namespace MonoDevelop.Ide.Gui.Content
 		}
 		public void UpdateEngine ()
 		{
-			UpdateEngine (editor.Caret.Offset);
+			UpdateEngine (editor.CaretOffset);
 		}
 		
 		//Makes sure that the smart indent engine's cursor has caught up with the 
@@ -112,7 +113,7 @@ namespace MonoDevelop.Ide.Gui.Content
 			// get the engine caught up
 			int nextSave = (cachedEngines.Count == 0)? BUFFER_SIZE : cachedEngines.Peek ().Position + BUFFER_SIZE;
 			if (currentEngine.Position + 1 == position) {
-				char ch = editor.Document.GetCharAt (currentEngine.Position);
+				char ch = editor.GetCharAt (currentEngine.Position);
 				currentEngine.Push (ch);
 				ConsoleWrite ("pushing character '{0}'", ch);
 				if (currentEngine.Position == nextSave)
@@ -124,7 +125,7 @@ namespace MonoDevelop.Ide.Gui.Content
 					int endCut = currentEngine.Position + BUFFER_SIZE;
 					if (endCut > position)
 						endCut = position;
-					string buffer = editor.Document.GetTextBetween (currentEngine.Position, endCut);
+					string buffer = editor.GetTextBetween (currentEngine.Position, endCut);
 					ConsoleWrite ("getting buffer between {0} and {1}" /* '{2}'"*/, currentEngine.Position, endCut - 1, buffer);
 					foreach (char ch in buffer) {
 						currentEngine.Push (ch);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IEncodedTextContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IEncodedTextContent.cs
deleted file mode 100644
index 53f2e681e5..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IEncodedTextContent.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// IEncodedTextContent.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-
-namespace MonoDevelop.Ide.Gui.Content
-{
-	public interface IEncodedTextContent
-	{
-		void Load (string fileName, Encoding encoding);
-		void Save (string fileName, Encoding encoding);
-		
-		Encoding SourceEncoding { get; }		
-	}
-}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IFoldable.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IFoldable.cs
index 2e163bc941..2775cfd06e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IFoldable.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IFoldable.cs
@@ -30,7 +30,7 @@ using System;
 
 namespace MonoDevelop.Ide.Gui.Content
 {
-	public interface IFoldable
+	interface IFoldable
 	{
 		void ToggleAllFoldings ();
 		void FoldDefinitions ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IOpenNamedElementHandler.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IOpenNamedElementHandler.cs
index 306e4b4fab..e7b6c33768 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IOpenNamedElementHandler.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IOpenNamedElementHandler.cs
@@ -30,8 +30,9 @@ using System;
 
 namespace MonoDevelop.Ide.Gui.Content
 {
-	public interface IOpenNamedElementHandler
+	interface IOpenNamedElementHandler
 	{
-		void Open (ICSharpCode.NRefactory.TypeSystem.INamedElement element);
+		void Open (Microsoft.CodeAnalysis.ISymbol element);
+		void Open (string documentationCommentId);
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ISmartIndenter.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ISmartIndenter.cs
deleted file mode 100644
index dfeb37a083..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ISmartIndenter.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// 
-// ISmartIndenter.cs
-// 
-// Author:
-//   Michael Hutchinson <mhutchinson@novell.com>
-// 
-// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace MonoDevelop.Ide.Gui.Content
-{
-	
-	public interface ISmartIndenter
-	{
-		Indent GetIndent (int line);
-		Indent GetAutoTriggeredReindent (int insertionOffset, int length);
-	}
-	
-	public struct Indent
-	{
-		int depth, alignment;
-		bool isRelative;
-		
-		public Indent (int depth, int alignment)
-			: this (depth, alignment, false)
-		{
-		}
-		
-		public Indent (int depth, int alignment, bool isRelative)
-		{
-			this.depth = depth;
-			this.alignment = alignment;
-			this.isRelative = isRelative;
-		}
-		
-		public int Depth { get { return depth; } }
-		public int Alignment { get { return alignment; } }
-		public bool IsRelativeToPreviousLine { get { return isRelative; } }
-		
-		public bool IsZero { get { return Depth == 0 && Alignment == 0; } }
-	}
-}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextBuffer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextBuffer.cs
deleted file mode 100644
index 02c2834d25..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextBuffer.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// ITextBuffer.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using MonoDevelop.Projects.Text;
-
-namespace MonoDevelop.Ide.Gui.Content
-{
-	public interface ITextBuffer: ITextFile
-	{
-		//FIXME: this should be a method, it's relatively expensive
-		string SelectedText { get; set; }
-		
-		int CursorPosition { get; set; }
-
-		int SelectionStartPosition { get; }
-		int SelectionEndPosition { get; }
-		
-		void Select (int startPosition, int endPosition);
-		void ShowPosition (int position);
-	}
-}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextEditorResolver.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextEditorResolver.cs
index 5c1006a192..6d6ec4ab16 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextEditorResolver.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextEditorResolver.cs
@@ -26,39 +26,26 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using Mono.TextEditor;
 using Mono.Addins;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.Gui.Content
 {
 	public interface ITextEditorResolver
 	{
-		ResolveResult GetLanguageItem (int offset);
-		ResolveResult GetLanguageItem (int offset, string expression);
+		ISymbol GetLanguageItem (int offset);
+		ISymbol GetLanguageItem (int offset, string expression);
 	}
 	
 	public interface ITextEditorResolverProvider
 	{
-		ResolveResult GetLanguageItem (MonoDevelop.Ide.Gui.Document document, int offset, out DomRegion expressionRegion);
-		ResolveResult GetLanguageItem (MonoDevelop.Ide.Gui.Document document, int offset, string identifier);
-
-		string CreateTooltip (MonoDevelop.Ide.Gui.Document document, int offset, ResolveResult result, string errorInformations, Gdk.ModifierType modifierState);
-
-	}
-	
-	public interface ITextEditorMemberPositionProvider
-	{
-		IUnresolvedTypeDefinition GetTypeAt (int offset);
-		IUnresolvedMember GetMemberAt (int offset);
+		ISymbol GetLanguageItem (Document document, int offset, out DocumentRegion expressionRegion);
+		ISymbol GetLanguageItem (Document document, int offset, string identifier);
 	}
-	
-	
+
 	public static class TextEditorResolverService
 	{
 		static List<TextEditorResolverProviderCodon> providers = new List<TextEditorResolverProviderCodon> ();
@@ -85,16 +72,16 @@ namespace MonoDevelop.Ide.Gui.Content
 			return codon.CreateResolver ();
 		}
 
-		public static ResolveResult GetLanguageItem (this MonoDevelop.Ide.Gui.Document document, int offset, out DomRegion expressionRegion)
-		{

-			if (document == null)

+		public static ISymbol GetLanguageItem (this Document document, int offset, out DocumentRegion expressionRegion)
+		{
+			if (document == null)
 				throw new System.ArgumentNullException ("document");
 
-			var textEditorResolver = TextEditorResolverService.GetProvider (document.Editor.Document.MimeType);
+			var textEditorResolver = TextEditorResolverService.GetProvider (document.Editor.MimeType);
 			if (textEditorResolver != null) {
 				return textEditorResolver.GetLanguageItem (document, offset, out expressionRegion);
 			}
-			expressionRegion = DomRegion.Empty;
+			expressionRegion = DocumentRegion.Empty;
 			return null;
 		}
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/TextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/TextEditorExtension.cs
deleted file mode 100644
index 276c61db99..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/TextEditorExtension.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-// TextEditorExtension.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (c) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-
-using System;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Commands;

-using MonoDevelop.Core;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.Ide.Gui.Content
-{
-	public class TextEditorExtension : ITextEditorExtension, ICommandRouter
-	{
-		internal protected Document document;
-		
-		public void Initialize (Document document)
-		{
-			if (this.document != null)
-				throw new InvalidOperationException ("Extension is already initialized.");
-			this.document = document;
-			Initialize ();
-		}
-		
-		public ITextEditorExtension Next {
-			get;
-			set;
-		}
-		
-		protected Document Document {
-			get { return document; }
-		}
-
-		protected TextEditorData Editor {
-			get { return document != null ? document.Editor : null; }
-		}
-
-		protected FilePath FileName {
-			get {
-				IViewContent view = document.Window.ViewContent;
-				return view.IsUntitled ? view.UntitledName : view.ContentName;
-			}
-		}
-		
-		protected IProjectContent GetParserContext ()
-		{
-			CheckInitialized ();
-			
-			IViewContent view = document.Window.ViewContent;
-			string file = view.IsUntitled ? view.UntitledName : view.ContentName;
-			Project project = view.Project;
-			
-			if (project != null)
-				return TypeSystemService.GetProjectContext (project);
-			return TypeSystemService.GetContext (file, Document.Editor.Document.MimeType, Document.Editor.Text);
-		}
-		
-		protected Ambience GetAmbience ()
-		{
-			CheckInitialized ();
-			
-			IViewContent view = document.Window.ViewContent;
-			string file = view.IsUntitled ? view.UntitledName : view.ContentName;
-			return AmbienceService.GetAmbienceForFile (file);
-		}
-		
-		public virtual bool ExtendsEditor (Document doc, IEditableTextBuffer editor)
-		{
-			return true;
-		}
-		
-		// When a key is pressed, and before the key is processed by the editor, this method will be invoked.
-		// Return true if the key press should be processed by the editor.
-		public virtual bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
-		{
-			CheckInitialized ();
-			
-			if (Next == null)
-				return true;
-			else
-				return Next.KeyPress (key, keyChar, modifier);
-		}
-		
-		public virtual void CursorPositionChanged ()
-		{
-			CheckInitialized ();
-			
-			if (Next != null)
-				Next.CursorPositionChanged ();
-		}
-		
-		public virtual void TextChanged (int startIndex, int endIndex)
-		{
-			if (Next != null)
-				Next.TextChanged (startIndex, endIndex);
-		}
-		
-		public virtual void Initialize ()
-		{
-			CheckInitialized ();
-			
-			TextEditorExtension next = Next as TextEditorExtension;
-			if (next != null)
-				next.Initialize ();
-		}
-		
-		public virtual void Dispose ()
-		{
-		}
-		
-		void CheckInitialized ()
-		{
-			if (document == null)
-				throw new InvalidOperationException ("Editor extension not yet initialized");
-		}
-		
-		object ITextEditorExtension.GetExtensionCommandTarget ()
-		{
-			return this;
-		}
-		
-		object ICommandRouter.GetNextCommandTarget ()
-		{
-			if (Next != null)
-				return Next.GetExtensionCommandTarget ();
-			else
-				return null;
-		}
-	}
-	
-	public interface ITextEditorExtension : IDisposable
-	{
-		ITextEditorExtension Next {
-			get;
-		}
-		
-		bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier);
-		void CursorPositionChanged ();
-		void TextChanged (int startIndex, int endIndex);
-		
-		// Return the object that is going to process commands, or null
-		// if commands don't need custom processing
-		object GetExtensionCommandTarget ();
-	}
-	
-	class TextEditorExtensionMarker: TextEditorExtension
-	{
-		public override bool ExtendsEditor (Document doc, IEditableTextBuffer editor)
-		{
-			return false;
-		}
-	}
-}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ClassNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ClassNodeBuilder.cs
index 033a61ac81..a84c2b17c3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ClassNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ClassNodeBuilder.cs
@@ -61,9 +61,9 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 		
 		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
 		{
-			ClassData classData = dataObject as ClassData;
-			nodeInfo.Label = AmbienceService.DefaultAmbience.GetString (classData.Class.GetDefinition (), OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup);
-			nodeInfo.Icon = Context.GetIcon (classData.Class.GetStockIcon ());
+			// ClassData classData = dataObject as ClassData;
+			// nodeInfo.Label = Ambience.DefaultAmbience.GetString (classData.Class.GetDefinition (), OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup);
+			// nodeInfo.Icon = Context.GetIcon (classData.Class.GetStockIcon ());
 		}
 		/*
 		private string GetNameWithGenericParameters (IType c)
@@ -137,8 +137,8 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 	{
 		public override void ActivateItem ()
 		{
-			ClassData cls = CurrentNode.DataItem as ClassData;
-			IdeApp.ProjectOperations.JumpToDeclaration (cls.Class, true);
+//			ClassData cls = CurrentNode.DataItem as ClassData;
+//			IdeApp.ProjectOperations.JumpToDeclaration (cls.Class, true);
 		}
 	}	
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/EventNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/EventNodeBuilder.cs
index 425527694a..9f5a0a5910 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/EventNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/EventNodeBuilder.cs
@@ -49,9 +49,9 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 		
 		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
 		{
-			IEvent data = dataObject as IEvent;
-			nodeInfo.Label = Ambience.GetString (data, OutputFlags.ClassBrowserEntries  | OutputFlags.IncludeMarkup);
-			nodeInfo.Icon = Context.GetIcon (data.GetStockIcon ());
+			// IEvent data = dataObject as IEvent;
+			// nodeInfo.Label = Ambience.GetString (data, OutputFlags.ClassBrowserEntries  | OutputFlags.IncludeMarkup);
+			// nodeInfo.Icon = Context.GetIcon (data.GetStockIcon ());
 		}
 
 		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/FieldNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/FieldNodeBuilder.cs
index 21e4f8d5e5..8573d9ac85 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/FieldNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/FieldNodeBuilder.cs
@@ -49,9 +49,9 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 		
 		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
 		{
-			IField data = dataObject as IField;
-			nodeInfo.Label = Ambience.GetString (data, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup);
-			nodeInfo.Icon = Context.GetIcon (data.GetStockIcon ());
+			// IField data = dataObject as IField;
+			// nodeInfo.Label = Ambience.GetString (data, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup);
+			// nodeInfo.Icon = Context.GetIcon (data.GetStockIcon ());
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MemberNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MemberNodeBuilder.cs
index bbe1f25eff..35c0151faf 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MemberNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MemberNodeBuilder.cs
@@ -43,13 +43,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 		{
 			return ((IMember)dataObject).Name;
 		}
-		
-		protected Ambience Ambience {
-			get {
-				return AmbienceService.DefaultAmbience;
-			}
-		}
-		
+
 		public override Type CommandHandlerType {
 			get { return typeof(MemberNodeCommandHandler); }
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MemberNodeCommandHandler.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MemberNodeCommandHandler.cs
index 241ec93aec..b5a8c88505 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MemberNodeCommandHandler.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MemberNodeCommandHandler.cs
@@ -40,8 +40,8 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 	{
 		public override void ActivateItem ()
 		{			
-			var member = CurrentNode.DataItem as IEntity;
-			IdeApp.ProjectOperations.JumpToDeclaration(member);
+//			var member = CurrentNode.DataItem as IEntity;
+//			IdeApp.ProjectOperations.JumpToDeclaration(member);
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MethodNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MethodNodeBuilder.cs
index 8a25619430..2253d6973e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MethodNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/MethodNodeBuilder.cs
@@ -49,9 +49,9 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 		
 		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
 		{
-			IMethod data = dataObject as IMethod;
-			nodeInfo.Label = Ambience.GetString (data, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup);
-			nodeInfo.Icon = Context.GetIcon (data.GetStockIcon ());
+			// IMethod data = dataObject as IMethod;
+			// nodeInfo.Label = Ambience.GetString (data, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup);
+			// nodeInfo.Icon = Context.GetIcon (data.GetStockIcon ());
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs
index ad71ba09d4..285cca7e17 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs
@@ -97,23 +97,24 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 				builder.AddChild (((DotNetProject)project).References);
 			}
 			bool publicOnly = builder.Options ["PublicApiOnly"];
-			var dom = TypeSystemService.GetCompilation (project);
-			bool nestedNamespaces = builder.Options ["NestedNamespaces"];
-			HashSet<string> addedNames = new HashSet<string> ();
-			foreach (var ns in dom.MainAssembly.RootNamespace.ChildNamespaces) {
-				if (nestedNamespaces) {
-					if (!addedNames.Contains (ns.Name)) {
-						builder.AddChild (new ProjectNamespaceData (project, ns));
-						addedNames.Add (ns.Name);
-					}
-				} else {
-					FillNamespaces (builder, project, ns);
-				}
-			}
-			foreach (var type in dom.MainAssembly.RootNamespace.Types) {
-				if (!publicOnly || type.IsPublic)
-					builder.AddChild (new ClassData (project, type));
-			}
+			// TODO: Roslyn port.
+//			var dom = TypeSystemService.GetCompilation (project);
+//			bool nestedNamespaces = builder.Options ["NestedNamespaces"];
+//			HashSet<string> addedNames = new HashSet<string> ();
+//			foreach (var ns in dom.MainAssembly.RootNamespace.ChildNamespaces) {
+//				if (nestedNamespaces) {
+//					if (!addedNames.Contains (ns.Name)) {
+//						builder.AddChild (new ProjectNamespaceData (project, ns));
+//						addedNames.Add (ns.Name);
+//					}
+//				} else {
+//					FillNamespaces (builder, project, ns);
+//				}
+//			}
+//			foreach (var type in dom.MainAssembly.RootNamespace.Types) {
+//				if (!publicOnly || type.IsPublic)
+//					builder.AddChild (new ClassData (project, type));
+//			}
 		}
 		
 		public static void FillNamespaces (ITreeBuilder builder, Project project, INamespace ns)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/PropertyNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/PropertyNodeBuilder.cs
index 2d8c5bb73f..19ebd06aeb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/PropertyNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/PropertyNodeBuilder.cs
@@ -49,9 +49,9 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 		
 		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
 		{
-			IProperty data = dataObject as IProperty;
-			nodeInfo.Label = Ambience.GetString (data, OutputFlags.ClassBrowserEntries  | OutputFlags.IncludeMarkup);
-			nodeInfo.Icon = Context.GetIcon (data.GetStockIcon ());
+			// IProperty data = dataObject as IProperty;
+			// nodeInfo.Label = Ambience.GetString (data, OutputFlags.ClassBrowserEntries  | OutputFlags.IncludeMarkup);
+			// nodeInfo.Icon = Context.GetIcon (data.GetStockIcon ());
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs
index 392f2e6744..8c441c2e52 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs
@@ -69,6 +69,14 @@ namespace MonoDevelop.Ide.Gui
 				return null;
 		}
 
+		public virtual IEnumerable<T> GetContents<T> () where T : class
+		{
+			var t = this as T;
+			if (t != null)
+				yield return t;
+		}
+
+
 		#endregion
 
 		#region IDisposable Members
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
index 00eb11bfa8..620ca00313 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
@@ -100,8 +100,13 @@ namespace MonoDevelop.Ide.Gui
 			OnBeforeSave (EventArgs.Empty);
 			this.Save (contentName);
 		}
-
-		public virtual void Save (string fileName)
+		
+		public void Save (string fileName)
+		{
+			Save (new FileSaveInformation (fileName)); 
+		}
+		
+		public virtual void Save (FileSaveInformation fileSaveInformation)
 		{
 			throw new NotImplementedException ();
 		}
@@ -110,7 +115,12 @@ namespace MonoDevelop.Ide.Gui
 		{
 		}
 
-		public abstract void Load (string fileName);
+		public abstract void Load (FileOpenInformation fileOpenInformation);
+		
+		public void Load (string fileName)
+		{
+			Load (new FileOpenInformation (fileName, null));
+		}
 		
 		public virtual void LoadNew (System.IO.Stream content, string mimeType)
 		{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/CommonTextEditorOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/CommonTextEditorOptions.cs
deleted file mode 100644
index e04a6f9d14..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/CommonTextEditorOptions.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// 
-// CommonTextEditorOptions.cs
-//  
-// Author:
-//       Michael Hutchinson <mhutch@xamarin.com>
-// 
-// Copyright (c) 2011 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Fonts;
-
-namespace MonoDevelop.Ide.Gui
-{
-	/// <summary>
-	/// Text editor options that subscribe to MonoDevelop common settings.
-	/// </summary>
-	public class CommonTextEditorOptions : Mono.TextEditor.TextEditorOptions
-	{
-		bool disposed = false;
-		
-		public CommonTextEditorOptions ()
-		{
-			PropertyService.PropertyChanged += PropertyServiceChanged;
-			base.FontName = PropertyService.Get ("FontName", FontService.MonospaceFontName);
-			base.ColorScheme = IdeApp.Preferences.ColorScheme;
-			FontService.RegisterFontChangedCallback ("Editor", UpdateFont);
-		}
-		
-		public override void Dispose ()
-		{
-			if (disposed)
-				return;
-			disposed = true;
-			PropertyService.PropertyChanged -= PropertyServiceChanged;
-			FontService.RemoveCallback (UpdateFont);
-		}
-		
-		void UpdateFont ()
-		{
-			base.FontName = FontName;
-			base.GutterFontName = GutterFontName;
-			this.OnChanged (EventArgs.Empty);
-		}
-		
-		void PropertyServiceChanged (object sender, PropertyChangedEventArgs e)
-		{
-			switch (e.Key) {
-			case "ColorScheme": {
-				string val = (string) e.NewValue;
-				if (string.IsNullOrEmpty (val))
-					val = "Default";
-				base.ColorScheme = val;
-				break;
-			}
-			}
-		}
-		
-		public override string ColorScheme {
-			set { throw new InvalidOperationException ("Set via global source editor options"); }
-		}
-		
-		public override string FontName {
-			get {
-				return FontService.FilterFontName (FontService.GetUnderlyingFontName ("Editor"));
-			}
-			set {
-				throw new InvalidOperationException ("Set via global source editor options");
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
index bc7bf6f75c..f52c5526e9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
@@ -25,7 +25,6 @@
 
 using System;
 using System.IO;
-using System.Collections.ObjectModel;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Diagnostics;
@@ -39,12 +38,10 @@ using MonoDevelop.Ide.Codons;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Components.Docking;
 
-using GLib;
 using MonoDevelop.Components.DockToolbars;
 using Gtk;
 using MonoDevelop.Components;
 using MonoDevelop.Ide.Extensions;
-using Mono.TextEditor;
 using MonoDevelop.Components.MainToolbar;
 using MonoDevelop.Components.DockNotebook;
 
@@ -368,7 +365,7 @@ namespace MonoDevelop.Ide.Gui
 			return mimeimage;
 		}
 
-		public virtual void ShowView (IViewContent content, bool bringToFront, DockNotebook notebook = null)
+		public virtual void ShowView (IViewContent content, bool bringToFront, IViewDisplayBinding binding = null, DockNotebook notebook = null)
 		{
 			bool isFile = content.IsFile;
 			if (!isFile) {
@@ -404,6 +401,10 @@ namespace MonoDevelop.Ide.Gui
 			sdiWorkspaceWindow.TitleChanged += delegate { SetWorkbenchTitle (); };
 			sdiWorkspaceWindow.Closed += CloseWindowEvent;
 			sdiWorkspaceWindow.Show ();
+			if (binding != null)
+				DisplayBindingService.AttachSubWindows (sdiWorkspaceWindow, binding);
+
+			sdiWorkspaceWindow.CreateCommandHandler ();
 
 			tab.Content = sdiWorkspaceWindow;
 			if (mimeimage != null)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
index eff3218cc9..c96d9fb360 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
@@ -47,23 +47,25 @@ using MonoDevelop.Ide.Extensions;
 using System.Linq;
 using System.Threading;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using System.Text;
 using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Options;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Ide.Gui
 {
-	public class Document : ICSharpCode.NRefactory.AbstractAnnotatable
+
+	public class Document : DocumentContext
 	{
 		internal object MemoryProbe = Counters.DocumentsInMemory.CreateMemoryProbe ();
 		
 		IWorkbenchWindow window;
-		TextEditorExtension editorExtension;
 		ParsedDocument parsedDocument;
-		IProjectContent singleFileContext;
-		Mono.TextEditor.ITextEditorDataProvider provider = null;
+		FilePath analysisDocumentFileName;
+		Microsoft.CodeAnalysis.DocumentId analysisDocument;
 
 		const int ParseDelay = 600;
 
@@ -75,12 +77,20 @@ namespace MonoDevelop.Ide.Gui
 			get;
 			set;
 		}
-		
-		public TextEditorExtension EditorExtension {
-			get { return this.editorExtension; }
+
+		/// <summary>
+		/// Returns the roslyn document for this document. This may return <c>null</c> if it's no compileable document.
+		/// Even if it's a C# file.
+		/// </summary>
+		public override Microsoft.CodeAnalysis.Document AnalysisDocument {
+			get {
+				if (analysisDocument == null)
+					return null;
+				return TypeSystemService.GetCodeAnalysisDocument (analysisDocument);
+			}
 		}
  		
-		public T GetContent<T> () where T : class
+		public override T GetContent<T> ()
 		{
 			if (window == null)
 				return null;
@@ -97,39 +107,30 @@ namespace MonoDevelop.Ide.Gui
 					return ret;
 			}
 
-			//no, so look through the TexteditorExtensions as well
-			TextEditorExtension nextExtension = editorExtension;
-			while (nextExtension != null) {
-				if (typeof(T).IsAssignableFrom (nextExtension.GetType ()))
-					return nextExtension as T;
-				nextExtension = nextExtension.Next as TextEditorExtension;
+			//If we didn't find in ActiveView or ViewContent... Try in SubViews
+			foreach (var subView in window.SubViewContents) {
+				foreach (var cnt in subView.GetContents<T> ()) {
+					return cnt;
+				}
 			}
+
 			return null;
 		}
 		
-		public IEnumerable<T> GetContents<T> () where T : class
+		public override IEnumerable<T> GetContents<T> ()
 		{
-			//check whether the ViewContent can return the type directly
-			T ret = (T) Window.ActiveViewContent.GetContent (typeof(T));
-			if (ret != null)
-				yield return ret;
-			
-			//check the primary viewcontent
-			//not sure if this is the right thing to do, but things depend on this behaviour
-			if (Window.ViewContent != Window.ActiveViewContent) {
-				ret = (T) Window.ViewContent.GetContent (typeof(T));
-				if (ret != null)
-					yield return ret;
+			foreach (var cnt in window.ViewContent.GetContents<T> ()) {
+				yield return cnt;
 			}
-			
-			//no, so look through the TexteditorExtensions as well
-			TextEditorExtension nextExtension = editorExtension;
-			while (nextExtension != null) {
-				if (typeof(T).IsAssignableFrom (nextExtension.GetType ()))
-					yield return nextExtension as T;
-				nextExtension = nextExtension.Next as TextEditorExtension;
+
+			foreach (var subView in window.SubViewContents) {
+				foreach (var cnt in subView.GetContents<T> ()) {
+					yield return cnt;
+				}
 			}
 		}
+
+
 		static Document ()
 		{
 			if (IdeApp.Workbench != null) {
@@ -155,6 +156,19 @@ namespace MonoDevelop.Ide.Gui
 			if (window.ViewContent.Project != null)
 				window.ViewContent.Project.Modified += HandleProjectModified;
 			window.ViewsChanged += HandleViewsChanged;
+			window.ViewContent.ContentNameChanged += delegate {
+				analysisDocument = null;
+			};
+			MonoDevelopWorkspace.LoadingFinished += TypeSystemService_WorkspaceItemLoaded;
+		}
+
+		void TypeSystemService_WorkspaceItemLoaded (object sender, EventArgs e)
+		{
+			if (adhocProject == null)
+				analysisDocument = null;
+			EnsureAnalysisDocumentIsOpen ();
+			if (analysisDocument != null)
+				StartReparseThread ();
 		}
 
 /*		void UpdateRegisteredDom (object sender, ProjectDomEventArgs e)
@@ -182,13 +196,12 @@ namespace MonoDevelop.Ide.Gui
 			get { return !Window.ViewContent.IsViewOnly && (Window.ViewContent.ContentName == null || Window.ViewContent.IsDirty); }
 			set { Window.ViewContent.IsDirty = value; }
 		}
-		
-		public bool HasProject {
-			get { return Window != null ? Window.ViewContent.Project != null : false; }
-		}
-		
-		public Project Project {
-			get { return Window != null ? Window.ViewContent.Project : null; }
+
+		FilePath adHocFile;
+		Project adhocProject;
+
+		public override Project Project {
+			get { return (Window != null ? Window.ViewContent.Project : null); }
 /*			set { 
 				Window.ViewContent.Project = value; 
 				if (value != null)
@@ -199,7 +212,7 @@ namespace MonoDevelop.Ide.Gui
 			}*/
 		}
 
-		public bool IsCompileableInProject {
+		public override bool IsCompileableInProject {
 			get {
 				var project = Project;
 				if (project == null)
@@ -220,19 +233,15 @@ namespace MonoDevelop.Ide.Gui
 			}
 		}
 
-		public  IProjectContent ProjectContent {
-			get {
-				return Project != null ? TypeSystemService.GetProjectContext (Project) : GetProjectContext ();
-			}
-		}
-		
-		public virtual ICompilation Compilation {
-			get {
-				return Project != null ? TypeSystemService.GetCompilation (Project) : GetProjectContext ().CreateCompilation ();
-			}
+		public Task<Microsoft.CodeAnalysis.Compilation> GetCompilationAsync(CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var project = TypeSystemService.GetCodeAnalysisProject (Project ?? adhocProject); 
+			if (project == null)
+				return new Task<Microsoft.CodeAnalysis.Compilation> (() => null);
+			return project.GetCompilationAsync (cancellationToken);
 		}
-		
-		public virtual ParsedDocument ParsedDocument {
+
+		public override ParsedDocument ParsedDocument {
 			get {
 				return parsedDocument;
 			}
@@ -300,21 +309,16 @@ namespace MonoDevelop.Ide.Gui
 				return new DocumentView (this, content);
 		}
 
-		public string Name {
+		public override string Name {
 			get {
 				IViewContent view = Window.ViewContent;
 				return view.IsUntitled ? view.UntitledName : view.ContentName;
 			}
 		}
 
-		public Mono.TextEditor.TextEditorData Editor {
+		public TextEditor Editor {
 			get {
-				if (provider == null) {
-					provider = GetContent <Mono.TextEditor.ITextEditorDataProvider> ();
-					if (provider == null)
-						return null;
-				}
-				return provider.GetTextEditorData ();
+				return GetContent <TextEditor> ();
 			}
 		}
 
@@ -378,21 +382,21 @@ namespace MonoDevelop.Ide.Gui
 				// Set the file time of the current document after the file time of the written file, to prevent double file updates.
 				// Note that the parsed document may be overwritten by a background thread to a more recent one.
 				var doc = parsedDocument;
-				if (doc != null && doc.ParsedFile != null) {
+				if (doc != null) {
 					string fileName = Window.ViewContent.ContentName;
 					try {
 						// filename could be null if the user cancelled SaveAs and this is a new & unsaved file
 						if (fileName != null)
-							doc.ParsedFile.LastWriteTime = File.GetLastWriteTimeUtc (fileName);
+							doc.LastWriteTimeUtc = File.GetLastWriteTimeUtc (fileName);
 					} catch (Exception e) {
-						doc.ParsedFile.LastWriteTime = DateTime.UtcNow;
+						doc.LastWriteTimeUtc = DateTime.UtcNow;
 						LoggingService.LogWarning ("Exception while getting the write time from " + fileName, e); 
 					}
 				}
 				TypeSystemService.TrackFileChanges = true;
 			}
 		}
-		
+
 		public void SaveAs ()
 		{
 			SaveAs (null);
@@ -406,11 +410,11 @@ namespace MonoDevelop.Ide.Gui
 
 			Encoding encoding = null;
 			
-			IEncodedTextContent tbuffer = GetContent <IEncodedTextContent> ();
+			var tbuffer = GetContent <ITextSource> ();
 			if (tbuffer != null) {
-				encoding = tbuffer.SourceEncoding;
+				encoding = tbuffer.Encoding;
 				if (encoding == null)
-					encoding = Encoding.Default;
+					encoding = Encoding.UTF8;
 			}
 				
 			if (filename == null) {
@@ -446,16 +450,13 @@ namespace MonoDevelop.Ide.Gui
 			// save backup first
 			if ((bool)PropertyService.Get ("SharpDevelop.CreateBackupCopy", false)) {
 				if (tbuffer != null && encoding != null)
-					tbuffer.Save (filename + "~", encoding);
+					TextFileUtility.WriteText (filename + "~", tbuffer.Text, encoding, tbuffer.UseBOM);
 				else
-					Window.ViewContent.Save (filename + "~");
+					Window.ViewContent.Save (new FileSaveInformation (filename + "~", encoding));
 			}
 			TypeSystemService.RemoveSkippedfile (FileName);
 			// do actual save
-			if (tbuffer != null && encoding != null)
-				tbuffer.Save (filename, encoding);
-			else
-				Window.ViewContent.Save (filename);
+			Window.ViewContent.Save (new FileSaveInformation (filename + "~", encoding));
 
 			FileService.NotifyFileChanged (filename);
 			DesktopService.RecentFiles.AddFile (filename, (Project)null);
@@ -468,12 +469,11 @@ namespace MonoDevelop.Ide.Gui
 		{
 			return ((SdiWorkspaceWindow)Window).CloseWindow (false, true);
 		}
-		
-		void OnSaved (EventArgs args)
+
+		protected override void OnSaved (EventArgs e)
 		{
 			IdeApp.Workbench.SaveFileStatus ();
-			if (Saved != null)
-				Saved (this, args);
+			base.OnSaved (e);
 		}
 
 		public void CancelParseTimeout ()
@@ -518,8 +518,14 @@ namespace MonoDevelop.Ide.Gui
 
 		internal void DisposeDocument ()
 		{
-			DetachExtensionChain ();
-			RemoveAnnotations (typeof(System.Object));
+			if (analysisDocument != null) {
+				TypeSystemService.InformDocumentClose (analysisDocument, FileName);
+				analysisDocument = null;
+			}
+			UnloadAdhocProject ();
+			if (Editor != null) {
+				Editor.Dispose ();
+			}
 			if (window is SdiWorkspaceWindow)
 				((SdiWorkspaceWindow)window).DetachFromPathedDocument ();
 			window.Closed -= OnClosed;
@@ -531,11 +537,12 @@ namespace MonoDevelop.Ide.Gui
 			if (window.ViewContent.Project != null)
 				window.ViewContent.Project.Modified -= HandleProjectModified;
 			window.ViewsChanged += HandleViewsChanged;
+			TypeSystemService.Workspace.WorkspaceChanged -= HandleWorkspaceChanged;
+			MonoDevelopWorkspace.LoadingFinished -= TypeSystemService_WorkspaceItemLoaded;
+
 			window = null;
 
 			parsedDocument = null;
-			singleFileContext = null;
-			provider = null;
 			views = null;
 			viewsRO = null;
 		}
@@ -587,84 +594,44 @@ namespace MonoDevelop.Ide.Gui
 
 		void InitializeExtensionChain ()
 		{
-			DetachExtensionChain ();
-			var editor = GetContent<IExtensibleTextEditor> ();
-
-			ExtensionNodeList extensions = window.ExtensionContext.GetExtensionNodes ("/MonoDevelop/Ide/TextEditorExtensions", typeof(TextEditorExtensionNode));
-			editorExtension = null;
-			TextEditorExtension last = null;
-			var mimetypeChain = DesktopService.GetMimeTypeInheritanceChainForFile (FileName).ToArray ();
-			foreach (TextEditorExtensionNode extNode in extensions) {
-				if (!extNode.Supports (FileName, mimetypeChain))
-					continue;
-				TextEditorExtension ext;
-				try {
-					ext = (TextEditorExtension)extNode.CreateInstance ();
-				} catch (Exception e) {
-					LoggingService.LogError ("Error while creating text editor extension :" + extNode.Id + "(" + extNode.Type +")", e); 
-					continue;
-				}
-				if (ext.ExtendsEditor (this, editor)) {
-					if (last != null) {
-						ext.Next = last.Next;
-						last.Next = ext;
-						last = ext;
-					} else {
-						editorExtension = last = ext;
-						last.Next = editor.AttachExtension (editorExtension);
-					}
-					ext.Initialize (this);
-				}
-			}
+			Editor.InitializeExtensionChain (this);
+
 			if (window is SdiWorkspaceWindow)
 				((SdiWorkspaceWindow)window).AttachToPathedDocument (GetContent<MonoDevelop.Ide.Gui.Content.IPathedDocument> ());
-		}
 
-		void DetachExtensionChain ()
-		{
-			while (editorExtension != null) {
-				try {
-					editorExtension.Dispose ();
-				} catch (Exception ex) {
-					LoggingService.LogError ("Exception while disposing extension:" + editorExtension, ex);
-				}
-				editorExtension = editorExtension.Next as TextEditorExtension;
-			}
-			editorExtension = null;
 		}
 
-		void InitializeEditor (IExtensibleTextEditor editor)
+		void InitializeEditor ()
 		{
-			Editor.Document.TextReplaced += (o, a) => {
+			Editor.TextChanged += (o, a) => {
 				if (parsedDocument != null)
 					parsedDocument.IsInvalid = true;
 
-				if (Editor.Document.IsInAtomicUndo) {
+				if (Editor.IsInAtomicUndo) {
 					wasEdited = true;
 				} else {
 					StartReparseThread ();
 				}
 			};
 			
-			Editor.Document.BeginUndo += delegate {
+			Editor.BeginAtomicUndoOperation += delegate {
 				wasEdited = false;
 			};
 			
-			Editor.Document.EndUndo += delegate {
+			Editor.EndAtomicUndoOperation += delegate {
 				if (wasEdited)
 					StartReparseThread ();
 			};
-			Editor.Document.Undone += (o, a) => StartReparseThread ();
-			Editor.Document.Redone += (o, a) => StartReparseThread ();
+//			Editor.Undone += (o, a) => StartReparseThread ();
+//			Editor.Redone += (o, a) => StartReparseThread ();
 
 			InitializeExtensionChain ();
 		}
 		
 		internal void OnDocumentAttached ()
 		{
-			IExtensibleTextEditor editor = GetContent<IExtensibleTextEditor> ();
-			if (editor != null) {
-				InitializeEditor (editor);
+			if (Editor != null) {
+				InitializeEditor ();
 				RunWhenLoaded (delegate { ListenToProjectLoad (Project); });
 			}
 			
@@ -680,24 +647,25 @@ namespace MonoDevelop.Ide.Gui
 		public void RunWhenLoaded (System.Action action)
 		{
 			var e = Editor;
-			if (e == null || e.Document == null) {
+			if (e == null) {
 				action ();
 				return;
 			}
-			e.Document.RunWhenLoaded (action);
+			e.RunWhenLoaded (action);
 		}
 
-		public void AttachToProject (Project project)
+		public override void AttachToProject (Project project)
 		{
 			SetProject (project);
 		}
 
-		TypeSystemService.ProjectContentWrapper currentWrapper;
 		internal void SetProject (Project project)
 		{
 			if (Window == null || Window.ViewContent == null || Window.ViewContent.Project == project)
 				return;
-			DetachExtensionChain ();
+			UnloadAdhocProject ();
+			if (adhocProject == null) 
+				analysisDocument = null;
 			ISupportsProjectReload pr = GetContent<ISupportsProjectReload> ();
 			if (pr != null) {
 				// Unsubscribe project events
@@ -709,22 +677,19 @@ namespace MonoDevelop.Ide.Gui
 			if (project != null)
 				project.Modified += HandleProjectModified;
 			InitializeExtensionChain ();
-
+			TypeSystemService.Workspace.WorkspaceChanged += HandleWorkspaceChanged;
 			ListenToProjectLoad (project);
 		}
 
-		void ListenToProjectLoad (Project project)
+		void HandleWorkspaceChanged (object sender, Microsoft.CodeAnalysis.WorkspaceChangeEventArgs e)
 		{
-			if (currentWrapper != null) {
-				currentWrapper.Loaded -= HandleInLoadChanged;
-				currentWrapper = null;
-			}
-			if (project != null) {
-				var wrapper = TypeSystemService.GetProjectContentWrapper (project);
-				wrapper.Loaded += HandleInLoadChanged;
-				currentWrapper = wrapper;
-				currentWrapper.RequestLoad ();
+			if (e.Kind == Microsoft.CodeAnalysis.WorkspaceChangeKind.DocumentChanged && e.DocumentId == analysisDocument) {
+				OnDocumentParsed (EventArgs.Empty);
 			}
+		}
+
+		void ListenToProjectLoad (Project project)
+		{
 			StartReparseThread ();
 		}
 
@@ -746,18 +711,30 @@ namespace MonoDevelop.Ide.Gui
 		/// <returns>
 		/// A <see cref="ParsedDocument"/> that contains the current dom.
 		/// </returns>
-		public ParsedDocument UpdateParseDocument ()
+		public override ParsedDocument UpdateParseDocument ()
 		{
 			try {
+				EnsureAnalysisDocumentIsOpen ();
 				string currentParseFile = FileName;
 				var editor = Editor;
 				if (editor == null || string.IsNullOrEmpty (currentParseFile))
 					return null;
 				TypeSystemService.AddSkippedFile (currentParseFile);
-				string currentParseText = editor.Text;
-				this.parsedDocument = TypeSystemService.ParseFile (Project, currentParseFile, editor.Document.MimeType, currentParseText);
-				if (Project == null && this.parsedDocument != null) {
-					singleFileContext = GetProjectContext ().AddOrUpdateFiles (parsedDocument.ParsedFile);
+				var currentParseText = editor.CreateDocumentSnapshot ();
+				CancelOldParsing();
+				var project = Project ?? adhocProject;
+				if (project != null && TypeSystemService.CanParseProjections (project, Editor.MimeType, FileName)) {
+					var task = TypeSystemService.ParseProjection (project, currentParseFile, editor.MimeType, currentParseText);
+					if (task.Result != null) {
+						var p = task.Result;
+						this.parsedDocument = p.ParsedDocument;
+						var projections = p.Projections;
+						foreach (var p2 in projections)
+							p2.CreateProjectedEditor (this);
+						Editor.SetOrUpdateProjections (this, projections, p.DisabledProjectionFeatures);
+					}
+				} else { 
+					this.parsedDocument = TypeSystemService.ParseFile (project, currentParseFile, editor.MimeType, currentParseText).Result ?? this.parsedDocument;
 				}
 			} finally {
 
@@ -765,89 +742,136 @@ namespace MonoDevelop.Ide.Gui
 			}
 			return this.parsedDocument;
 		}
+			
+		uint parseTimeout = 0;
 
-		static readonly Lazy<IUnresolvedAssembly> mscorlib = new Lazy<IUnresolvedAssembly> ( () => new IkvmLoader ().LoadAssemblyFile (typeof (object).Assembly.Location));
-		static readonly Lazy<IUnresolvedAssembly> systemCore = new Lazy<IUnresolvedAssembly>( () => new IkvmLoader ().LoadAssemblyFile (typeof (System.Linq.Enumerable).Assembly.Location));
-		static readonly Lazy<IUnresolvedAssembly> system = new Lazy<IUnresolvedAssembly>( () => new IkvmLoader ().LoadAssemblyFile (typeof (System.Uri).Assembly.Location));
-
-		static IUnresolvedAssembly Mscorlib { get { return mscorlib.Value; } }
-		static IUnresolvedAssembly SystemCore { get { return systemCore.Value; } }
-		static IUnresolvedAssembly System { get { return system.Value; } }
-
-		public bool IsProjectContextInUpdate {
-			get {
-				if (currentWrapper == null)
-					return false;
-				return !currentWrapper.IsLoaded;
+		void EnsureAnalysisDocumentIsOpen ()
+		{
+			if (analysisDocument != null)
+				return;
+			if (Editor == null) {
+				analysisDocument = null;
+				return;
+			}
+			analysisDocumentFileName = FileName;
+			if (Project != null) {
+				RoslynWorkspace = TypeSystemService.GetWorkspace (this.Project.ParentSolution);
+				analysisDocument = TypeSystemService.GetDocumentId (this.Project, this.FileName);
+				if (analysisDocument != null) {
+					TypeSystemService.InformDocumentOpen (analysisDocument, Editor);
+				}
+			} else {
+				lock (adhocProjectLock) {
+					if (adhocProject != null) {
+						return;
+					}
+					if (Editor != null && Editor.MimeType == "text/x-csharp") {
+						var newProject = new DotNetAssemblyProject (Microsoft.CodeAnalysis.LanguageNames.CSharp);
+						this.adhocProject = newProject;
+
+						newProject.Name = "InvisibleProject";
+						newProject.References.Add (new ProjectReference (ReferenceType.Package, "mscorlib"));
+						newProject.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
+						newProject.References.Add (new ProjectReference (ReferenceType.Package, "System.Core"));
+
+						newProject.FileName = "test.csproj";
+						adHocFile = Platform.IsWindows ? "C:\\a.cs" : "/a.cs";
+						newProject.Files.Add (new ProjectFile (adHocFile, BuildAction.Compile));
+
+						var solution = new Solution ();
+						solution.AddConfiguration ("", true);
+						solution.DefaultSolutionFolder.AddItem (newProject);
+						using (var monitor = new MonoDevelop.Core.ProgressMonitoring.NullProgressMonitor ())
+							RoslynWorkspace = TypeSystemService.Load (solution, monitor, false);
+						analysisDocument = TypeSystemService.GetDocumentId (RoslynWorkspace, adhocProject, adHocFile);
+						TypeSystemService.InformDocumentOpen (RoslynWorkspace, analysisDocument, Editor);
+					}
+				}
 			}
 		}
+		object adhocProjectLock = new object();
 
-		public virtual IProjectContent GetProjectContext ()
+		void UnloadAdhocProject ()
 		{
-			if (Project == null) {
-				if (singleFileContext == null) {
-					singleFileContext = new ICSharpCode.NRefactory.CSharp.CSharpProjectContent ();
-					singleFileContext = singleFileContext.AddAssemblyReferences (new [] { Mscorlib, System, SystemCore });
-				}
-				if (parsedDocument != null)
-					return singleFileContext.AddOrUpdateFiles (parsedDocument.ParsedFile);
-				return singleFileContext;
+			lock (adhocProjectLock) {
+				if (adhocProject == null)
+					return;
+				TypeSystemService.Unload (adhocProject.ParentSolution.ParentWorkspace);
+				adhocProject = null;
 			}
-			
-			return TypeSystemService.GetProjectContext (Project);
 		}
-		
-		uint parseTimeout = 0;
+
 		object reparseLock = new object();
-		internal void StartReparseThread ()
+		CancellationTokenSource parseTokenSource = new CancellationTokenSource();
+		int reparseQueue;
+		void CancelOldParsing()
 		{
-			lock (reparseLock) {
-				if (currentWrapper != null)
-					currentWrapper.EnsureReferencesAreLoaded ();
+			parseTokenSource.Cancel ();
+			parseTokenSource = new CancellationTokenSource ();
+		}
 
+		internal void StartReparseThread ()
+		{
+			string currentParseFile = adhocProject != null ? adHocFile : FileName;
+			if (string.IsNullOrEmpty (currentParseFile))
+				return;
+			Interlocked.Increment (ref reparseQueue);
+			Application.Invoke (delegate {
+				if (Interlocked.Decrement (ref reparseQueue) != 0) {
+					return;
+				}
 				// Don't directly parse the document because doing it at every key press is
 				// very inefficient. Do it after a small delay instead, so several changes can
 				// be parsed at the same time.
-				string currentParseFile = FileName;
-				if (string.IsNullOrEmpty (currentParseFile))
-					return;
+				EnsureAnalysisDocumentIsOpen ();
 				CancelParseTimeout ();
-				if (IsProjectContextInUpdate) {
-					return;
-				}
-				parseTimeout = GLib.Timeout.Add (ParseDelay, delegate {
-					var editor = Editor;
-					if (editor == null || IsProjectContextInUpdate) {
-						parseTimeout = 0;
-						return false;
-					}
-					string currentParseText = editor.Text;
-					string mimeType = editor.Document.MimeType;
-					ThreadPool.QueueUserWorkItem (delegate {
-						if (IsProjectContextInUpdate) {
-							return;
-						}
-						TypeSystemService.AddSkippedFile (currentParseFile);
-						var currentParsedDocument = TypeSystemService.ParseFile (Project, currentParseFile, mimeType, currentParseText);
-						Application.Invoke (delegate {
-							// this may be called after the document has closed, in that case the OnDocumentParsed event shouldn't be invoked.
-							if (isClosed)
+				var currentParseText = Editor.CreateSnapshot ();
+				string mimeType = Editor.MimeType;
+				CancelOldParsing ();
+				var token = parseTokenSource.Token;
+				var project = Project ?? adhocProject;
+				ThreadPool.QueueUserWorkItem (delegate {
+					TypeSystemService.AddSkippedFile (currentParseFile);
+					if (project != null && TypeSystemService.CanParseProjections (project, mimeType, currentParseFile)) {
+						TypeSystemService.ParseProjection (project, currentParseFile, mimeType, currentParseText, token).ContinueWith (task => {
+							if (token.IsCancellationRequested)
 								return;
-							this.parsedDocument = currentParsedDocument;
-							OnDocumentParsed (EventArgs.Empty);
-						});
-					});
+							Application.Invoke (delegate {
+								// this may be called after the document has closed, in that case the OnDocumentParsed event shouldn't be invoked.
+								var taskResult = task.Result;
+								if (isClosed || taskResult == null || token.IsCancellationRequested)
+									return;
+								this.parsedDocument = taskResult.ParsedDocument;
+								var projections = taskResult.Projections;
+								foreach (var p2 in projections)
+									p2.CreateProjectedEditor (this);
+								Editor.SetOrUpdateProjections (this, projections, taskResult.DisabledProjectionFeatures);
+								OnDocumentParsed (EventArgs.Empty);
+							});
+						}, TaskContinuationOptions.OnlyOnRanToCompletion);
+					} else {
+						TypeSystemService.ParseFile (project, currentParseFile, mimeType, currentParseText, token).ContinueWith (task => {
+							if (token.IsCancellationRequested)
+								return;
+							Application.Invoke (delegate {
+								// this may be called after the document has closed, in that case the OnDocumentParsed event shouldn't be invoked.
+								if (isClosed || task.Result == null || token.IsCancellationRequested)
+									return;
+								this.parsedDocument = task.Result;
+								OnDocumentParsed (EventArgs.Empty);
+							});
+						}, TaskContinuationOptions.OnlyOnRanToCompletion);
+					}
 					parseTimeout = 0;
-					return false;
 				});
-			}
+			});
 		}
 		
 		/// <summary>
 		/// This method kicks off an async document parser and should be used instead of 
 		/// <see cref="UpdateParseDocument"/> unless you need the parsed document immediately.
 		/// </summary>
-		public void ReparseDocument ()
+		public override void ReparseDocument ()
 		{
 			StartReparseThread ();
 		}
@@ -855,8 +879,8 @@ namespace MonoDevelop.Ide.Gui
 		internal object ExtendedCommandTargetChain {
 			get {
 				// Only go through the text editor chain, if the text editor is selected as subview
-				if (Window != null && Window.ActiveViewContent.GetContent (typeof(IExtensibleTextEditor)) != null)
-					return editorExtension;
+				if (Window != null && Window.ActiveViewContent.GetContent (typeof(TextEditor)) != null)
+					return Editor.CommandRouter;
 				return null;
 			}
 		}
@@ -867,19 +891,10 @@ namespace MonoDevelop.Ide.Gui
 				window.ViewContent.Project = null;
 		}
 		
-		protected virtual void OnDocumentParsed (EventArgs e)
-		{
-			EventHandler handler = this.DocumentParsed;
-			if (handler != null)
-				handler (this, e);
-		}
-		
 		public event EventHandler Closed;
-		public event EventHandler Saved;
 		public event EventHandler ViewChanged;
 		
-		public event EventHandler DocumentParsed;
-		
+
 		public string[] CommentTags {
 			get {
 				if (IsFile)
@@ -893,30 +908,16 @@ namespace MonoDevelop.Ide.Gui
 		{
 			//Document doc = IdeApp.Workbench.ActiveDocument;
 			string loadedMimeType = DesktopService.GetMimeTypeForUri (fileName);
-			
-			Mono.TextEditor.Highlighting.SyntaxMode mode = null;
-			foreach (string mt in DesktopService.GetMimeTypeInheritanceChain (loadedMimeType)) {
-				mode = Mono.TextEditor.Highlighting.SyntaxModeService.GetSyntaxMode (null, mt);
-				if (mode != null)
-					break;
-			}
-			
-			if (mode == null)
-				return null;
-			
-			List<string> ctags;
-			if (mode.Properties.TryGetValue ("LineComment", out ctags) && ctags.Count > 0) {
-				return new string [] { ctags [0] };
-			}
-			List<string> tags = new List<string> ();
-			if (mode.Properties.TryGetValue ("BlockCommentStart", out ctags))
-				tags.Add (ctags [0]);
-			if (mode.Properties.TryGetValue ("BlockCommentEnd", out ctags))
-				tags.Add (ctags [0]);
-			if (tags.Count == 2)
-				return tags.ToArray ();
-			else
-				return null;
+
+			var result = TextEditorFactory.GetSyntaxProperties (loadedMimeType, "LineComment");
+			if (result != null)
+				return result;
+
+			var start = TextEditorFactory.GetSyntaxProperties (loadedMimeType, "BlockCommentStart");
+			var end = TextEditorFactory.GetSyntaxProperties (loadedMimeType, "BlockCommentEnd");
+			if (start != null && end != null)
+				return new [] { start[0], end[0] };
+			return null;
 		}
 	
 //		public MonoDevelop.Projects.CodeGeneration.CodeGenerator CreateCodeGenerator ()
@@ -932,7 +933,29 @@ namespace MonoDevelop.Ide.Gui
 		public void DisableAutoScroll ()
 		{
 			if (IsFile)
-				Mono.TextEditor.Utils.FileSettingsStore.Remove (FileName);
+				FileSettingsStore.Remove (FileName);
+		}
+
+		public override OptionSet GetOptionSet ()
+		{
+			return TypeSystemService.Workspace.Options;
+		}
+
+		internal override Task<IReadOnlyList<Editor.Projection.Projection>> GetPartialProjectionsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var parser = TypeSystemService.GetParser (Editor.MimeType);
+			if (parser == null)
+				return null;
+			var projectFile = Project.GetProjectFile (Editor.FileName);
+			if (projectFile == null)
+				return null;
+			if (!parser.CanGenerateProjection (Editor.MimeType, projectFile.BuildAction, Project.SupportedLanguages))
+				return null;
+			try {
+				return parser.GetPartialProjectionsAsync (this, Editor, parsedDocument, cancellationToken);
+			} catch (NotSupportedException) {
+				return null;
+			}
 		}
 	}
 	
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs
index 46edebf535..82fa7c413f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs
@@ -34,7 +34,6 @@ using Gdk;
 using Gtk;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using MonoDevelop.Components;
 
 namespace MonoDevelop.Ide
@@ -262,8 +261,8 @@ namespace MonoDevelop.Ide
 		{
 			Gdk.Key key;
 			Gdk.ModifierType mod;
-			Mono.TextEditor.KeyboardShortcut[] accels;
-			Mono.TextEditor.GtkWorkarounds.MapKeys (evnt, out key, out mod, out accels);
+			KeyboardShortcut[] accels;
+			GtkWorkarounds.MapKeys (evnt, out key, out mod, out accels);
 			
 			switch (accels [0].Key) {
 			case Gdk.Key.Left:
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentToolbar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentToolbar.cs
index 1a2536782a..5dfd8bdaf1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentToolbar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentToolbar.cs
@@ -26,8 +26,6 @@
 using System;
 using Gtk;
 using MonoDevelop.Components;
-using Mono.TextEditor;
-
 
 namespace MonoDevelop.Ide.Gui
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs
index b070b93358..cbd23e5ea3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs
@@ -27,13 +27,20 @@
 using System;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Core;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Ide.Gui
 {
-	public class HiddenTextEditorViewContent : MonoDevelop.Ide.Gui.AbstractViewContent, IEditableTextBuffer, Mono.TextEditor.ITextEditorDataProvider
+	public class HiddenTextEditorViewContent : MonoDevelop.Ide.Gui.AbstractViewContent, IServiceProvider
 	{
-		Mono.TextEditor.TextEditorData data;
+		readonly TextEditor editor;
+
+		public TextEditor Editor {
+			get {
+				return editor;
+			}
+		}
 		
 		public override Gtk.Widget Control {
 			get {
@@ -43,12 +50,17 @@ namespace MonoDevelop.Ide.Gui
 		
 		public HiddenTextEditorViewContent ()
 		{
-			document = new Mono.TextEditor.TextDocument ();
-			data = new Mono.TextEditor.TextEditorData (document);
+			editor = TextEditorFactory.CreateNewEditor ();
 			Name = "";
 		}
-		
-		public override void Load (string fileName)
+
+		public HiddenTextEditorViewContent (TextEditor editor)
+		{
+			this.editor = editor;
+			Name = editor.FileName;
+		}
+
+		public override void Load (FileOpenInformation fileOpenInformation)
 		{
 		}
 		
@@ -63,54 +75,53 @@ namespace MonoDevelop.Ide.Gui
 		
 		public int LineCount {
 			get {
-				return document.LineCount;
+				return editor.LineCount;
 			}
 		}
 		
-		Mono.TextEditor.TextDocument document;
 		public string Text {
 			get {
-				return document.Text;
+				return editor.Text;
 			}
 			set {
-				document.Text = value;
+				editor.Text = value;
 			}
 		}
 		
 		public int InsertText (int position, string text)
 		{
-			document.Insert (position, text);
+			editor.InsertText (position, text);
 			return text.Length;
 		}
 		
 		public void DeleteText (int position, int length)
 		{
-			document.Replace (position, length, "");
+			editor.ReplaceText (position, length, "");
 		}
 		
 		public int Length {
 			get {
-				return document.TextLength;
+				return editor.Length;
 			}
 		}
 		
 		public string GetText (int startPosition, int endPosition)
 		{
-			return document.GetTextBetween (startPosition, endPosition);
+			return editor.GetTextBetween (startPosition, endPosition);
 		}
 		public char GetCharAt (int position)
 		{
-			return document.GetCharAt (position);
+			return editor.GetCharAt (position);
 		}
 		
 		public int GetPositionFromLineColumn (int line, int column)
 		{
-			return document.LocationToOffset (line, column);
+			return editor.LocationToOffset (line, column);
 		}
 		
 		public void GetLineColumnFromPosition (int position, out int line, out int column)
 		{
-			Mono.TextEditor.DocumentLocation loc = document.OffsetToLocation (position);
+			var loc = editor.OffsetToLocation (position);
 			line = loc.Line;
 			column = loc.Column;
 		}
@@ -119,32 +130,32 @@ namespace MonoDevelop.Ide.Gui
 		
 		public int CursorPosition {
 			get {
-				return data.Caret.Offset;
+				return editor.CaretOffset;
 			}
 			set {
-				data.Caret.Offset = value;
+				editor.CaretOffset = value;
 			}
 		}
 
 		public int SelectionStartPosition { 
 			get {
-				if (!data.IsSomethingSelected)
-					return data.Caret.Offset;
-				return data.SelectionRange.Offset;
+				if (!editor.IsSomethingSelected)
+					return editor.CaretOffset;
+				return editor.SelectionRange.Offset;
 			}
 		}
 		
 		public int SelectionEndPosition { 
 			get {
-				if (!data.IsSomethingSelected)
-					return data.Caret.Offset;
-				return data.SelectionRange.EndOffset;
+				if (!editor.IsSomethingSelected)
+					return editor.CaretOffset;
+				return editor.SelectionRange.EndOffset;
 			}
 		}
 		
 		public void Select (int startPosition, int endPosition)
 		{
-			data.SelectionRange = new TextSegment (startPosition, endPosition - startPosition);
+			editor.SelectionRange = new TextSegment (startPosition, endPosition - startPosition);
 		}
 		
 		public void ShowPosition (int position)
@@ -195,12 +206,18 @@ namespace MonoDevelop.Ide.Gui
 		{
 			return new DisposeStub ();
 		}
-		
-		public Mono.TextEditor.TextEditorData GetTextEditorData ()
+
+		#region IServiceProvider implementation
+
+		object IServiceProvider.GetService (Type serviceType)
 		{
-			return data;
+			if (serviceType.IsInstanceOfType (editor))
+				return editor;
+			return null;
 		}
+
+		#endregion
+
 		public event EventHandler CaretPositionSet;
-		public event EventHandler<TextChangedEventArgs> TextChanged;
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IBaseViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IBaseViewContent.cs
index c40c6f8525..ad246af631 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IBaseViewContent.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IBaseViewContent.cs
@@ -27,6 +27,7 @@
 
 using System;
 using Gtk;
+using System.Collections.Generic;
 
 namespace MonoDevelop.Ide.Gui
 {
@@ -41,7 +42,8 @@ namespace MonoDevelop.Ide.Gui
 		string TabPageLabel { get; }
 
 		object GetContent (Type type);
-		
+		IEnumerable<T> GetContents<T> () where T : class;
+
 		bool CanReuseView (string fileName);
 		void RedrawContent ();
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IViewContent.cs
index 2fbc0c618e..0c76d3cc02 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IViewContent.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IViewContent.cs
@@ -30,7 +30,7 @@ using MonoDevelop.Projects;
 
 namespace MonoDevelop.Ide.Gui
 {
-    public interface IViewContent : IBaseViewContent
+	public interface IViewContent : IBaseViewContent
 	{
         Project Project { get; set; }
 
@@ -45,9 +45,11 @@ namespace MonoDevelop.Ide.Gui
         bool IsDirty { get; set; }
         bool IsReadOnly { get; }
 
-        void Load (string fileName);
+		void Load (FileOpenInformation fileOpenInformation);
+		void Load (string fileName);
 		void LoadNew (System.IO.Stream content, string mimeType);
-        void Save (string fileName);
+		void Save (FileSaveInformation fileSaveInformation);
+		void Save (string fileName);
         void Save ();
 		
 		/// <summary>
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
index c5468e9ee5..05aba59465 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
@@ -121,7 +121,10 @@ namespace MonoDevelop.Ide.Gui
 			Add (box);
 			
 			SetTitleEvent(null, null);
+		}
 
+		internal void CreateCommandHandler ()
+		{
 			commandHandler = new ViewCommandHandlers (this);
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs
index 8705e7258f..23fa36eb7b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs
@@ -115,7 +115,7 @@ namespace MonoDevelop.Ide.Gui
 		public static int ProgressBarInnerPadding { get { return (int)(4 * PixelScale); } }
 		public static int ProgressBarOuterPadding { get { return (int)(4 * PixelScale); } }
 
-		static readonly double PixelScale = Mono.TextEditor.GtkWorkarounds.GetPixelScale ();
+		static readonly double PixelScale = GtkWorkarounds.GetPixelScale ();
 
 		// Toolbar
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs
index 46a5e9712c..da50ac8bc1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs
@@ -35,6 +35,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Commands;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.Gui
 {
@@ -240,33 +241,33 @@ namespace MonoDevelop.Ide.Gui
 		[CommandHandler (EditCommands.UppercaseSelection)]
 		public void OnUppercaseSelection ()
 		{
-			IEditableTextBuffer buffer = GetContent <IEditableTextBuffer> ();
+			var buffer = GetContent <TextEditor> ();
 			if (buffer == null)
 				return;
 			
 			string selectedText = buffer.SelectedText;
 			if (string.IsNullOrEmpty (selectedText)) {
-				int pos = buffer.CursorPosition;
-				string ch = buffer.GetText (pos, pos + 1);
+				int pos = buffer.CaretOffset;
+				string ch = buffer.GetTextAt (pos, pos + 1);
 				string upper = ch.ToUpper ();
 				if (upper == ch) {
-					buffer.CursorPosition = pos + 1;
+					buffer.CaretOffset = pos + 1;
 					return;
 				}
 				using (var undo = buffer.OpenUndoGroup ()) {
-					buffer.DeleteText (pos, 1);
+					buffer.RemoveText (pos, 1);
 					buffer.InsertText (pos, upper);
-					buffer.CursorPosition = pos + 1;
+					buffer.CaretOffset = pos + 1;
 				}
 			} else {
 				string newText = selectedText.ToUpper ();
 				if (newText == selectedText)
 					return;
-				int startPos = buffer.SelectionStartPosition;
+				int startPos = buffer.SelectionRange.Offset;
 				using (var undo = buffer.OpenUndoGroup ()) {
-					buffer.DeleteText (startPos, selectedText.Length);
+					buffer.RemoveText (startPos, selectedText.Length);
 					buffer.InsertText (startPos, newText);
-					buffer.Select (startPos, startPos + newText.Length);
+					buffer.SetSelection (startPos, startPos + newText.Length);
 				}
 			}
 		}
@@ -274,40 +275,40 @@ namespace MonoDevelop.Ide.Gui
 		[CommandUpdateHandler (EditCommands.UppercaseSelection)]
 		protected void OnUppercaseSelection (CommandInfo info)
 		{
-			IEditableTextBuffer buffer = GetContent <IEditableTextBuffer> ();
+			var buffer = GetContent <TextEditor> ();
 			info.Enabled = buffer != null;
 		}
 		
 		[CommandHandler (EditCommands.LowercaseSelection)]
 		public void OnLowercaseSelection ()
 		{
-			IEditableTextBuffer buffer = GetContent <IEditableTextBuffer> ();
+			var buffer = GetContent <TextEditor> ();
 			if (buffer == null)
 				return;
 			
 			string selectedText = buffer.SelectedText;
 			if (string.IsNullOrEmpty (selectedText)) {
-				int pos = buffer.CursorPosition;
-				string ch = buffer.GetText (pos, pos + 1);
+				int pos = buffer.CaretOffset;
+				string ch = buffer.GetTextAt (pos, pos + 1);
 				string lower = ch.ToLower ();
 				if (lower == ch) {
-					buffer.CursorPosition = pos + 1;
+					buffer.CaretOffset = pos + 1;
 					return;
 				};
 				using (var undo = buffer.OpenUndoGroup ()) {
-					buffer.DeleteText (pos, 1);
+					buffer.RemoveText (pos, 1);
 					buffer.InsertText (pos, lower);
-					buffer.CursorPosition = pos + 1;
+					buffer.CaretOffset = pos + 1;
 				}
 			} else {
 				string newText = selectedText.ToLower ();
 				if (newText == selectedText)
 					return;
-				int startPos = buffer.SelectionStartPosition;
+				int startPos = buffer.SelectionRange.Offset;
 				using (var undo = buffer.OpenUndoGroup ()) {
-					buffer.DeleteText (startPos, selectedText.Length);
+					buffer.RemoveText (startPos, selectedText.Length);
 					buffer.InsertText (startPos, newText);
-					buffer.Select (startPos, startPos + newText.Length);
+					buffer.SetSelection (startPos, startPos + newText.Length);
 				}
 			}
 		}
@@ -315,7 +316,7 @@ namespace MonoDevelop.Ide.Gui
 		[CommandUpdateHandler (EditCommands.LowercaseSelection)]
 		protected void OnLowercaseSelection (CommandInfo info)
 		{
-			IEditableTextBuffer buffer = GetContent <IEditableTextBuffer> ();
+			var buffer = GetContent <TextEditor> ();
 			info.Enabled = buffer != null;
 		}
 		
@@ -346,69 +347,68 @@ namespace MonoDevelop.Ide.Gui
 		[CommandHandler (TextEditorCommands.LineEnd)]
 		protected void OnLineEnd ()
 		{
-			Mono.TextEditor.CaretMoveActions.LineEnd (doc.Editor);
+			doc.Editor.EditorActionHost.MoveCaretToLineEnd ();
 		}
 		
 		[CommandHandler (TextEditorCommands.LineStart)]
 		protected void OnLineStart ()
 		{
-			Mono.TextEditor.CaretMoveActions.LineStart (doc.Editor);
+			doc.Editor.EditorActionHost.MoveCaretToLineStart ();
 		}
 		
 		[CommandHandler (TextEditorCommands.DeleteLeftChar)]
 		protected void OnDeleteLeftChar ()
 		{
-			Mono.TextEditor.CaretMoveActions.Left (doc.Editor);
-			Mono.TextEditor.DeleteActions.Delete (doc.Editor);
+			doc.Editor.EditorActionHost.Backspace ();
 		}
 		
 		[CommandHandler (TextEditorCommands.DeleteRightChar)]
 		protected void OnDeleteRightChar ()
 		{
-			Mono.TextEditor.DeleteActions.Delete (doc.Editor);
+			doc.Editor.EditorActionHost.Delete ();
 		}
 		
 		[CommandHandler (TextEditorCommands.CharLeft)]
 		protected void OnCharLeft ()
 		{
-			Mono.TextEditor.CaretMoveActions.Left (doc.Editor);
+			doc.Editor.EditorActionHost.MoveCaretLeft ();
 		}
 		
 		[CommandHandler (TextEditorCommands.CharRight)]
 		protected void OnCharRight ()
 		{
-			Mono.TextEditor.CaretMoveActions.Right (doc.Editor);
+			doc.Editor.EditorActionHost.MoveCaretRight ();
 		}
 		
 		[CommandHandler (TextEditorCommands.LineUp)]
 		protected void OnLineUp ()
 		{
-			Mono.TextEditor.CaretMoveActions.Up (doc.Editor);
+			doc.Editor.EditorActionHost.MoveCaretUp ();
 		}
 		
 		[CommandHandler (TextEditorCommands.LineDown)]
 		protected void OnLineDown ()
 		{
-			Mono.TextEditor.CaretMoveActions.Down (doc.Editor);
+			doc.Editor.EditorActionHost.MoveCaretDown ();
 		}
 		
 		[CommandHandler (TextEditorCommands.DocumentStart)]
 		protected void OnDocumentStart ()
 		{
-			Mono.TextEditor.CaretMoveActions.ToDocumentStart (doc.Editor);
+			doc.Editor.EditorActionHost.MoveCaretToDocumentStart ();
 		}
 		
 		[CommandHandler (TextEditorCommands.DocumentEnd)]
 		protected void OnDocumentEnd ()
 		{
-			Mono.TextEditor.CaretMoveActions.ToDocumentEnd (doc.Editor);
+			doc.Editor.EditorActionHost.MoveCaretToDocumentEnd ();
 		}
 		
 		[CommandHandler (TextEditorCommands.DeleteLine)]
 		protected void OnDeleteLine ()
 		{
-			var line = doc.Editor.Document.GetLine (doc.Editor.Caret.Line);
-			doc.Editor.Remove (line.Offset, line.LengthIncludingDelimiter);
+			var line = doc.Editor.GetLine (doc.Editor.CaretLocation.Line);
+			doc.Editor.RemoveText (line.Offset, line.LengthIncludingDelimiter);
 		}
 		
 		struct RemoveInfo
@@ -435,7 +435,7 @@ namespace MonoDevelop.Ide.Gui
 				return ch == ' ' || ch == '\t' || ch == '\v';
 			}
 			
-			public static RemoveInfo GetRemoveInfo (Mono.TextEditor.TextDocument document, ref int pos)
+			public static RemoveInfo GetRemoveInfo (TextEditor document, ref int pos)
 			{
 				int len = 0;
 				while (pos > 0 && IsWhiteSpace (document.GetCharAt (pos))) {
@@ -458,22 +458,22 @@ namespace MonoDevelop.Ide.Gui
 		[CommandHandler (EditCommands.RemoveTrailingWhiteSpaces)]
 		public void OnRemoveTrailingWhiteSpaces ()
 		{
-			Mono.TextEditor.TextEditorData data = doc.Editor;
+			var data = doc.Editor;
 			if (data == null)
 				return;
 			
 			System.Collections.Generic.List<RemoveInfo> removeList = new System.Collections.Generic.List<RemoveInfo> ();
-			int pos = data.Document.TextLength - 1;
-			RemoveInfo removeInfo = RemoveInfo.GetRemoveInfo (data.Document, ref pos);
+			int pos = data.Length - 1;
+			RemoveInfo removeInfo = RemoveInfo.GetRemoveInfo (data, ref pos);
 			if (!removeInfo.IsEmpty)
 				removeList.Add (removeInfo);
 			
 			while (pos >= 0) {
-				char ch = data.Document.GetCharAt (pos);
+				char ch = data.GetCharAt (pos);
 				if (ch == '\n' || ch == '\r') {
-					if (RemoveInfo.IsWhiteSpace (data.Document.GetCharAt (pos - 1))) {
+					if (RemoveInfo.IsWhiteSpace (data.GetCharAt (pos - 1))) {
 						--pos;
-						removeInfo = RemoveInfo.GetRemoveInfo (data.Document, ref pos);
+						removeInfo = RemoveInfo.GetRemoveInfo (data, ref pos);
 						if (!removeInfo.IsEmpty)
 							removeList.Add (removeInfo);
 					}
@@ -482,8 +482,7 @@ namespace MonoDevelop.Ide.Gui
 			}
 			using (var undo = data.OpenUndoGroup ()) {
 				foreach (var info in removeList) {
-					data.Document.Remove (info.Position, info.Length);
-					data.Document.CommitLineUpdate (data.Document.OffsetToLineNumber (info.Position));
+					data.RemoveText (info.Position, info.Length);
 				}
 			}
 		}
@@ -491,7 +490,7 @@ namespace MonoDevelop.Ide.Gui
 		[CommandUpdateHandler (EditCommands.RemoveTrailingWhiteSpaces)]
 		protected void OnRemoveTrailingWhiteSpaces (CommandInfo info)
 		{
-			info.Enabled = GetContent <IEditableTextBuffer> () != null;
+			info.Enabled = GetContent <TextEditor> () != null;
 		}
 		
 		#region Folding
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
index d53c7c1c9c..ff8260efa1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
@@ -51,6 +51,7 @@ using MonoDevelop.Ide.Navigation;
 using MonoDevelop.Components.Docking;
 using MonoDevelop.Components.DockNotebook;
 using System.Text;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.Gui
 {
@@ -441,6 +442,25 @@ namespace MonoDevelop.Ide.Gui
 			return OpenDocument (openFileInfo);
 		}
 
+		static void ScrollToRequestedCaretLocation (Document doc, FileOpenInformation info)
+		{
+			var ipos = doc.Editor;
+			if ((info.Line >= 1 || info.Offset >= 0) && ipos != null) {
+				doc.DisableAutoScroll ();
+				doc.RunWhenLoaded (() => {
+					var loc = new DocumentLocation (info.Line, info.Column >= 1 ? info.Column : 1);
+					if (info.Offset >= 0) {
+						loc = ipos.OffsetToLocation (info.Offset);
+					}
+					if (loc.IsEmpty)
+						return;
+					ipos.SetCaretLocation (loc, info.Options.HasFlag (OpenDocumentOptions.HighlightCaretLine));
+					if (info.Options.HasFlag (OpenDocumentOptions.CenterCaretLine))
+						ipos.CenterToCaret ();
+				});
+			}
+		}
+		
 		internal Document OpenDocument (FilePath fileName, Project project, int line, int column, OpenDocumentOptions options, Encoding Encoding, IViewDisplayBinding binding, DockNotebook dockNotebook)
 		{
 			var openFileInfo = new FileOpenInformation (fileName, project) {
@@ -455,7 +475,6 @@ namespace MonoDevelop.Ide.Gui
 			return OpenDocument (openFileInfo);
 		}
 
-
 		public Document OpenDocument (FileOpenInformation info)
 		{
 			if (string.IsNullOrEmpty (info.FileName))
@@ -481,18 +500,7 @@ namespace MonoDevelop.Ide.Gui
 								doc.SetProject (info.Project); 
 							}
 
-							IEditableTextBuffer ipos = (IEditableTextBuffer) vcFound.GetContent (typeof(IEditableTextBuffer));
-							if (info.Line >= 1 && ipos != null) {
-								doc.DisableAutoScroll ();
-								doc.RunWhenLoaded (() =>
-									ipos.SetCaretTo (
-										info.Line,
-										info.Column >= 1 ? info.Column : 1,
-										info.Options.HasFlag (OpenDocumentOptions.HighlightCaretLine),
-										info.Options.HasFlag (OpenDocumentOptions.CenterCaretLine)
-									)
-								);
-							}
+							ScrollToRequestedCaretLocation (doc, info);
 							
 							if (info.Options.HasFlag (OpenDocumentOptions.BringToFront)) {
 								doc.Select ();
@@ -518,6 +526,9 @@ namespace MonoDevelop.Ide.Gui
 				if (info.NewContent != null) {
 					Counters.OpenDocumentTimer.Trace ("Wrapping document");
 					Document doc = WrapDocument (info.NewContent.WorkbenchWindow);
+					
+					ScrollToRequestedCaretLocation (doc, info);
+					
 					if (doc != null && info.Options.HasFlag (OpenDocumentOptions.BringToFront)) {
 						doc.RunWhenLoaded (() => {
 							if (doc.Window != null)
@@ -577,7 +588,7 @@ namespace MonoDevelop.Ide.Gui
 			if (binding == null)
 				throw new ApplicationException("Can't create display binding for mime type: " + mimeType);				
 			
-			IViewContent newContent = binding.CreateContent (null, mimeType, null);
+			IViewContent newContent = binding.CreateContent (defaultName, mimeType, null);
 			using (content) {
 				newContent.LoadNew (content, mimeType);
 			}
@@ -588,9 +599,8 @@ namespace MonoDevelop.Ide.Gui
 			
 			newContent.UntitledName = defaultName;
 			newContent.IsDirty = true;
-			workbench.ShowView (newContent, true);
-			DisplayBindingService.AttachSubWindows (newContent.WorkbenchWindow, binding);
-			
+			workbench.ShowView (newContent, true, binding);
+
 			var document = WrapDocument (newContent.WorkbenchWindow);
 			document.StartReparseThread ();
 			return document;
@@ -979,8 +989,8 @@ namespace MonoDevelop.Ide.Gui
 			var dp = new DocumentUserPrefs ();
 			dp.FileName = FileService.AbsoluteToRelativePath (args.Item.BaseDirectory, document.FileName);
 			if (document.Editor != null) {
-				dp.Line = document.Editor.Caret.Line;
-				dp.Column = document.Editor.Caret.Column;
+				dp.Line = document.Editor.CaretLine;
+				dp.Column = document.Editor.CaretColumn;
 			}
 			return dp;
 		}
@@ -1161,6 +1171,7 @@ namespace MonoDevelop.Ide.Gui
 			ThreadPool.QueueUserWorkItem (delegate {
 				lock (fileStatusLock) {
 //					DateTime t = DateTime.Now;
+
 					if (fileStatus == null)
 						return;
 					List<FilePath> modified = new List<FilePath> (fileStatus.Count);
@@ -1257,7 +1268,30 @@ namespace MonoDevelop.Ide.Gui
 			}
 		}
 	}
-
+	
+	public class FileSaveInformation
+	{
+		FilePath fileName;
+		public FilePath FileName {
+			get {
+				return fileName;
+			}
+			set {
+				fileName = value.CanonicalPath;
+				if (fileName.IsNullOrEmpty)
+					LoggingService.LogError ("FileName == null\n" + Environment.StackTrace);
+			}
+		}
+		
+		public Encoding Encoding { get; set; }
+		
+		public FileSaveInformation (FilePath fileName, Encoding encoding = null)
+		{
+			this.FileName = fileName;
+			this.Encoding = encoding;
+		}
+	}
+	
 	public class FileOpenInformation
 	{
 		FilePath fileName;
@@ -1266,19 +1300,29 @@ namespace MonoDevelop.Ide.Gui
 				return fileName;
 			}
 			set {
-				fileName = FileService.ResolveFullPath (value.CanonicalPath);
+				fileName = value.CanonicalPath.ResolveLinks ();
 				if (fileName.IsNullOrEmpty)
 					LoggingService.LogError ("FileName == null\n" + Environment.StackTrace);
 			}
 		}
 
 		public OpenDocumentOptions Options { get; set; }
+		int offset = -1;
+		public int Offset {
+			get {
+				return offset;
+			}
+			set {
+				offset = value;
+			}
+		}
 		public int Line { get; set; }
 		public int Column { get; set; }
 		public IViewDisplayBinding DisplayBinding { get; set; }
 		public IViewContent NewContent { get; set; }
 		public Encoding Encoding { get; set; }
 		public Project Project { get; set; }
+
 		internal DockNotebook DockNotebook { get; set; }
 
 		[Obsolete("Use FileOpenInformation (FilePath filePath, Project project, int line, int column, OpenDocumentOptions options)")]
@@ -1291,7 +1335,7 @@ namespace MonoDevelop.Ide.Gui
 
 		}
 
-		public FileOpenInformation (FilePath filePath, Project project)
+		public FileOpenInformation (FilePath filePath, Project project = null)
 		{
 			this.FileName = filePath;
 			this.Project = project;
@@ -1393,12 +1437,8 @@ namespace MonoDevelop.Ide.Gui
 				
 				Counters.OpenDocumentTimer.Trace ("Loading file");
 				
-				IEncodedTextContent etc = (IEncodedTextContent) newContent.GetContent (typeof(IEncodedTextContent));
 				try {
-					if (fileInfo.Encoding != null && etc != null)
-						etc.Load (fileName, fileInfo.Encoding);
-					else
-						newContent.Load (fileName);
+					newContent.Load (fileInfo);
 				} catch (InvalidEncodingException iex) {
 					monitor.ReportError (GettextCatalog.GetString ("The file '{0}' could not opened. {1}", fileName, iex.Message), null);
 					return;
@@ -1420,14 +1460,14 @@ namespace MonoDevelop.Ide.Gui
 
 			Counters.OpenDocumentTimer.Trace ("Showing view");
 
-			workbench.ShowView (newContent, fileInfo.Options.HasFlag (OpenDocumentOptions.BringToFront), fileInfo.DockNotebook);
+			workbench.ShowView (newContent, fileInfo.Options.HasFlag (OpenDocumentOptions.BringToFront), binding, fileInfo.DockNotebook);
 
-			DisplayBindingService.AttachSubWindows (newContent.WorkbenchWindow, binding);
 			newContent.WorkbenchWindow.DocumentType = binding.Name;
 			
-			IEditableTextBuffer ipos = (IEditableTextBuffer) newContent.GetContent (typeof(IEditableTextBuffer));
+
+			var ipos = (TextEditor) newContent.GetContent (typeof(TextEditor));
 			if (fileInfo.Line > 0 && ipos != null) {
-				Mono.TextEditor.Utils.FileSettingsStore.Remove (fileName);
+				FileSettingsStore.Remove (fileName);
 				ipos.RunWhenLoaded (JumpToLine); 
 			}
 			
@@ -1436,8 +1476,12 @@ namespace MonoDevelop.Ide.Gui
 		
 		void JumpToLine ()
 		{
-			IEditableTextBuffer ipos = (IEditableTextBuffer) newContent.GetContent (typeof(IEditableTextBuffer));
-			ipos.SetCaretTo (Math.Max(1, fileInfo.Line), Math.Max(1, fileInfo.Column), fileInfo.Options.HasFlag (OpenDocumentOptions.HighlightCaretLine));
+			var ipos = (TextEditor) newContent.GetContent (typeof(TextEditor));
+			var loc = new DocumentLocation (Math.Max(1, fileInfo.Line), Math.Max(1, fileInfo.Column));
+			if (fileInfo.Offset >= 0) {
+				loc = ipos.OffsetToLocation (fileInfo.Offset);
+			}
+			ipos.SetCaretLocation (loc, fileInfo.Options.HasFlag (OpenDocumentOptions.HighlightCaretLine));
 		}
 	}
 	
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/WorkbenchWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/WorkbenchWindow.cs
index 92ed672f84..06098c686c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/WorkbenchWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/WorkbenchWindow.cs
@@ -26,6 +26,7 @@
 
 using System;
 using System.Collections.Generic;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Ide.Gui
 {
@@ -35,7 +36,7 @@ namespace MonoDevelop.Ide.Gui
 		
 		public WorkbenchWindow (): base (Gtk.WindowType.Toplevel)
 		{
-			Mono.TextEditor.GtkWorkarounds.FixContainerLeak (this);
+			GtkWorkarounds.FixContainerLeak (this);
 			this.Role = "workbench";
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs
index a1af09c25c..934c975f87 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs
@@ -159,7 +159,7 @@ namespace MonoDevelop.Ide.Navigation
 					return point;
 			}
 			
-			IEditableTextBuffer editBuf = doc.GetContent<IEditableTextBuffer> ();
+			var editBuf = doc.Editor;
 			if (editBuf != null) {
 				point = new TextFileNavigationPoint (doc, editBuf);
 				if (point != null)
@@ -291,8 +291,8 @@ namespace MonoDevelop.Ide.Navigation
 			currentDoc.Closed += HandleCurrentDocClosed;
 			
 			if (currentDoc.Editor != null) {
-				currentDoc.Editor.Document.TextReplaced += BufferTextChanged;
-				currentDoc.Editor.Caret.PositionChanged += BufferCaretPositionChanged;
+				currentDoc.Editor.TextChanged += BufferTextChanged;
+				currentDoc.Editor.CaretPositionChanged += BufferCaretPositionChanged;
 			}
 		}
 
@@ -308,8 +308,8 @@ namespace MonoDevelop.Ide.Navigation
 			
 			currentDoc.Closed -= HandleCurrentDocClosed;
 			if (currentDoc.Editor != null) {
-				currentDoc.Editor.Document.TextReplaced -= BufferTextChanged;
-				currentDoc.Editor.Caret.PositionChanged -= BufferCaretPositionChanged;
+				currentDoc.Editor.TextChanged -= BufferTextChanged;
+				currentDoc.Editor.CaretPositionChanged -= BufferCaretPositionChanged;
 			}
 			currentDoc = null;
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/TextFileNavigationPoint.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/TextFileNavigationPoint.cs
index 82087312c9..d17c03e0c9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/TextFileNavigationPoint.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/TextFileNavigationPoint.cs
@@ -31,6 +31,7 @@ using System;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.Navigation
 {
@@ -39,10 +40,12 @@ namespace MonoDevelop.Ide.Navigation
 		int line;
 		int column;
 		
-		public TextFileNavigationPoint (Document doc, IEditableTextBuffer buffer)
+		public TextFileNavigationPoint (Document doc, TextEditor buffer)
 			: base (doc)
 		{
-			buffer.GetLineColumnFromPosition (buffer.CursorPosition, out line, out column);
+			var location = buffer.CaretLocation;
+			line = location.Line;
+			column = location.Column;
 		}
 		
 		public TextFileNavigationPoint (FilePath file, int line, int column)
@@ -79,11 +82,11 @@ namespace MonoDevelop.Ide.Navigation
 		{
 			Document doc = base.DoShow ();
 			if (doc != null) {
-				IEditableTextBuffer buf = doc.GetContent<IEditableTextBuffer> ();
+				var buf = doc.Editor;
 				if (buf != null) {
 					doc.DisableAutoScroll ();
 					buf.RunWhenLoaded (() => {
-						buf.SetCaretTo (Math.Max (line, 1), Math.Max (column, 1));
+						buf.SetCaretLocation (Math.Max (line, 1), Math.Max (column, 1));
 					});
 				}
 			}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs
index ac66b89aef..2cd7be2053 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs
@@ -34,6 +34,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.ProgressMonitoring;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Ide.ProgressMonitoring
 {
@@ -74,7 +75,7 @@ namespace MonoDevelop.Ide.ProgressMonitoring
 					TransientFor = parent,
 				};
 				MessageService.PlaceDialog (dialog, parent);
-				Mono.TextEditor.GtkWorkarounds.PresentWindowWithNotification (dialog);
+				GtkWorkarounds.PresentWindowWithNotification (dialog);
 				dialog.CancellationTokenSource = CancellationTokenSource;
 				DispatchService.RunPendingEvents ();
 				this.showDetails = showDetails;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ApplyPolicyDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ApplyPolicyDialog.cs
index e5d8570872..876fd4dc31 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ApplyPolicyDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ApplyPolicyDialog.cs
@@ -30,6 +30,7 @@ using MonoDevelop.Ide;
 using MonoDevelop.Core;
 using System.Collections.Generic;
 using System.Text;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Ide.Projects
 {
@@ -206,7 +207,7 @@ namespace MonoDevelop.Ide.Projects
 				return true;
 			}
 			
-			using (var layout = Mono.TextEditor.PangoUtil.CreateLayout (this)) {
+			using (var layout = PangoUtil.CreateLayout (this)) {
 				layout.SetMarkup ("<i>" + GLib.Markup.EscapeText (message) + "</i>");
 				int w, h;
 				layout.GetPixelSize (out w, out h);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs
index 4d2ea70c0d..3a19b8397c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs
@@ -283,7 +283,7 @@ namespace MonoDevelop.Ide.Projects
 		{
 			StringBuilder result = new StringBuilder ();
 			int lastPos = 0;
-			var color = Mono.TextEditor.HslColor.GenerateHighlightColors (widget.Style.Base (StateType.Normal), 
+			var color = HslColor.GenerateHighlightColors (widget.Style.Base (StateType.Normal), 
 				widget.Style.Text (StateType.Normal), 3)[2];
 			for (int n=0; n < matches.Length; n++) {
 				int pos = matches[n] - startIndex;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.UI.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.UI.cs
index c1b7cfd6b7..a6477cfad3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.UI.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.UI.cs
@@ -75,7 +75,6 @@ namespace MonoDevelop.Ide.Projects
 			WidthRequest = 901;

 			HeightRequest = 632;

 

-			Modal = true;

 			Name = "wizard_dialog";

 			Title = GettextCatalog.GetString ("New Project");

 			WindowPosition = WindowPosition.CenterOnParent;

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs
index 155bfca65d..473abc0799 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs
@@ -195,7 +195,7 @@ namespace MonoDevelop.Ide.Projects
 			if (BasePath == null)

 				BasePath = IdeApp.ProjectOperations.ProjectsDefaultPath;

 

-			projectConfiguration.Location = FileService.ResolveFullPath (BasePath);

+			projectConfiguration.Location = new FilePath (BasePath).ResolveLinks ();

 		}

 

 		void SetDefaultGitSettings ()

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/PackageReferencePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/PackageReferencePanel.cs
index ad2aa73f1a..81850c4eb2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/PackageReferencePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/PackageReferencePanel.cs
@@ -240,7 +240,7 @@ namespace MonoDevelop.Ide.Projects
 		{
 			StringBuilder result = new StringBuilder ();
 			int lastPos = 0;
-			var color = Mono.TextEditor.HslColor.GenerateHighlightColors (widget.Style.Base (StateType.Normal), 
+			var color = HslColor.GenerateHighlightColors (widget.Style.Base (StateType.Normal), 
 				widget.Style.Text (StateType.Normal), 3)[2];
 			for (int n=0; n < matches.Length; n++) {
 				int pos = matches[n] - startIndex;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
index c8a995266b..6504bf4fc7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
@@ -30,15 +30,12 @@ using System.Linq;
 
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
-using MonoDevelop.Core.Assemblies;
 
 using Gtk;
 using System.Collections.Generic;
 using MonoDevelop.Components;
-using MonoDevelop.Ide.Commands;
 using MonoDevelop.Components.Commands;
 using System.IO;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Ide.Projects
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksChangedEventHandler.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksChangedEventHandler.cs
index 514601b9f1..945cd9a5fb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksChangedEventHandler.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksChangedEventHandler.cs
@@ -33,11 +33,11 @@ namespace MonoDevelop.Ide.Tasks
 {
 	public class CommentTasksChangedEventArgs : EventArgs
 	{
-		string filename;
-		IList<Tag> tagComments;
-		Project project;
+		readonly string filename;
+		readonly IReadOnlyList<Tag> tagComments;
+		readonly Project project;
 		
-		public CommentTasksChangedEventArgs (string filename, IList<Tag> tagComments, Project project)
+		public CommentTasksChangedEventArgs (string filename, IReadOnlyList<Tag> tagComments, Project project)
 		{
 			this.filename = filename;
 			this.tagComments = tagComments;
@@ -46,7 +46,7 @@ namespace MonoDevelop.Ide.Tasks
 		
 		public string FileName { get { return filename; } }
 
-		public IList<Tag> TagComments { get { return tagComments; } }
+		public IReadOnlyList<Tag> TagComments { get { return tagComments; } }
 
 		public Project Project { get { return project; } }
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs
index b01e917033..509f2998b7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs
@@ -36,10 +36,11 @@ using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
-using MonoDevelop.Projects.Text;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
+using MonoDevelop.Ide.Editor;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Ide.Tasks
 {
@@ -83,9 +84,12 @@ namespace MonoDevelop.Ide.Tasks
 			
 			TaskService.CommentTasksChanged += OnCommentTasksChanged;
 			CommentTag.SpecialCommentTagsChanged += OnCommentTagsChanged;
-			IdeApp.Workspace.WorkspaceItemLoaded += OnWorkspaceItemLoaded;
+
+			MonoDevelopWorkspace.LoadingFinished += OnWorkspaceItemLoaded;
 			IdeApp.Workspace.WorkspaceItemUnloaded += OnWorkspaceItemUnloaded;
-			
+			IdeApp.Workbench.DocumentOpened += WorkbenchDocumentOpened;
+			IdeApp.Workbench.DocumentClosed += WorkbenchDocumentClosed;;
+
 			highPrioColor = StringToColor ((string)PropertyService.Get ("Monodevelop.UserTasksHighPrioColor", ""));
 			normalPrioColor = StringToColor ((string)PropertyService.Get ("Monodevelop.UserTasksNormalPrioColor", ""));
 			lowPrioColor = StringToColor ((string)PropertyService.Get ("Monodevelop.UserTasksLowPrioColor", ""));
@@ -124,15 +128,8 @@ namespace MonoDevelop.Ide.Tasks
 			col.Resizable = true;
 
 			LoadColumnsVisibility ();
-			
-			comments.BeginTaskUpdates ();
-			try {
-				foreach (var item in IdeApp.Workspace.Items) {
-					LoadWorkspaceItemContents (item);
-				}
-			} finally {
-				comments.EndTaskUpdates ();
-			}
+
+			OnWorkspaceItemLoaded (null, EventArgs.Empty);
 
 			comments.TasksAdded += GeneratedTaskAdded;
 			comments.TasksRemoved += GeneratedTaskRemoved;
@@ -147,7 +144,7 @@ namespace MonoDevelop.Ide.Tasks
 				view.RowActivated -= OnRowActivated;
 				TaskService.CommentTasksChanged -= OnCommentTasksChanged;
 				CommentTag.SpecialCommentTagsChanged -= OnCommentTagsChanged;
-				IdeApp.Workspace.WorkspaceItemLoaded -= OnWorkspaceItemLoaded;
+				MonoDevelopWorkspace.LoadingFinished -= OnWorkspaceItemLoaded;
 				IdeApp.Workspace.WorkspaceItemUnloaded -= OnWorkspaceItemUnloaded;
 				comments.TasksAdded -= GeneratedTaskAdded;
 				comments.TasksRemoved -= GeneratedTaskRemoved;
@@ -156,6 +153,38 @@ namespace MonoDevelop.Ide.Tasks
 			};
 		}
 
+		void WorkbenchDocumentClosed (object sender, DocumentEventArgs e)
+		{
+			e.Document.DocumentParsed -= HandleDocumentParsed;
+		}
+
+		void WorkbenchDocumentOpened (object sender, DocumentEventArgs e)
+		{
+			e.Document.DocumentParsed += HandleDocumentParsed;
+		}
+
+		void HandleDocumentParsed (object sender, EventArgs e)
+		{
+			var doc = (Document)sender;
+			var pd = doc.ParsedDocument;
+			var project = doc.Project;
+			if (pd == null || project == null)
+				return;
+			ProjectCommentTags tags;
+			if (!projectTags.TryGetValue (project, out tags))
+				return;
+			var token = src.Token;
+			var file = doc.FileName;
+			Task.Run (async () => {
+				try {
+					tags.UpdateTags (project, file, await pd.GetTagCommentsAsync (token));
+				} catch (TaskCanceledException) {
+				} catch (AggregateException ae) {
+					ae.Flatten ().Handle (x => x is TaskCanceledException);
+				}
+			});
+		}
+
 		void LoadColumnsVisibility ()
 		{
 			string columns = (string)PropertyService.Get ("Monodevelop.CommentTasksColumns", "TRUE;TRUE;TRUE;TRUE");
@@ -181,76 +210,66 @@ namespace MonoDevelop.Ide.Tasks
 			PropertyService.Set ("Monodevelop.CommentTasksColumns", columns);
 		}
 		
-		void OnWorkspaceItemLoaded (object sender, WorkspaceItemEventArgs e)
+		void OnWorkspaceItemLoaded (object sender, EventArgs e)
 		{
 			comments.BeginTaskUpdates ();
 			try {
-				LoadWorkspaceItemContents (e.Item);
+				foreach (var sln in IdeApp.Workspace.GetAllSolutions ())
+					LoadSolutionContents (sln);
 			}
 			finally {
 				comments.EndTaskUpdates ();
 			}
 		}
-		
-		void LoadWorkspaceItemContents (WorkspaceItem wob)
-		{
-			foreach (var sln in wob.GetAllItems<Solution> ())
-				LoadSolutionContents (sln);
-		}
 
-		void UpdateCommentTagsForProject (Solution solution, Project project)
+		Dictionary<Project, ProjectCommentTags> projectTags = new Dictionary<Project, ProjectCommentTags> ();
+		CancellationTokenSource src = new CancellationTokenSource ();
+		void UpdateCommentTagsForProject (Solution solution, Project project, CancellationToken token)
 		{
-			var ctx = TypeSystemService.GetProjectContentWrapper (project);
-			if (ctx == null)
+			if (token.IsCancellationRequested)
 				return;
-			var tags = ctx.GetExtensionObject<ProjectCommentTags> ();
-			if (tags == null) {
+			ProjectCommentTags tags;
+			if (!projectTags.TryGetValue (project, out tags)) {
 				tags = new ProjectCommentTags ();
-				ctx.UpdateExtensionObject (tags);
-				tags.Update (ctx.Project);
-			} else {
-				foreach (var kv in tags.Tags) {
-					UpdateCommentTags (solution, kv.Key, kv.Value);
-				}
+				projectTags [project] = tags;
 			}
-		}
-
-		void HandleSolutionItemAdded (object sender, SolutionItemChangeEventArgs e)
-		{
-			var newProject = e.SolutionItem as Project;
-			if (newProject == null)
-				return;
-			UpdateCommentTagsForProject (e.Solution, newProject);
+			var files = project.Files.ToArray ();
+			Task.Run (async () => {
+				try {
+					await tags.UpdateAsync (project, files, token);
+				} catch (TaskCanceledException) {
+				} catch (AggregateException ae) {
+					ae.Flatten ().Handle (x => x is TaskCanceledException);
+				} catch (Exception e) {
+					LoggingService.LogError ("Error while updating comment tags.", e); 
+				}
+			});
 		}
 		
 		void LoadSolutionContents (Solution sln)
 		{
+			src.Cancel ();
+			src = new CancellationTokenSource ();
+			var token = src.Token;
+
 			loadedSlns.Add (sln);
-			System.Threading.ThreadPool.QueueUserWorkItem (delegate {
-				sln.SolutionItemAdded += HandleSolutionItemAdded;
+			Task.Run (delegate {
+				sln.SolutionItemAdded += delegate(object sender, SolutionItemChangeEventArgs e) {
+					var newProject = e.SolutionItem as Project;
+					if (newProject == null)
+						return;
+					UpdateCommentTagsForProject (sln, newProject, token);
+				};
 
 				// Load all tags that are stored in pidb files
 				foreach (Project p in sln.GetAllProjects ()) {
-					UpdateCommentTagsForProject (sln, p);
+					UpdateCommentTagsForProject (sln, p, token);
 				}
 			});
 		}
 		
-		
-		static IEnumerable<Tag> GetSpecialComments (IProjectContent ctx, string name)
-		{
-			var doc = ctx.GetFile (name) as ParsedDocument;
-			if (doc == null)
-				return Enumerable.Empty<Tag> ();
-			return (IEnumerable<Tag>)doc.TagComments;
-		}
-		
 		void OnWorkspaceItemUnloaded (object sender, WorkspaceItemEventArgs e)
 		{
-			foreach (var sln in e.Item.GetAllItems<Solution>()) {
-				if (loadedSlns.Remove (sln))
-					sln.SolutionItemAdded -= HandleSolutionItemAdded;
-			}
 			comments.RemoveItemTasks (e.Item, true);
 		}		
 
@@ -506,7 +525,7 @@ namespace MonoDevelop.Ide.Tasks
 		{
 			TaskListEntry task = SelectedTask;
 			if (task != null && ! String.IsNullOrEmpty (task.FileName)) {
-				Document doc = IdeApp.Workbench.OpenDocument (task.FileName, Math.Max (1, task.Line), Math.Max (1, task.Column));
+				var doc = IdeApp.Workbench.OpenDocument (task.FileName, Math.Max (1, task.Line), Math.Max (1, task.Column));
 				if (doc != null && doc.HasProject && doc.Project is DotNetProject) {
 					string[] commentTags = doc.CommentTags;
 					if (commentTags != null && commentTags.Length == 1) {
@@ -515,10 +534,11 @@ namespace MonoDevelop.Ide.Tasks
 							string line = doc.Editor.GetLineText (task.Line);
 							int index = line.IndexOf (commentTags[0]);
 							if (index != -1) {
-								doc.Editor.SetCaretTo (task.Line, task.Column);
+								doc.Editor.CaretLocation = new DocumentLocation (task.Line, task.Column);
+								doc.Editor.StartCaretPulseAnimation ();
 								line = line.Substring (0, index);
-								var ls = doc.Editor.Document.GetLine (task.Line);
-								doc.Editor.Replace (ls.Offset, ls.Length, line);
+								var ls = doc.Editor.GetLine (task.Line);
+								doc.Editor.ReplaceText (ls.Offset, ls.Length, line);
 								comments.Remove (task);
 							}
 						}); 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ProjectCommentTags.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/ProjectCommentTags.cs
index c2b33ee0b0..9f9fcb9476 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ProjectCommentTags.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/ProjectCommentTags.cs
@@ -29,11 +29,13 @@ using System.Collections.Generic;
 using System.Collections.Concurrent;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.Tasks;
+using System.Threading;
+using MonoDevelop.Ide.TypeSystem;
+using System.Threading.Tasks;
 
-namespace MonoDevelop.Ide.TypeSystem
+namespace MonoDevelop.Ide.Tasks
 {
-	[Serializable]
-	public class ProjectCommentTags
+	class ProjectCommentTags
 	{
 		readonly Dictionary<string, List<Tag>> tags = new Dictionary<string, List<Tag>> ();
 
@@ -43,7 +45,7 @@ namespace MonoDevelop.Ide.TypeSystem
 			}
 		}
 
-		public void UpdateTags (Project project, string fileName, IList<Tag> tagComments)
+		public void UpdateTags (Project project, string fileName, IReadOnlyList<Tag> tagComments)
 		{
 			var list = tagComments == null || tagComments.Count == 0 ? null : new List<Tag> (tagComments);
 			lock (tags) {
@@ -67,14 +69,15 @@ namespace MonoDevelop.Ide.TypeSystem
 			TaskService.InformCommentTasks (new CommentTasksChangedEventArgs (fileName, null, project));
 		}
 
-		internal void Update (Project project)
+		internal async Task UpdateAsync (Project project, ProjectFile[] files, CancellationToken token = default (CancellationToken))
 		{
-			foreach (var file in project.Files) {
+			foreach (var file in files) {
 				if (file.BuildAction == BuildAction.None)
 					continue;
-				TypeSystemService.ParseFile (project, file.FilePath);
+				var pd = await TypeSystemService.ParseFile (project, file.FilePath, token).ConfigureAwait (false);
+				if (pd != null)
+					UpdateTags (project, file.FilePath, await pd.GetTagCommentsAsync (token));
 			}
 		}
 	}
-}
-
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTask.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskListEntry.cs
index 9ddda8db4d..fb8db5ea77 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTask.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskListEntry.cs
@@ -1,5 +1,5 @@
 // 
-// Task.cs
+// TaskListEntry.cs
 //  
 // Author:
 //       Lluis Sanchez Gual <lluis@novell.com>
@@ -31,7 +31,7 @@ using System.CodeDom.Compiler;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide.Gui.Pads.ProjectPad;

+using MonoDevelop.Ide.Gui.Pads.ProjectPad;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Serialization;
 
@@ -64,7 +64,7 @@ namespace MonoDevelop.Ide.Tasks
 		bool completed;
 		
 		object owner;
-		WorkspaceObject parentObject;
+		IWorkspaceObject parentObject;
 		internal int SavedLine;
 
 		public TaskListEntry (FilePath file, string description, int column, int line, TaskSeverity severity)
@@ -77,12 +77,12 @@ namespace MonoDevelop.Ide.Tasks
 		{
 		}
 		
-		public TaskListEntry (FilePath file, string description, int column, int line, TaskSeverity severity, TaskPriority priority, WorkspaceObject parent)
+		public TaskListEntry (FilePath file, string description, int column, int line, TaskSeverity severity, TaskPriority priority, IWorkspaceObject parent)
 			: this (file, description, column, line, severity, priority, parent, null)
 		{
 		}
 		
-		public TaskListEntry (FilePath file, string description, int column, int line, TaskSeverity severity, TaskPriority priority, WorkspaceObject parent, object owner)
+		public TaskListEntry (FilePath file, string description, int column, int line, TaskSeverity severity, TaskPriority priority, IWorkspaceObject parent, object owner)
 		{
 			this.file = file;
 			this.description = description;
@@ -106,7 +106,7 @@ namespace MonoDevelop.Ide.Tasks
 		
 		public TaskListEntry (BuildError error, object owner)
 		{
-			parentObject = error.SourceTarget as WorkspaceObject;
+			parentObject = error.SourceTarget;
 			file = error.FileName;
 			this.owner = owner;
 			description = error.ErrorText;
@@ -179,7 +179,7 @@ namespace MonoDevelop.Ide.Tasks
 			}
 		}
 		
-		public WorkspaceObject WorkspaceObject {
+		public IWorkspaceObject WorkspaceObject {
 			get {
 				return parentObject;
 			}
@@ -224,17 +224,17 @@ namespace MonoDevelop.Ide.Tasks
 			TaskService.InformJumpToTask (this);
 		}
 		
-		public bool BelongsToItem (WorkspaceObject item, bool checkHierarchy)
+		public bool BelongsToItem (IWorkspaceObject item, bool checkHierarchy)
 		{
 			if (!checkHierarchy)
 				return item == parentObject;
 			
-			WorkspaceObject cit = parentObject;
+			IWorkspaceObject cit = parentObject;
 			do {
 				if (cit == item)
 					return true;
-				if (cit is SolutionFolderItem) {
-					SolutionFolderItem si = (SolutionFolderItem) cit;
+				if (cit is SolutionItem) {
+					SolutionItem si = (SolutionItem) cit;
 					if (si.ParentFolder != null)
 						cit = si.ParentFolder;
 					else
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskService.cs
index a00767d569..408d4189cb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskService.cs
@@ -54,8 +54,10 @@ namespace MonoDevelop.Ide.Tasks
 		
 		static TaskService ()
 		{
-			IdeApp.Workspace.WorkspaceItemLoaded += OnWorkspaceItemLoaded;
-			IdeApp.Workspace.WorkspaceItemUnloaded += OnWorkspaceItemUnloaded;
+			if (IdeApp.Workspace != null) {
+				IdeApp.Workspace.WorkspaceItemLoaded += OnWorkspaceItemLoaded;
+				IdeApp.Workspace.WorkspaceItemUnloaded += OnWorkspaceItemUnloaded;
+			}
 			errors.ItemName = GettextCatalog.GetString ("Warning/Error");
 			userTasks.ItemName = GettextCatalog.GetString ("User Task");
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs
index 5bc6c0215d..7db2b7aef8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs
@@ -23,17 +23,17 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-//------------------------------------------------------------------------------

-// <auto-generated>

-//     This code was generated by a tool.

-//     Runtime Version:2.0.50727.3074

-//

-//     Changes to this file may cause incorrect behavior and will be lost if

-//     the code is regenerated.

-// </auto-generated>

-//------------------------------------------------------------------------------

-

-using System;

+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.3074
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using MonoDevelop.Core;
@@ -42,12 +42,12 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Navigation;
 using MonoDevelop.Ide.TextEditing;
-using MonoDevelop.Ide.Desktop;

-

-namespace MonoDevelop.Ide.Tasks

-{

-	public class TaskStore: IEnumerable<TaskListEntry>, ILocationList

-	{

+using MonoDevelop.Ide.Desktop;
+
+namespace MonoDevelop.Ide.Tasks
+{
+	public class TaskStore: IEnumerable<TaskListEntry>, ILocationList
+	{
 		int taskUpdateCount;
 		List<TaskListEntry> tasks = new List<TaskListEntry> ();
 		Dictionary<FilePath,TaskListEntry[]> taskIndex = new Dictionary<FilePath, TaskListEntry[]> ();
@@ -59,11 +59,13 @@ namespace MonoDevelop.Ide.Tasks
 		List<TaskListEntry> tasksAdded;
 		List<TaskListEntry> tasksRemoved;
 		
-		public TaskStore ()

-		{

-			IdeApp.Workspace.FileRenamedInProject += ProjectFileRenamed;
-			IdeApp.Workspace.FileRemovedFromProject += ProjectFileRemoved;
-			
+		public TaskStore ()
+		{
+			if (IdeApp.Workspace != null) {
+				IdeApp.Workspace.FileRenamedInProject += ProjectFileRenamed;
+				IdeApp.Workspace.FileRemovedFromProject += ProjectFileRemoved;
+			}
+
 			TextEditorService.LineCountChangesCommitted += delegate (object sender, TextFileEventArgs args) {
 				foreach (TaskListEntry task in GetFileTasks (args.TextFile.Name.FullPath))
 					task.SavedLine = -1;
@@ -198,7 +200,7 @@ namespace MonoDevelop.Ide.Tasks
 					yield return t;
 			}
 		}
-

+
 		public TaskListEntry[] GetFileTasks (FilePath file)
 		{
 			TaskListEntry[] ta;
@@ -523,7 +525,7 @@ namespace MonoDevelop.Ide.Tasks
 		}
 		
 		#endregion
-	}

+	}
 		
 	public delegate void TaskEventHandler (object sender, TaskEventArgs e);
 	
@@ -545,4 +547,4 @@ namespace MonoDevelop.Ide.Tasks
 			get { return tasks; }
 		}
 	}
-}

+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs
index 3a57928536..964f13b1eb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs
@@ -35,8 +35,8 @@ using System.CodeDom.Compiler;
 
 using MonoDevelop.Projects;
 
-using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.Templates
 {
@@ -89,7 +89,7 @@ namespace MonoDevelop.Ide.Templates
 		
 		static string StripHeaderAndBlankLines (string text, CodeDomProvider provider)
 		{
-			Mono.TextEditor.TextDocument doc = new Mono.TextEditor.TextDocument ();
+			var doc = TextEditorFactory.CreateNewDocument ();
 			doc.Text = text;
 			int realStartLine = 0;
 			for (int i = 1; i <= doc.LineCount; i++) {
@@ -106,20 +106,20 @@ namespace MonoDevelop.Ide.Templates
 			// We reformat the C# generated output to the user's coding style anyway, but the reformatter preserves blank lines
 			if (provider is Microsoft.CSharp.CSharpCodeProvider) {
 				for (int i = 1; i <= doc.LineCount; i++) {
-					Mono.TextEditor.DocumentLine line = doc.GetLine (i);
+					var line = doc.GetLine (i);
 					if (IsBlankLine (doc, line) && line.LengthIncludingDelimiter > 0) {
-						doc.Remove (line.Offset, line.LengthIncludingDelimiter);
+						doc.RemoveText (line.Offset, line.LengthIncludingDelimiter);
 						i--;
 						continue;
 					}
 				}
 			}
 			
-			int offset = doc.GetLine (Math.Max(Mono.TextEditor.DocumentLocation.MinLine, realStartLine)).Offset;
-			return doc.GetTextAt (offset, doc.TextLength - offset);
+			int offset = doc.GetLine (realStartLine).Offset;
+			return doc.GetTextAt (offset, doc.Length - offset);
 		}
 
-		static bool IsBlankLine (Mono.TextEditor.TextDocument doc, Mono.TextEditor.DocumentLine line)
+		static bool IsBlankLine (IReadonlyTextDocument doc, IDocumentLine line)
 		{
 			for (int i = 0; i < line.Length; i++) {
 				if (!Char.IsWhiteSpace (doc.GetCharAt (line.Offset + i)))
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplatingProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplatingProvider.cs
index d23660ee33..b47ae8a685 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplatingProvider.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplatingProvider.cs
@@ -76,8 +76,8 @@ namespace MonoDevelop.Ide.Templates
 		ProjectCreateInformation CreateProjectCreateInformation (NewProjectConfiguration config, SolutionFolder parentFolder)

 		{

 			ProjectCreateInformation cinfo = new ProjectCreateInformation ();

-			cinfo.SolutionPath = FileService.ResolveFullPath (config.SolutionLocation);

-			cinfo.ProjectBasePath = FileService.ResolveFullPath (config.ProjectLocation);

+			cinfo.SolutionPath = new FilePath (config.SolutionLocation).ResolveLinks ();

+			cinfo.ProjectBasePath = new FilePath (config.ProjectLocation).ResolveLinks ();

 			cinfo.ProjectName = config.ProjectName;

 			cinfo.SolutionName = config.SolutionName;

 			cinfo.ParentFolder = parentFolder;

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
index 62332a28b5..6c334b9185 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
@@ -40,6 +40,7 @@ using MonoDevelop.Ide.StandardHeader;
 using System.Text;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.CodeFormatting;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.Projects.SharedAssetsProjects;
 using MonoDevelop.Core.StringParsing;
 
@@ -317,7 +318,7 @@ namespace MonoDevelop.Ide.Templates
 				ms.Write (data, 0, data.Length);
 			}
 			
-			Mono.TextEditor.TextDocument doc = new Mono.TextEditor.TextDocument ();
+			var doc = TextEditorFactory.CreateNewDocument ();
 			doc.Text = content;
 			
 			TextStylePolicy textPolicy = policyParent != null ? policyParent.Policies.Get<TextStylePolicy> ("text/plain")
@@ -327,7 +328,7 @@ namespace MonoDevelop.Ide.Templates
 			
 			var tabToSpaces = textPolicy.TabsToSpaces? new string (' ', textPolicy.TabWidth) : null;
 			
-			foreach (Mono.TextEditor.DocumentLine line in doc.Lines) {
+			foreach (var line in doc.GetLines ()) {
 				var lineText = doc.GetTextAt (line.Offset, line.Length);
 				if (tabToSpaces != null)
 					lineText = lineText.Replace ("\t", tabToSpaces);
@@ -400,8 +401,8 @@ namespace MonoDevelop.Ide.Templates
 				}
 			}
 			
-			tags ["Namespace"] = ns;

-			if (policyParent != null)

+			tags ["Namespace"] = ns;
+			if (policyParent != null)
 				tags ["SolutionName"] = policyParent.Name;
 			if (project != null) {
 				tags ["ProjectName"] = project.Name;
@@ -418,7 +419,7 @@ namespace MonoDevelop.Ide.Templates
 			if (languageExtension.Length > 0)
 				tags ["LanguageExtension"] = languageExtension;
 			
-			if (fileName != FilePath.Null) {

+			if (fileName != FilePath.Null) {
 				FilePath fileDirectory = Path.GetDirectoryName (fileName);
 				if (project != null && project.BaseDirectory != FilePath.Null && fileDirectory.IsChildPathOf (project.BaseDirectory))
 					tags ["ProjectRelativeDirectory"] = fileDirectory.ToRelative (project.BaseDirectory);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileExtension.cs
index 03ea1cb117..d0ccd99bc7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileExtension.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileExtension.cs
@@ -28,7 +28,6 @@
 using System;
 using System.Linq;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Text;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileExtensionEventArgs.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileExtensionEventArgs.cs
index 876a9d2581..79d246e707 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileExtensionEventArgs.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileExtensionEventArgs.cs
@@ -27,7 +27,6 @@
 using System;
 using System.Linq;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Text;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileLineExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileLineExtension.cs
index ec22e90aff..b5278f365a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileLineExtension.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/FileLineExtension.cs
@@ -27,7 +27,6 @@
 using System;
 using System.Linq;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Text;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/HorizontalAlignment.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/HorizontalAlignment.cs
index 3863a5ea86..f124f748c7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/HorizontalAlignment.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/HorizontalAlignment.cs
@@ -27,7 +27,6 @@
 using System;
 using System.Linq;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Text;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/LineCountEventArgs.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/LineCountEventArgs.cs
index bf252a697c..95eb469c54 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/LineCountEventArgs.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/LineCountEventArgs.cs
@@ -27,7 +27,6 @@
 using System;
 using System.Linq;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Text;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextEditorService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextEditorService.cs
index 595db9c80a..74385431b9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextEditorService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextEditorService.cs
@@ -27,7 +27,6 @@
 using System;
 using System.Linq;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Text;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextFileEventArgs.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextFileEventArgs.cs
index d2c3a245c5..53c4ed6e41 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextFileEventArgs.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextFileEventArgs.cs
@@ -27,7 +27,6 @@
 using System;
 using System.Linq;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Text;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextLineMarkerExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextLineMarkerExtension.cs
index 6126390e80..67dee58ab2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextLineMarkerExtension.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/TextLineMarkerExtension.cs
@@ -27,16 +27,14 @@
 using System;
 using System.Linq;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Text;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.TextEditing
 {
-
 	public abstract class TextLineMarkerExtension: FileLineExtension
 	{
-		public abstract TextLineMarker CreateMarker ();
-	}
-	
+		public abstract ITextLineMarker CreateMarker ();
 	}
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/VerticalAlignment.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/VerticalAlignment.cs
index 47f318f92e..d72bfb9e71 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/VerticalAlignment.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TextEditing/VerticalAlignment.cs
@@ -27,7 +27,6 @@
 using System;
 using System.Linq;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Text;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Ambience.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Ambience.cs
index 65621369b2..07849bbe88 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Ambience.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Ambience.cs
@@ -30,51 +30,74 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
 using Mono.Cecil;
 using System.Linq;
 using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using System.Xml;
+using Mono.Addins;
+using MonoDevelop.Ide.Extensions;
 
 namespace MonoDevelop.Ide.TypeSystem
 {
-	public abstract class Ambience
-	{
-		public string Name {
-			get;
-			private set;
-		}
-
-		
-		public Ambience (string name)
-		{
-			this.Name = name;
-		}
-		
-		#region To implement
-		public abstract string GetIntrinsicTypeName (string reflectionName);
-		
-		public abstract string SingleLineComment (string text);
-		public abstract string GetString (string nameSpace, OutputSettings settings);
-		
-		protected abstract string GetTypeReferenceString (IType reference, OutputSettings settings);
-		protected abstract string GetTypeString (IType type, OutputSettings settings);
-		protected abstract string GetMethodString (IMethod method, OutputSettings settings);
-		protected abstract string GetConstructorString (IMethod constructor, OutputSettings settings);
-		protected abstract string GetDestructorString (IMethod destructor, OutputSettings settings);
-		protected abstract string GetOperatorString (IMethod op, OutputSettings settings);
-		
-		protected abstract string GetFieldString (IField field, OutputSettings settings);
-		protected abstract string GetEventString (IEvent evt, OutputSettings settings);
-		protected abstract string GetPropertyString (IProperty property, OutputSettings settings);
-		protected abstract string GetIndexerString (IProperty property, OutputSettings settings);
 
-		protected abstract string GetParameterString (IParameterizedMember member, IParameter parameter, OutputSettings settings);
-
-		#endregion
-		
-		public virtual TooltipInformation GetTooltip (IEntity entity)
+	public static class Ambience
+	{
+		public static readonly SymbolDisplayFormat LabelFormat =
+			new SymbolDisplayFormat(
+				globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+				typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+				propertyStyle: SymbolDisplayPropertyStyle.NameOnly,
+				genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters | SymbolDisplayGenericsOptions.IncludeVariance,
+				memberOptions: SymbolDisplayMemberOptions.IncludeParameters | SymbolDisplayMemberOptions.IncludeExplicitInterface,
+				parameterOptions:
+				SymbolDisplayParameterOptions.IncludeDefaultValue |
+				SymbolDisplayParameterOptions.IncludeExtensionThis |
+				SymbolDisplayParameterOptions.IncludeType |
+				SymbolDisplayParameterOptions.IncludeName |
+				SymbolDisplayParameterOptions.IncludeParamsRefOut,
+				miscellaneousOptions:
+				SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+				SymbolDisplayMiscellaneousOptions.UseSpecialTypes
+			);
+		/// <summary>
+		/// Standard format for displaying to the user.
+		/// </summary>
+		/// <remarks>
+		/// No return type.
+		/// </remarks>
+		public static readonly SymbolDisplayFormat NameFormat =
+			new SymbolDisplayFormat(
+				globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+				typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+				propertyStyle: SymbolDisplayPropertyStyle.NameOnly,
+				genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters | SymbolDisplayGenericsOptions.IncludeVariance,
+				memberOptions: SymbolDisplayMemberOptions.IncludeParameters | SymbolDisplayMemberOptions.IncludeExplicitInterface,
+				parameterOptions:
+				SymbolDisplayParameterOptions.IncludeParamsRefOut |
+				SymbolDisplayParameterOptions.IncludeExtensionThis |
+				SymbolDisplayParameterOptions.IncludeType |
+				SymbolDisplayParameterOptions.IncludeName,
+				miscellaneousOptions:
+				SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+				SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+		static Ambience ()
 		{
-			return null;
+			// may not have been initialized in testing environment.
+			if (AddinManager.IsInitialized) {
+				AddinManager.AddExtensionNodeHandler ("/MonoDevelop/TypeSystem/AmbienceTooltipProviders", delegate(object sender, ExtensionNodeEventArgs args) {
+					var node = args.ExtensionNode as MimeTypeExtensionNode;
+					switch (args.Change) {
+					case ExtensionChange.Add:
+						tooltipProviders.Add ((AmbienceTooltipProvider)node.CreateInstance ());
+						break;
+					case ExtensionChange.Remove:
+						tooltipProviders.Remove ((AmbienceTooltipProvider)node.CreateInstance ());
+						break;
+					}
+				});
+			}
 		}
 
 		public static string Format (string str)
@@ -86,104 +109,490 @@ namespace MonoDevelop.Ide.TypeSystem
 			MarkupUtilities.AppendEscapedString (sb, str);
 			return sb.ToString (); 
 		}
+
+		#region Documentation
 		
-		protected static OutputFlags GetFlags (object settings)
+		public class DocumentationFormatOptions 
 		{
-			if (settings is OutputFlags)
-				return (OutputFlags)settings;
-			return ((OutputSettings)settings).OutputFlags;
+			public static readonly DocumentationFormatOptions Empty = new DocumentationFormatOptions ();
+			public string HighlightParameter {
+				get;
+				set;
+			}
+			
+			public int MaxLineLength {
+				get;
+				set;
+			}
+			
+			public bool BigHeadings {
+				get;
+				set;
+			}
+			
+			public bool BoldHeadings {
+				get;
+				set;
+			}
+			
+			public bool SmallText {
+				get;
+				set;
+			}
+
+			
+			public DocumentationFormatOptions ()
+			{
+				BoldHeadings = true;
+			}
+			
+			public string FormatHeading (string heading)
+			{
+				string result = heading;
+				if (BigHeadings)
+					result = "<big>" + result + "</big>";
+				if (BoldHeadings)
+					result = "<b>" + result + "</b>";
+				return result;
+			}
+			
+			public string FormatBody (string body)
+			{
+				var str = body.Trim ();
+				if (string.IsNullOrEmpty (str))
+					return "";
+				return SmallText ? "<small>" + str + Environment.NewLine + "</small>" : str + Environment.NewLine;
+			}
+		}
+
+		public static string GetSummaryMarkup (ISymbol member, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (member == null)
+				return null;
+			string documentation = GetDocumentation (member);
+			if (string.IsNullOrEmpty (documentation))
+				return null;
+
+			if (!string.IsNullOrEmpty (documentation)) {
+				int idx1 = documentation.IndexOf ("<summary>", StringComparison.Ordinal);
+				int idx2 = documentation.LastIndexOf ("</summary>", StringComparison.Ordinal);
+				string result;
+				if (idx1 >= 0 && idx2 > idx1) {
+					try {
+						var xmlText = documentation.Substring (idx1, idx2 - idx1 + "</summary>".Length);
+						return ParseBody (member,
+							new XmlTextReader (xmlText, XmlNodeType.Element, null),
+							"summary", 
+							DocumentationFormatOptions.Empty
+						);
+					} catch (Exception e) {
+						LoggingService.LogWarning ("Malformed documentation xml detected:" + documentation, e);
+						// may happen on malformed xml.
+						var len = idx2 - idx1 - "</summary>".Length;
+						result = len > 0 ? documentation.Substring (idx1 + "<summary>".Length, len) : documentation;
+					}
+				} else if (idx1 >= 0) {
+					result = documentation.Substring (idx1 + "<summary>".Length);
+				} else if (idx2 >= 0) {
+					result = documentation.Substring (0, idx2 - 1);
+				} else {
+					result = documentation;
+				}
+				return GetDocumentationMarkup (member, CleanEmpty (result));
+			}
+			
+			return GetDocumentationMarkup (member, CleanEmpty (documentation));
 		}
 		
-		protected static OutputSettings GetSettings (object settings)
+		static string CleanEmpty (string doc)
+		{
+			return IsEmptyDocumentation (doc)? null : doc;
+		}
+
+		static bool IsEmptyDocumentation (string documentation)
 		{
-			if (settings is OutputFlags)
-				return new OutputSettings ((OutputFlags)settings);
-			return (OutputSettings)settings;
+			return string.IsNullOrWhiteSpace (documentation) || documentation.StartsWith ("To be added") || documentation == "we have not entered docs yet";
 		}
 		
-		public string GetString (string nameSpace, OutputFlags flags)
+		public static string GetDocumentation (ISymbol member)
 		{
-			return GetString (nameSpace, new OutputSettings (flags));
+			if (member == null)
+				return null;
+			var documentation = member.GetDocumentationCommentXml ();
+			if (string.IsNullOrEmpty (documentation))
+				documentation = MonoDocDocumentationProvider.GetDocumentation (member);
+			if (documentation != null)
+				return CleanEmpty (documentation);
+			return null;
 		}
 		
-		public string GetString (IEntity entity, OutputSettings settings)
-		{
-			if (entity == null) {
-				string[] trace = Environment.StackTrace.Split (new [] { Environment.NewLine }, StringSplitOptions.None);
-				return "null entity: " + (trace != null && trace.Length > 2 ? trace [2] : "unknown location");
-			}
-			string result = null;
-			switch (entity.SymbolKind) {
-			case SymbolKind.Constructor:
-				result = GetConstructorString ((IMethod)entity, settings);
-				break;
-			case SymbolKind.Destructor:
-				result = GetDestructorString ((IMethod)entity, settings);
-				break;
-			case SymbolKind.Event:
-				result = GetEventString ((IEvent)entity, settings);
-				break;
-			case SymbolKind.Field:
-				result = GetFieldString ((IField)entity, settings);
-				break;
-			case SymbolKind.Indexer:
-				result = GetPropertyString ((IProperty)entity, settings);
-				break;
-			case SymbolKind.Method:
-				result = GetMethodString ((IMethod)entity, settings);
-				break;
-			case SymbolKind.Operator:
-				result = GetMethodString ((IMethod)entity, settings);
-				break;
-			case SymbolKind.Property:
-				result = GetPropertyString ((IProperty)entity, settings);
-				break;
-			case SymbolKind.TypeDefinition:
-				result = GetTypeString ((ITypeDefinition)entity, settings);
-				break;
-			default:
-				throw new ArgumentOutOfRangeException ("SymbolKind", "Unknown entity type:" + entity.SymbolKind);
-			}
-			result = settings.PostProcess (entity, result);
-			return result;
+		static string GetCref (ICSharpCode.NRefactory.TypeSystem.ITypeResolveContext ctx, string cref)
+		{
+			if (cref == null)
+				return "";
+
+			if (cref.Length < 2)
+				return cref;
+			try {
+				var entity = new ICSharpCode.NRefactory.Documentation.DocumentationComment ("", ctx).ResolveCref (cref.Replace("<", "{").Replace(">", "}"));
+	
+				if (entity != null) {
+					var ambience = new ICSharpCode.NRefactory.CSharp.CSharpAmbience ();
+					ambience.ConversionFlags = ICSharpCode.NRefactory.TypeSystem.ConversionFlags.ShowParameterList | ICSharpCode.NRefactory.TypeSystem.ConversionFlags.ShowParameterNames | ICSharpCode.NRefactory.TypeSystem.ConversionFlags.ShowTypeParameterList;
+					return ambience.ConvertEntity (entity);
+				}
+			} catch (Exception e) {
+				LoggingService.LogWarning ("Invalid cref:" + cref, e);
+			}
+
+			if (cref.Substring (1, 1) == ":")
+				return cref.Substring (2, cref.Length - 2);
+			
+			return cref;
 		}
 		
-		public string GetString (IType type, OutputSettings settings)
+		static bool IsSpecialChar (int charValue)
 		{
-			var result = GetTypeString (type, settings);
-			return settings.PostProcess (type, result);
+			return 
+				0x01 <= charValue && charValue <= 0x08 ||
+				0x0B <= charValue && charValue <= 0x0C ||
+				0x0E <= charValue && charValue <= 0x1F ||
+				0x7F <= charValue && charValue <= 0x84 ||
+				0x86 <= charValue && charValue <= 0x9F;
 		}
-	
-/*		public string GetString (ITypeReference reference, OutputSettings settings)
+		
+		public static string BreakLines (string text, int maxLineLength)
 		{
-			var result = GetTypeReferenceString (reference, settings);
-			return settings.PostProcess (reference, result);
-		}*/
+			if (maxLineLength <= 0)
+				return text;
+			StringBuilder result = new StringBuilder ();
+			int lineLength = 0;
+			bool inTag = false;
+			bool inAmp = false;
+			foreach (char ch in text) {
+				switch (ch) {
+				case '<':
+					inTag = true;
+					break;
+				case '>':
+					inTag = false;
+					break;
+				case '&':
+					inAmp = true;
+					break;
+				case ';':
+					inAmp = false;
+					break;
+				case '\n':
+					lineLength = 0;
+					break;
+				case '\r':
+					lineLength = 0;
+					break;
+				}
+				
+				result.Append (ch);
+				if (!inTag && !inAmp)
+					lineLength++;
+				if (!Char.IsLetterOrDigit (ch) && lineLength > maxLineLength) {
+					result.AppendLine ();
+					lineLength = 0;
+				}
+			}
+			return result.ToString ();
+		}
 		
-		public string GetString (IEntity entity, OutputFlags flags)
+		public static string EscapeText (string text)
 		{
-			return GetString (entity, new OutputSettings (flags));
+			if (text == null)
+				return null;
+			StringBuilder result = new StringBuilder ();
+			foreach (char ch in text) {
+				switch (ch) {
+				case '<':
+					result.Append ("&lt;");
+					break;
+				case '>':
+					result.Append ("&gt;");
+					break;
+				case '&':
+					result.Append ("&amp;");
+					break;
+				case '\'':
+					result.Append ("&apos;");
+					break;
+				case '"':
+					result.Append ("&quot;");
+					break;
+				default:
+					int charValue = (int)ch;
+					if (IsSpecialChar (charValue)) {
+						result.AppendFormat ("&#x{0:X};", charValue);
+					} else {
+						result.Append (ch);
+					}
+					break;
+				}
+			}
+			return result.ToString ();
 		}
 		
-		public string GetString (IType type, OutputFlags flags)
+		public static string UnescapeText (string text)
 		{
-			return GetString (type, new OutputSettings (flags));
+			var sb = new StringBuilder ();
+			for (int i = 0; i < text.Length; i++) {
+				char ch = text[i];
+				if (ch == '&') {
+					int end = text.IndexOf (';', i);
+					if (end == -1)
+						break;
+					string entity = text.Substring (i + 1, end - i - 1);
+					switch (entity) {
+					case "lt":
+						sb.Append ('<');
+						break;
+					case "gt":
+						sb.Append ('>');
+						break;
+					case "amp":
+						sb.Append ('&');
+						break;
+					case "apos":
+						sb.Append ('\'');
+						break;
+					case "quot":
+						sb.Append ('"');
+						break;
+					}
+					i = end;
+				} else {
+					sb.Append (ch);
+				}
+			}
+			return sb.ToString ();	
 		}
 		
-		public string GetString (ITypeDefinition type, OutputFlags flags)
+		
+		public static string GetDocumentationMarkup (ISymbol member, string doc)
 		{
-			return GetString ((IEntity)type, new OutputSettings (flags));
+			return GetDocumentationMarkup (member, doc, DocumentationFormatOptions.Empty);
 		}
 		
+		static string ParseBody (ISymbol member, XmlTextReader xml, string endTagName, DocumentationFormatOptions options)
+		{
+			StringBuilder result = new StringBuilder (); 
+			bool wasWhiteSpace = true;
+			bool appendSpace = false;
+			//ITypeResolveContext ctx = member.Compilation.TypeResolveContext;
+			while (xml.Read ()) {
+				switch (xml.NodeType) {
+				case XmlNodeType.EndElement:
+					if (xml.Name == endTagName) 
+						goto end;
+					break;
+				case XmlNodeType.Element:
+					switch (xml.Name.ToLower ()) {
+					case "para":
+						result.AppendLine (ParseBody (member, xml, xml.Name, options));
+						wasWhiteSpace = true;
+						break;
+					case "see":
+						if (!wasWhiteSpace) {
+							result.Append (' ');
+							wasWhiteSpace = true;
+						}
+						result.Append ("<i>");
+						string name = (xml ["cref"] + xml ["langword"]).Trim ();
+						// if (options.Ambience != null)
+						// 	name = options.Ambience.GetIntrinsicTypeName (name);
+						result.Append (EscapeText (name));
+						result.Append ("</i>");
+						wasWhiteSpace = false;
+						appendSpace = true;
+						break;
+					case "paramref":
+						if (!wasWhiteSpace) {
+							result.Append (' ');
+							wasWhiteSpace = true;
+						}
+						result.Append ("<i>");
+						result.Append (EscapeText (xml ["name"].Trim ()));
+						result.Append ("</i>");
+						appendSpace = true;
+						wasWhiteSpace = false;
+						break;
+					}
+					break;
+				case XmlNodeType.Text:
+					if (IsEmptyDocumentation (xml.Value))
+						break;
+					foreach (char ch in xml.Value) {
+						if (!Char.IsWhiteSpace (ch) && appendSpace) {
+							result.Append (' ');
+							appendSpace = false;
+						}
+						if (Char.IsWhiteSpace (ch) || ch == '\n' || ch == '\r') {
+							if (!wasWhiteSpace) {
+								result.Append (' ');
+								wasWhiteSpace = true;
+							}
+							continue;
+						}
+						wasWhiteSpace = false;
+						result.Append (EscapeText (ch.ToString ()));
+					}
+					break;
+				}
+			}
+		end:
+			return result.ToString ().Trim ();
+		}
 		
-		public string GetString (IParameterizedMember member, IParameter parameter, OutputFlags flags)
+		public static string GetDocumentationMarkup (ISymbol member, string doc, DocumentationFormatOptions options)
 		{
-			return GetParameterString (member, parameter, new OutputSettings (flags));
+			if (string.IsNullOrEmpty (doc))
+				return null;
+			System.IO.StringReader reader = new System.IO.StringReader ("<docroot>" + doc + "</docroot>");
+			XmlTextReader xml = new XmlTextReader (reader);
+			StringBuilder ret = new StringBuilder (70);
+			StringBuilder parameterBuilder = new StringBuilder ();
+			StringBuilder exceptions = new StringBuilder ();
+			exceptions.AppendLine (options.FormatHeading (GettextCatalog.GetString ("Exceptions:")));
+			//		ret.Append ("<small>");
+			int paramCount = 0, exceptionCount = 0, summaryEnd = -1;
+			try {
+				xml.Read ();
+				do {
+					if (xml.NodeType == XmlNodeType.Element) {
+						switch (xml.Name.ToLower ()) {
+						case "para":
+							ret.Append (options.FormatBody (ParseBody (member, xml, xml.Name, options)));
+							if (summaryEnd < 0)
+								summaryEnd = ret.Length;
+							break;
+						case "summary":
+							var summary = options.FormatBody (ParseBody (member, xml, xml.Name, options));
+							if (!IsEmptyDocumentation (summary)) {
+								//							ret.AppendLine (GetHeading ("Summary:", options));
+								ret.Append (summary);
+								if (summaryEnd < 0)
+									summaryEnd = ret.Length;
+							}
+							break;
+						case "remarks":
+							if (string.IsNullOrEmpty (options.HighlightParameter)) {
+								ret.AppendLine (options.FormatHeading (GettextCatalog.GetString ("Remarks:")));
+								ret.Append (options.FormatBody (ParseBody (member, xml, xml.Name, options)));
+								if (summaryEnd < 0)
+									summaryEnd = ret.Length;
+							} else {
+								options.FormatBody (ParseBody (member, xml, xml.Name, options));
+							}
+							break;
+						// skip <example>-nodes
+						case "example":
+							xml.Skip ();
+							xml.Skip ();
+							break;
+						case "exception":
+							exceptionCount++;
+							if (options.SmallText)
+								exceptions.Append ("<small>");
+							exceptions.Append ("<b>");
+							exceptions.Append (EscapeText (xml ["cref"]));
+							exceptions.Append (": ");
+							exceptions.Append ("</b>");
+							if (options.SmallText)
+								exceptions.Append ("</small>");
+							
+							exceptions.AppendLine (options.FormatBody (ParseBody (member, xml, xml.Name, options)));
+							break;
+						case "returns":
+							if (string.IsNullOrEmpty (options.HighlightParameter)) {
+								ret.AppendLine (options.FormatHeading (GettextCatalog.GetString ("Returns:")));
+								ret.Append (options.FormatBody (ParseBody (member, xml, xml.Name, options)));
+							} else {
+								options.FormatBody (ParseBody (member, xml, xml.Name, options));
+							}
+							break;
+						case "param":
+							string paramName = xml.GetAttribute ("name") != null ? xml ["name"].Trim () : "";
+								
+							var body = options.FormatBody (ParseBody (member, xml, xml.Name, options));
+							if (!IsEmptyDocumentation (body)) {
+								paramCount++;
+								parameterBuilder.Append ("<i>");
+								if (options.HighlightParameter == paramName)
+									parameterBuilder.Append ("<b>");
+								if (options.SmallText)
+									parameterBuilder.Append ("<small>");
+								parameterBuilder.Append (EscapeText (paramName));
+								if (options.SmallText)
+									parameterBuilder.Append ("</small>");
+								if (options.HighlightParameter == paramName)
+									parameterBuilder.Append ("</b>");
+								parameterBuilder.Append (":</i> ");
+								parameterBuilder.Append (body);
+							} else {
+								return null;
+							}
+							break;
+						case "value":
+							ret.AppendLine (options.FormatHeading (GettextCatalog.GetString ("Value:")));
+							ret.AppendLine (options.FormatBody (ParseBody (member, xml, xml.Name, options)));
+							break;
+						case "seealso":
+							if (string.IsNullOrEmpty (options.HighlightParameter)) {
+								ret.Append (options.FormatHeading (GettextCatalog.GetString ("See also:")));
+								ret.Append (" " + EscapeText (xml ["cref"] + xml ["langword"]));
+							}
+							break;
+						}
+					}
+				} while (xml.Read ());
+			
+			} catch (Exception ex) {
+				MonoDevelop.Core.LoggingService.LogError (ex.ToString ());
+				return EscapeText (doc);
+			}
+
+			if (IsEmptyDocumentation (ret.ToString ()) && IsEmptyDocumentation (parameterBuilder.ToString ()))
+				return EscapeText (doc);
+			if (string.IsNullOrEmpty (options.HighlightParameter) && exceptionCount > 0)
+				ret.Append (exceptions.ToString ());
+			
+			string result = ret.ToString ();
+			if (summaryEnd < 0)
+				summaryEnd = result.Length;
+			if (paramCount > 0) {
+				var paramSb = new StringBuilder ();
+				if (result.Length > 0)
+					paramSb.AppendLine ();/*
+				paramSb.Append ("<small>");
+				paramSb.AppendLine (options.FormatHeading (GettextCatalog.GetPluralString ("Parameter:", "Parameters:", paramCount)));
+				paramSb.Append ("</small>");*/
+				paramSb.Append (parameterBuilder.ToString ());
+				result = result.Insert (summaryEnd, paramSb.ToString ());
+			}
+			result = result.Trim ();
+			if (result.EndsWith (Environment.NewLine + "</small>"))
+				result = result.Substring (0, result.Length - (Environment.NewLine + "</small>").Length) + "</small>";
+			return result;
 		}
-		/*
-		public string GetString (ITypeReference reference, OutputFlags flags)
+		#endregion
+
+		#region Tooltips
+		static List<AmbienceTooltipProvider> tooltipProviders = new List<AmbienceTooltipProvider>();
+
+		public static TooltipInformation GetTooltip(ISymbol symbol)
 		{
-			return GetString (reference, new OutputSettings (flags));
-		}*/
+			foreach (var tp in tooltipProviders) {
+				var result = tp.GetTooltip (symbol);
+				if (result != null)
+					return result;
+			}
+			return null;
+		}
+		#endregion
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/AmbienceService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/AmbienceService.cs
deleted file mode 100644
index 794144d931..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/AmbienceService.cs
+++ /dev/null
@@ -1,559 +0,0 @@
-//
-// AmbienceService.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using Mono.Addins;
-using System.Xml;
-using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide;
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Extensions;
-using ICSharpCode.NRefactory.Documentation;
-
-namespace MonoDevelop.Ide.TypeSystem
-{
-	public static class AmbienceService
-	{
-		static Dictionary <string, Ambience> ambiences = new Dictionary <string, Ambience> ();
-		
-		static AmbienceService ()
-		{
-			// may not have been initialized in testing environment.
-			if (AddinManager.IsInitialized) {
-				AddinManager.AddExtensionNodeHandler ("/MonoDevelop/TypeSystem/Ambiences", delegate(object sender, ExtensionNodeEventArgs args) {
-					var ambience = args.ExtensionNode as MimeTypeExtensionNode;
-					switch (args.Change) {
-					case ExtensionChange.Add:
-						ambiences[ambience.MimeType] = (Ambience) ambience.CreateInstance ();
-						break;
-					case ExtensionChange.Remove:
-						ambiences.Remove (ambience.MimeType);
-						break;
-					}
-				});
-			}
-		}
-		
-		public static Ambience GetAmbience (IMember member)
-		{
-			return GetAmbienceForFile (member.DeclaringTypeDefinition.Region.FileName) ?? new NetAmbience ();
-		}
-		
-		public static Ambience GetAmbienceForFile (string fileName)
-		{
-			if (string.IsNullOrEmpty (fileName))
-				return DefaultAmbience;
-			return GetAmbience (DesktopService.GetMimeTypeForUri (fileName));
-		}
-		
-		public static Ambience GetAmbience (string mimeType)
-		{
-			Ambience result;
-			if (!string.IsNullOrEmpty (mimeType) && ambiences.TryGetValue (mimeType, out result))
-				return result;
-			return defaultAmbience;
-		}
-		
-		static Ambience defaultAmbience = new NetAmbience ();
-		
-		public static Ambience DefaultAmbience { get { return defaultAmbience; } }
-		#region Documentation
-		
-		public class DocumentationFormatOptions 
-		{
-			public static readonly DocumentationFormatOptions Empty = new DocumentationFormatOptions ();
-			public string HighlightParameter {
-				get;
-				set;
-			}
-			
-			public int MaxLineLength {
-				get;
-				set;
-			}
-			
-			public bool BigHeadings {
-				get;
-				set;
-			}
-			
-			public bool BoldHeadings {
-				get;
-				set;
-			}
-			
-			public bool SmallText {
-				get;
-				set;
-			}
-			
-			public Ambience Ambience {
-				get;
-				set;
-			}
-			
-			
-			public DocumentationFormatOptions ()
-			{
-				BoldHeadings = true;
-			}
-			
-			public string FormatHeading (string heading)
-			{
-				string result = heading;
-				if (BigHeadings)
-					result = "<big>" + result + "</big>";
-				if (BoldHeadings)
-					result = "<b>" + result + "</b>";
-				return result;
-			}
-			
-			public string FormatBody (string body)
-			{
-				var str = body.Trim ();
-				if (string.IsNullOrEmpty (str))
-					return "";
-				return SmallText ? "<small>" + str + Environment.NewLine + "</small>" : str + Environment.NewLine;
-			}
-		}
-
-		public static string GetSummaryMarkup (IEntity member)
-		{
-			if (member == null || member.Documentation == null)
-				return null;
-			string documentation = member.Documentation.Xml.Text;
-			if (!string.IsNullOrEmpty (documentation)) {
-				int idx1 = documentation.IndexOf ("<summary>", StringComparison.Ordinal);
-				int idx2 = documentation.LastIndexOf ("</summary>", StringComparison.Ordinal);
-				string result;
-				if (idx1 >= 0 && idx2 > idx1) {
-					try {
-						var xmlText = documentation.Substring (idx1, idx2 - idx1 + "</summary>".Length);
-						return ParseBody (member,
-							new XmlTextReader (xmlText, XmlNodeType.Element, null),
-							"summary", 
-							DocumentationFormatOptions.Empty
-						);
-					} catch (Exception e) {
-						LoggingService.LogWarning ("Malformed documentation xml detected:" + documentation, e);
-						// may happen on malformed xml.
-						var len = idx2 - idx1 - "</summary>".Length;
-						result = len > 0 ? documentation.Substring (idx1 + "<summary>".Length, len) : documentation;
-					}
-				} else if (idx1 >= 0) {
-					result = documentation.Substring (idx1 + "<summary>".Length);
-				} else if (idx2 >= 0) {
-					result = documentation.Substring (0, idx2 - 1);
-				} else {
-					result = documentation;
-				}
-				return GetDocumentationMarkup (member, CleanEmpty (result));
-			}
-			
-			return GetDocumentationMarkup (member, CleanEmpty (documentation));
-		}
-		
-		static string CleanEmpty (string doc)
-		{
-			return IsEmptyDocumentation (doc)? null : doc;
-		}
-
-		static bool IsEmptyDocumentation (string documentation)
-		{
-			return string.IsNullOrWhiteSpace (documentation) || documentation.StartsWith ("To be added") || documentation == "we have not entered docs yet";
-		}
-		
-		public static string GetDocumentation (IEntity member)
-		{
-			if (member == null)
-				return null;
-			if (member.Documentation != null)
-				return CleanEmpty (member.Documentation);
-			return null;
-		}
-		
-		static string GetCref (ITypeResolveContext ctx, string cref)
-		{
-			if (cref == null)
-				return "";
-
-			if (cref.Length < 2)
-				return cref;
-			try {
-				var entity = new DocumentationComment ("", ctx).ResolveCref (cref.Replace("<", "{").Replace(">", "}"));
-	
-				if (entity != null) {
-					var ambience = new ICSharpCode.NRefactory.CSharp.CSharpAmbience ();
-					ambience.ConversionFlags = ConversionFlags.ShowParameterList | ConversionFlags.ShowParameterNames | ConversionFlags.ShowTypeParameterList;
-					return ambience.ConvertSymbol (entity);
-				}
-			} catch (Exception e) {
-				LoggingService.LogWarning ("Invalid cref:" + cref, e);
-			}
-
-			if (cref.Substring (1, 1) == ":")
-				return cref.Substring (2, cref.Length - 2);
-			
-			return cref;
-		}
-		
-		static bool IsSpecialChar (int charValue)
-		{
-			return 
-				0x01 <= charValue && charValue <= 0x08 ||
-				0x0B <= charValue && charValue <= 0x0C ||
-				0x0E <= charValue && charValue <= 0x1F ||
-				0x7F <= charValue && charValue <= 0x84 ||
-				0x86 <= charValue && charValue <= 0x9F;
-		}
-		
-		public static string BreakLines (string text, int maxLineLength)
-		{
-			if (maxLineLength <= 0)
-				return text;
-			StringBuilder result = new StringBuilder ();
-			int lineLength = 0;
-			bool inTag = false;
-			bool inAmp = false;
-			foreach (char ch in text) {
-				switch (ch) {
-				case '<':
-					inTag = true;
-					break;
-				case '>':
-					inTag = false;
-					break;
-				case '&':
-					inAmp = true;
-					break;
-				case ';':
-					inAmp = false;
-					break;
-				case '\n':
-					lineLength = 0;
-					break;
-				case '\r':
-					lineLength = 0;
-					break;
-				}
-				
-				result.Append (ch);
-				if (!inTag && !inAmp)
-					lineLength++;
-				if (!Char.IsLetterOrDigit (ch) && lineLength > maxLineLength) {
-					result.AppendLine ();
-					lineLength = 0;
-				}
-			}
-			return result.ToString ();
-		}
-		
-		public static string EscapeText (string text)
-		{
-			if (text == null)
-				return null;
-			StringBuilder result = new StringBuilder ();
-			foreach (char ch in text) {
-				switch (ch) {
-				case '<':
-					result.Append ("&lt;");
-					break;
-				case '>':
-					result.Append ("&gt;");
-					break;
-				case '&':
-					result.Append ("&amp;");
-					break;
-				case '\'':
-					result.Append ("&apos;");
-					break;
-				case '"':
-					result.Append ("&quot;");
-					break;
-				default:
-					int charValue = (int)ch;
-					if (IsSpecialChar (charValue)) {
-						result.AppendFormat ("&#x{0:X};", charValue);
-					} else {
-						result.Append (ch);
-					}
-					break;
-				}
-			}
-			return result.ToString ();
-		}
-		
-		public static string UnescapeText (string text)
-		{
-			var sb = new StringBuilder ();
-			for (int i = 0; i < text.Length; i++) {
-				char ch = text[i];
-				if (ch == '&') {
-					int end = text.IndexOf (';', i);
-					if (end == -1)
-						break;
-					string entity = text.Substring (i + 1, end - i - 1);
-					switch (entity) {
-					case "lt":
-						sb.Append ('<');
-						break;
-					case "gt":
-						sb.Append ('>');
-						break;
-					case "amp":
-						sb.Append ('&');
-						break;
-					case "apos":
-						sb.Append ('\'');
-						break;
-					case "quot":
-						sb.Append ('"');
-						break;
-					}
-					i = end;
-				} else {
-					sb.Append (ch);
-				}
-			}
-			return sb.ToString ();	
-		}
-		
-		
-		public static string GetDocumentationMarkup (IEntity member, string doc)
-		{
-			return GetDocumentationMarkup (member, doc, DocumentationFormatOptions.Empty);
-		}
-		
-		static string ParseBody (IEntity member, XmlTextReader xml, string endTagName, DocumentationFormatOptions options)
-		{
-			StringBuilder result = new StringBuilder (); 
-			bool wasWhiteSpace = true;
-			bool appendSpace = false;
-			ITypeResolveContext ctx = member.Compilation.TypeResolveContext;
-			while (xml.Read ()) {
-				switch (xml.NodeType) {
-				case XmlNodeType.EndElement:
-					if (xml.Name == endTagName) 
-						goto end;
-					break;
-				case XmlNodeType.Element:
-					switch (xml.Name.ToLower ()) {
-					case "para":
-						result.AppendLine (ParseBody (member, xml, xml.Name, options));
-						wasWhiteSpace = true;
-						break;
-					case "see":
-						if (!wasWhiteSpace) {
-							result.Append (' ');
-							wasWhiteSpace = true;
-						}
-						result.Append ("<i>");
-						string name = (GetCref (ctx, xml ["cref"]) + xml ["langword"]).Trim ();
-						if (options.Ambience != null)
-							name = options.Ambience.GetIntrinsicTypeName (name);
-						result.Append (EscapeText (name));
-						result.Append ("</i>");
-						wasWhiteSpace = false;
-						appendSpace = true;
-						break;
-					case "paramref":
-						if (!wasWhiteSpace) {
-							result.Append (' ');
-							wasWhiteSpace = true;
-						}
-						result.Append ("<i>");
-						result.Append (EscapeText (xml ["name"].Trim ()));
-						result.Append ("</i>");
-						appendSpace = true;
-						wasWhiteSpace = false;
-						break;
-					}
-					break;
-				case XmlNodeType.Text:
-					if (IsEmptyDocumentation (xml.Value))
-						break;
-					foreach (char ch in xml.Value) {
-						if (!Char.IsWhiteSpace (ch) && appendSpace) {
-							result.Append (' ');
-							appendSpace = false;
-						}
-						if (Char.IsWhiteSpace (ch) || ch == '\n' || ch == '\r') {
-							if (!wasWhiteSpace) {
-								result.Append (' ');
-								wasWhiteSpace = true;
-							}
-							continue;
-						}
-						wasWhiteSpace = false;
-						result.Append (EscapeText (ch.ToString ()));
-					}
-					break;
-				}
-			}
-		end:
-			return result.ToString ().Trim ();
-		}
-		
-		public static string GetDocumentationMarkup (IEntity member, string doc, DocumentationFormatOptions options)
-		{
-			if (string.IsNullOrEmpty (doc))
-				return null;
-			System.IO.StringReader reader = new System.IO.StringReader ("<docroot>" + doc + "</docroot>");
-			XmlTextReader xml = new XmlTextReader (reader);
-			StringBuilder ret = new StringBuilder (70);
-			StringBuilder parameterBuilder = new StringBuilder ();
-			StringBuilder exceptions = new StringBuilder ();
-			exceptions.AppendLine (options.FormatHeading (GettextCatalog.GetString ("Exceptions:")));
-			//		ret.Append ("<small>");
-			int paramCount = 0, exceptionCount = 0, summaryEnd = -1;
-			try {
-				xml.Read ();
-				do {
-					if (xml.NodeType == XmlNodeType.Element) {
-						switch (xml.Name.ToLower ()) {
-						case "para":
-							ret.Append (options.FormatBody (ParseBody (member, xml, xml.Name, options)));
-							if (summaryEnd < 0)
-								summaryEnd = ret.Length;
-							break;
-						case "summary":
-							var summary = options.FormatBody (ParseBody (member, xml, xml.Name, options));
-							if (!IsEmptyDocumentation (summary)) {
-								//							ret.AppendLine (GetHeading ("Summary:", options));
-								ret.Append (summary);
-								if (summaryEnd < 0)
-									summaryEnd = ret.Length;
-							}
-							break;
-						case "remarks":
-							if (string.IsNullOrEmpty (options.HighlightParameter)) {
-								ret.AppendLine (options.FormatHeading (GettextCatalog.GetString ("Remarks:")));
-								ret.Append (options.FormatBody (ParseBody (member, xml, xml.Name, options)));
-								if (summaryEnd < 0)
-									summaryEnd = ret.Length;
-							} else {
-								options.FormatBody (ParseBody (member, xml, xml.Name, options));
-							}
-							break;
-						// skip <example>-nodes
-						case "example":
-							xml.Skip ();
-							xml.Skip ();
-							break;
-						case "exception":
-							exceptionCount++;
-							if (options.SmallText)
-								exceptions.Append ("<small>");
-							exceptions.Append ("<b>");
-							exceptions.Append (EscapeText (GetCref (member.Compilation.TypeResolveContext, xml ["cref"])));
-							exceptions.Append (": ");
-							exceptions.Append ("</b>");
-							if (options.SmallText)
-								exceptions.Append ("</small>");
-							
-							exceptions.AppendLine (options.FormatBody (ParseBody (member, xml, xml.Name, options)));
-							break;
-						case "returns":
-							if (string.IsNullOrEmpty (options.HighlightParameter)) {
-								ret.AppendLine (options.FormatHeading (GettextCatalog.GetString ("Returns:")));
-								ret.Append (options.FormatBody (ParseBody (member, xml, xml.Name, options)));
-							} else {
-								options.FormatBody (ParseBody (member, xml, xml.Name, options));
-							}
-							break;
-						case "param":
-							string paramName = xml.GetAttribute ("name") != null ? xml ["name"].Trim () : "";
-								
-							var body = options.FormatBody (ParseBody (member, xml, xml.Name, options));
-							if (!IsEmptyDocumentation (body)) {
-								paramCount++;
-								parameterBuilder.Append ("<i>");
-								if (options.HighlightParameter == paramName)
-									parameterBuilder.Append ("<b>");
-								if (options.SmallText)
-									parameterBuilder.Append ("<small>");
-								parameterBuilder.Append (EscapeText (paramName));
-								if (options.SmallText)
-									parameterBuilder.Append ("</small>");
-								if (options.HighlightParameter == paramName)
-									parameterBuilder.Append ("</b>");
-								parameterBuilder.Append (":</i> ");
-								parameterBuilder.Append (body);
-							} else {
-								return null;
-							}
-							break;
-						case "value":
-							ret.AppendLine (options.FormatHeading (GettextCatalog.GetString ("Value:")));
-							ret.AppendLine (options.FormatBody (ParseBody (member, xml, xml.Name, options)));
-							break;
-						case "seealso":
-							if (string.IsNullOrEmpty (options.HighlightParameter)) {
-								ret.Append (options.FormatHeading (GettextCatalog.GetString ("See also:")));
-								ret.Append (" " + EscapeText (GetCref (member.Compilation.TypeResolveContext, xml ["cref"]) + xml ["langword"]));
-							}
-							break;
-						}
-					}
-				} while (xml.Read ());
-			
-			} catch (Exception ex) {
-				MonoDevelop.Core.LoggingService.LogError (ex.ToString ());
-				return EscapeText (doc);
-			}
-
-			if (IsEmptyDocumentation (ret.ToString ()) && IsEmptyDocumentation (parameterBuilder.ToString ()))
-				return EscapeText (doc);
-			if (string.IsNullOrEmpty (options.HighlightParameter) && exceptionCount > 0)
-				ret.Append (exceptions.ToString ());
-			
-			string result = ret.ToString ();
-			if (summaryEnd < 0)
-				summaryEnd = result.Length;
-			if (paramCount > 0) {
-				var paramSb = new StringBuilder ();
-				if (result.Length > 0)
-					paramSb.AppendLine ();/*
-				paramSb.Append ("<small>");
-				paramSb.AppendLine (options.FormatHeading (GettextCatalog.GetPluralString ("Parameter:", "Parameters:", paramCount)));
-				paramSb.Append ("</small>");*/
-				paramSb.Append (parameterBuilder.ToString ());
-				result = result.Insert (summaryEnd, paramSb.ToString ());
-			}
-			result = result.Trim ();
-			if (result.EndsWith (Environment.NewLine + "</small>"))
-				result = result.Substring (0, result.Length - (Environment.NewLine + "</small>").Length) + "</small>";
-			return result;
-		}
-		#endregion
-	}
-}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/AmbienceTooltipProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/AmbienceTooltipProvider.cs
new file mode 100644
index 0000000000..4fd10c0a32
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/AmbienceTooltipProvider.cs
@@ -0,0 +1,40 @@
+//
+// AmbienceTooltipProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+
+namespace MonoDevelop.Ide.TypeSystem
+{
+	/// <summary>
+	/// Provides tooltips for a roslyn symbol.
+	/// Note: Intentionally part of internal extension API. 
+	/// </summary>
+	abstract class AmbienceTooltipProvider
+	{
+		public abstract TooltipInformation GetTooltip (ISymbol symbol);
+	}
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerationService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerationService.cs
deleted file mode 100644
index 4c857af7d9..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerationService.cs
+++ /dev/null
@@ -1,563 +0,0 @@
-// 
-// CodeGenerationService.cs
-//  
-// Author:
-//       mkrueger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Mono.TextEditor;
-using MonoDevelop.Core;
-using System.CodeDom;
-using MonoDevelop.Projects;
-using System.CodeDom.Compiler;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using System.Threading.Tasks;
-
-namespace MonoDevelop.Ide.TypeSystem
-{
-	public static class CodeGenerationService
-	{
-		public static IUnresolvedMember AddCodeDomMember (Project project, IUnresolvedTypeDefinition type, CodeTypeMember newMember)
-		{
-			bool isOpen;
-			var data = TextFileProvider.Instance.GetTextEditorData (type.Region.FileName, out isOpen);
-			var parsedDocument = TypeSystemService.ParseFile (data.Document.FileName, data.Document.MimeType, data.Text);
-			
-			var insertionPoints = GetInsertionPoints (data, parsedDocument, type);
-			
-			var suitableInsertionPoint = GetSuitableInsertionPoint (insertionPoints, type, newMember);
-			
-			var dotNetProject = project as DotNetProject;
-			if (dotNetProject == null) {
-				LoggingService.LogError ("Only .NET projects are supported.");
-				return null;
-			}
-			
-			var generator = dotNetProject.LanguageBinding.GetCodeDomProvider ();
-			StringWriter sw = new StringWriter ();
-			var options = new CodeGeneratorOptions ();
-			options.IndentString = data.GetLineIndent (type.Region.BeginLine) + "\t";
-			if (newMember is CodeMemberMethod)
-				options.BracingStyle = "C";
-			generator.GenerateCodeFromMember (newMember, sw, options);
-
-			var code = sw.ToString ();
-			if (!string.IsNullOrEmpty (code))
-				suitableInsertionPoint.Insert (data, code);
-			if (!isOpen) {
-				try {
-					File.WriteAllText (type.Region.FileName, data.Text);
-				} catch (Exception e) {
-					LoggingService.LogError (string.Format ("Failed to write file '{0}'.", type.Region.FileName), e);
-					MessageService.ShowError (GettextCatalog.GetString ("Failed to write file '{0}'.", type.Region.FileName));
-				}
-			}
-			var newDocument = TypeSystemService.ParseFile (data.FileName, data.MimeType, data.Text);
-			return newDocument.ParsedFile.GetMember (suitableInsertionPoint.Location.Line, int.MaxValue);
-		}
-		
-		public static void AddNewMember (ITypeDefinition type, IUnresolvedTypeDefinition part, IUnresolvedMember newMember, bool implementExplicit = false)
-		{
-			bool isOpen;
-			var data = TextFileProvider.Instance.GetTextEditorData (part.Region.FileName, out isOpen);
-			var parsedDocument = TypeSystemService.ParseFile (data.FileName, data.MimeType, data.Text);
-			
-			var insertionPoints = GetInsertionPoints (data, parsedDocument, part);
-			
-			var suitableInsertionPoint = GetSuitableInsertionPoint (insertionPoints, part, newMember);
-			
-			var generator = CreateCodeGenerator (data, type.Compilation);
-
-			generator.IndentLevel = CalculateBodyIndentLevel (parsedDocument.GetInnermostTypeDefinition (type.Region.Begin));
-			var generatedCode = generator.CreateMemberImplementation (type, part, newMember, implementExplicit);
-			suitableInsertionPoint.Insert (data, generatedCode.Code);
-			if (!isOpen) {
-				try {
-					File.WriteAllText (type.Region.FileName, data.Text);
-				} catch (Exception e) {
-					LoggingService.LogError (GettextCatalog.GetString ("Failed to write file '{0}'.", type.Region.FileName), e);
-					MessageService.ShowError (GettextCatalog.GetString ("Failed to write file '{0}'.", type.Region.FileName));
-				}
-			}
-		}
-
-		public static Task<bool> InsertMemberWithCursor (
-			string operation, ITypeDefinition parentType, IUnresolvedTypeDefinition part,
-			IUnresolvedMember newMember, bool implementExplicit = false)
-		{
-			var tcs = new TaskCompletionSource<bool>();
-			if (parentType == null)
-				return tcs.Task;
-			part = part ?? parentType.Parts.FirstOrDefault ();
-			if (part == null)
-				return tcs.Task;
-			var loadedDocument = IdeApp.Workbench.OpenDocument (part.Region.FileName);
-			loadedDocument.RunWhenLoaded (delegate {
-				var editor = loadedDocument.Editor;
-				var loc = part.Region.Begin;
-				var parsedDocument = loadedDocument.UpdateParseDocument ();
-				var declaringType = parsedDocument.GetInnermostTypeDefinition (loc);
-				var mode = new InsertionCursorEditMode (
-					editor.Parent,
-					CodeGenerationService.GetInsertionPoints (loadedDocument, declaringType));
-				if (mode.InsertionPoints.Count == 0) {
-					MessageService.ShowError (
-						GettextCatalog.GetString ("No valid insertion point can be found in type '{0}'.", declaringType.Name)
-						);
-					return;
-				}
-				var suitableInsertionPoint = GetSuitableInsertionPoint (mode.InsertionPoints, part, newMember);
-				if (suitableInsertionPoint != null)
-					mode.CurIndex = mode.InsertionPoints.IndexOf (suitableInsertionPoint);
-				else
-					mode.CurIndex = 0;
-
-				var helpWindow = new Mono.TextEditor.PopupWindow.InsertionCursorLayoutModeHelpWindow () {
-					TitleText = operation
-				};
-				mode.HelpWindow = helpWindow;
-
-				mode.StartMode ();
-				mode.Exited += delegate(object s, InsertionCursorEventArgs iCArgs) {
-					if (!iCArgs.Success) {
-						tcs.SetResult (false);
-						return;
-					}
-					var generator = CreateCodeGenerator (editor, parentType.Compilation);
-					generator.IndentLevel = CalculateBodyIndentLevel (declaringType);
-					var generatedCode = generator.CreateMemberImplementation (parentType, part, newMember, implementExplicit);
-					mode.InsertionPoints[mode.CurIndex].Insert (editor, generatedCode.Code);
-					tcs.SetResult (true);
-				};
-			});
-
-			return tcs.Task;
-		}
-		
-		public static Task<bool> InsertMember (
-			ITypeDefinition parentType, IUnresolvedTypeDefinition part,
-			IUnresolvedMember newMember, bool implementExplicit = false)
-		{
-			var tcs = new TaskCompletionSource<bool>();
-			if (parentType == null)
-				return tcs.Task;
-			part = part ?? parentType.Parts.FirstOrDefault ();
-			if (part == null)
-				return tcs.Task;
-
-			var loadedDocument = IdeApp.Workbench.OpenDocument (part.Region.FileName);
-			loadedDocument.RunWhenLoaded (delegate {
-				var editor = loadedDocument.Editor;
-				var loc = part.Region.Begin;
-				var parsedDocument = loadedDocument.UpdateParseDocument ();
-				var declaringType = parsedDocument.GetInnermostTypeDefinition (loc);
-				var insertionPoints = CodeGenerationService.GetInsertionPoints (loadedDocument, declaringType);
-				if (insertionPoints.Count == 0) {
-					MessageService.ShowError (
-						GettextCatalog.GetString ("No valid insertion point can be found in type '{0}'.", declaringType.Name)
-						);
-					return;
-				}
-				var suitableInsertionPoint = GetSuitableInsertionPoint (insertionPoints, part, newMember) ?? insertionPoints.First ();
-
-				var generator = CreateCodeGenerator (editor, parentType.Compilation);
-				generator.IndentLevel = CalculateBodyIndentLevel (declaringType);
-				var generatedCode = generator.CreateMemberImplementation (parentType, part, newMember, implementExplicit);
-				suitableInsertionPoint.Insert (editor, generatedCode.Code);
-			});
-
-			return tcs.Task;
-		}
-
-		public static int CalculateBodyIndentLevel (IUnresolvedTypeDefinition declaringType)
-		{
-			if (declaringType == null)
-				return 0;
-			int indentLevel = 1;
-			while (declaringType.DeclaringTypeDefinition != null) {
-				indentLevel++;
-				declaringType = declaringType.DeclaringTypeDefinition;
-			}
-			var file = declaringType.UnresolvedFile as CSharpUnresolvedFile;
-			if (file == null)
-				return indentLevel;
-			var scope = file.GetUsingScope (declaringType.Region.Begin);
-			while (scope != null && !string.IsNullOrEmpty (scope.NamespaceName)) {
-				indentLevel++;
-				// skip virtual scopes.
-				while (scope.Parent != null && scope.Parent.Region == scope.Region)
-					scope = scope.Parent;
-				scope = scope.Parent;
-			}
-			return indentLevel;
-		}
-		
-		public static void AddNewMembers (Project project, ITypeDefinition type, IUnresolvedTypeDefinition part, IEnumerable<IUnresolvedMember> newMembers, string regionName = null, Func<IUnresolvedMember, bool> implementExplicit = null)
-		{
-			IUnresolvedMember firstNewMember = newMembers.FirstOrDefault ();
-			if (firstNewMember == null)
-				return;
-			bool isOpen;
-			var data = TextFileProvider.Instance.GetTextEditorData (part.Region.FileName, out isOpen);
-			var parsedDocument = TypeSystemService.ParseFile (project, data);
-			
-			var insertionPoints = GetInsertionPoints (data, parsedDocument, part);
-			
-			
-			var suitableInsertionPoint = GetSuitableInsertionPoint (insertionPoints, part, firstNewMember);
-			
-			var generator = CreateCodeGenerator (data, type.Compilation);
-			generator.IndentLevel = CalculateBodyIndentLevel (parsedDocument.GetInnermostTypeDefinition (part.Region.Begin));
-			StringBuilder sb = new StringBuilder ();
-			foreach (var newMember in newMembers) {
-				if (sb.Length > 0) {
-					sb.AppendLine ();
-					sb.AppendLine ();
-				}
-				sb.Append (generator.CreateMemberImplementation (type, part, newMember, implementExplicit != null ? implementExplicit (newMember) : false).Code);
-			}
-			suitableInsertionPoint.Insert (data, string.IsNullOrEmpty (regionName) ? sb.ToString () : generator.WrapInRegions (regionName, sb.ToString ()));
-			if (!isOpen) {
-				try {
-					File.WriteAllText (type.Region.FileName, data.Text);
-				} catch (Exception e) {
-					LoggingService.LogError (GettextCatalog.GetString ("Failed to write file '{0}'.", type.Region.FileName), e);
-					MessageService.ShowError (GettextCatalog.GetString ("Failed to write file '{0}'.", type.Region.FileName));
-				}
-			}
-		}
-		
-		public static CodeGenerator CreateCodeGenerator (this Ide.Gui.Document doc)
-		{
-			return CodeGenerator.CreateGenerator (doc);
-		}
-		
-		public static CodeGenerator CreateCodeGenerator (this TextEditorData data, ICompilation compilation)
-		{
-			return CodeGenerator.CreateGenerator (data, compilation);
-		}
-		
-		static IUnresolvedTypeDefinition GetMainPart (IType t)
-		{
-			return t.GetDefinition ().Parts.First ();
-		}
-		
-		#region Insertion Points
-		public static List<InsertionPoint> GetInsertionPoints (MonoDevelop.Ide.Gui.Document document, IUnresolvedTypeDefinition type)
-		{
-			if (document == null)
-				throw new ArgumentNullException ("document");
-			if (document.ParsedDocument == null)
-				return new List<InsertionPoint> ();
-			return GetInsertionPoints (document.Editor, document.ParsedDocument, type);
-		}
-		
-		public static List<InsertionPoint> GetInsertionPoints (TextEditorData data, ParsedDocument parsedDocument, IUnresolvedTypeDefinition type)
-		{
-			if (data == null)
-				throw new ArgumentNullException ("data");
-			if (parsedDocument == null)
-				throw new ArgumentNullException ("parsedDocument");
-			if (type == null)
-				throw new ArgumentNullException ("type");
-			
-			// update type from parsed document, since this is always newer.
-			//type = parsedDocument.GetInnermostTypeDefinition (type.GetLocation ()) ?? type;
-			List<InsertionPoint> result = new List<InsertionPoint> ();
-			int offset = data.LocationToOffset (type.Region.Begin);
-			if (offset < 0 || type.BodyRegion.IsEmpty)
-				return result;
-			while (offset < data.Length && data.GetCharAt (offset) != '{') {
-				offset++;
-			}
-			var realStartLocation = data.OffsetToLocation (offset);
-			result.Add (GetInsertionPosition (data.Document, realStartLocation.Line, realStartLocation.Column));
-			result [0].LineBefore = NewLineInsertion.None;
-			
-			foreach (var member in type.Members) {
-				TextLocation domLocation = member.BodyRegion.End;
-				if (domLocation.Line <= 0) {
-					DocumentLine lineSegment = data.GetLine (member.Region.BeginLine);
-					if (lineSegment == null)
-						continue;
-					domLocation = new TextLocation (member.Region.BeginLine, lineSegment.Length + 1);
-				}
-				result.Add (GetInsertionPosition (data.Document, domLocation.Line, domLocation.Column));
-			}
-
-			foreach (var nestedType in type.NestedTypes) {
-				TextLocation domLocation = nestedType.BodyRegion.End;
-				if (domLocation.Line <= 0) {
-					DocumentLine lineSegment = data.GetLine (nestedType.Region.BeginLine);
-					if (lineSegment == null)
-						continue;
-					domLocation = new TextLocation (nestedType.Region.BeginLine, lineSegment.Length + 1);
-				}
-				result.Add (GetInsertionPosition (data.Document, domLocation.Line, domLocation.Column));
-			}
-
-			result [result.Count - 1].LineAfter = NewLineInsertion.None;
-			CheckStartPoint (data.Document, result [0], result.Count == 1);
-			if (result.Count > 1) {
-				result.RemoveAt (result.Count - 1); 
-				NewLineInsertion insertLine;
-				var lineBefore = data.GetLine (type.BodyRegion.EndLine - 1);
-				if (lineBefore != null && lineBefore.Length == lineBefore.GetIndentation (data.Document).Length) {
-					insertLine = NewLineInsertion.None;
-				} else {
-					insertLine = NewLineInsertion.Eol;
-				}
-				// search for line start
-				int col = type.BodyRegion.EndColumn - 1;
-				var line = data.GetLine (type.BodyRegion.EndLine);
-				if (line != null) {
-					var lineOffset = line.Offset;
-					col = Math.Min (line.Length, col);
-					while (lineOffset + col - 2 >= 0 && col > 1 && char.IsWhiteSpace (data.GetCharAt (lineOffset + col - 2)))
-						col--;
-				}
-				result.Add (new InsertionPoint (new DocumentLocation (type.BodyRegion.EndLine, col), insertLine, NewLineInsertion.Eol));
-				CheckEndPoint (data.Document, result [result.Count - 1], result.Count == 1);
-			}
-			
-			foreach (var region in parsedDocument.UserRegions.Where (r => type.BodyRegion.IsInside (r.Region.Begin))) {
-				result.Add (new InsertionPoint (new DocumentLocation (region.Region.BeginLine + 1, 1), NewLineInsertion.Eol, NewLineInsertion.Eol));
-				result.Add (new InsertionPoint (new DocumentLocation (region.Region.EndLine, 1), NewLineInsertion.Eol, NewLineInsertion.Eol));
-				result.Add (new InsertionPoint (new DocumentLocation (region.Region.EndLine + 1, 1), NewLineInsertion.Eol, NewLineInsertion.Eol));
-			}
-			result.Sort ((left, right) => left.Location.CompareTo (right.Location));
-//			foreach (var res in result)
-//				Console.WriteLine (res);
-			return result;
-		}
-
-		static void CheckEndPoint (TextDocument doc, InsertionPoint point, bool isStartPoint)
-		{
-			DocumentLine line = doc.GetLine (point.Location.Line);
-			if (line == null)
-				return;
-			
-			if (doc.GetLineIndent (line).Length + 1 < point.Location.Column)
-				point.LineBefore = NewLineInsertion.BlankLine;
-			if (point.Location.Column < line.Length + 1)
-				point.LineAfter = NewLineInsertion.Eol;
-		}
-		
-		static void CheckStartPoint (TextDocument doc, InsertionPoint point, bool isEndPoint)
-		{
-			DocumentLine line = doc.GetLine (point.Location.Line);
-			if (line == null)
-				return;
-			if (doc.GetLineIndent (line).Length + 1 == point.Location.Column) {
-				int lineNr = point.Location.Line;
-				while (lineNr > 1 && doc.GetLineIndent (lineNr - 1).Length == doc.GetLine (lineNr - 1).Length) {
-					lineNr--;
-				}
-				line = doc.GetLine (lineNr);
-				point.Location = new DocumentLocation (lineNr, doc.GetLineIndent (line).Length + 1);
-			}
-			
-			if (doc.GetLineIndent (line).Length + 1 < point.Location.Column)
-				point.LineBefore = NewLineInsertion.Eol;
-			if (point.Location.Column < line.Length + 1)
-				point.LineAfter = isEndPoint ? NewLineInsertion.Eol : NewLineInsertion.BlankLine;
-		}
-		
-		static InsertionPoint GetInsertionPosition (TextDocument doc, int line, int column)
-		{
-			int bodyEndOffset = doc.LocationToOffset (line, column) + 1;
-			DocumentLine curLine = doc.GetLine (line);
-			if (curLine != null) {
-				if (bodyEndOffset < curLine.Offset + curLine.Length) {
-					// case1: positition is somewhere inside the start line
-					return new InsertionPoint (new DocumentLocation (line, column + 1), NewLineInsertion.Eol, NewLineInsertion.BlankLine);
-				}
-			}
-			
-			// -> if position is at line end check next line
-			DocumentLine nextLine = doc.GetLine (line + 1);
-			if (nextLine == null) // check for 1 line case.
-				return new InsertionPoint (new DocumentLocation (line, column + 1), NewLineInsertion.BlankLine, NewLineInsertion.BlankLine);
-			
-			for (int i = nextLine.Offset; i < nextLine.EndOffset; i++) {
-				char ch = doc.GetCharAt (i);
-				if (!char.IsWhiteSpace (ch)) {
-					// case2: next line contains non ws chars.
-					return new InsertionPoint (new DocumentLocation (line + 1, 1), NewLineInsertion.Eol, NewLineInsertion.BlankLine);
-				}
-			}
-
-			DocumentLine nextLine2 = doc.GetLine (line + 2);
-			if (nextLine2 != null) {
-				for (int i = nextLine2.Offset; i < nextLine2.EndOffset; i++) {
-					char ch = doc.GetCharAt (i);
-					if (!char.IsWhiteSpace (ch)) {
-						// case3: one blank line
-						return new InsertionPoint (new DocumentLocation (line + 1, 1), NewLineInsertion.Eol, NewLineInsertion.Eol);
-					}
-				}
-			}
-			// case4: more than 1 blank line
-			return new InsertionPoint (new DocumentLocation (line + 1, 1), NewLineInsertion.Eol, NewLineInsertion.None);
-		}
-		
-		static InsertionPoint GetSuitableInsertionPoint (IEnumerable<InsertionPoint> points, IUnresolvedTypeDefinition cls, IUnresolvedMember member)
-		{
-			var mainPart = cls;
-			switch (member.SymbolKind) {
-			case SymbolKind.Field:
-				return GetNewFieldPosition (points, mainPart);
-			case SymbolKind.Method:
-			case SymbolKind.Constructor:
-			case SymbolKind.Destructor:
-			case SymbolKind.Operator:
-				return GetNewMethodPosition (points, mainPart);
-			case SymbolKind.Event:
-				return GetNewEventPosition (points, mainPart);
-			case SymbolKind.Property:
-				return GetNewPropertyPosition (points, mainPart);
-			}
-			throw new InvalidOperationException ("Invalid member type: " + member.SymbolKind);
-		}
-		
-		static InsertionPoint GetSuitableInsertionPoint (IEnumerable<InsertionPoint> points, IUnresolvedTypeDefinition cls, CodeTypeMember mem)
-		{
-			var mainPart = cls;
-			if (mem is System.CodeDom.CodeMemberEvent)
-				return GetNewEventPosition (points, mainPart);
-			if (mem is System.CodeDom.CodeMemberProperty)
-				return GetNewPropertyPosition (points, mainPart);
-			if (mem is System.CodeDom.CodeMemberField)
-				return GetNewFieldPosition (points, mainPart);
-			if (mem is System.CodeDom.CodeMemberMethod)
-				return GetNewMethodPosition (points, mainPart);
-			return GetNewFieldPosition (points, mainPart);
-		}
-		
-		static InsertionPoint GetNewFieldPosition (IEnumerable<InsertionPoint> points, IUnresolvedTypeDefinition cls)
-		{
-			if (!cls.Fields.Any ()) 
-				return points.FirstOrDefault ();
-			var lastField = cls.Fields.Last ();
-			return points.FirstOrDefault (p => p.Location.Convert () > lastField.Region.Begin);
-		}
-		
-		static InsertionPoint GetNewMethodPosition (IEnumerable<InsertionPoint> points, IUnresolvedTypeDefinition cls)
-		{
-			if (!cls.Methods.Any ()) 
-				return GetNewPropertyPosition (points, cls);
-			var lastMember = cls.Members.Last ();
-			return points.FirstOrDefault (p => p.Location.Convert () > lastMember.Region.Begin);
-		}
-		
-		static InsertionPoint GetNewPropertyPosition (IEnumerable<InsertionPoint> points, IUnresolvedTypeDefinition cls)
-		{
-			if (!cls.Properties.Any ())
-				return GetNewFieldPosition (points, cls);
-			var lastProperty = cls.Properties.Last ();
-			return points.FirstOrDefault (p => p.Location.Convert () > lastProperty.Region.Begin);
-		}
-		
-		static InsertionPoint GetNewEventPosition (IEnumerable<InsertionPoint> points, IUnresolvedTypeDefinition cls)
-		{
-			if (!cls.Events.Any ())
-				return GetNewMethodPosition (points, cls);
-			var lastEvent = cls.Events.Last ();
-			return points.FirstOrDefault (p => p.Location.Convert () > lastEvent.Region.Begin);
-		}
-		#endregion
-		
-		public static void AddAttribute (ITypeDefinition cls, string name, params object[] parameters)
-		{
-			bool isOpen;
-			string fileName = cls.Region.FileName;
-			var buffer = TextFileProvider.Instance.GetTextEditorData (fileName, out isOpen);
-			
-			var attr = new CodeAttributeDeclaration (name);
-			foreach (var parameter in parameters) {
-				attr.Arguments.Add (new CodeAttributeArgument (new CodePrimitiveExpression (parameter)));
-			}
-			
-			var type = new CodeTypeDeclaration ("temp");
-			type.CustomAttributes.Add (attr);
-			Project project;
-			if (!cls.TryGetSourceProject (out project)) {
-				LoggingService.LogError ("Error can't get source project for:" + cls.FullName); 
-			}
-
-			var provider = ((DotNetProject)project).LanguageBinding.GetCodeDomProvider ();
-			var sw = new StringWriter ();
-			provider.GenerateCodeFromType (type, sw, new CodeGeneratorOptions ());
-			string code = sw.ToString ();
-			int start = code.IndexOf ('[');
-			int end = code.LastIndexOf (']');
-			code = code.Substring (start, end - start + 1) + Environment.NewLine;
-
-			int pos = buffer.LocationToOffset (cls.Region.BeginLine, cls.Region.BeginColumn);
-
-			code = buffer.GetLineIndent (cls.Region.BeginLine) + code;
-			buffer.Insert (pos, code);
-			if (!isOpen) {
-				File.WriteAllText (fileName, buffer.Text);
-				buffer.Dispose ();
-			}
-			
-		}
-		
-		public static IUnresolvedTypeDefinition AddType (DotNetProject project, string folder, string namspace, CodeTypeDeclaration type)
-		{
-			
-			var unit = new CodeCompileUnit ();
-			var ns = new CodeNamespace (namspace);
-			ns.Types.Add (type);
-			unit.Namespaces.Add (ns);
-			
-			string fileName = project.LanguageBinding.GetFileName (Path.Combine (folder, type.Name));
-			using (var sw = new StreamWriter (fileName)) {
-				var provider = project.LanguageBinding.GetCodeDomProvider ();
-				var options = new CodeGeneratorOptions ();
-				options.IndentString = "\t";
-				options.BracingStyle = "C";
-		
-				provider.GenerateCodeFromCompileUnit (unit, sw, options);
-			}
-			return TypeSystemService.ParseFile (project, fileName).TopLevelTypeDefinitions.FirstOrDefault ();
-		}
-		
-	}
-	
-	public static class HelperMethods
-	{
-		public static TextLocation Convert (this DocumentLocation location)
-		{
-			return new TextLocation (location.Line, location.Column);
-		}
-	}
-}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerator.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerator.cs
index 1b1d6e1310..760496caed 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerator.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerator.cs
@@ -29,12 +29,12 @@ using System.Collections.Generic;
 using System.Linq;
 using Mono.Addins;
 using ICSharpCode.NRefactory.TypeSystem;
-using Mono.TextEditor;
 using MonoDevelop.Core.AddIns;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory;
 using MonoDevelop.Projects.Policies;
 using MonoDevelop.Ide.Extensions;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.TypeSystem
 {
@@ -67,36 +67,39 @@ namespace MonoDevelop.Ide.TypeSystem
 			set;
 		}
 
-		public ICompilation Compilation {
-			get;
-			set;
-		}
-
-		public static CodeGenerator CreateGenerator (Ide.Gui.Document doc)
+		public static CodeGenerator CreateGenerator (TextEditor editor, DocumentContext documentContext)
 		{
 			MimeTypeExtensionNode node;
-			if (!generators.TryGetValue (doc.Editor.MimeType, out node))
+			if (!generators.TryGetValue (editor.MimeType, out node))
 				return null;
 
 			var result = (CodeGenerator)node.CreateInstance ();
-			result.UseSpaceIndent = doc.Editor.TabsToSpaces;
-			result.EolMarker = doc.Editor.EolMarker;
-			result.TabSize = doc.Editor.Options.TabSize;
-			result.Compilation = doc.Compilation;
+
+			result.UseSpaceIndent = editor.Options.TabsToSpaces;
+			result.EolMarker = editor.EolMarker;
+			result.TabSize = editor.Options.TabSize;
+
 			return result;
 		}
-		
-		public static CodeGenerator CreateGenerator (TextEditorData editor, ICompilation compilation)
+
+		public static CodeGenerator CreateGenerator (Ide.Gui.Document doc)
+		{
+			return CreateGenerator (doc.Editor, doc);
+		}
+
+		public static CodeGenerator CreateGenerator (ITextDocument editor, ICompilation compilation)
 		{
 			MimeTypeExtensionNode node;
 			if (!generators.TryGetValue (editor.MimeType, out node))
 				return null;
 
 			var result = (CodeGenerator)node.CreateInstance ();
-			result.UseSpaceIndent = editor.TabsToSpaces;
-			result.EolMarker = editor.EolMarker;
-			result.TabSize = editor.Options.TabSize;
-			result.Compilation = compilation;
+
+			//result.UseSpaceIndent = editor.Options.TabsToSpaces;
+			result.EolMarker = editor.GetEolMarker ();
+			//result.TabSize = editor.Options.TabSize;
+			//result.Compilation = compilation;
+
 			return result;
 		}
 
@@ -154,12 +157,6 @@ namespace MonoDevelop.Ide.TypeSystem
 			generators.Remove (node.MimeType);
 		}
 
-		protected void SetIndentTo (IUnresolvedTypeDefinition implementingType)
-		{
-			if (IndentLevel < 0)
-				IndentLevel = AutoIndent ? CodeGenerationService.CalculateBodyIndentLevel (implementingType) : 0;
-		}
-
 		static bool CompareMethods (IMethod interfaceMethod, IMethod typeMethod)
 		{
 			if (typeMethod.IsExplicitInterfaceImplementation)
@@ -168,15 +165,26 @@ namespace MonoDevelop.Ide.TypeSystem
 		}
 
 		public abstract string WrapInRegions (string regionName, string text);
-		public abstract CodeGeneratorMemberResult CreateMemberImplementation (ITypeDefinition implementingType, IUnresolvedTypeDefinition part, IUnresolvedMember member, bool explicitDeclaration);
-		public abstract CodeGeneratorMemberResult CreateMemberImplementation (ITypeDefinition implementingType, IUnresolvedTypeDefinition part, IMember member, bool explicitDeclaration);
 
-		public abstract string CreateFieldEncapsulation (IUnresolvedTypeDefinition implementingType, IField field, string propertyName, Accessibility modifiers, bool readOnly);
+		public abstract void AddGlobalNamespaceImport (TextEditor editor, DocumentContext context, string nsName);
+		public abstract void AddLocalNamespaceImport (TextEditor editor, DocumentContext context, string nsName, TextLocation caretLocation);
+
+		public void AddGlobalNamespaceImport (MonoDevelop.Ide.Gui.Document doc, string nsName)
+		{
+			if (doc == null)
+				throw new ArgumentNullException ("doc");
+			AddGlobalNamespaceImport (doc.Editor, doc, nsName);
+		}
+
+		public void AddLocalNamespaceImport (MonoDevelop.Ide.Gui.Document doc, string nsName, TextLocation caretLocation)
+		{
+			if (doc == null)
+				throw new ArgumentNullException ("doc");
+			AddLocalNamespaceImport (doc.Editor, doc, nsName, caretLocation);
+		}
 
-		public abstract void AddGlobalNamespaceImport (MonoDevelop.Ide.Gui.Document doc, string nsName);
-		public abstract void AddLocalNamespaceImport (MonoDevelop.Ide.Gui.Document doc, string nsName, TextLocation caretLocation);
 
-		public abstract string GetShortTypeString (MonoDevelop.Ide.Gui.Document doc, IType type);
+		//public abstract string GetShortTypeString (TextEditor editor, DocumentContext context, IType type);
 
 		public abstract void CompleteStatement (MonoDevelop.Ide.Gui.Document doc);
 	}
@@ -230,4 +238,4 @@ namespace MonoDevelop.Ide.TypeSystem
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Comment.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Comment.cs
index 6f615285ba..01eceed24a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Comment.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Comment.cs
@@ -26,7 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Ide.TypeSystem
 {
@@ -55,7 +56,13 @@ namespace MonoDevelop.Ide.TypeSystem
 			set;
 		}
 
-		public DomRegion Region {
+		public bool HasRegion {
+			get {
+				return !Region.IsEmpty;
+			}
+		}
+
+		public DocumentRegion Region {
 			get;
 			set;
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Error.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Error.cs
new file mode 100644
index 0000000000..ca6a00634b
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Error.cs
@@ -0,0 +1,216 @@
+//
+// Error.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 mkrueger
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.Ide.TypeSystem
+{
+	/// <summary>
+	/// Enum that describes the type of an error.
+	/// </summary>
+	public enum ErrorType
+	{
+		Unknown,
+		Error,
+		Warning
+	}
+
+	/// <summary>
+	/// Descibes an error during parsing.
+	/// </summary>
+	[Serializable]
+	public class Error
+	{
+		readonly ErrorType errorType;
+		readonly string message;
+		readonly DocumentRegion region;
+
+		/// <summary>
+		/// The type of the error.
+		/// </summary>
+		public ErrorType ErrorType { get { return errorType; } }
+
+		/// <summary>
+		/// The error description.
+		/// </summary>
+		public string Message { get { return message; } }
+
+		/// <summary>
+		/// The id of the error.
+		/// </summary>
+		public string Id { get; private set; }
+
+		/// <summary>
+		/// The region of the error.
+		/// </summary>
+		public DocumentRegion Region { get { return region; } }
+
+		/// <summary>
+		/// Gets or sets the tag.
+		/// </summary>
+		public object Tag { get; set; }
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.Error"/> class.
+		/// </summary>
+		/// <param name='errorType'>
+		/// The error type.
+		/// </param>
+		/// <param name='message'>
+		/// The description of the error.
+		/// </param>
+		/// <param name='region'>
+		/// The region of the error.
+		/// </param>
+		public Error (ErrorType errorType, string message, DocumentRegion region)
+		{
+			this.errorType = errorType;
+			this.message = message;
+			this.region = region;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.Error"/> class.
+		/// </summary>
+		/// <param name='errorType'>
+		/// The error type.
+		/// </param>
+		/// <param name='message'>
+		/// The description of the error.
+		/// </param>
+		/// <param name='location'>
+		/// The location of the error.
+		/// </param>
+		public Error (ErrorType errorType, string message, DocumentLocation location)
+		{
+			this.errorType = errorType;
+			this.message = message;
+			this.region = new DocumentRegion (location, location);
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.Error"/> class.
+		/// </summary>
+		/// <param name='errorType'>
+		/// The error type.
+		/// </param>
+		/// <param name='message'>
+		/// The description of the error.
+		/// </param>
+		public Error (ErrorType errorType, string message, int line, int column) : this (errorType, message, new DocumentLocation (line, column)) 
+		{
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.Error"/> class.
+		/// </summary>
+		/// <param name='errorType'>
+		/// The error type.
+		/// </param>
+		/// <param name='message'>
+		/// The description of the error.
+		/// </param>
+		public Error (ErrorType errorType, string message)
+		{
+			this.errorType = errorType;
+			this.message = message;
+			this.region = DocumentRegion.Empty;
+		}
+
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.Error"/> class.
+		/// </summary>
+		/// <param name='errorType'>
+		/// The error type.
+		/// </param>
+		/// <param name='message'>
+		/// The description of the error.
+		/// </param>
+		/// <param name='region'>
+		/// The region of the error.
+		/// </param>
+		public Error (ErrorType errorType, string id, string message, DocumentRegion region)
+		{
+			this.errorType = errorType;
+			this.Id = id;
+			this.message = message;
+			this.region = region;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.Error"/> class.
+		/// </summary>
+		/// <param name='errorType'>
+		/// The error type.
+		/// </param>
+		/// <param name='message'>
+		/// The description of the error.
+		/// </param>
+		/// <param name='location'>
+		/// The location of the error.
+		/// </param>
+		public Error (ErrorType errorType, string id, string message, DocumentLocation location)
+		{
+			this.errorType = errorType;
+			this.Id = id;
+			this.message = message;
+			this.region = new DocumentRegion (location, location);
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.Error"/> class.
+		/// </summary>
+		/// <param name='errorType'>
+		/// The error type.
+		/// </param>
+		/// <param name='message'>
+		/// The description of the error.
+		/// </param>
+		public Error (ErrorType errorType, string id, string message, int line, int column) : this (errorType, id, message, new DocumentLocation (line, column)) 
+		{
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.Error"/> class.
+		/// </summary>
+		/// <param name='errorType'>
+		/// The error type.
+		/// </param>
+		/// <param name='message'>
+		/// The description of the error.
+		/// </param>
+		public Error (ErrorType errorType, string id, string message)
+		{
+			this.errorType = errorType;
+			this.Id = id;
+			this.message = message;
+			this.region = DocumentRegion.Empty;
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/FoldingRegion.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/FoldingRegion.cs
index 46f0ffcfea..91f5b99b93 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/FoldingRegion.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/FoldingRegion.cs
@@ -24,7 +24,7 @@
 // THE SOFTWARE.
 //
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Ide.TypeSystem
 {
@@ -38,37 +38,37 @@ namespace MonoDevelop.Ide.TypeSystem
 		//NOTE: thsi is only respected if the FoldType is set to "Undefined"
 		public bool IsFoldedByDefault { get; set; }
 		
-		public DomRegion Region { get; set; }
+		public DocumentRegion Region { get; set; }
 		
 		public FoldType Type { get; set; }
 		
-		public FoldingRegion (DomRegion region) : this (null, region)
+		public FoldingRegion (DocumentRegion region) : this (null, region)
 		{
 		}
 		
-		public FoldingRegion (string name, DomRegion region)
+		public FoldingRegion (string name, DocumentRegion region)
 		{
 			this.Name = name ?? defaultName;
 			this.Region = region;
 		}
 		
-		public FoldingRegion (string name, DomRegion region, bool isFoldedByDefault) : this (name, region)
+		public FoldingRegion (string name, DocumentRegion region, bool isFoldedByDefault) : this (name, region)
 		{
 			this.IsFoldedByDefault = isFoldedByDefault;
 		}
 		
-		public FoldingRegion (string name, DomRegion region, FoldType type) : this (name, region)
+		public FoldingRegion (string name, DocumentRegion region, FoldType type) : this (name, region)
 		{
 			this.Type = type;
 		}
 		
-		public FoldingRegion (string name, DomRegion region, FoldType type, bool isFoldedByDefault) : this (name, region)
+		public FoldingRegion (string name, DocumentRegion region, FoldType type, bool isFoldedByDefault) : this (name, region)
 		{
 			this.Type = type;
 			this.IsFoldedByDefault = isFoldedByDefault;
 		}
 		
-		public FoldingRegion (DomRegion region, FoldType type) : this (null, region, type)
+		public FoldingRegion (DocumentRegion region, FoldType type) : this (null, region, type)
 		{
 		}
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/IFoldingParser.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/IFoldingParser.cs
new file mode 100644
index 0000000000..66ea540bed
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/IFoldingParser.cs
@@ -0,0 +1,41 @@
+//
+// IFoldingParser.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+namespace MonoDevelop.Ide.TypeSystem
+{
+	/// <summary>
+	/// The folding parser is used for generating a preliminary parsed document that does not
+	/// contain a full dom - only some basic lexical constructs like comments or pre processor directives.
+	/// 
+	/// This is useful for opening a document the first time to have some folding regions as start that are folded by default.
+	/// Otherwise an irritating screen update will occur.
+	/// </summary>
+	public interface IFoldingParser
+	{
+		ParsedDocument Parse (string fileName, string content);
+	}
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MetadataReferenceCache.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MetadataReferenceCache.cs
new file mode 100644
index 0000000000..77d8e818eb
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MetadataReferenceCache.cs
@@ -0,0 +1,166 @@
+//
+// MetadataReferenceCache.cs
+//
+// Author:
+//       David Karlaš <david.karlas@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.IO;
+using MonoDevelop.Core;
+using System.Threading;
+
+namespace MonoDevelop.Ide.TypeSystem
+{
+	static class MetadataReferenceCache
+	{
+		static Dictionary<string, MetadataReferenceCacheItem> cache = new Dictionary<string, MetadataReferenceCacheItem> ();
+
+		public static MetadataReference LoadReference (ProjectId projectId, string path)
+		{
+			lock (cache) {
+				MetadataReferenceCacheItem result;
+				if (!cache.TryGetValue (path, out result)) {
+					result = new MetadataReferenceCacheItem (path);
+					cache.Add (path, result);
+				}
+				result.InUseBy.Add (projectId);
+				return result.Reference;
+			}
+		}
+
+		//TODO: This should be called when reference is actually removed and not on
+		//project reload because if this is only project that has this reference... Cache will be
+		//invalidated and when reload comes back in few miliseconds it will need to reload reference again
+		public static void RemoveReference (ProjectId projectId, string path)
+		{
+			lock (cache) {
+				MetadataReferenceCacheItem result;
+				if (cache.TryGetValue (path, out result)) {
+					result.InUseBy.Remove (projectId);
+					if (result.InUseBy.Count == 0) {
+						cache.Remove (path);
+					}
+				}
+			}
+		}
+
+		public static void RemoveReferences (ProjectId id)
+		{
+			lock (cache) {
+				var toRemove = new List<string> ();
+				foreach (var val in cache) {
+					val.Value.InUseBy.Remove (id);
+					if (val.Value.InUseBy.Count == 0) {
+						toRemove.Add (val.Key);
+					}
+				}
+				toRemove.ForEach ((k) => cache.Remove (k));
+			}
+		}
+
+		static Timer timer;
+
+		static MetadataReferenceCache ()
+		{
+			timer = new Timer ((o) => CheckForChanges (), null, 10000, 10000);
+		}
+
+		//TODO: Call this method when focus returns to MD or even better use FileSystemWatcher
+		public static void CheckForChanges ()
+		{
+			lock (cache) {
+				foreach (var value in cache.Values) {
+					value.CheckForChange ();
+				}
+			}
+		}
+
+		class MetadataReferenceCacheItem
+		{
+			public HashSet<ProjectId> InUseBy { get; private set; }
+
+			public MetadataReference Reference { get; private set; }
+
+			readonly string path;
+
+			DateTime timeStamp;
+
+			public MetadataReferenceCacheItem (string path)
+			{
+				this.path = path;
+				CreateNewReference ();
+				InUseBy = new HashSet<ProjectId> ();
+			}
+
+			public void CheckForChange ()
+			{
+				if (timeStamp != File.GetLastWriteTimeUtc (path)) {
+					if (Reference != null) {
+						foreach (var solution in IdeApp.Workspace.GetAllSolutions ()) {
+							var workspace = TypeSystemService.GetWorkspace (solution);
+							foreach (var projId in InUseBy) {
+								while (true) {
+									var project = workspace.CurrentSolution.GetProject (projId);
+									if (project == null)
+										break;
+									if (workspace.TryApplyChanges (project.RemoveMetadataReference (Reference).Solution))
+										break;
+								}
+							}
+						}
+					}
+					CreateNewReference ();
+					if (Reference != null) {
+						foreach (var solution in IdeApp.Workspace.GetAllSolutions ()) {
+							var workspace = TypeSystemService.GetWorkspace (solution);
+							foreach (var projId in InUseBy) {
+								while (true) {
+									var project = workspace.CurrentSolution.GetProject (projId);
+									if (project == null)
+										break;
+									if (workspace.TryApplyChanges (project.AddMetadataReference (Reference).Solution))
+										break;
+								}
+							}
+						}
+					}
+				}
+			}
+
+			readonly static DateTime NonExistentFile = new DateTime (1601, 1, 1);
+
+			void CreateNewReference ()
+			{
+				timeStamp = File.GetLastWriteTimeUtc (path);
+				if (timeStamp == NonExistentFile) {
+					Reference = null;
+				} else {
+					Reference = MetadataReference.CreateFromFile (path, MetadataReferenceProperties.Assembly);
+				}
+			}
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopProjectContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopProjectContent.cs
deleted file mode 100644
index bc77935929..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopProjectContent.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// MonoDevelopProjectContent.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using System.Collections.Generic;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.Ide.TypeSystem
-{
-	[Serializable]
-	class MonoDevelopProjectContent : CSharpProjectContent
-	{
-		[NonSerialized]
-		Project project;
-
-		public Project Project {
-			get {
-				return project;
-			}
-			internal set {
-				project = value;
-			}
-		}
-
-		public MonoDevelopProjectContent (Project project)
-		{
-			this.project = project;
-		}
-
-		MonoDevelopProjectContent (MonoDevelopProjectContent pc) : base (pc)
-		{
-			this.project = pc.project;
-		}
-
-		public override ICompilation CreateCompilation()
-		{
-			var solutionSnapshot = new DefaultSolutionSnapshot();
-			ICompilation compilation = new MonoDevelopCompilation(solutionSnapshot, this, AssemblyReferences);
-			solutionSnapshot.AddCompilation(this, compilation);
-			return compilation;
-		}
-
-		protected override CSharpProjectContent Clone()
-		{
-			return new MonoDevelopProjectContent(this);
-		}
-
-		public override ICompilation CreateCompilation(ISolutionSnapshot solutionSnapshot)
-		{
-			return new MonoDevelopCompilation(solutionSnapshot, this, AssemblyReferences);
-		}
-	}
-
-	class MonoDevelopCompilation : SimpleCompilation
-	{
-		readonly MonoDevelopProjectContent content;
-
-		public MonoDevelopCompilation (ISolutionSnapshot solutionSnapshot, MonoDevelopProjectContent content, IEnumerable<IAssemblyReference> assemblyReferences) : base (solutionSnapshot, content, assemblyReferences)
-		{
-			this.content = content;
-		}
-
-		public override INamespace GetNamespaceForExternAlias (string alias)
-		{
-			var netProject = content.Project as DotNetProject;
-			if (netProject == null)
-				return null;
-			foreach (var r in netProject.References) {
-				if (r.Aliases == alias) {
-					foreach (var refAsm in ReferencedAssemblies) {
-						if (refAsm.FullAssemblyName == r.StoredReference) {
-							return refAsm.RootNamespace;
-						}
-						
-					}
-				}
-			}
-			
-
-			return null;
-		}
-	}
-}
-
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopSourceTextContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopSourceTextContainer.cs
new file mode 100644
index 0000000000..fa3c9b7192
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopSourceTextContainer.cs
@@ -0,0 +1,123 @@
+//
+// RoslynTypeSystemService.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using System.Linq;
+using System.IO;
+using MonoDevelop.Core;
+using System.Collections.Generic;
+using System.Threading;
+using System.Reflection;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using Microsoft.CodeAnalysis.Text;
+
+namespace MonoDevelop.Ide.TypeSystem
+{
+	class MonoDevelopSourceText : SourceText
+	{
+		readonly ITextSource doc;
+
+		public override System.Text.Encoding Encoding {
+			get {
+				return doc.Encoding;
+			}
+		}
+
+		public MonoDevelopSourceText (ITextSource doc)
+		{
+			if (doc == null)
+				throw new ArgumentNullException ("doc");
+			this.doc = doc;
+		}
+
+		#region implemented abstract members of SourceText
+		public override void CopyTo (int sourceIndex, char[] destination, int destinationIndex, int count)
+		{
+			while (count --> 0) {
+				destination[destinationIndex++] = doc.GetCharAt (sourceIndex++);
+			}
+		}
+		
+		public override int Length {
+			get {
+				return doc.Length;
+			}
+		}
+
+		public override char this [int index] {
+			get {
+				return doc.GetCharAt (index);
+			}
+		}
+		#endregion
+	}
+
+	class MonoDevelopSourceTextContainer : SourceTextContainer
+	{
+		readonly ITextDocument document;
+		public DocumentId Id {
+			get;
+			private set;
+		}
+
+		public MonoDevelopSourceTextContainer (DocumentId documentId, ITextDocument document) : this (document)
+		{
+			this.Id = documentId;
+		}
+
+		public MonoDevelopSourceTextContainer (ITextDocument document)
+		{
+			this.document = document;
+			this.document.TextChanging += HandleTextReplacing;
+		}
+
+		~MonoDevelopSourceTextContainer ()
+		{
+			document.TextChanging -= HandleTextReplacing;
+		}
+
+		void HandleTextReplacing (object sender, MonoDevelop.Core.Text.TextChangeEventArgs e)
+		{
+			var handler = TextChanged;
+			if (handler != null) {
+				var oldText = CurrentText;
+				var newText = oldText.Replace (e.Offset, e.RemovalLength, e.InsertedText.Text);
+				handler (this, new Microsoft.CodeAnalysis.Text.TextChangeEventArgs (oldText, newText, new TextChangeRange(TextSpan.FromBounds (e.Offset, e.Offset + e.RemovalLength), e.InsertionLength)));
+			}
+			
+		}
+		#region implemented abstract members of SourceTextContainer
+		public override SourceText CurrentText {
+			get {
+				return new MonoDevelopSourceText (document.CreateSnapshot ());
+			}
+		}
+
+		public override event EventHandler<Microsoft.CodeAnalysis.Text.TextChangeEventArgs> TextChanged;
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopTextLoader.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopTextLoader.cs
new file mode 100644
index 0000000000..d81a4d16a7
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopTextLoader.cs
@@ -0,0 +1,69 @@
+//
+// MonoDevelopTextLoader.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.Ide.TypeSystem
+{
+	class MonoDevelopTextLoader : TextLoader
+	{
+		readonly string fileName;
+
+		public MonoDevelopTextLoader (string fileName)
+		{
+			this.fileName = fileName;
+		}
+
+		#region implemented abstract members of TextLoader
+		TextAndVersion GetTextAndVersion (Workspace workspace, DocumentId documentId)
+		{
+			SourceText text;
+			if (workspace.IsDocumentOpen (documentId)) {
+				text = SourceText.From (TextFileProvider.Instance.GetTextEditorData (fileName).Text);
+			}
+			else {
+				text = SourceText.From (MonoDevelop.Core.Text.TextFileUtility.GetText (fileName));
+			}
+			return TextAndVersion.Create (text, VersionStamp.Create ());
+		}
+
+		public override Task<TextAndVersion> LoadTextAndVersionAsync (Workspace workspace, DocumentId documentId, CancellationToken cancellationToken)
+		{
+			return Task.FromResult (GetTextAndVersion (workspace, documentId));
+		}
+		#endregion
+
+		public static TextLoader CreateFromText (string text)
+		{
+			if (text == null)
+				throw new System.ArgumentNullException ("text");
+			return TextLoader.From (TextAndVersion.Create (SourceText.From (text), VersionStamp.Create ()));
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs
new file mode 100644
index 0000000000..e7ce3ef053
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs
@@ -0,0 +1,848 @@
+//
+// MonoDevelopWorkspace.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis;
+using System.Linq;
+using System.IO;
+using MonoDevelop.Core;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Host;
+using MonoDevelop.Core.Text;
+using System.Collections.Concurrent;
+using MonoDevelop.Ide.CodeFormatting;
+using MonoDevelop.Core.ProgressMonitoring;
+using Gtk;
+
+namespace MonoDevelop.Ide.TypeSystem
+{
+	class MonoDevelopWorkspace : Workspace
+	{
+		readonly static HostServices services = Microsoft.CodeAnalysis.Host.Mef.MefHostServices.DefaultHost;
+		CancellationTokenSource src = new CancellationTokenSource ();
+		MonoDevelop.Projects.Solution currentMonoDevelopSolution;
+		object addLock = new object();
+		bool added;
+		bool internalChanges;
+
+		public MonoDevelop.Projects.Solution MonoDevelopSolution {
+			get {
+				return currentMonoDevelopSolution;
+			}
+		}
+
+		public MonoDevelopWorkspace () : base (services, "MonoDevelopWorkspace")
+		{
+			if (IdeApp.Workspace != null) {
+				IdeApp.Workspace.ActiveConfigurationChanged += HandleActiveConfigurationChanged;
+			}
+		}
+
+		protected override void Dispose (bool finalize)
+		{
+			base.Dispose (finalize);
+			if (IdeApp.Workspace != null) {
+				IdeApp.Workspace.ActiveConfigurationChanged -= HandleActiveConfigurationChanged;
+			}
+
+		}
+
+		internal void InformDocumentTextChange (DocumentId id, SourceText text)
+		{
+			base.ApplyDocumentTextChanged (id, text);
+		}
+
+		void CancelLoad ()
+		{
+			src.Cancel ();
+			src = new CancellationTokenSource ();
+		}
+
+		static StatusBarIcon statusIcon = null;
+		static int workspacesLoading = 0;
+
+		internal static event EventHandler LoadingFinished;
+
+		static void OnLoadingFinished (EventArgs e)
+		{
+			var handler = LoadingFinished;
+			if (handler != null)
+				handler (null, e);
+		}
+
+		internal void HideStatusIcon ()
+		{
+			Gtk.Application.Invoke (delegate {
+				workspacesLoading--;
+				if (workspacesLoading == 0 && statusIcon != null) {
+					statusIcon.Dispose ();
+					statusIcon = null;
+					OnLoadingFinished (EventArgs.Empty);
+				}
+			});
+		}
+
+		internal void ShowStatusIcon ()
+		{
+			Gtk.Application.Invoke (delegate {
+				workspacesLoading++;
+				if (statusIcon != null)
+					return;
+				statusIcon = IdeApp.Workbench?.StatusBar.ShowStatusIcon (ImageService.GetIcon ("md-parser"));
+			});
+		}
+
+		void HandleActiveConfigurationChanged (object sender, EventArgs e)
+		{
+			if (currentMonoDevelopSolution == null)
+				return;
+			ShowStatusIcon ();
+			CancelLoad ();
+			var token = src.Token;
+			Task.Run (() => {
+				try {
+					return CreateSolutionInfo (currentMonoDevelopSolution, token);
+				} catch (Exception ex) {
+					LoggingService.LogError ("Error while reloading solution.", ex); 
+					return null;
+				}
+			}).ContinueWith ((Task<SolutionInfo> t) => {
+				try {
+					if (t.Status == TaskStatus.RanToCompletion) {
+						if (t.Result == null)
+							return;
+						OnSolutionReloaded (t.Result);
+					}
+				} finally {
+					HideStatusIcon ();
+				}
+			});
+		}
+
+		SolutionInfo CreateSolutionInfo (MonoDevelop.Projects.Solution solution, CancellationToken token)
+		{
+			var projects = new ConcurrentBag<ProjectInfo> ();
+			var mdProjects = solution.GetAllProjects ();
+			Parallel.ForEach (mdProjects, proj => {
+				if (token.IsCancellationRequested)
+					return;
+				projects.Add (LoadProject (proj, token));
+			});
+			if (token.IsCancellationRequested)
+				return null;
+			var solutionInfo = SolutionInfo.Create (GetSolutionId (solution), VersionStamp.Create (), solution.FileName, projects);
+			lock (addLock) {
+				if (!added) {
+					added = true;
+					OnSolutionAdded (solutionInfo);
+				}
+			}
+			return solutionInfo;
+		}
+
+		public void TryLoadSolution (MonoDevelop.Projects.Solution solution/*, IProgressMonitor progressMonitor*/)
+		{
+			this.currentMonoDevelopSolution = solution;
+			CancelLoad ();
+			CreateSolutionInfo (solution, src.Token);
+		}
+		
+		public void UnloadSolution ()
+		{
+			OnSolutionRemoved (); 
+		}
+
+		Dictionary<MonoDevelop.Projects.Solution, SolutionId> solutionIdMap = new Dictionary<MonoDevelop.Projects.Solution, SolutionId> ();
+
+		internal SolutionId GetSolutionId (MonoDevelop.Projects.Solution solution)
+		{
+			if (solution == null)
+				throw new ArgumentNullException ("solution");
+			lock (solutionIdMap) {
+				SolutionId result;
+				if (!solutionIdMap.TryGetValue (solution, out result)) {
+					result = SolutionId.CreateNewId (solution.Name);
+					solutionIdMap [solution] = result;
+				}
+				return result;
+			}
+		}
+
+		ConcurrentDictionary<MonoDevelop.Projects.Project, ProjectId> projectIdMap = new ConcurrentDictionary<MonoDevelop.Projects.Project, ProjectId> ();
+		ConcurrentDictionary<ProjectId, ProjectData> projectDataMap = new ConcurrentDictionary<ProjectId, ProjectData> ();
+
+		internal MonoDevelop.Projects.Project GetMonoProject (Project project)
+		{
+			return GetMonoProject (project.Id);
+		}
+
+		internal MonoDevelop.Projects.Project GetMonoProject (ProjectId projectId)
+		{
+			foreach (var kv in projectIdMap) {
+				if (kv.Value == projectId)
+					return kv.Key;
+			}
+			return null;
+		}
+
+		public bool Contains (ProjectId projectId) 
+		{
+			return projectDataMap.ContainsKey (projectId);
+		}
+
+		internal ProjectId GetProjectId (MonoDevelop.Projects.Project p)
+		{
+			lock (projectIdMap) {
+				ProjectId result;
+				if (projectIdMap.TryGetValue (p, out result))
+					return result;
+				return null;
+			}
+		}
+
+		internal ProjectId GetOrCreateProjectId (MonoDevelop.Projects.Project p)
+		{
+			lock (projectIdMap) {
+				ProjectId result;
+				if (!projectIdMap.TryGetValue (p, out result)) {
+					result = ProjectId.CreateNewId (p.Name);
+					projectIdMap [p] = result;
+				}
+				return result;
+			}
+		}
+
+		ProjectData GetProjectData (ProjectId id)
+		{
+			lock (projectIdMap) {
+				ProjectData result;
+				if (projectDataMap.TryGetValue (id, out result)) {
+					return result;
+				}
+				return null;
+			}
+		}
+
+		ProjectData GetOrCreateProjectData (ProjectId id)
+		{
+			lock (projectIdMap) {
+				ProjectData result;
+				if (!projectDataMap.TryGetValue (id, out result)) {
+					result = new ProjectData (id);
+					projectDataMap [id] = result;
+				}
+				return result;
+			}
+		}
+
+		class ProjectData
+		{
+			readonly ProjectId projectId;
+			readonly Dictionary<string, DocumentId> documentIdMap;
+
+			public ProjectInfo Info {
+				get;
+				set;
+			}
+
+			public ProjectData (ProjectId projectId)
+			{
+				this.projectId = projectId;
+				documentIdMap = new Dictionary<string, DocumentId> (FilePath.PathComparer);
+			}
+
+			internal DocumentId GetOrCreateDocumentId (string name)
+			{
+				lock (documentIdMap) {
+					DocumentId result;
+					if (!documentIdMap.TryGetValue (name, out result)) {
+						result = DocumentId.CreateNewId (projectId, name);
+						documentIdMap [name] = result;
+					}
+					return result;
+				}
+			}
+			
+			public DocumentId GetDocumentId (string name)
+			{
+				DocumentId result;
+				if (!documentIdMap.TryGetValue (name, out result))
+					return null;
+				return result;
+			}
+
+			internal void RemoveDocument (string name)
+			{
+				documentIdMap.Remove (name);
+			}
+		}
+
+		internal DocumentId GetDocumentId (ProjectId projectId, string name)
+		{
+			var data = GetProjectData (projectId);
+			if (data == null)
+				return null;
+			return data.GetDocumentId (name);
+		}
+
+		public override bool CanApplyChange (ApplyChangesKind feature)
+		{
+			return true;
+		}
+
+		ProjectInfo LoadProject (MonoDevelop.Projects.Project p, CancellationToken token)
+		{
+			if (!projectIdMap.ContainsKey (p)) {
+				p.FileAddedToProject += OnFileAdded;
+				p.FileRemovedFromProject += OnFileRemoved;
+				p.FileRenamedInProject += OnFileRenamed;
+				p.Modified += OnProjectModified;
+			}
+
+			var projectId = GetOrCreateProjectId (p);
+			var projectData = GetOrCreateProjectData (projectId); 
+			var config = IdeApp.Workspace != null ? p.GetConfiguration (IdeApp.Workspace.ActiveConfiguration) as MonoDevelop.Projects.DotNetProjectConfiguration : null;
+			MonoDevelop.Projects.DotNetConfigurationParameters cp = null;
+			if (config != null)
+				cp = config.CompilationParameters as MonoDevelop.Projects.DotNetConfigurationParameters;
+			FilePath fileName = IdeApp.Workspace != null ? p.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration) : new FilePath (p.Name + ".dll");
+			var info = ProjectInfo.Create (
+				projectId,
+				VersionStamp.Create (),
+				p.Name, 
+				fileName.FileNameWithoutExtension,
+				LanguageNames.CSharp,
+				p.FileName,
+				fileName,
+				cp != null ? cp.CreateCompilationOptions () : null,
+				cp != null ? cp.CreateParseOptions () : null,
+				CreateDocuments (projectData, p, token),
+				CreateProjectReferences (p, token),
+				CreateMetadataReferences (p, projectId, token)
+			);
+
+			projectData.Info = info;
+			return info;
+		}
+
+		internal static Func<string, TextLoader> CreateTextLoader = fileName => new MonoDevelopTextLoader (fileName);
+
+		static DocumentInfo CreateDocumentInfo (string projectName, ProjectData id, MonoDevelop.Projects.ProjectFile f)
+		{
+			var sourceCodeKind = f.FilePath.Extension == ".sketchcs" ? SourceCodeKind.Interactive : SourceCodeKind.Regular;
+			return DocumentInfo.Create (
+				id.GetOrCreateDocumentId (f.Name),
+				f.FilePath,
+				new [] { projectName }.Concat (f.ProjectVirtualPath.ParentDirectory.ToString ().Split (Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)),
+				sourceCodeKind,
+				CreateTextLoader (f.Name),
+				f.Name,
+				false
+			);
+		}
+
+		IEnumerable<DocumentInfo> CreateDocuments (ProjectData id, MonoDevelop.Projects.Project p, CancellationToken token)
+		{
+			var duplicates = new HashSet<DocumentId> ();
+			foreach (var f in p.Files) {
+				if (token.IsCancellationRequested)
+					yield break;
+				if (TypeSystemParserNode.IsCompileBuildAction (f.BuildAction)) {
+					if (!duplicates.Add (id.GetOrCreateDocumentId (f.Name)))
+						continue;
+					yield return CreateDocumentInfo (p.Name, id, f);
+					continue;
+				}
+				var mimeType = DesktopService.GetMimeTypeForUri (f.FilePath);
+				var node = TypeSystemService.GetTypeSystemParserNode (mimeType, f.BuildAction);
+				if (node == null || !node.Parser.CanGenerateProjection (mimeType, f.BuildAction, p.SupportedLanguages))
+					continue;
+				if (!duplicates.Add (id.GetOrCreateDocumentId (f.Name)))
+					continue;
+				var options = new ParseOptions {
+					FileName = f.FilePath,
+					Project = p,
+					Content = StringTextSource.ReadFrom (f.FilePath),
+				};
+				var projections = node.Parser.GenerateProjections (options);
+				foreach (var projection in projections.Result) {
+					yield return DocumentInfo.Create (
+						id.GetOrCreateDocumentId (projection.Document.FileName),
+						projection.Document.FileName,
+						null,
+						SourceCodeKind.Regular,
+						TextLoader.From (TextAndVersion.Create (new MonoDevelopSourceText (projection.Document), VersionStamp.Create (), projection.Document.FileName)),
+						f.Name,
+						false
+					);
+				}
+			}
+		}
+
+		static IEnumerable<MetadataReference> CreateMetadataReferences (MonoDevelop.Projects.Project p, ProjectId projectId, CancellationToken token)
+		{
+			var netProject = p as MonoDevelop.Projects.DotNetProject;
+			if (netProject == null)
+				yield break;
+			var configurationSelector = IdeApp.Workspace?.ActiveConfiguration ?? MonoDevelop.Projects.ConfigurationSelector.Default;
+			var hashSet = new HashSet<string> (FilePath.PathComparer);
+
+			bool addFacadeAssemblies = false;
+
+			foreach (string file in netProject.GetReferencedAssemblies (configurationSelector, false)) {
+				if (token.IsCancellationRequested)
+					yield break;
+				string fileName;
+				if (!Path.IsPathRooted (file)) {
+					fileName = Path.Combine (Path.GetDirectoryName (netProject.FileName), file);
+				} else {
+					fileName = Path.GetFullPath (file);
+				}
+				if (hashSet.Contains (fileName))
+					continue;
+				hashSet.Add (fileName);
+				yield return MetadataReferenceCache.LoadReference (projectId, fileName);
+				addFacadeAssemblies |= MonoDevelop.Core.Assemblies.SystemAssemblyService.ContainsReferenceToSystemRuntime (fileName);
+			}
+
+			// HACK: Facade assemblies should be added by the project system. Remove that when the project system can do that.
+			if (addFacadeAssemblies) {
+				if (netProject != null) {
+					var runtime = netProject.TargetRuntime ?? MonoDevelop.Core.Runtime.SystemAssemblyService.DefaultRuntime;
+					var facades = runtime.FindFacadeAssembliesForPCL (netProject.TargetFramework);
+					foreach (var facade in facades)
+						yield return MetadataReferenceCache.LoadReference (projectId, facade);
+				}
+			}
+
+			foreach (var pr in p.GetReferencedItems (configurationSelector)) {
+				if (token.IsCancellationRequested)
+					yield break;
+				var referencedProject = pr as MonoDevelop.Projects.DotNetProject;
+				if (referencedProject == null)
+					continue;
+				if (TypeSystemService.IsOutputTrackedProject (referencedProject)) {
+					var fileName = referencedProject.GetOutputFileName (configurationSelector);
+					yield return MetadataReferenceCache.LoadReference (projectId, fileName);
+				}
+			}
+		}
+
+		IEnumerable<ProjectReference> CreateProjectReferences (MonoDevelop.Projects.Project p, CancellationToken token)
+		{
+			foreach (var pr in p.GetReferencedItems (MonoDevelop.Projects.ConfigurationSelector.Default)) {
+				if (token.IsCancellationRequested)
+					yield break;
+				var referencedProject = pr as MonoDevelop.Projects.DotNetProject;
+				if (referencedProject == null)
+					continue;
+				if (TypeSystemService.IsOutputTrackedProject (referencedProject))
+					continue;
+				yield return new ProjectReference (GetOrCreateProjectId (referencedProject));
+			}
+		}
+
+		#region Open documents
+		public override bool CanOpenDocuments {
+			get {
+				return true;
+			}
+		}
+
+		public override void OpenDocument (DocumentId documentId, bool activate = true)
+		{
+			var document = GetDocument (documentId);
+			if (document == null)
+				return;
+			MonoDevelop.Projects.Project prj = null;
+			foreach (var curPrj in IdeApp.Workspace.GetAllProjects ()) {
+				if (GetProjectId (curPrj) == documentId.ProjectId) {
+					prj = curPrj;
+					break;
+				}
+			}
+			IdeApp.Workbench.OpenDocument (new MonoDevelop.Ide.Gui.FileOpenInformation (
+				DetermineFilePath(document.Id, document.Name, document.FilePath, document.Folders),
+				prj,
+				activate
+			)); 
+		}
+
+		List<MonoDevelopSourceTextContainer> openDocuments = new List<MonoDevelopSourceTextContainer>();
+		internal void InformDocumentOpen (DocumentId documentId, ITextDocument editor)
+		{
+			var document = this.GetDocument (documentId);
+			if (document == null) {
+				return;
+			}
+			if (IsDocumentOpen (documentId))
+				InformDocumentClose (documentId, document.FilePath);
+            var monoDevelopSourceTextContainer = new MonoDevelopSourceTextContainer (documentId, editor);
+			lock (openDocuments) {
+				openDocuments.Add (monoDevelopSourceTextContainer);
+			}
+			OnDocumentOpened (documentId, monoDevelopSourceTextContainer); 
+		}
+
+		Solution newSolution;
+		public override bool TryApplyChanges (Solution newSolution)
+		{
+			this.newSolution = newSolution;
+			return base.TryApplyChanges (newSolution);
+		}
+
+		protected override void ApplyProjectChanges (ProjectChanges projectChanges)
+		{
+			try {
+				internalChanges = true;
+				base.ApplyProjectChanges (projectChanges);
+				var data = GetMonoProject (projectChanges.NewProject);
+				if (data != null) {
+					Application.Invoke (delegate {
+						data.Save (new NullProgressMonitor ());	
+					});
+				}
+			} finally {
+				internalChanges = false;
+			}
+		}
+
+		protected override void ApplyAdditionalDocumentAdded (DocumentInfo info, SourceText text)
+		{
+			base.ApplyAdditionalDocumentAdded (info, text);
+		}
+
+		protected override void OnDocumentTextChanged (Document document)
+		{
+			base.OnDocumentTextChanged (document);
+		}
+
+		protected override void OnDocumentClosing (DocumentId documentId)
+		{
+			base.OnDocumentClosing (documentId);
+			lock (openDocuments) {
+				var openDoc = openDocuments.FirstOrDefault (d => d.Id == documentId);
+				if (openDoc != null) {
+//					openDoc.TextChanged -= HandleTextChanged;
+					openDocuments.Remove (openDoc);
+				}
+			}
+		}
+
+//		internal override bool CanChangeActiveContextDocument {
+//			get {
+//				return true;
+//			}
+//		}
+
+		public void InformDocumentClose (DocumentId analysisDocument, string filePath)
+		{
+			try {
+				OnDocumentClosed (analysisDocument, new MonoDevelopTextLoader (filePath)); 
+			} catch (Exception e) {
+				LoggingService.LogError ("Exception while closing document.", e); 
+			}
+		}
+		
+		public override void CloseDocument (DocumentId documentId)
+		{
+		}
+
+		protected override void ApplyDocumentTextChanged (DocumentId id, SourceText text)
+		{
+			var document = GetDocument (id);
+			
+			if (document == null)
+				return;
+			bool isOpen;
+			var data = TextFileProvider.Instance.GetTextEditorData (document.FilePath, out isOpen);
+			var changes = text.GetTextChanges (document.GetTextAsync ().Result).OrderByDescending (c => c.Span.Start).ToList ();
+
+			int delta = 0;
+			foreach (var change in changes) {
+				data.ReplaceText (change.Span.Start, change.Span.Length, change.NewText);
+				delta += change.Span.Length - change.NewText.Length;
+			}
+
+			if (!isOpen) {
+				var formatter = CodeFormatterService.GetFormatter (data.MimeType); 
+				var mp = GetMonoProject (CurrentSolution.GetProject (id.ProjectId));
+				string currentText = data.Text;
+				foreach (var change in changes) {
+					delta -= change.Span.Length - change.NewText.Length;
+					var startOffset = change.Span.Start - delta;
+					var str = formatter.FormatText (mp.Policies, currentText, startOffset, startOffset + change.NewText.Length);
+					data.ReplaceText (startOffset, change.NewText.Length, str);
+				}
+				data.Save ();
+				FileService.NotifyFileChanged (document.FilePath);
+			} else {
+				var formatter = CodeFormatterService.GetFormatter (data.MimeType); 
+				var documentContext = IdeApp.Workbench.Documents.FirstOrDefault (d => FilePath.PathComparer.Compare (d.FileName, document.FilePath) == 0);
+				if (documentContext != null) {
+					foreach (var change in changes) {
+						delta -= change.Span.Length - change.NewText.Length;
+						var startOffset = change.Span.Start - delta;
+						formatter.OnTheFlyFormat ((TextEditor)data, documentContext, startOffset, startOffset + change.NewText.Length);
+					}
+				}
+			}
+			OnDocumentTextChanged (id, new MonoDevelopSourceText(data), PreservationMode.PreserveValue);
+		}
+
+		protected override void ApplyDocumentAdded (DocumentInfo info, SourceText text)
+		{
+			var id = info.Id;
+			var path = DetermineFilePath (info.Id, info.Name, info.FilePath, info.Folders, true);
+
+			MonoDevelop.Projects.Project mdProject = null;
+
+			if (id.ProjectId != null) {
+				var project = CurrentSolution.GetProject (id.ProjectId);
+				mdProject = GetMonoProject (project);
+				if (mdProject == null)
+					LoggingService.LogWarning ("Couldn't find project for newly generated file {0} (Project {1}).", path, info.Id.ProjectId);
+			}
+
+			string formattedText;
+			var formatter = CodeFormatterService.GetFormatter (DesktopService.GetMimeTypeForUri (path)); 
+			if (formatter != null && mdProject != null) {
+				formattedText = formatter.FormatText (mdProject.Policies, text.ToString ());
+			} else {
+				formattedText = text.ToString ();
+			}
+
+			var textSource = new StringTextSource (formattedText, text.Encoding ?? System.Text.Encoding.UTF8);
+			try {
+				textSource.WriteTextTo (path);
+			} catch (Exception e) {
+				LoggingService.LogError ("Exception while saving file to " + path, e);
+			}
+
+			if (mdProject != null) {
+				var file = new MonoDevelop.Projects.ProjectFile (path);
+				Application.Invoke (delegate {
+					mdProject.Files.Add (file);
+					IdeApp.ProjectOperations.Save (mdProject);
+				});
+			}
+
+			OnDocumentAdded (info.WithTextLoader (new MonoDevelopTextLoader (path)));
+		}
+
+		string DetermineFilePath (DocumentId id, string name, string filePath, IReadOnlyList<string> docFolders, bool createDirectory = false)
+		{
+			var path = filePath;
+
+			if (string.IsNullOrEmpty (path)) {
+				var monoProject = GetMonoProject (id.ProjectId);
+
+				// If the first namespace name matches the name of the project, then we don't want to
+				// generate a folder for that.  The project is implicitly a folder with that name.
+				IEnumerable<string> folders;
+				if (docFolders.FirstOrDefault () == monoProject.Name) {
+					folders = docFolders.Skip (1);
+				} else {
+					folders = docFolders;
+				}
+
+				if (folders.Any ()) {
+					string baseDirectory = Path.Combine (monoProject.BaseDirectory, Path.Combine (folders.ToArray ()));
+					try {
+						if (createDirectory && !Directory.Exists (baseDirectory))
+							Directory.CreateDirectory (baseDirectory);
+					} catch (Exception e) {
+						LoggingService.LogError ("Error while creating directory for a new file : " + baseDirectory, e);
+					}
+                    path = Path.Combine (baseDirectory, name);
+				}
+			}
+			return path;
+		}
+		#endregion
+
+		public Document GetDocument (DocumentId documentId, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var project = CurrentSolution.GetProject (documentId.ProjectId);
+			if (project == null)
+				return null;
+			return project.GetDocument (documentId);
+		}
+
+		public void UpdateFileContent (string fileName, string text)
+		{
+			SourceText newText = SourceText.From (text);
+			foreach (var project in this.projectDataMap.Keys) {
+				var docId = this.GetDocumentId (project, fileName);
+				if (docId == null)
+					continue;
+				base.OnDocumentTextChanged (docId, newText, PreservationMode.PreserveIdentity);
+			}
+		}
+
+		public void AddProject (MonoDevelop.Projects.Project project)
+		{
+			var info = LoadProject (project, default(CancellationToken));
+			OnProjectAdded (info); 
+		}
+
+		public void RemoveProject (MonoDevelop.Projects.Project project)
+		{
+			var id = GetProjectId (project); 
+			if (id != null) {
+				foreach (var docId in GetOpenDocumentIds (id).ToList ()) {
+					ClearOpenDocument (docId);
+				}
+				OnProjectRemoved (id);
+				ProjectId val;
+				projectIdMap.TryRemove (project, out val);
+				ProjectData val2;
+				projectDataMap.TryRemove (id, out val2);
+				MetadataReferenceCache.RemoveReferences (id);
+
+				project.FileAddedToProject -= OnFileAdded;
+				project.FileRemovedFromProject -= OnFileRemoved;
+				project.FileRenamedInProject -= OnFileRenamed;
+				project.Modified -= OnProjectModified;
+			}
+		}
+
+		#region Project modification handlers
+
+		void OnFileAdded (object sender, MonoDevelop.Projects.ProjectFileEventArgs args)
+		{
+			if (internalChanges)
+				return;
+			var project = (MonoDevelop.Projects.Project)sender;
+			foreach (MonoDevelop.Projects.ProjectFileEventInfo fargs in args) {
+				if (!TypeSystemParserNode.IsCompileBuildAction (fargs.ProjectFile.BuildAction))
+					continue;
+				var projectId = GetProjectId (project);
+				var newDocument = CreateDocumentInfo (project.Name, GetProjectData (projectId), fargs.ProjectFile);
+				OnDocumentAdded (newDocument);
+			}
+		}
+
+		void OnFileRemoved (object sender, MonoDevelop.Projects.ProjectFileEventArgs args)
+		{
+			if (internalChanges)
+				return;
+			var project = (MonoDevelop.Projects.Project)sender;
+			foreach (MonoDevelop.Projects.ProjectFileEventInfo fargs in args) {
+				var projectId = GetProjectId (project);
+				var data = GetProjectData (projectId);
+				var id = data.GetDocumentId (fargs.ProjectFile.FilePath); 
+				if (id != null) {
+					ClearDocumentData (id);
+					OnDocumentRemoved (id);
+					data.RemoveDocument (fargs.ProjectFile.FilePath);
+				}
+			}
+		}
+
+		void OnFileRenamed (object sender, MonoDevelop.Projects.ProjectFileRenamedEventArgs args)
+		{
+			if (internalChanges)
+				return;
+			var project = (MonoDevelop.Projects.Project)sender;
+			foreach (MonoDevelop.Projects.ProjectFileRenamedEventInfo fargs in args) {
+				if (!TypeSystemParserNode.IsCompileBuildAction (fargs.ProjectFile.BuildAction))
+					continue;
+
+				var projectId = GetProjectId (project);
+				var data = GetProjectData (projectId);
+
+				var id = data.GetDocumentId (fargs.OldName); 
+				if (id != null) {
+					if (this.IsDocumentOpen (id)) {
+						this.InformDocumentClose (id, fargs.OldName);
+					}
+					OnDocumentRemoved (id);
+					data.RemoveDocument (fargs.OldName);
+				}
+
+				var newDocument = CreateDocumentInfo (project.Name, GetProjectData (projectId), fargs.ProjectFile);
+				OnDocumentAdded (newDocument);
+			}
+		}
+
+		void OnProjectModified (object sender, MonoDevelop.Projects.SolutionItemModifiedEventArgs args)
+		{
+			if (internalChanges)
+				return;
+			if (!args.Any (x => x.Hint == "TargetFramework" || x.Hint == "References"))
+				return;
+			var project = (MonoDevelop.Projects.Project)sender;
+			var projectId = GetProjectId (project);
+			OnProjectReloaded (LoadProject (project, default(CancellationToken))); 
+		}
+
+		#endregion
+	
+	}
+
+//	static class MonoDevelopWorkspaceFeatures
+//	{
+//		static FeaturePack pack;
+//
+//		public static FeaturePack Features {
+//			get {
+//				if (pack == null)
+//					Interlocked.CompareExchange (ref pack, ComputePack (), null);
+//				return pack;
+//			}
+//		}
+//
+//		static FeaturePack ComputePack ()
+//		{
+//			var assemblies = new List<Assembly> ();
+//			var workspaceCoreAssembly = typeof(Workspace).Assembly;
+//			assemblies.Add (workspaceCoreAssembly);
+//
+//			LoadAssembly (assemblies, "Microsoft.CodeAnalysis.CSharp.Workspaces");
+//			//LoadAssembly (assemblies, "Microsoft.CodeAnalysis.VisualBasic.Workspaces");
+//
+//			var catalogs = assemblies.Select (a => new System.ComponentModel.Composition.Hosting.AssemblyCatalog (a));
+//
+//			return new MefExportPack (catalogs);
+//		}
+//
+//		static void LoadAssembly (List<Assembly> assemblies, string assemblyName)
+//		{
+//			try {
+//				var loadedAssembly = Assembly.Load (assemblyName);
+//				assemblies.Add (loadedAssembly);
+//			} catch (Exception e) {
+//				LoggingService.LogWarning ("Couldn't load assembly:" + assemblyName, e);
+//			}
+//		}
+//	}
+
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDocDocumentationProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDocDocumentationProvider.cs
index 67e8fd2bf2..9d98c1beb5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDocDocumentationProvider.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDocDocumentationProvider.cs
@@ -26,29 +26,18 @@
 using System;
 using System.Collections.Generic;
 using System.Xml;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.Documentation;
 using System.Text;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.Ide.TypeSystem
 {
-	[Serializable]
-	public class MonoDocDocumentationProvider : IDocumentationProvider
+	static class MonoDocDocumentationProvider
 	{
-		[NonSerialized]
-		bool hadError;
-		
-		public MonoDocDocumentationProvider ()
-		{
-		}
+		static bool hadError;
+		static Dictionary<string, string> commentCache = new Dictionary<string, string> ();
 
-		#region IDocumentationProvider implementation
-		[NonSerialized]
-		readonly Dictionary<string, DocumentationComment> commentCache = new Dictionary<string, DocumentationComment> ();
-
-		public DocumentationComment GetDocumentation (IEntity entity)
+		public static string GetDocumentation (ISymbol entity)
 		{
 			if (entity == null)
 				throw new System.ArgumentNullException ("entity");
@@ -57,8 +46,10 @@ namespace MonoDevelop.Ide.TypeSystem
 			// shouldn't try it again. A corrupt .zip file could cause long tooltip delays otherwise.
 			if (hadError)
 				return null;
-			var idString = entity.GetIdString ();
-			DocumentationComment result;
+			var idString = entity.GetDocumentationCommentId ();
+			if (string.IsNullOrEmpty (idString))
+				return null;
+			string result;
 			if (commentCache.TryGetValue (idString, out result))
 				return result;
 			XmlDocument doc = null;
@@ -66,21 +57,20 @@ namespace MonoDevelop.Ide.TypeSystem
 				var helpTree = MonoDevelop.Projects.HelpService.HelpTree;
 				if (helpTree == null)
 					return null;
-				if (entity.SymbolKind == SymbolKind.TypeDefinition) {
+				if (entity.Kind == SymbolKind.NamedType) {
 					doc = helpTree.GetHelpXml (idString);
 				} else {
-					var parentId = entity.DeclaringTypeDefinition.GetIdString ();
-
+					var containingType = entity.ContainingType;
+					if (containingType == null)
+						return null;
+					var parentId = containingType.GetDocumentationCommentId ();
 					doc = helpTree.GetHelpXml (parentId);
 					if (doc == null)
 						return null;
 					XmlNode node = SelectNode (doc, entity);
-					
 					if (node != null)
-						return commentCache [idString] = new DocumentationComment (node.OuterXml, new SimpleTypeResolveContext (entity));
+						return commentCache [idString] = node.OuterXml;
 					return null;
-//					var node = doc.SelectSingleNode ("/Type/Members/Member")
-//					return new DocumentationComment (doc.OuterXml, new SimpleTypeResolveContext (entity));
 				}
 			} catch (Exception e) {
 				hadError = true;
@@ -90,33 +80,34 @@ namespace MonoDevelop.Ide.TypeSystem
 				commentCache [idString] = null;
 				return null;
 			}
-			return commentCache [idString] = new DocumentationComment (doc.OuterXml, new SimpleTypeResolveContext (entity));
+			return commentCache [idString] = doc.OuterXml;
 		}
 
-		public XmlNode SelectNode (XmlDocument doc, IEntity entity)
+		internal static void ClearCommentCache ()
 		{
-			switch (entity.SymbolKind) {
-			case SymbolKind.None:
-			case SymbolKind.TypeDefinition:
+			commentCache = new Dictionary<string, string> ();
+		}
+
+		static XmlNode SelectNode (XmlDocument doc, ISymbol entity)
+		{
+			switch (entity.Kind) {
+			case SymbolKind.NamedType:
 			case SymbolKind.Field:
 			case SymbolKind.Property:
-			case SymbolKind.Indexer:
 			case SymbolKind.Event:
 				return doc.SelectSingleNode ("/Type/Members/Member[@MemberName='" + entity.Name + "']");
 			
 			case SymbolKind.Method:
-			case SymbolKind.Operator:
-			case SymbolKind.Destructor:
-				return SelectOverload (doc.SelectNodes ("/Type/Members/Member[@MemberName='" + entity.Name + "']"), (IParameterizedMember)entity);
-			case SymbolKind.Constructor:
-				return SelectOverload (doc.SelectNodes ("/Type/Members/Member[@MemberName='.ctor']"), (IParameterizedMember)entity);
-				
+				var method = (IMethodSymbol)entity;
+				if (method.MethodKind == MethodKind.Constructor)
+					return SelectOverload (doc.SelectNodes ("/Type/Members/Member[@MemberName='.ctor']"), method);
+				return SelectOverload (doc.SelectNodes ("/Type/Members/Member[@MemberName='" + entity.Name + "']"), method);
 			default:
 				throw new ArgumentOutOfRangeException ();
 			}
-
 		}
-		public XmlNode SelectOverload (XmlNodeList nodes, IParameterizedMember entity)
+
+		static XmlNode SelectOverload (XmlNodeList nodes, IMethodSymbol entity)
 		{
 			XmlNode node = null;
 			if (nodes.Count == 1) {
@@ -125,12 +116,12 @@ namespace MonoDevelop.Ide.TypeSystem
 				var p = entity.Parameters;
 				foreach (XmlNode curNode in nodes) {
 					var paramList = curNode.SelectNodes ("Parameters/*");
-					if (p.Count == 0 && paramList.Count == 0) 
+					if (p.Length == 0 && paramList.Count == 0) 
 						return curNode;
-					if (p.Count != paramList.Count) 
+					if (p.Length != paramList.Count) 
 						continue;
 					bool matched = true;
-					for (int i = 0; i < p.Count; i++) {
+					for (int i = 0; i < p.Length; i++) {
 						var idString = GetTypeString (p [i].Type);
 						if (idString != paramList [i].Attributes ["Type"].Value) {
 							matched = false;
@@ -148,69 +139,20 @@ namespace MonoDevelop.Ide.TypeSystem
 			}
 			return null;
 		}
-		
 
-		static string GetTypeString (IType t)
+		static string GetTypeString (ITypeSymbol t)
 		{
-			if (t.Kind == TypeKind.Unknown)
-				return t.Name;
-			
-			if (t.Kind == TypeKind.TypeParameter)
-				return t.FullName;
-			
-			var typeWithElementType = t as TypeWithElementType;
-			if (typeWithElementType != null) {
-				var sb = new StringBuilder ();
-			
-				if (typeWithElementType is PointerType) {
-					sb.Append ("*");
-				} 
-				sb.Append (GetTypeString (typeWithElementType.ElementType));
-
-				if (typeWithElementType is ArrayType) {
-					sb.Append ("[");
-					sb.Append (new string (',', ((ArrayType)t).Dimensions - 1));
-					sb.Append ("]");
-				}
-				return sb.ToString ();
-			}
-			
-			ITypeDefinition typeDef = t.GetDefinition ();
-			if (typeDef == null)
-				return "";
-			
-			var result = new StringBuilder ();
-
-			result.Append (typeDef.Namespace + ".");
-			
-			if (typeDef.DeclaringTypeDefinition != null) {
-				string typeString = GetTypeString (typeDef.DeclaringTypeDefinition);
-				result.Append (typeString);
-				result.Append (".");
-			}
-
-			result.Append (typeDef.Name);
-
-			if (typeDef.TypeParameterCount > 0) {
-				result.Append ("<");
-				for (int i = 0; i < typeDef.TypeParameterCount; i++) {
-					if (i > 0)
-						result.Append (",");
-					if (t.TypeArguments.Count > 0) {
-						result.Append (GetTypeString (t.TypeArguments [i]));
-					} else {
-						result.Append (typeDef.TypeParameters [i].FullName);
-					}
-				}
-				result.Append (">");
+			switch (t.TypeKind) {
+			case TypeKind.Array:
+				var arr = (IArrayTypeSymbol)t;
+				return GetTypeString (arr.ElementType) + "[" + new string (',', arr.Rank - 1) + "]";
+			case TypeKind.Pointer:
+				var ptr = (IPointerTypeSymbol)t;
+				return "*" + GetTypeString (ptr.PointedAtType);
+			default:
+				var docComment = t.GetDocumentationCommentId ();
+				return docComment != null && docComment.Length > 2 ? docComment.Substring (2) : t.Name;
 			}
-			
-			return result.ToString ();
 		}
-		
-		#endregion
-		
-		
 	}
 }
-
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/NetAmbience.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/NetAmbience.cs
deleted file mode 100755
index 28b35bc9bb..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/NetAmbience.cs
+++ /dev/null
@@ -1,367 +0,0 @@
-//
-// NetAmbience.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Linq;
-using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Collections.Generic;
-
-namespace MonoDevelop.Ide.TypeSystem
-{
-	public class NetAmbience : Ambience
-	{
-		public NetAmbience () : base ("NET")
-		{
-			classTypes [TypeKind.Class] = "Class";
-			classTypes [TypeKind.Enum] = "Enumeration";
-			classTypes [TypeKind.Interface] = "Interface";
-			classTypes [TypeKind.Struct] = "Structure";
-			classTypes [TypeKind.Delegate] = "Delegate";
-		}
-		
-		public override string SingleLineComment (string text)
-		{
-			return "// " + text;
-		}
-		
-		#region Type system output
-		public override string GetIntrinsicTypeName (string reflectionName)
-		{
-			return reflectionName;
-		}
-		
-		protected override string GetTypeReferenceString (IType reference, OutputSettings settings)
-		{
-			return reference.ToString ();
-		}
-		
-		protected override string GetTypeString (IType t, OutputSettings settings)
-		{
-			ITypeDefinition type = t.GetDefinition ();
-			var result = new StringBuilder ();
-			if (settings.IncludeModifiers)
-				AppendModifiers (result, settings, type);
-			if (settings.IncludeKeywords)
-				result.Append (settings.EmitKeyword (GetString (type.Kind)));
-			
-			result.Append (settings.EmitName (type, settings.UseFullName ? type.FullName : type.Name));
-			
-			int parameterCount = type.TypeParameters.Count;
-			
-			if (settings.IncludeGenerics && parameterCount > 0) {
-				result.Append (settings.Markup ("<"));
-				if (!settings.HideGenericParameterNames) {
-					for (int i = 0; i < parameterCount; i++) {
-						if (i > 0)
-							result.Append (settings.Markup (", "));
-						result.Append (type.TypeParameters [i].Name);
-					}
-				}
-				result.Append (settings.Markup (">"));
-			}
-			
-			if (settings.IncludeBaseTypes && type.DirectBaseTypes.Any ()) {
-				result.Append (settings.Markup (" : "));
-				bool first = true;
-				foreach (var baseType in type.DirectBaseTypes) {
-					if (baseType.Equals (type.Compilation.FindType (KnownTypeCode.Object)))
-						continue;
-					if (!first)
-						result.Append (settings.Markup (", "));
-					first = false;
-					result.Append (GetTypeReferenceString (baseType, settings));
-				}
-				
-			}
-			return result.ToString ();
-		}
-		
-		protected override string GetMethodString (IMethod method, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			
-			if (settings.IncludeModifiers)
-				AppendModifiers (result, settings, method);
-			
-			result.Append (settings.EmitKeyword ("Method"));
-			result.Append (settings.EmitName (method, settings.UseFullName ? method.FullName : method.Name));
-			
-			if (settings.IncludeParameters) {
-				result.Append (settings.Markup ("("));
-				bool first = true;
-				foreach (var parameter in method.Parameters) {
-					if (!first)
-						result.Append (settings.Markup (", "));
-					result.Append (GetParameterString (method, parameter, settings));
-					first = false;
-				}
-				result.Append (settings.Markup (")"));
-			}
-				
-			if (settings.IncludeReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (method.ReturnType, settings));
-			}
-			return result.ToString ();
-		}
-		
-		protected override string GetConstructorString (IMethod method, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			
-			if (settings.IncludeModifiers)
-				AppendModifiers (result, settings, method);
-			
-			result.Append (settings.EmitKeyword ("Constructor"));
-			result.Append (settings.EmitName (method, method.DeclaringType.Name));
-			
-			if (settings.IncludeParameters) {
-				result.Append (settings.Markup ("("));
-				bool first = true;
-				foreach (var parameter in method.Parameters) {
-					if (!first)
-						result.Append (settings.Markup (", "));
-					result.Append (GetParameterString (method, parameter, settings));
-					first = false;
-				}
-				result.Append (settings.Markup (")"));
-			}
-			return result.ToString ();
-		}
-		
-		protected override string GetDestructorString (IMethod method, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			result.Append (settings.EmitKeyword ("Destructor"));
-			result.Append (settings.EmitName (method, method.DeclaringType.Name));
-			return result.ToString ();
-		}
-		
-		protected override string GetOperatorString (IMethod method, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			
-			if (settings.IncludeModifiers)
-				AppendModifiers (result, settings, method);
-			
-			result.Append (settings.EmitKeyword ("Operator"));
-			result.Append (settings.EmitName (method, settings.UseFullName ? method.FullName : method.Name));
-			
-			if (settings.IncludeParameters) {
-				result.Append (settings.Markup ("("));
-				bool first = true;
-				foreach (var parameter in method.Parameters) {
-					if (!first)
-						result.Append (settings.Markup (", "));
-					result.Append (GetParameterString (method, parameter, settings));
-					first = false;
-				}
-				result.Append (settings.Markup (")"));
-			}
-				
-			if (settings.IncludeReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (method.ReturnType, settings));
-			}
-			return result.ToString ();
-		}
-		
-		protected override string GetFieldString (IField field, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			
-			if (settings.IncludeModifiers)
-				AppendModifiers (result, settings, field);
-			
-			result.Append (settings.EmitKeyword ("Field"));
-			result.Append (settings.EmitName (field, field.Name));
-			
-			if (settings.IncludeReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (field.ReturnType, settings));
-			}
-			return result.ToString ();
-		}
-		
-		protected override string GetEventString (IEvent evt, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			
-			if (settings.IncludeModifiers)
-				AppendModifiers (result, settings, evt);
-			
-			result.Append (settings.EmitKeyword ("Event"));
-			result.Append (settings.EmitName (evt, evt.Name));
-			
-			if (settings.IncludeReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (evt.ReturnType, settings));
-			}
-			return result.ToString ();
-		}
-		
-		protected override string GetPropertyString (IProperty property, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			if (settings.IncludeModifiers)
-				AppendModifiers (result, settings, property);
-			result.Append (settings.EmitKeyword ("Property"));
-			result.Append (settings.EmitName (property, property.Name));
-			if (settings.IncludeReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (property.ReturnType, settings));
-			}
-			return result.ToString ();
-		}
-		
-		protected override string GetIndexerString (IProperty property, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			if (settings.IncludeModifiers)
-				AppendModifiers (result, settings, property);
-			result.Append (settings.EmitKeyword ("Indexer"));
-			result.Append (settings.EmitName (property, property.Name));
-			
-			if (settings.IncludeParameters && property.Parameters.Count > 0) {
-				result.Append (settings.Markup ("("));
-				bool first = true;
-				foreach (var parameter in property.Parameters) {
-					if (!first)
-						result.Append (settings.Markup (", "));
-					result.Append (GetParameterString (property, parameter, settings));
-					first = false;
-				}
-				result.Append (settings.Markup (")"));
-			}
-			if (settings.IncludeReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (property.ReturnType, settings));
-			}
-			return result.ToString ();
-		}
-		
-		protected override string GetParameterString (IParameterizedMember member, IParameter parameter, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			if (settings.IncludeParameterName) {
-				result.Append (Format (parameter.Name));
-				if (settings.IncludeReturnType) {
-					result.Append (settings.Markup (" : "));
-					result.Append (GetTypeReferenceString (parameter.Type, settings));
-				}
-			} else {
-				result.Append (GetTypeReferenceString (parameter.Type, settings));
-			}
-			if (parameter.IsRef || parameter.IsOut)
-				result.Append (settings.Markup ("&"));
-			return result.ToString ();
-		}
-		#endregion
-		
-		void AppendModifiers (StringBuilder result, OutputSettings settings, IEntity entity)
-		{
-			if (entity.IsStatic)
-				result.Append (settings.EmitModifiers ("Static"));
-			if (entity.IsSealed)
-				result.Append (settings.EmitModifiers ("Sealed"));
-			if (entity.IsAbstract)
-				result.Append (settings.EmitModifiers ("Abstract"));
-			if (entity.IsShadowing)
-				result.Append (settings.EmitModifiers ("Shadows"));
-			if (entity.IsSynthetic)
-				result.Append (settings.EmitModifiers ("Synthetic"));
-			
-			switch (entity.Accessibility) {
-			case Accessibility.Internal:
-				result.Append (settings.EmitModifiers ("Internal"));
-				break;
-			case Accessibility.ProtectedAndInternal:
-				result.Append (settings.EmitModifiers ("Protected And Internal"));
-				break;
-			case Accessibility.ProtectedOrInternal:
-				result.Append (settings.EmitModifiers ("Protected Or Internal"));
-				break;
-			case Accessibility.Protected:
-				result.Append (settings.EmitModifiers ("Protected"));
-				break;
-			case Accessibility.Private:
-				result.Append (settings.EmitModifiers ("Private"));
-				break;
-			case Accessibility.Public:
-				result.Append (settings.EmitModifiers ("Public"));
-				break;
-			}
-		}
-		
-		public override string GetString (string nameSpace, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			result.Append (settings.EmitKeyword ("Namespace"));
-			result.Append (Format (nameSpace));
-			return result.ToString ();
-		}
-		
-		Dictionary<TypeKind, string> classTypes = new Dictionary<TypeKind, string> ();
-		
-		string GetString (TypeKind classType)
-		{
-			string res;
-			if (classTypes.TryGetValue (classType, out res))
-				return res;
-			return string.Empty;
-		}
-//		public string Visit (IAttribute attribute, OutputSettings settings)
-//		{
-//			StringBuilder result = new StringBuilder ();
-//			result.Append (settings.Markup ("["));
-//			result.Append (GetString (attribute.AttributeType, settings));
-//			result.Append (settings.Markup ("("));
-//			bool first = true;
-//			if (attribute.PositionalArguments != null) {
-//				foreach (object o in attribute.PositionalArguments) {
-//					if (!first)
-//						result.Append (settings.Markup (", "));
-//					first = false;
-//					if (o is string) {
-//						result.Append (settings.Markup ("\""));
-//						result.Append (o);
-//						result.Append (settings.Markup ("\""));
-//					} else if (o is char) {
-//						result.Append (settings.Markup ("\""));
-//						result.Append (o);
-//						result.Append (settings.Markup ("\""));
-//					} else
-//						result.Append (o);
-//				}
-//			}
-//			result.Append (settings.Markup (")]"));
-//			return result.ToString ();
-//		}
-	}
-}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/OutputFlags.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/OutputFlags.cs
deleted file mode 100644
index 6ef2920d6d..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/OutputFlags.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// OutputFlags.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace MonoDevelop.Ide.TypeSystem
-{
-	[Flags]
-	public enum OutputFlags {
-		None = 0,
-		
-		// Flags
-		UseFullName              = 0x0001,
-		IncludeReturnType        = 0x0002,
-		IncludeParameters        = 0x0004,
-		IncludeParameterName     = 0x0008,
-		IncludeMarkup            = 0x0010,
-		IncludeKeywords          = 0x0020,
-		IncludeModifiers         = 0x0040,
-		IncludeBaseTypes         = 0x0080,
-		IncludeGenerics          = 0x0100,
-		UseIntrinsicTypeNames    = 0x0200,
-		HighlightName            = 0x0400,
-		HideExtensionsParameter  = 0x0800,
-		HideGenericParameterNames= 0x1000,
-		HideArrayBrackets        = 0x2000,
-		UseNETTypeNames          = 0x4000, // print 'System.Int32' intead of 'int'
-		UseFullInnerTypeName     = 0x8000,
-		ReformatDelegates        = 0x10000,
-		GeneralizeGenerics       = 0x20000,
-		StaticUsage              = 0x40000, // to distinguish static usage for extension methods.
-		IncludeConstraints       = 0x80000,
-		ReturnTypesLast          = 0x100000,
-		CompletionListFomat      = 0x200000, // print "Name : type" instead of "type : Name" 
-		IncludeAccessor          = 0x400000, // print {get;set;} after property name.
-		
-		ClassBrowserEntries        = IncludeReturnType | IncludeParameters | IncludeGenerics,
-		AssemblyBrowserDescription = IncludeGenerics | IncludeBaseTypes | IncludeReturnType | IncludeParameters | IncludeParameterName | IncludeMarkup | IncludeKeywords | IncludeModifiers
-	}
-}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/OutputSettings.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/OutputSettings.cs
deleted file mode 100644
index 0071f2b4ac..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/OutputSettings.cs
+++ /dev/null
@@ -1,268 +0,0 @@
-// OutputSettings.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using MonoDevelop.Projects.Policies;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace MonoDevelop.Ide.TypeSystem
-{
-	public class OutputSettings
-	{
-		public OutputFlags OutputFlags {
-			get;
-			set;
-		}
-		
-		public PolicyContainer PolicyParent {
-			get;
-			set;
-		}
-		
-		public OutputSettings (OutputFlags outputFlags)
-		{
-			this.OutputFlags = outputFlags;
-		}
-		
-		public string Markup (string text)
-		{
-			if (MarkupCallback != null)
-				return MarkupCallback (text);
-			return IncludeMarkup ? PangoFormat (text) : text;
-		}
-
-		public string EmitName (object domVisitable, string text)
-		{
-			if (EmitNameCallback != null)
-				return EmitNameCallback (domVisitable, text);
-			return text;
-		}
-		
-		public string EmitModifiers (string text)
-		{
-			if (!IncludeModifiers)
-				return string.Empty;
-			if (EmitModifiersCallback != null)
-				return EmitModifiersCallback (text) + " ";
-			if (IncludeMarkup)
-				return "<b>" + PangoFormat (text) + "</b> ";
-			return text + " ";
-		}
-		
-		public string EmitKeyword (string text)
-		{
-			if (EmitKeywordCallback != null)
-				return EmitKeywordCallback (text) + " ";
-			if (!IncludeKeywords)
-				return "";
-			if (IncludeMarkup)
-				return "<b>" + PangoFormat (text) + "</b> ";
-			return text + " ";
-		}
-		
-		public string Highlight (string text)
-		{
-			if (HighlightCallback != null)
-				return HighlightCallback (text);
-			if (IncludeMarkup)
-				return "<b>" + PangoFormat (text) + "</b>";
-			return text;
-		}
-		
-		public string PostProcess (object domVisitable, string outString)
-		{
-			if (PostProcessCallback != null)
-				return PostProcessCallback (domVisitable, outString);
-			return outString;
-		}
-		
-		static string PangoFormat (string input)
-		{
-			StringBuilder result = new StringBuilder ();
-			foreach (char ch in input) {
-				switch (ch) {
-					case '<':
-						result.Append ("&lt;");
-						break;
-					case '>':
-						result.Append ("&gt;");
-						break;
-					case '&':
-						result.Append ("&amp;");
-						break;
-					default:
-						result.Append (ch);
-						break;
-				}
-			}
-			return result.ToString ();
-		}
-			
-		public bool IncludeMarkup {
-			get {
-				return (OutputFlags & OutputFlags.IncludeMarkup) == OutputFlags.IncludeMarkup;
-			}
-		}
-		
-		public bool IncludeKeywords  {
-			get {
-				return (OutputFlags & OutputFlags.IncludeKeywords) == OutputFlags.IncludeKeywords;
-			}
-		}
-		
-		public bool IncludeModifiers {
-			get {
-				return (OutputFlags & OutputFlags.IncludeModifiers) == OutputFlags.IncludeModifiers;
-			}
-		}
-
-		public bool UseFullName {
-			get {
-				return (OutputFlags & OutputFlags.UseFullName) == OutputFlags.UseFullName;
-			}
-		}
-		
-		public bool UseFullInnerTypeName {
-			get {
-				return (OutputFlags & OutputFlags.UseFullInnerTypeName) == OutputFlags.UseFullInnerTypeName;
-			}
-		}
-		
-		public bool IncludeParameters {
-			get {
-				return (OutputFlags & OutputFlags.IncludeParameters) == OutputFlags.IncludeParameters;
-			}
-		}
-
-		public bool IncludeReturnType {
-			get {
-				return (OutputFlags & OutputFlags.IncludeReturnType) == OutputFlags.IncludeReturnType;
-			}
-		}
-		
-		public bool IncludeParameterName {
-			get {
-				return (OutputFlags & OutputFlags.IncludeParameterName) == OutputFlags.IncludeParameterName;
-			}
-		}
-		
-		public bool IncludeBaseTypes {
-			get {
-				return (OutputFlags & OutputFlags.IncludeBaseTypes) == OutputFlags.IncludeBaseTypes;
-			}
-		}
-		
-		public bool IncludeGenerics {
-			get {
-				return (OutputFlags & OutputFlags.IncludeGenerics) == OutputFlags.IncludeGenerics;
-			}
-		}
-		
-		public bool HideArrayBrackets {
-			get {
-				return (OutputFlags & OutputFlags.HideArrayBrackets) == OutputFlags.HideArrayBrackets;
-			}
-		}
-		
-		public bool HighlightName {
-			get {
-				return (OutputFlags & OutputFlags.HighlightName) == OutputFlags.HighlightName;
-			}
-		}
-		
-		public bool HideExtensionsParameter {
-			get {
-				return (OutputFlags & OutputFlags.HideExtensionsParameter) == OutputFlags.HideExtensionsParameter;
-			}
-		}
-		
-		public bool HideGenericParameterNames {
-			get {
-				return (OutputFlags & OutputFlags.HideGenericParameterNames) != 0;
-			}
-		}
-		
-		public bool GeneralizeGenerics {
-			get {
-				return (OutputFlags & OutputFlags.GeneralizeGenerics) != 0;
-			}
-		}
-		
-		public bool UseNETTypeNames {
-			get {
-				return (OutputFlags & OutputFlags.UseNETTypeNames) != 0;
-			}
-		}
-		
-		public bool ReformatDelegates {
-			get {
-				return (OutputFlags & OutputFlags.ReformatDelegates) != 0;
-			}
-		}
-		
-		public bool StaticUsage {
-			get {
-				return (OutputFlags & OutputFlags.StaticUsage) != 0;
-			}
-		}
-		
-		public bool IncludeConstraints {
-			get {
-				return (OutputFlags & OutputFlags.IncludeConstraints) != 0;
-			}
-		}
-		
-		public bool CompletionListFomat {
-			get {
-				return (OutputFlags & OutputFlags.CompletionListFomat) != 0;
-			}
-		}
-		
-		public bool ReturnTypesLast {
-			get {
-				return (OutputFlags & OutputFlags.ReturnTypesLast) != 0;
-			}
-		}
-		
-		public bool IncludeAccessor {
-			get {
-				return (OutputFlags & OutputFlags.IncludeAccessor) == OutputFlags.IncludeAccessor;
-			}
-		}
-
-		public MarkupText EmitModifiersCallback;
-		public MarkupText EmitKeywordCallback;
-		public MarkupText MarkupCallback;
-		public MarkupText HighlightCallback;
-		public Func<object, string, string> EmitNameCallback;
-		
-		public delegate string MarkupText (string text);
-		
-		public Func<object, string, string> PostProcessCallback;
-	}
-}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ParsedDocument.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ParsedDocument.cs
index 0fdb4a13cd..dddd7641f3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ParsedDocument.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ParsedDocument.cs
@@ -29,10 +29,8 @@ using System.Collections.Generic;
 using System.Text;
 using System.Linq;
 using System.Threading;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.Semantics;
-using Mono.TextEditor;
-
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Ide.TypeSystem
 {
@@ -43,7 +41,6 @@ namespace MonoDevelop.Ide.TypeSystem
 		NonSerializable = 1
 	}
 
-
 	public abstract class ParsedDocument
 	{
 		DateTime lastWriteTimeUtc = DateTime.UtcNow;
@@ -51,63 +48,8 @@ namespace MonoDevelop.Ide.TypeSystem
 			get { return lastWriteTimeUtc; }
 			set { lastWriteTimeUtc = value; }
 		}
-		
-		[NonSerialized]
-		List<Comment> comments = new List<Comment> ();
-		
-		public virtual IUnresolvedFile ParsedFile {
-			get { return null; }
-			set { throw new InvalidOperationException (); }
-		}
 
-		public IList<Comment> Comments {
-			get {
-				return comments;
-			}
-		}
 
-		/// <summary>
-		/// Gets or sets a value indicating whether this instance is invalid and needs to be reparsed.
-		/// </summary>
-		public bool IsInvalid {
-			get;
-			set;
-		}
-
-		List<Tag> tagComments = new List<Tag> ();
-		public IList<Tag> TagComments {
-			get {
-				return tagComments;
-			}
-		}
-		
-		IEnumerable<FoldingRegion> foldings = null;
-		public virtual IEnumerable<FoldingRegion> Foldings {
-			get {
-				return foldings ?? Enumerable.Empty<FoldingRegion> ();
-			}
-		}
-		
-		public IEnumerable<FoldingRegion> UserRegions {
-			get {
-				return Foldings.Where (f => f.Type == FoldType.UserRegion);
-			}
-		}
-		
-		List<PreProcessorDefine> defines = new List<PreProcessorDefine> ();
-		public IList<PreProcessorDefine> Defines {
-			get {
-				return defines;
-			}
-		}
-		
-		List<ConditionalRegion> conditionalRegions = new List<ConditionalRegion> ();
-		public IList<ConditionalRegion> ConditionalRegions {
-			get {
-				return conditionalRegions;
-			}
-		}
-		
 		[NonSerialized]
 		ParsedDocumentFlags flags;
 		public ParsedDocumentFlags Flags {
@@ -128,16 +70,30 @@ namespace MonoDevelop.Ide.TypeSystem
 				fileName = value;
 			}
 		}
-		
-		public virtual IList<Error> Errors {
-			get {
-				return new Error[0];
-			}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether this instance is invalid and needs to be reparsed.
+		/// </summary>
+		public bool IsInvalid {
+			get;
+			set;
 		}
-		
+
+		public abstract Task<IReadOnlyList<Comment>> GetCommentsAsync (CancellationToken cancellationToken = default(CancellationToken));
+		public abstract Task<IReadOnlyList<Tag>> GetTagCommentsAsync (CancellationToken cancellationToken = default(CancellationToken));
+		public abstract Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (CancellationToken cancellationToken = default(CancellationToken));
+
+		public async Task<IEnumerable<FoldingRegion>> GetUserRegionsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var foldings = await GetFoldingsAsync (cancellationToken).ConfigureAwait (false);
+			return foldings.Where (f => f.Type == FoldType.UserRegion);
+		}
+
+		public abstract Task<IReadOnlyList<Error>> GetErrorsAsync (CancellationToken cancellationToken = default(CancellationToken));
+
 		public bool HasErrors {
 			get {
-				return Errors.Any (e => e.ErrorType == ErrorType.Error);
+				return GetErrorsAsync ().Result.Any (e => e.ErrorType == ErrorType.Error);
 			}
 		}
 		
@@ -162,236 +118,84 @@ namespace MonoDevelop.Ide.TypeSystem
 		{
 			this.fileName = fileName;
 		}
-		
-		
-		public void Add (Comment comment)
-		{
-			comments.Add (comment);
-		}
-		
-		public void Add (Tag tagComment)
-		{
-			tagComments.Add (tagComment);
-		}
-		
-		public void Add (PreProcessorDefine define)
-		{
-			defines.Add (define);
-		}
-		
-		public void Add (ConditionalRegion region)
+	}
+	
+	public class DefaultParsedDocument : ParsedDocument
+	{
+		public DefaultParsedDocument (string fileName) : base (fileName)
 		{
-			conditionalRegions.Add (region);
+			Flags |= ParsedDocumentFlags.NonSerializable;
 		}
 
-		List<FoldingRegion> EnsureFoldingList ()
-		{
-			if (this.foldings == null || !(foldings is List<FoldingRegion>))
-				this.foldings = new List<FoldingRegion> ();
-			return (List<FoldingRegion>)foldings;
-		}
-		
-		public void Add (FoldingRegion region)
+		List<Comment> comments = new List<Comment> ();
+
+		public void Add (Comment comment)
 		{
-			EnsureFoldingList ().Add (region);
+			comments.Add (comment);
 		}
-		
-		public void Add (IEnumerable<Comment> comments)
+
+		public void AddRange (IEnumerable<Comment> comments)
 		{
 			this.comments.AddRange (comments);
 		}
-		
-		public void Add (IEnumerable<Tag> tagComments)
-		{
-			this.tagComments.AddRange (tagComments);
-		}
-		
-		public void Add (IEnumerable<PreProcessorDefine> defines)
-		{
-			this.defines.AddRange (defines);
-		}
-		
-		public void Add (IEnumerable<FoldingRegion> folds)
-		{
-			if (foldings == null) {
-				this.foldings = folds;
-				return;
-			}
-			if (foldings != null && !(foldings is List<FoldingRegion>))
-				EnsureFoldingList ().AddRange (foldings);
-			EnsureFoldingList ().AddRange (folds);
-		}
-		
-		public void Add (IEnumerable<ConditionalRegion> conditionalRegions)
-		{
-			this.conditionalRegions.AddRange (conditionalRegions);
-		}
-		
-		#region IUnresolvedFile delegation
-		public virtual IUnresolvedTypeDefinition GetTopLevelTypeDefinition (TextLocation location)
+
+		public override Task<IReadOnlyList<Comment>> GetCommentsAsync (CancellationToken cancellationToken = default(CancellationToken))
 		{
-			return null;
+			return Task.FromResult<IReadOnlyList<Comment>> (comments);
 		}
-		
-		public virtual IUnresolvedTypeDefinition GetInnermostTypeDefinition (TextLocation location)
+
+		List<Tag> tagComments = new List<Tag> ();
+
+		public void Add (Tag tagComment)
 		{
-			return null;
+			tagComments.Add (tagComment);
 		}
 
-		public virtual IUnresolvedMember GetMember (TextLocation location)
+		public void AddRange (IEnumerable<Tag> tagComments)
 		{
-			return null;
+			this.tagComments.AddRange (tagComments);
 		}
 
-		public virtual IList<IUnresolvedTypeDefinition> TopLevelTypeDefinitions {
-			get {
-				return new List<IUnresolvedTypeDefinition> ();
-			}
+		public override Task<IReadOnlyList<Tag>> GetTagCommentsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return Task.FromResult<IReadOnlyList<Tag>> (tagComments);
 		}
 
-		#endregion
+		List<FoldingRegion> foldingRegions = new List<FoldingRegion> ();
 
-		public Func<MonoDevelop.Ide.Gui.Document, CancellationToken, IRefactoringContext> CreateRefactoringContext;
-		public Func<TextEditorData, object, CancellationToken, IRefactoringContext> CreateRefactoringContextWithEditor;
-	}
-	
-	public class DefaultParsedDocument : ParsedDocument, IUnresolvedFile
-	{
-
-		public override IUnresolvedFile ParsedFile {
-			get { return this; }
-		}
-		
-		List<Error> errors = new List<Error> ();
-		
-		public override IList<Error> Errors {
-			get {
-				return errors;
-			} 
-		}
-
-		public DefaultParsedDocument (string fileName) : base (fileName)
+		public void Add (FoldingRegion foldingRegion)
 		{
-			Flags |= ParsedDocumentFlags.NonSerializable;
-		}
-		
-		#region IUnresolvedFile implementation
-		public override IUnresolvedTypeDefinition GetTopLevelTypeDefinition(TextLocation location)
-		{
-			return TopLevelTypeDefinitions.FirstOrDefault (t => t.Region.IsInside (location));
+			foldingRegions.Add (foldingRegion);
 		}
-		
-		public override IUnresolvedTypeDefinition GetInnermostTypeDefinition(TextLocation location)
+
+		public void AddRange (IEnumerable<FoldingRegion> foldingRegions)
 		{
-			IUnresolvedTypeDefinition parent = null;
-			var type = GetTopLevelTypeDefinition(location);
-			while (type != null) {
-				parent = type;
-				type = parent.NestedTypes.FirstOrDefault (t => t.Region.IsInside (location));
-			}
-			return parent;
+			this.foldingRegions.AddRange (foldingRegions);
 		}
-		
-		public override IUnresolvedMember GetMember(TextLocation location)
+
+		public override Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (CancellationToken cancellationToken = default(CancellationToken))
 		{
-			var type = GetInnermostTypeDefinition(location);
-			if (type == null)
-				return null;
-			return type.Members.FirstOrDefault (e => e.Region.IsInside(location));
-		}
-		
-		List<IUnresolvedTypeDefinition> types = new List<IUnresolvedTypeDefinition> ();
-		public override IList<IUnresolvedTypeDefinition> TopLevelTypeDefinitions {
-			get {
-				return types;
-			}
-		}
-		
-		List<IUnresolvedAttribute> attributes = new List<IUnresolvedAttribute> ();
-		public IList<IUnresolvedAttribute> AssemblyAttributes {
-			get {
-				return attributes;
-			}
+			return Task.FromResult<IReadOnlyList<FoldingRegion>> (foldingRegions);
 		}
 
-		public IList<IUnresolvedAttribute> ModuleAttributes {
-			get {
-				return new List<IUnresolvedAttribute> ();
-			}
-		}
-		#endregion
-		
+		List<Error> errors = new List<Error> ();
+
 		public void Add (Error error)
 		{
 			errors.Add (error);
 		}
-		
-		public void Add (IEnumerable<Error> errors)
-		{
-			this.errors.AddRange (errors);
-		}
-
-		#region IUnresolvedFile implementation
-		DateTime? IUnresolvedFile.LastWriteTime {
-			get {
-				return LastWriteTimeUtc;
-			}
-			set {
-				LastWriteTimeUtc = value.HasValue ? value.Value : DateTime.UtcNow;
-			}
-		}
-		#endregion
-	}
-	
-	[Serializable]
-	public class ParsedDocumentDecorator : ParsedDocument
-	{
-		IUnresolvedFile parsedFile;
-		
-		public override IUnresolvedFile ParsedFile {
-			get { return parsedFile; }
-			set { parsedFile = value; FileName = parsedFile.FileName; }
-		}
-		
-		public override IList<Error> Errors {
-			get {
-				return parsedFile.Errors;
-			}
-		}
-		
-		public ParsedDocumentDecorator (IUnresolvedFile parsedFile) : base (parsedFile.FileName)
-		{
-			this.parsedFile = parsedFile;
-		}
-		
-		public ParsedDocumentDecorator () : base ("")
-		{
-		}
-		
-		#region IUnresolvedFile implementation
-		public override IUnresolvedTypeDefinition GetTopLevelTypeDefinition (TextLocation location)
-		{
-			return parsedFile.GetTopLevelTypeDefinition (location);
-		}
 
-		public override IUnresolvedTypeDefinition GetInnermostTypeDefinition (TextLocation location)
+		public void AddRange (IEnumerable<Error> errors)
 		{
-			return parsedFile.GetInnermostTypeDefinition (location);
+			this.errors.AddRange (errors);
 		}
 
-		public override IUnresolvedMember GetMember (TextLocation location)
+		public override Task<IReadOnlyList<Error>> GetErrorsAsync (CancellationToken cancellationToken = default(CancellationToken))
 		{
-			return parsedFile.GetMember (location);
-		}
-
-		public override IList<IUnresolvedTypeDefinition> TopLevelTypeDefinitions {
-			get {
-				return parsedFile.TopLevelTypeDefinitions;
-			}
+			return Task.FromResult<IReadOnlyList<Error>> (errors);
 		}
-		#endregion
 	}
-	
+
 	public static class FoldingUtilities
 	{
 		static bool IncompleteOrSingleLine (DomRegion region)
@@ -399,7 +203,7 @@ namespace MonoDevelop.Ide.TypeSystem
 			return region.BeginLine <= 0 || region.EndLine <= region.BeginLine;
 		}
 		
-		public static IEnumerable<FoldingRegion> ToFolds (this IList<Comment> comments)
+		public static IEnumerable<FoldingRegion> ToFolds (this IReadOnlyList<Comment> comments)
 		{
 			for (int i = 0; i < comments.Count; i++) {
 				Comment comment = comments [i];
@@ -449,7 +253,7 @@ namespace MonoDevelop.Ide.TypeSystem
 					curLine = curComment.Region.BeginLine;
 				}
 				
-				if (j - i > 1) {
+				if (j - i > 1 || (comment.IsDocumentation && comment.Region.BeginLine < comment.Region.EndLine)) {
 					string txt;
 					if (comment.IsDocumentation) {
 						txt = "/// ..."; 
@@ -483,7 +287,7 @@ namespace MonoDevelop.Ide.TypeSystem
 					}
 					
 					yield return new FoldingRegion (txt,
-						new DomRegion (comment.Region.Begin, end),
+						new DocumentRegion (comment.Region.Begin, end),
 						FoldType.Comment);
 					i = j - 1;
 				}
@@ -550,6 +354,23 @@ namespace MonoDevelop.Ide.TypeSystem
 			}
 			return false;
 		}
+
+		static bool IsInsideMember (this DocumentRegion region, IUnresolvedTypeDefinition cl)
+		{
+			if (region.IsEmpty || cl == null || !cl.BodyRegion.IsInside (region.Begin.Line, region.Begin.Column))
+				return false;
+			foreach (var member in cl.Members) {
+				if (member.BodyRegion.IsEmpty)
+					continue;
+				if (member.BodyRegion.IsInside (region.Begin.Line, region.Begin.Column) && member.BodyRegion.IsInside (region.End.Line, region.End.Column)) 
+					return true;
+			}
+			foreach (var inner in cl.NestedTypes) {
+				if (region.IsInsideMember (inner))
+					return true;
+			}
+			return false;
+		}
 		
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ProjectContentEventArgs.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ProjectContentEventArgs.cs
deleted file mode 100644
index 54d31aa138..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ProjectContentEventArgs.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// 
-// ProjectContentEventArgs.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.Ide.TypeSystem
-{
-	[Serializable]
-	public sealed class ProjectContentEventArgs : EventArgs
-	{
-		public Project Project {
-			get;
-			private set;
-		}
-		
-		public IProjectContent Content {
-			get; 
-			private set;
-		}
-		
-		public ProjectContentEventArgs (Project project, IProjectContent content)
-		{
-			this.Project = project;
-			this.Content = content;
-		}
-	}
-}
-
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs
index bd7eea162b..d52111e65f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs
@@ -25,8 +25,8 @@
 // THE SOFTWARE.
 using System;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
 using Mono.Cecil;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.Ide.TypeSystem
 {
@@ -122,149 +122,175 @@ namespace MonoDevelop.Ide.TypeSystem
 			Stock.Event, Stock.PrivateEvent, Stock.Event, Stock.ProtectedEvent, Stock.InternalEvent, Stock.ProtectedOrInternalEvent, Stock.InternalAndProtectedEvent
 		};
 
-		public static string GetStockIcon (this INamedElement element)
-		{
-			if (element is IType)
-				return ((IType)element).GetStockIcon ();
-			if (element is ITypeParameter)
-				return ((ITypeParameter)element).GetStockIcon ();
-			if (element is IUnresolvedEntity)
-				return ((IUnresolvedEntity)element).GetStockIcon ();
-			return ((IEntity)element).GetStockIcon ();
-		}
-		
-		public static string GetStockIcon (this ITypeDefinition entity)
-		{
-			return GetStockIcon ((IType)entity);
-		}
-		
-		public static string GetStockIcon (this IType entity)
+//		public static IconId GetStockIcon (this INamedElement element)
+//		{
+//			if (element is IType)
+//				return ((IType)element).GetStockIcon ();
+//			if (element is ITypeParameter)
+//				return ((ITypeParameter)element).GetStockIcon ();
+//			if (element is IUnresolvedEntity)
+//				return ((IUnresolvedEntity)element).GetStockIcon ();
+//			return ((IEntity)element).GetStockIcon ();
+//		}
+//		
+//		public static IconId GetStockIcon (this ITypeDefinition entity)
+//		{
+//			return GetStockIcon ((IType)entity);
+//		}
+//
+//		public static IconId GetStockIcon (this IType entity)
+//		{
+//			var def = entity.GetDefinition ();
+//			if (def == null)
+//				return Class;
+//			switch (def.Kind) {
+//			case TypeKind.Class:
+//				return typeIconTable [0, (int)def.Accessibility];
+//			case TypeKind.Enum:
+//				return typeIconTable [1, (int)def.Accessibility];
+//			case TypeKind.Interface:
+//				return typeIconTable [2, (int)def.Accessibility];
+//			case TypeKind.Struct:
+//				return typeIconTable [3, (int)def.Accessibility];
+//			case TypeKind.Delegate:
+//				return typeIconTable [4, (int)def.Accessibility];
+//			default:
+//				return typeIconTable [0, (int)def.Accessibility];
+//			}
+//		}
+
+		static int GetIndex (Microsoft.CodeAnalysis.Accessibility accessibility)
 		{
-			var def = entity.GetDefinition ();
-			if (def == null)
-				return Class;
-			switch (def.Kind) {
-			case TypeKind.Class:
-				return typeIconTable [0, (int)def.Accessibility];
-			case TypeKind.Enum:
-				return typeIconTable [1, (int)def.Accessibility];
-			case TypeKind.Interface:
-				return typeIconTable [2, (int)def.Accessibility];
-			case TypeKind.Struct:
-				return typeIconTable [3, (int)def.Accessibility];
-			case TypeKind.Delegate:
-				return typeIconTable [4, (int)def.Accessibility];
+			switch (accessibility) {
+			case Microsoft.CodeAnalysis.Accessibility.NotApplicable:
+				return 0;
+			case Microsoft.CodeAnalysis.Accessibility.Private:
+				return 1;
+			case Microsoft.CodeAnalysis.Accessibility.ProtectedAndInternal:
+				return 5;
+			case Microsoft.CodeAnalysis.Accessibility.Protected:
+				return 3;
+			case Microsoft.CodeAnalysis.Accessibility.Internal:
+				return 4;
+			case Microsoft.CodeAnalysis.Accessibility.ProtectedOrInternal:
+				return 5;
+			case Microsoft.CodeAnalysis.Accessibility.Public:
+				return 2;
 			default:
-				return typeIconTable [0, (int)def.Accessibility];
+				throw new ArgumentOutOfRangeException ();
 			}
 		}
-		
-		public static string GetStockIcon (this IUnresolvedTypeDefinition def)
+
+		public static IconId GetStockIcon (this Microsoft.CodeAnalysis.ISymbol symbol)
 		{
-			switch (def.Kind) {
-			case TypeKind.Class:
-				return typeIconTable [0, (int)def.Accessibility];
-			case TypeKind.Enum:
-				return typeIconTable [1, (int)def.Accessibility];
-			case TypeKind.Interface:
-				return typeIconTable [2, (int)def.Accessibility];
-			case TypeKind.Struct:
-				return typeIconTable [3, (int)def.Accessibility];
-			case TypeKind.Delegate:
-				return typeIconTable [4, (int)def.Accessibility];
+			switch (symbol.Kind) {
+			case Microsoft.CodeAnalysis.SymbolKind.Alias:
+			case Microsoft.CodeAnalysis.SymbolKind.ArrayType:
+			case Microsoft.CodeAnalysis.SymbolKind.Assembly:
+			case Microsoft.CodeAnalysis.SymbolKind.DynamicType:
+			case Microsoft.CodeAnalysis.SymbolKind.ErrorType:
+			case Microsoft.CodeAnalysis.SymbolKind.Label:
+			case Microsoft.CodeAnalysis.SymbolKind.Local:
+			case Microsoft.CodeAnalysis.SymbolKind.NetModule:
+			case Microsoft.CodeAnalysis.SymbolKind.PointerType:
+				return Field;
+			case Microsoft.CodeAnalysis.SymbolKind.NamedType:
+				var namedTypeSymbol = (Microsoft.CodeAnalysis.INamedTypeSymbol)symbol;
+				return typeIconTable [GetTypeIndex(namedTypeSymbol.TypeKind ), GetIndex (namedTypeSymbol.DeclaredAccessibility)];
+			case Microsoft.CodeAnalysis.SymbolKind.Event:
+				var evtSymbol = (Microsoft.CodeAnalysis.IEventSymbol)symbol;
+				return eventIconTable [GetIndex (evtSymbol.DeclaredAccessibility)];
+			case Microsoft.CodeAnalysis.SymbolKind.Field:
+				var fieldSymbol = (Microsoft.CodeAnalysis.IFieldSymbol)symbol;
+				return fieldIconTable [GetIndex (fieldSymbol.DeclaredAccessibility)];
+			case Microsoft.CodeAnalysis.SymbolKind.Method:
+				var methodSymbol = (Microsoft.CodeAnalysis.IMethodSymbol)symbol;
+				return methodIconTable [GetIndex (methodSymbol.DeclaredAccessibility)];
+			case Microsoft.CodeAnalysis.SymbolKind.Namespace:
+				return Namespace;
+			case Microsoft.CodeAnalysis.SymbolKind.Parameter:
+				return Field;
+			case Microsoft.CodeAnalysis.SymbolKind.Property:
+				var propertySymbol = (Microsoft.CodeAnalysis.IPropertySymbol)symbol;
+				return propertyIconTable [GetIndex (propertySymbol.DeclaredAccessibility)];
+			case Microsoft.CodeAnalysis.SymbolKind.RangeVariable:
+				return Field;
+			case Microsoft.CodeAnalysis.SymbolKind.TypeParameter:
+				return Stock.typeIconTable [0, 0];
+			case Microsoft.CodeAnalysis.SymbolKind.Preprocessing:
+				return Field;
 			default:
-				return typeIconTable [0, (int)def.Accessibility];
+				throw new ArgumentOutOfRangeException ();
 			}
 		}
-		
-		public static string GetStockIcon (this IField field)
-		{
-			return GetStockIcon ((IEntity)field);
-		}
-		
-		public static string GetStockIcon (this IVariable variable)
-		{
-			return Field;
-		}
-		
-		public static string GetStockIcon (this IParameter parameter)
-		{
-			return Field;
-		}
-		
-		public static string GetStockIcon (this IUnresolvedTypeParameter parameter)
-		{
-			return Field;
-		}
-		
-		public static string GetStockIcon (this IEntity entity, bool showAccessibility = true)
+
+		static int GetTypeIndex (Microsoft.CodeAnalysis.TypeKind typeKind)
 		{
-			switch (entity.SymbolKind) {
-			case SymbolKind.TypeDefinition:
-				return GetStockIcon ((IType)entity);
-			case SymbolKind.Field:
-				if (showAccessibility)
-					return fieldIconTable [(int)entity.Accessibility];
-				else
-					return fieldIconTable [0];
-			case SymbolKind.Method:
-			case SymbolKind.Constructor:
-			case SymbolKind.Destructor:
-			case SymbolKind.Operator:
-				if (showAccessibility) {
-					if (((IMethod)entity).IsExtensionMethod)
-						return extensionMethodIconTable [(int)entity.Accessibility];
-					return methodIconTable [(int)entity.Accessibility];
-				} else {
-					if (((IMethod)entity).IsExtensionMethod)
-						return extensionMethodIconTable [0];
-					return methodIconTable [0];
-				}
-			case SymbolKind.Property:
-			case SymbolKind.Indexer:
-				if (showAccessibility)
-					return propertyIconTable [(int)entity.Accessibility];
-				else
-					return propertyIconTable [0];
-			case SymbolKind.Event:
-				if (showAccessibility)
-					return eventIconTable [(int)entity.Accessibility];
-				else
-					return eventIconTable [0];
+			switch (typeKind) {
+			case Microsoft.CodeAnalysis.TypeKind.Unknown:
+			case Microsoft.CodeAnalysis.TypeKind.Array:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Class:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Delegate:
+				return 4;
+			case Microsoft.CodeAnalysis.TypeKind.Dynamic:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Enum:
+				return 1;
+			case Microsoft.CodeAnalysis.TypeKind.Error:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Interface:
+				return 2;
+			case Microsoft.CodeAnalysis.TypeKind.Module:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Pointer:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Struct:
+				return 3;
+			case Microsoft.CodeAnalysis.TypeKind.TypeParameter:
+				return 0;
+			case Microsoft.CodeAnalysis.TypeKind.Submission:
+				return 0;
+			default:
+				throw new ArgumentOutOfRangeException ();
 			}
-			return "";
 		}
-		public static string GetStockIcon (this IUnresolvedEntity entity, bool showAccessibility = true)
+
+		internal static IconId GetStockIconForSymbolInfo (this DeclaredSymbolInfo symbol)
 		{
-			switch (entity.SymbolKind) {
-			case SymbolKind.TypeDefinition:
-				return GetStockIcon ((IUnresolvedTypeDefinition)entity);
-			case SymbolKind.Field:
-				if (showAccessibility)
-					return fieldIconTable [(int)entity.Accessibility];
-				else
-					return fieldIconTable [0];
-			case SymbolKind.Method:
-			case SymbolKind.Constructor:
-			case SymbolKind.Destructor:
-			case SymbolKind.Operator:
-				if (showAccessibility)
-					return methodIconTable [(int)entity.Accessibility];
-				else
-					return methodIconTable [0];
-			case SymbolKind.Property:
-			case SymbolKind.Indexer:
-				if (showAccessibility)
-					return propertyIconTable [(int)entity.Accessibility];
-				else
-					return propertyIconTable [0];
-			case SymbolKind.Event:
-				if (showAccessibility)
-					return eventIconTable [(int)entity.Accessibility];
-				else
-					return eventIconTable [0];
+			switch (symbol.Kind) {
+			case DeclaredSymbolInfoKind.Class:
+				return Stock.Class;
+			case DeclaredSymbolInfoKind.Constant:
+				return Stock.Field;
+			case DeclaredSymbolInfoKind.Constructor:
+				return Stock.Method;
+			case DeclaredSymbolInfoKind.Delegate:
+				return Stock.Delegate;
+			case DeclaredSymbolInfoKind.Enum:
+				return Stock.Enum;
+			case DeclaredSymbolInfoKind.EnumMember:
+				return Stock.Field;
+			case DeclaredSymbolInfoKind.Event:
+				return Stock.Event;
+			case DeclaredSymbolInfoKind.Field:
+				return Stock.Field;
+			case DeclaredSymbolInfoKind.Indexer:
+				return Stock.Method;
+			case DeclaredSymbolInfoKind.Interface:
+				return Stock.Interface;
+			case DeclaredSymbolInfoKind.Method:
+				return Stock.Method;
+			case DeclaredSymbolInfoKind.Module:
+				return Stock.Method;
+			case DeclaredSymbolInfoKind.Property:
+				return Stock.Property;
+			case DeclaredSymbolInfoKind.Struct:
+				return Stock.Struct;
+			default:
+				throw new ArgumentOutOfRangeException ();
 			}
-			return "";
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Tag.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Tag.cs
index f45231144b..9f6924a2d0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Tag.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Tag.cs
@@ -51,7 +51,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Ide.TypeSystem
 {
@@ -66,16 +67,16 @@ namespace MonoDevelop.Ide.TypeSystem
 			}
 		}
 		
-		public Tag (string key, DomRegion region)
+		public Tag (string key, DocumentRegion region)
 		{
 			this.key = key;
 			base.Region = region;
 		}
-		
-		public Tag (string key, string comment, DomRegion region)  : base (comment)
+
+		public Tag (string key, string comment, DocumentRegion region)  : base (comment)
 		{
 			this.key = key;
 			base.Region = region;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemParser.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemParser.cs
index 7470e8c358..62ca819303 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemParser.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemParser.cs
@@ -27,9 +27,53 @@ using System;
 using System.IO;
 using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Projects;
+using MonoDevelop.Core.Text;
+using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
+using System.Threading;
+using MonoDevelop.Ide.Editor.Projection;
+using MonoDevelop.Ide.Editor;
+using System.Collections.Generic;
 
 namespace MonoDevelop.Ide.TypeSystem
 {
+	public sealed class ParseOptions
+	{
+		public string FileName { get; set; } 
+
+		public ITextSource Content { get; set; }
+
+		public MonoDevelop.Projects.Project Project { get; set; }
+
+		public Document RoslynDocument { get; set; }
+	}
+
+	[Flags]
+	public enum DisabledProjectionFeatures {
+		None                     = 0,
+		Completion               = 1 << 0,
+		SemanticHighlighting     = 1 << 1,
+		Tooltips                 = 1 << 2,
+
+		All = Completion | SemanticHighlighting | Tooltips
+	}
+
+	public class ParsedDocumentProjection 
+	{
+		public ParsedDocument ParsedDocument { get; private set; }
+
+		public IReadOnlyList<Projection> Projections { get; private set;}
+
+		public DisabledProjectionFeatures DisabledProjectionFeatures { get; private set;}
+
+		public ParsedDocumentProjection (ParsedDocument parsedDocument, IReadOnlyList<Projection> projections, DisabledProjectionFeatures disabledProjectionFeatures = DisabledProjectionFeatures.None)
+		{
+			this.ParsedDocument = parsedDocument;
+			this.Projections = projections;
+			this.DisabledProjectionFeatures = disabledProjectionFeatures;
+		}
+	}
+
 	/// <summary>
 	/// A type system parser provides a ParsedDocument (which just adds some more information to a IUnresolvedFile) for
 	/// a given file. This is required for adding information to the type system service to make the file contents available
@@ -52,24 +96,51 @@ namespace MonoDevelop.Ide.TypeSystem
 		/// <param name='project'>
 		/// The project the file belongs to.
 		/// </param>
-		public abstract ParsedDocument Parse (bool storeAst, string fileName, TextReader content, Project project = null);
+		public abstract Task<ParsedDocument> Parse (ParseOptions options, CancellationToken cancellationToken = default(CancellationToken));
 
 		/// <summary>
-		/// Parse the specified file. The file content should be read by the type system parser.
+		/// If true projections are possible. A projection transforms a source to a target language and maps certain parts of the file to parts in the projected file.
+		/// That's used for embedded languages for example.
 		/// </summary>
-		/// <param name='storeAst'>
-		/// If set to <c>true</c> the ast should be stored in the parsed document.
-		/// </param>
-		/// <param name='fileName'>
-		/// The name of the file.
-		/// </param>
-		/// <param name='project'>
-		/// The project the file belongs to.
-		/// </param>
-		public virtual ParsedDocument Parse (bool storeAst, string fileName, Project project = null)
+		/// <returns><c>true</c> if this instance can generate projection the specified mimeType buildAction supportedLanguages;
+		/// otherwise, <c>false</c>.</returns>
+		/// <param name="mimeType">MIME type.</param>
+		/// <param name="buildAction">Build action.</param>
+		/// <param name="supportedLanguages">Supported languages.</param>
+		public virtual bool CanGenerateProjection (string mimeType, string buildAction, string[] supportedLanguages)
+		{
+			return false;
+		}
+
+		/// <summary>
+		/// Generates the plain projection. This is used for type system services.
+		/// </summary>
+		/// <returns>The projection.</returns>
+		/// <param name="options">Options.</param>
+		/// <param name="cancellationToken">Cancellation token.</param>
+		public virtual Task<IReadOnlyList<Projection>> GenerateProjections (ParseOptions options, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			throw new NotSupportedException ();
+		}
+
+		/// <summary>
+		/// Generates the parsed document projection. That contains the parsed document and the projection. This is used inside the IDE for the editor.
+		/// That's usually more efficient than calling Parse/GenerateProjection separately.
+		/// </summary>
+		/// <returns>The parsed document projection.</returns>
+		/// <param name="options">Options.</param>
+		/// <param name="cancellationToken">Cancellation token.</param>
+		public virtual Task<ParsedDocumentProjection> GenerateParsedDocumentProjection (ParseOptions options, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			throw new NotSupportedException ();
+		}
+
+		/// <summary>
+		/// Gets an up to date partial projection used by code completion.
+		/// </summary>
+		public virtual Task<IReadOnlyList<Projection>> GetPartialProjectionsAsync (DocumentContext ctx, TextEditor editor, ParsedDocument currentParsedDocument, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			using (var stream = Mono.TextEditor.Utils.TextFileUtility.OpenStream (fileName)) 
-				return Parse (storeAst, fileName, stream, project);
+			throw new NotSupportedException ();
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemParserNode.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemParserNode.cs
index 1cb27e418a..1a58e50598 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemParserNode.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemParserNode.cs
@@ -113,6 +113,4 @@ namespace MonoDevelop.Ide.TypeSystem
 			}
 		}
 	}
-
 }
-
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
index e18c2c603c..8a5bf71552 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
@@ -28,138 +28,24 @@ using System.Collections.Generic;
 using System.Linq;
 using System.IO;
 using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using ICSharpCode.NRefactory.TypeSystem;
 using Mono.Addins;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
-using Mono.TextEditor;
 using System.Threading;
-using MonoDevelop.Core.ProgressMonitoring;
 using System.Xml;
 using ICSharpCode.NRefactory.Utils;
-using ICSharpCode.NRefactory;
 using System.Threading.Tasks;
-using ICSharpCode.NRefactory.Documentation;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Ide.Extensions;
 using MonoDevelop.Core.Assemblies;
 using System.Text;
-using ICSharpCode.NRefactory.Completion;
-using System.Diagnostics;
-using MonoDevelop.Projects.SharedAssetsProjects;
-using Mono.CSharp.Nullable;
-using MonoDevelop.Ide.Templates;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using Microsoft.CodeAnalysis.Text;
+using Mono.Posix;
 
 namespace MonoDevelop.Ide.TypeSystem
 {
-	public static class TypeSystemServiceExt
-	{
-		/// <summary>
-		/// Tries to the get source project for a given type definition. This operation may fall if it was called on an outdated
-		/// compilation unit or the correspondening project was unloaded.
-		/// </summary>
-		/// <returns><c>true</c>, if get source project was found, <c>false</c> otherwise.</returns>
-		/// <param name="type">The type definition.</param>
-		/// <param name="project">The project or null if it wasn't found.</param>
-		public static bool TryGetSourceProject (this ITypeDefinition type, out Project project)
-		{
-			var location = type.Compilation.MainAssembly.UnresolvedAssembly.Location;
-			if (string.IsNullOrEmpty (location)) {
-				project = null;
-				return false;
-			}
-			project = TypeSystemService.GetProject (location);
-			return project != null;
-		}
-
-		/// <summary>
-		/// Tries to the get source project for a given type. This operation may fall if it was called on an outdated
-		/// compilation unit or the correspondening project was unloaded.
-		/// </summary>
-		/// <returns><c>true</c>, if get source project was found, <c>false</c> otherwise.</returns>
-		/// <param name="type">The type.</param>
-		/// <param name="project">The project or null if it wasn't found.</param>
-		public static bool TryGetSourceProject (this IType type, out Project project)
-		{
-			var def = type.GetDefinition ();
-			if (def == null) {
-				project = null;
-				return false;
-			}
-			return def.TryGetSourceProject (out project);
-		}
-
-
-		internal static Project GetProjectWhereTypeIsDefined (this ITypeDefinition type)
-		{
-			var location = type.ParentAssembly.UnresolvedAssembly.Location;
-			if (string.IsNullOrEmpty (location))
-				return null;
-			return TypeSystemService.GetProject (location);
-		}
-
-		internal static Project GetProjectWhereTypeIsDefined (this IType type)
-		{
-			Project project;
-			TryGetSourceProject (type, out project);
-			return project;
-		}
-
-		public static TextLocation GetLocation (this IType type)
-		{
-			return type.GetDefinition ().Region.Begin;
-		}
-
-		public static bool IsBaseType (this IType type, IType potentialBase)
-		{
-			return type.GetAllBaseTypes ().Any (t => t.Equals (potentialBase));
-		}
-
-		public static bool IsObsolete (this IEntity member)
-		{
-			return member != null && member.Attributes.Any (a => a.AttributeType.FullName == "System.ObsoleteAttribute");
-		}
-
-		public static bool IsObsolete (this IEntity member, out string reason)
-		{
-			if (member == null) {
-				reason = null;
-				return false;
-			}
-			var attr = member.Attributes.FirstOrDefault (a => a.AttributeType.FullName == "System.ObsoleteAttribute");
-			if (attr == null) {
-				reason = null;
-				return false;
-			}
-			reason = attr.PositionalArguments.Count > 0 ? attr.PositionalArguments [0].ConstantValue.ToString () : null;
-			return true;
-		}
-
-		public static IType Resolve (this IUnresolvedTypeDefinition def, Project project)
-		{
-			if (project == null)
-				throw new ArgumentNullException ("project");
-			var compilation = TypeSystemService.GetCompilation (project);
-			var ctx = new SimpleTypeResolveContext (compilation.MainAssembly);
-			var resolvedType = def.Resolve (ctx);
-			return resolvedType;
-		}
-	}
-
-	/// <summary>
-	/// The folding parser is used for generating a preliminary parsed document that does not
-	/// contain a full dom - only some basic lexical constructs like comments or pre processor directives.
-	/// 
-	/// This is useful for opening a document the first time to have some folding regions as start that are folded by default.
-	/// Otherwise an irritating screen update will occur.
-	/// </summary>
-	public interface IFoldingParser
-	{
-		ParsedDocument Parse (string fileName, string content);
-	}
-
-	public static class TypeSystemService
+	public static partial class TypeSystemService
 	{
 		const string CurrentVersion = "1.1.8";
 		static readonly List<TypeSystemParserNode> parsers;
@@ -171,6 +57,11 @@ namespace MonoDevelop.Ide.TypeSystem
 			}
 		}
 
+		public static bool TrackFileChanges {
+			get;
+			set;
+		}
+
 		public static void RemoveSkippedfile (FilePath fileName)
 		{
 			filesSkippedInParseThread = filesSkippedInParseThread.Where (f => f != fileName).ToArray ();
@@ -196,7 +87,33 @@ namespace MonoDevelop.Ide.TypeSystem
 					break;
 				}
 			});
+			try {
+				emptyWorkspace = new MonoDevelopWorkspace ();
+			} catch (Exception e) {
+				LoggingService.LogFatalError ("Can't create roslyn workspace", e); 
+			}
 
+			FileService.FileChanged += delegate(object sender, FileEventArgs e) {
+				//				if (!TrackFileChanges)
+				//					return;
+				foreach (var file in e) {
+					// Open documents are handled by the Document class itself.
+					if (IdeApp.Workbench != null && IdeApp.Workbench.GetDocument (file.FileName) != null)
+						continue;
+					try {
+						var text = MonoDevelop.Core.Text.StringTextSource.ReadFrom (file.FileName).Text;
+						foreach (var w in Workspaces)
+							w.UpdateFileContent (file.FileName, text);
+					} catch (FileNotFoundException) {}
+				}
+				if (IdeApp.Workbench != null)
+					foreach (var w in IdeApp.Workbench.Documents)
+						w.StartReparseThread ();
+			};
+
+			IntitializeTrackedProjectHandling ();
+		}
+/*
 			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/TypeSystem/OutputTracking", delegate (object sender, ExtensionNodeEventArgs args) {
 				var node = (TypeSystemOutputTrackingNode)args.ExtensionNode;
 				switch (args.Change) {
@@ -209,63 +126,11 @@ namespace MonoDevelop.Ide.TypeSystem
 				}
 			});
 
-			FileService.FileChanged += delegate(object sender, FileEventArgs e) {
-				if (!TrackFileChanges)
-					return;
-				foreach (var file in e) {
-					// Open documents are handled by the Document class itself.
-					if (IdeApp.Workbench != null && IdeApp.Workbench.GetDocument (file.FileName) != null)
-						continue;
-					//
-					lock (projectWrapperUpdateLock) {
-						foreach (var wrapper in projectContents.Values) {
-							var projectFile = wrapper.Project.Files.GetFile (file.FileName);
-							if (projectFile != null)
-								QueueParseJob (wrapper, new [] { projectFile });
-						}
-						UnresolvedAssemblyProxy ctx;
-						if (cachedAssemblyContents.TryGetValue (file.FileName, out ctx))
-							CheckModifiedFile (ctx);
-					}
-				}
-
-				foreach (var content in projectContents.Values.ToArray ()) {
-					var files = new List<ProjectFile> ();
-					foreach (var file in e) {
-						var f = content.Project.GetProjectFile (file.FileName);
-						if (f == null || f.BuildAction == BuildAction.None)
-							continue;
-						files.Add (f);
-					}
-					if (files.Count > 0)
-						QueueParseJob (content, files);
-				}
-
-			};
-			if (IdeApp.ProjectOperations != null) {
-				IdeApp.ProjectOperations.EndBuild += HandleEndBuild;
-			}
-			if (IdeApp.Workspace != null) {
-				IdeApp.Workspace.ActiveConfigurationChanged += HandleActiveConfigurationChanged;
-			}
-		}
-
-		static void HandleActiveConfigurationChanged (object sender, EventArgs e)
-		{
-			foreach (var pr in projectContents.ToArray ()) {
-				var project = pr.Key as DotNetProject;
-				if (project != null)
-					CheckProjectOutput (project, true);
-
-				pr.Value.referencesConnected = false;
-			}
-		}
-
 		static readonly List<TypeSystemOutputTrackingNode> outputTrackedProjects = new List<TypeSystemOutputTrackingNode> ();
 
 		static bool IsOutputTracked (DotNetProject project)
 		{
-			foreach (var projectType in project.GetTypeTags ()) {
+			foreach (var projectType in project.GetProjectTypes ()) {
 				if (outputTrackedProjects.Any (otp => otp.ProjectType != null && string.Equals (otp.ProjectType, projectType, StringComparison.OrdinalIgnoreCase))) {
 					return true;
 				}
@@ -273,35 +138,7 @@ namespace MonoDevelop.Ide.TypeSystem
 			return outputTrackedProjects.Any (otp => otp.LanguageName != null && string.Equals (otp.LanguageName, project.LanguageName, StringComparison.OrdinalIgnoreCase));
 		}
 
-		static void CheckProjectOutput (DotNetProject project, bool autoUpdate)
-		{
-			if (project == null)
-				throw new ArgumentNullException ("project");
-			if (IsOutputTracked (project)) {
-				var fileName = project.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration);
-
-				var wrapper = GetProjectContentWrapper (project);
-				if (wrapper == null)
-					return;
-				bool update = wrapper.UpdateTrackedOutputAssembly (fileName);
-				if (autoUpdate && update) {
-					wrapper.ReconnectAssemblyReferences ();
-
-					// update documents
-					foreach (var openDocument in IdeApp.Workbench.Documents) {
-						openDocument.ReparseDocument ();
-					}
-				}
-			}
-		}
-
-		static void HandleEndBuild (object sender, BuildEventArgs args)
-		{
-			var project = args.SolutionItem as DotNetProject;
-			if (project == null)
-				return;
-			CheckProjectOutput (project, true);
-		}
+*/
 
 		public static TypeSystemParser GetParser (string mimeType, string buildAction = BuildAction.Compile)
 		{
@@ -309,7 +146,7 @@ namespace MonoDevelop.Ide.TypeSystem
 			return n != null ? n.Parser : null;
 		}
 
-		static TypeSystemParserNode GetTypeSystemParserNode (string mimeType, string buildAction)
+		internal static TypeSystemParserNode GetTypeSystemParserNode (string mimeType, string buildAction)
 		{
 			foreach (var mt in DesktopService.GetMimeTypeInheritanceChain (mimeType)) {
 				var provider = Parsers.FirstOrDefault (p => p.CanParse (mt, buildAction));
@@ -319,172 +156,157 @@ namespace MonoDevelop.Ide.TypeSystem
 			return null;
 		}
 
-		static List<MimeTypeExtensionNode> foldingParsers;
-
-		static IEnumerable<MimeTypeExtensionNode> FoldingParsers {
-			get {
-				if (foldingParsers == null) {
-					foldingParsers = new List<MimeTypeExtensionNode> ();
-					AddinManager.AddExtensionNodeHandler ("/MonoDevelop/TypeSystem/FoldingParser", delegate (object sender, ExtensionNodeEventArgs args) {
-						switch (args.Change) {
-						case ExtensionChange.Add:
-							foldingParsers.Add ((MimeTypeExtensionNode)args.ExtensionNode);
-							break;
-						case ExtensionChange.Remove:
-							foldingParsers.Remove ((MimeTypeExtensionNode)args.ExtensionNode);
-							break;
-						}
-					});
-				}
-				return foldingParsers;
-			}
-		}
-
-		public static IFoldingParser GetFoldingParser (string mimeType)
+		public static Task<ParsedDocument> ParseFile (Project project, string fileName, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			foreach (var mt in DesktopService.GetMimeTypeInheritanceChain (mimeType)) {
-				var node = FoldingParsers.FirstOrDefault (n => n.MimeType == mt);
-				if (node != null)
-					return node.CreateInstance () as IFoldingParser;
-			}
-			return null;
-		}
+			StringTextSource text;
 
-		public static ParsedDocument ParseFile (Project project, string fileName)
-		{
-			string text;
-			
 			try {
 				if (!File.Exists (fileName))
 					return null;
-				text = Mono.TextEditor.Utils.TextFileUtility.ReadAllText (fileName);
+				text = StringTextSource.ReadFrom (fileName);
 			} catch (Exception) {
 				return null;
 			}
-			
-			return ParseFile (project, fileName, DesktopService.GetMimeTypeForUri (fileName), text);
+
+			return ParseFile (project, fileName, DesktopService.GetMimeTypeForUri (fileName), text, cancellationToken);
 		}
 
-		static readonly object projectWrapperUpdateLock = new object ();
-		
-		public static ParsedDocument ParseFile (Project project, string fileName, string mimeType, string content)
+		public static Task<ParsedDocument> ParseFile (ParseOptions options, string mimeType, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			if (fileName == null)
-				throw new ArgumentNullException ("fileName");
+			if (options == null)
+				throw new ArgumentNullException ("options");
+			if (options.FileName == null)
+				throw new ArgumentNullException ("options.FileName");
+
 			var parser = GetParser (mimeType);
 			if (parser == null)
-				return null;
+				return Task.FromResult ((ParsedDocument)null);
 
-			var t = Counters.ParserService.FileParsed.BeginTiming (fileName);
+			var t = Counters.ParserService.FileParsed.BeginTiming (options.FileName);
 			try {
-				var result = parser.Parse (true, fileName, new StringReader (content), project);
-				lock (projectWrapperUpdateLock) {
-					ProjectContentWrapper wrapper;
-					if (project != null) {
-						projectContents.TryGetValue (project, out wrapper);
-					} else {
-						wrapper = null;
-					}
-					if (wrapper != null && (result.Flags & ParsedDocumentFlags.NonSerializable) != ParsedDocumentFlags.NonSerializable) {
-						var oldFile = wrapper._content.GetFile (fileName);
-						wrapper.UpdateContent (c => c.AddOrUpdateFiles (result.ParsedFile));
-						UpdateProjectCommentTasks (wrapper, result);
-						if (oldFile != null)
-							wrapper.InformFileRemoved (new ParsedFileEventArgs (oldFile));
-						wrapper.InformFileAdded (new ParsedFileEventArgs (result.ParsedFile));
-					}
-
-					// The parsed file could be included in other projects as well, therefore
-					// they need to be updated.
-					foreach (var cnt in projectContents.ToArray ()) {
-						if (cnt.Key == project)
-							continue;
-						// Use the project context because file lookup is faster there than in the project class.
-						var pcnt = cnt.Value;
-						var file = pcnt._content.GetFile (fileName);
-						if (file != null) {
-							var newResult = parser.Parse (false, fileName, new StringReader (content), pcnt.Project);
-							if ((newResult.Flags & ParsedDocumentFlags.NonSerializable) != ParsedDocumentFlags.NonSerializable) {
-								pcnt.UpdateContent (c => c.AddOrUpdateFiles (newResult.ParsedFile));
-								pcnt.InformFileRemoved (new ParsedFileEventArgs (file));
-								pcnt.InformFileAdded (new ParsedFileEventArgs (newResult.ParsedFile));
-							}
-						}
-					}
-				}
+				var result = parser.Parse (options, cancellationToken);
 				return result;
+			} catch (OperationCanceledException) {
+				return Task.FromResult ((ParsedDocument)null);
 			} catch (Exception e) {
 				LoggingService.LogError ("Exception while parsing: " + e);
-				return null;
+				return Task.FromResult ((ParsedDocument)null);
 			} finally {
 				t.Dispose ();
 			}
 		}
 
-		public static ParsedDocument ParseFile (Project project, string fileName, string mimeType, TextReader content)
+		internal static bool CanParseProjections (Project project, string mimeType, string fileName)
+		{
+			var parser = GetParser (mimeType);
+			if (parser == null)
+				return false;
+			var projectFile = project.GetProjectFile (fileName);
+			if (projectFile == null)
+				return false;
+
+			return parser.CanGenerateProjection (mimeType, projectFile.BuildAction, project.SupportedLanguages);
+		}
+
+		public static Task<ParsedDocument> ParseFile (Project project, string fileName, string mimeType, ITextSource content, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			return ParseFile (project, fileName, mimeType, content.ReadToEnd ());
+			return ParseFile (new ParseOptions { FileName = fileName, Project = project, Content = content }, mimeType, cancellationToken);
 		}
 
-		public static ParsedDocument ParseFile (Project project, TextEditorData data)
+		public static Task<ParsedDocument> ParseFile (Project project, string fileName, string mimeType, TextReader content, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			return ParseFile (project, data.FileName, data.MimeType, data.Text);
+			return ParseFile (project, fileName, mimeType, new StringTextSource (content.ReadToEnd ()), cancellationToken);
 		}
 
-		public static ParsedDocument ParseFile (string fileName, string mimeType, string text, ProjectContentWrapper wrapper = null)
+		public static Task<ParsedDocument> ParseFile (Project project, IReadonlyTextDocument data, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			using (var reader = new StringReader (text))
-				return ParseFile (fileName, mimeType, reader, wrapper);
+			return ParseFile (project, data.FileName, data.MimeType, data, cancellationToken);
 		}
 
-		public static ParsedDocument ParseFile (string fileName, string mimeType, TextReader content, ProjectContentWrapper wrapper = null)
+		internal static Task<ParsedDocumentProjection> ParseProjection (ParseOptions options, string mimeType, CancellationToken cancellationToken = default(CancellationToken))
 		{
+			if (options == null)
+				throw new ArgumentNullException ("options");
+			if (options.FileName == null)
+				throw new ArgumentNullException ("fileName");
+
 			var parser = GetParser (mimeType);
 			if (parser == null)
-				return null;
-			var t = Counters.ParserService.FileParsed.BeginTiming (fileName);
+				return Task.FromResult ((ParsedDocumentProjection)null);
+
+			var t = Counters.ParserService.FileParsed.BeginTiming (options.FileName);
 			try {
-				var result = parser.Parse (true, fileName, content);
-				lock (projectWrapperUpdateLock) {
-					if (wrapper != null && (result.Flags & ParsedDocumentFlags.NonSerializable) != ParsedDocumentFlags.NonSerializable) {
-						var oldFile = wrapper._content.GetFile (fileName);
-						wrapper.UpdateContent (c => c.AddOrUpdateFiles (result.ParsedFile));
-						UpdateProjectCommentTasks (wrapper, result);
-						if (oldFile != null)
-							wrapper.InformFileRemoved (new ParsedFileEventArgs (oldFile));
-						wrapper.InformFileAdded (new ParsedFileEventArgs (result.ParsedFile));
+				var result = parser.GenerateParsedDocumentProjection (options, cancellationToken);
+				if (options.Project != null) {
+					var Workspace = Workspaces.First () ;
+					var projectId = Workspace.GetProjectId (options.Project);
+					if (projectId != null) {
+						foreach (var projection in result.Result.Projections) {
+							var docId = Workspace.GetDocumentId (projectId, projection.Document.FileName);
+							if (docId != null)
+								Workspace.InformDocumentTextChange (docId, new MonoDevelopSourceText (projection.Document));
+						}
 					}
 				}
 				return result;
+			} catch (OperationCanceledException) {
+				return Task.FromResult ((ParsedDocumentProjection)null);
 			} catch (Exception e) {
-				LoggingService.LogError ("Exception while parsing :" + e);
-				return null;
+				LoggingService.LogError ("Exception while parsing: " + e);
+				return Task.FromResult ((ParsedDocumentProjection)null);
 			} finally {
 				t.Dispose ();
 			}
 		}
 
-		public static event EventHandler ParseOperationStarted;
+		internal static Task<ParsedDocumentProjection> ParseProjection (Project project, string fileName, string mimeType, ITextSource content, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return ParseProjection (new ParseOptions { FileName = fileName, Project = project, Content = content }, mimeType, cancellationToken);
+		}
+
+		internal static Task<ParsedDocumentProjection> ParseProjection (Project project, string fileName, string mimeType, TextReader content, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return ParseProjection (project, fileName, mimeType, new StringTextSource (content.ReadToEnd ()), cancellationToken);
+		}
 
-		internal static void StartParseOperation ()
+		internal static Task<ParsedDocumentProjection> ParseProjection (Project project, IReadonlyTextDocument data, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			if ((parseStatus++) == 0) {
-				if (ParseOperationStarted != null)
-					ParseOperationStarted (null, EventArgs.Empty);
-			}
+			return ParseProjection (project, data.FileName, data.MimeType, data, cancellationToken);
 		}
 
-		public static event EventHandler ParseOperationFinished;
+	
+		#region Folding parsers
+		static List<MimeTypeExtensionNode> foldingParsers;
 
-		internal static void EndParseOperation ()
+		static IEnumerable<MimeTypeExtensionNode> FoldingParsers {
+			get {
+				if (foldingParsers == null) {
+					foldingParsers = new List<MimeTypeExtensionNode> ();
+					AddinManager.AddExtensionNodeHandler ("/MonoDevelop/TypeSystem/FoldingParser", delegate (object sender, ExtensionNodeEventArgs args) {
+						switch (args.Change) {
+						case ExtensionChange.Add:
+							foldingParsers.Add ((MimeTypeExtensionNode)args.ExtensionNode);
+							break;
+						case ExtensionChange.Remove:
+							foldingParsers.Remove ((MimeTypeExtensionNode)args.ExtensionNode);
+							break;
+						}
+					});
+				}
+				return foldingParsers;
+			}
+		}
+
+		public static IFoldingParser GetFoldingParser (string mimeType)
 		{
-			if (parseStatus == 0)
-				return;
-			if (--parseStatus == 0) {
-				if (ParseOperationFinished != null)
-					ParseOperationFinished (null, EventArgs.Empty);
+			foreach (var mt in DesktopService.GetMimeTypeInheritanceChain (mimeType)) {
+				var node = FoldingParsers.FirstOrDefault (n => n.MimeType == mt);
+				if (node != null)
+					return node.CreateInstance () as IFoldingParser;
 			}
+			return null;
 		}
+		#endregion
 
 		#region Parser Database Handling
 
@@ -702,7 +524,7 @@ namespace MonoDevelop.Ide.TypeSystem
 		{
 			var t = Counters.ParserService.ObjectDeserialized.BeginTiming (path);
 			try {
-				using (var fs = new FileStream (path, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, FileOptions.SequentialScan)) {
+				using (var fs = new FileStream (path, System.IO.FileMode.Open, FileAccess.Read, FileShare.Read, 4096, FileOptions.SequentialScan)) {
 					using (var reader = new BinaryReaderWith7BitEncodedInts (fs)) {
 						lock (sharedSerializer) {
 							return (T)sharedSerializer.Deserialize (reader);
@@ -724,7 +546,7 @@ namespace MonoDevelop.Ide.TypeSystem
 
 			var t = Counters.ParserService.ObjectSerialized.BeginTiming (path);
 			try {
-				using (var fs = new FileStream (path, FileMode.Create, FileAccess.Write)) {
+				using (var fs = new FileStream (path, System.IO.FileMode.Create, FileAccess.Write)) {
 					using (var writer = new BinaryWriterWith7BitEncodedInts (fs)) {
 						lock (sharedSerializer) {
 							sharedSerializer.Serialize (writer, obj);
@@ -805,2230 +627,86 @@ namespace MonoDevelop.Ide.TypeSystem
 			}
 		}
 
-		static void StoreProjectCache (Project project, ProjectContentWrapper wrapper)
-		{
-			if (!wrapper.WasChanged)
-				return;
-			string cacheDir = GetCacheDirectory (project, true);
-			string fileName = Path.GetTempFileName ();
-			
-			SerializeObject (fileName, wrapper.Content.RemoveAssemblyReferences (wrapper.Content.AssemblyReferences));
-			
-			string cacheFile = Path.Combine (cacheDir, "completion.cache");
-			
-			try {
-				if (File.Exists (cacheFile))
-					File.Delete (cacheFile);
-				File.Move (fileName, cacheFile);
-			} catch (Exception e) {
-				LoggingService.LogError ("Error whil saving cache " + cacheFile, e);
-			}
-
-			foreach (var extensionObject in wrapper.ExtensionObjects) {
-				StoreExtensionObject (cacheDir, extensionObject);
-			}
-		}
-
 		#endregion
-
-		#region Project loading
-
-		public static void Load (WorkspaceItem item)
-		{
-			using (Counters.ParserService.WorkspaceItemLoaded.BeginTiming ()) {
-				InternalLoad (item);
-				CleanupCache ();
-			}
-		}
-		static CancellationTokenSource loadCancellationSource = new CancellationTokenSource ();
-		static bool loadWs = false;
-		static void InternalLoad (WorkspaceItem item)
-		{
-			var ws = item as Workspace;
-			if (ws != null) {
-				loadWs = true;
-				loadCancellationSource.Cancel ();
-				loadCancellationSource = new CancellationTokenSource ();
-				foreach (WorkspaceItem it in ws.Items)
-					InternalLoad (it);
-				ws.ItemAdded += OnWorkspaceItemAdded;
-				ws.ItemRemoved += OnWorkspaceItemRemoved;
-			} else {
-				if (!loadWs) {
-					loadCancellationSource.Cancel ();
-					loadCancellationSource = new CancellationTokenSource ();
-				}
-				var solution = item as Solution;
-				if (solution != null) {
-					Parallel.ForEach (solution.GetAllProjects (), project => LoadProject (project));
-					var list = projectContents.Values.ToList ();
-					Task.Run (delegate {
-						foreach (var wrapper in list) {
-							CheckModifiedFiles (wrapper.Project, wrapper.Project.Files.ToArray (), wrapper, loadCancellationSource.Token);
-						}
-					});
-
-					solution.SolutionItemAdded += OnSolutionItemAdded;
-					solution.SolutionItemRemoved += OnSolutionItemRemoved;
-					OnSolutionLoaded (new SolutionEventArgs (solution));
-				}
-			}
-		}
-
-		public static event EventHandler<SolutionEventArgs> SolutionLoaded;
-
-		static void OnSolutionLoaded (SolutionEventArgs e)
-		{
-			var handler = SolutionLoaded;
-			if (handler != null)
-				handler (null, e);
-		}
-
-		[Serializable]
-		public class UnresolvedAssemblyDecorator : IUnresolvedAssembly
-		{
-			readonly ProjectContentWrapper wrapper;
-
-			IUnresolvedAssembly assembly {
-				get {
-					if (wrapper.OutputAssembly != null)
-						return wrapper.OutputAssembly;
-					return wrapper.Compilation.MainAssembly.UnresolvedAssembly;
-				}
-			}
-
-			public UnresolvedAssemblyDecorator (ProjectContentWrapper wrapper)
-			{
-				this.wrapper = wrapper;
-			}
-
-			#region IUnresolvedAssembly implementation
-
-			public string AssemblyName {
-				get {
-					return assembly.AssemblyName;
-				}
-			}
-
-			public string FullAssemblyName {
-				get {
-					return assembly.FullAssemblyName;
-				}
-			}
-
-			public string Location {
-				get {
-					return assembly.Location;
-				}
-			}
-
-			public IEnumerable<IUnresolvedAttribute> AssemblyAttributes {
-				get {
-					return assembly.AssemblyAttributes;
-				}
-			}
-
-			public IEnumerable<IUnresolvedAttribute> ModuleAttributes {
-				get {
-					return assembly.ModuleAttributes;
-				}
-			}
-
-			public IEnumerable<IUnresolvedTypeDefinition> TopLevelTypeDefinitions {
-				get {
-					return assembly.TopLevelTypeDefinitions;
-				}
-			}
-
-			#endregion
-
-			#region IAssemblyReference implementation
-
-			public IAssembly Resolve (ITypeResolveContext context)
-			{
-				return assembly.Resolve (context);
-			}
-
-			#endregion
-
-		}
-
-		[Serializable]
-		public class ProjectContentWrapper
-		{
-			readonly Dictionary<Type, object> extensionObjects = new Dictionary<Type, object> ();
-			List<ProjectContentWrapper> referencedWrappers = new List<ProjectContentWrapper>();
-			List<UnresolvedAssemblyProxy> referencedAssemblies = new List<UnresolvedAssemblyProxy>();
-			internal IProjectContent _content;
-			internal bool referencesConnected;
-
-			/*
-			static bool GetReferencesConnected (ProjectContentWrapper pcw, HashSet<ProjectContentWrapper> wrapper)
-			{
-				if (wrapper.Contains (pcw))
-					return true;
-				wrapper.Add (pcw); 
-				return pcw.referencesConnected && pcw.referencedWrappers.All (w => GetReferencesConnected (w, wrapper));
-			}*/
-
-			public IProjectContent Content {
-				get {
-					if (!referencesConnected) {
-						EnsureReferencesAreLoaded ();
-					}
-					return _content;
-				}
-				private set {
-					if (value == null)
-						throw new InvalidOperationException ("Project content can't be null");
-					_content = value;
-				}
-			}
-
-			/// <summary>
-			/// Gets the extension objects attached to the content wrapper.
-			/// </summary>
-			public IEnumerable<object> ExtensionObjects {
-				get {
-					return extensionObjects.Values;
-				}
-			}
-
-			/// <summary>
-			/// Updates an extension object for the wrapper. Note that only one extension object of a certain
-			/// type may be stored inside the project content wrapper.
-			/// 
-			/// The extension objects need to be serializable and are stored in the project cache on project unload.
-			/// </summary>
-			public void UpdateExtensionObject (object ext)
-			{
-				if (ext == null)
-					throw new ArgumentNullException ("ext");
-				extensionObjects [ext.GetType ()] = ext;
-			}
-
-			/// <summary>
-			/// Gets a specific extension object. This may lazy load an existing extension object from disk,
-			/// if called the first time and a serialized extension object exists.
-			/// </summary>
-			/// <returns>
-			/// The extension object. Or null, if no extension object of the specified type was registered.
-			/// </returns>
-			/// <typeparam name='T'>
-			/// The type of the extension object.
-			/// </typeparam>
-			public T GetExtensionObject<T> () where T : class
-			{
-				object result;
-				if (extensionObjects.TryGetValue (typeof(T), out result))
-					return (T)result;
-
-				string cacheDir = GetCacheDirectory (Project);
-				if (cacheDir == null)
-					return default(T);
-
-				try {
-					string fileName = Path.Combine (cacheDir, typeof(T).FullName + ".cache");
-					if (File.Exists (fileName)) {
-						var deserialized = DeserializeObject<T> (fileName);
-						extensionObjects [typeof(T)] = deserialized;
-						return deserialized;
-					}
-				} catch (Exception) {
-					Console.WriteLine ("Can't deserialize :" + typeof(T).FullName);
-				}
-
-				return default (T);
-			}
-
-			List<Action<IProjectContent>> loadActions = new List<Action<IProjectContent>> ();
-
-			public void RunWhenLoaded (Action<IProjectContent> act)
-			{
-				lock (updateContentLock) {
-					var lazyProjectLoader = _content as LazyProjectLoader;
-					if (loadActions != null) {
-						lock (loadActions) {
-							if (lazyProjectLoader != null && !lazyProjectLoader.ContextTask.IsCompleted) {
-								loadActions.Add (act);
-								return;
-							}
-						}
-					}
-				}
-				act (Content);
-			}
-
-			void ClearCachedCompilations ()
-			{
-				// Need to clear this compilation & all compilations that reference this directly or indirectly
-				var stack = new Stack<ProjectContentWrapper> ();
-				stack.Push (this);
-				var cleared = new HashSet<ProjectContentWrapper> ();
-				while (stack.Count > 0) {
-					var cur = stack.Pop ();
-					if (cleared.Contains (cur))
-						continue;
-					cleared.Add (cur);
-					cur.compilation = null;
-					foreach (var project in cur.ReferencedProjects) {
-						var projectContentWrapper = GetProjectContentWrapper (project);
-						if (projectContentWrapper != null)
-							stack.Push (projectContentWrapper);
-					}
-				}
-			}
-
-			readonly object updateContentLock = new object ();
-
-			void RunLoadActions ()
-			{
-				if (loadActions == null)
-					return;
-				Action<IProjectContent>[] actions;
-				lock (loadActions) {
-					actions = loadActions.ToArray ();
-					loadActions = null;
-				}
-				foreach (var action in actions)
-					action (Content);
-			}
-
-			public void UpdateContent (Func<IProjectContent, IProjectContent> updateFunc)
-			{
-				LazyProjectLoader lazyProjectLoader;
-				lock (updateContentLock) {
-					lazyProjectLoader = _content as LazyProjectLoader;
-					if (lazyProjectLoader != null) {
-						lazyProjectLoader.ContextTask.Wait ();
-					}
-					_content = updateFunc (_content);
-					ClearCachedCompilations ();
-					WasChanged = true;
-					if (lazyProjectLoader != null && !(_content is LazyProjectLoader)) {
-						RunLoadActions ();
-					}
-				}
-			}
-
-			public void InformFileRemoved (ParsedFileEventArgs e)
-			{
-				var handler = FileRemoved;
-				if (handler != null)
-					handler (this, e);
-			}
-
-			public void InformFileAdded (ParsedFileEventArgs e)
-			{
-				var handler = FileAdded;
-				if (handler != null)
-					handler (this, e);
-			}
-
-			public EventHandler<ParsedFileEventArgs> FileAdded;
-			public EventHandler<ParsedFileEventArgs> FileRemoved;
-			public bool WasChanged;
-			[NonSerialized]
-			ICompilation compilation;
-
-			public ICompilation Compilation {
-				get {
-					lock (updateContentLock) {
-						if (compilation == null) {
-							compilation = Content.CreateCompilation ();
-						}
-						return compilation;
-					}
-				}
-			}
-
-			public Project Project {
-				get;
-				private set;
-			}
-
-			[NonSerialized]
-			int loadOperationDepth = 0;
-			[NonSerialized]
-			readonly object loadOperationLocker = new object ();
-
-			internal void BeginLoadOperation ()
-			{
-				lock (loadOperationLocker) {
-					loadOperationDepth++;
-					if (loadOperationDepth == 1)
-						UpdateLoadState ();
-				}
-			}
-
-			internal void EndLoadOperation ()
-			{
-				lock (loadOperationLocker) {
-					if (loadOperationDepth > 0) {
-						loadOperationDepth--;
-					}
-					if (loadOperationDepth == 0)
-						UpdateLoadState ();
-				}
-			}
-
-			bool isLoaded;
-			public bool IsLoaded {
-				get {
-					return isLoaded;
-				}
-			}
-
-			[NonSerialized]
-			CancellationTokenSource src;
-
-			internal void CancelLoad ()
-			{
-				if (src != null)
-					src.Cancel ();
-			}
-
-			void UpdateLoadState ()
-			{
-				bool wasLoaded = isLoaded;
-				isLoaded = loadOperationDepth == 0 && referencesConnected && !referencedAssemblies.Any (a => a.InLoad);
-				if (isLoaded && !wasLoaded)
-					OnLoad (EventArgs.Empty);
-			}
-
-			internal void RequestLoad ()
-			{
-				BeginLoadOperation ();
-				EnsureReferencesAreLoaded ();
-				CancelLoad ();
-				src = new CancellationTokenSource ();
-				var token = src.Token;
-				//Task.Factory.StartNew (delegate {
-					try {
-						foreach (var asm in referencedAssemblies.ToArray ()) {
-							if (token.IsCancellationRequested)
-								break;
-							var ctxLoader = asm.CtxLoader;
-							if (ctxLoader != null)
-								ctxLoader.EnsureAssemblyLoaded ();
-						}
-					} finally {
-						EndLoadOperation ();
-					}
-				//});
-			}
-
-			public event EventHandler Loaded;
-
-			protected virtual void OnLoad (EventArgs e)
-			{
-				var handler = Loaded;
-				if (handler != null)
-					handler (this, e);
-			}
-
-			[NonSerialized]
-			internal LazyAssemblyLoader OutputAssembly;
-
-			internal bool UpdateTrackedOutputAssembly (FilePath fileName)
-			{
-				if (File.Exists (fileName)) {
-					OutputAssembly = new LazyAssemblyLoader (fileName, null);
-					// a clean operation could remove the assembly, thefore we need to load it.
-					OutputAssembly.EnsureAssemblyLoaded ();
-					return true;
-				}
-				return false;
-			}
-
-			public ProjectContentWrapper (Project project)
-			{
-				if (project == null)
-					throw new ArgumentNullException ("project");
-				this.Project = project;
-				var lazyProjectLoader = new LazyProjectLoader (this);
-				this.Content = lazyProjectLoader;
-			}
-
-			public IEnumerable<Project> ReferencedProjects {
-				get {
-					return Project.GetReferencedItems (ConfigurationSelector.Default).OfType<DotNetProject> ();
-				}
-			}
-
-			class LazyProjectLoader : IProjectContent
-			{
-				readonly ProjectContentWrapper wrapper;
-				readonly Task<IProjectContent> contextTask;
-
-				public Task<IProjectContent> ContextTask {
-					get {
-						return contextTask;
-					}
-				}
-				object contentLock = new object ();
-				IProjectContent contentWithReferences;
-				public IProjectContent Content {
-					get {
-						lock (contentLock) {
-							if (References != null) {
-								return contentWithReferences ?? (contentWithReferences = contextTask.Result.AddAssemblyReferences (References)); 
-							}
-							return contextTask.Result;
-						}
-					}
-				}
-
-				List<IAssemblyReference> references;
-				public List<IAssemblyReference> References {
-					get {
-						return references;
-					}
-					set {
-						lock (contentLock) {
-							references = value;
-						}
-					}
-				}
-
-				public LazyProjectLoader (ProjectContentWrapper wrapper)
-				{
-					this.wrapper = wrapper;
-					contextTask = Task.Factory.StartNew (delegate {
-						try {
-							this.wrapper.BeginLoadOperation ();
-							var p = this.wrapper.Project;
-							var context = LoadProjectCache (p);
-
-							var assemblyName = p.ParentSolution != null ? p.GetOutputFileName (p.ParentSolution.DefaultConfigurationSelector).FileNameWithoutExtension : p.Name;
-							if (string.IsNullOrEmpty (assemblyName))
-								assemblyName = p.Name;
-
-							if (context != null) {
-								return context.SetAssemblyName (assemblyName) ?? context;
-							}
-
-							context = new MonoDevelopProjectContent (p);
-							context = context.SetLocation (p.FileName);
-							context = context.SetAssemblyName (assemblyName);
-
-							QueueParseJob (this.wrapper);
-							return context;
-						} finally {
-							this.wrapper.EndLoadOperation ();
-						}
-					});
-				}
-
-				static IProjectContent LoadProjectCache (Project project)
-				{
-					string cacheDir = GetCacheDirectory (project);
-					if (cacheDir == null)
-						return null;
-					
-					var cacheFile = Path.Combine (cacheDir, "completion.cache");
-					if (!File.Exists (cacheFile))
-						return null;
-					try {
-						var cache = DeserializeObject<IProjectContent> (cacheFile);
-						var monoDevelopProjectContent = cache as MonoDevelopProjectContent;
-						if (monoDevelopProjectContent != null)
-							monoDevelopProjectContent.Project = project;
-						return cache;
-					} catch (Exception e) {
-						LoggingService.LogWarning ("Error while reading completion cache, regenerating", e); 
-						Directory.Delete (cacheDir, true);
-						return null;
-					}
-				}
-
-				#region IAssemblyReference implementation
-
-				IAssembly IAssemblyReference.Resolve (ITypeResolveContext context)
-				{
-					return Content.Resolve (context);
-				}
-
-				#endregion
-
-				#region IUnresolvedAssembly implementation
-
-				string IUnresolvedAssembly.AssemblyName {
-					get {
-						return Content.AssemblyName;
-					}
-				}
-
-				string IUnresolvedAssembly.FullAssemblyName {
-					get {
-						return Content.FullAssemblyName;
-					}
-				}
-
-				string IUnresolvedAssembly.Location {
-					get {
-						return Content.Location;
-					}
-				}
-
-				IEnumerable<IUnresolvedAttribute> IUnresolvedAssembly.AssemblyAttributes {
-					get {
-						return Content.AssemblyAttributes;
-					}
-				}
-
-				IEnumerable<IUnresolvedAttribute> IUnresolvedAssembly.ModuleAttributes {
-					get {
-						return Content.ModuleAttributes;
-					}
-				}
-
-				IEnumerable<IUnresolvedTypeDefinition> IUnresolvedAssembly.TopLevelTypeDefinitions {
-					get {
-						return Content.TopLevelTypeDefinitions;
-					}
-				}
-
-				#endregion
-
-				#region IProjectContent implementation
-
-				string IProjectContent.ProjectFileName { get { return Content.ProjectFileName; } }
-
-				IUnresolvedFile IProjectContent.GetFile (string fileName)
-				{
-					return Content.GetFile (fileName);
-				}
-
-				ICompilation IProjectContent.CreateCompilation ()
-				{
-					return Content.CreateCompilation ();
-				}
-
-				public ICompilation CreateCompilation (ISolutionSnapshot solutionSnapshot)
-				{
-					return Content.CreateCompilation (solutionSnapshot);
-				}
-
-				IProjectContent IProjectContent.SetAssemblyName (string newAssemblyName)
-				{
-					return Content.SetAssemblyName (newAssemblyName);
-				}
-
-				IProjectContent IProjectContent.SetLocation (string newLocation)
-				{
-					return Content.SetLocation (newLocation);
-				}
-
-				IProjectContent IProjectContent.AddAssemblyReferences (IEnumerable<IAssemblyReference> references)
-				{
-					return Content.AddAssemblyReferences (references);
-				}
-
-				IProjectContent IProjectContent.AddAssemblyReferences (params IAssemblyReference[] references)
-				{
-					return Content.AddAssemblyReferences (references);
-				}
-
-				IProjectContent IProjectContent.RemoveAssemblyReferences (IEnumerable<IAssemblyReference> references)
-				{
-					return Content.RemoveAssemblyReferences (references);
-				}
-
-				IProjectContent IProjectContent.RemoveAssemblyReferences (params IAssemblyReference[] references)
-				{
-					return Content.RemoveAssemblyReferences (references);
-				}
-				#pragma warning disable 618
-				IProjectContent IProjectContent.UpdateProjectContent (IUnresolvedFile oldFile, IUnresolvedFile newFile)
-				{
-					return Content.UpdateProjectContent (oldFile, newFile);
-				}
-
-				public IProjectContent UpdateProjectContent (IEnumerable<IUnresolvedFile> oldFiles, IEnumerable<IUnresolvedFile> newFiles)
-				{
-					return Content.UpdateProjectContent (oldFiles, newFiles);
-				}
-				#pragma warning restore 618
-
-				public IProjectContent AddOrUpdateFiles (IEnumerable<IUnresolvedFile> newFiles)
-				{
-					return Content.AddOrUpdateFiles (newFiles);
-				}
-
-				public IProjectContent AddOrUpdateFiles (params IUnresolvedFile[] newFiles)
-				{
-					return Content.AddOrUpdateFiles (newFiles);
-				}
-
-				IEnumerable<IUnresolvedFile> IProjectContent.Files {
-					get {
-						return Content.Files;
-					}
-				}
-
-				IEnumerable<IAssemblyReference> IProjectContent.AssemblyReferences {
-					get {
-						return Content.AssemblyReferences;
-					}
-				}
-
-				IProjectContent IProjectContent.SetProjectFileName (string newProjectFileName)
-				{
-					return Content.SetProjectFileName (newProjectFileName);
-				}
-
-				IProjectContent IProjectContent.RemoveFiles (IEnumerable<string> fileNames)
-				{
-					return Content.RemoveFiles (fileNames);
-				}
-
-				IProjectContent IProjectContent.RemoveFiles (params string[] fileNames)
-				{
-					return Content.RemoveFiles (fileNames);
-				}
-
-				#endregion
-
-				object compilerSettings;
-
-				public IProjectContent SetCompilerSettings (object compilerSettings)
-				{
-					this.compilerSettings = compilerSettings;
-					return this;
-				}
-
-				public object CompilerSettings {
-					get {
-						return compilerSettings;
-					}
-				}
-			}
-
-			bool HasCyclicRefs (ProjectContentWrapper wrapper, HashSet<Project> nonCyclicCache)
-			{
-				if (nonCyclicCache.Contains (wrapper.Project))
-					return false;
-				nonCyclicCache.Add (wrapper.Project);
-				foreach (var referencedProject in wrapper.ReferencedProjects) {
-					ProjectContentWrapper w;
-					if (referencedProject == Project || referencedProject == wrapper.Project || projectContents.TryGetValue (referencedProject, out w) && HasCyclicRefs (w, nonCyclicCache)) {
-						return true;
-					}
-				}
-				return false;
-			}
-
-			List<UnresolvedAssemblyProxy> LoadReferencedAssemblies (DotNetProject netProject)
-			{
-				var newReferencedAssemblies = new List<UnresolvedAssemblyProxy> ();
-				try {
-					foreach (string file in netProject.GetReferencedAssemblies (IdeApp.IsInitialized ? IdeApp.Workspace.ActiveConfiguration : ConfigurationSelector.Default, false)) {
-						string fileName;
-						if (!Path.IsPathRooted (file)) {
-							fileName = Path.Combine (Path.GetDirectoryName (netProject.FileName), file);
-						}
-						else {
-							fileName = Path.GetFullPath (file);
-						}
-						var ctx = LoadAssemblyContext (fileName);
-						if (ctx != null) {
-							newReferencedAssemblies.Add (ctx);
-							ctx.Loaded += HandleReferencedProjectInLoadChange;
-						}
-						else {
-							LoggingService.LogWarning ("TypeSystemService: Can't load assembly context for:" + file);
-						}
-					}
-				}
-				catch (Exception e) {
-					LoggingService.LogError ("Error while getting assembly references", e);
-				}
-				return newReferencedAssemblies;
-			}
-
-			public void EnsureReferencesAreLoaded ()
-			{
-				lock (projectContentLock) {
-					if (referencesConnected)
-						return;
-					compilation = null;
-					referencesConnected = true;
-					var netProject = Project as DotNetProject;
-					if (netProject == null)
-						return;
-					try {
-						var contexts = new List<IAssemblyReference> ();
-						var nonCyclicCache = new HashSet<Project> ();
-						foreach (var referencedWrapper in referencedWrappers) {
-							referencedWrapper.Loaded -= HandleReferencedProjectInLoadChange;
-						}
-						var newReferencedWrappers = new List<ProjectContentWrapper> ();
-						foreach (var referencedProject in ReferencedProjects) {
-							ProjectContentWrapper wrapper;
-							if (projectContents.TryGetValue (referencedProject, out wrapper)) {
-								if (HasCyclicRefs (wrapper, nonCyclicCache))
-									continue;
-								wrapper.Loaded += HandleReferencedProjectInLoadChange;
-								newReferencedWrappers.Add (wrapper);
-								contexts.Add (new UnresolvedAssemblyDecorator (wrapper));
-							}
-						}
-						this.referencedWrappers = newReferencedWrappers;
-						UnresolvedAssemblyProxy ctx;
-						// Add mscorlib reference
-						var config = IdeApp.Workspace != null ? netProject.GetConfiguration (IdeApp.Workspace.ActiveConfiguration) as DotNetProjectConfiguration : null;
-						bool noStdLib = false;
-						if (config != null) {
-							var parameters = config.CompilationParameters as DotNetCompilerParameters;
-							if (parameters != null) {
-								noStdLib = parameters.NoStdLib;
-							}
-						}
-						if (!noStdLib && netProject.TargetRuntime != null && netProject.TargetRuntime.AssemblyContext != null) {
-							var corLibRef = netProject.TargetRuntime.AssemblyContext.GetAssemblyForVersion (typeof(object).Assembly.FullName, null, netProject.TargetFramework);
-							if (corLibRef != null) {
-								ctx = LoadAssemblyContext (corLibRef.Location);
-								if (ctx != null)
-									contexts.Add (ctx);
-							}
-						}
-						// Get the assembly references throught the project, since it may have custom references
-						foreach (var asm in referencedAssemblies) {
-							asm.Loaded += HandleReferencedProjectInLoadChange;
-						}
-						var newReferencedAssemblies = LoadReferencedAssemblies (netProject);
-						contexts.AddRange (newReferencedAssemblies);
-						referencedAssemblies = newReferencedAssemblies;
-						bool changed = WasChanged;
-						var lazyProjectLoader = Content as LazyProjectLoader;
-						if (lazyProjectLoader != null) {
-							lazyProjectLoader.References = contexts;
-						}
-						else {
-							UpdateContent (c => c.RemoveAssemblyReferences (Content.AssemblyReferences).AddAssemblyReferences (contexts));
-						}
-						WasChanged = changed;
-					} catch (Exception e) {
-						if (netProject.TargetRuntime == null) {
-							LoggingService.LogError ("Target runtime was null: " + Project.Name);
-						} else if (netProject.TargetRuntime.AssemblyContext == null) {
-							LoggingService.LogError ("Target runtime assembly context was null: " + Project.Name);
-						}
-						LoggingService.LogError ("Error while reloading all references of project: " + Project.Name, e);
-					} finally {
-						UpdateLoadState ();
-					}
-				}
-			}
-			static readonly object reconnectLock = new object();
-			public void ReconnectAssemblyReferences ()
-			{
-				var netProject = Project as DotNetProject;
-				if (netProject == null)
-					return;
-				lock (reconnectLock) {
-					CancelLoad ();
-					this.referencesConnected = false;
-					RequestLoad ();
-				}
-			}
-
-			void HandleReferencedProjectInLoadChange (object sender, EventArgs e)
-			{
-				UpdateLoadState ();
-			}
-
-			internal void Unload ()
-			{
-				CancelLoad ();
-				foreach (var asm in referencedAssemblies) {
-					asm.Loaded -= HandleReferencedProjectInLoadChange;
-				}
-				foreach (var wrapper in referencedWrappers) {
-					wrapper.Loaded -= HandleReferencedProjectInLoadChange;
-				}
-				loadActions = null;
-				foreach (var wrapper in referencedWrappers) {
-					wrapper.Loaded -= HandleReferencedProjectInLoadChange;
-				}
-				referencedWrappers.Clear ();
-				referencedAssemblies.Clear ();
-				Loaded = null;
-				Content = new CSharpProjectContent ();
-			}
-		}
-
-		static readonly object projectContentLock = new object ();
-		static readonly Dictionary<Project, ProjectContentWrapper> projectContents = new Dictionary<Project, ProjectContentWrapper> ();
-
-		public static ProjectContentWrapper LoadProject (Project project)
+	
+		internal static Microsoft.CodeAnalysis.Document GetCodeAnalysisDocument (Microsoft.CodeAnalysis.DocumentId analysisDocument, CancellationToken cancellationToken = default (CancellationToken))
 		{
-			if (IncLoadCount (project) != 1)
-				return null;
-			lock (projectContentLock) {
-				if (projectContents.ContainsKey (project))
-					return null;
-				try {
-					Counters.ParserService.ProjectsLoaded++;
-					ProjectContentWrapper wrapper;
-					projectContents [project] = wrapper = new ProjectContentWrapper (project);
-					var dotNetProject = project as DotNetProject;
-					if (dotNetProject != null)
-						CheckProjectOutput (dotNetProject, false);
-
-					project.FileAddedToProject += OnFileAdded;
-					project.FileRemovedFromProject += OnFileRemoved;
-					project.FileRenamedInProject += OnFileRenamed;
-					project.Modified += OnProjectModified;
-
-					if (dotNetProject != null) {
-						StartFrameworkLookup (dotNetProject);
-					}
-					return wrapper;
-				} catch (Exception ex) {
-					LoggingService.LogError ("Parser database for project '" + project.Name + " could not be loaded", ex);
-				}
-				return null;
+			foreach (var w in Workspaces) {
+				var doc = w.GetDocument (analysisDocument, cancellationToken);
+				if (doc != null)
+					return doc;
 			}
-		}
-
-		public static Project GetProject (IEntity entity)
-		{
-			if (entity == null)
-				throw new ArgumentNullException ("entity");
-			return GetProject (entity.ParentAssembly.UnresolvedAssembly.Location);
-		}
-
-		public static Project GetProject (string location)
-		{
-			foreach (var wrapper in projectContents)
-				if (wrapper.Value.Compilation.MainAssembly.UnresolvedAssembly.Location == location)
-					return wrapper.Key;
 			return null;
 		}
 
-		#region Project modification handlers
-
-		static void OnFileAdded (object sender, ProjectFileEventArgs args)
-		{
-			var project = (Project)sender;
-			foreach (ProjectFileEventInfo fargs in args) {
-				QueueParseJob (projectContents [project], new [] { fargs.ProjectFile });
-			}
-		}
-
-		static void OnFileRemoved (object sender, ProjectFileEventArgs args)
-		{
-			var project = (Project)sender;
-			foreach (ProjectFileEventInfo fargs in args) {
-				var wrapper = projectContents [project];
-				var fileName = fargs.ProjectFile.Name;
-				var file = wrapper._content.GetFile (fileName);
-				if (file == null)
-					continue;
-				wrapper.UpdateContent (c => c.RemoveFiles (fileName));
-				wrapper.InformFileRemoved (new ParsedFileEventArgs (file));
-
-				var tags = wrapper.GetExtensionObject <ProjectCommentTags> ();
-				if (tags != null)
-					tags.RemoveFile (wrapper.Project, fileName);
-			}
-		}
-
-		static void OnFileRenamed (object sender, ProjectFileRenamedEventArgs args)
-		{
-			var project = (Project)sender;
-			foreach (ProjectFileRenamedEventInfo fargs in args) {
-				var content = projectContents [project];
-				var file = content._content.GetFile (fargs.OldName);
-				if (file == null)
-					continue;
-				content.UpdateContent (c => c.RemoveFiles (fargs.OldName));
-				content.InformFileRemoved (new ParsedFileEventArgs (file));
-
-				var tags = content.GetExtensionObject <ProjectCommentTags> ();
-				if (tags != null)
-					tags.RemoveFile (project, fargs.OldName);
-
-				QueueParseJob (content, new [] { fargs.ProjectFile });
-			}
-		}
-
-		static void OnProjectModified (object sender, SolutionItemModifiedEventArgs args)
+		internal static void InformDocumentClose (Microsoft.CodeAnalysis.DocumentId analysisDocument, FilePath fileName)
 		{
-			if (!args.Any (x => x.Hint == "TargetFramework" || x.Hint == "References"))
-				return;
-			var project = (Project)sender;
-			
-			ProjectContentWrapper wrapper;
-			projectContents.TryGetValue (project, out wrapper);
-			if (wrapper == null)
-				return;
-			wrapper.ReconnectAssemblyReferences ();
-		}
-
-		#endregion
-
-		internal static void Unload (WorkspaceItem item)
-		{
-			var ws = item as Workspace;
-			TrackFileChanges = false;
-			loadCancellationSource.Cancel ();
-			if (ws != null) {
-				foreach (WorkspaceItem it in ws.Items)
-					Unload (it);
-				ws.ItemAdded -= OnWorkspaceItemAdded;
-				ws.ItemRemoved -= OnWorkspaceItemRemoved;
-				projectContents.Clear ();
-				loadWs = false;
-			} else {
-				var solution = item as Solution;
-				if (solution != null) {
-					foreach (var project in solution.GetAllProjects ()) {
-						UnloadProject (project);
-					}
-					solution.SolutionItemAdded -= OnSolutionItemAdded;
-					solution.SolutionItemRemoved -= OnSolutionItemRemoved;
-				}
-			}
+			foreach (var w in Workspaces) {
+				if (w.GetOpenDocumentIds ().Contains (analysisDocument) )
+					w.InformDocumentClose (analysisDocument, fileName); 
 
-			cachedAssemblyContents.Clear ();
-			lock (parseQueueLock) {
-				parseQueueIndex.Clear ();
-				parseQueue.Clear ();
 			}
-			TrackFileChanges = true;
 		}
 
-		internal static void UnloadProject (Project project, bool skipProjectSerialization = false)
+		internal static void InformDocumentOpen (Microsoft.CodeAnalysis.DocumentId analysisDocument, TextEditor editor)
 		{
-			if (DecLoadCount (project) != 0)
-				return;
-			Counters.ParserService.ProjectsLoaded--;
-			project.FileAddedToProject -= OnFileAdded;
-			project.FileRemovedFromProject -= OnFileRemoved;
-			project.FileRenamedInProject -= OnFileRenamed;
-			project.Modified -= OnProjectModified;
-				
-			ProjectContentWrapper wrapper;
-			lock (projectWrapperUpdateLock) {
-				if (!projectContents.TryGetValue (project, out wrapper))
+			foreach (var w in Workspaces) {
+				if (w.Contains (analysisDocument.ProjectId)) {
+					w.InformDocumentOpen (analysisDocument, editor); 
 					return;
-				projectContents.Remove (project);
-			}
-			if (!skipProjectSerialization)
-				StoreProjectCache (project, wrapper);
-			OnProjectUnloaded (new ProjectUnloadEventArgs (project, wrapper));
-			wrapper.Unload ();
-		}
-
-		public static event EventHandler<ProjectUnloadEventArgs> ProjectUnloaded;
-
-		static void OnProjectUnloaded (ProjectUnloadEventArgs e)
-		{
-			var handler = ProjectUnloaded;
-			if (handler != null)
-				handler (null, e);
-		}
-
-		static void OnWorkspaceItemAdded (object s, WorkspaceItemEventArgs args)
-		{
-			Load (args.Item);
-		}
-
-		static void OnWorkspaceItemRemoved (object s, WorkspaceItemEventArgs args)
-		{
-			Unload (args.Item);
-		}
-
-		static void OnSolutionItemAdded (object sender, SolutionItemChangeEventArgs args)
-		{
-			var project = args.SolutionItem as Project;
-			if (project != null) {
-				var wrapper = LoadProject (project);
-				if (wrapper != null) {
-					var files = wrapper.Project.Files.ToArray ();
-					Task.Run (delegate {
-						CheckModifiedFiles (wrapper.Project, files, wrapper);
-						wrapper.RequestLoad ();
-					});
 				}
 			}
-		}
-
-		static void OnSolutionItemRemoved (object sender, SolutionItemChangeEventArgs args)
-		{
-			var project = args.SolutionItem as Project;
-			if (project != null)
-				UnloadProject (project);
-		}
-
-		#endregion
-
-		#region Reference Counting
-
-		static readonly Dictionary<Project,int> loadCount = new Dictionary<Project,int> ();
-		static readonly object rwLock = new object ();
-
-		static int DecLoadCount (Project ob)
-		{
-			lock (rwLock) {
-				int c;
-				if (loadCount.TryGetValue (ob, out c)) {
-					c--;
-					if (c == 0)
-						loadCount.Remove (ob);
-					else
-						loadCount [ob] = c;
-					return c;
-				}
-				LoggingService.LogError ("DecLoadCount: Object not registered.");
-				return 0;
-			}
-		}
-
-		static int IncLoadCount (Project ob)
-		{
-			lock (rwLock) {
-				int c;
-				if (loadCount.TryGetValue (ob, out c)) {
-					c++;
-					loadCount [ob] = c;
-					return c;
-				}
-				loadCount [ob] = 1;
-				return 1;
-			}
-		}
-
-		#endregion
-
-		static bool GetXml (string baseName, TargetRuntime runtime, out FilePath xmlFileName)
-		{
-			try {
-				xmlFileName = LookupLocalizedXmlDoc (baseName);
-				if (!xmlFileName.IsNull)
-					return true;
-			} catch (Exception e) {
-				LoggingService.LogError ("Error while looking up XML docs.", e);
-			}
-			
-			if (MonoDevelop.Core.Platform.IsWindows) {
-				string windowsFileName = FindWindowsXmlDocumentation (baseName, runtime);
-				if (File.Exists (windowsFileName)) {
-					xmlFileName = windowsFileName;
-					return true;
-				}
-			}
-			
-			xmlFileName = "";
-			return false;
-		}
-
-		#region Lookup XML documentation
-
-		// ProgramFilesX86 is broken on 32-bit WinXP, this is a workaround
-		static string GetProgramFilesX86 ()
-		{
-			return Environment.GetFolderPath (IntPtr.Size == 8 ?
-				Environment.SpecialFolder.ProgramFilesX86 : Environment.SpecialFolder.ProgramFiles);
-		}
-
-		static readonly string referenceAssembliesPath = Path.Combine (GetProgramFilesX86 (), @"Reference Assemblies\Microsoft\\Framework");
-		static readonly string frameworkPath = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Windows), @"Microsoft.NET\Framework");
-
-		static string FindWindowsXmlDocumentation (string assemblyFileName, TargetRuntime runtime)
-		{
-			string fileName;
-			ClrVersion version = runtime != null && runtime.CustomFrameworks.Any () ? runtime.CustomFrameworks.First ().ClrVersion : ClrVersion.Default;
-			switch (version) {
-//			case "1.0":
-//				fileName = LookupLocalizedXmlDoc (Path.Combine (frameworkPath, "v1.0.3705", assemblyFileName));
-//				break;
-			case ClrVersion.Net_1_1:
-				fileName = LookupLocalizedXmlDoc (Path.Combine (frameworkPath, "v1.1.4322", assemblyFileName));
-				break;
-			case ClrVersion.Net_2_0:
-			case ClrVersion.Clr_2_1:
-				fileName = LookupLocalizedXmlDoc (Path.Combine (frameworkPath, "v2.0.50727", assemblyFileName))
-				?? LookupLocalizedXmlDoc (Path.Combine (referenceAssembliesPath, "v3.5"))
-				?? LookupLocalizedXmlDoc (Path.Combine (referenceAssembliesPath, "v3.0"))
-				?? LookupLocalizedXmlDoc (Path.Combine (referenceAssembliesPath, @".NETFramework\v3.5\Profile\Client"));
-				break;
-			default:
-				fileName = LookupLocalizedXmlDoc (Path.Combine (referenceAssembliesPath, @".NETFramework\v4.0", assemblyFileName))
-				?? LookupLocalizedXmlDoc (Path.Combine (frameworkPath, "v4.0.30319", assemblyFileName));
-				break;
-			}
-			return fileName;
-		}
-
-		static string LookupLocalizedXmlDoc (string fileName)
-		{
-			return XmlDocumentationProvider.LookupLocalizedXmlDoc (fileName);
-		}
-
-		#endregion
-
-		class UnresolvedAssemblyProxy : IUnresolvedAssembly
-		{
-			public readonly string FileName;
-			internal LazyAssemblyLoader CtxLoader;
-
-			public IUnresolvedAssembly Ctx {
-				get {
-					return CtxLoader;
-				}
-			}
-
-			public bool InLoad {
-				get {
-					return CtxLoader == null || CtxLoader.InLoad;
-				}
-			}
-
-			public event EventHandler Loaded {
-				add {
-					var ctxLoader = CtxLoader;
-					if (ctxLoader != null)
-						ctxLoader.Loaded += value;
-				}
-				remove { 
-					var ctxLoader = CtxLoader;
-					if (ctxLoader != null)
-						ctxLoader.Loaded -= value;
-				}
-			}
-
-			public UnresolvedAssemblyProxy (string fileName)
-			{
-				if (fileName == null)
-					throw new ArgumentNullException ("fileName");
-				this.FileName = fileName;
-			}
-
-			#region IUnresolvedAssembly implementation
-
-			string IUnresolvedAssembly.AssemblyName {
-				get {
-					return Ctx.AssemblyName;
-				}
-			}
-
-			string IUnresolvedAssembly.FullAssemblyName {
-				get {
-					return Ctx.FullAssemblyName;
-				}
-			}
-
-			string IUnresolvedAssembly.Location {
-				get {
-					return Ctx.Location;
-				}
-			}
-
-			IEnumerable<IUnresolvedAttribute> IUnresolvedAssembly.AssemblyAttributes {
-				get {
-					return Ctx.AssemblyAttributes;
-				}
-			}
-
-			IEnumerable<IUnresolvedAttribute> IUnresolvedAssembly.ModuleAttributes {
-				get {
-					return Ctx.ModuleAttributes;
-				}
-			}
-
-			IEnumerable<IUnresolvedTypeDefinition> IUnresolvedAssembly.TopLevelTypeDefinitions {
-				get {
-					return Ctx.TopLevelTypeDefinitions;
-				}
-			}
-
-			#endregion
-
-			#region IAssemblyReference implementation
-
-			IAssembly IAssemblyReference.Resolve (ITypeResolveContext context)
-			{
-				var ctx = Ctx;
-				if (ctx == null)
-					return null;
-				return ctx.Resolve (context);
-			}
-
-			#endregion
-
-			public override string ToString ()
-			{
-				return string.Format ("[UnresolvedAssemblyProxy: FileName={0}]", FileName);
-			}
-		}
-
-		internal class LazyAssemblyLoader : IUnresolvedAssembly
-		{
-			class LazyAssembly : IAssembly
-			{
-				readonly LazyAssemblyLoader loader;
-				readonly ITypeResolveContext context;
-				IAssembly assembly;
-
-				IAssembly Assembly {
-					get {
-						lock (loader) {
-							if (assembly == null) {
-								loader.EnsureAssemblyLoaded ();
-								assembly = loader.assembly.Resolve (context);
-							}
-							return assembly;
-						}
-					}
-				}
-
-
-				public LazyAssembly (LazyAssemblyLoader loader, ITypeResolveContext context)
-				{
-					this.loader = loader;
-					this.context = context;
-				}
-
-				#region IAssembly implementation
-
-				bool IAssembly.InternalsVisibleTo (IAssembly assembly)
-				{
-					return Assembly.InternalsVisibleTo (assembly);
-				}
-
-				ITypeDefinition IAssembly.GetTypeDefinition (TopLevelTypeName typeName)
-				{
-					return Assembly.GetTypeDefinition (typeName);
-				}
-
-				IUnresolvedAssembly IAssembly.UnresolvedAssembly {
-					get {
-						return Assembly.UnresolvedAssembly;
-					}
-				}
-
-				bool IAssembly.IsMainAssembly {
-					get {
-						return Assembly.IsMainAssembly;
-					}
-				}
-
-				string IAssembly.AssemblyName {
-					get {
-						return Assembly.AssemblyName;
-					}
-				}
-
-				string IAssembly.FullAssemblyName {
-					get {
-						return Assembly.FullAssemblyName;
-					}
-				}
-
-				IList<IAttribute> IAssembly.AssemblyAttributes {
-					get {
-						return Assembly.AssemblyAttributes;
-					}
-				}
-
-				IList<IAttribute> IAssembly.ModuleAttributes {
-					get {
-						return Assembly.ModuleAttributes;
-					}
-				}
-
-				INamespace IAssembly.RootNamespace {
-					get {
-						return Assembly.RootNamespace;
-					}
-				}
-
-				IEnumerable<ITypeDefinition> IAssembly.TopLevelTypeDefinitions {
-					get {
-						return Assembly.TopLevelTypeDefinitions;
-					}
-				}
-
-				#endregion
-
-				#region ICompilationProvider implementation
-
-				ICompilation ICompilationProvider.Compilation {
-					get {
-						return Assembly.Compilation;
-					}
-				}
-
-				#endregion
-
-			}
-
-			#region IAssemblyReference implementation
-
-			IAssembly IAssemblyReference.Resolve (ITypeResolveContext context)
-			{
-				if (assembly != null)
-					return assembly.Resolve (context);
-				return new LazyAssembly (this, context);
-			}
-
-			#endregion
-
-			#region IUnresolvedAssembly implementation
-
-			readonly object assemblyLock = new object ();
-
-			string IUnresolvedAssembly.AssemblyName {
-				get {
-					lock (assemblyLock) {
-						EnsureAssemblyLoaded ();
-						return assembly.AssemblyName;
-					}
-				}
-			}
-
-			string IUnresolvedAssembly.FullAssemblyName {
-				get {
-					lock (assemblyLock) {
-						EnsureAssemblyLoaded ();
-						return assembly.FullAssemblyName;
-					}
-				}
-			}
-
-			string IUnresolvedAssembly.Location {
-				get {
-					lock (assemblyLock) {
-						EnsureAssemblyLoaded ();
-						return assembly.Location;
-					}
-				}
-			}
-
-			IEnumerable<IUnresolvedAttribute> IUnresolvedAssembly.AssemblyAttributes {
-				get {
-					lock (assemblyLock) {
-						EnsureAssemblyLoaded ();
-						return assembly.AssemblyAttributes;
-					}
-				}
-			}
-
-			IEnumerable<IUnresolvedAttribute> IUnresolvedAssembly.ModuleAttributes {
-				get {
-					lock (assemblyLock) {
-						EnsureAssemblyLoaded ();
-						return assembly.ModuleAttributes;
-					}
-				}
-			}
-
-			IEnumerable<IUnresolvedTypeDefinition> IUnresolvedAssembly.TopLevelTypeDefinitions {
-				get {
-					lock (assemblyLock) {
-						EnsureAssemblyLoaded ();
-						return assembly.TopLevelTypeDefinitions;
-					}
-				}
-			}
-
-			#endregion
-
-			readonly string fileName;
-			readonly string cache;
-			IUnresolvedAssembly assembly;
-
-			readonly object asmLocker = new object ();
-			internal void EnsureAssemblyLoaded ()
-			{
-				lock (asmLocker) {
-					if (assembly != null)
-						return;
-					var loadedAssembly = LoadAssembly ();
-					if (loadedAssembly == null) {
-						LoggingService.LogWarning ("Assembly " + fileName + " could not be loaded cleanly.");
-						assembly = new DefaultUnresolvedAssembly (fileName);
-					} else {
-						assembly = loadedAssembly;
-					}
-
-					OnLoad (EventArgs.Empty);
-				}
-			}
-
-			public override string ToString ()
-			{
-				return string.Format ("[LazyAssemblyLoader: fileName={0}, assembly={1}]", fileName, assembly);
-			}
-			
-			public bool InLoad {
-				get {
-					return assembly == null;
-				}
-			}
-
-			public event EventHandler Loaded;
-
-			protected virtual void OnLoad (EventArgs e)
-			{
-				var handler = Loaded;
-				if (handler != null)
-					handler (this, e);
-			}
-
-			public LazyAssemblyLoader (string fileName, string cache)
-			{
-				this.fileName = fileName;
-				this.cache = cache;
-			}
-
-
-			IUnresolvedAssembly LoadAssembly ()
-			{
-				var assemblyPath = cache != null ? Path.Combine (cache, "assembly.data") : null;
-				var assemblyTag = cache != null ? Path.Combine (cache, "assembly.tag") : null;
-				try {
-					if (assemblyPath != null && assemblyTag != null && File.Exists (assemblyPath) && File.Exists (assemblyTag)) {
-						var deserializedAssembly = DeserializeObject <IUnresolvedAssembly> (assemblyPath);
-						if (deserializedAssembly != null) {
-							return deserializedAssembly;
-						}
-					}
-				} catch (Exception) {
-				}
-				IUnresolvedAssembly result;
-				try {
-					var loader = new IkvmLoader ();
-					loader.IncludeInternalMembers = true;
-					loader.DocumentationProvider = new CombinedDocumentationProvider (fileName);
-					result = loader.LoadAssemblyFile (fileName);
-				} catch (Exception e) {
-					LoggingService.LogError ("Can't convert assembly: " + fileName, e);
-					return null;
-				}
-
-				if (cache != null) {
-					var writeTime = File.GetLastWriteTimeUtc (fileName);
-					SerializeObject (assemblyPath, result);
-					SerializeObject (assemblyTag, new AssemblyTag (writeTime));
-				}
-				return result;
-			}
-		}
-
-		[Serializable]
-		class CombinedDocumentationProvider : IDocumentationProvider
-		{
-			readonly string fileName;
-			[NonSerialized]
-			IDocumentationProvider baseProvider;
-
-			public IDocumentationProvider BaseProvider {
-				get {
-					if (baseProvider == null) {
-						FilePath xmlDocFile;
-						if (GetXml (fileName, null, out xmlDocFile)) {
-							try {
-								baseProvider = new XmlDocumentationProvider (xmlDocFile);
-							} catch (Exception ex) {
-								LoggingService.LogWarning ("Ignoring error while reading xml doc from " + xmlDocFile, ex);
-							} 
-						}
-						if (baseProvider == null)
-							baseProvider = new MonoDocDocumentationProvider ();
-					}
-					return baseProvider;
-				}
-			}
-
-			public CombinedDocumentationProvider (string fileName)
-			{
-				this.fileName = fileName;
-			}
-
-			#region IDocumentationProvider implementation
-
-			public DocumentationComment GetDocumentation (IEntity entity)
-			{
-				var provider = BaseProvider;
-				return provider != null ? provider.GetDocumentation (entity) : null;
-			}
-
-			#endregion
-
-		}
-
-		static readonly object assemblyContextLock = new object ();
-
-		static UnresolvedAssemblyProxy LoadAssemblyContext (FilePath fileName)
-		{
-			CanonicalizePath (ref fileName);
-
-			UnresolvedAssemblyProxy loadedContext;
-			if (cachedAssemblyContents.TryGetValue (fileName, out loadedContext)) {
-				return loadedContext;
-			}
-			if (!File.Exists (fileName))
-				return null;
-			lock (assemblyContextLock) {
-				if (cachedAssemblyContents.TryGetValue (fileName, out loadedContext)) {
-					CheckModifiedFile (loadedContext);
-					return loadedContext;
-				}
-
-				string cache = GetCacheDirectory (fileName, true);
-
-				try {
-					var result = new UnresolvedAssemblyProxy (fileName);
-					result.CtxLoader = new LazyAssemblyLoader (fileName, cache);
-					CheckModifiedFile (result);
-					var newcachedAssemblyContents = new Dictionary<string, UnresolvedAssemblyProxy> (cachedAssemblyContents);
-					newcachedAssemblyContents [fileName] = result;
-					cachedAssemblyContents = newcachedAssemblyContents;
-					OnAssemblyLoaded (new AssemblyLoadedEventArgs (result.CtxLoader));
-					return result;
-				} catch (Exception ex) {
-					LoggingService.LogError ("Error loading assembly " + fileName, ex);
-					return null;
-				}
+			if (!gotDocumentRequestError) {
+				gotDocumentRequestError = true;
+				LoggingService.LogWarning ("Can't open requested document : " + analysisDocument + ":" + editor.FileName);
 			}
 		}
 
-		internal static event EventHandler<AssemblyLoadedEventArgs> AssemblyLoaded;
-
-		static  void OnAssemblyLoaded (AssemblyLoadedEventArgs e)
-		{
-			var handler = AssemblyLoaded;
-			if (handler != null)
-				handler (null, e);
-		}
-
-		public static IUnresolvedAssembly LoadAssemblyContext (TargetRuntime runtime, TargetFramework fx, string fileName)
+		internal static void InformDocumentOpen (Microsoft.CodeAnalysis.Workspace ws, Microsoft.CodeAnalysis.DocumentId analysisDocument, TextEditor editor)
 		{
-			if (File.Exists (fileName))
-				return LoadAssemblyContext (fileName);
-			var corLibRef = runtime.AssemblyContext.GetAssemblyForVersion (fileName, null, fx);
-			return corLibRef == null ? null : LoadAssemblyContext (corLibRef.Location);
+			((MonoDevelopWorkspace)ws).InformDocumentOpen (analysisDocument, editor); 
 		}
 
-		public static IProjectContent GetProjectContext (Project project)
-		{
-			if (project == null)
-				throw new ArgumentNullException ("project");
-			var content = GetProjectContentWrapper (project);
-			if (content == null)
-				return null;
-			return content.Content;
-		}
+		static bool gotDocumentRequestError = false;
 
-		public static ICompilation GetCompilation (Project project)
+		public static Microsoft.CodeAnalysis.ProjectId GetProjectId (MonoDevelop.Projects.Project project)
 		{
 			if (project == null)
 				throw new ArgumentNullException ("project");
-			var content = GetProjectContentWrapper (project);
-			if (content == null)
-				return null;
-			return content.Compilation;
-		}
-
-		public static ICompilation GetCompilation (SystemAssembly assembly, ICompilation compilation)
-		{
-			var ctx = LoadAssemblyContext (assembly.Location);
-			var list = compilation.ReferencedAssemblies.Select (r => r.UnresolvedAssembly).ToList ();
-			list.Add (compilation.MainAssembly.UnresolvedAssembly);
-			var	result = new SimpleCompilation (ctx, list);
-			return result;
-		}
-
-		static IEnumerable<SystemAssembly> GetFrameworkAssemblies (DotNetProject netProject)
-		{
-			var assemblies = new Dictionary<string, SystemAssembly> ();
-			foreach (var assembly in netProject.AssemblyContext.GetAssemblies ()) {
-				SystemAssembly existing;
-				if (assemblies.TryGetValue (assembly.Name, out existing)) {
-					Version v1, v2;
-					if (!Version.TryParse (existing.Version, out v1))
-						continue;
-					if (!Version.TryParse (assembly.Version, out v2))
-						continue;
-					if (v1 > v2)
-						continue;
+			foreach (var w in Workspaces) {
+				var projectId = w.GetProjectId (project);
+				if (projectId != null) {
+					return projectId;
 				}
-				assemblies [assembly.Name] = assembly;
-			}
-			return assemblies.Values;
-		}
-
-		class FrameworkTask
-		{
-			public int RetryCount { get; set; }
-
-			public Task<FrameworkLookup> Task { get; set; }
-		}
-
-		readonly static Dictionary<string, FrameworkTask> frameworkLookup = new Dictionary<string, FrameworkTask> ();
-
-		static void StartFrameworkLookup (DotNetProject netProject)
-		{
-			if (netProject == null)
-				throw new ArgumentNullException ("netProject");
-			lock (frameworkLookup) {
-				FrameworkTask result;
-				if (netProject.TargetFramework == null)
-					return;
-				var frameworkName = netProject.TargetFramework.Name;
-				if (!frameworkLookup.TryGetValue (frameworkName, out result))
-					frameworkLookup [frameworkName] = result = new FrameworkTask ();
-				if (result.Task != null)
-					return;
-				result.Task = Task.Factory.StartNew (delegate {
-					return GetFrameworkLookup (netProject);
-				});
-			}
-		}
-
-		public static bool TryGetFrameworkLookup (DotNetProject project, out FrameworkLookup lookup)
-		{
-			lock (frameworkLookup) {
-				FrameworkTask result;
-				if (frameworkLookup.TryGetValue (project.TargetFramework.Name, out result)) {
-					if (!result.Task.IsCompleted) {
-						lookup = null;
-						return false;
-					}
-					lookup = result.Task.Result;
-					return true;
-				}
-			}
-			lookup = null;
-			return false;
-		}
-
-		public static bool RecreateFrameworkLookup (DotNetProject netProject)
-		{
-			lock (frameworkLookup) {
-				FrameworkTask result;
-				var frameworkName = netProject.TargetFramework.Name;
-				if (!frameworkLookup.TryGetValue (frameworkName, out result))
-					return false;
-				if (result.RetryCount > 5) {
-					LoggingService.LogError ("Can't create framework lookup for:" + frameworkName);
-					return false;
-				}
-				result.RetryCount++;
-				LoggingService.LogInfo ("Trying to recreate framework lookup for {0}, try {1}.", frameworkName, result.RetryCount);
-				result.Task = null;
-				StartFrameworkLookup (netProject);
-				return true;
 			}
+			return null;
 		}
 
-		static FrameworkLookup GetFrameworkLookup (DotNetProject netProject)
+		public static Microsoft.CodeAnalysis.Document GetCodeAnysisDocument (Microsoft.CodeAnalysis.DocumentId docId, CancellationToken cancellationToken = default (CancellationToken))
 		{
-			FrameworkLookup result;
-			string fileName;
-			var cache = GetCacheDirectory (netProject.TargetFramework);
-			fileName = Path.Combine (cache, "FrameworkLookup_" + FrameworkLookup.CurrentVersion + ".dat");
-			try {
-				if (File.Exists (fileName)) {
-					result = FrameworkLookup.Load (fileName);
-					if (result != null) {
-						return result;
-					}
+			if (docId == null)
+				throw new ArgumentNullException ("docId");
+			foreach (var w in Workspaces) {
+				var documentId = w.GetDocument (docId, cancellationToken);
+				if (documentId != null) {
+					return documentId;
 				}
-			} catch (Exception e) {
-				LoggingService.LogWarning ("Can't read framework cache - recreating...", e);
-			}
-
-			try {
-				using (var creator = FrameworkLookup.Create (fileName)) {
-					foreach (var assembly in GetFrameworkAssemblies (netProject)) {
-						var ctx = LoadAssemblyContext (assembly.Location);
-						foreach (var type in ctx.Ctx.GetAllTypeDefinitions ()) {
-							if (!type.IsPublic)
-								continue;
-							creator.AddLookup (assembly.Package.Name, assembly.FullName, type);
-						}
-					}
-				}
-			} catch (Exception e) {
-				LoggingService.LogError ("Error while storing framework lookup", e);
-				return FrameworkLookup.Empty;
-			}
-
-			try {
-				result = FrameworkLookup.Load (fileName);
-				return result;
-			} catch (Exception e) {
-				LoggingService.LogError ("Error loading framework lookup", e);
-				return FrameworkLookup.Empty;
 			}
+			return null;
 		}
 
-		public static ProjectContentWrapper GetProjectContentWrapper (Project project)
+		public static MonoDevelop.Projects.Project GetMonoProject (Microsoft.CodeAnalysis.Project project)
 		{
 			if (project == null)
 				throw new ArgumentNullException ("project");
-			ProjectContentWrapper content;
-			if (projectContents.TryGetValue (project, out content))
-				return content;
-			// in case of outdated projects try to get the most recent project wrapper.
-			foreach (var cnt in projectContents) {
-				if (cnt.Key.FileName == project.FileName)
-					return cnt.Value;
-			}
-			return null;
-		}
-
-		public static IProjectContent GetContext (FilePath file, string mimeType, string text)
-		{
-			using (var reader = new StringReader (text)) {
-				var parsedDocument = ParseFile (file, mimeType, reader);
-				
-				var content = new CSharpProjectContent ();
-				return content.AddOrUpdateFiles (parsedDocument.ParsedFile);
-			}
-		}
-
-		static Dictionary<string, UnresolvedAssemblyProxy> cachedAssemblyContents = new Dictionary<string, UnresolvedAssemblyProxy> ();
-
-		/// <summary>
-		/// Force the update of a project context. Note: This method blocks the thread.
-		/// It was just implemented for use inside unit tests.
-		/// </summary>
-		public static void ForceUpdate (ProjectContentWrapper context)
-		{
-			CheckModifiedFiles ();
-			while (!context.IsLoaded) {
-				Thread.Sleep (10);
-			}
-		}
-
-		#region Parser queue
-
-		static bool threadRunning;
-
-		public static IProgressMonitorFactory ParseProgressMonitorFactory {
-			get;
-			set;
-		}
-
-		class InternalProgressMonitor
-		: ProgressMonitor
-		{
-			public InternalProgressMonitor ()
-			{
-				StartParseOperation ();
-			}
-
-			public override void Dispose ()
-			{
-				EndParseOperation ();
-			}
-		}
-
-		internal static ProgressMonitor GetParseProgressMonitor ()
-		{
-			var mon = ParseProgressMonitorFactory != null ? ParseProgressMonitorFactory.CreateProgressMonitor () : new ProgressMonitor ();
-			
-			return new AggregatedProgressMonitor (mon, new InternalProgressMonitor ());
-		}
-
-		static readonly Queue<ParsingJob> parseQueue = new Queue<ParsingJob> ();
-
-		class ParsingJob
-		{
-			public ProjectContentWrapper Context;
-			public IEnumerable<ProjectFile> FileList;
-			//			public Action<string, IProgressMonitor> ParseCallback;
-			public void Run (ProgressMonitor monitor, CancellationToken token)
-			{
-				TypeSystemParserNode node = null;
-				TypeSystemParser parser = null;
-				var tags = Context.GetExtensionObject <ProjectCommentTags> ();
-				try {
-					Context.BeginLoadOperation ();
-					var parsedFiles = new List<Tuple<ParsedDocument, IUnresolvedFile>> ();
-					foreach (var file in (FileList ?? Context.Project.Files)) {
-						if (token.IsCancellationRequested)
-							return;
-						var fileName = file.FilePath;
-						if (filesSkippedInParseThread.Any (f => f == fileName)) {
-							continue;
-						}
-						if (node == null || !node.CanParse (fileName, file.BuildAction)) {
-							var newNode = GetTypeSystemParserNode (DesktopService.GetMimeTypeForUri (fileName), file.BuildAction);
-							var newParser = newNode != null ? newNode.Parser : null;
-							if (newParser == null)
-								continue;
-							node = newNode;
-							parser = newParser;
-						}
-
-						if (parser == null || !File.Exists (fileName))
-							continue;
-						ParsedDocument parsedDocument;
-						try {
-							parsedDocument = parser.Parse (false, fileName, Context.Project);
-						} catch (Exception e) {
-							LoggingService.LogError ("Error while parsing " + fileName, e);
-							continue;
-						} 
-						if (token.IsCancellationRequested)
-							return;
-						if (tags != null)
-							tags.UpdateTags (Context.Project, parsedDocument.FileName, parsedDocument.TagComments);
-						if (token.IsCancellationRequested)
-							return;
-						parsedFiles.Add (Tuple.Create (parsedDocument, Context._content.GetFile (fileName))); 
-					}
-					Context.UpdateContent (c => c.AddOrUpdateFiles (parsedFiles.Where (f => (f.Item1.Flags & ParsedDocumentFlags.NonSerializable) != ParsedDocumentFlags.NonSerializable).Select (p => p.Item1.ParsedFile)));
-					foreach (var file in parsedFiles) {
-						if (token.IsCancellationRequested)
-							return;
-						if (file.Item2 != null)
-							Context.InformFileRemoved (new ParsedFileEventArgs (file.Item2));
-						var parsedDocument = file.Item1;
-						if ((parsedDocument.Flags & ParsedDocumentFlags.NonSerializable) != ParsedDocumentFlags.NonSerializable)
-							Context.InformFileAdded (new ParsedFileEventArgs (parsedDocument.ParsedFile));
-					}
-				} finally {
-					Context.EndLoadOperation ();
+			foreach (var w in Workspaces) {
+				var documentId = w.GetMonoProject (project);
+				if (documentId != null) {
+					return documentId;
 				}
 			}
+			return null;
 		}
 
-		static void UpdateProjectCommentTasks (ProjectContentWrapper context, ParsedDocument parsedDocument)
-		{
-			var tags = context.GetExtensionObject <ProjectCommentTags> ();
-			if (tags != null) // When tags are not there they're updated first time the tasks are requested.
-				tags.UpdateTags (context.Project, parsedDocument.FileName, parsedDocument.TagComments);
-		}
-		//		public static event EventHandler<ProjectFileEventArgs> FileParsed;
-		static readonly object parseQueueLock = new object ();
-		static readonly AutoResetEvent parseEvent = new AutoResetEvent (false);
-		static readonly ManualResetEvent queueEmptied = new ManualResetEvent (true);
-		static bool trackingFileChanges;
-
-		public static bool TrackFileChanges {
-			get {
-				return trackingFileChanges;
-			}
-			set {
-				lock (parseQueueLock) {
-					if (value != trackingFileChanges) {
-						trackingFileChanges = value;
-						if (value)
-							StartParserThread ();
-					}
-				}
-			}
-		}
-
-		static int parseStatus;
-
-		public static bool IsParsing {
-			get { return parseStatus > 0; }
-		}
-
-		static readonly Dictionary<ProjectContentWrapper, ParsingJob> parseQueueIndex = new Dictionary<ProjectContentWrapper, ParsingJob> ();
-
-		internal static int PendingJobCount {
-			get {
-				lock (parseQueueLock) {
-					return parseQueueIndex.Count;
-				}
-			}
-		}
-
-		static void QueueParseJob (ProjectContentWrapper context, IEnumerable<ProjectFile> fileList = null)
-		{
-			var job = new ParsingJob {
-				Context = context,
-				FileList = fileList
-			};
-			lock (parseQueueLock) {
-				RemoveParseJob (context);
-				context.BeginLoadOperation ();
-				parseQueueIndex [context] = job;
-				parseQueue.Enqueue (job);
-				parseEvent.Set ();
-				
-				if (parseQueueIndex.Count == 1)
-					queueEmptied.Reset ();
-			}
-		}
-
-		static bool WaitForParseJob (int timeout = 5000)
-		{
-			return parseEvent.WaitOne (timeout, true);
-		}
-
-		static ParsingJob DequeueParseJob ()
-		{
-			lock (parseQueueLock) {
-				if (parseQueue.Count > 0) {
-					var job = parseQueue.Dequeue ();
-					parseQueueIndex.Remove (job.Context);
-					return job;
-				}
-				return null;
-			}
-		}
-
-		internal static void WaitForParseQueue ()
-		{
-			queueEmptied.WaitOne ();
-		}
-
-		static void RemoveParseJob (ProjectContentWrapper project)
-		{
-			lock (parseQueueLock) {
-				ParsingJob job;
-				if (parseQueueIndex.TryGetValue (project, out job)) {
-					parseQueueIndex.Remove (project);
-					project.EndLoadOperation ();
-				}
-			}
-		}
-
-		static void StartParserThread ()
-		{
-			lock (parseQueueLock) {
-				if (!threadRunning) {
-					threadRunning = true;
-					var t = new Thread (new ThreadStart (ParserUpdateThread));
-					t.Name = "Background parser";
-					t.IsBackground = true;
-					t.Priority = ThreadPriority.AboveNormal;
-					t.Start ();
-				}
-			}
-		}
-
-		static void ParserUpdateThread ()
-		{
-			try {
-				while (trackingFileChanges) {
-					WaitForParseJob ();
-//						CheckModifiedFiles ();
-					if (trackingFileChanges)
-						ConsumeParsingQueue ();
-				}
-			} catch (Exception ex) {
-				LoggingService.LogError ("Unhandled error in parsing thread", ex);
-			}
-			lock (parseQueueLock) {
-				threadRunning = false;
-				if (trackingFileChanges)
-					StartParserThread ();
-			}
-		}
-
-		static bool IsFileModified (ProjectFile file, IUnresolvedFile parsedFile)
-		{
-			if (parsedFile == null || !parsedFile.LastWriteTime.HasValue)
-				return true;
-			try {
-				return File.GetLastWriteTimeUtc (file.FilePath) != parsedFile.LastWriteTime;
-			} catch (Exception) {
-				return true;
-			}
-		}
-
-		static void CheckModifiedFiles (Project project, ProjectFile[] projectFiles, ProjectContentWrapper content, CancellationToken token = default (CancellationToken))
-		{
-			if (token.IsCancellationRequested) {
-				return;
-			}
-//			Console.WriteLine ("add modified file check for :" + project.Name);
-			content.RunWhenLoaded (delegate(IProjectContent cnt) {
-				try {
-//					Console.WriteLine ("check for " + project.Name);
-					content.BeginLoadOperation ();
-					var modifiedFiles = new List<ProjectFile> ();
-					var oldFileNewFile = new List<Tuple<ProjectFile, IUnresolvedFile>> ();
-					foreach (var file in projectFiles) {
-						if (token.IsCancellationRequested) {
-							return;
-						}
-						if (file.BuildAction == null)
-							continue;
-						// if the file is already inside the content a parser exists for it, if not check if it can be parsed.
-						var oldFile = cnt.GetFile (file.Name);
-						oldFileNewFile.Add (Tuple.Create (file, oldFile));
-					}
-
-					// This is disk intensive and slow
-					oldFileNewFile.RemoveAll (t => !IsFileModified (t.Item1, t.Item2));
-
-					foreach (var v in oldFileNewFile) {
-						var file = v.Item1;
-						var oldFile = v.Item2;
-						if (oldFile == null) {
-							var parser = TypeSystemService.GetParser (DesktopService.GetMimeTypeForUri (file.Name), file.BuildAction);
-							if (parser == null)
-								continue;
-						}
-						modifiedFiles.Add (file);
-					}
-					var tags = content.GetExtensionObject <ProjectCommentTags> ();
-
-					// check if file needs to be removed from project content 
-					foreach (var file in cnt.Files) {
-						if (token.IsCancellationRequested) {
-							return;
-						}
-						if (project.GetProjectFile (file.FileName) == null) {
-							content.UpdateContent (c => c.RemoveFiles (file.FileName));
-							content.InformFileRemoved (new ParsedFileEventArgs (file));
-							if (tags != null)
-								tags.RemoveFile (project, file.FileName);
-						}
-					}
-					if (token.IsCancellationRequested) {
-						return;
-					}
-					if (modifiedFiles.Count > 0)  {
-						QueueParseJob (content, modifiedFiles);
-						WaitForParseJob ();
-					}
-				} catch (Exception e) {
-					LoggingService.LogError ("Exception in check modified files.", e);
-				} finally {
-					content.EndLoadOperation ();
-				}
-			});
-		}
-
-		/// <summary>
-		/// Used to store meta data information about the assembly.
-		/// </summary>
-		[Serializable]
-		class AssemblyTag
-		{
-			public DateTime LastWriteTimeUTC { get; set; }
-
-			public AssemblyTag (DateTime lastWriteTimeUTC)
-			{
-				this.LastWriteTimeUTC = lastWriteTimeUTC;
-			}
-		}
-
-		static void CheckModifiedFile (UnresolvedAssemblyProxy context)
-		{
-			try {
-				string cache = GetCacheDirectory (context.FileName);
-				if (cache == null)
-					return;
-				var assemblyDataDirectory = Path.Combine (cache, "assembly.tag");
-				var writeTime = File.GetLastWriteTimeUtc (context.FileName);
-				var cacheTime = File.Exists (assemblyDataDirectory) ? DeserializeObject<AssemblyTag> (assemblyDataDirectory) : new AssemblyTag (writeTime);
-				if (writeTime != cacheTime.LastWriteTimeUTC) {
-					cache = GetCacheDirectory (context.FileName);
-					if (cache != null) {
-						try {
-							// Files will be reloaded by the lazy loader
-							File.Delete (assemblyDataDirectory);
-							File.Delete (Path.Combine (cache, "assembly.data"));
-						} catch {
-						}
-						context.CtxLoader = new LazyAssemblyLoader (context.FileName, cache);
-					}
-				}
-			} catch (Exception e) {
-				LoggingService.LogError ("Error while updating assembly " + context.FileName, e);
-			}
-		}
-
-		static void CheckModifiedFiles ()
-		{
-			Queue<KeyValuePair<Project, ProjectContentWrapper>> list;
-
-			lock (projectContentLock) {
-				list = new Queue<KeyValuePair<Project, ProjectContentWrapper>> (projectContents);
-			}
-
-			while (list.Count > 0) {
-				var readydb = list.Dequeue ();
-				var files = readydb.Key.Files.ToArray ();
-				CheckModifiedFiles (readydb.Key, files, readydb.Value);
-			}
-			
-			var assemblyList = new Queue<KeyValuePair<string, UnresolvedAssemblyProxy>> (cachedAssemblyContents);
-
-			while (assemblyList.Count > 0) {
-				var readydb = assemblyList.Dequeue ();
-				CheckModifiedFile (readydb.Value);
-			}
-		}
-
-		static void ConsumeParsingQueue ()
-		{
-			int pending = 0;
-			ProgressMonitor monitor = null;
-			var token = loadCancellationSource.Token;
-			StartParseOperation ();
-			try {
-				do {
-					if (pending > 5 && monitor == null) {
-						monitor = GetParseProgressMonitor ();
-						monitor.BeginTask (GettextCatalog.GetString ("Generating database"), 0);
-					}
-					var job = DequeueParseJob ();
-					if (job != null) {
-						try {
-							job.Run (monitor, token);
-						} catch (Exception ex) {
-							if (monitor == null)
-								monitor = GetParseProgressMonitor ();
-							monitor.ReportError (null, ex);
-						} finally {
-							job.Context.EndLoadOperation ();
-						}
-					}
-					
-					if (token.IsCancellationRequested)
-						break;
-					pending = PendingJobCount;
-				} while (pending > 0);
-				queueEmptied.Set ();
-			} finally {
-				if (monitor != null)
-					monitor.Dispose ();
-				EndParseOperation ();
-			}
-		}
-
-		#endregion
-
-	}
-
-	sealed class AssemblyLoadedEventArgs : EventArgs
-	{
-		public readonly TypeSystemService.LazyAssemblyLoader Assembly;
-
-		public AssemblyLoadedEventArgs (TypeSystemService.LazyAssemblyLoader assembly)
-		{
-			this.Assembly = assembly;
-		}
-	}
-
-	public sealed class ProjectUnloadEventArgs : EventArgs
-	{
-		public readonly Project Project;
-		public readonly TypeSystemService.ProjectContentWrapper Wrapper;
-
-		public ProjectUnloadEventArgs (Project project, TypeSystemService.ProjectContentWrapper wrapper)
-		{
-			this.Project = project;
-			this.Wrapper = wrapper;
-		}
 	}
 }
-
-
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs
new file mode 100644
index 0000000000..e623dbf213
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs
@@ -0,0 +1,488 @@
+//
+// TypeSystemService.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Core;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Mono.Addins;
+using MonoDevelop.Projects;
+using System.IO;
+using System.Linq;
+using System.Collections.Immutable;
+using System.Collections.Concurrent;
+
+namespace MonoDevelop.Ide.TypeSystem
+{
+
+//	static class MonoDevelopWorkspaceFeatures
+//	{
+//		static FeaturePack pack;
+//
+//		public static FeaturePack Features {
+//			get {
+//				if (pack == null)
+//					Interlocked.CompareExchange (ref pack, ComputePack (), null);
+//				return pack;
+//			}
+//		}
+//
+//		static FeaturePack ComputePack ()
+//		{
+//			var assemblies = new List<Assembly> ();
+//			var workspaceCoreAssembly = typeof(Workspace).Assembly;
+//			assemblies.Add (workspaceCoreAssembly);
+//
+//			LoadAssembly (assemblies, "Microsoft.CodeAnalysis.CSharp.Workspaces");
+//			//LoadAssembly (assemblies, "Microsoft.CodeAnalysis.VisualBasic.Workspaces");
+//
+//			var catalogs = assemblies.Select (a => new System.ComponentModel.Composition.Hosting.AssemblyCatalog (a));
+//
+//			return new MefExportPack (catalogs);
+//		}
+//
+//		static void LoadAssembly (List<Assembly> assemblies, string assemblyName)
+//		{
+//			try {
+//				var loadedAssembly = Assembly.Load (assemblyName);
+//				assemblies.Add (loadedAssembly);
+//			} catch (Exception e) {
+//				LoggingService.LogWarning ("Couldn't load assembly:" + assemblyName, e);
+//			}
+//		}
+//	}
+
+	public static partial class TypeSystemService
+	{
+		static readonly MonoDevelopWorkspace emptyWorkspace;
+
+		static ConcurrentBag<MonoDevelopWorkspace> workspaces = new ConcurrentBag<MonoDevelopWorkspace>();
+
+		static ImmutableArray<MonoDevelopWorkspace> Workspaces {
+			get {
+				return workspaces.ToImmutableArray ();
+			}
+		}
+		public static ImmutableArray<Microsoft.CodeAnalysis.Workspace> AllWorkspaces {
+			get {
+				return workspaces.ToImmutableArray<Microsoft.CodeAnalysis.Workspace> ();
+			}
+		}
+
+
+		internal static MonoDevelopWorkspace GetWorkspace (MonoDevelop.Projects.Solution solution)
+		{
+			if (solution == null)
+				throw new ArgumentNullException ("solution");
+			foreach (var ws in Workspaces) {
+				if (ws.MonoDevelopSolution == solution)
+					return ws;
+			}
+			return emptyWorkspace;
+		}
+
+		public static Microsoft.CodeAnalysis.Workspace Workspace {
+			get {
+				var solution = IdeApp.ProjectOperations?.CurrentSelectedSolution;
+				if (solution == null)
+					return emptyWorkspace;
+				return GetWorkspace (solution);
+			}
+		}
+
+
+		public static void NotifyFileChange (string fileName, string text)
+		{
+			foreach (var ws in Workspaces)
+				ws.UpdateFileContent (fileName, text);
+		}
+
+		internal static Microsoft.CodeAnalysis.Workspace Load (WorkspaceItem item, IProgressMonitor progressMonitor, bool loadInBackground = true)
+		{
+			using (Counters.ParserService.WorkspaceItemLoaded.BeginTiming ()) {
+				var workspace = new MonoDevelopWorkspace ();
+				if (!(item is MonoDevelop.Projects.Workspace))
+					workspaces.Add (workspace);
+				workspace.ShowStatusIcon ();
+				InternalLoad (item, progressMonitor, workspace, loadInBackground).ContinueWith (t => {
+					workspace.HideStatusIcon ();
+				});
+				return workspace;
+			}
+		}
+
+		static Task InternalLoad (MonoDevelop.Projects.WorkspaceItem item, IProgressMonitor progressMonitor, MonoDevelopWorkspace workspace, bool loadInBackground)
+		{
+			var ws = item as MonoDevelop.Projects.Workspace;
+			if (ws != null) {
+				Action loadAction = () =>  {
+					var newWorkspace = new MonoDevelopWorkspace ();
+					foreach (var it in ws.Items)
+						InternalLoad (it, progressMonitor, newWorkspace, false);
+					workspaces.Add (workspace);
+					ws.ItemAdded += OnWorkspaceItemAdded;
+					ws.ItemRemoved += OnWorkspaceItemRemoved;
+				};
+				if (loadInBackground) {
+					return Task.Run (loadAction);
+				} else {
+					loadAction ();
+				}
+			} else {
+				var solution = item as MonoDevelop.Projects.Solution;
+				if (solution != null) {
+					Action loadAction = () =>  {
+						workspace.TryLoadSolution (solution/*, progressMonitor*/);
+						solution.SolutionItemAdded += OnSolutionItemAdded;
+						solution.SolutionItemRemoved += OnSolutionItemRemoved;
+					};
+					if (loadInBackground) {
+						return Task.Run (loadAction);
+					} else {
+						loadAction ();
+					}
+				}
+			}
+			return Task.FromResult(false);
+		}
+
+		internal static void Unload (MonoDevelop.Projects.WorkspaceItem item)
+		{
+			var ws = item as MonoDevelop.Projects.Workspace;
+			if (ws != null) {
+				foreach (var it in ws.Items)
+					Unload (it);
+				ws.ItemAdded -= OnWorkspaceItemAdded;
+				ws.ItemRemoved -= OnWorkspaceItemRemoved;
+				MonoDocDocumentationProvider.ClearCommentCache ();
+			} else {
+				var solution = item as MonoDevelop.Projects.Solution;
+				if (solution != null) {
+					MonoDevelopWorkspace result = GetWorkspace (solution);
+					if (result != emptyWorkspace) {
+						workspaces = new ConcurrentBag<MonoDevelopWorkspace> (Workspaces.Where (w => w != result));
+						result.Dispose ();
+					}
+					solution.SolutionItemAdded -= OnSolutionItemAdded;
+					solution.SolutionItemRemoved -= OnSolutionItemRemoved;
+					if (solution.ParentWorkspace == null)
+						MonoDocDocumentationProvider.ClearCommentCache ();
+				}
+			}
+		}
+
+		public static DocumentId GetDocumentId (MonoDevelop.Projects.Project project, string fileName)
+		{
+			if (project == null)
+				throw new ArgumentNullException ("project");
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
+			fileName = FileService.GetFullPath (fileName);
+			foreach (var w in Workspaces) {
+				var projectId = w.GetProjectId (project);
+				if (projectId != null)
+					return w.GetDocumentId (projectId, fileName);
+			}
+			return null;
+		}
+
+		public static DocumentId GetDocumentId (Microsoft.CodeAnalysis.Workspace workspace, MonoDevelop.Projects.Project project, string fileName)
+		{
+			if (project == null)
+				throw new ArgumentNullException ("project");
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
+			fileName = FileService.GetFullPath (fileName);
+			var projectId = ((MonoDevelopWorkspace)workspace).GetProjectId (project);
+			if (projectId != null)
+				return ((MonoDevelopWorkspace)workspace).GetDocumentId (projectId, fileName);
+			return null;
+		}
+
+
+		public static DocumentId GetDocumentId (ProjectId projectId, string fileName)
+		{
+			if (projectId == null)
+				throw new ArgumentNullException ("projectId");
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
+			foreach (var w in Workspaces) {
+				if (w.Contains (projectId))
+					return w.GetDocumentId (projectId, fileName);
+			}
+			return null;
+		}
+
+		public static IEnumerable<DocumentId> GetDocuments (string fileName)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
+			fileName = FileService.GetFullPath (fileName);
+			foreach (var w in Workspaces) {
+				foreach (var projectId in w.CurrentSolution.ProjectIds) {
+					var docId = w.GetDocumentId (projectId, fileName);
+					if (docId != null)
+						yield return docId;
+				}
+			}
+		}
+
+		public static Microsoft.CodeAnalysis.Project GetCodeAnalysisProject (MonoDevelop.Projects.Project project)
+		{
+			if (project == null)
+				throw new ArgumentNullException ("project");
+			foreach (var w in Workspaces) {
+				var projectId = w.GetProjectId (project); 
+				if (projectId != null)
+					return w.CurrentSolution.GetProject (projectId);
+			}
+			return null;
+		}
+
+		public static async Task<Compilation> GetCompilationAsync (MonoDevelop.Projects.Project project, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (project == null)
+				throw new ArgumentNullException ("project");
+			foreach (var w in Workspaces) {
+				var projectId = w.GetProjectId (project); 
+				if (projectId == null)
+					continue;
+				var roslynProject = w.CurrentSolution.GetProject (projectId);
+				if (roslynProject == null)
+					continue;
+				return await roslynProject.GetCompilationAsync (cancellationToken).ConfigureAwait (false);
+			}
+			return null;
+		}
+
+		static void OnWorkspaceItemAdded (object s, MonoDevelop.Projects.WorkspaceItemEventArgs args)
+		{
+			Task.Run (() => TypeSystemService.Load (args.Item, null));
+		}
+
+		static void OnWorkspaceItemRemoved (object s, MonoDevelop.Projects.WorkspaceItemEventArgs args)
+		{
+			Unload (args.Item);
+		}
+
+		static void OnSolutionItemAdded (object sender, MonoDevelop.Projects.SolutionItemChangeEventArgs args)
+		{
+			var project = args.SolutionItem as MonoDevelop.Projects.Project;
+			if (project != null) {
+				var ws = GetWorkspace (project.ParentSolution);
+				ws.AddProject (project);
+			}
+		}
+
+		static void OnSolutionItemRemoved (object sender, MonoDevelop.Projects.SolutionItemChangeEventArgs args)
+		{
+			var project = args.SolutionItem as MonoDevelop.Projects.Project;
+			var solution = sender as MonoDevelop.Projects.Solution;
+			if (project != null) {
+				var ws = GetWorkspace (solution);
+				ws.RemoveProject (project);
+			}
+		}
+
+		#region Tracked project handling
+		static readonly List<string> outputTrackedProjects = new List<string> ();
+
+		static void IntitializeTrackedProjectHandling ()
+		{
+			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/TypeSystem/OutputTracking", delegate (object sender, ExtensionNodeEventArgs args) {
+				var projectType = ((TypeSystemOutputTrackingNode)args.ExtensionNode).ProjectType;
+				switch (args.Change) {
+				case ExtensionChange.Add:
+					outputTrackedProjects.Add (projectType);
+					break;
+				case ExtensionChange.Remove:
+					outputTrackedProjects.Remove (projectType);
+					break;
+				}
+			});
+			if (IdeApp.ProjectOperations != null)
+				IdeApp.ProjectOperations.EndBuild += HandleEndBuild;
+			if (IdeApp.Workspace != null)
+				IdeApp.Workspace.ActiveConfigurationChanged += HandleActiveConfigurationChanged;
+
+
+		}
+
+		static void HandleEndBuild (object sender, BuildEventArgs args)
+		{
+			var project = args.SolutionItem as DotNetProject;
+			if (project == null)
+				return;
+			CheckProjectOutput (project, true);
+		}
+
+		static void HandleActiveConfigurationChanged (object sender, EventArgs e)
+		{
+			foreach (var pr in IdeApp.ProjectOperations.CurrentSelectedSolution.GetAllProjects ()) {
+				var project = pr as DotNetProject;
+				if (project != null)
+					CheckProjectOutput (project, true);
+			}
+		}
+
+		internal static bool IsOutputTrackedProject (DotNetProject project)
+		{
+			if (project == null)
+				throw new ArgumentNullException ("project");
+			return project.GetProjectTypes ().Any (p => outputTrackedProjects.Contains (p, StringComparer.OrdinalIgnoreCase));
+		}
+
+		static void CheckProjectOutput (DotNetProject project, bool autoUpdate)
+		{
+			if (project == null)
+				throw new ArgumentNullException ("project");
+			if (IsOutputTrackedProject (project)) {
+				var fileName = project.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration);
+				if (!File.Exists (fileName))
+					return;
+				FileService.NotifyFileChanged (fileName);
+				if (autoUpdate) {
+					// update documents
+					foreach (var openDocument in IdeApp.Workbench.Documents) {
+						openDocument.ReparseDocument ();
+					}
+				}
+			}
+		}
+		#endregion
+
+// TODO: Port framework lookup to NR6
+//		#region FrameworkLookup
+//		class FrameworkTask
+//		{
+//			public int RetryCount { get; set; }
+//
+//			public Task<FrameworkLookup> Task { get; set; }
+//		}
+//
+//		readonly static Dictionary<string, FrameworkTask> frameworkLookup = new Dictionary<string, FrameworkTask> ();
+//
+//		static void StartFrameworkLookup (DotNetProject netProject)
+//		{
+//			if (netProject == null)
+//				throw new ArgumentNullException ("netProject");
+//			lock (frameworkLookup) {
+//				FrameworkTask result;
+//				if (netProject.TargetFramework == null)
+//					return;
+//				var frameworkName = netProject.TargetFramework.Name;
+//				if (!frameworkLookup.TryGetValue (frameworkName, out result))
+//					frameworkLookup [frameworkName] = result = new FrameworkTask ();
+//				if (result.Task != null)
+//					return;
+//				result.Task = Task.Factory.StartNew (delegate {
+//					return GetFrameworkLookup (netProject);
+//				});
+//			}
+//		}
+//
+//		public static bool TryGetFrameworkLookup (DotNetProject project, out FrameworkLookup lookup)
+//		{
+//			lock (frameworkLookup) {
+//				FrameworkTask result;
+//				if (frameworkLookup.TryGetValue (project.TargetFramework.Name, out result)) {
+//					if (!result.Task.IsCompleted) {
+//						lookup = null;
+//						return false;
+//					}
+//					lookup = result.Task.Result;
+//					return true;
+//				}
+//			}
+//			lookup = null;
+//			return false;
+//		}
+//
+//		public static bool RecreateFrameworkLookup (DotNetProject netProject)
+//		{
+//			lock (frameworkLookup) {
+//				FrameworkTask result;
+//				var frameworkName = netProject.TargetFramework.Name;
+//				if (!frameworkLookup.TryGetValue (frameworkName, out result))
+//					return false;
+//				if (result.RetryCount > 5) {
+//					LoggingService.LogError ("Can't create framework lookup for:" + frameworkName);
+//					return false;
+//				}
+//				result.RetryCount++;
+//				LoggingService.LogInfo ("Trying to recreate framework lookup for {0}, try {1}.", frameworkName, result.RetryCount);
+//				result.Task = null;
+//				StartFrameworkLookup (netProject);
+//				return true;
+//			}
+//		}
+//
+//		static FrameworkLookup GetFrameworkLookup (DotNetProject netProject)
+//		{
+//			FrameworkLookup result;
+//			string fileName;
+//			var cache = GetCacheDirectory (netProject.TargetFramework);
+//			fileName = Path.Combine (cache, "FrameworkLookup_" + FrameworkLookup.CurrentVersion + ".dat");
+//			try {
+//				if (File.Exists (fileName)) {
+//					result = FrameworkLookup.Load (fileName);
+//					if (result != null) {
+//						return result;
+//					}
+//				}
+//			} catch (Exception e) {
+//				LoggingService.LogWarning ("Can't read framework cache - recreating...", e);
+//			}
+//
+//			try {
+//				using (var creator = FrameworkLookup.Create (fileName)) {
+//					foreach (var assembly in GetFrameworkAssemblies (netProject)) {
+//						var ctx = LoadAssemblyContext (assembly.Location);
+//						foreach (var type in ctx.Ctx.GetAllTypeDefinitions ()) {
+//							if (!type.IsPublic)
+//								continue;
+//							creator.AddLookup (assembly.Package.Name, assembly.FullName, type);
+//						}
+//					}
+//				}
+//			} catch (Exception e) {
+//				LoggingService.LogError ("Error while storing framework lookup", e);
+//				return FrameworkLookup.Empty;
+//			}
+//
+//			try {
+//				result = FrameworkLookup.Load (fileName);
+//				return result;
+//			} catch (Exception e) {
+//				LoggingService.LogError ("Error loading framework lookup", e);
+//				return FrameworkLookup.Empty;
+//			}
+//		}
+//		#endregion
+	}
+
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/AddinsUpdateHandler.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/AddinsUpdateHandler.cs
index a40a755af4..bd5a88814f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/AddinsUpdateHandler.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/AddinsUpdateHandler.cs
@@ -32,8 +32,8 @@ using Mono.Addins.Gui;
 using MonoDevelop.Ide.ProgressMonitoring;
 using Mono.Addins;
 using MonoDevelop.Core.Setup;
-using Mono.TextEditor;
 using System.Threading.Tasks;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Ide.Updater
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFirstRun.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFirstRun.cs
index 2f4d880a34..df2f768770 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFirstRun.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFirstRun.cs
@@ -31,7 +31,6 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Components;
 using System.Collections.Generic;
 using Xwt.Motion;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Ide.WelcomePage
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs
index 6fb3f20e73..9fa482fc34 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs
@@ -187,7 +187,7 @@ namespace MonoDevelop.Ide.WelcomePage
 				if (uri.StartsWith ("project://")) {

 					string projectUri = uri.Substring ("project://".Length);			

 					Uri fileuri = new Uri (projectUri);

-					Gdk.ModifierType mtype = Mono.TextEditor.GtkWorkarounds.GetCurrentKeyModifiers ();

+					Gdk.ModifierType mtype = GtkWorkarounds.GetCurrentKeyModifiers ();

 					bool inWorkspace = (mtype & Gdk.ModifierType.ControlMask) != 0;

 					IdeApp.Workspace.OpenWorkspaceItem (fileuri.LocalPath, !inWorkspace);

 				} else if (uri.StartsWith ("monodevelop://")) {

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs
index ec6e00a91a..08cc70f4cb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs
@@ -27,7 +27,6 @@ using System;
 using MonoDevelop.Core;
 using MonoDevelop.Components;
 using Gtk;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Ide.WelcomePage
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs
index b5f450b8b9..02401d3679 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs
@@ -28,7 +28,6 @@ using Gtk;
 using System.Xml.Linq;
 using MonoDevelop.Core;
 using MonoDevelop.Components;
-using Mono.TextEditor;
 
 namespace MonoDevelop.Ide.WelcomePage
 {
@@ -129,8 +128,18 @@ namespace MonoDevelop.Ide.WelcomePage
 				if (uri.StartsWith ("project://")) {
 					string projectUri = uri.Substring ("project://".Length);			
 					Uri fileuri = new Uri (projectUri);
-					Gdk.ModifierType mtype = Mono.TextEditor.GtkWorkarounds.GetCurrentKeyModifiers ();
+					Gdk.ModifierType mtype = GtkWorkarounds.GetCurrentKeyModifiers ();
 					bool inWorkspace = (mtype & Gdk.ModifierType.ControlMask) != 0;
+
+					// Notify the RecentFiles that this item does not exist anymore.
+					// Possible other solution would be to check the recent projects list on focus in
+					// and update them accordingly.
+					if (!System.IO.File.Exists (fileuri.LocalPath)) {
+						MessageService.ShowError (GettextCatalog.GetString ("File not found {0}", fileuri.LocalPath));
+						FileService.NotifyFileRemoved (fileuri.LocalPath);
+						return;
+					}
+
 					IdeApp.Workspace.OpenWorkspaceItem (fileuri.LocalPath, !inWorkspace);
 				} else if (uri.StartsWith ("monodevelop://")) {
 					var cmdId = uri.Substring ("monodevelop://".Length);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
index 530204b514..c170ba7116 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
@@ -100,10 +100,45 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Design" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
       <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.AttributedModel">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Convention">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Hosting">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Runtime">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.TypedParts">
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -111,11 +146,6 @@
       <Name>MonoDevelop.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Projects.Formats.MSBuild\MonoDevelop.Projects.Formats.MSBuild.csproj">
       <Project>{A437F1A3-78DF-4F00-8053-D32A8B1EB679}</Project>
       <Name>MonoDevelop.Projects.Formats.MSBuild</Name>
@@ -124,12 +154,10 @@
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
       <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
       <Name>ICSharpCode.NRefactory.CSharp</Name>
-      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\external\xwt\Xwt\Xwt.csproj">
       <Project>{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}</Project>
@@ -170,6 +198,18 @@
       <Project>{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}</Project>
       <Name>IKVM.Reflection</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory6.CSharp.Refactoring.csproj">
+      <Project>{C465A5DC-AD28-49A2-89C0-F81838814A7E}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp.Refactoring</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="templates\AppConfigFile.xft.xml">
@@ -913,7 +953,6 @@
     <EmbeddedResource Include="icons\tree-popup-button-down%402x.png">
       <LogicalName>tree-popup-button-down@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.Components\SearchEntry.cs" />
     <EmbeddedResource Include="icons\clear-all-bookmarks-16.png">
       <LogicalName>clear-all-bookmarks-16.png</LogicalName>
     </EmbeddedResource>
@@ -2351,7 +2390,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="icons\mac\status-pushing-1-16%402x.png">
       <LogicalName>status-pushing-1-16@2x.png</LogicalName>
-   </EmbeddedResource>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\mac\status-pushing-2-16.png">
       <LogicalName>status-pushing-2-16.png</LogicalName>
     </EmbeddedResource>
@@ -2540,9 +2579,7 @@
     <Compile Include="MonoDevelop.Ide.Gui\ViewCommandHandlers.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Content\IBookmarkBuffer.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Content\IClipboardHandler.cs" />
-    <Compile Include="MonoDevelop.Ide.Gui.Content\IEditableTextBuffer.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Content\IPrintable.cs" />
-    <Compile Include="MonoDevelop.Ide.Gui.Content\ITextBuffer.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Dialogs\CommonAboutDialog.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Dialogs\DirtyFilesDialog.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Dialogs\NewLayoutDialog.cs" />
@@ -2595,7 +2632,6 @@
     <Compile Include="MonoDevelop.Ide.Templates\CodeTranslationFileDescriptionTemplate.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Dialogs\SelectEncodingsDialog.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Dialogs\FileSelectorDialog.cs" />
-    <Compile Include="MonoDevelop.Ide.Gui.Content\IEncodedTextContent.cs" />
     <Compile Include="MonoDevelop.Ide.Tasks\TaskPriority.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Pads\ErrorListPad.cs" />
     <Compile Include="gtk-gui\generated.cs" />
@@ -2604,9 +2640,7 @@
     <Compile Include="MonoDevelop.Ide.Tasks\CommentTasksView.cs" />
     <Compile Include="MonoDevelop.Ide.Tasks\UserTasksView.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\LayoutComboBox.cs" />
-    <Compile Include="MonoDevelop.Ide.Gui.Content\IExtensibleTextEditor.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Pads.ProjectPad\UnknownEntryNodeBuilder.cs" />
-    <Compile Include="MonoDevelop.Ide.Gui.Content\TextEditorExtension.cs" />
     <Compile Include="MonoDevelop.Ide.Commands\NavigationCommands.cs" />
     <Compile Include="MonoDevelop.Ide.Templates\ISolutionItemFeature.cs" />
     <Compile Include="MonoDevelop.Ide.StandardHeader\StandardHeaderService.cs" />
@@ -2631,14 +2665,15 @@
     <Compile Include="MonoDevelop.Ide.Templates\FileTemplateCondition.cs" />
     <Compile Include="MonoDevelop.Ide.Templates\PartialTypeFileTemplateCondition.cs" />
     <Compile Include="MonoDevelop.Ide.Templates\ParentProjectFileTemplateCondition.cs" />
-    <Compile Include="MonoDevelop.Ide.Gui.Content\CompletionTextEditorExtension.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\ToolbarComboBox.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Content\ISplittable.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Content\IFoldable.cs" />
     <Compile Include="MonoDevelop.Ide.ExternalTools\ExternalToolPanel.cs" />
     <Compile Include="gtk-gui\MonoDevelop.Ide.ExternalTools.ExternalToolPanelWidget.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\MonoDevelopStatusBar.cs" />
-    <Compile Include="MonoDevelop.Ide.Gui\DocumentSwitcher.cs" />
+    <Compile Include="MonoDevelop.Ide.Gui\DocumentSwitcher.cs">
+      <DependentUpon>GuiSyncContext.cs</DependentUpon>
+    </Compile>
     <Compile Include="MonoDevelop.Ide.Gui.OptionPanels\IDEStyleOptionsPanel.cs" />
     <Compile Include="gtk-gui\MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Content\IZoomable.cs" />
@@ -2667,7 +2702,6 @@
     <Compile Include="MonoDevelop.Ide.Gui.Components\TransactedTreeBuilder.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Content\INavigable.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Content\IOpenNamedElementHandler.cs" />
-    <Compile Include="MonoDevelop.Ide.Gui.Content\ISmartIndenter.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Content\ITextEditorResolver.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.OptionPanels\AuthorInformationPanel.cs" />
@@ -2741,7 +2775,9 @@
     <Compile Include="MonoDevelop.Ide.Extensions\IOpenFileDialogHandler.cs" />
     <Compile Include="MonoDevelop.Ide.Extensions\IAddFileDialogHandler.cs" />
     <Compile Include="MonoDevelop.Ide.Extensions\TextEditorExtensionNode.cs" />
-    <Compile Include="MonoDevelop.Ide.Gui\DockItemToolbarLoader.cs" />
+    <Compile Include="MonoDevelop.Ide.Gui\DockItemToolbarLoader.cs">
+      <DependentUpon>DisplayBindingService.cs</DependentUpon>
+    </Compile>
     <Compile Include="MonoDevelop.Ide.Gui.Components\LogView.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\WorkbenchContext.cs" />
     <Compile Include="MonoDevelop.Ide.Extensions\LayoutExtensionNode.cs" />
@@ -2867,7 +2903,6 @@
     <Compile Include="MonoDevelop.Components.PropertyGrid.Editors\FlagsSelectorDialog.cs" />
     <Compile Include="MonoDevelop.Components.PropertyGrid.Editors\FloatRange.cs" />
     <Compile Include="MonoDevelop.Components.PropertyGrid.Editors\IntRange.cs" />
-    <Compile Include="MonoDevelop.Components.PropertyGrid.Editors\TextEditor.cs" />
     <Compile Include="MonoDevelop.Components.PropertyGrid.Editors\TextEditorDialog.cs" />
     <Compile Include="MonoDevelop.Components.PropertyGrid.Editors\TimeSpanEditor.cs" />
     <Compile Include="MonoDevelop.Components.PropertyGrid.Editors\BooleanEditorCell.cs" />
@@ -3137,7 +3172,6 @@
     <Compile Include="MonoDevelop.Ide.WelcomePage\WelcomePageRecentProjectsList.cs" />
     <Compile Include="MonoDevelop.Ide.WelcomePage\WelcomePageLinksList.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\ProjectLoadProgressMonitor.cs" />
-    <Compile Include="MonoDevelop.Ide.Gui\CommonTextEditorOptions.cs" />
     <Compile Include="MonoDevelop.Components\FileFilterSet.cs" />
     <Compile Include="MonoDevelop.Ide\IdeVersionInfo.cs" />
     <Compile Include="MonoDevelop.Components\ContextMenuTreeView.cs" />
@@ -3150,22 +3184,14 @@
     <Compile Include="MonoDevelop.Ide\ProjectCreatedEventArgs.cs" />
     <Compile Include="MonoDevelop.Ide.FindInFiles\MemberCollector.cs" />
     <Compile Include="MonoDevelop.Ide.FindInFiles\SearchCollector.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\ProjectContentEventArgs.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\TypeSystemService.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\Ambience.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\AmbienceService.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\NetAmbience.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\OutputFlags.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\OutputSettings.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\StockIcons.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\FoldingRegion.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\ParsedDocument.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\Comment.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\Tag.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\PreProcessorDefine.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\ConditionalRegion.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\MarkupUtilities.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\CodeGenerationService.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\CodeGenerator.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\TypeSystemParserNode.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\MonoDocDocumentationProvider.cs" />
@@ -3177,7 +3203,6 @@
     <Compile Include="MonoDevelop.Components.MainToolbar\StatusArea.cs" />
     <Compile Include="MonoDevelop.Components.MainToolbar\RoundButton.cs" />
     <Compile Include="MonoDevelop.Components.MainToolbar\ButtonBar.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\ProjectCommentTags.cs" />
     <Compile Include="MonoDevelop.Components.MainToolbar\ProjectSearchCategory.cs" />
     <Compile Include="MonoDevelop.Components.MainToolbar\SearchCategory.cs" />
     <Compile Include="MonoDevelop.Components.MainToolbar\ISearchDataSource.cs" />
@@ -3191,7 +3216,6 @@
     <Compile Include="MonoDevelop.Components\TooltipPopoverWindow.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Components\AnimatedIcon.cs" />
     <Compile Include="MonoDevelop.Ide\DefaultWebCertificateProvider.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\ParsedFileEventArgs.cs" />
     <Compile Include="MonoDevelop.Ide.Extensions\MimeTypeExtensionNode.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\DocumentView.cs" />
     <Compile Include="MonoDevelop.Components\VPanedThin.cs" />
@@ -3200,7 +3224,6 @@
     <Compile Include="MonoDevelop.Components\ExtendedLabel.cs" />
     <Compile Include="MonoDevelop.Ide.CodeCompletion\TooltipInformation.cs" />
     <Compile Include="MonoDevelop.Ide.CodeCompletion\TooltipInformationWindow.cs" />
-    <Compile Include="MonoDevelop.Ide.CodeCompletion\ParameterDataProvider.cs" />
     <Compile Include="MonoDevelop.Ide.TypeSystem\TypeSystemParser.cs" />
     <Compile Include="MonoDevelop.Ide.WelcomePage\WelcomePageSection.cs" />
     <Compile Include="MonoDevelop.Ide.WelcomePage\Style.cs" />
@@ -3220,7 +3243,6 @@
     <Compile Include="MonoDevelop.Ide.TextEditing\TopLevelWidgetExtension.cs" />
     <Compile Include="MonoDevelop.Ide.TextEditing\VerticalAlignment.cs" />
     <Compile Include="MonoDevelop.Ide.TextEditing\HorizontalAlignment.cs" />
-    <Compile Include="MonoDevelop.Ide.TextEditing\TextLineMarkerExtension.cs" />
     <Compile Include="MonoDevelop.Ide.TextEditing\TextFileEventArgs.cs" />
     <Compile Include="MonoDevelop.Ide.TextEditing\LineCountEventArgs.cs" />
     <Compile Include="MonoDevelop.Ide.TextEditing\FileExtension.cs" />
@@ -3247,7 +3269,6 @@
     <Compile Include="MonoDevelop.Ide.Gui\StatusBarIcon.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\StatusBarContextImpl.cs" />
     <Compile Include="MonoDevelop.Components.MainToolbar\MainStatusBarContextImpl.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\MonoDevelopProjectContent.cs" />
     <Compile Include="MonoDevelop.Components.Commands\ICommandDelegator.cs" />
     <Compile Include="MonoDevelop.Ide.CustomTools\ResXFileCodeGenerator.cs" />
     <Compile Include="MonoDevelop.Components\CellRendererImage.cs" />
@@ -3256,7 +3277,6 @@
     <Compile Include="AddinInfo.cs" />
     <Compile Include="MonoDevelop.Ide.CodeCompletion\CompletionCharacters.cs" />
     <Compile Include="MonoDevelop.Ide.CodeCompletion\CompletionCharacterCodon.cs" />
-    <Compile Include="MonoDevelop.Ide.TypeSystem\IRefactoringContext.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Pads.ProjectPad\ImplicitFrameworkAssemblyReferenceNodeBuilder.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Pads.ProjectPad\PortableFrameworkSubsetNodeBuilder.cs" />
     <Compile Include="MonoDevelop.Components.MainToolbar\SearchInSolutionSearchCategory.cs" />
@@ -3273,6 +3293,57 @@
     <Compile Include="MonoDevelop.Ide.Templates\WorkspaceItemCreatedInformation.cs" />
     <Compile Include="MonoDevelop.Ide.Templates\PackageReferencesForCreatedProject.cs" />
     <Compile Include="MonoDevelop.Ide.Templates\ProjectTemplatePackageInstaller.cs" />
+    <Compile Include="MonoDevelop.Ide.TypeSystem\MonoDevelopTextLoader.cs" />
+    <Compile Include="MonoDevelop.Ide.TypeSystem\MonoDevelopSourceTextContainer.cs" />
+    <Compile Include="MonoDevelop.Ide.CustomTools\PublicResXFileCodeGenerator.cs" />
+    <Compile Include="MonoDevelop.Components\ImageLoader.cs" />
+    <Compile Include="MonoDevelop.Ide.CodeCompletion\ParameterHintingData.cs" />
+    <Compile Include="MonoDevelop.Ide.TypeSystem\MonoDevelopWorkspace.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\IDocumentLine.cs" />
+    <Compile Include="MonoDevelop.Ide.CodeTemplates\IListDataProvider.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\ITextEditorOptions.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\WordFindStrategy.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\InsertionPoint.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextLink.cs">
+      <DependentUpon>TextLinkModeEventArgs.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MonoDevelop.Components\WindowTransparencyDecorator.cs" />
+    <Compile Include="MonoDevelop.Components\GtkWorkarounds.cs" />
+    <Compile Include="MonoDevelop.Components\PangoUtil.cs" />
+    <Compile Include="MonoDevelop.Components\HslColor.cs" />
+    <Compile Include="MonoDevelop.Components\HelperMethods.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\SelectionMode.cs" />
+    <Compile Include="MonoDevelop.Components\GtkGestures.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\FileSettingsStore.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\InsertionCursorEventArgs.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\IFoldSegment.cs" />
+    <Compile Include="MonoDevelop.Ide.TextEditing\TextLineMarkerExtension.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\ITextLineMarker.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TooltipProvider.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\ITextSegmentMarker.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\DocumentRegion.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextMarkerMouseEventArgs.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\DefaultSourceEditorOptions.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextEditor.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\ITextDocument.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextEditorDisplayBinding.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\AbstractUsagesExtension.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextEditorViewContent.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\IndentationTracker.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\SelectionSurroundingProvider.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\TextPasteHandler.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\DocumentLocation.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\SyntaxModeService.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\AmbientColor.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\ColorScheme.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\ColorDescriptionAttribute.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\TemplateCodon.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\IStreamProvider.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\TemplateExtensionNodeLoader.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextLinkModeEventArgs.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\InsertionModeOptions.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextLinkModeOptions.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\CompletionTextEditorExtension.cs" />
     <Compile Include="MonoDevelop.Components.DockNotebook\DockNotebook.cs" />
     <Compile Include="MonoDevelop.Components.DockNotebook\PlaceholderWindow.cs" />
     <Compile Include="MonoDevelop.Components.DockNotebook\TabStrip.cs" />
@@ -3289,12 +3360,25 @@
     <Compile Include="MonoDevelop.Components\ContextMenuExtensionsMac.cs" />
     <Compile Include="MonoDevelop.Components\ContextMenuExtensionsGtk.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\Split.cs" />
-    <Compile Include="MonoDevelop.Ide.CustomTools\PublicResXFileCodeGenerator.cs" />
-    <Compile Include="MonoDevelop.Components\ImageLoader.cs" />
     <Compile Include="MonoDevelop.Components.DockNotebook\DockWindow.cs" />
     <Compile Include="MonoDevelop.Ide.CustomTools\MSBuildCustomTool.cs" />
     <Compile Include="MonoDevelop.Components\Mac\GtkMacInterop.cs" />
     <Compile Include="MonoDevelop.Components\Control.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\TextEditorExtension.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\IUnitTestMarker.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\ChunkStyle.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextMarkerFactory.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\InternalExtensionAPI\ITextEditorImpl.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\InternalExtensionAPI\ITextMarkerFactory.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\InternalExtensionAPI\IEditorActionHost.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\EditActions.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\DocumentContext.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\InternalExtensionAPI\ITextEditorFactory.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\FoldSegmentFactory.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\IReadonlyTextDocument.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\Usage.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextEditorFactory.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\AutoSave.cs" />
     <Compile Include="MonoDevelop.Ide.Templates\SolutionTemplate.cs" />
     <Compile Include="MonoDevelop.Ide.Templates\TemplateCategory.cs" />
     <Compile Include="MonoDevelop.Ide.Templates\TemplateWizard.cs" />
@@ -3339,7 +3423,38 @@
     <Compile Include="MonoDevelop.Components\Mac\NSViewContainer.cs" />
     <Compile Include="MonoDevelop.Components\Mac\GtkEmbed.cs" />
     <Compile Include="MonoDevelop.Components\Mac\WidgetWithNativeWindow.cs" />
-    <Compile Include="MonoDevelop.Ide.Tasks\UserTask.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\IQuickTaskProvider.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\QuickTask.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\SemanticHighlighting.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\ColoredSegment.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\SegmentTree.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Util\Diff.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Util\SimpleBracketMatcher.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Util\SimpleReadonlyDocument.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Commands\DynamicAbbrevHandler.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\ModifierKeys.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\SpecialKey.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\KeyDescriptor.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\MessageBubbles\MessageBubbleCommands.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\LineEventArgs.cs" />
+    <Compile Include="MonoDevelop.Ide.TypeSystem\Error.cs" />
+    <Compile Include="MonoDevelop.Ide.TypeSystem\MetadataReferenceCache.cs" />
+    <Compile Include="MonoDevelop.Ide.TypeSystem\IFoldingParser.cs" />
+    <Compile Include="MonoDevelop.Ide.TypeSystem\TypeSystemService_WorkspaceHandling.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Projection\ProjectedSegment.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Projection\Projection.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Projection\ProjectedSemanticHighlighting.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Projection\ProjectedTooltipProvider.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Projection\ProjectedCompletionExtension.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Projection\ProjectedDocumentContext.cs" />
+    <Compile Include="MonoDevelop.Ide.CodeCompletion\CompletionCategory.cs" />
+    <Compile Include="MonoDevelop.Ide.CodeCompletion\DisplayFlags.cs" />
+    <Compile Include="MonoDevelop.Ide.CodeCompletion\ParameterHintingResult.cs" />
+    <Compile Include="MonoDevelop.Ide.Tasks\TaskListEntry.cs" />
+    <Compile Include="MonoDevelop.Ide.TypeSystem\AmbienceTooltipProvider.cs" />
+    <Compile Include="MonoDevelop.Components.PropertyGrid.Editors\PropertyTextEditor.cs" />
+    <Compile Include="MonoDevelop.Ide.Tasks\ProjectCommentTags.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\CustomEditorOptions.cs" />
     <Compile Include="MonoDevelop.Ide.Projects\NewProjectConfiguration.cs" />
     <Compile Include="MonoDevelop.Components\EventBoxTooltip.cs" />
     <Compile Include="MonoDevelop.Ide.Templates\ProjectTemplateCreateInformation.cs" />
@@ -3352,6 +3467,10 @@
     <Compile Include="MonoDevelop.Components.MainToolbar\StatusBarContextHandler.cs" />
     <Compile Include="MonoDevelop.Components.MainToolbar\IButtonBarButton.cs" />
     <Compile Include="MonoDevelop.Components.MainToolbar\MainToolbarModels.cs" />
+    <Compile Include="MonoDevelop.Ide.CodeCompletion\MruCache.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TooltipExtensionNode.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Projection\IProjectionExtension.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Projection\ProjectedFilterCompletionTextEditorExtension.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
@@ -3363,6 +3482,7 @@
     <None Include="MonoDevelop.Ide.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
@@ -3395,6 +3515,10 @@
     <Folder Include="MonoDevelop.Ide.WelcomePage\icons\" />
     <Folder Include="MonoDevelop.Ide.TextEditing\" />
     <Folder Include="MonoDevelop.Components.DockNotebook\" />
+    <Folder Include="MonoDevelop.Ide.Editor.Util\" />
+    <Folder Include="MonoDevelop.Ide.Editor\Commands\" />
+    <Folder Include="MonoDevelop.Ide.Editor\MessageBubbles\" />
+    <Folder Include="MonoDevelop.Ide.Editor\Projection\" />
     <Folder Include="icons\mac\" />
   </ItemGroup>
   <ItemGroup>
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs
index b8cba9ec3e..8455c21735 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs
@@ -166,14 +166,7 @@ namespace MonoDevelop.Ide
 			if (!File.Exists (file))
 				return false;
 
-			using (var f = File.OpenRead (file)) {
-				var buf = new byte[8192];
-				var read = f.Read (buf, 0, buf.Length);
-				for (int i = 0; i < read; i++)
-					if (buf [i] == 0)
-						return false;
-			}
-			return true;
+			return !MonoDevelop.Core.Text.TextFileUtility.IsBinary (file); 
 		}
 
 		public async static Task<bool> GetFileIsTextAsync (string file, string mimeType = null)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/HelpOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/HelpOperations.cs
index 166415e254..df86d6de4c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/HelpOperations.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/HelpOperations.cs
@@ -35,7 +35,6 @@ using MonoDevelop.Core.Execution;
 using System.IO;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.Semantics;
 
 namespace MonoDevelop.Ide
 {
@@ -227,14 +226,14 @@ namespace MonoDevelop.Ide
 			}
 		}
 		
-		public bool CanShowHelp (ResolveResult result)
-		{
-			try {
-				return CanShowHelp (HelpService.GetMonoDocHelpUrl (result));
-			} catch (Exception e) {
-				LoggingService.LogError ("Error while trying to get monodoc help.", e);
-				return false;
-			}
-		}
+//		public bool CanShowHelp (ResolveResult result)
+//		{
+//			try {
+//				return CanShowHelp (HelpService.GetMonoDocHelpUrl (result));
+//			} catch (Exception e) {
+//				LoggingService.LogError ("Error while trying to get monodoc help.", e);
+//				return false;
+//			}
+//		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs
index deeb48a636..79f510c135 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs
@@ -223,7 +223,6 @@ namespace MonoDevelop.Ide
 
 			// Perser service initialization
 			TypeSystemService.TrackFileChanges = true;
-			TypeSystemService.ParseProgressMonitorFactory = new ParseProgressMonitorFactory (); 
 
 			Customizer.OnIdeInitialized ();
 			
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
index 1fd7b88e78..d096632d8e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
@@ -53,6 +53,7 @@ using MonoDevelop.Ide.Extensions;
 using MonoDevelop.Components.Extensions;
 using MonoDevelop.Ide.Desktop;
 using System.Threading.Tasks;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Ide
 {
@@ -117,11 +118,11 @@ namespace MonoDevelop.Ide
 			Xwt.Toolkit.CurrentEngine.RegisterBackend<IExtendedTitleBarDialogBackend,GtkExtendedTitleBarDialogBackend> ();
 
 			//default to Windows IME on Windows
-			if (Platform.IsWindows && Mono.TextEditor.GtkWorkarounds.GtkMinorVersion >= 16) {
+			if (Platform.IsWindows && GtkWorkarounds.GtkMinorVersion >= 16) {
 				var settings = Gtk.Settings.Default;
-				var val = Mono.TextEditor.GtkWorkarounds.GetProperty (settings, "gtk-im-module");
+				var val = GtkWorkarounds.GetProperty (settings, "gtk-im-module");
 				if (string.IsNullOrEmpty (val.Val as string))
-					Mono.TextEditor.GtkWorkarounds.SetProperty (settings, "gtk-im-module", new GLib.Value ("ime"));
+					GtkWorkarounds.SetProperty (settings, "gtk-im-module", new GLib.Value ("ime"));
 			}
 			
 			InternalLog.Initialize ();
@@ -610,6 +611,14 @@ namespace MonoDevelop.Ide
 		static void HandleException (Exception ex, bool willShutdown)
 		{
 			var msg = String.Format ("An unhandled exception has occured. Terminating {0}? {1}", BrandingService.ApplicationName, willShutdown);
+			var aggregateException = ex as AggregateException;
+			if (aggregateException != null) {
+				aggregateException.Flatten ().Handle (innerEx => {
+					HandleException (innerEx, willShutdown);
+					return true;
+				});
+				return;
+			}
 
 			if (willShutdown)
 				LoggingService.LogFatalError (msg, ex);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ImageService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ImageService.cs
index 60e64618c6..2cff1a6d5a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ImageService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ImageService.cs
@@ -212,12 +212,12 @@ namespace MonoDevelop.Ide
 
 		static Gdk.Pixbuf Get2xIconVariant (Gdk.Pixbuf px)
 		{
-			return Mono.TextEditor.GtkWorkarounds.Get2xVariant (px);
+			return GtkWorkarounds.Get2xVariant (px);
 		}
 
 		static void Set2xIconVariant (Gdk.Pixbuf px, Gdk.Pixbuf variant2x)
 		{
-			Mono.TextEditor.GtkWorkarounds.Set2xVariant (px, variant2x);
+			GtkWorkarounds.Set2xVariant (px, variant2x);
 		}
 
 		static Dictionary<string,Xwt.Drawing.Image> icons = new Dictionary<string, Xwt.Drawing.Image> ();
@@ -489,7 +489,7 @@ namespace MonoDevelop.Ide
 			Gtk.IconSource source2x = null;
 
 			if (Platform.IsWindows) {
-				var pixel_scale = Mono.TextEditor.GtkWorkarounds.GetPixelScale ();
+				var pixel_scale = GtkWorkarounds.GetPixelScale ();
 				source.Pixbuf = pixbuf.ScaleSimple ((int)(pixbuf.Width * pixel_scale), (int)(pixbuf.Height * pixel_scale), Gdk.InterpType.Bilinear);
 			} else {
 				source.Pixbuf = pixbuf;
@@ -499,17 +499,17 @@ namespace MonoDevelop.Ide
 			source.SizeWildcarded = iconSize == Gtk.IconSize.Invalid;
 
 			if (pixbuf2x != null) {
-				if (Mono.TextEditor.GtkWorkarounds.SetSourceScale (source, 1)) {
-					Mono.TextEditor.GtkWorkarounds.SetSourceScaleWildcarded (source, false);
+				if (GtkWorkarounds.SetSourceScale (source, 1)) {
+					GtkWorkarounds.SetSourceScaleWildcarded (source, false);
 					source2x = new Gtk.IconSource ();
 					source2x.Pixbuf = pixbuf2x;
 					source2x.Size = iconSize;
 					source2x.SizeWildcarded = iconSize == Gtk.IconSize.Invalid;
-					Mono.TextEditor.GtkWorkarounds.SetSourceScale (source2x, 2);
-					Mono.TextEditor.GtkWorkarounds.SetSourceScaleWildcarded (source2x, false);
+					GtkWorkarounds.SetSourceScale (source2x, 2);
+					GtkWorkarounds.SetSourceScaleWildcarded (source2x, false);
 				}
 			} else {
-				Mono.TextEditor.GtkWorkarounds.SetSourceScaleWildcarded (source, true);
+				GtkWorkarounds.SetSourceScaleWildcarded (source, true);
 			}
 
 			iconSet.AddSource (source);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs
index ea4319b4bc..b8d750f1f1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs
@@ -30,6 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using MonoDevelop.Components;
 using Gtk;
 using MonoDevelop.Core;
 using MonoDevelop.Components.Extensions;
@@ -374,7 +375,7 @@ namespace MonoDevelop.Ide
 			else
 				PlaceDialog (dialog, parent);
 			#endif
-			return Mono.TextEditor.GtkWorkarounds.RunDialogWithNotification (dialog);
+			return GtkWorkarounds.RunDialogWithNotification (dialog);
 		}
 
 		#if MAC
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
index 660423cc7c..4caf1b5021 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
@@ -45,18 +45,17 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Projects;
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Core.Instrumentation;
-using Mono.TextEditor;
 using System.Diagnostics;
-using ICSharpCode.NRefactory.Documentation;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using System.Text;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Threading.Tasks;
 using System.Threading;
 using ExecutionContext = MonoDevelop.Projects.ExecutionContext;
 using MonoDevelop.Ide.Tasks;
 using MonoDevelop.Projects.Formats.MSBuild;
+using System.Collections.Immutable;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Ide
 {
@@ -231,31 +230,33 @@ namespace MonoDevelop.Ide
 			return (GetDeclaredFile(item) != null);
 		}*/
 		
-		public bool CanJumpToDeclaration (object element)
+		public bool CanJumpToDeclaration (Microsoft.CodeAnalysis.ISymbol symbol)
 		{
-			if (element is ICSharpCode.NRefactory.TypeSystem.IVariable)
-				return true;
-			var entity = element as ICSharpCode.NRefactory.TypeSystem.IEntity;
-			if (entity == null && element is ICSharpCode.NRefactory.TypeSystem.IType)
-				entity = ((ICSharpCode.NRefactory.TypeSystem.IType)element).GetDefinition ();
-			if (entity == null)
+			if (symbol == null)
 				return false;
-			if (entity.Region.IsEmpty) {
-				var parentAssembly = entity.ParentAssembly;
-				if (parentAssembly == null)
-					return false;
-				return !string.IsNullOrEmpty (parentAssembly.UnresolvedAssembly.Location);
+			switch (symbol.Kind) {
+			case Microsoft.CodeAnalysis.SymbolKind.Local:
+			case Microsoft.CodeAnalysis.SymbolKind.Parameter:
+			case Microsoft.CodeAnalysis.SymbolKind.NamedType:
+			case Microsoft.CodeAnalysis.SymbolKind.Method:
+			case Microsoft.CodeAnalysis.SymbolKind.Field:
+			case Microsoft.CodeAnalysis.SymbolKind.Property:
+			case Microsoft.CodeAnalysis.SymbolKind.Event:
+			case Microsoft.CodeAnalysis.SymbolKind.Label:
+			case Microsoft.CodeAnalysis.SymbolKind.TypeParameter:
+			case Microsoft.CodeAnalysis.SymbolKind.RangeVariable:
+				return true;
 			}
-			return true;
+			return false;
 		}
 
-		static MonoDevelop.Ide.FindInFiles.SearchResult GetJumpTypePartSearchResult (ICSharpCode.NRefactory.TypeSystem.IUnresolvedTypeDefinition part)
+		static MonoDevelop.Ide.FindInFiles.SearchResult GetJumpTypePartSearchResult (Microsoft.CodeAnalysis.ISymbol part, Microsoft.CodeAnalysis.Location location)
 		{
-			var provider = new MonoDevelop.Ide.FindInFiles.FileProvider (part.Region.FileName);
-			var doc = new Mono.TextEditor.TextDocument ();
+			var provider = new MonoDevelop.Ide.FindInFiles.FileProvider (location.SourceTree.FilePath);
+			var doc = TextEditorFactory.CreateNewDocument ();
 			doc.Text = provider.ReadString ();
-			int position = doc.LocationToOffset (part.Region.BeginLine, part.Region.BeginColumn);
-			while (position + part.Name.Length < doc.TextLength) {
+			int position = location.SourceSpan.Start;
+			while (position + part.Name.Length < doc.Length) {
 				if (doc.GetTextAt (position, part.Name.Length) == part.Name)
 					break;
 				position++;
@@ -263,67 +264,90 @@ namespace MonoDevelop.Ide
 			return new MonoDevelop.Ide.FindInFiles.SearchResult (provider, position, part.Name.Length);
 		}
 
-		public void JumpToDeclaration (ICSharpCode.NRefactory.TypeSystem.INamedElement visitable, bool askIfMultipleLocations = true)
+		public void JumpTo (Microsoft.CodeAnalysis.ISymbol symbol, Microsoft.CodeAnalysis.Location location, Project project = null)
 		{
-			if (askIfMultipleLocations) {
-				var type = visitable as ICSharpCode.NRefactory.TypeSystem.IType;
-				if (type != null && type.GetDefinition () != null && type.GetDefinition ().Parts.Count > 1) {
-					using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
-						foreach (var part in type.GetDefinition ().Parts)
-							monitor.ReportResult (GetJumpTypePartSearchResult (part));
+			if (location == null)
+				return;
+			if (location.IsInMetadata) {
+				string fileName = null;
+				var dn = project as DotNetProject;
+				if (dn == null)
+					return;
+				var metadataDllName = location.MetadataModule.Name;
+				if (metadataDllName == "CommonLanguageRuntimeLibrary")
+					metadataDllName = "corlib.dll";
+				foreach (var assembly in dn.GetReferencedAssemblies (IdeApp.Workspace.ActiveConfiguration)) {
+					if (assembly.IndexOf (metadataDllName) > 0) {
+						fileName = dn.GetAbsoluteChildPath (assembly);
+						break;
 					}
+				}
+				if (fileName == null)
 					return;
+				var doc = IdeApp.Workbench.OpenDocument (new FileOpenInformation (fileName, project));
+
+				if (doc != null) {
+					doc.RunWhenLoaded (delegate {
+						var handler = doc.PrimaryView.GetContent<MonoDevelop.Ide.Gui.Content.IOpenNamedElementHandler> ();
+						if (handler != null)
+							handler.Open (symbol);
+					});
 				}
-			}
 
-			JumpToDeclaration (visitable);
+				return;
+			}
+			IdeApp.Workbench.OpenDocument (new FileOpenInformation (location.SourceTree.FilePath, project) {
+				Offset = location.SourceSpan.Start
+			});
 		}
-
-		void JumpToDeclaration (ICSharpCode.NRefactory.TypeSystem.INamedElement element)
+		
+		public void JumpToDeclaration (Microsoft.CodeAnalysis.ISymbol symbol, Project project = null, bool askIfMultipleLocations = true)
 		{
-			var entity = element as ICSharpCode.NRefactory.TypeSystem.IEntity;
-
-			if (entity == null && element is ICSharpCode.NRefactory.TypeSystem.IType)
-				entity = ((ICSharpCode.NRefactory.TypeSystem.IType)element).GetDefinition ();
-			if (entity is SpecializedMember) 
-				entity = ((SpecializedMember)entity).MemberDefinition;
-
-			if (entity == null) {
-				LoggingService.LogError ("Unknown element:" + element);
+			if (symbol == null)
+				throw new ArgumentNullException ("symbol");
+			var locations = symbol.Locations;
+			
+			if (askIfMultipleLocations && locations.Length > 1) {
+				using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+					foreach (var part in locations)
+						monitor.ReportResult (GetJumpTypePartSearchResult (symbol, part));
+				}
 				return;
 			}
-			string fileName;
-			bool isCecilProjectContent = entity.Region.IsEmpty;
-			if (isCecilProjectContent) {
-				fileName = entity.ParentAssembly.UnresolvedAssembly.Location;
-			} else {
-				fileName = entity.Region.FileName;
-			}
-			var project = (entity is ITypeDefinition ? ((ITypeDefinition )entity) : entity.DeclaringTypeDefinition).GetProjectWhereTypeIsDefined ();
-			var doc = IdeApp.Workbench.OpenDocument (fileName,
-				project,
-				entity.Region.BeginLine,
-				entity.Region.BeginColumn);
+			JumpTo (symbol, locations.FirstOrDefault (), project);
+		}
 
-			if (isCecilProjectContent && doc != null) {
+		public void JumpToMetadata (string metadataDllName, string documentationCommentId, Project project = null)
+		{
+			if (metadataDllName == null)
+				throw new ArgumentNullException ("metadataDllName");
+			if (documentationCommentId == null)
+				throw new ArgumentNullException ("documentationCommentId");
+			string fileName = metadataDllName;
+			if (metadataDllName == "CommonLanguageRuntimeLibrary")
+				metadataDllName = "corlib.dll";
+			var dn = project as DotNetProject;
+			if (dn != null) {
+				foreach (var assembly in dn.GetReferencedAssemblies (IdeApp.Workspace.ActiveConfiguration)) {
+					if (assembly.IndexOf(metadataDllName, StringComparison.Ordinal) > 0) {
+						fileName = dn.GetAbsoluteChildPath (assembly);
+						break;
+					}
+				}
+			}
+			if (fileName == null || !File.Exists (fileName))
+				return;
+			var doc = IdeApp.Workbench.OpenDocument (new FileOpenInformation (fileName));
+			if (doc != null) {
 				doc.RunWhenLoaded (delegate {
 					var handler = doc.PrimaryView.GetContent<MonoDevelop.Ide.Gui.Content.IOpenNamedElementHandler> ();
 					if (handler != null)
-						handler.Open (entity);
+						handler.Open (documentationCommentId);
 				});
 			}
 		}
 
-		public void JumpToDeclaration (ICSharpCode.NRefactory.TypeSystem.IVariable entity)
-		{
-			if (entity == null)
-				throw new ArgumentNullException ("entity");
-			string fileName = entity.Region.FileName;
-			// variables are always in the same file -> file is already open, project not needed.
-			IdeApp.Workbench.OpenDocument (fileName, null, entity.Region.BeginLine, entity.Region.BeginColumn);
-		}
-
-		public async Task RenameItem (IWorkspaceFileObject item, string newName)
+		public async void RenameItem (IWorkspaceFileObject item, string newName)
 		{
 			ProjectOptionsDialog.RenameItem (item, newName);
 			if (item is SolutionFolderItem) {
@@ -2100,7 +2124,12 @@ namespace MonoDevelop.Ide
 			return new BackgroundProgressMonitor (GettextCatalog.GetString ("Code completion database generation"), "md-parser");
 		}
 	}
-	
+
+	public interface ITextFileProvider
+	{
+		ITextDocument GetEditableTextFile (FilePath filePath);
+	}
+
 	public class TextFileProvider : ITextFileProvider
 	{
 		static TextFileProvider instance = new TextFileProvider ();
@@ -2113,101 +2142,19 @@ namespace MonoDevelop.Ide
 		TextFileProvider ()
 		{
 		}
-		
-		class ProviderProxy : ITextEditorDataProvider, IEditableTextFile
-		{
-			TextEditorData data;
-			string encoding;
-			bool bom;
-			
-			public ProviderProxy (TextEditorData data, string encoding, bool bom)
-			{
-				this.data = data;
-				this.encoding = encoding;
-				this.bom = bom;
-			}
-
-			public TextEditorData GetTextEditorData ()
-			{
-				return data;
-			}
-			
-			void Save ()
-			{
-				TextFile.WriteFile (Name, Text, encoding, bom);
-			}
-			
-			#region IEditableTextFile implementation
-			public FilePath Name { get { return data.Document.FileName; } }
 
-			public int Length { get { return data.Length; } }
-		
-			public string GetText (int startPosition, int endPosition)
-			{
-				return data.GetTextBetween (startPosition, endPosition);
-			}
-			
-			public char GetCharAt (int position)
-			{
-				return data.GetCharAt (position);
-			}
-			
-			public int GetPositionFromLineColumn (int line, int column)
-			{
-				return data.Document.LocationToOffset (line, column);
-			}
-			
-			public void GetLineColumnFromPosition (int position, out int line, out int column)
-			{
-				var loc = data.Document.OffsetToLocation (position);
-				line = loc.Line;
-				column = loc.Column;
-			}
-			
-			public int InsertText (int position, string text)
-			{
-				int result = data.Insert (position, text);
-				Save ();
-				
-				return result;
-			}
-			
-			public void DeleteText (int position, int length)
-			{
-				data.Remove (position, length);
-				Save ();
-			}
-			
-			public string Text {
-				get {
-					return data.Text;
-				}
-				set {
-					data.Text = value;
-					Save ();
-				}
-			}
-			
-			#endregion
-		}
-		
-		public IEditableTextFile GetEditableTextFile (FilePath filePath)
+		public ITextDocument GetEditableTextFile (FilePath filePath)
 		{
 			if (IdeApp.IsInitialized) {
 				foreach (var doc in IdeApp.Workbench.Documents) {
 					if (doc.FileName == filePath) {
-						IEditableTextFile ef = doc.GetContent<IEditableTextFile> ();
+						var ef = doc.Editor;
 						if (ef != null) return ef;
 					}
 				}
 			}
-			
-			TextFile file = TextFile.ReadFile (filePath);
-			TextEditorData data = new TextEditorData ();
-			data.Document.FileName = filePath;
-			data.Text = file.Text;
-			
-			return new ProviderProxy (data, file.SourceEncoding, file.HadBOM);
+
+			return TextEditorFactory.CreateNewDocument (StringTextSource.ReadFrom (filePath), filePath);
 		}
 
 		/// <summary>
@@ -2216,18 +2163,16 @@ namespace MonoDevelop.Ide
 		/// <returns><c>true</c>, if file operation was saved, <c>false</c> otherwise.</returns>
 		/// <param name="filePath">File path.</param>
 		/// <param name="operation">The operation.</param>
-		public bool EditFile (FilePath filePath, Action<TextEditorData> operation)
+		public bool EditFile (FilePath filePath, Action<ITextDocument> operation)
 		{
 			if (operation == null)
 				throw new ArgumentNullException ("operation");
-			bool hadBom;
-			Encoding encoding;
 			bool isOpen;
-			var data = GetTextEditorData (filePath, out hadBom, out encoding, out isOpen);
+			var data = GetTextEditorData (filePath, out isOpen);
 			operation (data);
 			if (!isOpen) {
-				try { 
-					Mono.TextEditor.Utils.TextFileUtility.WriteText (filePath, data.Text, encoding, hadBom);
+				try {
+					data.Save ();
 				} catch (Exception e) {
 					LoggingService.LogError ("Error while saving changes to : " + filePath, e);
 					return false;
@@ -2236,13 +2181,13 @@ namespace MonoDevelop.Ide
 			return true;
 		}
 
-		public TextEditorData GetTextEditorData (FilePath filePath)
+		public ITextDocument GetTextEditorData (FilePath filePath)
 		{
 			bool isOpen;
 			return GetTextEditorData (filePath, out isOpen);
 		}
 
-		public TextEditorData GetReadOnlyTextEditorData (FilePath filePath)
+		public IReadonlyTextDocument GetReadOnlyTextEditorData (FilePath filePath)
 		{
 			if (filePath.IsNullOrEmpty)
 				throw new ArgumentNullException ("filePath");
@@ -2251,42 +2196,26 @@ namespace MonoDevelop.Ide
 					return doc.Editor;
 				}
 			}
-			bool hadBom;
-			Encoding encoding;
-			var text = Mono.TextEditor.Utils.TextFileUtility.ReadAllText (filePath, out hadBom, out encoding);
-			var data = new TextEditorData (TextDocument.CreateImmutableDocument (text));
-			data.Document.MimeType = DesktopService.GetMimeTypeForUri (filePath);
-			data.Document.FileName = filePath;
-			data.Text = text;
+			var data = TextEditorFactory.CreateNewReadonlyDocument (StringTextSource.ReadFrom (filePath), filePath);
 			return data;
 		}
 
-		public TextEditorData GetTextEditorData (FilePath filePath, out bool isOpen)
-		{
-			bool hadBom;
-			Encoding encoding;
-			return GetTextEditorData (filePath, out hadBom, out encoding, out isOpen);
-		}
-
-		public TextEditorData GetTextEditorData (FilePath filePath, out bool hadBom, out Encoding encoding, out bool isOpen)
+		public ITextDocument GetTextEditorData (FilePath filePath, out bool isOpen)
 		{
 			foreach (var doc in IdeApp.Workbench.Documents) {
 				if (doc.FileName == filePath) {
-					var content = doc.GetContent <MonoDevelop.Ide.Gui.Content.IEncodedTextContent> (); 
-					var theEncoding = content != null ? content.SourceEncoding : null;
-
 					isOpen = true;
-					hadBom = false;
-					encoding = theEncoding ?? Encoding.Default;
 					return doc.Editor;
 				}
 			}
-
-			var text = Mono.TextEditor.Utils.TextFileUtility.ReadAllText (filePath, out hadBom, out encoding);
-			TextEditorData data = new TextEditorData ();
-			data.Document.SuppressHighlightUpdate = true;
-			data.Document.MimeType = DesktopService.GetMimeTypeForUri (filePath);
-			data.Document.FileName = filePath;
+			bool hadBom;
+			Encoding encoding;
+			var text = TextFileUtility.ReadAllText (filePath, out hadBom, out encoding);
+			var data = TextEditorFactory.CreateNewDocument ();
+			data.UseBOM = hadBom;
+			data.Encoding = encoding;
+			data.MimeType = DesktopService.GetMimeTypeForUri (filePath);
+			data.FileName = filePath;
 			data.Text = text;
 			isOpen = false;
 			return data;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
index 33cf83c704..7bfd13a306 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
@@ -554,7 +554,7 @@ namespace MonoDevelop.Ide
 				if (reloading)
 					SetReloading (false);
 			}
-			
+
 			using (monitor) {
 				try {
 					// Add the item in the GUI thread. It is not safe to do it in the background thread.
@@ -910,6 +910,11 @@ namespace MonoDevelop.Ide
 		
 		internal void NotifyItemAdded (WorkspaceItem item)
 		{
+			try {
+				MonoDevelop.Ide.TypeSystem.TypeSystemService.Load (item, null);
+			} catch (Exception ex) {
+				LoggingService.LogError ("Could not load parser database.", ex);
+			}
 			if (DispatchService.IsGuiThread)
 				NotifyItemAddedGui (item, IsReloading);
 			else {
@@ -919,18 +924,9 @@ namespace MonoDevelop.Ide
 				});
 			}
 		}
-		
+
 		void NotifyItemAddedGui (WorkspaceItem item, bool reloading)
 		{
-			try {
-//				Mono.Profiler.RuntimeControls.EnableProfiler ();
-				MonoDevelop.Ide.TypeSystem.TypeSystemService.Load (item);
-//				Mono.Profiler.RuntimeControls.DisableProfiler ();
-//				Console.WriteLine ("PARSE LOAD: " + (DateTime.Now - t).TotalMilliseconds);
-			} catch (Exception ex) {
-				LoggingService.LogError ("Could not load parser database.", ex);
-			}
-
 			Workspace ws = item as Workspace;
 			if (ws != null) {
 				ws.DescendantItemAdded += NotifyDescendantItemAdded;
@@ -982,10 +978,8 @@ namespace MonoDevelop.Ide
 				if (LastWorkspaceItemClosed != null)
 					LastWorkspaceItemClosed (this, EventArgs.Empty);
 			}
-			
 			MonoDevelop.Ide.TypeSystem.TypeSystemService.Unload (item);
-//			ParserDatabase.Unload (item);
-			
+
 			NotifyDescendantItemRemoved (this, args);
 		}
 		
@@ -1223,7 +1217,7 @@ namespace MonoDevelop.Ide
 		/// once for the workspace, and once for each solution.
 		/// </remarks>
 		public event EventHandler<WorkspaceItemEventArgs> WorkspaceItemLoaded;
-		
+
 		/// <summary>
 		/// Fired when a workspace item (a solution or workspace) is unloaded
 		/// </summary>
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs
index bdc908fc2d..8be5d967a0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs
@@ -53,6 +53,7 @@ namespace MonoDevelop.Ide
 		internal static TimerCounter OpenDocumentTimer = InstrumentationService.CreateTimerCounter ("Document opened", "IDE");
 		internal static TimerCounter DocumentOpened = InstrumentationService.CreateTimerCounter ("Document opened", "IDE", id:"Ide.Shell.DocumentOpened");
 		internal static TimerCounter BuildItemTimer = InstrumentationService.CreateTimerCounter ("Project/Solution built in the IDE", "IDE");
+		internal static Counter AutoSavedFiles = InstrumentationService.CreateCounter ("Autosaved Files", "Text Editor");
 		internal static Counter PadShown = InstrumentationService.CreateCounter ("Pad focused", "IDE", id:"Ide.Shell.PadShown");
 
 		internal static class ParserService {
diff --git a/main/src/core/MonoDevelop.Ide/packages.config b/main/src/core/MonoDevelop.Ide/packages.config
new file mode 100644
index 0000000000..0b521ddcb5
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/packages.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0.0-beta2" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0.0-beta2" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0.0-beta2" targetFramework="net45" />

+  <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0.csproj
index db1de1236d..d6a24cbced 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0.csproj
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0.csproj
@@ -10,6 +10,7 @@
     <AssemblyName>MonoDevelop.Projects.Formats.MSBuild</AssemblyName>
     <RootNamespace>MonoDevelop.Projects.Formats.MSBuild</RootNamespace>
     <BaseIntermediateOutputPath>obj\12.0</BaseIntermediateOutputPath>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>True</DebugSymbols>
@@ -40,18 +41,12 @@
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>$(MSBuildProgramFiles32)\MSBuild\12.0\Bin\Microsoft.Build.dll</HintPath>
-      <Private>False</Private>
-      <SpecificVersion>True</SpecificVersion>
     </Reference>
     <Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>$(MSBuildProgramFiles32)\MSBuild\12.0\Bin\Microsoft.Build.Framework.dll</HintPath>
-      <Private>False</Private>
-      <SpecificVersion>True</SpecificVersion>
     </Reference>
     <Reference Include="Microsoft.Build.Utilities.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>$(MSBuildProgramFiles32)\MSBuild\12.0\Bin\Microsoft.Build.Utilities.v12.0.dll</HintPath>
-      <Private>False</Private>
-      <SpecificVersion>True</SpecificVersion>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/BufferTests.cs b/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/BufferTests.cs
index 36ff408cde..516613d132 100644
--- a/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/BufferTests.cs
+++ b/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/BufferTests.cs
@@ -27,6 +27,7 @@ using System;
 using System.Collections.Generic;
 using NUnit.Framework;
 using System.Linq;
+using Mono.TextEditor.Utils;
 
 namespace Mono.TextEditor.Tests
 {
@@ -36,48 +37,53 @@ namespace Mono.TextEditor.Tests
 		[Test()]
 		public void TestSearchForwardMany ()
 		{
-			GapBuffer buffer = new GapBuffer ();
-			buffer.Text = new string ('a', 100);
+			var buffer = new Rope<char> ();
+			buffer.InsertText (0, new string ('a', 100));
 			int cnt = 0;
 			int o = 0;
-			while ((o = buffer.IndexOf ("a", o, buffer.TextLength - o, StringComparison.Ordinal)) >= 0) {
+			while ((o = buffer.IndexOf ("a", o, buffer.Length - o, StringComparison.Ordinal)) >= 0) {
 				cnt++;
 				o++;
 			}
 			Assert.AreEqual (100, cnt);
 		}
 		
+		[Ignore]
 		[Test()]
 		public void TestSearchBackwardMany ()
 		{
-			GapBuffer buffer = new GapBuffer ();
-			buffer.Text = new string ('a', 100);
+			var buffer = new Rope<char> ();
+			buffer.InsertText (0, new string ('a', 100));
 			int cnt = 0;
-			int o = buffer.TextLength;
+			int o = buffer.Length;
 			while (o > 0 && (o = buffer.LastIndexOf ("a", o - 1, o, StringComparison.Ordinal)) != -1) {
 				cnt++;
 			}
 			Assert.AreEqual (100, cnt);
 		}
-		
+		void Replace (Rope<char> buffer, int idx, int cnt, string value) 
+		{
+			buffer.RemoveRange (idx, cnt);
+			buffer.InsertText (idx, value);
+		}
 		[Test()]
 		public void TestSearchForward ()
 		{
-			GapBuffer buffer = new GapBuffer ();
+			var buffer = new Rope<char> ();
 			for (int i = 0; i < 100; i++) {
-				buffer.Insert (0, "a");
+				buffer.InsertText (0, "a");
 			}
-			var idx = new List<int> (new [] { 0,  buffer.TextLength / 2, buffer.TextLength });
+			var idx = new List<int> (new [] { 0,  buffer.Length / 2, buffer.Length });
 			
-			idx.ForEach (i => buffer.Insert (i, "test"));
+			idx.ForEach (i => buffer.InsertText (i, "test"));
 			
 			// move gap to the beginning
-			buffer.Replace (idx [0], 1, buffer.GetCharAt (idx [0]).ToString ());
+			Replace (buffer, idx [0], 1, buffer[idx [0]].ToString ());
 			
 			List<int> results = new List<int> ();
 			
 			int o = 0;
-			while ((o = buffer.IndexOf ("test", o, buffer.TextLength - o, StringComparison.Ordinal)) >= 0) {
+			while ((o = buffer.IndexOf ("test", o, buffer.Length - o, StringComparison.Ordinal)) >= 0) {
 				results.Add (o);
 				o++;
 			}
@@ -88,11 +94,11 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [i], results [i], (i + 1) + ". match != " + idx [i] + " was " + results [i]);
 			
 			// move gap to the middle
-			buffer.Replace (idx [1], 1, buffer.GetCharAt (idx [1]).ToString ());
+			Replace (buffer, idx [1], 1, buffer [idx [1]].ToString ());
 			
 			results = new List<int> ();
 			o = 0;
-			while ((o = buffer.IndexOf ("test", o, buffer.TextLength - o, StringComparison.Ordinal)) >= 0) {
+			while ((o = buffer.IndexOf ("test", o, buffer.Length - o, StringComparison.Ordinal)) >= 0) {
 				results.Add (o);
 				o++;
 			}
@@ -102,11 +108,11 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [i], results [i], (i + 1) + ". match != " + idx [i] + " was " + results [i]);
 			
 			// move gap to the end
-			buffer.Replace (idx [2], 1, buffer.GetCharAt (idx [2]).ToString ());
+			Replace (buffer, idx [2], 1, buffer [idx [2]].ToString ());
 			
 			results = new List<int> ();
 			o = 0;
-			while ((o = buffer.IndexOf ("test", o, buffer.TextLength - o, StringComparison.Ordinal)) >= 0) {
+			while ((o = buffer.IndexOf ("test", o, buffer.Length - o, StringComparison.Ordinal)) >= 0) {
 				results.Add (o);
 				o++;
 			}
@@ -116,11 +122,11 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [i], results [i], (i + 1) + ". match != " + idx [i] + " was " + results [i]);
 			
 			// move gap to the end
-			buffer.Replace (buffer.TextLength - 1, 1, buffer.GetCharAt (buffer.TextLength - 1).ToString ());
+			Replace (buffer, buffer.Length - 1, 1, buffer [buffer.Length - 1].ToString ());
 			
 			results = new List<int> ();
 			o = 0;
-			while ((o = buffer.IndexOf ("test", o, buffer.TextLength - o, StringComparison.Ordinal)) >= 0) {
+			while ((o = buffer.IndexOf ("test", o, buffer.Length - o, StringComparison.Ordinal)) >= 0) {
 				results.Add (o);
 				o++;
 			}
@@ -133,20 +139,20 @@ namespace Mono.TextEditor.Tests
 		[Test()]
 		public void TestSearchForwardIgnoreCase ()
 		{
-			GapBuffer buffer = new GapBuffer ();
+			var buffer = new Rope<char> ();
 			for (int i = 0; i < 100; i++) {
-				buffer.Insert (0, "a");
+				buffer.InsertText (0, "a");
 			}
-			var idx = new List<int> (new [] { 0,  buffer.TextLength / 2, buffer.TextLength });
+			var idx = new List<int> (new [] { 0,  buffer.Length / 2, buffer.Length });
 			
-			idx.ForEach (i => buffer.Insert (i, "test"));
+			idx.ForEach (i => buffer.InsertText (i, "test"));
 			
 			// move gap to the beginning
-			buffer.Replace (idx [0], 1, buffer.GetCharAt (idx [0]).ToString ());
+			Replace (buffer, idx [0], 1, buffer [idx [0]].ToString ());
 			
 			List<int> results = new List<int> ();
 			int o = 0;
-			while ((o = buffer.IndexOf ("TEST", o, buffer.TextLength - o, StringComparison.OrdinalIgnoreCase)) >= 0) {
+			while ((o = buffer.IndexOf ("TEST", o, buffer.Length - o, StringComparison.OrdinalIgnoreCase)) >= 0) {
 				results.Add (o);
 				o++;
 			}
@@ -156,11 +162,11 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [i], results [i], (i + 1) + ". match != " + idx [i] + " was " + results [i]);
 			
 			// move gap to the middle
-			buffer.Replace (idx [1], 1, buffer.GetCharAt (idx [1]).ToString ());
+			Replace (buffer, idx [1], 1, buffer [idx [1]].ToString ());
 			
 			results = new List<int> ();
 			o = 0;
-			while ((o = buffer.IndexOf ("TEST", o, buffer.TextLength - o, StringComparison.OrdinalIgnoreCase)) >= 0) {
+			while ((o = buffer.IndexOf ("TEST", o, buffer.Length - o, StringComparison.OrdinalIgnoreCase)) >= 0) {
 				results.Add (o);
 				o++;
 			}
@@ -170,11 +176,11 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [i], results [i], (i + 1) + ". match != " + idx [i] + " was " + results [i]);
 			
 			// move gap to the end
-			buffer.Replace (idx [2], 1, buffer.GetCharAt (idx [2]).ToString ());
+			Replace (buffer, idx [2], 1, buffer [idx [2]].ToString ());
 			
 			results = new List<int> ();
 			o = 0;
-			while ((o = buffer.IndexOf ("TEST", o, buffer.TextLength - o, StringComparison.OrdinalIgnoreCase)) >= 0) {
+			while ((o = buffer.IndexOf ("TEST", o, buffer.Length - o, StringComparison.OrdinalIgnoreCase)) >= 0) {
 				results.Add (o);
 				o++;
 			}
@@ -183,11 +189,11 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [i], results [i], (i + 1) + ". match != " + idx [i] + " was " + results [i]);
 			
 			// move gap to the end
-			buffer.Replace (buffer.TextLength - 1, 1, buffer.GetCharAt (buffer.TextLength - 1).ToString ());
+			Replace (buffer, buffer.Length - 1, 1, buffer [buffer.Length - 1].ToString ());
 			
 			results = new List<int> ();
 			o = 0;
-			while ((o = buffer.IndexOf ("TEST", o, buffer.TextLength - o, StringComparison.OrdinalIgnoreCase)) >= 0) {
+			while ((o = buffer.IndexOf ("TEST", o, buffer.Length - o, StringComparison.OrdinalIgnoreCase)) >= 0) {
 				results.Add (o);
 				o++;
 			}
@@ -196,24 +202,25 @@ namespace Mono.TextEditor.Tests
 			for (int i = 0; i < idx.Count; i++)
 				Assert.AreEqual (idx[i], results[i], (i + 1) +". match != " + idx[i] +  " was " + results[i]);
 		}
-		
+
+		[Ignore]
 		[Test()]
 		public void TestSearchBackward ()
 		{
-			GapBuffer buffer = new GapBuffer ();
+			var buffer = new Rope<char> ();
 			for (int i = 0; i < 100; i++) {
-				buffer.Insert (0, "a");
+				buffer.InsertText (0, "a");
 			}
-			var idx = new List<int> (new [] { 0,  buffer.TextLength / 2, buffer.TextLength });
+			var idx = new List<int> (new [] { 0,  buffer.Length / 2, buffer.Length });
 			
-			idx.ForEach (i => buffer.Insert (i, "test"));
+			idx.ForEach (i => buffer.InsertText (i, "test"));
 			
 			// move gap to the beginning
-			buffer.Replace (idx [0], 1, buffer.GetCharAt (idx [0]).ToString ());
+			Replace (buffer, idx [0], 1, buffer [idx [0]].ToString ());
 			
 			List<int> results = new List<int> ();
-			int o = buffer.TextLength;
-			while (o > 0 && (o = buffer.LastIndexOf ("test", o - 1, o, StringComparison.Ordinal)) != -1) {
+			int o = buffer.Length;
+			while (o > 0 && (o = buffer.LastIndexOf ("test", o - 1, buffer.Length - (o - 1), StringComparison.Ordinal)) != -1) {
 				results.Add (o);
 			}
 			
@@ -224,10 +231,10 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [idx.Count - 1 - i], results [i], (i + 1) + ". match != " + idx [idx.Count - 1 - i] + " was " + results [i]);
 			
 			// move gap to the middle
-			buffer.Replace (idx [1], 1, buffer.GetCharAt (idx [1]).ToString ());
+			Replace (buffer, idx [1], 1, buffer [idx [1]].ToString ());
 			
 			results = new List<int> ();
-			o = buffer.TextLength - 1;
+			o = buffer.Length - 1;
 			while (o > 0 && (o = buffer.LastIndexOf ("test", o - 1, o, StringComparison.Ordinal)) != -1) {
 				results.Add (o);
 			}
@@ -237,10 +244,10 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [idx.Count - 1 - i], results [i], (i + 1) + ". match != " + idx [idx.Count - 1 - i] + " was " + results [i]);
 			
 			// move gap to the end
-			buffer.Replace (idx [2], 1, buffer.GetCharAt (idx [2]).ToString ());
+			Replace (buffer, idx [2], 1, buffer [idx [2]].ToString ());
 			
 			results = new List<int> ();
-			o = buffer.TextLength - 1;
+			o = buffer.Length - 1;
 			while (o > 0 && (o = buffer.LastIndexOf ("test", o - 1, o, StringComparison.Ordinal)) != -1) {
 				results.Add (o);
 			}
@@ -250,10 +257,10 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [idx.Count - 1 - i], results [i], (i + 1) + ". match != " + idx [idx.Count - 1 - i] + " was " + results [i]);
 			
 			// move gap to the end
-			buffer.Replace (buffer.TextLength - 1, 1, buffer.GetCharAt (buffer.TextLength - 1).ToString ());
+			Replace (buffer, buffer.Length - 1, 1, buffer [buffer.Length - 1].ToString ());
 			
 			results = new List<int> ();
-			o = buffer.TextLength - 1;
+			o = buffer.Length - 1;
 			while (o > 0 && (o = buffer.LastIndexOf ("test", o - 1, o, StringComparison.Ordinal)) != -1) {
 				results.Add (o);
 			}
@@ -262,22 +269,23 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx[idx.Count -  1 - i], results[i], (i + 1) +". match != " + idx[idx.Count -  1 - i] +  " was " + results[i]);
 		}
 		
+		[Ignore]
 		[Test()]
 		public void TestSearchBackwardIgnoreCase ()
 		{
-			GapBuffer buffer = new GapBuffer ();
+			var buffer = new Rope<char> ();
 			for (int i = 0; i < 100; i++) {
-				buffer.Insert (0, "a");
+				buffer.InsertText (0, "a");
 			}
-			var idx = new List<int> (new [] { 0,  buffer.TextLength / 2, buffer.TextLength });
+			var idx = new List<int> (new [] { 0,  buffer.Length / 2, buffer.Length });
 			
-			idx.ForEach (i => buffer.Insert (i, "test"));
+			idx.ForEach (i => buffer.InsertText (i, "test"));
 			
 			// move gap to the beginning
-			buffer.Replace (idx [0], 1, buffer.GetCharAt (idx [0]).ToString ());
+			Replace (buffer, idx [0], 1, buffer [idx [0]].ToString ());
 			
 			List<int> results = new List<int> ();
-			int o = buffer.TextLength - 1;
+			int o = buffer.Length - 1;
 			while (o > 0 && (o = buffer.LastIndexOf ("TEST", o - 1, o, StringComparison.OrdinalIgnoreCase)) != -1) {
 				results.Add (o);
 				o--;
@@ -288,10 +296,10 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [idx.Count - 1 - i], results [i], (i + 1) + ". match != " + idx [idx.Count - 1 - i] + " was " + results [i]);
 			
 			// move gap to the middle
-			buffer.Replace (idx [1], 1, buffer.GetCharAt (idx [1]).ToString ());
+			Replace (buffer, idx [1], 1, buffer [idx [1]].ToString ());
 			
 			results = new List<int> ();
-			o = buffer.TextLength - 1;
+			o = buffer.Length - 1;
 			while (o > 0 && (o = buffer.LastIndexOf ("TEST", o - 1, o, StringComparison.OrdinalIgnoreCase)) != -1) {
 				results.Add (o);
 				o--;
@@ -301,10 +309,10 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [idx.Count - 1 - i], results [i], (i + 1) + ". match != " + idx [idx.Count - 1 - i] + " was " + results [i]);
 			
 			// move gap to the end
-			buffer.Replace (idx [2], 1, buffer.GetCharAt (idx [2]).ToString ());
+			Replace (buffer, idx [2], 1, buffer [idx [2]].ToString ());
 			
 			results = new List<int> ();
-			o = buffer.TextLength - 1;
+			o = buffer.Length - 1;
 			while (o > 0 && (o = buffer.LastIndexOf ("TEST", o - 1, o, StringComparison.OrdinalIgnoreCase)) != -1) {
 				results.Add (o);
 				o--;
@@ -314,10 +322,10 @@ namespace Mono.TextEditor.Tests
 				Assert.AreEqual (idx [idx.Count - 1 - i], results [i], (i + 1) + ". match != " + idx [idx.Count - 1 - i] + " was " + results [i]);
 			
 			// move gap to the end
-			buffer.Replace (buffer.TextLength - 1, 1, buffer.GetCharAt (buffer.TextLength - 1).ToString ());
+			Replace (buffer, buffer.Length - 1, 1, buffer [buffer.Length - 1].ToString ());
 			
 			results = new List<int> ();
-			o = buffer.TextLength - 1;
+			o = buffer.Length - 1;
 			while (o > 0 && (o = buffer.LastIndexOf ("TEST", o - 1, o, StringComparison.OrdinalIgnoreCase)) != -1) {
 				results.Add (o);
 				o--;
diff --git a/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/LineSplitterTests.cs b/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/LineSplitterTests.cs
index 0bfcf65a86..f044049d3d 100644
--- a/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/LineSplitterTests.cs
+++ b/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/LineSplitterTests.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Text;
 using NUnit.Framework;
+using Mono.TextEditor.Utils;
 
 namespace Mono.TextEditor.Tests
 {
@@ -38,10 +39,10 @@ namespace Mono.TextEditor.Tests
 		[Test()]
 		public void TestLastLineCreation ()
 		{
-			IBuffer buffer = new Mono.TextEditor.GapBuffer ();
+			var buffer = new Rope<char> ();
 			LineSplitter splitter = new Mono.TextEditor.LineSplitter ();
-			buffer.Text = "1\n2\n3\n";
-			splitter.TextReplaced (null, new DocumentChangeEventArgs (0, "", buffer.Text));
+			buffer.InsertText (0, "1\n2\n3\n");
+			splitter.TextReplaced (null, new DocumentChangeEventArgs (0, "", buffer.ToString ()));
 			Assert.AreEqual (4, splitter.Count);
 			for (int i = 0; i < 3; i++) {
 				Assert.AreEqual (i * 2, splitter.Get (i + 1).Offset);
@@ -58,13 +59,13 @@ namespace Mono.TextEditor.Tests
 		[Test()]
 		public void TestLastLineRemove ()
 		{
-			IBuffer buffer = new Mono.TextEditor.GapBuffer ();
+			var buffer = new Rope<char> ();
 			LineSplitter splitter = new Mono.TextEditor.LineSplitter ();
-			buffer.Text = "1\n2\n3\n";
-			splitter.TextReplaced (null, new DocumentChangeEventArgs (0, "", buffer.Text));
+			buffer.InsertText (0, "1\n2\n3\n");
+			splitter.TextReplaced (null, new DocumentChangeEventArgs (0, "", buffer.ToString ()));
 			
 			DocumentLine lastLine = splitter.Get (2);
-			splitter.TextReplaced (null, new DocumentChangeEventArgs (lastLine.Offset, buffer.GetTextAt (lastLine.Offset, lastLine.LengthIncludingDelimiter), ""));
+			splitter.TextReplaced (null, new DocumentChangeEventArgs (lastLine.Offset, buffer.ToString (lastLine.Offset, lastLine.LengthIncludingDelimiter), ""));
 			
 			Assert.AreEqual (3, splitter.Count);
 			
diff --git a/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/VirtualIndentModeTests.cs b/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/VirtualIndentModeTests.cs
index a163c4dcec..2ab0d1be4e 100644
--- a/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/VirtualIndentModeTests.cs
+++ b/main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/VirtualIndentModeTests.cs
@@ -168,8 +168,8 @@ namespace Mono.TextEditor.Tests
 			var data = CreateData ("test\n\n\n");
 			data.Caret.Location = new DocumentLocation (2, data.IndentationTracker.GetVirtualIndentationColumn (2, 1));
 			DeleteActions.Backspace (data);
-			Assert.AreEqual (new DocumentLocation (2, data.IndentationTracker.GetVirtualIndentationColumn (2, 1) - 1), data.Caret.Location);
-			Assert.AreEqual ("test\n\t\n\n", data.Document.Text);
+			Assert.AreEqual (new DocumentLocation (1, 5), data.Caret.Location);
+			Assert.AreEqual ("test\n\n", data.Document.Text);
 		}
 
 		[Test]
@@ -206,7 +206,7 @@ namespace Mono.TextEditor.Tests
 			CaretMoveActions.Up (data);
 			Assert.AreEqual (new DocumentLocation (1, 3), data.Caret.Location);
 			DeleteActions.Delete (data);
-			Assert.AreEqual ("\t\t\t\ttest", data.Document.Text);
+			Assert.AreEqual ("\t\ttest", data.Document.Text);
 		}
 
 		[Test]
@@ -262,7 +262,7 @@ namespace Mono.TextEditor.Tests
 			data.Caret.Location = new DocumentLocation (2, 2);
 			DeleteActions.Backspace (data);
 			Assert.AreEqual ("\n\n\n", data.Document.Text);
-			Assert.AreEqual (1, data.Caret.Column);
+			Assert.AreEqual (1, data.Caret.Offset);
 		}
 
 		[Test]
@@ -391,7 +391,7 @@ namespace Mono.TextEditor.Tests
 			data.Caret.Location = new DocumentLocation (1, 2);
 			DeleteActions.Backspace (data);
 			Assert.AreEqual ("", data.Document.Text);
-			Assert.AreEqual (new DocumentLocation (1, 1), data.Caret.Location);
+			Assert.AreEqual (0, data.Caret.Offset);
 		}
 
 		/// <summary>
@@ -455,15 +455,105 @@ namespace Mono.TextEditor.Tests
 			data.Caret.Location = new DocumentLocation (4, 3);
 
 			DeleteActions.Backspace (data);
-			Assert.AreEqual (new DocumentLocation (4, 2), data.Caret.Location);
+			Assert.AreEqual (new DocumentLocation (3, 3), data.Caret.Location);
+
+		}
+
+		[Test]
+		public void TestSmartBackspaceBehavior ()
+		{
+			var data = CreateData ("\n\t\t\n\t\t");
+			data.Caret.Location = new DocumentLocation (3, 3);
 			DeleteActions.Backspace (data);
-			Assert.AreEqual (new DocumentLocation (4, 1), data.Caret.Location);
+			Assert.AreEqual (new DocumentLocation (2, 3), data.Caret.Location);
+			Assert.AreEqual ("\n", data.Document.Text);
+		}
 
+		[Test]
+		public void TestSmartBackspaceBehaviorCase2 ()
+		{
+			var data = CreateData ("\n\t\tTest\n\t\t");
+			data.Caret.Location = new DocumentLocation (3, 3);
+			DeleteActions.Backspace (data);
+			Assert.AreEqual (new DocumentLocation (2, 7), data.Caret.Location);
+			Assert.AreEqual ("\n\t\tTest", data.Document.Text);
+		}
+
+		[Test]
+		public void TestSmartBackspaceBehaviorCase3 ()
+		{
+			var data = CreateData ("\n\t\t   Test");
+			data.Caret.Location = new DocumentLocation (2, 6);
 			DeleteActions.Backspace (data);
-			Assert.AreEqual (new DocumentLocation (3, 3), data.Caret.Location);
 
+			Assert.AreEqual (new DocumentLocation (2, 5), data.Caret.Location);
+			Assert.AreEqual ("\n\t\t  Test", data.Document.Text);
+
+			DeleteActions.Backspace (data);
+			Assert.AreEqual (new DocumentLocation (2, 4), data.Caret.Location);
+			Assert.AreEqual ("\n\t\t Test", data.Document.Text);
+
+			DeleteActions.Backspace (data);
+			Assert.AreEqual (new DocumentLocation (2, 3), data.Caret.Location);
+			Assert.AreEqual ("\n\t\tTest", data.Document.Text);
 		}
 
+		[Test]
+		public void TestEmptyLineSmartBackspace ()
+		{
+			var data = CreateData ("\n\n\n\n");
+			data.IndentationTracker = new SmartIndentModeTests.TestIndentTracker ("\t");
+			data.Caret.Location = new DocumentLocation (3, 2);
+			DeleteActions.Backspace (data);
+			Assert.AreEqual (new DocumentLocation (2, 2), data.Caret.Location);
+			Assert.AreEqual ("\n\n\n", data.Document.Text);
+			DeleteActions.Backspace (data);
+			Assert.AreEqual (new DocumentLocation (1, 2), data.Caret.Location);
+			Assert.AreEqual ("\n\n", data.Document.Text);
+		}
+
+
+		[Test]
+		public void TestSmartExistingLineBackspace ()
+		{
+			var data = CreateData ("\n\t\t\n\t\tTest");
+			data.Caret.Location = new DocumentLocation (3, 3);
+			DeleteActions.Backspace (data);
+			Assert.AreEqual (new DocumentLocation (2, 3), data.Caret.Location);
+			Assert.AreEqual ("\n\t\tTest", data.Document.Text);
+		}
+
+
+		[Test]
+		public void TestSmartDeleteBehavior ()
+		{
+			var data = CreateData ("\n\t\t\n\t\t");
+			data.Caret.Location = new DocumentLocation (2, 3);
+			DeleteActions.Delete (data);
+			Assert.AreEqual (new DocumentLocation (2, 3), data.Caret.Location);
+			Assert.AreEqual ("\n", data.Document.Text);
+		}
+
+		[Test]
+		public void TestSmartDeleteBehaviorNonEmptyLines ()
+		{
+			var data = CreateData ("\n\t\tFoo\n\t\tBar");
+			data.Caret.Location = new DocumentLocation (2, 6);
+			DeleteActions.Delete (data);
+			Assert.AreEqual (new DocumentLocation (2, 6), data.Caret.Location);
+			Assert.AreEqual ("\n\t\tFooBar", data.Document.Text);
+		}
+
+
+		[Test]
+		public void TestSmartDeleteBehaviorBug1 ()
+		{
+			var data = CreateData ("\n\t\tFoo\n\t\t Bar");
+			data.Caret.Location = new DocumentLocation (2, 6);
+			DeleteActions.Delete (data);
+			Assert.AreEqual (new DocumentLocation (2, 6), data.Caret.Location);
+			Assert.AreEqual ("\n\t\tFooBar", data.Document.Text);
+		}
 	}
 }
 
diff --git a/main/src/tools/mdmonitor/TimeLineView.cs b/main/src/tools/mdmonitor/TimeLineView.cs
index cac59f3169..613d5386e2 100644
--- a/main/src/tools/mdmonitor/TimeLineView.cs
+++ b/main/src/tools/mdmonitor/TimeLineView.cs
@@ -368,7 +368,7 @@ namespace Mono.Instrumentation.Monitor
 			
 			ctx.NewPath ();
 			ctx.Rectangle (markerX, ytop + baseTime + 0.5, MarkerWidth/2, ((mainValue.Duration.TotalMilliseconds * scale) / 1000));
-			Mono.TextEditor.HslColor hsl = Style.Foreground (Gtk.StateType.Normal);
+			HslColor hsl = Style.Foreground (Gtk.StateType.Normal);
 			hsl.L = 0.8;
 			ctx.SetSourceColor (hsl);
 			ctx.Fill ();
@@ -465,7 +465,7 @@ namespace Mono.Instrumentation.Monitor
 				ctx.NewPath ();
 				double dx = val == focusedValue ? 0 : 2;
 				ctx.Rectangle (lx + 0.5 + dx - SelectedValuePadding, ytime + 0.5, LineEndWidth - dx*2 + SelectedValuePadding, ((val.Duration.TotalMilliseconds * scale) / 1000));
-				Mono.TextEditor.HslColor hsl = color;
+				HslColor hsl = color;
 				hsl.L = val == focusedValue ? 0.9 : 0.8;
 				ctx.SetSourceColor (hsl);
 				ctx.Fill ();
diff --git a/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj b/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj
index c0516db167..a474509d89 100644
--- a/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj
+++ b/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj
@@ -36,7 +36,6 @@
     <Reference Include="System" />
     <Reference Include="MonoMac">
       <HintPath>..\..\external\monomac\src\MonoMac.dll</HintPath>
-      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/GenerateNewMemberTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/GenerateNewMemberTests.cs
index c83146a734..1751e877d1 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/GenerateNewMemberTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/GenerateNewMemberTests.cs
@@ -30,9 +30,12 @@ using MonoDevelop.CSharpBinding.Tests;
 using System.Collections.Generic;
 using MonoDevelop.CSharpBinding;
 using MonoDevelop.Ide.Gui;
-using Mono.TextEditor;
 using MonoDevelop.Ide.TypeSystem;
 using System.Linq;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Core.ProgressMonitoring;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharpBinding.Refactoring
 {
@@ -41,17 +44,14 @@ namespace MonoDevelop.CSharpBinding.Refactoring
 	{
 		static void TestInsertionPoints (string text)
 		{
-			
-			TestWorkbenchWindow tww = new TestWorkbenchWindow ();
-			TestViewContent sev = new TestViewContent ();
-			var project = new UnknownProject ();
-			project.FileName = "test.csproj";
-			
-			TypeSystemService.LoadProject (project);
-
-			sev.Project = project;
-			tww.ViewContent = sev;
+			var tww = new TestWorkbenchWindow ();
+			var content = new TestViewContent ();
+			tww.ViewContent = content;
+			content.ContentName = "/a.cs";
+			content.Data.MimeType = "text/x-csharp";
+			MonoDevelop.AnalysisCore.AnalysisOptions.EnableUnitTestEditorIntegration.Set (true);
 			var doc = new MonoDevelop.Ide.Gui.Document (tww);
+
 			var data = doc.Editor;
 			List<InsertionPoint> loc = new List<InsertionPoint> ();
 			for (int i = 0; i < text.Length; i++) {
@@ -61,7 +61,7 @@ namespace MonoDevelop.CSharpBinding.Refactoring
 					ch = text [i];
 					NewLineInsertion insertBefore = NewLineInsertion.None;
 					NewLineInsertion insertAfter = NewLineInsertion.None;
-					
+
 					switch (ch) {
 					case 'n':
 						break;
@@ -83,7 +83,7 @@ namespace MonoDevelop.CSharpBinding.Refactoring
 					case 'S':
 						insertBefore = insertAfter = NewLineInsertion.BlankLine;
 						break;
-						
+
 					case 't':
 						insertBefore = NewLineInsertion.Eol;
 						insertAfter = NewLineInsertion.BlankLine;
@@ -104,21 +104,42 @@ namespace MonoDevelop.CSharpBinding.Refactoring
 						Assert.Fail ("unknown insertion point:" + ch);
 						break;
 					}
-					loc.Add (new InsertionPoint (data.Document.OffsetToLocation (data.Document.TextLength), insertBefore, insertAfter));
+					var vv = data.OffsetToLocation (data.Length);
+					loc.Add (new InsertionPoint (new DocumentLocation (vv.Line, vv.Column), insertBefore, insertAfter));
 				} else {
-					data.Insert (data.Document.TextLength, ch.ToString ());
+					data.InsertText (data.Length, ch.ToString ());
 				}
 			}
-			
-			var parsedFile = TypeSystemService.ParseFile (project, "program.cs", "text/x-csharp", data.Document.Text);
 
-			var foundPoints = CodeGenerationService.GetInsertionPoints (doc.Editor, parsedFile, parsedFile.TopLevelTypeDefinitions.First ());
-			Assert.AreEqual (loc.Count, foundPoints.Count, "point count doesn't match");
+
+			var project = new DotNetAssemblyProject (Microsoft.CodeAnalysis.LanguageNames.CSharp);
+			project.Name = "test";
+			project.FileName = "test.csproj";
+			project.Files.Add (new ProjectFile ("/a.cs", BuildAction.Compile)); 
+
+			var solution = new MonoDevelop.Projects.Solution ();
+			solution.AddConfiguration ("", true); 
+			solution.DefaultSolutionFolder.AddItem (project);
+			using (var monitor = new NullProgressMonitor ())
+				TypeSystemService.Load (solution, monitor, false);
+			content.Project = project;
+			doc.SetProject (project);
+			var parsedFile = doc.UpdateParseDocument ();
+			var model = parsedFile.GetAst<SemanticModel> ();
+
+			var sym = model.GetEnclosingSymbol (data.Text.IndexOf ('{'));
+			var type = sym as INamedTypeSymbol ?? sym.ContainingType;
+
+			var foundPoints = InsertionPointService.GetInsertionPoints (doc.Editor, parsedFile, type, type.Locations.First ());
+			//	Assert.AreEqual (loc.Count, foundPoints.Count, "point count doesn't match");
 			for (int i = 0; i < loc.Count; i++) {
 				Assert.AreEqual (loc[i].Location, foundPoints[i].Location, "point " + i + " doesn't match");
 				Assert.AreEqual (loc[i].LineAfter, foundPoints[i].LineAfter, "point " + i + " ShouldInsertNewLineAfter doesn't match");
 				Assert.AreEqual (loc[i].LineBefore, foundPoints[i].LineBefore, "point " + i + " ShouldInsertNewLineBefore doesn't match");
 			}
+
+			TypeSystemService.Unload (solution);
+
 		}
 		
 		[Test()]
@@ -287,7 +308,36 @@ public class EmptyClass
 ");
 		}
 
-		
+		[Test]
+		public void TestComplexInsertionPOintCase3 ()
+		{
+			TestInsertionPoints (@"using System;
+class vaevle
+{
+@D    int fooBar = 0;
+@u	
+
+    public event EventHandler FooBar;
+@u	
+
+    public vaevle ()
+    {
+        FooBar += HandleEventHandler;
+    }
+@u	
+
+    public static void Main (string [] args)
+    {
+        try {
+            System.Console.WriteLine (nameof (args));
+        } catch (Exception e) when (true) {
+
+        }
+    }
+@s}
+
+");
+		}
 	}
 }
 
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/ResolveNamespaceTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/ResolveNamespaceTests.cs
deleted file mode 100644
index 5b53a5a12a..0000000000
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/ResolveNamespaceTests.cs
+++ /dev/null
@@ -1,413 +0,0 @@
-// 
-// ResolveNamespaceTests.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using MonoDevelop.CSharpBinding.Tests;
-using System.Collections.Generic;
-using MonoDevelop.CSharpBinding;
-using MonoDevelop.Ide.Gui;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.CSharp;
-using MonoDevelop.CSharp.Completion;
-using MonoDevelop.Refactoring;
-using System.Linq;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.CSharpBinding.Refactoring
-{
-	[TestFixture]
-	public class ResolveNamespaceTests : UnitTests.TestBase
-	{
-		static Document Setup (string input)
-		{
-			var tww = new TestWorkbenchWindow ();
-			var content = new TestViewContent ();
-
-			var project = Services.ProjectService.CreateDotNetProject ("C#");
-			project.Name = "test";
-			project.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
-			project.References.Add (new ProjectReference (ReferenceType.Package, "System.Core"));
-
-			project.FileName = "test.csproj";
-
-			var wrapper = TypeSystemService.LoadProject (project);
-			wrapper.EnsureReferencesAreLoaded ();
-			wrapper.ReconnectAssemblyReferences (); 
-			content.Project = project;
-
-			tww.ViewContent = content;
-			content.ContentName = "a.cs";
-			content.GetTextEditorData ().Document.MimeType = "text/x-csharp";
-			var doc = new Document (tww);
-
-			var text = input;
-			int endPos = text.IndexOf ('$');
-			if (endPos >= 0)
-				text = text.Substring (0, endPos) + text.Substring (endPos + 1);
-
-			content.Text = text;
-			content.CursorPosition = Math.Max (0, endPos);
-
-			var compExt = new CSharpCompletionTextEditorExtension ();
-			compExt.Initialize (doc);
-			content.Contents.Add (compExt);
-			doc.UpdateParseDocument ();
-			return doc;
-		}
-
-		List<MonoDevelop.Refactoring.ResolveCommandHandler.PossibleNamespace> GetResult (string input)
-		{
-			var doc = Setup (input);
-			var location = doc.Editor.Caret.Location;
-			ResolveResult resolveResult;
-			AstNode node;
-			doc.TryResolveAt (location, out resolveResult, out node);
-			return ResolveCommandHandler.GetPossibleNamespaces (doc, node, ref resolveResult);
-		}
-
-		[Test]
-		public void TestObjectCreationType ()
-		{
-			var result = GetResult (@"class Test {
-	void MyMethod ()
-	{
-		var list = new $List<string> ();
-	}
-}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Collections.Generic"));
-		}
-
-		[Test]
-		public void TestLocalVariableType ()
-		{
-			var result = GetResult (@"class Test {
-	void MyMethod ()
-	{
-		$List<string> list;
-	}
-}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Collections.Generic"));
-		}
-
-		[Test]
-		public void TestParameterType ()
-		{
-			var result = GetResult (@"class Test {
-	void MyMethod ($List<string> list)
-	{
-	}
-}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Collections.Generic"));
-		}
-		
-		[Test]
-		public void TestFieldType ()
-		{
-			var result = GetResult (@"class Test {
-	$List<string> list;
-}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Collections.Generic"));
-		}
-		
-		
-		[Test]
-		public void TestBaseType ()
-		{
-			var result = GetResult (@"class Test : $List<string> {}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Collections.Generic"));
-		}
-		
-
-		[Test]
-		public void TestLocalVariableValid ()
-		{
-			var result = GetResult (@"using System.Collections.Generic;
-class Test {
-	void MyMethod ()
-	{
-		$List<string> list;
-	}
-}");
-			Assert.AreEqual (0, result.Count);
-		}
-
-		[Test]
-		public void TestAttributeCase1 ()
-		{
-			var result = GetResult (@"
-[$Obsolete]
-class Test {
-}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System"));
-		}
-		
-		[Test]
-		public void TestAttributeCase2 ()
-		{
-
-			var result = GetResult (@"
-[$SerializableAttribute]
-class Test {
-}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System"));
-		}
-
-		[Test]
-		public void TestAmbigiousResolveResult ()
-		{
-
-			var result = GetResult (@"namespace Foo { class Bar {} }
-namespace Foo2 { class Bar {} }
-
-namespace My
-{
-	using Foo;
-	using Foo2;
-
-	class Program
-	{
-		public static void Main ()
-		{
-			$Bar bar;
-		}
-	}
-}");
-			foreach (var a in result)
-				Console.WriteLine (a);
-			Assert.IsTrue (result.Any (t => t.Namespace == "Foo"));
-			Assert.IsTrue (result.Any (t => t.Namespace == "Foo2"));
-		}
-
-		[Test]
-		public void TestExtensionMethod ()
-		{
-			var result = GetResult (@"class Program
-{
-	public static void Main (string[] args)
-	{
-		args.$First ();
-	}
-}");
-			foreach (var a in result)
-				Console.WriteLine (a);
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Linq"));
-		}
-
-
-		#region Bug 3453 - [New Resolver] "Resolve" doesn't show up from time
-		[Test]
-		public void TestBug3453Case1 ()
-		{
-			var result = GetResult (@"class Test {
-	string GetName ()
-	{
-		var encoding = $Encoding
-		return encoding.EncodingName;
-	}
-}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Text"));
-		}
-
-		[Test]
-		public void TestBug3453Case2 ()
-		{
-			var result = GetResult (@"class Test {
-	string GetName ()
-	{
-		$Encoding
-		return encoding.EncodingName;
-	}
-}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Text"));
-		}
-
-		[Test]
-		public void TestBug3453Case3 ()
-		{
-			var result = GetResult (@"class Test {
-	string GetName ()
-	{
-		$Encoding.
-	}
-}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Text"));
-		}
-
-		[Test]
-		public void TestBug3453Case3WithGeneris ()
-		{
-			var result = GetResult (@"class Test {
-	string GetName ()
-	{
-		$List<string>.
-	}
-}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Collections.Generic"));
-		}
-		#endregion
-
-		/// <summary>
-		/// Bug 4361 - Cannot 'resolve' an unknown type
-		/// </summary>
-		[Test]
-		public void TestBug4361 ()
-		{
-			var result = GetResult (@"using System;
-
-namespace sadfhgjhkfj
-{
-    class MainClass
-    {
-        public static void Main (string[] args)
-        {
-            while (true) {
-                var t = new Thre$ad
-            }
-        }
-    }
-}");
-			foreach (var a in result)
-				Console.WriteLine (a);
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Threading"));
-		}
-
-		[Test]
-		public void TestBug4361Case2 ()
-		{
-			var result = GetResult (@"using System;
-
-namespace sadfhgjhkfj
-{
-    class MainClass
-    {
-        public static void Main (string[] args)
-        {
-            while (true) {
-                var t = new Thre$ad[0];
-            }
-        }
-    }
-}");
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Threading"));
-		}
-
-		/// <summary>
-		/// Bug 4493 - 'Resolve' context action offers incorrect options
-		/// </summary>
-		[Test]
-		public void TestBug4493 ()
-		{
-			var result = GetResult (@"using System;
-
-namespace sadfhgjhkfj
-{
-    class MainClass
-    {
-        public static void Main (string[] args)
-        {
-            S$tack<int> a;
-        }
-    }
-}"
-			);
-
-			Assert.IsFalse (result.Any (t => t.Namespace == "System.Collections"));
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Collections.Generic"));
-		}
-
-
-		/// <summary>
-		/// Bug 5206 - Resolve -> Add Using statement does not work after "|" 
-		/// </summary>
-		[Test]
-		public void TestBug5206 ()
-		{
-			var result = GetResult (@"using System;
-
-namespace TestConsole
-{
-	class MainClass
-	{
-		public static void Main (string[] args)
-		{
-			var f = typeof (int).GetFields (System.Reflection.BindingFlags.Static | Binding$Flags
-		}
- 	}
-}"
-			);
-
-			Assert.IsTrue (result.Any (t => t.Namespace == "System.Reflection"));
-		}
-
-		/// <summary>
-		/// Bug 4749 - Resolve is incorrect for inner classes
-		/// </summary>
-		[Test]
-		public void TestBug4749 ()
-		{
-
-			var result = GetResult (@"namespace Test { public class Foo { public class Bar {} } }
-
-class Program
-{
-	public static void Main ()
-	{
-		$Bar bar;
-	}
-}
-");
-			foreach (var a in result)
-				Console.WriteLine (a);
-			Assert.IsTrue (result.Any (t => t.Namespace == "Test.Foo" && !t.IsAccessibleWithGlobalUsing));
-		}
-
-
-		/// <summary>
-		/// Bug 10059 - Resolve type fails for nested static types
-		/// </summary>
-		[Test]
-		public void TestBug10059 ()
-		{
-			var result = GetResult (@"namespace ConsoleTest
-{
-    class MainClass
-    {
-        $Environment.SpecialFolder F { get; }
-    }
-}
-"
-			                        );
-			
-			Assert.IsTrue (result.Any (t => t.Namespace == "System"));
-		}
-
-
-	}
-}
-
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/AutomaticBracketInsertionTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/AutomaticBracketInsertionTests.cs
index 0029b2a513..044eed3e56 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/AutomaticBracketInsertionTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/AutomaticBracketInsertionTests.cs
@@ -26,22 +26,20 @@
 using System;
 using NUnit.Framework;
 
-using MonoDevelop.CSharp.Parser;
-using Mono.TextEditor;
-using System.Text;
-using System.Collections.Generic;
 using System.Linq;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.CSharp.Formatting;
 using UnitTests;
-using MonoDevelop.Projects.Policies;
 using MonoDevelop.CSharpBinding.Tests;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.CSharp.Completion;
 using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Projects;
+using MonoDevelop.Core.ProgressMonitoring;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.CSharp.Formatting;
+using MonoDevelop.Projects.Policies;
 
 namespace MonoDevelop.CSharpBinding
 {
@@ -50,11 +48,14 @@ namespace MonoDevelop.CSharpBinding
 	{
 		class TestCompletionWidget : ICompletionWidget 
 		{
-			Document doc;
+			MonoDevelop.Ide.Editor.TextEditor editor;
+
+			DocumentContext documentContext;
 
-			public TestCompletionWidget (Document doc)
+			public TestCompletionWidget (TextEditor editor, DocumentContext document)
 			{
-				this.doc = doc;
+				this.editor = editor;
+				documentContext = document;
 			}
 
 			public string CompletedWord {
@@ -69,17 +70,17 @@ namespace MonoDevelop.CSharpBinding
 
 			public string GetText (int startOffset, int endOffset)
 			{
-				return doc.Editor.GetTextBetween (startOffset, endOffset);
+				return editor.GetTextBetween (startOffset, endOffset);
 			}
 
 			public char GetChar (int offset)
 			{
-				return  doc.Editor.GetCharAt (offset);
+				return  editor.GetCharAt (offset);
 			}
 
 			public CodeCompletionContext CreateCodeCompletionContext (int triggerOffset)
 			{
-				var line = doc.Editor.GetLineByOffset (triggerOffset); 
+				var line = editor.GetLineByOffset (triggerOffset); 
 				return new CodeCompletionContext {
 					TriggerOffset = triggerOffset,
 					TriggerLine = line.LineNumber,
@@ -93,7 +94,7 @@ namespace MonoDevelop.CSharpBinding
 
 			public CodeCompletionContext CurrentCodeCompletionContext {
 				get {
-					return CreateCodeCompletionContext (doc.Editor.Caret.Offset);
+					return CreateCodeCompletionContext (editor.CaretOffset);
 				}
 			}
 
@@ -118,13 +119,16 @@ namespace MonoDevelop.CSharpBinding
 
 			public int CaretOffset {
 				get {
-					return doc.Editor.Caret.Offset;
+					return editor.CaretOffset;
+				}
+				set {
+					editor.CaretOffset = value;
 				}
 			}
 
 			public int TextLength {
 				get {
-					return doc.Editor.Document.TextLength;
+					return editor.Length;
 				}
 			}
 
@@ -139,6 +143,17 @@ namespace MonoDevelop.CSharpBinding
 					return null;
 				}
 			}
+
+			double ICompletionWidget.ZoomLevel {
+				get {
+					return 1;
+				}
+			}
+
+			void ICompletionWidget.AddSkipChar (int cursorPosition, char c)
+			{
+				// ignore
+			}
 			#endregion
 		}
 
@@ -148,10 +163,10 @@ namespace MonoDevelop.CSharpBinding
 			TestWorkbenchWindow tww = new TestWorkbenchWindow ();
 			content = new TestViewContent ();
 			tww.ViewContent = content;
-			content.ContentName = "a.cs";
-			content.GetTextEditorData ().Document.MimeType = "text/x-csharp";
+			content.ContentName = "/a.cs";
+			content.Data.MimeType = "text/x-csharp";
 
-			Document doc = new Document (tww);
+			var doc = new MonoDevelop.Ide.Gui.Document (tww);
 
 			var text = input;
 			int endPos = text.IndexOf ('$');
@@ -161,12 +176,26 @@ namespace MonoDevelop.CSharpBinding
 			content.Text = text;
 			content.CursorPosition = System.Math.Max (0, endPos);
 
+			var project = new DotNetAssemblyProject (Microsoft.CodeAnalysis.LanguageNames.CSharp);
+			project.Name = "test";
+			project.FileName = "test.csproj";
+			project.Files.Add (new ProjectFile (content.ContentName, BuildAction.Compile)); 
+			project.Policies.Set (PolicyService.InvariantPolicies.Get<CSharpFormattingPolicy> (), CSharpFormatter.MimeType);
+			var solution = new MonoDevelop.Projects.Solution ();
+			solution.AddConfiguration ("", true); 
+			solution.DefaultSolutionFolder.AddItem (project);
+			using (var monitor = new NullProgressMonitor ())
+				TypeSystemService.Load (solution, monitor, false);
+			content.Project = project;
+			doc.SetProject (project);
+
 
 			var compExt = new CSharpCompletionTextEditorExtension ();
-			compExt.Initialize (doc);
+			compExt.Initialize (doc.Editor, doc);
 			content.Contents.Add (compExt);
 
 			doc.UpdateParseDocument ();
+			TypeSystemService.Unload (solution);
 			return compExt;
 		}
 
@@ -175,18 +204,19 @@ namespace MonoDevelop.CSharpBinding
 			TestViewContent content;
 			var ext = Setup (input, out content);
 
-			ListWindow.ClearHistory ();
 			var listWindow = new CompletionListWindow ();
-			var widget = new TestCompletionWidget (ext.Document);
+			var widget = new TestCompletionWidget (ext.Editor, ext.DocumentContext);
 			listWindow.CompletionWidget = widget;
 			listWindow.CodeCompletionContext = widget.CurrentCodeCompletionContext;
+			var model = ext.DocumentContext.ParsedDocument.GetAst<SemanticModel> ();
 
-			var t = ext.Document.Compilation.FindType (new FullTypeName (type)); 
-			var method = member != null ? t.GetMembers (m => m.Name == member).First () : t.GetConstructors ().First ();
-			var data = new MemberCompletionData (ext, method, OutputFlags.ClassBrowserEntries);
+			var t = model.Compilation.GetTypeByMetadataName (type); 
+			var method = member != null ? t.GetMembers().First (m => m.Name == member) : t.GetMembers ().OfType<IMethodSymbol> ().First (m => m.MethodKind == MethodKind.Constructor);
+			var data = new RoslynSymbolCompletionData (null, ext, method);
 			data.IsDelegateExpected = isDelegateExpected;
 			KeyActions ka = KeyActions.Process;
-			data.InsertCompletionText (listWindow, ref ka, key, (char)key, Gdk.ModifierType.None, true, false); 
+			data.InsertCompletionText (listWindow, ref ka, KeyDescriptor.FromGtk (key, (char)key, Gdk.ModifierType.None)); 
+
 			return widget.CompletedWord;
 		}
 
@@ -200,7 +230,7 @@ namespace MonoDevelop.CSharpBinding
 		$
 	}
 }", "MyClass", "FooBar");
-			Assert.AreEqual ("FooBar ();|", completion); 
+			Assert.AreEqual ("FooBar();|", completion); 
 		}
 
 		[Test]
@@ -226,7 +256,7 @@ namespace MonoDevelop.CSharpBinding
 		Test($);
 	}
 }", "MyClass", "FooBar");
-			Assert.AreEqual ("FooBar ()|", completion); 
+			Assert.AreEqual ("FooBar()|", completion); 
 		}
 
 		[Test]
@@ -239,7 +269,7 @@ namespace MonoDevelop.CSharpBinding
 		Test(foo, $
 	}
 }", "MyClass", "FooBar");
-			Assert.AreEqual ("FooBar ()|", completion); 
+			Assert.AreEqual ("FooBar()|", completion); 
 		}
 
 		[Test]
@@ -255,7 +285,7 @@ namespace MonoDevelop.CSharpBinding
 		$
 	}
 }", "MyClass", "FooBar");
-			Assert.AreEqual ("FooBar (|);", completion); 
+			Assert.AreEqual ("FooBar(|);", completion); 
 		}
 
 		[Test]
@@ -269,7 +299,7 @@ namespace MonoDevelop.CSharpBinding
 		i = $
 	}
 }", "MyClass", "FooBar");
-			Assert.AreEqual ("FooBar ()|", completion); 
+			Assert.AreEqual ("FooBar()|", completion); 
 		}
 
 		[Test]
@@ -287,7 +317,7 @@ namespace MonoDevelop.CSharpBinding
 		i = $
 	}
 }", "MyClass", "FooBar");
-			Assert.AreEqual ("FooBar (|)", completion); 
+			Assert.AreEqual ("FooBar(|)", completion); 
 		}
 
 		[Test]
@@ -315,7 +345,7 @@ class MyClass
 		$
 	}
 }", "MyClass", "FooBar", (Gdk.Key)'.');
-			Assert.AreEqual ("FooBar ().|", completion); 
+			Assert.AreEqual ("FooBar().|", completion); 
 		}
 
 
@@ -332,7 +362,7 @@ class MyClass
 		$
 	}
 }", "MyClass", null);
-			Assert.AreEqual ("MyClass ()|", completion); 
+			Assert.AreEqual ("MyClass()|", completion); 
 		}
 
 		[Test]
@@ -348,7 +378,7 @@ class MyClass
 		$
 	}
 }", "MyClass", null);
-			Assert.AreEqual ("MyClass (|)", completion); 
+			Assert.AreEqual ("MyClass(|)", completion); 
 		}
 
 		[Test]
@@ -361,7 +391,7 @@ class MyClass
 		$
 	}
 }", "MyClass", "FooBar");
-			Assert.AreEqual ("FooBar<|> ();", completion); 
+			Assert.AreEqual ("FooBar<|>();", completion); 
 		}
 
 		[Test]
@@ -374,7 +404,7 @@ class MyClass
 		$
 	}
 }", "MyClass", "FooBar");
-			Assert.AreEqual ("FooBar (|);", completion); 
+			Assert.AreEqual ("FooBar(|);", completion); 
 		}
 
 		[Test]
@@ -387,7 +417,7 @@ class MyClass
 		$
 	}
 }", "MyClass", "FooBar", (Gdk.Key)'.');
-			Assert.AreEqual ("FooBar<> ().|", completion); 
+			Assert.AreEqual ("FooBar<>().|", completion); 
 		}
 
 		[Test]
@@ -401,7 +431,7 @@ class MyClass
 		if (true) { }
 	}
 }", "MyClass", "FooBar");
-			Assert.AreEqual ("FooBar ();|", completion); 
+			Assert.AreEqual ("FooBar();|", completion); 
 		}
 
 		
@@ -417,7 +447,7 @@ class MyClass
 		$
 	}
 }", "MyClass`1", null);
-			Assert.AreEqual ("MyClass<|> ()", completion); 
+			Assert.AreEqual ("MyClass<|>()", completion); 
 		}
 
 		[Test]
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs
index 09e4259738..aeacf06c41 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs
@@ -1,3 +1,4 @@
+/*
 // 
 // CSharpTextEditorIndentationTests.cs
 //  
@@ -38,7 +39,8 @@ using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.CSharp.Formatting;
 using UnitTests;
-using MonoDevelop.Projects.Policies;

+using MonoDevelop.Projects.Policies;
+
 using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.CSharpBinding.Tests;
 using MonoDevelop.Ide.Gui;
@@ -141,8 +143,10 @@ namespace MonoDevelop.CSharpBinding
 
 		IStateMachineIndentEngine CreateTracker (TextEditorData data)
 		{
-			var policy = PolicyService.InvariantPolicies.Get <CSharpFormattingPolicy> ("text/x-csharp").CreateOptions();

-			var textStylePolicy = data.CreateNRefactoryTextEditorOptions();

+			var policy = PolicyService.InvariantPolicies.Get <CSharpFormattingPolicy> ("text/x-csharp").CreateOptions();
+
+			var textStylePolicy = data.CreateNRefactoryTextEditorOptions();
+
 			textStylePolicy.IndentBlankLines = true;
 			var result = new CacheIndentEngine(new ICSharpCode.NRefactory.CSharp.CSharpIndentEngine(data.Document, textStylePolicy, policy));
 			result.Update (data.Caret.Offset);
@@ -452,3 +456,4 @@ $void Bar ()
 
 	}
 }
+*/
\ No newline at end of file
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/FoldingParserTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/FoldingParserTests.cs
index 39798271e4..831cd61baf 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/FoldingParserTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/FoldingParserTests.cs
@@ -29,12 +29,10 @@ using System.Linq;
 using NUnit.Framework;
 
 using MonoDevelop.CSharp.Parser;
-using Mono.TextEditor;
 using System.Text;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharpBinding
 {
@@ -45,21 +43,21 @@ namespace MonoDevelop.CSharpBinding
 		{
 			var parser = new CSharpFoldingParser ();
 			var sb = new StringBuilder ();
-			var openStack = new Stack<TextLocation>();
+			var openStack = new Stack<DocumentLocation>();
 			
 			int line = 1;
 			int col = 1;
 			
-			var foldingList = new List<DomRegion> ();
+			var foldingList = new List<DocumentRegion> ();
 			
 			for (int i = 0; i < code.Length; i++) {
 				char ch = code [i];
 				switch (ch) {
 				case '[':
-					openStack.Push (new TextLocation (line, col));
+					openStack.Push (new DocumentLocation (line, col));
 					break;
 				case ']':
-					foldingList.Add (new DomRegion (openStack.Pop (), new TextLocation (line, col)));
+					foldingList.Add (new DocumentRegion (openStack.Pop (), new DocumentLocation (line, col)));
 					break;
 				default:
 					if (ch =='\n') {
@@ -74,7 +72,7 @@ namespace MonoDevelop.CSharpBinding
 			}
 			
 			var doc = parser.Parse ("a.cs", sb.ToString ());
-			var generatedFoldings = new List<FoldingRegion> (doc.Foldings);
+			var generatedFoldings = doc.GetFoldingsAsync().Result;
 			Assert.AreEqual (foldingList.Count, generatedFoldings.Count, "Folding count differs.");
 			foreach (var generated in generatedFoldings) {
 				Assert.IsTrue (foldingList.Any (f => f == generated.Region), "fold not found:" + generated.Region);
@@ -140,7 +138,7 @@ class SomeNew {
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.]
 using System;");
-			foreach (var cmt in doc.Comments) {
+			foreach (var cmt in doc.GetCommentsAsync().Result) {
 				Assert.IsFalse (cmt.Text.StartsWith ("//"));
 			}
 
@@ -157,8 +155,8 @@ using System;");
 	}
 	#endregion]
 }");
-			Assert.AreEqual (1, doc.Foldings.Count ());
-			Assert.AreEqual ("TestRegion", doc.Foldings.First ().Name);
+			Assert.AreEqual (1, doc.GetFoldingsAsync().Result.Count ());
+			Assert.AreEqual ("TestRegion", doc.GetFoldingsAsync().Result.First ().Name);
 		}
 		
 		[Test]
@@ -178,9 +176,9 @@ using System;");
 	}
 	#endregion]
 }");
-			Assert.AreEqual (2, doc.Foldings.Count ());
-			Assert.AreEqual ("TestRegion", doc.Foldings.First ().Name);
-			Assert.AreEqual ("TestRegion2", doc.Foldings.Skip (1).First ().Name);
+			Assert.AreEqual (2, doc.GetFoldingsAsync().Result.Count ());
+			Assert.AreEqual ("TestRegion", doc.GetFoldingsAsync().Result.First ().Name);
+			Assert.AreEqual ("TestRegion2", doc.GetFoldingsAsync().Result.Skip (1).First ().Name);
 		}
 		
 
@@ -196,7 +194,7 @@ using System;");
 	{
 	}
 }");
-			foreach (var cmt in doc.Comments) {
+			foreach (var cmt in doc.GetCommentsAsync().Result) {
 				Assert.IsFalse (cmt.Text.StartsWith ("///"));
 				Assert.IsTrue (cmt.IsDocumentation);
 			}
@@ -235,7 +233,7 @@ using System;");
 	{ // not be 
 	} // folded
 }");
-			Assert.AreEqual (0, doc.Foldings.Count ());
+			Assert.AreEqual (0, doc.GetFoldingsAsync().Result.Count ());
 		}
 
 		
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/MemberTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/MemberTests.cs
deleted file mode 100644
index 5db91c48e7..0000000000
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/MemberTests.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-////
-//// MemberTests.cs
-////
-//// Author:
-////   Mike Krüger <mkrueger@novell.com>
-////
-//// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
-////
-//// Permission is hereby granted, free of charge, to any person obtaining
-//// a copy of this software and associated documentation files (the
-//// "Software"), to deal in the Software without restriction, including
-//// without limitation the rights to use, copy, modify, merge, publish,
-//// distribute, sublicense, and/or sell copies of the Software, and to
-//// permit persons to whom the Software is furnished to do so, subject to
-//// the following conditions:
-//// 
-//// The above copyright notice and this permission notice shall be
-//// included in all copies or substantial portions of the Software.
-//// 
-//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-//// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-//// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-//// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-////
-//
-//using System;
-//using System.Collections.Generic;
-//
-//using NUnit.Framework;
-//using MonoDevelop.CSharpBinding;
-//using MonoDevelop.CSharp.Parser;
-//
-//namespace MonoDevelop.CSharpBinding.Tests
-//{
-//	[TestFixture]
-//	public class MemberTests
-//	{
-//		void DoTestFields (IParser parser)
-//		{
-//			ICompilationUnit unit = parser.Parse (null, "a.cs", @"class AClass { int x, y; }").CompilationUnit;
-//			Assert.AreEqual (1, unit.Types.Count);
-//			IType type = unit.Types[0];
-//			
-//			Assert.AreEqual (2, type.FieldCount);
-//			List<IField> fields = new List<IField> (type.Fields);
-//			Assert.AreEqual ("x", fields[0].Name);
-//			Assert.AreEqual ("System.Int32", fields[0].ReturnType.FullName);
-//			Assert.AreEqual ("y", fields[1].Name);
-//			Assert.AreEqual ("System.Int32", fields[1].ReturnType.FullName);
-//		}
-//		
-//		[Test]
-//		public void TestFields ()
-//		{
-//			DoTestFields (new McsParser ());
-////			DoTestFields (new DomParser ());
-//		}
-//		
-//		void DoTestMethods (IParser parser)
-//		{
-//			ICompilationUnit unit = parser.Parse (null, "a.cs", 
-//@"class AClass {
-//     void TestMethod<T> (string a, int b) {}
-//     public static void ExtensionMethod (this int a) {}; 
-//}").CompilationUnit;
-//			Assert.AreEqual (1, unit.Types.Count);
-//			IType type = unit.Types[0];
-//			
-//			Assert.AreEqual (2, type.MethodCount);
-//			List<IMethod> methods = new List<IMethod> (type.Methods);
-//			Assert.AreEqual ("TestMethod", methods[0].Name);
-//			Assert.AreEqual (2, methods[0].Parameters.Count);
-//			Assert.AreEqual ("a", methods[0].Parameters[0].Name);
-//			Assert.AreEqual ("b", methods[0].Parameters[1].Name);
-//						
-//			Assert.IsFalse (methods[1].IsConstructor);
-//			Assert.IsTrue (methods[1].IsExtension);
-//			Assert.AreEqual (1, methods[1].Parameters.Count);
-//			Assert.AreEqual ("a", methods[1].Parameters[0].Name);
-//		}
-//		
-//		[Test]
-//		public void TestMethods ()
-//		{
-//			DoTestMethods (new McsParser ());
-////			DoTestMethods (new DomParser ());
-//		}
-//		
-//		void DoTestConstructor (IParser parser)
-//		{
-//			ICompilationUnit unit = parser.Parse (null, "a.cs", 
-//@"public abstract class BaseClass {
-//     BaseClass () {}
-//  	protected BaseClass(int id)
-//    {
-//    }     
-//}").CompilationUnit;
-//			Assert.AreEqual (1, unit.Types.Count);
-//			IType type = unit.Types[0];
-//			
-//			Assert.AreEqual (2, type.ConstructorCount);
-//			List<IMethod> methods = new List<IMethod> (type.Methods);
-//			Assert.IsTrue (methods[0].IsConstructor);
-//			Assert.IsTrue (methods[1].IsConstructor);
-//		}
-//		
-//		[Test]
-//		public void TestConstructor ()
-//		{
-//			DoTestConstructor (new McsParser ());
-////			DoTestConstructor (new DomParser ());
-//		}
-//		
-//		void DoTestProperties (IParser parser)
-//		{
-//			ICompilationUnit unit = parser.Parse (null, "a.cs", 
-//@"class AClass {
-//	int MyProperty {
-//		get { }
-//		set { }
-//	}
-//	string MyProperty2 {
-//		set { }
-//	}
-//	string MyProperty3 {
-//		get { }
-//	}
-//}").CompilationUnit;
-//			Assert.AreEqual (1, unit.Types.Count);
-//			IType type = unit.Types[0];
-//			
-//			Assert.AreEqual (3, type.PropertyCount);
-//			List<IProperty> properties = new List<IProperty> (type.Properties);
-//			Assert.AreEqual ("MyProperty", properties[0].Name);
-//			Assert.IsTrue (properties[0].HasGet);
-//			Assert.IsTrue (properties[0].HasSet);
-//			Assert.IsFalse (properties[0].IsIndexer);
-//			
-//			Assert.AreEqual ("MyProperty2", properties[1].Name);
-//			Assert.IsFalse (properties[1].HasGet);
-//			Assert.IsTrue (properties[1].HasSet);
-//			Assert.IsFalse (properties[1].IsIndexer);
-//			
-//			Assert.AreEqual ("MyProperty3", properties[2].Name);
-//			Assert.IsTrue (properties[2].HasGet);
-//			Assert.IsFalse (properties[2].HasSet);
-//			Assert.IsFalse (properties[2].IsIndexer);
-//		}
-//		
-//		[Test]
-//		public void TestProperties ()
-//		{
-//			DoTestProperties (new McsParser ());
-////			DoTestProperties (new DomParser ());
-//		}
-//		
-//		void DoTestIndexer (IParser parser)
-//		{
-//			ICompilationUnit unit = parser.Parse (null, "a.cs", 
-//@"class AClass {
-//	int this[int a] {
-//		get { }
-//		set { }
-//	}
-//}").CompilationUnit;
-//			Assert.AreEqual (1, unit.Types.Count);
-//			IType type = unit.Types[0];
-//			
-//			Assert.AreEqual (1, type.IndexerCount);
-//			List<IProperty> properties = new List<IProperty> (type.Properties);
-//			Assert.IsTrue (properties[0].IsIndexer);
-//			Assert.AreEqual (1, properties[0].Parameters.Count);
-//			Assert.AreEqual ("a", properties[0].Parameters[0].Name);
-//		}
-//		
-//		[Test]
-//		public void TestIndexer ()
-//		{
-//			DoTestIndexer (new McsParser ());
-////			DoTestIndexer (new DomParser ());
-//		}
-//
-//		void DoTestEvents (IParser parser)
-//		{
-//			ICompilationUnit unit = parser.Parse (null, "a.cs", 
-//@"class AClass {
-//	event EventHandler TestEvent;
-//}").CompilationUnit;
-//			Assert.AreEqual (1, unit.Types.Count);
-//			IType type = unit.Types[0];
-//			
-//			Assert.AreEqual (1, type.EventCount);
-//			List<IEvent> events = new List<IEvent> (type.Events);
-//			Assert.AreEqual ("TestEvent", events[0].Name);
-//			Assert.AreEqual ("EventHandler", events[0].ReturnType.Name);
-//		}
-//		
-//		[Test]
-//		public void TestEvents ()
-//		{
-//			DoTestEvents (new McsParser ());
-////			DoTestEvents (new DomParser ());
-//		}
-//		
-//	}
-//}
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/NamedArgumentCompletionTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/NamedArgumentCompletionTests.cs
index edb713bd35..90349d23c5 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/NamedArgumentCompletionTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/NamedArgumentCompletionTests.cs
@@ -26,23 +26,18 @@
 using System;
 using NUnit.Framework;
 
-using MonoDevelop.CSharp.Parser;
-using Mono.TextEditor;
-using System.Text;
-using System.Collections.Generic;
 using System.Linq;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.CSharp.Formatting;
 using UnitTests;
-using MonoDevelop.Projects.Policies;
 using MonoDevelop.CSharpBinding.Tests;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.CSharp.Completion;
 using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Projects;
+using MonoDevelop.Core.ProgressMonitoring;
+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.CSharpBinding
 {
@@ -51,11 +46,14 @@ namespace MonoDevelop.CSharpBinding
 	{
 		class TestCompletionWidget : ICompletionWidget 
 		{
-			Document doc;
+			DocumentContext documentContext;
 
-			public TestCompletionWidget (Document doc)
+			TextEditor editor;
+
+			public TestCompletionWidget (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext documentContext)
 			{
-				this.doc = doc;
+				this.editor = editor;
+				this.documentContext = documentContext;
 			}
 
 			public string CompletedWord {
@@ -70,17 +68,17 @@ namespace MonoDevelop.CSharpBinding
 
 			public string GetText (int startOffset, int endOffset)
 			{
-				return doc.Editor.GetTextBetween (startOffset, endOffset);
+				return editor.GetTextBetween (startOffset, endOffset);
 			}
 
 			public char GetChar (int offset)
 			{
-				return  doc.Editor.GetCharAt (offset);
+				return  editor.GetCharAt (offset);
 			}
 
 			public CodeCompletionContext CreateCodeCompletionContext (int triggerOffset)
 			{
-				var line = doc.Editor.GetLineByOffset (triggerOffset); 
+				var line = editor.GetLineByOffset (triggerOffset); 
 				return new CodeCompletionContext {
 					TriggerOffset = triggerOffset,
 					TriggerLine = line.LineNumber,
@@ -94,7 +92,7 @@ namespace MonoDevelop.CSharpBinding
 
 			public CodeCompletionContext CurrentCodeCompletionContext {
 				get {
-					return CreateCodeCompletionContext (doc.Editor.Caret.Offset);
+					return CreateCodeCompletionContext (editor.CaretOffset);
 				}
 			}
 
@@ -119,13 +117,16 @@ namespace MonoDevelop.CSharpBinding
 
 			public int CaretOffset {
 				get {
-					return doc.Editor.Caret.Offset;
+					return editor.CaretOffset;
+				}
+				set {
+					editor.CaretOffset = value;
 				}
 			}
 
 			public int TextLength {
 				get {
-					return doc.Editor.Document.TextLength;
+					return editor.Length;
 				}
 			}
 
@@ -140,19 +141,30 @@ namespace MonoDevelop.CSharpBinding
 					return null;
 				}
 			}
+
+			double ICompletionWidget.ZoomLevel {
+				get {
+					return 1;
+				}
+			}
+
+			void ICompletionWidget.AddSkipChar (int cursorPosition, char c)
+			{
+				// ignore
+			}
 			#endregion
 		}
 
 
 		static CSharpCompletionTextEditorExtension Setup (string input, out TestViewContent content)
 		{
-			TestWorkbenchWindow tww = new TestWorkbenchWindow ();
+			var tww = new TestWorkbenchWindow ();
 			content = new TestViewContent ();
 			tww.ViewContent = content;
-			content.ContentName = "a.cs";
-			content.GetTextEditorData ().Document.MimeType = "text/x-csharp";
+			content.ContentName = "/a.cs";
+			content.Data.MimeType = "text/x-csharp";
 
-			Document doc = new Document (tww);
+			var doc = new MonoDevelop.Ide.Gui.Document (tww);
 
 			var text = input;
 			int endPos = text.IndexOf ('$');
@@ -162,12 +174,25 @@ namespace MonoDevelop.CSharpBinding
 			content.Text = text;
 			content.CursorPosition = System.Math.Max (0, endPos);
 
+			var project = new DotNetAssemblyProject (Microsoft.CodeAnalysis.LanguageNames.CSharp);
+			project.Name = "test";
+			project.FileName = "test.csproj";
+			project.Files.Add (new ProjectFile (content.ContentName, BuildAction.Compile)); 
+
+			var solution = new MonoDevelop.Projects.Solution ();
+			solution.AddConfiguration ("", true); 
+			solution.DefaultSolutionFolder.AddItem (project);
+			using (var monitor = new NullProgressMonitor ())
+				TypeSystemService.Load (solution, monitor, false);
+			content.Project = project;
+			doc.SetProject (project);
 
 			var compExt = new CSharpCompletionTextEditorExtension ();
-			compExt.Initialize (doc);
+			compExt.Initialize (doc.Editor, doc);
 			content.Contents.Add (compExt);
 
 			doc.UpdateParseDocument ();
+			TypeSystemService.Unload (solution);
 			return compExt;
 		}
 
@@ -176,17 +201,19 @@ namespace MonoDevelop.CSharpBinding
 			TestViewContent content;
 			var ext = Setup (input, out content);
 
-			ListWindow.ClearHistory ();
 			var listWindow = new CompletionListWindow ();
-			var widget = new TestCompletionWidget (ext.Document);
+			var widget = new TestCompletionWidget (ext.Editor, ext.DocumentContext);
 			listWindow.CompletionWidget = widget;
 			listWindow.CodeCompletionContext = widget.CurrentCodeCompletionContext;
-			var t = ext.Document.Compilation.FindType (new FullTypeName (type)); 
-			var foundMember = t.GetMembers (m => m.Name == member).First ();
-			var data = new MemberCompletionData (ext, foundMember, OutputFlags.ClassBrowserEntries);
-			data.DisplayFlags |= ICSharpCode.NRefactory.Completion.DisplayFlags.NamedArgument;
+			var sm = ext.DocumentContext.ParsedDocument.GetAst<SemanticModel> ();
+
+			var t = sm.Compilation.GetTypeByMetadataName (type); 
+			var foundMember = t.GetMembers().First (m => m.Name == member);
+			var data = new RoslynSymbolCompletionData (null, ext, foundMember);
+			data.DisplayFlags |= DisplayFlags.NamedArgument;
 			KeyActions ka = KeyActions.Process;
-			data.InsertCompletionText (listWindow, ref ka, key, (char)key, Gdk.ModifierType.None, true, false); 
+			data.InsertCompletionText (listWindow, ref ka, KeyDescriptor.FromGtk (key, (char)key, Gdk.ModifierType.None)); 
+
 			return widget.CompletedWord;
 		}
 
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/OnTheFlyFormatterTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/OnTheFlyFormatterTests.cs
index e024ac162f..63c9900409 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/OnTheFlyFormatterTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/OnTheFlyFormatterTests.cs
@@ -26,37 +26,35 @@
 using System;
 using NUnit.Framework;
 
-using MonoDevelop.CSharp.Parser;
-using Mono.TextEditor;
 using System.Text;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.CSharp.Formatting;
-using UnitTests;
-using MonoDevelop.Projects.Policies;
 using MonoDevelop.CSharp.Completion;
 using MonoDevelop.CSharpBinding.Tests;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Projects;
+using MonoDevelop.Core.ProgressMonitoring;
 
 namespace MonoDevelop.CSharpBinding
 {
 	[TestFixture]
 	public class OnTheFlyFormatterTests : UnitTests.TestBase
 	{
-		static CSharpTextEditorIndentation Setup (string input, out TestViewContent content)
+		static void Simulate (string input, Action<TestViewContent, CSharpTextEditorIndentation> act)
 		{
 			TestWorkbenchWindow tww = new TestWorkbenchWindow ();
-			content = new TestViewContent ();
-			content.Data.Options.IndentStyle = IndentStyle.Auto;
+			var content = new TestViewContent ();
+			content.Data.Options = new CustomEditorOptions {
+				IndentStyle = IndentStyle.Auto
+			};
+
 			tww.ViewContent = content;
-			content.ContentName = "a.cs";
-			content.GetTextEditorData ().Document.MimeType = "text/x-csharp";
+			content.ContentName = "/a.cs";
+			content.Data.MimeType = "text/x-csharp";
 
-			Document doc = new Document (tww);
+			var doc = new Document (tww);
 
 			var sb = new StringBuilder ();
 			int cursorPosition = 0, selectionStart = -1, selectionEnd = -1;
@@ -94,70 +92,153 @@ namespace MonoDevelop.CSharpBinding
 			content.Text = sb.ToString ();
 			content.CursorPosition = cursorPosition;
 
+			var project = new DotNetAssemblyProject (Microsoft.CodeAnalysis.LanguageNames.CSharp);
+			project.Name = "test";
+			project.FileName = "test.csproj";
+			project.Files.Add (new ProjectFile (content.ContentName, BuildAction.Compile)); 
+			project.Policies.Set (Projects.Policies.PolicyService.InvariantPolicies.Get<CSharpFormattingPolicy> (), CSharpFormatter.MimeType);
+
+			var solution = new MonoDevelop.Projects.Solution ();
+			solution.AddConfiguration ("", true); 
+			solution.DefaultSolutionFolder.AddItem (project);
+			using (var monitor = new NullProgressMonitor ())
+				TypeSystemService.Load (solution, monitor, false);
+			content.Project = project;
+			doc.SetProject (project);
+
 			var compExt = new CSharpCompletionTextEditorExtension ();
-			compExt.Initialize (doc);
+			compExt.Initialize (doc.Editor, doc);
 			content.Contents.Add (compExt);
 			
 			var ext = new CSharpTextEditorIndentation ();
 			CSharpTextEditorIndentation.OnTheFlyFormatting = true;
-			ext.Initialize (doc);
+			ext.Initialize (doc.Editor, doc);
 			content.Contents.Add (ext);
 			
 			doc.UpdateParseDocument ();
 			if (selectionStart >= 0 && selectionEnd >= 0)
 				content.GetTextEditorData ().SetSelection (selectionStart, selectionEnd);
-			return ext;
+			try {
+				act (content, ext);
+			} finally {
+				TypeSystemService.Unload (solution);
+			}
 		}
 
-		[Ignore("Semicolon formatting partially deactivated.")]
 		[Test]
 		public void TestSemicolon ()
 		{
-			TestViewContent content;
-			var ext = Setup (@"class Foo
+			Simulate (@"class Foo
 {
 	void Test ()
 	{
 		Console.WriteLine ()      ;$
 	}
-}", out content);
-			ext.KeyPress (Gdk.Key.semicolon, ';', Gdk.ModifierType.None);
+}", (content, ext) => {
+				ext.KeyPress (KeyDescriptor.FromGtk (Gdk.Key.semicolon, ';', Gdk.ModifierType.None));
 			
-			var newText = content.Text;
-			Assert.AreEqual (@"class Foo
+				var newText = content.Text;
+				Assert.AreEqual (@"class Foo
 {
 	void Test ()
 	{
-		Console.WriteLine ();
+		Console.WriteLine();
 	}
 }", newText);
-
+			});
 		}
 
-		[Ignore("FIXME")]
 		[Test]
 		public void TestCloseBrace ()
 		{
-			TestViewContent content;
-			var ext = Setup (@"class Foo
+			Simulate (@"class Foo
 {
 	void Test ()
 	{
 		Console.WriteLine()                   ;
 	}$
-}", out content);
-			ext.KeyPress (Gdk.Key.braceright, '}', Gdk.ModifierType.None);
+}", (content, ext) => {
+				ext.KeyPress (KeyDescriptor.FromGtk (Gdk.Key.braceright, '}', Gdk.ModifierType.None));
+
+				var newText = content.Text;
+				Console.WriteLine (newText);
+				Assert.AreEqual (@"class Foo
+{
+	void Test()
+	{
+		Console.WriteLine();
+	}
+}", newText);
+			});
+
+		}
+
+		[Test]
+		public void TestCloseBraceIf ()
+		{
+			//Notice that some text stay unformatted by design
+			Simulate (@"class Foo
+{
+	void Test ()
+			{
+		Console.WriteLine()                   ;
+		if(true){
+		Console.WriteLine()                   ;
+	}$
+	}
+}", (content, ext) => {
+				ext.KeyPress (KeyDescriptor.FromGtk (Gdk.Key.braceright, '}', Gdk.ModifierType.None));
 			
-			var newText = content.Text;
-			Console.WriteLine (newText);
-			Assert.AreEqual (@"class Foo
+				var newText = content.Text;
+				Console.WriteLine (newText);
+				Assert.AreEqual (@"class Foo
 {
 	void Test ()
-	{
-		Console.WriteLine ();
+			{
+		Console.WriteLine()                   ;
+		if (true)
+		{
+			Console.WriteLine();
+		}
 	}
 }", newText);
+			});
+		}
 
+		[Test]
+		public void TestCloseBraceCatch ()
+		{
+			//Notice that some text stay unformatted by design
+			Simulate (@"class Foo
+{
+	void Test ()
+			{
+		Console.WriteLine()                   ;
+					try{
+		Console.WriteLine()                   ;
+	}catch(Exception e){
+	}$
+	}
+}", (content, ext) => {
+				ext.KeyPress (KeyDescriptor.FromGtk (Gdk.Key.braceright, '}', Gdk.ModifierType.None));
+			
+				var newText = content.Text;
+				Console.WriteLine (newText);
+				Assert.AreEqual (@"class Foo
+{
+	void Test ()
+			{
+		Console.WriteLine()                   ;
+		try
+		{
+			Console.WriteLine();
+		}
+		catch (Exception e)
+		{
+		}
+	}
+}", newText);
+			});
 		}
 
 		
@@ -167,34 +248,34 @@ namespace MonoDevelop.CSharpBinding
 		[Test]
 		public void TestBug5080 ()
 		{
-			TestViewContent content;
-			var ext = Setup ("\"Hello\n\t$", out content);
-			ext.ReindentOnTab ();
+			Simulate ("\"Hello\n\t$", (content, ext) => {
+				ext.ReindentOnTab ();
 
-			var newText = content.Text;
-			Assert.AreEqual ("\"Hello\n", newText);
+				var newText = content.Text;
+				Assert.AreEqual ("\"Hello\n", newText);
+			});
 		}
 
 
 		[Test]
 		public void TestVerbatimToNonVerbatimConversion ()
 		{
-			TestViewContent content;
-			Setup ("@$\"\t\"", out content);
-			content.GetTextEditorData ().Remove (0, 1);
-			var newText = content.Text;
-			Assert.AreEqual ("\"\\t\"", newText);
+			Simulate ("@$\"\t\"", (content, ext) => {
+				content.Data.RemoveText (0, 1);
+				var newText = content.Text;
+				Assert.AreEqual ("\"\\t\"", newText);
+			});
 		}
 
 		[Test]
 		public void TestNonVerbatimToVerbatimConversion ()
 		{
-			TestViewContent content;
-			var ext = Setup ("$\"\\t\"", out content);
-			content.GetTextEditorData ().Insert (0, "@");
-			ext.KeyPress ((Gdk.Key)'@', '@', Gdk.ModifierType.None);
-			var newText = content.Text;
-			Assert.AreEqual ("@\"\t\"", newText);
+			Simulate ("$\"\\t\"", (content, ext) => {
+				content.Data.InsertText (0, "@");
+				ext.KeyPress (KeyDescriptor.FromGtk ((Gdk.Key)'@', '@', Gdk.ModifierType.None));
+				var newText = content.Text;
+				Assert.AreEqual ("@\"\t\"", newText);
+			});
 		}
 
 		/// <summary>
@@ -203,36 +284,36 @@ namespace MonoDevelop.CSharpBinding
 		[Test]
 		public void TestBug14686 ()
 		{
-			TestViewContent content;
-			var ext = Setup ("$\"\\\\\"", out content);
-			content.GetTextEditorData ().Insert (0, "@");
-			ext.KeyPress ((Gdk.Key)'@', '@', Gdk.ModifierType.None);
-			var newText = content.Text;
-			Assert.AreEqual ("@\"\\\"", newText);
+			Simulate ("$\"\\\\\"", (content, ext) => {
+				content.Data.InsertText (0, "@");
+				ext.KeyPress (KeyDescriptor.FromGtk ((Gdk.Key)'@', '@', Gdk.ModifierType.None));
+				var newText = content.Text;
+				Assert.AreEqual ("@\"\\\"", newText);
+			});
 		}
 
 		[Test]
 		public void TestBug14686Case2 ()
 		{
-			TestViewContent content;
-			var ext = Setup ("$\"\\\"", out content);
-			content.GetTextEditorData ().Insert (0, "@");
-			ext.KeyPress ((Gdk.Key)'@', '@', Gdk.ModifierType.None);
-			var newText = content.Text;
-			Assert.AreEqual ("@\"\\\"", newText);
-
-			ext = Setup ("$\"\\\"a", out content);
-			content.GetTextEditorData ().Insert (0, "@");
-			ext.KeyPress ((Gdk.Key)'@', '@', Gdk.ModifierType.None);
-			newText = content.Text;
-			Assert.AreEqual ("@\"\\\"a", newText);
+			Simulate ("$\"\\\"", (content, ext) => {
+				content.Data.InsertText (0, "@");
+				ext.KeyPress (KeyDescriptor.FromGtk ((Gdk.Key)'@', '@', Gdk.ModifierType.None));
+				var newText = content.Text;
+				Assert.AreEqual ("@\"\\\"", newText);
+			});
+
+			Simulate ("$\"\\\"a", (content, ext) => {
+				content.Data.InsertText (0, "@");
+				ext.KeyPress (KeyDescriptor.FromGtk ((Gdk.Key)'@', '@', Gdk.ModifierType.None));
+				var newText = content.Text;
+				Assert.AreEqual ("@\"\\\"a", newText);
+			});
 
 		}
 		[Test]
 		public void TestCorrectReindentNextLine ()
 		{
-			TestViewContent content;
-			var ext = Setup (@"
+			Simulate (@"
 class Foo
 {
 	void Bar ()
@@ -241,14 +322,14 @@ class Foo
 		} catch (Exception e) {$}
 	}
 }
-", out content);
-			ext.ReindentOnTab ();
-			MiscActions.InsertNewLine (content.Data);
-			ext.KeyPress ((Gdk.Key)'\n', '\n', Gdk.ModifierType.None);
+", (content, ext) => {
+				ext.ReindentOnTab ();
+				EditActions.NewLine (ext.Editor);
+				ext.KeyPress (KeyDescriptor.FromGtk ((Gdk.Key)'\n', '\n', Gdk.ModifierType.None));
 
-			var newText = content.Text;
+				var newText = content.Text;
 
-			var expected = @"
+				var expected = @"
 class Foo
 {
 	void Bar ()
@@ -259,9 +340,10 @@ class Foo
 	}
 }
 ";
-			if (newText != expected)
-				Console.WriteLine (newText);
-			Assert.AreEqual (expected, newText);
+				if (newText != expected)
+					Console.WriteLine (newText);
+				Assert.AreEqual (expected, newText);
+			});
 		}
 
 		/// <summary>
@@ -270,37 +352,39 @@ class Foo
 		[Test]
 		public void TestBug16174_AutoIndent ()
 		{
-			TestViewContent content;
-
-			var ext = Setup  ("namespace Foo\n{\n\tpublic class Bar\n\t{\n$\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n", out content);
-			ext.document.Editor.Options.IndentStyle = IndentStyle.Auto;
-			MiscActions.InsertNewLine (content.Data);
-			ext.KeyPress (Gdk.Key.Return, '\n', Gdk.ModifierType.None);
-
-			var newText = content.Text;
-
-			var expected = "namespace Foo\n{\n\tpublic class Bar\n\t{\n\n\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n";
-			if (newText != expected)
-				Console.WriteLine (newText);
-			Assert.AreEqual (expected, newText);
+			Simulate ("namespace Foo\n{\n\tpublic class Bar\n\t{\n$\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n", (content, ext) => {
+				var options = DefaultSourceEditorOptions.Instance;
+				options.IndentStyle = IndentStyle.Auto;
+				ext.Editor.Options = options;
+				EditActions.NewLine (ext.Editor);
+				ext.KeyPress (KeyDescriptor.FromGtk (Gdk.Key.Return, '\n', Gdk.ModifierType.None));
+
+				var newText = content.Text;
+
+				var expected = "namespace Foo\n{\n\tpublic class Bar\n\t{\n\n\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n";
+				if (newText != expected)
+					Console.WriteLine (newText);
+				Assert.AreEqual (expected, newText);
+			});
 		}
 
 		[Test]
 		public void TestBug16174_VirtualIndent ()
 		{
-			TestViewContent content;
-
-			var ext = Setup  ("namespace Foo\n{\n\tpublic class Bar\n\t{\n$\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n", out content);
-			ext.document.Editor.Options.IndentStyle = IndentStyle.Virtual;
-			MiscActions.InsertNewLine (content.Data);
-			ext.KeyPress (Gdk.Key.Return, '\n', Gdk.ModifierType.None);
-
-			var newText = content.Text;
-
-			var expected = "namespace Foo\n{\n\tpublic class Bar\n\t{\n\n\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n";
-			if (newText != expected)
-				Console.WriteLine (newText);
-			Assert.AreEqual (expected, newText);
+			Simulate ("namespace Foo\n{\n\tpublic class Bar\n\t{\n$\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n", (content, ext) => {
+				var options = DefaultSourceEditorOptions.Instance;
+				options.IndentStyle = IndentStyle.Virtual;
+				ext.Editor.Options = options;
+				EditActions.NewLine (ext.Editor);
+				ext.KeyPress (KeyDescriptor.FromGtk (Gdk.Key.Return, '\n', Gdk.ModifierType.None));
+
+				var newText = content.Text;
+
+				var expected = "namespace Foo\n{\n\tpublic class Bar\n\t{\n\n\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n";
+				if (newText != expected)
+					Console.WriteLine (newText);
+				Assert.AreEqual (expected, newText);
+			});
 		}
 
 
@@ -310,12 +394,12 @@ class Foo
 		[Test]
 		public void TestBug16283 ()
 		{
-			TestViewContent content;
-			var ext = Setup ("$\"\\dev\\null {0}\"", out content);
-			content.GetTextEditorData ().Insert (0, "@");
-			ext.KeyPress ((Gdk.Key)'@', '@', Gdk.ModifierType.None);
-			var newText = content.Text;
-			Assert.AreEqual ("@\"\\dev\null {0}\"", newText);
+			Simulate ("$\"\\dev\\null {0}\"", (content, ext) => {
+				content.Data.InsertText (0, "@");
+				ext.KeyPress (KeyDescriptor.FromGtk ((Gdk.Key)'@', '@', Gdk.ModifierType.None));
+				var newText = content.Text;
+				Assert.AreEqual ("@\"\\dev\null {0}\"", newText);
+			});
 		}
 
 		/// <summary>
@@ -324,8 +408,7 @@ class Foo
 		[Test]
 		public void TestBug17765 ()
 		{
-			TestViewContent content;
-			var ext = Setup (@"
+			Simulate (@"
 namespace FormatSelectionTest
 {
 	public class EmptyClass
@@ -334,24 +417,51 @@ namespace FormatSelectionTest
 		{
 		}->
 	}
-}", out content);
+}", (content, ext) => {
 
-			OnTheFlyFormatter.Format (ext.document, ext.document.Editor.SelectionRange.Offset, ext.document.Editor.SelectionRange.EndOffset); 
+				OnTheFlyFormatter.Format (ext.Editor, ext.DocumentContext, ext.Editor.SelectionRange.Offset, ext.Editor.SelectionRange.EndOffset); 
 
 
-			Assert.AreEqual (@"
+				Assert.AreEqual (@"
 namespace FormatSelectionTest
 {
 	public class EmptyClass
 	{
-		public EmptyClass ()
+		public EmptyClass()
 		{
 		}
 	}
-}", ext.document.Editor.Text);
+}", ext.Editor.Text);
+			});
 		}
 
+		[Test]
+		public void TestAfterCommentLine ()
+		{
+			Simulate (@"class Foo
+{
+	void Test ()
+	{
+		//random comment
+		Console.WriteLine ()      ;$
+	}
+}", (content, ext) => {
+				content.Data.Options = new CustomEditorOptions {
+					IndentStyle = IndentStyle.Virtual
+				};
+				ext.KeyPress (KeyDescriptor.FromGtk (Gdk.Key.semicolon, ';', Gdk.ModifierType.None));
+			
+				var newText = content.Text;
+				Assert.AreEqual (@"class Foo
+{
+	void Test ()
+	{
+		//random comment
+		Console.WriteLine();
+	}
+}", newText);
+			});
+		}
 	}
-
 }
 
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/ProjectDomTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/ProjectDomTests.cs
deleted file mode 100644
index 37045dedc3..0000000000
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/ProjectDomTests.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-// 
-// ProjectDomTests.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using NUnit.Framework;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Ide.Gui.Content;
-
-namespace MonoDevelop.CSharpBinding
-{
-/*	[TestFixture()]
-	public class ProjectDomTests : UnitTests.TestBase
-	{
-		public delegate void DomCallback (ProjectDom dom);
-		
-		public static void CheckDomCorrectness (IType type, DomCallback callback)
-		{
-			CheckDomCorrectness (new IType[] { type }, callback);
-		}
-		
-		public static void CheckDomCorrectness (IEnumerable<IType> types, DomCallback callback)
-		{
-			//IParserDatabase database = new MonoDevelop.Projects.Dom.MemoryDatabase.MemoryDatabase ();
-			IParserDatabase database = new MonoDevelop.Projects.Dom.Serialization.ParserDatabase ();
-			ProjectDom dom = database.LoadSingleFileDom ("a.cs");
-			Console.WriteLine ("dom:" + dom);
-			CompilationUnit unit = new CompilationUnit ("a.cs");
-			foreach (IType type in types) {
-				unit.Add (type);
-			}
-			dom.UpdateFromParseInfo (unit);
-			callback (dom);
-		}
-		
-		[Test()]
-		public void TestTypeInstantiation ()
-		{
-			DomType type = new DomType () {
-				Name = "MyClass",
-				ClassType = ClassType.Class
-			};
-			type.AddTypeParameter (new TypeParameter ("T"));
-			IProperty prop = new DomProperty () {
-				Name = "Prop",
-				ReturnType = new DomReturnType ("T")
-			};
-			type.Add (prop);
-			
-			
-			CheckDomCorrectness	 (type, delegate (ProjectDom dom) {
-				IType result = dom.GetType ("MyClass", new IReturnType [] { new DomReturnType ("SomeNamespace.OtherType") }, true, true);
-				Assert.IsNotNull (result);
-				prop = result.Properties.FirstOrDefault ();
-				Assert.IsNotNull (prop);
-				Assert.AreEqual ("SomeNamespace.OtherType", prop.ReturnType.FullName);
-			});
-		}
-		
-		[Test()]
-		public void TestGetNamespaceExists ()
-		{
-			CheckDomCorrectness	 (new DomType ("A.B.C.TestClass"), delegate (ProjectDom dom) {
-				Assert.IsTrue (dom.NamespaceExists("A"));
-				Assert.IsTrue (dom.NamespaceExists("A.B"));
-				Assert.IsTrue (dom.NamespaceExists("A.B.C"));
-				Assert.IsFalse (dom.NamespaceExists("B"));
-				Assert.IsFalse (dom.NamespaceExists("C"));
-				Assert.IsFalse (dom.NamespaceExists("B.C"));
-				Assert.IsFalse (dom.NamespaceExists("A.C"));
-				Assert.IsFalse (dom.NamespaceExists(".B"));
-				Assert.IsFalse (dom.NamespaceExists(".C"));
-			});
-		}
-		
-		[Test()]
-		public void TestGetInheritanceTree ()
-		{
-			DomType[] types = new DomType[] {
-				new DomType ("A"),
-				new DomType ("B") {
-					BaseType = new DomReturnType ("A")
-				},
-				new DomType ("C") {
-					BaseType = new DomReturnType ("B")
-				}
-			};
-			
-			CheckDomCorrectness	 (types, delegate (ProjectDom dom) {
-				IType result = dom.GetType ("C");
-				Assert.IsNotNull (result);
-				HashSet<string> resTypes = new HashSet<string> ();
-				foreach (IType t in dom.GetInheritanceTree (result)) {
-					resTypes.Add (t.FullName);
-				}
-				Assert.IsTrue (resTypes.Contains ("A"));
-				Assert.IsTrue (resTypes.Contains ("B"));
-				Assert.IsTrue (resTypes.Contains ("C"));
-			});
-		}
-			
-		[Test()]
-		public void TestGetInnerInheritedType ()
-		{
-			DomType[] types = new DomType[] {
-				new DomType ("A"),
-				new DomType ("B") {
-					BaseType = new DomReturnType ("A")
-				}
-			};
-			types[0].Add (new DomType ("Inner"));
-			
-			CheckDomCorrectness	 (types, delegate (ProjectDom dom) {
-				IType result = dom.GetType ("B.Inner");
-				Assert.IsNotNull (result);
-			});
-		}
-	
-		[Test()]
-		public void TestGetSubclasses ()
-		{
-			DomType[] types = new DomType[] {
-				new DomType ("A"),
-				new DomType ("B") {
-					BaseType = new DomReturnType ("A")
-				},
-				new DomType ("C") {
-					BaseType = new DomReturnType ("B")
-				}
-			};
-			
-			CheckDomCorrectness	 (types, delegate (ProjectDom dom) {
-				IType result = dom.GetType ("A");
-				Assert.IsNotNull (result);
-				HashSet<string> resTypes = new HashSet<string> ();
-				foreach (IType t in dom.GetSubclasses (result)) {
-					resTypes.Add (t.FullName);
-				}
-				Assert.IsTrue (resTypes.Contains ("A"));
-				Assert.IsTrue (resTypes.Contains ("B"));
-				Assert.IsTrue (resTypes.Contains ("C"));
-			});
-		}
-	}
-	*/
-}
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestDocument.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestDocument.cs
index 8803593ed1..58a979c0ef 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestDocument.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestDocument.cs
@@ -45,12 +45,12 @@ namespace MonoDevelop.CSharpBinding
 		
 		public IProjectContent HiddenProjectContent;
 
-		public override IProjectContent GetProjectContext ()
-		{
-			if (HiddenProjectContent != null)
-				return HiddenProjectContent;
-			return base.GetProjectContext ();
-		}
+//		public override IProjectContent GetProjectContext ()
+//		{
+//			if (HiddenProjectContent != null)
+//				return HiddenProjectContent;
+//			return base.GetProjectContext ();
+//		}
 	}
 }
 
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestViewContent.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestViewContent.cs
index 698686bd2a..2886fd80c8 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestViewContent.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestViewContent.cs
@@ -29,16 +29,17 @@
 using System;

 using System.Linq;

 using System.Collections.Generic;

-using Mono.TextEditor;

 using MonoDevelop.Core;

 using MonoDevelop.Ide.Gui;

 using MonoDevelop.Ide.Gui.Content;

+using MonoDevelop.Ide.Editor;

+using MonoDevelop.Core.Text;

 
 namespace MonoDevelop.CSharpBinding.Tests
 {
-	public class TestViewContent : AbstractViewContent, IEditableTextBuffer, Mono.TextEditor.ITextEditorDataProvider

+	public class TestViewContent : AbstractViewContent

 	{

-		TextEditorData data;

+		TextEditor data;

 		

 		public override Gtk.Widget Control {
 			get {

@@ -46,85 +47,84 @@ namespace MonoDevelop.CSharpBinding.Tests
 			}
 		}

 		

-		public TextEditorData Data {

+		public TextEditor Data {

 			get {

 				return this.data;

 			}

 		}

 
		public TestViewContent ()

 		{

-			document = new Mono.TextEditor.TextDocument ();

-			data = new TextEditorData (document);

+			data = TextEditorFactory.CreateNewEditor ();

+			Contents.Add (data);;
 			Name = "";

 		}

 

-		public TestViewContent (TextEditorData data)

+		public TestViewContent (IReadonlyTextDocument doc)

 		{

-			this.document = data.Document;

-			this.data = data;

+			data = TextEditorFactory.CreateNewEditor (doc);

+			Contents.Add (data);

 			Name = "";

 		}

 		
-		public override void Load(string fileName)

+		public override void Load(FileOpenInformation fileOpenInformation)

 		{

 		}

 		

 		FilePath name;

 		public FilePath Name { 

 			get { return name; }

-			set { name =  document.FileName = value; }

+			set { name =  data.FileName = value; }

 		}

 		

 		public int LineCount {

 			get {

-				return document.LineCount;

+				return data.LineCount;

 			}

 		}

-		
-		Mono.TextEditor.TextDocument document;
+
 		public string Text {

 			get {

-				return document.Text;

+				return data.Text;

 			}

 			set {

-				document.Text = value;

+				data.Text = value;

 			}

 		}

 		

 		public int InsertText (int position, string text)

 		{

-			document.Insert (position, text);

+			data.InsertText (position, text);

 			return text.Length;

 		}

 		
 		public void DeleteText (int position, int length)

 		{

-			document.Replace (position, length, "");

+			data.ReplaceText (position, length, "");

 		}
 		
 		public int Length {

 			get {

-				return document.TextLength;

+				return data.Length;

 			}

 		}
 		
 		public string GetText (int startPosition, int endPosition)

 		{

-			return document.GetTextBetween (startPosition, endPosition);

+			return data.GetTextBetween (startPosition, endPosition);

 		}
 		public char GetCharAt (int position)

 		{

-			return document.GetCharAt (position);

+			return data.GetCharAt (position);

 		}
 		
 		public int GetPositionFromLineColumn (int line, int column)

 		{

-			return document.LocationToOffset (line, column);

+			return data.LocationToOffset (line, column);

 		}

 		
 		public void GetLineColumnFromPosition (int position, out int line, out int column)

 		{

-			DocumentLocation loc = document.OffsetToLocation (position);

+			var loc = data.OffsetToLocation (position);

 			line = loc.Line;

 			column = loc.Column;

 		}

@@ -133,17 +133,17 @@ namespace MonoDevelop.CSharpBinding.Tests
 		

 		public int CursorPosition {

 			get {

-				return data.Caret.Offset;

+				return data.CaretOffset;

 			}

 			set {

-				data.Caret.Offset = value;

+				data.CaretOffset = value;

 			}

 		}
 
 		public int SelectionStartPosition { 

 			get {

 				if (!data.IsSomethingSelected)

-					return data.Caret.Offset;

+					return data.CaretOffset;

 				return data.SelectionRange.Offset;

 			}

 		}

@@ -151,14 +151,14 @@ namespace MonoDevelop.CSharpBinding.Tests
 		public int SelectionEndPosition { 

 			get {

 				if (!data.IsSomethingSelected)

-					return data.Caret.Offset;

+					return data.CaretOffset;

 				return data.SelectionRange.EndOffset;

 			}

 		}
 		
 		public void Select (int startPosition, int endPosition)
 		{
-			data.SelectionRange = new TextSegment (startPosition, endPosition - startPosition);

+			data.SelectionRange = TextSegment.FromBounds (startPosition, endPosition);

 		}

 		
 		public void ShowPosition (int position)

@@ -204,15 +204,20 @@ namespace MonoDevelop.CSharpBinding.Tests
 		

 		public override object GetContent (Type type) 

 		{

-			return Contents.FirstOrDefault (o => type.IsInstanceOfType (type)) ??  base.GetContent (type);

+			return Contents.FirstOrDefault (type.IsInstanceOfType) ??  base.GetContent (type);

 		}

-		

+

+		public override IEnumerable<T> GetContents<T> ()

+		{

+			return Contents.OfType<T> ();

+		}

+

 		public IDisposable OpenUndoGroup ()

 		{

 			return new DisposeStub ();

 		}

 		

-		public TextEditorData GetTextEditorData ()
+		public TextEditor GetTextEditorData ()
 		{
 			return data;

 		}

@@ -230,6 +235,5 @@ namespace MonoDevelop.CSharpBinding.Tests
 		}

 		#endregion

 		public event EventHandler CaretPositionSet;
-		public event EventHandler<TextChangedEventArgs> TextChanged;
 	}

 }
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/UnitTesteditorIntegrationTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/UnitTesteditorIntegrationTests.cs
index 9a7e8e1077..237e7e08de 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/UnitTesteditorIntegrationTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/UnitTesteditorIntegrationTests.cs
@@ -25,13 +25,16 @@
 // THE SOFTWARE.
 
 using System;
-using System.Collections;
 
 using MonoDevelop.Ide.Gui;
 using System.Collections.Generic;
-using Mono.Addins;
 using NUnit.Framework;
 using MonoDevelop.CSharp;
+using System.Threading;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
+using MonoDevelop.Core.ProgressMonitoring;
 
 namespace MonoDevelop.CSharpBinding.Tests
 {
@@ -40,19 +43,18 @@ namespace MonoDevelop.CSharpBinding.Tests
 	{
 		static UnitTestTextEditorExtension Setup (string input, out TestViewContent content)
 		{
-			TestWorkbenchWindow tww = new TestWorkbenchWindow ();
+			var tww = new TestWorkbenchWindow ();
 			content = new TestViewContent ();
 			tww.ViewContent = content;
-			content.ContentName = "a.cs";
-			content.GetTextEditorData ().Document.MimeType = "text/x-csharp";
-
-			Document doc = new Document (tww);
+			content.ContentName = "/a.cs";
+			content.Data.MimeType = "text/x-csharp";
+			MonoDevelop.AnalysisCore.AnalysisOptions.EnableUnitTestEditorIntegration.Set (true);
+			var doc = new Document (tww);
 
 			var text = @"namespace NUnit.Framework {
-	using System;
-	class TestFixtureAttribute : Attribute {} 
-	class TestAttribute : Attribute {} 
-} namespace Test { " + input +"}";
+	public class TestFixtureAttribute : System.Attribute {} 
+	public class TestAttribute : System.Attribute {} 
+} namespace TestNs { " + input +"}";
 			int endPos = text.IndexOf ('$');
 			if (endPos >= 0)
 				text = text.Substring (0, endPos) + text.Substring (endPos + 1);
@@ -60,28 +62,46 @@ namespace MonoDevelop.CSharpBinding.Tests
 			content.Text = text;
 			content.CursorPosition = System.Math.Max (0, endPos);
 
+			var project = new DotNetAssemblyProject (Microsoft.CodeAnalysis.LanguageNames.CSharp);
+			project.Name = "test";
+			project.FileName = "test.csproj";
+			project.Files.Add (new ProjectFile ("/a.cs", BuildAction.Compile)); 
+
+			var solution = new Solution ();
+			solution.AddConfiguration ("", true); 
+			solution.DefaultSolutionFolder.AddItem (project);
+			using (var monitor = new NullProgressMonitor ())
+				TypeSystemService.Load (solution, monitor, false);
+			content.Project = project;
+			doc.SetProject (project);
 
 			var compExt = new UnitTestTextEditorExtension ();
-			compExt.Initialize (doc);
+			compExt.Initialize (doc.Editor, doc);
 			content.Contents.Add (compExt);
-
 			doc.UpdateParseDocument ();
+			TypeSystemService.Unload (solution);
 			return compExt;
 		}
 
+		protected override void InternalSetup (string rootDir)
+		{
+			base.InternalSetup (rootDir);
+			IdeApp.Initialize (new MonoDevelop.Core.ProgressMonitoring.NullProgressMonitor ()); 
+		}
+
 		[Test]
 		public void TestSimple ()
 		{
 			TestViewContent content;
 			var ext = Setup (@"using NUnit.Framework;
 [TestFixture]
-class Test
+class TestClass
 {
 	[Test]
 	public void MyTest () {}
 }
 ", out content);
-			var tests = ext.GatherUnitTests ();
+			var tests = ext.GatherUnitTests (default(CancellationToken)).Result;
 			Assert.IsNotNull (tests);
 			Assert.AreEqual (2, tests.Count);
 		}
@@ -91,12 +111,12 @@ class Test
 		{
 			TestViewContent content;
 			var ext = Setup (@"using NUnit.Framework;
-class Test
+class TestClass
 {
 	public void MyTest () {}
 }
 ", out content);
-			var tests = ext.GatherUnitTests ();
+			var tests = ext.GatherUnitTests (default(CancellationToken)).Result;
 			Assert.IsNotNull (tests);
 			Assert.AreEqual (0, tests.Count);
 		}
@@ -122,13 +142,34 @@ public class Derived : MyBase
 	public void MyTest () {}
 }
 ", out content);
-			var tests = ext.GatherUnitTests ();
+			var tests = ext.GatherUnitTests (default(CancellationToken)).Result;
 			Assert.IsNotNull (tests);
 			Assert.AreEqual (2, tests.Count);
 
-			Assert.AreEqual ("Test.Derived", tests [0].UnitTestIdentifier);
-			Assert.AreEqual ("Test.Derived.MyTest", tests [1].UnitTestIdentifier);
+			Assert.AreEqual ("TestNs.Derived", tests [0].UnitTestIdentifier);
+			Assert.AreEqual ("TestNs.Derived.MyTest", tests [1].UnitTestIdentifier);
 		}
+
+
+		/// <summary>
+		/// Bug 19651 - Should not require [TestFixture] for Unit Test Integration
+		/// </summary>
+		[Test]
+		public void TestBug19651 ()
+		{
+			TestViewContent content;
+			var ext = Setup (@"using NUnit.Framework;
+class TestClass
+{
+	[Test]
+	public void MyTest () {}
+}
+", out content);
+			var tests = ext.GatherUnitTests (default(CancellationToken)).Result;
+			Assert.IsNotNull (tests);
+			Assert.AreEqual (2, tests.Count);
+		}
+
 	}
 }
 
diff --git a/main/tests/UnitTests/MonoDevelop.Core/BacktrackingStringMatcherTests.cs b/main/tests/UnitTests/MonoDevelop.Core/BacktrackingStringMatcherTests.cs
index 4fd2ad602d..3cda234a7e 100644
--- a/main/tests/UnitTests/MonoDevelop.Core/BacktrackingStringMatcherTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Core/BacktrackingStringMatcherTests.cs
@@ -30,6 +30,7 @@ using System.Linq;
 
 namespace MonoDevelop.Core
 {
+	[TestFixture]
 	public class BacktrackingStringMatcherTests
 	{
 		[Test()]
@@ -87,6 +88,20 @@ namespace MonoDevelop.Core
 			CompareMatch(match,          "*****--");
 		}
 
+
+		[Test()]
+		public void TestBacktrackBug ()
+		{
+			var matcher = StringMatcher.GetMatcher ("dlli", true);
+			var match = matcher.GetMatch("DllList");
+			CompareMatch(match,          "**-**--");
+
+			matcher = StringMatcher.GetMatcher ("dLli", true);
+			match = matcher.GetMatch("DllList");
+			Assert.IsNull (match, "match found");
+		}
+
+
 		[Test()]
 		public void TestUnderscoreAtEnd ()
 		{
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Editor/Commands/CodeCommentTests.cs b/main/tests/UnitTests/MonoDevelop.Ide.Editor/Commands/CodeCommentTests.cs
new file mode 100644
index 0000000000..4ac482e082
--- /dev/null
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Editor/Commands/CodeCommentTests.cs
@@ -0,0 +1,207 @@
+//
+// CodeCommentTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Text;
+using NUnit.Framework;
+using UnitTests;
+
+namespace MonoDevelop.Ide.Editor
+{
+	[TestFixture]
+	public class CodeCommentTests : TestBase
+	{
+		internal static TextEditor CreateTextEditor (string input)
+		{
+			var editor = TextEditorFactory.CreateNewEditor ();
+			editor.MimeType = "text/x-csharp";
+
+			var sb = new StringBuilder ();
+			int cursorPosition = 0, selectionStart = -1, selectionEnd = -1;
+
+			for (int i = 0; i < input.Length; i++) {
+				var ch = input [i];
+				switch (ch) {
+				case '$':
+					cursorPosition = sb.Length;
+					break;
+				case '<':
+					if (i + 1 < input.Length) {
+						if (input [i + 1] == '-') {
+							selectionStart = sb.Length;
+							i++;
+							break;
+						}
+					}
+					goto default;
+				case '-':
+					if (i + 1 < input.Length) {
+						var next = input [i + 1];
+						if (next == '>') {
+							selectionEnd = sb.Length;
+							i++;
+							break;
+						}
+					}
+					goto default;
+				default:
+					sb.Append (ch);
+					break;
+				}
+			}
+			editor.Text = sb.ToString ();
+			editor.CaretOffset = cursorPosition;
+			if (selectionStart >= 0 && selectionEnd >= 0)
+				editor.SetSelection (selectionStart, selectionEnd);
+			return editor;
+		}
+
+		static void AssertEditorState (TextEditor editor, string input)
+		{
+			var sb = new StringBuilder ();
+			int cursorPosition = -1, selectionStart = -1, selectionEnd = -1;
+
+			for (int i = 0; i < input.Length; i++) {
+				var ch = input [i];
+				switch (ch) {
+				case '$':
+					cursorPosition = sb.Length;
+					break;
+				case '<':
+					if (i + 1 < input.Length) {
+						if (input [i + 1] == '-') {
+							selectionStart = sb.Length;
+							i++;
+							break;
+						}
+					}
+					goto default;
+				case '-':
+					if (i + 1 < input.Length) {
+						var next = input [i + 1];
+						if (next == '>') {
+							selectionEnd = sb.Length;
+							i++;
+							break;
+						}
+					}
+					goto default;
+				default:
+					sb.Append (ch);
+					break;
+				}
+			}
+			if (cursorPosition >= 0)
+				Assert.AreEqual (cursorPosition, editor.CaretOffset, "Cursor position mismatch.");
+			if (selectionStart >= 0) {
+				Assert.AreEqual (selectionStart, editor.SelectionRange.Offset, "Selection start mismatch.");
+				Assert.AreEqual (selectionEnd, editor.SelectionRange.EndOffset, "Selection end mismatch.");
+			}
+			Assert.AreEqual (sb.ToString (), editor.Text, "Editor text doesn't match.");
+		}
+
+		[Test]
+		public void TestAddComment()
+		{
+			var editor = CreateTextEditor (@"class Foo
+{
+	<-void Bar ()
+	{
+
+	}->
+}");
+			((TextEditorViewContent)editor.GetViewContent ()).AddCodeComment ();
+			AssertEditorState (editor, @"class Foo
+{
+	//<-void Bar ()
+	//{
+
+	//}->
+}");
+		}
+
+		[Test]
+		public void TestRemoveComment()
+		{
+			var editor = CreateTextEditor ( @"class Foo
+{
+	//<-void Bar ()
+	//{
+
+	//}->
+}");
+			((TextEditorViewContent)editor.GetViewContent ()).RemoveCodeComment ();
+			AssertEditorState (editor,@"class Foo
+{
+	<-void Bar ()
+	{
+
+	}->
+}");
+		}
+
+		[Test]
+		public void TestToggle_Add()
+		{
+			var editor = CreateTextEditor (@"class Foo
+{
+	<-void Bar ()
+	{
+
+	}->
+}");
+			((TextEditorViewContent)editor.GetViewContent ()).ToggleCodeComment ();
+			AssertEditorState (editor, @"class Foo
+{
+	//<-void Bar ()
+	//{
+
+	//}->
+}");
+		}
+	
+		[Test]
+		public void TestToggle_Remove()
+		{
+			var editor = CreateTextEditor ( @"class Foo
+{
+	//<-void Bar ()
+	//{
+
+	//}->
+}");
+			((TextEditorViewContent)editor.GetViewContent ()).ToggleCodeComment ();
+			AssertEditorState (editor,@"class Foo
+{
+	<-void Bar ()
+	{
+
+	}->
+}");
+		}
+
+	}
+}
+
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Editor/Commands/SortSelectedLinesTests.cs b/main/tests/UnitTests/MonoDevelop.Ide.Editor/Commands/SortSelectedLinesTests.cs
new file mode 100644
index 0000000000..aff4feefdc
--- /dev/null
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Editor/Commands/SortSelectedLinesTests.cs
@@ -0,0 +1,66 @@
+//
+// SortSelectedLinesTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Text;
+using NUnit.Framework;
+using UnitTests;
+using MonoDevelop.Ide.Commands;
+
+namespace MonoDevelop.Ide.Editor
+{
+	[TestFixture]
+	public class SortSelectedLinesTests : TestBase
+	{
+		[Test]
+		public void SortSimpleTest ()
+		{
+			var editor = CodeCommentTests.CreateTextEditor (@"
+9
+<-8
+7
+6
+5
+4
+3
+2->
+1
+");
+			EditActions.SortSelectedLines (editor);
+			Assert.AreEqual (@"
+9
+2
+3
+4
+5
+6
+7
+8
+1
+", editor.Text);
+		}
+	}
+}
+
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Editor/ReadonlyTextDocumentTestBase.cs b/main/tests/UnitTests/MonoDevelop.Ide.Editor/ReadonlyTextDocumentTestBase.cs
new file mode 100644
index 0000000000..4b0685ee57
--- /dev/null
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Editor/ReadonlyTextDocumentTestBase.cs
@@ -0,0 +1,164 @@
+//
+// ReadonlyTextDocumentTestBase.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using MonoDevelop.Core.Text;
+using System.Text;
+
+namespace MonoDevelop.Ide.Editor
+{
+	[TestFixture]
+	public abstract class ReadonlyTextDocumentTestBase : TextSourceTestBase
+	{
+		protected sealed override ITextSource CreateTextSource (string text, Encoding enc = null, bool useBom = false)
+		{
+			return CreateReadonlyTextDocument (text, enc, useBom);
+		}
+
+		protected abstract IReadonlyTextDocument CreateReadonlyTextDocument (string text, Encoding enc = null, bool useBom = false);
+
+
+		[Test]
+		public void TestLineCount()
+		{
+			var doc = CreateReadonlyTextDocument ("aaa\nbbb\nccc\n");
+			Assert.AreEqual (4, doc.LineCount);
+		}
+
+
+		[Test]
+		public void TestLocationToOffset()
+		{
+			var doc = CreateReadonlyTextDocument ("aaa\nbbb\nccc\n");
+			Assert.AreEqual (0, doc.LocationToOffset (1, 1));
+			Assert.AreEqual (4, doc.LocationToOffset (2, 1));
+			Assert.AreEqual (11, doc.LocationToOffset (3, 4));
+		}
+
+		[Test]
+		public void TestOffsetToLocation()
+		{
+			var doc = CreateReadonlyTextDocument ("aaa\nbbb\nccc\n");
+			Assert.AreEqual (new DocumentLocation (1, 1), doc.OffsetToLocation (0));
+			Assert.AreEqual (new DocumentLocation (2, 1), doc.OffsetToLocation (4));
+			Assert.AreEqual (new DocumentLocation (3, 4), doc.OffsetToLocation (11));
+		}
+
+		[Test]
+		public void TestGetLine()
+		{
+			var doc = CreateReadonlyTextDocument ("aaa\nbbb\nccc\n");
+			var line1 = doc.GetLine (1);
+			Assert.AreEqual (0, line1.Offset);
+			Assert.AreEqual (3, line1.Length);
+			Assert.AreEqual (1, line1.DelimiterLength);
+			Assert.AreEqual (1, line1.LineNumber);
+
+			var line2 = doc.GetLine (2);
+			Assert.AreEqual (4, line2.Offset);
+			Assert.AreEqual (3, line2.Length);
+			Assert.AreEqual (1, line2.DelimiterLength);
+			Assert.AreEqual (2, line2.LineNumber);
+
+			var line3 = doc.GetLine (3);
+			Assert.AreEqual (8, line3.Offset);
+			Assert.AreEqual (3, line3.Length);
+			Assert.AreEqual (1, line3.DelimiterLength);
+			Assert.AreEqual (3, line3.LineNumber);
+
+			var line4 = doc.GetLine (4);
+			Assert.AreEqual (12, line4.Offset);
+			Assert.AreEqual (0, line4.Length);
+			Assert.AreEqual (0, line4.DelimiterLength);
+			Assert.AreEqual (4, line4.LineNumber);
+		}
+
+		[Test]
+		public void GetLineByOffset()
+		{
+			var doc = CreateReadonlyTextDocument ("aaa\nbbb\nccc\n");
+			for (int i = 0; i < 3; i++) {
+				var line1 = doc.GetLineByOffset (0 + i);
+				Assert.AreEqual (0, line1.Offset);
+				Assert.AreEqual (3, line1.Length);
+				Assert.AreEqual (1, line1.DelimiterLength);
+				Assert.AreEqual (1, line1.LineNumber);
+			}
+
+			for (int i = 0; i < 3; i++) {
+				var line2 = doc.GetLineByOffset (4 + i);
+				Assert.AreEqual (4, line2.Offset);
+				Assert.AreEqual (3, line2.Length);
+				Assert.AreEqual (1, line2.DelimiterLength);
+				Assert.AreEqual (2, line2.LineNumber);
+			}
+
+			for (int i = 0; i < 3; i++) {
+				var line3 = doc.GetLineByOffset (8 + i);
+				Assert.AreEqual (8, line3.Offset);
+				Assert.AreEqual (3, line3.Length);
+				Assert.AreEqual (1, line3.DelimiterLength);
+				Assert.AreEqual (3, line3.LineNumber);
+			}
+
+			var line4 = doc.GetLineByOffset (12);
+			Assert.AreEqual (12, line4.Offset);
+			Assert.AreEqual (0, line4.Length);
+			Assert.AreEqual (0, line4.DelimiterLength);
+			Assert.AreEqual (4, line4.LineNumber);
+		}
+
+		[Test]
+		public void TestLineParsingLineEndings()
+		{
+			var doc = CreateReadonlyTextDocument ("1\n2\r\n3\r4\u00855\u000B6\u000C7\u20288\u2029");
+			Assert.AreEqual (UnicodeNewline.LF, doc.GetLine (1).UnicodeNewline);
+			Assert.AreEqual (1, doc.GetLine (1).DelimiterLength);
+
+			Assert.AreEqual (UnicodeNewline.CRLF, doc.GetLine (2).UnicodeNewline);
+			Assert.AreEqual (2, doc.GetLine (2).DelimiterLength);
+
+			Assert.AreEqual (UnicodeNewline.CR, doc.GetLine (3).UnicodeNewline);
+			Assert.AreEqual (1, doc.GetLine (3).DelimiterLength);
+
+			Assert.AreEqual (UnicodeNewline.NEL, doc.GetLine (4).UnicodeNewline);
+			Assert.AreEqual (1, doc.GetLine (4).DelimiterLength);
+
+			Assert.AreEqual (UnicodeNewline.VT, doc.GetLine (5).UnicodeNewline);
+			Assert.AreEqual (1, doc.GetLine (5).DelimiterLength);
+
+			Assert.AreEqual (UnicodeNewline.FF, doc.GetLine (6).UnicodeNewline);
+			Assert.AreEqual (1, doc.GetLine (6).DelimiterLength);
+
+			Assert.AreEqual (UnicodeNewline.LS, doc.GetLine (7).UnicodeNewline);
+			Assert.AreEqual (1, doc.GetLine (7).DelimiterLength);
+
+			Assert.AreEqual (UnicodeNewline.PS, doc.GetLine (8).UnicodeNewline);
+			Assert.AreEqual (1, doc.GetLine (8).DelimiterLength);
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Editor/SimpleBracketMatcherTests.cs b/main/tests/UnitTests/MonoDevelop.Ide.Editor/SimpleBracketMatcherTests.cs
new file mode 100644
index 0000000000..82cbe2ca27
--- /dev/null
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Editor/SimpleBracketMatcherTests.cs
@@ -0,0 +1,55 @@
+//
+// SimpleBracketMatcherTests.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Ide.Editor.Util;
+using NUnit.Framework;
+using UnitTests;
+
+namespace MonoDevelop.Ide.Editor
+{
+	[TestFixture]
+	public class SimpleBracketMatcherTests : TestBase
+	{
+		[TestCase ("{}", 0, 1)]
+		[TestCase ("{}", 1, 0)]
+		public void MatchingBracketTests (string text, int offset, int expectedOffsetMatch)
+		{
+			var editor = TextEditorFactory.CreateNewEditor ();
+			editor.MimeType = "text/x-csharp";
+			editor.Text = text;
+			var document = new TextDocument (text);
+
+			int actualOffset = SimpleBracketMatcher.GetMatchingBracketOffset (editor, offset);
+			int actualOffset2 = document.GetMatchingBracketOffset (offset);
+
+			Assert.AreEqual (actualOffset2, actualOffset);
+			Assert.AreEqual (expectedOffsetMatch, actualOffset);
+		}
+	}
+}
+
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Editor/Tests/MonoTextEditorImplementationTests.cs b/main/tests/UnitTests/MonoDevelop.Ide.Editor/Tests/MonoTextEditorImplementationTests.cs
new file mode 100644
index 0000000000..18819ab481
--- /dev/null
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Editor/Tests/MonoTextEditorImplementationTests.cs
@@ -0,0 +1,56 @@
+//
+// MonoTextEditorImplementationTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using System.Text;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public class MonoTextEditorImplementationTests : TextEditorTestBase
+	{
+		protected override TextEditor CreateTextEditor (string text, Encoding enc = null, bool useBom = false)
+		{
+			var editor = TextEditorFactory.CreateNewEditor ();
+			editor.Text = text;
+			editor.Encoding = enc;
+			editor.UseBOM = useBom;
+			return editor;
+		}
+	}
+
+	public class MonoTextEditorSnapshotImplementationTests : ReadonlyTextDocumentTestBase
+	{
+		protected override IReadonlyTextDocument CreateReadonlyTextDocument (string text, Encoding enc = null, bool useBom = false)
+		{
+			var editor = TextEditorFactory.CreateNewEditor ();
+			editor.Text = text;
+			editor.Encoding = enc;
+			editor.UseBOM = useBom;
+			return editor.CreateDocumentSnapshot ();
+		}
+	}
+}
+
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Editor/Tests/SimpleReadonlyDocument_Tests.cs b/main/tests/UnitTests/MonoDevelop.Ide.Editor/Tests/SimpleReadonlyDocument_Tests.cs
new file mode 100644
index 0000000000..0e20ea8dda
--- /dev/null
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Editor/Tests/SimpleReadonlyDocument_Tests.cs
@@ -0,0 +1,41 @@
+//
+// SimpleReadonlyDocument_Tests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Util;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public class SimpleReadonlyDocument_Tests : ReadonlyTextDocumentTestBase
+	{
+		protected override IReadonlyTextDocument CreateReadonlyTextDocument (string text, System.Text.Encoding enc, bool useBom = false)
+		{
+			return SimpleReadonlyDocument.CreateReadonlyDocumentAsync (new StringTextSource (text, enc, useBom)).Result; 
+		}
+	}
+}
+
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Editor/Tests/StringTextSource_Tests.cs b/main/tests/UnitTests/MonoDevelop.Ide.Editor/Tests/StringTextSource_Tests.cs
new file mode 100644
index 0000000000..955eacd4f5
--- /dev/null
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Editor/Tests/StringTextSource_Tests.cs
@@ -0,0 +1,47 @@
+//
+// StringTextSource_Tests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.Ide.Editor
+{
+	public class StringTextSource_Tests : TextSourceTestBase
+	{
+		protected override ITextSource CreateTextSource (string text, System.Text.Encoding enc = null, bool useBom = false)
+		{
+			return new StringTextSource (text, enc, useBom);
+		}
+	}
+
+	public class StringTextSource_Snapshot_Tests : TextSourceTestBase
+	{
+		protected override ITextSource CreateTextSource (string text, System.Text.Encoding enc = null, bool useBom = false)
+		{
+			return new StringTextSource (text, enc, useBom).CreateSnapshot ();
+		}
+	}
+}
+
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextDocumentTestBase.cs b/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextDocumentTestBase.cs
new file mode 100644
index 0000000000..e5e368c41d
--- /dev/null
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextDocumentTestBase.cs
@@ -0,0 +1,173 @@
+//
+// TextDocumentTestBase.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using MonoDevelop.Core.Text;
+using System.Text;
+
+namespace MonoDevelop.Ide.Editor
+{
+	[TestFixture]
+	public abstract class TextDocumentTestBase : ReadonlyTextDocumentTestBase
+	{
+		protected sealed override IReadonlyTextDocument CreateReadonlyTextDocument (string text, Encoding enc = null, bool useBom = false)
+		{
+			return CreateTextDocument (text, enc, useBom);
+		}
+
+		protected abstract ITextDocument CreateTextDocument (string text, Encoding enc = null, bool useBom = false);
+
+		[Test]
+		public void InsertTextTest()
+		{
+			var textDoc = CreateTextDocument ("12345");
+			textDoc.InsertText (3, "Hello");
+			Assert.AreEqual (textDoc.Text, "123Hello45");
+		}
+
+		[Test]
+		public void InsertText_TextSourceTest()
+		{
+			var textDoc = CreateTextDocument ("12345");
+			textDoc.InsertText (3, new StringTextSource ("Hello"));
+			Assert.AreEqual (textDoc.Text, "123Hello45");
+		}
+
+		[Test]
+		public void RemoveText_TextSourceTest()
+		{
+			var textDoc = CreateTextDocument ("12345");
+			textDoc.RemoveText (2, 2);
+			Assert.AreEqual (textDoc.Text, "125");
+		}
+
+		[Test]
+		public void RemoveText_Segment_TextSourceTest()
+		{
+			var textDoc = CreateTextDocument ("12345");
+			textDoc.RemoveText (new TextSegment (2, 2));
+			Assert.AreEqual (textDoc.Text, "125");
+		}
+
+		[Test]
+		public void ReplaceTextTest()
+		{
+			var textDoc = CreateTextDocument ("12345");
+			textDoc.ReplaceText (2, 2, "Hello");
+			Assert.AreEqual (textDoc.Text, "12Hello5");
+		}
+
+		[Test]
+		public void Replace_Segment_TextTest()
+		{
+			var textDoc = CreateTextDocument ("12345");
+			textDoc.ReplaceText (new TextSegment (2, 2), "Hello");
+			Assert.AreEqual (textDoc.Text, "12Hello5");
+		}
+
+
+		[Test]
+		public void Replace_TextSourceTextTest()
+		{
+			var textDoc = CreateTextDocument ("12345");
+			textDoc.ReplaceText (2, 2, new StringTextSource ("Hello"));
+			Assert.AreEqual (textDoc.Text, "12Hello5");
+		}
+
+		[Test]
+		public void Replace_TextSource_Segment_TextTest()
+		{
+			var textDoc = CreateTextDocument ("12345");
+			textDoc.ReplaceText (new TextSegment (2, 2), new StringTextSource ("Hello"));
+			Assert.AreEqual (textDoc.Text, "12Hello5");
+		}
+
+		[Test]
+		public void TestUndoOperation()
+		{
+			var textDoc = CreateTextDocument ("12345");
+			Assert.IsFalse (textDoc.IsInAtomicUndo);
+			using (var undo = textDoc.OpenUndoGroup ()) {
+				Assert.IsTrue (textDoc.IsInAtomicUndo);
+			}
+			Assert.IsFalse (textDoc.IsInAtomicUndo);
+		}
+
+
+		[Test]
+		public void TestTextChanging()
+		{
+			var textDoc = CreateTextDocument ("12345");
+			TextChangeEventArgs changeArgs = null;
+			string text = null;
+			textDoc.TextChanging += delegate(object sender, TextChangeEventArgs e) {
+				changeArgs = e;
+				text = textDoc.Text;
+			};
+			textDoc.ReplaceText (2, 2, "Hello");
+			Assert.AreEqual (textDoc.Text, "12Hello5");
+			Assert.AreEqual (text, "12345");
+			Assert.AreEqual (changeArgs.Offset, 2);
+			Assert.AreEqual (changeArgs.RemovalLength, 2);
+			Assert.AreEqual (changeArgs.RemovedText.Text, "34");
+			Assert.AreEqual (changeArgs.InsertionLength, "Hello".Length);
+			Assert.AreEqual (changeArgs.InsertedText.Text, "Hello");
+		}
+
+		[Test]
+		public void TestTextChanged()
+		{
+			var textDoc = CreateTextDocument ("12345");
+			TextChangeEventArgs changeArgs = null;
+			string text = null;
+			textDoc.TextChanged += delegate(object sender, TextChangeEventArgs e) {
+				changeArgs = e;
+				text = textDoc.Text;
+			};
+			textDoc.ReplaceText (2, 2, "Hello");
+			Assert.AreEqual (textDoc.Text, "12Hello5");
+			Assert.AreEqual (text, "12Hello5");
+			Assert.AreEqual (changeArgs.Offset, 2);
+			Assert.AreEqual (changeArgs.RemovalLength, 2);
+			Assert.AreEqual (changeArgs.RemovedText.Text, "34");
+			Assert.AreEqual (changeArgs.InsertionLength, "Hello".Length);
+			Assert.AreEqual (changeArgs.InsertedText.Text, "Hello");
+		}
+
+//		[Test]
+//		public void TestLineInserted()
+//		{
+//			var textDoc = CreateTextDocument ("12345");
+//			LineEventArgs changeArgs = null;
+//			textDoc.LineInserted += (sender, e) => changeArgs = e;
+//			textDoc.InsertText (0, "foo\n");
+//			Assert.AreEqual (1, changeArgs.Line.LineNumber);
+//			Assert.AreEqual (changeArgs.Line.Length, "foo".Length);
+//		}
+
+	}
+}
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextEditorProjectionTests.cs b/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextEditorProjectionTests.cs
new file mode 100644
index 0000000000..5cc9c56ce9
--- /dev/null
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextEditorProjectionTests.cs
@@ -0,0 +1,78 @@
+//
+// TextEditorProjectionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Editor.Projection;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.CSharpBinding;
+using UnitTests;
+using MonoDevelop.CSharpBinding.Tests;
+using System.Linq;
+
+namespace MonoDevelop.Ide.Editor
+{
+	[TestFixture]
+	public class TextEditorProjectionTests : TestBase
+	{
+		[Test]
+		public void TestProjectionUpdate ()
+		{
+			var editor = TextEditorFactory.CreateNewEditor ();
+			editor.Text = "1234567890";
+
+			var projectedDocument = TextEditorFactory.CreateNewDocument (
+				new StringTextSource ("__12__34__56__78__90"), 
+				"a"
+			);
+
+			var segments = new List<ProjectedSegment> ();
+			for (int i = 0; i < 5; i++) {
+				segments.Add (new ProjectedSegment (i * 2, 2 + i * 4, 2));
+			}
+			var projection = new Projection.Projection (projectedDocument, segments);
+			var tww = new TestWorkbenchWindow ();
+			var content = new TestViewContent ();
+			tww.ViewContent = content;
+
+			var originalContext = new Document (tww);
+			var projectedEditor = projection.CreateProjectedEditor (originalContext);
+			editor.SetOrUpdateProjections (originalContext, new [] { projection }, TypeSystem.DisabledProjectionFeatures.All);
+			editor.InsertText (1, "foo");
+			Assert.AreEqual ("__1foo2__34__56__78__90", projectedEditor.Text);
+
+			Assert.AreEqual (2 , projection.ProjectedSegments.ElementAt (0).ProjectedOffset);
+			Assert.AreEqual (2 + "foo".Length, projection.ProjectedSegments.ElementAt (0).Length);
+			for (int i = 1; i < 5; i++) {
+				Assert.AreEqual (2 + i * 4 + "foo".Length, projection.ProjectedSegments.ElementAt (i).ProjectedOffset);
+				Assert.AreEqual (2, projection.ProjectedSegments.ElementAt (i).Length);
+			}
+
+		}
+	}
+}
+
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextEditorTestBase.cs b/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextEditorTestBase.cs
new file mode 100644
index 0000000000..3de39dd5b9
--- /dev/null
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextEditorTestBase.cs
@@ -0,0 +1,45 @@
+//
+// TextEditorTestBase.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using MonoDevelop.Core.Text;
+using System.Text;
+
+namespace MonoDevelop.Ide.Editor
+{
+	[TestFixture]
+	public abstract class TextEditorTestBase : TextDocumentTestBase
+	{
+		protected sealed override ITextDocument CreateTextDocument (string text, Encoding enc = null, bool useBom = false)
+		{
+			return CreateTextEditor (text, enc, useBom);
+		}
+
+		protected abstract TextEditor CreateTextEditor (string text, Encoding enc = null, bool useBom = false);
+	}
+
+}
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextSourceTestBase.cs b/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextSourceTestBase.cs
new file mode 100644
index 0000000000..a3710af4a4
--- /dev/null
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Editor/TextSourceTestBase.cs
@@ -0,0 +1,169 @@
+//
+// TextSourceTestBase.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using UnitTests;
+using NUnit.Framework.Internal;
+using MonoDevelop.Core.Text;
+using System.Text;
+using NUnit.Framework;
+using System.IO;
+
+namespace MonoDevelop.Ide.Editor
+{
+	[TestFixture]
+	public abstract class TextSourceTestBase : TestBase
+	{
+		protected abstract ITextSource CreateTextSource (string text, Encoding enc = null, bool useBom = false);
+
+		[Test]
+		public void TestTextProperty()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			Assert.AreEqual (txt, test.Text);
+		}
+
+		[Test]
+		public void TestLengthProperty()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			Assert.AreEqual (txt.Length, test.Length);
+		}
+
+		[Test]
+		public void TestGetCharAt()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			for (int i = 0; i < txt.Length; i++) {
+				Assert.AreEqual (txt[i], test.GetCharAt (i));
+			}
+		}
+
+		[Test]
+		public void TestTextAt()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			for (int i = 0; i < txt.Length; i++) {
+				Assert.AreEqual (txt.Substring (0, i), test.GetTextAt (0, i));
+			}
+		}
+
+		[Test]
+		public void TestTextAt_Segment()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			for (int i = 0; i < txt.Length; i++) {
+				Assert.AreEqual (txt.Substring (0, i), test.GetTextAt (new TextSegment (0, i)));
+			}
+		}
+
+		[Test]
+		public void TestCreateReader()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			var readText = test.CreateReader ().ReadToEnd ();
+			Assert.AreEqual (txt, readText);
+		}
+
+		[Test]
+		public void TestCreateReaderAt()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			var readText = test.CreateReader (2, 2).ReadToEnd ();
+			Assert.AreEqual (txt.Substring (2, 2), readText);
+		}
+
+		[Test]
+		public void TestCreateReaderAt_Segment()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			var readText = test.CreateReader (new TextSegment (2, 2)).ReadToEnd ();
+			Assert.AreEqual (txt.Substring (2, 2), readText);
+		}
+
+		[Test]
+		public void TestWriteTextTo()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			var writer = new StringWriter ();
+			test.WriteTextTo (writer);
+			Assert.AreEqual (txt, writer.ToString ());
+		}
+
+		[Test]
+		public void TestWriteTextToAt()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			var writer = new StringWriter ();
+			test.WriteTextTo (writer, 2, 2);
+			Assert.AreEqual (txt.Substring (2, 2), writer.ToString ());
+		}
+
+		[Test]
+		public void TestWriteTextToAt_Segment()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			var writer = new StringWriter ();
+			test.WriteTextTo (writer, new TextSegment (2, 2));
+			Assert.AreEqual (txt.Substring (2, 2), writer.ToString ());
+		}
+
+		[Test]
+		public void TestCreateSnapshotAt()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt).CreateSnapshot (2, 2);
+			Assert.AreEqual (txt.Substring (2, 2), test.Text);
+		}
+
+		[Test]
+		public void TestCreateSnapshotAt_Segment()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt).CreateSnapshot (new TextSegment (2, 2));
+			Assert.AreEqual (txt.Substring (2, 2), test.Text);
+		}
+
+		[Test]
+		public void TestGetTextBetween()
+		{
+			const string txt = "test";
+			var test = CreateTextSource (txt);
+			Assert.AreEqual (txt.Substring (1, txt.Length - 2), test.GetTextBetween (1, txt.Length - 1));
+		}
+	}
+}
+
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.FindInFiles/ColorizationTests.cs b/main/tests/UnitTests/MonoDevelop.Ide.FindInFiles/ColorizationTests.cs
index 461f66b910..60d6e6d1c3 100644
--- a/main/tests/UnitTests/MonoDevelop.Ide.FindInFiles/ColorizationTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Ide.FindInFiles/ColorizationTests.cs
@@ -26,6 +26,7 @@
 
 using System;
 using NUnit.Framework;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Ide.FindInFiles
 {
@@ -39,7 +40,7 @@ namespace MonoDevelop.Ide.FindInFiles
 				"simple",
 				1,
 				5,
-				new Mono.TextEditor.HslColor (1d, 1d, 1d)
+				new HslColor (1d, 1d, 1d)
 			);
 			Assert.AreEqual ("s<span background=\"#FFFFFF\">impl</span>e", result);
 		}
@@ -54,7 +55,7 @@ namespace MonoDevelop.Ide.FindInFiles
 				"<span foreground=\"#000000\">Console.WriteLine (</span><span foreground=\"#3364A4\">base</span><span foreground=\"#000000\">.ToString());</span>",
 				19,
 				24,
-				new Mono.TextEditor.HslColor (1d, 1d, 1d)
+				new HslColor (1d, 1d, 1d)
 			);
 			Assert.AreEqual ("<span foreground=\"#000000\">Console.WriteLine (</span><span foreground=\"#3364A4\"><span background=\"#FFFFFF\">base</span></span><span foreground=\"#000000\"><span background=\"#FFFFFF\">.</span>ToString());</span>", result);
 		}
@@ -70,7 +71,7 @@ namespace MonoDevelop.Ide.FindInFiles
 				"<span foreground=\"#000000\">List&lt;RevisionPath&gt; foo;</span>",
 				5,
 				17,
-				new Mono.TextEditor.HslColor (1d, 1d, 1d)
+				new HslColor (1d, 1d, 1d)
 			);
 			Assert.AreEqual ("<span foreground=\"#000000\">List&lt;<span background=\"#FFFFFF\">RevisionPath</span>&gt; foo;</span>", result);
 		}
@@ -83,7 +84,7 @@ namespace MonoDevelop.Ide.FindInFiles
 				"<span foreground=\"#000000\">ec.Report.Error (</span><span foreground=\"#A40000\">29</span><span foreground=\"#000000\">, loc, </span><span foreground=\"#A40000\">\"Cannot implicitly convert type `{0}' to `{1}'\"</span><span foreground=\"#000000\">,</span>",
 				16,
 				20,
-				new Mono.TextEditor.HslColor (1d, 1d, 1d)
+				new HslColor (1d, 1d, 1d)
 			);
 			Assert.AreEqual ("<span foreground=\"#000000\">ec.Report.Error <span background=\"#FFFFFF\">(</span></span><span foreground=\"#A40000\"><span background=\"#FFFFFF\">29</span></span><span foreground=\"#000000\"><span background=\"#FFFFFF\">,</span> loc, </span><span foreground=\"#A40000\">\"Cannot implicitly convert type `{0}' to `{1}'\"</span><span foreground=\"#000000\">,</span>", result);
 		}
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.FindInFiles/MemberCollectorTests.cs b/main/tests/UnitTests/MonoDevelop.Ide.FindInFiles/MemberCollectorTests.cs
deleted file mode 100644
index 2b86670596..0000000000
--- a/main/tests/UnitTests/MonoDevelop.Ide.FindInFiles/MemberCollectorTests.cs
+++ /dev/null
@@ -1,632 +0,0 @@
-// 
-// MemberCollectorTests.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using NUnit.Framework;
-using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using Mono.CSharp.Nullable;
-using GLib;
-
-namespace MonoDevelop.Ide.FindInFiles
-{
-	[TestFixture ()]
-	public class MemberCollectorTests : UnitTests.TestBase
-	{
-		IAssembly GenerateAssembly(Project project, string code)
-		{
-			var wrapper = TypeSystemService.LoadProject (project);
-			TypeSystemService.ParseFile ("test.cs", "text/x-csharp", code, wrapper);
-			wrapper.RequestLoad ();
-			do {
-				System.Threading.Thread.Sleep (10);
-			} while (!wrapper.IsLoaded);
-			var result = wrapper.Compilation.MainAssembly;
-			return result;
-		}
-
-		List<IMember> CollectMembers (string code, string typeName, Predicate<IUnresolvedMember> filter1, Predicate<IMember> filter2,
-									  bool includeOverloads, bool matchDeclaringType)
-		{
-			var fileName = string.Format ("test{0}.csproj", Environment.TickCount); // use a new file name for each test to avoid conflicts
-			var project = new UnknownProject { FileName = fileName };
-
-			var solution = new Solution ();
-			solution.RootFolder.AddItem (project);
-
-			var baseType = GenerateAssembly (project, code).GetTypeDefinition ("", typeName, 0);
-
-			var members = baseType.GetMembers (filter1).Concat (baseType.GetConstructors (filter1));
-			if (filter2 != null)
-				members = members.Where (m => filter2(m));
-			var result = MemberCollector.CollectMembers (solution, members.First (), ReferenceFinder.RefactoryScope.Solution,
-				includeOverloads, matchDeclaringType).ToList ();
-			TypeSystemService.UnloadProject (project, true);
-			return result;
-		}
-
-		List<IMember> CollectMembers (string code, string typeName, string memberName, Predicate<IMember> searchMemberFilter,
-									  bool includeOverloads, bool matchDeclaringType)
-		{
-			return CollectMembers (code, typeName, m => m.Name == memberName && m.DeclaringTypeDefinition.Name == typeName,
-				searchMemberFilter, includeOverloads, matchDeclaringType);
-		}
-		
-		void TestCollectMembers (string code, string typeName, string memberName, IEnumerable<Predicate<IMember>> expected,
-								 Predicate<IMember> searchMemberFilter = null, bool includeOverloads = true, bool matchDeclaringType = false)
-		{
-			var result = CollectMembers (code, typeName, memberName, searchMemberFilter, includeOverloads, matchDeclaringType);
-			VerifyResult (result, expected);
-		}
-		
-		void TestCollectMembersForAllTypes (string code, string memberName, IList<String> typeNames, 
-		                              	    IList<Predicate<IMember>> filters = null)
-		{
-			// all the members should be in the result
-			var expected = new List<Predicate<IMember>>();
-			for (int i = 0; i < typeNames.Count; i++)
-				expected.Add (GetMemberFilter (typeNames[i], memberName, filters == null ? null : filters[i]));
-			
-			for (int i = 0; i < typeNames.Count; i++)
-				TestCollectMembers (code, typeNames[i], memberName, expected, filters == null ? null : filters[i]);
-		}
-		
-		void VerifyResult<T>(List<T> result, IEnumerable<Predicate<T>> expected)
-		{
-			Assert.AreEqual (expected.Count (), result.Count);
-			foreach (var pred in expected)
-				Assert.AreEqual (1, result.RemoveAll (pred));
-		}
-		
-		bool MatchParameters (IMember m, IList<string> paramTypes)
-		{
-			var member = (IParameterizedMember)m;
-			if (member.Parameters.Count != paramTypes.Count) return false;
-			for (int i = 0; i < paramTypes.Count; i++) {
-				if (member.Parameters[i].Type.Name != paramTypes[i]) return false;
-			}
-			return true;
-		}
-		
-		Predicate<IMember> GetMemberFilter (string declaringType, string memberName, Predicate<IMember> filter = null)
-		{
-			return m => m.Name == memberName && m.DeclaringType.Name == declaringType && (filter == null || filter (m));
-		}
-		
-		[Test]
-		public void TestMethodOverrides ()
-		{
-			var code = @"
-class A
-{
-	public virtual void Method () { }
-}
-class B : A
-{
-	public override void Method () { }
-}
-class C : B
-{
-	public sealed void Method () { }
-}
-class D : A
-{
-	public override void Method () { }
-}";
-			
-			var memberName = "Method";
-			var types = new [] {"A", "B", "C", "D"};
-			TestCollectMembersForAllTypes (code, memberName, types);
-		}
-		
-		[Test]
-		public void TestEventOverrides ()
-		{
-			var code = @"
-class A
-{
-	public virtual event EventHandler Event;
-}
-class B : A
-{
-	public override event EventHandler Event;
-}
-class C : B
-{
-	public sealed override event EventHandler Event;
-}
-class D : A
-{
-	public override event EventHandler Event;
-}";
-			var memberName = "Event";
-			var types = new [] {"A", "B", "C", "D"};
-			TestCollectMembersForAllTypes (code, memberName, types);
-		}
-		
-		[Test]
-		public void TestPropertyOverrides ()
-		{
-			var code = @"
-class A
-{
-	public virtual int Prop
-	{ get; set; }
-}
-class B : A
-{
-	public override int Prop
-	{ get; set; }
-}
-class C : B
-{
-	public override sealed int Prop
-	{ get; set; }
-}
-class D : A
-{
-	public override int Prop
-	{ get; set; }
-}";
-			var memberName = "Prop";
-			var types = new [] {"A", "B", "C", "D"};
-			TestCollectMembersForAllTypes (code, memberName, types);
-		}
-
-		[Test]
-		public void TestSingleInterfaceImpl ()
-		{
-			var code = @"
-interface IA
-{
-	void Method();
-}
-class A : IA
-{
-	public virtual void Method() { };
-}
-class B : A
-{
-	public override void Method() { };
-}
-class C : IA
-{
-	public void Method() { };
-}";
-			var memberName = "Method";
-			var types = new [] {"A", "B", "C", "IA"};
-			TestCollectMembersForAllTypes (code, memberName, types);
-		}
-		
-		[Test]
-		public void TestMultiInterfacesImpl1 ()
-		{
-			var code = @"
-interface IA
-{
-	void Method();
-}
-interface IB
-{
-	void Method();
-}
-class A : IA, IB
-{
-	public void Method() { }
-}
-class B : IA
-{
-	public void Method() { }
-}
-class C : IB
-{
-	public void Method() { }
-}";
-			string memberName = "Method";
-			
-			var expected1 = new List<Predicate<IMember>>();
-			expected1.Add (GetMemberFilter ("A", memberName));
-			expected1.Add (GetMemberFilter ("B", memberName));
-			expected1.Add (GetMemberFilter ("C", memberName));
-			expected1.Add (GetMemberFilter ("IA", memberName));
-			expected1.Add (GetMemberFilter ("IB", memberName));
-			TestCollectMembers (code, "A", memberName, expected1);
-		}
-
-		[Test]
-		public void TestMultiInterfacesImpl2 ()
-		{
-			var code = @"
-interface IA
-{
-	void Method();
-}
-interface IB
-{
-	void Method();
-}
-class A : IA, IB
-{
-	public void Method() { }
-}
-class B : IA
-{
-	public void Method() { }
-}
-class C : IB
-{
-	public void Method() { }
-}";
-			string memberName = "Method";
-
-			var expected2 = new List<Predicate<IMember>>();
-			expected2.Add (GetMemberFilter ("A", memberName));
-			expected2.Add (GetMemberFilter ("B", memberName));
-			expected2.Add (GetMemberFilter ("IA", memberName));
-			TestCollectMembers (code, "B", memberName, expected2);
-			TestCollectMembers (code, "IA", memberName, expected2);
-		}
-
-		[Test]
-		public void TestMultiInterfacesImpl3 ()
-		{
-			var code = @"
-interface IA
-{
-	void Method();
-}
-interface IB
-{
-	void Method();
-}
-class A : IA, IB
-{
-	public void Method() { }
-}
-class B : IA
-{
-	public void Method() { }
-}
-class C : IB
-{
-	public void Method() { }
-}";
-			string memberName = "Method";
-			
-			var expected3 = new List<Predicate<IMember>>();
-			expected3.Add (GetMemberFilter ("A", memberName));
-			expected3.Add (GetMemberFilter ("C", memberName));
-			expected3.Add (GetMemberFilter ("IB", memberName));
-			TestCollectMembers (code, "C", memberName, expected3);
-			TestCollectMembers (code, "IB", memberName, expected3);
-		}
-		
-		[Test]
-		public void TestMethodOverloads ()
-		{
-			var code = @"
-class A
-{
-	public void Method () { }
-	public void Method (int i) { }
-	public void Method (string i) { }
-}
-struct B
-{
-	public void Method () { }
-	public void Method (int i) { }
-	public void Method (string i) { }
-}";
-			var emptyParam = new string [] { };
-			var intParam = new [] {"Int32"};
-			var strParam = new [] {"String"};
-			var paramList = new [] {emptyParam, intParam, strParam};
-			var paramFilters = paramList.Select (p => new Predicate<IMember> (m => MatchParameters (m, p)));
-			
-			var memberName = "Method";
-			var typeNames = new [] {"A", "B"};
-			foreach (var typeName in typeNames) {
-				var expected = paramFilters.Select (p => GetMemberFilter (typeName, memberName, p)).ToList ();
-				foreach (var filter in paramFilters)
-					TestCollectMembers (code, typeName, memberName, expected, filter);
-			}
-		}
-		
-		[Test]
-		public void TestIncludeOverloads ()
-		{
-			var code = @"
-class A
-{
-	public virtual void Method () { }
-	public void Method (int i) { }
-}
-class B : A
-{
-	public override void Method () { }
-	public void Method (string i) { }
-}
-class C : B
-{
-	public override void Method () { }
-	public void Method (double i) { }
-}
-class D : A
-{
-	public override void Method () { }
-	public void Method (char i) { }
-}";
-			var emptyParam = new string [] { };
-			var intParam = new [] {"Int32"};
-			var strParam = new [] {"String"};
-			var doubleParam = new [] {"Double"};
-			var charParam = new [] {"Char"};
-			var paramList = new [] { emptyParam, emptyParam, emptyParam, emptyParam, intParam, strParam, doubleParam, charParam };
-			var paramFilters = paramList.Select (p => new Predicate<IMember> (m => MatchParameters (m, p)));
-			
-			var memberName = "Method";
-			var types = new [] {"A", "B", "C", "D", "A", "B", "C", "D"};
-			TestCollectMembersForAllTypes (code, memberName, types, paramFilters.ToList ());
-			
-		}
-		
-		[Test]
-		public void TestExcludeOverloads ()
-		{
-			var code = @"
-class A
-{
-	public virtual void Method () { }
-	public void Method (int i) { }
-}
-class B : A
-{
-	public override void Method () { }
-	public void Method (string i) { }
-}
-class C : B
-{
-	public override void Method () { }
-	public void Method (double i) { }
-}
-class D : A
-{
-	public override void Method () { }
-	public void Method (char i) { }
-}";
-			var emptyParam = new string [] { };
-			var intParam = new [] {"Int32"};
-			var strParam = new [] {"String"};
-			var doubleParam = new [] {"Double"};
-			var charParam = new [] {"Char"};
-			
-			string memberName = "Method";
-			
-			var types = new [] {"A", "B", "C", "D"};
-			var paramList = new [] {intParam, strParam, doubleParam, charParam};
-			for (int i = 0; i < types.Length; i++) {
-				Predicate<IMember> paramFilter = m => MatchParameters (m, paramList[i]);
-				TestCollectMembers (code, types[i], memberName, new [] { GetMemberFilter (types[i], memberName, paramFilter)}, paramFilter, false);
-			}
-			
-			var expected = types.Select (t => new Predicate<IMember> (GetMemberFilter (t, memberName, m => MatchParameters (m,emptyParam))))
-				.ToList ();
-			foreach (var type in types)
-				TestCollectMembers (code, type,memberName, expected, m => MatchParameters (m, emptyParam), false);
-			
-		}
-		
-		[Test]
-		public void TestInterfacePlusOverrides ()
-		{
-			string code = @"
-class A
-{
-	public virtual void Method() { };
-}
-interface IA
-{
-	void Method();
-}
-class B : A, IA
-{
-	public override void Method() { };
-}";
-			string memberName = "Method";
-			
-			var expected1 = new List<Predicate<IMember>> ();
-			expected1.Add (GetMemberFilter ("A", memberName));
-			expected1.Add (GetMemberFilter ("B", memberName));
-			
-			var expected2 = new List<Predicate<IMember>> ();
-			expected2.Add (GetMemberFilter ("IA", memberName));
-			expected2.Add (GetMemberFilter ("B", memberName));
-			
-			var expected3 = new List<Predicate<IMember>> ();
-			expected3.Add (GetMemberFilter ("A", memberName));
-			expected3.Add (GetMemberFilter ("IA", memberName));
-			expected3.Add (GetMemberFilter ("B", memberName));
-			
-			TestCollectMembers (code, "A", memberName, expected1);
-			TestCollectMembers (code, "IA", memberName, expected2);
-			TestCollectMembers (code, "B", memberName, expected3);
-		}
-		
-		[Test]
-		public void TestGetBaseTypes ()
-		{
-			string code = @"
-class A { }
-class B : A { }
-interface IA { }
-class C : A, IA { }
-interface IB { }
-class D : B, IA, IB { }
-";
-			var project = new UnknownProject ();
-			project.FileName = "test.csproj";
-			var assembly = GenerateAssembly (project, code);
-			
-			var A = assembly.GetTypeDefinition ("", "A", 0);
-			var B = assembly.GetTypeDefinition ("", "B", 0);
-			var C = assembly.GetTypeDefinition ("", "C", 0);
-			var D = assembly.GetTypeDefinition ("", "D", 0);
-			var IA = assembly.GetTypeDefinition ("", "IA", 0);
-			var IB = assembly.GetTypeDefinition ("", "IB", 0);
-			
-			var result1 = MemberCollector.GetBaseTypes (new [] {A, B, C, D}).ToList ();
-			VerifyResult (result1, new Predicate<ITypeDefinition>[] {t => t == A});
-			
-			var result2 = MemberCollector.GetBaseTypes (new [] {A, B, C, IA}).ToList ();
-			VerifyResult (result2, new Predicate<ITypeDefinition>[] 
-			             {t => t == A, t => t == IA});
-			
-			var result3 = MemberCollector.GetBaseTypes (new [] {A, B, C, D, IA, IB}).ToList ();
-			VerifyResult (result3, new Predicate<ITypeDefinition>[] 
-			             {t => t == A, t => t == IA, t => t == IB});
-			TypeSystemService.UnloadProject (project, true);
-		}
-
-		[Test]
-		public void TestMatchDeclaringType ()
-		{
-			var code = @"
-class A
-{
-	public virtual void Method() { };
-	public void Method(int i) { };
-}
-class B : A
-{
-	public override void Method() { };
-}";
-			var memberName = "Method";
-			var emptyParam = new string [] { };
-			var intParam = new [] { "Int32" };
-
-			var paramList = new [] { emptyParam, intParam };
-			var expected1 = paramList.Select (p => GetMemberFilter ("A", memberName, m => MatchParameters (m, p))).ToList ();
-			foreach (var filter in expected1)
-				TestCollectMembers (code, "A", memberName, expected1, filter, true, true);
-
-			var expected2 = new List<Predicate<IMember>> { GetMemberFilter ("A", memberName, m => MatchParameters (m, emptyParam)) };
-			TestCollectMembers (code, "A", memberName, expected2, expected2 [0], false, true);
-
-			var expected3 = new List<Predicate<IMember>> { GetMemberFilter ("B", memberName, m => MatchParameters (m, emptyParam)) };
-			TestCollectMembers (code, "B", memberName, expected3, expected3 [0], false, true);
-		}
-
-		[Test]
-		public void TestConstructor ()
-		{
-			var code = @"
-class A
-{
-public A() { }
-public A(int i) { }
-}";
-			var emptyParam = new string [] { };
-			var intParam = new [] { "Int32" };
-			var filters = new List<Predicate<IMember>> 
-			{
-				m => m.SymbolKind == SymbolKind.Constructor && MatchParameters(m, emptyParam),
-				m => m.SymbolKind == SymbolKind.Constructor && MatchParameters(m, intParam)
-			};
-			
-			foreach (var filter in filters) {
-				var result1 = CollectMembers (code, "A", m => true, filter, true, false);
-				VerifyResult (result1, filters);
-			}
-			
-			var result2 = CollectMembers (code, "A", m => true, filters [0], false, true);
-			VerifyResult (result2, new [] { filters [0] });
-		}
-
-
-		[Test]
-		public void TestStaticConstructor ()
-		{
-			var code = @"
-class A
-{
-public A() { }
-static A() { }
-}";
-			var emptyParam = new string [] { };
-			Predicate<IMember> filter = m => m.SymbolKind == SymbolKind.Constructor && MatchParameters(m, emptyParam);
-			var result1 = CollectMembers (code, "A", m => true, filter, true, false);
-			Assert.AreEqual (2, result1.Count);
-		}
-
-
-		[Test]
-		public void TestShadowedMember ()
-		{
-			var code = @"
-class A
-{
-	public int Prop
-	{ get; set; }
-}
-class B : A
-{
-	public int Prop
-	{ get; set; }
-}";
-			var members = CollectMembers (code, "A", "Prop", m => true, true, false);
-			Assert.AreEqual (1, members.Count);
-		}
-
-		/// <summary>
-		/// Bug 11714 - Rename interface member does not affect other implementations 
-		/// </summary>
-		[Test]
-		public void TestBug11714 ()
-		{
-			var code = @"
-class A : IA
-{
-	public int Prop
-	{ get; set; }
-}
-
-interface IA { int Prop { get; set; } }
-
-class B : IA
-{
-	public int Prop
-	{ get; set; }
-}";
-			var members = CollectMembers (code, "A", "Prop", m => true, true, false);
-			Assert.AreEqual (3, members.Count);
-		}
-
-	}
-}
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.FindInFiles/SearchCollectorTests.cs b/main/tests/UnitTests/MonoDevelop.Ide.FindInFiles/SearchCollectorTests.cs
deleted file mode 100755
index 0d67d4142c..0000000000
--- a/main/tests/UnitTests/MonoDevelop.Ide.FindInFiles/SearchCollectorTests.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-// 
-// SearchCollectorTests.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.TypeSystem;
-using NUnit.Framework;
-
-namespace MonoDevelop.Ide.FindInFiles
-{
-	[TestFixture]
-	public class SearchCollectorTests : UnitTests.TestBase
-	{
-
-		void VerifyResult<T> (List<T> result, List<T> expected)
-		{
-			Assert.AreEqual (expected.Count (), result.Count);
-			foreach (var item in expected)
-				Assert.AreEqual (true, result.Remove(item));
-		}
-
-		void TestCollectProjects (Solution solution, IEnumerable<IEntity> entities, IEnumerable<Project> expected)
-		{
-			VerifyResult (SearchCollector.CollectProjects (solution, entities).ToList (), expected.ToList ());
-		}
-
-		void VerifyResult (List<SearchCollector.FileList> result, List<Tuple<Project, IEnumerable<FilePath>>> expected)
-		{
-			Assert.AreEqual (expected.Count, result.Count);
-			Console.WriteLine (result [0].Files.Count ());
-			foreach (var item in expected ) {
-				var tuple = item;
-				Assert.AreEqual (1, result.RemoveAll (
-					f => tuple.Item1 == f.Project && tuple.Item2.All (fileName => f.Files.Any (p => p == fileName))));
-			}
-		}
-
-		void TestCollectFiles (Solution solution, IEnumerable<IEntity> entities, IEnumerable<Tuple<Project, IEnumerable<FilePath>>> expected)
-		{
-			VerifyResult (SearchCollector.CollectFiles (solution, entities).ToList (), expected.ToList ());
-		}
-
-		void TestCollectFiles (Project project, IEnumerable<IEntity> entities, IEnumerable<Tuple<Project, IEnumerable<FilePath>>> expected)
-		{
-			VerifyResult (SearchCollector.CollectFiles (project, entities).ToList (), expected.ToList ());
-		}
-
-		static Tuple<Project, IEnumerable<FilePath>> CreateTestTuple (Project project, IEnumerable<FilePath> files)
-		{
-			return Tuple.Create (project, files);
-		}
-		
-		static Tuple<Project, IEnumerable<FilePath>> CreateTestTuple (Project project)
-		{
-			return Tuple.Create (project, project.Files.Select (f => f.FilePath));
-		}
-
-		[Ignore("Unreliable")]
-		[Test]
-		public void TestCollectFiles ()
-		{
-			var code1 = @"
-namespace project1 {
-	class A
-	{
-		private void Method1() { }
-		public void Method2() { }
-	}
-	public class B
-	{ }
-}";
-			var project1 = new UnknownProject { FileName = "projectc1.csproj" };
-			var project2 = new MonoDevelop.CSharp.Project.CSharpProject { FileName = "projectc2.csproj" };
-			project2.References.Add (new MonoDevelop.Projects.ProjectReference (project1));
-
-			var solution = new Solution ();
-			solution.RootFolder.AddItem (project1);
-			solution.RootFolder.AddItem (project2);
-			solution.RootFolder.AddItem (new UnknownProject { FileName = "dummy.csproj" });
-
-			project1.AddFile (new ProjectFile ("dummy.cs"));
-			TypeSystemService.LoadProject (project2);
-			var wrapper = TypeSystemService.LoadProject (project1);
-			TypeSystemService.ParseFile ("test.cs", "text/x-csharp", code1, wrapper);
-			var compilation = wrapper.Compilation;
-
-			var typeA = compilation.MainAssembly.GetTypeDefinition ("project1", "A", 0);
-
-			TestCollectFiles (project1, typeA.GetMembers (m => m.Name == "Method1"),
-							  new [] { CreateTestTuple (project1, new [] { (FilePath)"test.cs" }) });
-			TestCollectFiles (project1, new [] { typeA }, new [] { CreateTestTuple (project1) });
-			TestCollectFiles (project1, typeA.GetMembers (m => m.Name == "Method2"), new [] { CreateTestTuple (project1) });
-			TestCollectFiles (project1, typeA.GetMembers(), new [] { CreateTestTuple (project1) });
-
-			TestCollectFiles (solution, typeA.GetMembers (m => m.Name == "Method1"),
-							  new [] { CreateTestTuple (project1, new [] { (FilePath)"test.cs" }) });
-			TestCollectFiles (solution, typeA.GetMembers (), new [] { CreateTestTuple (project1) });
-
-			var typeB = compilation.MainAssembly.GetTypeDefinition ("project1", "B", 0);
-			TestCollectFiles (solution, new [] { typeB }, new [] { CreateTestTuple (project1), CreateTestTuple (project2) });
-			TestCollectFiles (solution, new [] { typeA, typeB }, new [] { CreateTestTuple (project1), CreateTestTuple (project2) });
-			TypeSystemService.UnloadProject (project1); 
-			TypeSystemService.UnloadProject (project2); 
-		}
-
-		[Ignore("Unreliable")]
-		[Test]
-		public void TestCollectProjects ()
-		{
-			var code = @"
-namespace project1 {
-	class A
-	{
-		private void Method1() { }
-		public void Method2() { }
-	}
-	public class B
-	{
-		private void Method1() { }
-		protected void Method2() { }
-	}
-}";
-			var project1 = new UnknownProject { FileName = "project1.csproj" };
-			var project2 = new MonoDevelop.CSharp.Project.CSharpProject { FileName = "project2.csproj" };
-			var solution = new Solution ();
-			solution.RootFolder.AddItem (project1);
-			solution.RootFolder.AddItem (project2);
-			solution.RootFolder.AddItem (new UnknownProject { FileName = "project3.csproj" });
-
-			TypeSystemService.LoadProject (project2);
-			var wrapper = TypeSystemService.LoadProject (project1);
-			TypeSystemService.ParseFile ("test.cs", "text/x-csharp", code, wrapper);
-			var compilation = wrapper.Compilation;
-
-			var typeA = compilation.MainAssembly.GetTypeDefinition ("project1", "A", 0);
-			Assert.IsNotNull (typeA);
-			TestCollectProjects (solution, new [] { typeA }, new [] { project1 });
-			TestCollectProjects (solution, typeA.GetMembers (), new [] { project1 });
-			TestCollectProjects (solution, typeA.GetMembers (m => m.Name == "Method1"), new [] { project1 });
-			TestCollectProjects (solution, typeA.GetMembers (m => m.Name == "Method2"), new [] { project1 });
-
-			project2.References.Add (new MonoDevelop.Projects.ProjectReference (project1));
-			var typeB = compilation.MainAssembly.GetTypeDefinition ("project1", "B", 0);
-			Assert.IsNotNull (typeB);
-			TestCollectProjects (solution, new [] { typeB }, new Project [] { project1, project2 });
-			TestCollectProjects (solution, typeB.GetMembers (), new Project [] { project1, project2 });
-			TestCollectProjects (solution, typeB.GetMembers (m => m.Name == "Method1"), new [] { project1 });
-			TestCollectProjects (solution, typeB.GetMembers (m => m.Name == "Method2"), new Project [] { project1, project2 });
-			TypeSystemService.UnloadProject (project1); 
-			TypeSystemService.UnloadProject (project2); 
-		}
-
-		[Ignore("Unreliable")]
-		[Test]
-		public void TestCollectForExternalReference ()
-		{
-			var projects = new List<Project> ();
-			var solution = new Solution ();
-			for (int i = 0; i < 3; i++) {
-				var project = new MonoDevelop.CSharp.Project.CSharpProject { FileName = String.Format ("projectx{0}.csproj", i) };
-				projects.Add (project);
-				solution.RootFolder.AddItem (project);
-				project.AddFile (new ProjectFile (String.Format ("dummy{0}.cs", i)));
-				project.AddReference (typeof (object).Assembly.Location);
-				TypeSystemService.LoadProject (project);
-				TypeSystemService.GetProjectContentWrapper (project).ReconnectAssemblyReferences ();
-			}
-			solution.RootFolder.AddItem (new UnknownProject { FileName = "test.csproj" });
-
-			var compilation = TypeSystemService.GetCompilation (projects[0]);
-			var intType = compilation.GetAllTypeDefinitions ().First(t => t.Name == "Int32");
-			Assert.AreEqual (null, TypeSystemService.GetProject (intType));
-			TestCollectProjects (solution, new [] { intType }, projects);
-			TestCollectFiles (solution, new [] { intType }, projects.Select (CreateTestTuple));
-		}
-
-	}
-}
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Gui/CompletionListWindowTests.cs b/main/tests/UnitTests/MonoDevelop.Ide.Gui/CompletionListWindowTests.cs
index 61647513d5..ad079d75f4 100644
--- a/main/tests/UnitTests/MonoDevelop.Ide.Gui/CompletionListWindowTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Ide.Gui/CompletionListWindowTests.cs
@@ -32,6 +32,7 @@ using MonoDevelop.Projects;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Ide.Gui
 {
@@ -92,6 +93,9 @@ namespace MonoDevelop.Ide.Gui
 				get {
 					return sb.Length;
 				}
+				set {
+					throw new NotSupportedException ();
+				}
 			}
 			
 			public int TextLength {
@@ -111,6 +115,17 @@ namespace MonoDevelop.Ide.Gui
 					return null;
 				}
 			}
+
+			double ICompletionWidget.ZoomLevel {
+				get {
+					return 1;
+				}
+			}
+
+			void ICompletionWidget.AddSkipChar (int cursorPosition, char c)
+			{
+				// ignore
+			}
 			#endregion
 			public void AddChar (char ch)
 			{
@@ -125,43 +140,51 @@ namespace MonoDevelop.Ide.Gui
 		
 		static void SimulateInput (CompletionListWindow listWindow, string input)
 		{
+			var testCompletionWidget = ((TestCompletionWidget)listWindow.CompletionWidget);
+			bool isClosed = false;
+			listWindow.WindowClosed += delegate {
+				isClosed = true;
+			};
 			foreach (char ch in input) {
 				switch (ch) {
 				case '8':
-					listWindow.PreProcessKeyEvent (Gdk.Key.Up, '\0', Gdk.ModifierType.None);
-					listWindow.PostProcessKeyEvent (Gdk.Key.Up, '\0', Gdk.ModifierType.None);
+					listWindow.PreProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Up, '\0', Gdk.ModifierType.None));
+					listWindow.PostProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Up, '\0', Gdk.ModifierType.None));
 					break;
 				case '2':
-					listWindow.PreProcessKeyEvent (Gdk.Key.Down, '\0', Gdk.ModifierType.None);
-					listWindow.PostProcessKeyEvent (Gdk.Key.Down, '\0', Gdk.ModifierType.None);
+					listWindow.PreProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Down, '\0', Gdk.ModifierType.None));
+					listWindow.PostProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Down, '\0', Gdk.ModifierType.None));
 					break;
 				case '4':
-					listWindow.PreProcessKeyEvent (Gdk.Key.Left, '\0', Gdk.ModifierType.None);
-					listWindow.PostProcessKeyEvent (Gdk.Key.Left, '\0', Gdk.ModifierType.None);
+					listWindow.PreProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Left, '\0', Gdk.ModifierType.None));
+					listWindow.PostProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Left, '\0', Gdk.ModifierType.None));
 					break;
 				case '6':
-					listWindow.PreProcessKeyEvent (Gdk.Key.Right, '\0', Gdk.ModifierType.None);
-					listWindow.PostProcessKeyEvent (Gdk.Key.Right, '\0', Gdk.ModifierType.None);
+					listWindow.PreProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Right, '\0', Gdk.ModifierType.None));
+					listWindow.PostProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Right, '\0', Gdk.ModifierType.None));
 					break;
 				case '\t':
-					listWindow.PreProcessKeyEvent (Gdk.Key.Tab, '\t', Gdk.ModifierType.None);
-					listWindow.PostProcessKeyEvent (Gdk.Key.Tab, '\t', Gdk.ModifierType.None);
+					listWindow.PreProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Tab, '\t', Gdk.ModifierType.None));
+					listWindow.PostProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Tab, '\t', Gdk.ModifierType.None));
 					break;
 				case '\b':
-					listWindow.PreProcessKeyEvent (Gdk.Key.BackSpace, '\b', Gdk.ModifierType.None);
-					((TestCompletionWidget)listWindow.CompletionWidget).Backspace ();
-					listWindow.PostProcessKeyEvent (Gdk.Key.BackSpace, '\b', Gdk.ModifierType.None);
+					listWindow.PreProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.BackSpace, '\b', Gdk.ModifierType.None));
+					testCompletionWidget.Backspace ();
+					listWindow.PostProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.BackSpace, '\b', Gdk.ModifierType.None));
 					break;
 				case '\n':
-					listWindow.PreProcessKeyEvent (Gdk.Key.Return, '\n', Gdk.ModifierType.None);
-					listWindow.PostProcessKeyEvent (Gdk.Key.Return, '\n', Gdk.ModifierType.None);
+					listWindow.PreProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Return, '\n', Gdk.ModifierType.None));
+					listWindow.PostProcessKeyEvent (KeyDescriptor.FromGtk (Gdk.Key.Return, '\n', Gdk.ModifierType.None));
 					break;
 				default:
-					listWindow.PreProcessKeyEvent ((Gdk.Key)ch, ch, Gdk.ModifierType.None);
-					((TestCompletionWidget)listWindow.CompletionWidget).AddChar (ch);
-					listWindow.PostProcessKeyEvent ((Gdk.Key)ch, ch, Gdk.ModifierType.None);
+					listWindow.PreProcessKeyEvent (KeyDescriptor.FromGtk ((Gdk.Key)ch, ch, Gdk.ModifierType.None));
+					testCompletionWidget.AddChar (ch);
+					listWindow.PostProcessKeyEvent (KeyDescriptor.FromGtk ((Gdk.Key)ch, ch, Gdk.ModifierType.None));
 					break;
 				}
+				// window closed.
+				if (isClosed)
+					break;
 			}
 		}
 		
@@ -194,8 +217,9 @@ namespace MonoDevelop.Ide.Gui
 		static string RunSimulation (SimulationSettings settings)
 		{
 			CompletionListWindow listWindow = CreateListWindow (settings);
+			var testCompletionWidget = (TestCompletionWidget)listWindow.CompletionWidget;
 			SimulateInput (listWindow, settings.SimulatedInput);
-			return ((TestCompletionWidget)listWindow.CompletionWidget).CompletedWord;
+			return testCompletionWidget.CompletedWord;
 		}
 
 		static CompletionListWindow CreateListWindow (CompletionListWindowTests.SimulationSettings settings)
@@ -204,7 +228,6 @@ namespace MonoDevelop.Ide.Gui
 			dataList.AutoSelect = settings.AutoSelect;
 			dataList.AddRange (settings.CompletionData);
 			dataList.DefaultCompletionString = settings.DefaultCompletionString;
-			ListWindow.ClearHistory ();
 			CompletionListWindow listWindow = new CompletionListWindow () {
 				CompletionDataList = dataList,
 				CompletionWidget = new TestCompletionWidget (),
@@ -480,7 +503,6 @@ namespace MonoDevelop.Ide.Gui
 			Assert.AreEqual ("/AbAb", output);
 		}
 
-		[Ignore("Behavior was changed - commit with '.' now works everytime")]
 		[Test]
 		public void TestMatchPunctuationCommitOnSpaceAndPunctuation3 ()
 		{
@@ -591,8 +613,8 @@ namespace MonoDevelop.Ide.Gui
 		[Test]
 		public void TestBug543984 ()
 		{
-			string output = RunSimulation ("", "foo b\n", true, true, false, "foo bar", "foo bar baz");
-			Assert.AreEqual ("foo bar", output);
+			string output = RunSimulation ("", "foo#b\n", true, true, false, "foo#bar", "foo#bar#baz");
+			Assert.AreEqual ("foo#bar", output);
 		}
 		
 		[Test]
@@ -817,6 +839,100 @@ namespace MonoDevelop.Ide.Gui
 			Assert.AreEqual ("d", output);
 		}
 
+		[Test]
+		public void TestSpaceCommits ()
+		{
+			string output = RunSimulation ("", "over ", true, true, 
+				"override",
+				"override foo");
+
+			Assert.AreEqual ("override", output);
+		}
+
+
+
+		[Test]
+		public void TestNumberInput ()
+		{
+			string output = RunSimulation ("", "1.", true, true, false, "foo1");
+			Assert.IsTrue (string.IsNullOrEmpty (output), "output was " + output);
+		}
+
+		static void ContinueSimulation (CompletionListWindow listWindow, ICompletionDataList list, ref TestCompletionWidget testCompletionWidget, string simulatedInput)
+		{
+			listWindow.ResetState ();
+			listWindow.CodeCompletionContext = new CodeCompletionContext ();
+			listWindow.CompletionDataList = list;
+			listWindow.CompletionWidget = testCompletionWidget = new TestCompletionWidget ();
+			listWindow.List.FilterWords ();
+			listWindow.ResetSizes ();
+			listWindow.UpdateWordSelection ();
+			SimulateInput (listWindow, simulatedInput);
+			listWindow.CompleteWord ();
+		}
+
+		[Test]
+		public void TestMruSimpleLastItem ()
+		{
+			var settings = new SimulationSettings () {
+				AutoSelect = true,
+				CompleteWithSpaceOrPunctuation = true,
+				AutoCompleteEmptyMatch = true,
+				CompletionData = new[] { "FooBar1", "Bar", "FooFoo2"}
+			};
+
+			var listWindow = CreateListWindow (settings);
+			var list = listWindow.CompletionDataList;
+			var testCompletionWidget = (TestCompletionWidget)listWindow.CompletionWidget;
+
+			SimulateInput (listWindow, "FooBar\t");
+			Assert.AreEqual ("FooBar1", testCompletionWidget.CompletedWord);
+
+			ContinueSimulation (listWindow, list, ref testCompletionWidget, "FooFoo\t");
+			Assert.AreEqual ("FooFoo2", testCompletionWidget.CompletedWord);
+
+			ContinueSimulation (listWindow, list, ref testCompletionWidget, "F\t");
+			Assert.AreEqual ("FooFoo2", testCompletionWidget.CompletedWord);
+		}
+
+		[Test]
+		public void TestMruEmptyMatch ()
+		{
+			var settings = new SimulationSettings () {
+				AutoSelect = true,
+				CompleteWithSpaceOrPunctuation = true,
+				AutoCompleteEmptyMatch = true,
+				CompletionData = new[] { "Foo", "Bar", "Test"}
+			};
+
+			var listWindow = CreateListWindow (settings);
+			var list = listWindow.CompletionDataList;
+			var testCompletionWidget = (TestCompletionWidget)listWindow.CompletionWidget;
+			SimulateInput (listWindow, "Foo\t");
+			ContinueSimulation (listWindow, list, ref testCompletionWidget, "F\t");
+			Assert.AreEqual ("Foo", testCompletionWidget.CompletedWord);
+
+			ContinueSimulation (listWindow, list, ref testCompletionWidget, "Bar\t");
+			Assert.AreEqual ("Bar", testCompletionWidget.CompletedWord);
+
+			ContinueSimulation (listWindow, list, ref testCompletionWidget, "\t");
+			Assert.AreEqual ("Bar", testCompletionWidget.CompletedWord);
+		}
+
+		[Test]
+		public void TestCloseWithPunctiation ()
+		{
+			var output = RunSimulation ("", "\"\t", true, true, false, punctuationData);
+			Assert.AreEqual (null, output);
+		}
+
+		[Test]
+		public void TestPreference ()
+		{
+			string output = RunSimulation ("", "expr\t", true, true, false, "expression", "PostfixExpressionStatementSyntax");
+			Assert.AreEqual ("expression", output);
+		}
+
 
 		[TestFixtureSetUp] 
 		public void SetUp()
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/CompletionDatabaseTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/CompletionDatabaseTests.cs
deleted file mode 100644
index 228a8b8a23..0000000000
--- a/main/tests/UnitTests/MonoDevelop.Projects/CompletionDatabaseTests.cs
+++ /dev/null
@@ -1,889 +0,0 @@
-// CompletionDatabaseTests.cs
-//
-// Author:
-//   Lluis Sanchez Gual <lluis@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Parser;
-using NUnit.Framework;
-using UnitTests;
-using Mono.CSharp;
-using System.Linq;
-
-namespace MonoDevelop.Projects
-{
-	[TestFixture]
-	public class CompletionDatabaseTests: TestBase
-	{
-		Solution solution;
-		ProjectDom mainProject;
-		ProjectDom lib1;
-		ProjectDom lib2;
-		
-		public override void Setup ()
-		{
-			base.Setup ();
-			string solFile = Util.GetSampleProject ("completion-db-test", "CompletionDbTest.sln");
-			solution = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), solFile);
-			ProjectDomService.Load (solution);
-
-			Project prj;
-			prj = solution.FindProjectByName ("Library2");
-			lib2 = ProjectDomService.GetProjectDom (prj);
-			lib2.ForceUpdate (true);
-			prj = solution.FindProjectByName ("Library1");
-			lib1 = ProjectDomService.GetProjectDom (prj);
-			lib1.ForceUpdate (true);
-			prj = solution.FindProjectByName ("CompletionDbTest");
-			mainProject = ProjectDomService.GetProjectDom (prj);
-			mainProject.ForceUpdate (true);
-		}
-
-		public override void TearDown ()
-		{
-			ProjectDomService.Unload (solution);
-			base.TearDown ();
-		}
-		
-		void ReplaceFile (string targetRelativePath, string sourceRelativePath)
-		{
-			string tfile = mainProject.Project.GetAbsoluteChildPath (targetRelativePath);
-			string sfile = mainProject.Project.GetAbsoluteChildPath (sourceRelativePath);
-			File.Copy (sfile, tfile, true);
-			ProjectDomService.Parse (tfile, null);
-		}
-
-		[Test]
-		public void References ()
-		{
-			Assert.AreEqual (4, mainProject.References.Count);
-			Assert.AreEqual (3, lib1.References.Count);
-			Assert.AreEqual (3, lib2.References.Count);
-		}
-		
-		[Test]
-		public void SimpleGetType ()
-		{
-			// Simple get
-			IType type = mainProject.GetType ("CompletionDbTest.MainClass");
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.MainClass", type.FullName);
-
-			// Deep search in local project
-			type = mainProject.GetType ("CompletionDbTest.MainClass", true);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.MainClass", type.FullName);
-			
-			// Non deep search
-			// FIXME: deep search is currently the same as non-deep-search
-//			type = mainProject.GetType ("Library2.CWidget", false);
-//			Assert.IsNull (type);
-
-			// Deep search by default
-			type = mainProject.GetType ("Library2.CWidget");
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("Library2.CWidget", type.FullName);
-			
-			//check that references are accessible, but not references of references
-			type = mainProject.GetType ("Library3.Lib3Class");
-			Assert.IsNull (type);
-			type = lib2.GetType ("Library3.Lib3Class");
-			Assert.IsNotNull (type);
-
-			// Deep insensitive
-			type = mainProject.GetType ("library2.cwidget", true, false);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("Library2.CWidget", type.FullName);
-
-			// Case sensitive
-			type = mainProject.GetType ("library2.cwidget", true, true);
-			Assert.IsNull (type);
-
-			// Not generic
-			type = mainProject.GetType ("CompletionDbTest.MainClass", 1, true);
-			Assert.IsNull (type);
-
-			// System.Object
-			type = mainProject.GetType ("System.Object", true, true);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("System.Object", type.FullName);
-		}
-
-		[Test]
-		public void GetGenericType ()
-		{
-			List<IReturnType> args = new List<IReturnType> ();
-			DomReturnType rt = new DomReturnType ("System.String");
-			args.Add (rt);
-			IType type = mainProject.GetType ("CompletionDbTest.SomeGeneric", args);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.SomeGeneric[System.String]", type.FullName);
-			Assert.AreEqual (0, type.TypeParameters.Count);
-
-			IMethod met = FindMember (type, "Run") as IMethod;
-			Assert.IsNotNull (met);
-			Assert.AreEqual (1, met.Parameters.Count);
-			Assert.AreEqual ("System.String", met.Parameters[0].ReturnType.FullName);
-			Assert.IsNotNull (met.ReturnType);
-			Assert.AreEqual ("System.String", met.ReturnType.FullName);
-			
-			type = mainProject.GetType ("Library2.GenericWidget");
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("Library2.GenericWidget", type.FullName);
-			Assert.AreEqual (0, type.TypeParameters.Count);
-			
-			type = mainProject.GetType ("Library2.GenericWidget", 1, true);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("Library2.GenericWidget", type.FullName);
-			Assert.AreEqual (1, type.TypeParameters.Count);
-			
-			type = mainProject.GetType ("Library2.GenericWidget", 2, true);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("Library2.GenericWidget", type.FullName);
-			Assert.AreEqual (2, type.TypeParameters.Count);
-			
-			type = mainProject.GetType ("Library2.GenericWidget", 3, true);
-			Assert.IsNull (type);
-
-			// Inner generic type
-			
-			type = mainProject.GetType ("Library2.Container.InnerClass1", 1, true);
-			Assert.IsNotNull (type);
-		}
-		
-		IMember FindMember (IType type, string name)
-		{
-			foreach (IMember mem in type.Members)
-				if (mem.Name == name)
-					return mem;
-			return null;
-		}
-
-		[Test]
-		public void GetSubclasses ()
-		{
-			IType type = mainProject.GetType ("Library2.CWidget", true);
-			Assert.IsNotNull (type);
-
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetSubclasses (type, true))
-				types.Add (t.FullName);
-
-			Assert.IsTrue (types.Contains ("Library2.CContainer"));
-			Assert.IsTrue (types.Contains ("Library2.SomeContainer.CInnerWidget"));
-			Assert.IsTrue (types.Contains ("Library2.CExtraContainer"));
-			Assert.IsTrue (types.Contains ("Library2.SomeContainer.CExtraInnerWidget"));
-			Assert.IsTrue (types.Contains ("Library1.CBin"));
-			Assert.IsTrue (types.Contains ("Library1.CList"));
-			Assert.IsTrue (types.Contains ("Library1.SomeContainer.CInnerWidget"));
-			Assert.IsTrue (types.Contains ("Library1.SomeContainer.SomeInnerContainer.CSubInnerWidget"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraBin"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraContainerSub"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraContainerInnerSub"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraContainerInnerSub.CInnerWidget1"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraContainerInnerSub.CInnerWidget2"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraContainerInnerSub.CInnerWidget3"));
-			Assert.IsTrue (types.Contains ("CompletionDbTest.CustomWidget1"));
-			Assert.IsTrue (types.Contains ("CompletionDbTest.CustomWidget2"));
-			Assert.AreEqual (16, types.Count);
-
-			// No deep search
-			
-			type = mainProject.GetType ("Library2.CWidget", true);
-			Assert.IsNotNull (type);
-
-			types.Clear ();
-			foreach (IType t in mainProject.GetSubclasses (type, false))
-				types.Add (t.FullName);
-
-			Assert.IsTrue (types.Contains ("CompletionDbTest.CustomWidget1"));
-			Assert.IsTrue (types.Contains ("CompletionDbTest.CustomWidget2"));
-			Assert.AreEqual (2, types.Count);
-
-			// Interface subclassing
-			
-			type = mainProject.GetType ("Library2.IObject", true);
-			Assert.IsNotNull (type);
-
-			types.Clear ();
-			foreach (IType t in mainProject.GetSubclasses (type, true))
-				types.Add (t.FullName);
-
-			Assert.IsTrue (types.Contains ("Library2.CExtraContainer"));
-			Assert.IsTrue (types.Contains ("Library2.SomeContainer.CExtraInnerWidget"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraContainerInnerSub"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraContainerInnerSub.CInnerWidget1"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraContainerInnerSub.CInnerWidget2"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraContainerSub"));
-			Assert.IsTrue (types.Contains ("Library1.ISimple"));
-			Assert.IsTrue (types.Contains ("CompletionDbTest.CustomWidget1"));
-			Assert.IsTrue (types.Contains ("CompletionDbTest.CustomWidget2"));
-			Assert.AreEqual (9, types.Count);
-		}
-		
-		[Test]
-		public void GetFileTypes ()
-		{
-			string file = lib1.Project.GetAbsoluteChildPath ("MyClass.cs");
-			
-			List<string> types = new List<string> ();
-			foreach (IType t in lib1.GetTypes (file))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("Library1.CBin"));
-			Assert.IsTrue (types.Contains ("Library1.CList"));
-			Assert.IsTrue (types.Contains ("Library1.SomeContainer"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraBin"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraContainerSub"));
-			Assert.IsTrue (types.Contains ("Library1.CExtraContainerInnerSub"));
-			Assert.IsTrue (types.Contains ("Library1.ISimple"));
-			Assert.IsTrue (types.Contains ("Library1.TestAttribute"));
-			
-			Assert.AreEqual (8, types.Count);
-		}
-		
-		[Test]
-		public void GetInheritanceTree ()
-		{
-			IType type = mainProject.GetType ("CompletionDbTest.CustomWidget1", false);
-			
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (type))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.CustomWidget1"));
-			Assert.IsTrue (types.Contains ("Library1.CBin"));
-			Assert.IsTrue (types.Contains ("Library1.ISimple"));
-			Assert.IsTrue (types.Contains ("Library2.CWidget"));
-			Assert.IsTrue (types.Contains ("Library2.IObject"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-			Assert.AreEqual (6, types.Count);
-			
-			type = mainProject.GetType ("CompletionDbTest.CustomWidget2", false);
-			
-			types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (type))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.CustomWidget2"));
-			Assert.IsTrue (types.Contains ("Library1.SomeContainer.CInnerWidget"));
-			Assert.IsTrue (types.Contains ("Library2.IObject"));
-			Assert.IsTrue (types.Contains ("Library2.CWidget"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-			Assert.AreEqual (5, types.Count);
-		}
-		
-			
-		[Test]
-		public void GetInheritanceTreeForEnumsAndStructs ()
-		{
-			IType type = mainProject.GetType ("CompletionDbTest.TestEnum", false);
-			
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (type)) {
-				Console.WriteLine (t.FullName);
-				types.Add (t.FullName);
-			}
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.TestEnum"));
-			Assert.IsTrue (types.Contains ("System.Enum"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-			
-			type = mainProject.GetType ("CompletionDbTest.TestStruct", false);
-			
-			types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (type))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.TestStruct"));
-			Assert.IsTrue (types.Contains ("System.ValueType"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-		}
-		[Test]
-		public void GetNamespaceContents ()
-		{
-			var types = new List<string> ();
-			foreach (IMember mem in mainProject.GetNamespaceContents ("SharedNamespace1", true, true))
-				types.Add (mem.FullName);
-			Assert.IsTrue (types.Contains ("SharedNamespace1.A"));
-			Assert.IsTrue (types.Contains ("SharedNamespace1.B"));
-			Assert.IsTrue (types.Contains ("SharedNamespace1.E"));
-			Assert.IsTrue (types.Contains ("SharedNamespace1.F"));
-			Assert.AreEqual (4, types.Count);
-			
-			types = new List<string> ();
-			foreach (IMember mem in mainProject.GetNamespaceContents ("SharedNamespace1", false, true))
-				types.Add (mem.FullName);
-			Assert.IsTrue (types.Contains ("SharedNamespace1.A"));
-			Assert.IsTrue (types.Contains ("SharedNamespace1.B"));
-			Assert.AreEqual (2, types.Count);
-			
-			types = new List<string> ();
-			foreach (IMember mem in mainProject.GetNamespaceContents ("sharednamespace1", true, false))
-				types.Add (mem.FullName);
-			Assert.IsTrue (types.Contains ("SharedNamespace1.A"));
-			Assert.IsTrue (types.Contains ("SharedNamespace1.B"));
-			Assert.IsTrue (types.Contains ("SharedNamespace1.E"));
-			Assert.IsTrue (types.Contains ("SharedNamespace1.F"));
-			Assert.AreEqual (4, types.Count);
-			
-			types = new List<string> ();
-			foreach (IMember mem in mainProject.GetNamespaceContents ("SharedNamespace2", true, true))
-				types.Add (mem.FullName);
-			Assert.IsTrue (types.Contains ("SharedNamespace2.C"));
-			Assert.IsTrue (types.Contains ("SharedNamespace2.D"));
-			Assert.IsTrue (types.Contains ("SharedNamespace2.G"));
-			Assert.IsTrue (types.Contains ("SharedNamespace2.H"));
-			Assert.AreEqual (4, types.Count);
-			
-			types = new List<string> ();
-			foreach (IMember mem in mainProject.GetNamespaceContents ("SharedNamespace2", false, true))
-				types.Add (mem.FullName);
-			Assert.AreEqual (0, types.Count);
-		}
-
-		[Test]
-		public void GetGenericSubclassesNoParams ()
-		{
-			IType type = mainProject.GetType ("Library2.GenericWidget", true);
-			Assert.IsNotNull (type);
-
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetSubclasses (type, true))
-				types.Add (GetName(t));
-
-			Assert.IsTrue (types.Contains ("Library2.GenericBin"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericBin"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericWidget"));
-			Assert.AreEqual (3, types.Count);
-		}
-
-		[Test]
-		public void GetGenericSubclassesTemplate ()
-		{
-			// Uninstantiated generic type with one parameter
-			
-			IType type = mainProject.GetType ("Library2.GenericWidget", 1, true);
-			Assert.IsNotNull (type);
-
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetSubclasses (type, true))
-				types.Add (GetName (t));
-
-			// We don't support getting the subclasses of a parametrized type.
-			// It is not clear what should be considered a subclass in this case.
-			Assert.AreEqual (0, types.Count);
-		}
-		
-		[Test]
-		public void GetGenericSubclassesParamsInt ()
-		{
-			// Generic type with one parameter
-
-			List<IReturnType> args = new List<IReturnType> ();
-			args.Add (new DomReturnType ("System.Int32"));
-
-			IType type = mainProject.GetType ("Library2.GenericWidget", args);
-			Assert.IsNotNull (type);
-
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetSubclasses (type, true))
-				types.Add (GetName(t));
-
-			Assert.IsTrue (types.Contains ("Library2.GenericBin[System.Int32]"));
-			Assert.IsTrue (types.Contains ("Library2.GenericBinInt"));
-			Assert.IsTrue (types.Contains ("Library2.Container.InnerClass1[System.Int32]"));
-			Assert.IsTrue (types.Contains ("Library2.Container.InnerClass2"));
-			Assert.IsTrue (types.Contains ("Library2.Container.InnerClass3"));
-			Assert.IsTrue (types.Contains ("Library2.Container.InnerClass4"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericWidget[System.Int32]"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericBin[System.Int32]"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericBinInt1"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericBinInt2"));
-			Assert.IsTrue (types.Contains ("Library1.SubInnerClass[System.Int32]"));
-			Assert.IsTrue (types.Contains ("Library1.SubContainer.InnerClass1[System.Int32]"));
-			Assert.IsTrue (types.Contains ("Library1.SubContainer.InnerClass2"));
-			Assert.IsTrue (types.Contains ("Library1.SubContainer.InnerClass3"));
-			Assert.IsTrue (types.Contains ("Library1.SubContainer.InnerClass4"));
-			Assert.AreEqual (15, types.Count);
-		}
-
-		[Test]
-		public void GetGenericSubclassesParamsString ()
-		{
-			// Generic type with one string parameter
-
-			List<IReturnType> args = new List<IReturnType> ();
-			args.Add (new DomReturnType ("System.String"));
-
-			IType type = mainProject.GetType ("Library2.GenericWidget", args);
-			Assert.IsNotNull (type);
-
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetSubclasses (type, true))
-				types.Add (GetName(t));
-
-			Assert.IsTrue (types.Contains ("Library2.GenericBin[System.String]"));
-			Assert.IsTrue (types.Contains ("Library2.GenericBinString"));
-			Assert.IsTrue (types.Contains ("Library2.Container.InnerClass1[System.String]"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericWidget[System.String]"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericBin[System.String]"));
-			Assert.IsTrue (types.Contains ("Library1.SubInnerClass[System.String]"));
-			Assert.IsTrue (types.Contains ("Library1.SubContainer.InnerClass1[System.String]"));
-			Assert.AreEqual (7, types.Count);
-		}
-
-		[Test]
-		public void GetGenericSubclassesParamsStringInt ()
-		{
-			// Generic type with one string and one int
-
-			List<IReturnType> args = new List<IReturnType> ();
-			args.Add (new DomReturnType ("System.String"));
-			args.Add (new DomReturnType ("System.Int32"));
-
-			IType type = mainProject.GetType ("Library2.GenericWidget", args);
-			Assert.IsNotNull (type);
-
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetSubclasses (type, true))
-				types.Add (GetName(t));
-
-			Assert.IsTrue (types.Contains ("Library2.GenericBin[System.String,System.Int32]"));
-			Assert.IsTrue (types.Contains ("Library2.SpecialGenericBin[System.Int32]"));
-			Assert.IsTrue (types.Contains ("Library2.GenericBinStringInt"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericBin[System.String,System.Int32]"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericWidget[System.String,System.Int32]"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericBinStringInt1"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericBinStringInt2"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericWidgetStringNull[System.Int32]"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericWidgetNullInt[System.String]"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericWidgetSwapped[System.Int32,System.String]"));
-			Assert.AreEqual (10, types.Count);
-		}
-
-		[Test]
-		public void GetGenericSubclassesParamsIntString ()
-		{
-			// Generic type with one int and one string
-
-			List<IReturnType> args = new List<IReturnType> ();
-			args.Add (new DomReturnType ("System.Int32"));
-			args.Add (new DomReturnType ("System.String"));
-
-			IType type = mainProject.GetType ("Library2.GenericWidget", args);
-			Assert.IsNotNull (type);
-
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetSubclasses (type, true))
-				types.Add (GetName(t));
-
-			Assert.IsTrue (types.Contains ("Library2.GenericBin[System.Int32,System.String]"));
-			Assert.IsTrue (types.Contains ("Library2.GenericBinIntString"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericBin[System.Int32,System.String]"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericWidget[System.Int32,System.String]"));
-			Assert.IsTrue (types.Contains ("Library1.SubGenericWidgetSwapped[System.String,System.Int32]"));
-			Assert.AreEqual (5, types.Count);
-		}
-
-		string GetName (IType t)
-		{
-			if (t.TypeParameters.Count == 0)
-				return t.FullName;
-			else
-				return t.FullName + "`" + t.TypeParameters.Count;
-		}
-
-/*		[Test]
-		public void GetObjectSubclasses ()
-		{
-			IType type = mainProject.GetType ("System.Object", true);
-			Assert.IsNotNull (type);
-
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetSubclasses (type, true))
-				types.Add (t.FullName);
-		}
-*/
-		
-		[Test]
-		public void RewriteGenericType ()
-		{
-			// Check that the instantiated type cache is properly invalidated
-			// when a generic type changes.
-			
-			List<IReturnType> args = new List<IReturnType> ();
-			args.Add (new DomReturnType ("System.Int32"));
-			IType type = mainProject.GetType ("CompletionDbTest.GenericRewrite", args);
-			Assert.IsNotNull (type);
-			Assert.IsTrue (type is InstantiatedType);
-			Assert.IsTrue (type.FieldCount == 1);
-			
-			ReplaceFile ("GenericRewrite.cs", "Replacements/GenericRewrite.cs");
-			
-			type = mainProject.GetType ("CompletionDbTest.GenericRewrite", args);
-			Assert.IsNotNull (type);
-			Assert.IsTrue (type is InstantiatedType);
-			Assert.IsTrue (type.FieldCount == 2);
-		}
-		
-		[Test]
-		public void GenericConstraintTest_Class ()
-		{
-			IType type = mainProject.GetType ("CompletionDbTest.GenericConstraintTest1", 1, false);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.GenericConstraintTest1", type.FullName);
-			Assert.AreEqual (1, type.TypeParameters.Count);
-			Assert.AreEqual (1, type.FieldCount);
-			
-			List<IField> fs = new List<IField> (type.Fields);
-			IReturnType rt = fs [0].ReturnType;
-			
-			IType fieldType = mainProject.GetType (rt);
-			Assert.IsNotNull (fieldType);
-			Assert.AreEqual ("T", fieldType.Name);
-			
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (fieldType))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.GenericConstraintTest1.T"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-			Assert.AreEqual (2, types.Count);
-		}
-		
-		[Test]
-		public void GenericConstraintTest_Struct ()
-		{
-			IType type = mainProject.GetType ("CompletionDbTest.GenericConstraintTest2", 1, false);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.GenericConstraintTest2", type.FullName);
-			Assert.AreEqual (1, type.TypeParameters.Count);
-			Assert.AreEqual (1, type.FieldCount);
-			
-			List<IField> fs = new List<IField> (type.Fields);
-			IReturnType rt = fs [0].ReturnType;
-			
-			IType fieldType = mainProject.GetType (rt);
-			Assert.IsNotNull (fieldType);
-			Assert.AreEqual ("T", fieldType.Name);
-			
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (fieldType))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.GenericConstraintTest2.T"));
-			Assert.IsTrue (types.Contains ("System.ValueType"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-			Assert.AreEqual (3, types.Count);
-		}
-		
-		[Test]
-		public void GenericConstraintTest_New ()
-		{
-			IType type = mainProject.GetType ("CompletionDbTest.GenericConstraintTest3", 1, false);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.GenericConstraintTest3", type.FullName);
-			Assert.AreEqual (1, type.TypeParameters.Count);
-			Assert.AreEqual (1, type.FieldCount);
-			
-			List<IField> fs = new List<IField> (type.Fields);
-			IReturnType rt = fs [0].ReturnType;
-			
-			IType fieldType = mainProject.GetType (rt);
-			Assert.IsNotNull (fieldType);
-			Assert.AreEqual ("T", fieldType.Name);
-			
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (fieldType))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.GenericConstraintTest3.T"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-			Assert.AreEqual (2, types.Count);
-		}
-		
-		[Test]
-		public void GenericConstraintTest_WithBase ()
-		{
-			IType type = mainProject.GetType ("CompletionDbTest.GenericConstraintTest4", 2, false);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.GenericConstraintTest4", type.FullName);
-			Assert.AreEqual (2, type.TypeParameters.Count);
-			Assert.AreEqual (2, type.FieldCount);
-			
-			// First field
-			
-			List<IField> fs = new List<IField> (type.Fields);
-			IReturnType rt = fs [0].ReturnType;
-			
-			IType fieldType = mainProject.GetType (rt);
-			Assert.IsNotNull (fieldType);
-			Assert.AreEqual ("T", fieldType.Name);
-			
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (fieldType))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.GenericConstraintTest4.T"));
-			Assert.IsTrue (types.Contains ("Library1.CBin"));
-			Assert.IsTrue (types.Contains ("Library2.CWidget"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-			Assert.AreEqual (4, types.Count);
-			
-			// Second field
-			
-			rt = fs [1].ReturnType;
-			
-			fieldType = mainProject.GetType (rt);
-			Assert.IsNotNull (fieldType);
-			Assert.AreEqual ("U", fieldType.Name);
-			
-			types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (fieldType))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.GenericConstraintTest4.U"));
-			Assert.IsTrue (types.Contains ("CompletionDbTest.GenericConstraintTest4.T"));
-			Assert.IsTrue (types.Contains ("Library1.CBin"));
-			Assert.IsTrue (types.Contains ("Library2.CWidget"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-			Assert.AreEqual (5, types.Count);
-		}
-		
-		[Test]
-		public void GenericConstraintTest_WithWrongBase ()
-		{
-			IType type = mainProject.GetType ("CompletionDbTest.GenericConstraintTest5", 2, false);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.GenericConstraintTest5", type.FullName);
-			Assert.AreEqual (2, type.TypeParameters.Count);
-			Assert.AreEqual (2, type.FieldCount);
-			
-			// First field
-			
-			List<IField> fs = new List<IField> (type.Fields);
-			IReturnType rt = fs [0].ReturnType;
-			
-			IType fieldType = mainProject.GetType (rt);
-			Assert.IsNotNull (fieldType);
-			Assert.AreEqual ("T", fieldType.Name);
-			
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (fieldType))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.GenericConstraintTest5.T"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-			Assert.AreEqual (2, types.Count);
-			
-			// Second field
-			
-			rt = fs [1].ReturnType;
-			
-			fieldType = mainProject.GetType (rt);
-			Assert.IsNotNull (fieldType);
-			Assert.AreEqual ("U", fieldType.Name);
-			
-			types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (fieldType))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.GenericConstraintTest5.U"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-			Assert.AreEqual (2, types.Count);
-		}		
-		
-		[Test]
-		public void GenericConstraintTest_ClassAndInterface ()
-		{
-			IType type = mainProject.GetType ("CompletionDbTest.GenericConstraintTest6", 1, false);
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.GenericConstraintTest6", type.FullName);
-			Assert.AreEqual (1, type.TypeParameters.Count);
-			Assert.AreEqual (1, type.FieldCount);
-			
-			List<IField> fs = new List<IField> (type.Fields);
-			IReturnType rt = fs [0].ReturnType;
-			
-			IType fieldType = mainProject.GetType (rt);
-			Assert.IsNotNull (fieldType);
-			Assert.AreEqual ("T", fieldType.Name);
-			
-			List<string> types = new List<string> ();
-			foreach (IType t in mainProject.GetInheritanceTree (fieldType))
-				types.Add (t.FullName);
-			
-			Assert.IsTrue (types.Contains ("CompletionDbTest.GenericConstraintTest6.T"));
-			Assert.IsTrue (types.Contains ("Library1.CBin"));
-			Assert.IsTrue (types.Contains ("Library2.CWidget"));
-			Assert.IsTrue (types.Contains ("System.ICloneable"));
-			Assert.IsTrue (types.Contains ("System.Object"));
-			Assert.AreEqual (5, types.Count);
-		}
-		
-		[Test]
-		public void PartialClass ()
-		{
-			IType type = mainProject.GetType ("CompletionDbTest.PartialTest");
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.PartialTest", type.FullName);
-			
-			List<string> members = new List<string> ();
-			foreach (IMember mem in type.Members)
-				members.Add (mem.Name);
-			
-			Assert.AreEqual (15, members.Count);
-			Assert.IsTrue (members.Contains ("Field1"));
-			Assert.IsTrue (members.Contains ("Property1"));
-			Assert.IsTrue (members.Contains ("Event1"));
-			Assert.IsTrue (members.Contains ("Method1"));
-			Assert.IsTrue (members.Contains ("Inner1"));
-			Assert.IsTrue (members.Contains ("Field2"));
-			Assert.IsTrue (members.Contains ("Property2"));
-			Assert.IsTrue (members.Contains ("Event2"));
-			Assert.IsTrue (members.Contains ("Method2"));
-			Assert.IsTrue (members.Contains ("Inner2"));
-			Assert.IsTrue (members.Contains ("Field3"));
-			Assert.IsTrue (members.Contains ("Property3"));
-			Assert.IsTrue (members.Contains ("Event3"));
-			Assert.IsTrue (members.Contains ("Method3"));
-			Assert.IsTrue (members.Contains ("Inner3"));
-			
-			ReplaceFile ("PartialTest2.cs", "Replacements/PartialTest2.cs");
-			
-			type = mainProject.GetType ("CompletionDbTest.PartialTest");
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.PartialTest", type.FullName);
-			
-			members = new List<string> ();
-			foreach (IMember mem in type.Members)
-				members.Add (mem.Name);
-			
-			Assert.AreEqual (10, members.Count);
-			Assert.IsTrue (members.Contains ("Field2"));
-			Assert.IsTrue (members.Contains ("Property2"));
-			Assert.IsTrue (members.Contains ("Event2"));
-			Assert.IsTrue (members.Contains ("Method2"));
-			Assert.IsTrue (members.Contains ("Inner2"));
-			Assert.IsTrue (members.Contains ("Field3"));
-			Assert.IsTrue (members.Contains ("Property3"));
-			Assert.IsTrue (members.Contains ("Event3"));
-			Assert.IsTrue (members.Contains ("Method3"));
-			Assert.IsTrue (members.Contains ("Inner3"));
-			
-			ReplaceFile ("PartialTest2.cs", "Replacements/EmptyFile.cs");
-			
-			type = mainProject.GetType ("CompletionDbTest.PartialTest");
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CompletionDbTest.PartialTest", type.FullName);
-			
-			members = new List<string> ();
-			foreach (IMember mem in type.Members)
-				members.Add (mem.Name);
-			
-			Assert.AreEqual (5, members.Count);
-			Assert.IsTrue (members.Contains ("Field3"));
-			Assert.IsTrue (members.Contains ("Property3"));
-			Assert.IsTrue (members.Contains ("Event3"));
-			Assert.IsTrue (members.Contains ("Method3"));
-			Assert.IsTrue (members.Contains ("Inner3"));
-			
-			ReplaceFile ("PartialTest1.cs", "Replacements/EmptyFile.cs");
-			
-			type = mainProject.GetType ("CompletionDbTest.PartialTest");
-			Assert.IsNull (type);
-		}
-		
-		[Test]
-		public void NamespaceExistsTest ()
-		{
-			Assert.IsTrue (mainProject.NamespaceExists ("Level1"), "Level1 doesn't exist.");
-			Assert.IsTrue (mainProject.NamespaceExists ("Level1.Level2"), "Level1.Level2 doesn't exist.");
-			Assert.IsTrue (mainProject.NamespaceExists ("Level1.Level2.Level3"), "Level1.Level2.Level3 doesn't exist.");
-			Assert.IsTrue (mainProject.NamespaceExists ("Level1.Level2.Level3.Level4"), "Level1.Level2.Level3.Level4 doesn't exist.");
-			Assert.IsFalse (mainProject.NamespaceExists ("Level1.Level2.Level3.Level4.Level5"), "Level5 shouldn't exist.");
-			Assert.IsFalse (mainProject.NamespaceExists ("Level1.Level3"), "level1.level3 shouldn't exist.");
-		}
-		
-		[Test]
-		public void ClassAttributeTest ()
-		{
-			// Simple get
-			IType type = mainProject.GetType ("CompletionDbTest.AttributeTest");
-			Assert.IsNotNull (type);
-			Assert.AreEqual (1, type.Attributes.Count ());
-			Assert.AreEqual ("Serializable", type.Attributes.First ().Name);
-		}
-		
-		[Test]
-		public void MemberAttributeTest ()
-		{
-			// Simple get
-			IType type = mainProject.GetType ("CompletionDbTest.AttributeTest2");
-			Assert.IsNotNull (type);
-			
-			var prop = type.Properties.First ();
-			Assert.AreEqual (1, prop.Attributes.Count ());
-			Assert.AreEqual ("Obsolete", prop.Attributes.First ().Name);
-			
-			var method = type.Methods.First ();
-			Assert.AreEqual (1, method.Attributes.Count ());
-			Assert.AreEqual ("Obsolete", method.Attributes.First ().Name);
-		}
-		
-		[Test]
-		public void CustomAttributeTest ()
-		{
-			// Simple get
-			IType type = mainProject.GetType ("CompletionDbTest.AttributeTest3");
-			Assert.IsNotNull (type);
-			Assert.AreEqual (1, type.Attributes.Count ());
-			
-			var att = type.Attributes.First ();
-			Assert.AreEqual ("Library1.TestAttribute", att.AttributeType.FullName);
-			Assert.AreEqual (2, att.PositionalArguments.Count);
-			
-			var expr1 = att.PositionalArguments[0] as System.CodeDom.CodePrimitiveExpression;
-			Assert.IsNotNull (expr1);
-			Assert.AreEqual ("str1", expr1.Value);
-			
-			var expr2 = att.PositionalArguments[1] as System.CodeDom.CodePrimitiveExpression;
-			Assert.IsNotNull (expr2);
-			Assert.AreEqual (5, expr2.Value);
-			
-			Assert.AreEqual (1, att.NamedArguments.Count);
-			Assert.IsTrue (att.NamedArguments.ContainsKey ("Blah"));
-			var expr3 = att.NamedArguments["Blah"] as System.CodeDom.CodePrimitiveExpression;
-			Assert.IsNotNull (expr3);
-			Assert.AreEqual ("str2", expr3.Value);
-		}
-		
-	}
-}
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/DomCompilationUnitTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/DomCompilationUnitTests.cs
deleted file mode 100644
index 68a7f30ff1..0000000000
--- a/main/tests/UnitTests/MonoDevelop.Projects/DomCompilationUnitTests.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// DomCompilationUnitTests.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using NUnit.Framework;
-using MonoDevelop.Projects.Dom;
-
-namespace UnitTests
-{
-	[TestFixture()]
-	public class DomCompilationUnitTests : UnitTests.TestBase
-	{
-		[Test()]
-		public void TestGetNamespaceContentsCase1 ()
-		{
-			CompilationUnit unit = new CompilationUnit ("file.cs");
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.AClass"));
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.BClass"));
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.CClass"));
-			unit.Add (new DomType ("ANamespace.AClass2"));
-			unit.Add (new DomType ("ANamespace.BClass2"));
-			unit.Add (new DomType ("CClass3"));
-			
-			List<IMember> member = new List<IMember> ();
-			unit.GetNamespaceContents (member, "", true);
-			Assert.AreEqual (2, member.Count);
-			Namespace ns = member[0] as Namespace;
-			Assert.IsNotNull (ns);
-			Assert.AreEqual ("ANamespace", ns.Name);
-			
-			IType type = member[1] as IType;
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CClass3", type.FullName);
-		}
-		
-		[Test()]
-		public void TestGetNamespaceContentsCase2 ()
-		{
-			CompilationUnit unit = new CompilationUnit ("file.cs");
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.AClass"));
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.BClass"));
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.CClass"));
-			unit.Add (new DomType ("ANamespace.AClass2"));
-			unit.Add (new DomType ("ANamespace.BClass2"));
-			unit.Add (new DomType ("CClass3"));
-			
-			List<IMember> member = new List<IMember> ();
-			unit.GetNamespaceContents (member, "ANamespace", true);
-			
-			Assert.AreEqual (3, member.Count);
-			Namespace ns = member[0] as Namespace;
-			Assert.IsNotNull (ns);
-			Assert.AreEqual ("AnotherNamespace", ns.Name);
-			
-			IType type = member[1] as IType;
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("AClass2", type.Name);
-			
-			type = member[2] as IType;
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("BClass2", type.Name);
-		}
-		
-		[Test()]
-		public void TestGetNamespaceContentsCase3 ()
-		{
-			CompilationUnit unit = new CompilationUnit ("file.cs");
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.AClass"));
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.BClass"));
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.CClass"));
-			unit.Add (new DomType ("ANamespace.AClass2"));
-			unit.Add (new DomType ("ANamespace.BClass2"));
-			unit.Add (new DomType ("CClass3"));
-			
-			List<IMember> member = new List<IMember> ();
-			unit.GetNamespaceContents (member, "ANamespace.AnotherNamespace", true);
-			Assert.AreEqual (3, member.Count);
-			
-			IType type = member[0] as IType;
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("AClass", type.Name);
-			
-			type = member[1] as IType;
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("BClass", type.Name);
-			
-			type = member[2] as IType;
-			Assert.IsNotNull (type);
-			Assert.AreEqual ("CClass", type.Name);
-		}
-		
-		[Test()]
-		public void TestGetNamespaceContentsCase4 ()
-		{
-			CompilationUnit unit = new CompilationUnit ("file.cs");
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.AClass"));
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.BClass"));
-			unit.Add (new DomType ("ANamespace.AnotherNamespace.CClass"));
-			unit.Add (new DomType ("ANamespace.AClass2"));
-			unit.Add (new DomType ("ANamespace.BClass2"));
-			unit.Add (new DomType ("CClass3"));
-			
-			List<IMember> member = new List<IMember> ();
-			unit.GetNamespaceContents (member, "ANamespace.NotExist", true);
-			Assert.AreEqual (0, member.Count);
-		}
-	}
-}
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/DomPersistenceTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/DomPersistenceTests.cs
deleted file mode 100644
index 06238256eb..0000000000
--- a/main/tests/UnitTests/MonoDevelop.Projects/DomPersistenceTests.cs
+++ /dev/null
@@ -1,457 +0,0 @@
-//
-// DomPersistenceTests.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.CodeDom;
-using System.Collections.Generic;
-using System.IO;
-using NUnit.Framework;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Serialization;
-
-namespace MonoDevelop.Projects.DomTests
-{
-	[TestFixture()]
-	public class DomPersistenceTests : UnitTests.TestBase
-	{
-		
-		[Test()]
-		public void ReadWriteLocationTest ()
-		{
-			DomLocation input = new DomLocation (3, 9);
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, null, input);
-			byte[] bytes = ms.ToArray ();
-			
-			DomLocation result = DomPersistence.ReadLocation (CreateReader (bytes), null);
-			Assert.AreEqual (3, result.Line);
-			Assert.AreEqual (9, result.Column);
-		}
-		
-		[Test()]
-		public void ReadWriteRegionTest ()
-		{
-			DomRegion input = new DomRegion (1, 2, 3, 4);
-			
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, DefaultNameEncoder, input);
-			byte[] bytes = ms.ToArray ();
-			
-			DomRegion result = DomPersistence.ReadRegion (CreateReader (bytes), DefaultNameDecoder);
-			Assert.AreEqual (1, result.Start.Line);
-			Assert.AreEqual (2, result.Start.Column);
-			Assert.AreEqual (3, result.End.Line);
-			Assert.AreEqual (4, result.End.Column);
-		}
-		
-		
-		[Test()]
-		public void ReadWriteFieldTest ()
-		{
-			DomField input = new DomField ();
-			input.Name = "TestField";
-			input.Location = new DomLocation (5, 10);
-			input.Documentation = "testDocumentation";
-			input.Modifiers = Modifiers.Static;
-			input.ReturnType = new DomReturnType ("System.String");
-			
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, DefaultNameEncoder, input);
-			byte[] bytes = ms.ToArray ();
-			
-			DomField result = DomPersistence.ReadField (CreateReader (bytes), DefaultNameDecoder, null);
-			Assert.AreEqual ("TestField", result.Name);
-			Assert.AreEqual ("testDocumentation", result.Documentation);
-			Assert.AreEqual (new DomLocation (5, 10), result.Location);
-			Assert.AreEqual (Modifiers.Static, result.Modifiers);
-			Assert.AreEqual ("System.String", result.ReturnType.FullName);
-		}
-		
-		[Test()]
-		public void ReadWriteFieldTest2 ()
-		{
-			DomField input = new DomField ();
-			input.Name = null;
-			input.Location = DomLocation.Empty;
-			input.Documentation = null;
-			input.Modifiers = Modifiers.None;
-			input.ReturnType = null;
-			
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, DefaultNameEncoder, input);
-			byte[] bytes = ms.ToArray ();
-			
-			DomField result = DomPersistence.ReadField (CreateReader (bytes), DefaultNameDecoder, null);
-			Assert.AreEqual (null, result.Name);
-			Assert.AreEqual (null, result.Documentation);
-			Assert.AreEqual (DomLocation.Empty, result.Location);
-			Assert.AreEqual (Modifiers.None, result.Modifiers);
-			Assert.AreEqual (null, result.ReturnType);
-		}
-		
-		[Test()]
-		public void ReadWriteReturnTypeTest ()
-		{
-			DomReturnType input = new DomReturnType ();
-			input.Name      = "Test";
-			input.Namespace = "Namespace";
-			input.ArrayDimensions = 5;
-			input.IsByRef = true;
-			input.IsNullable = true;
-			input.PointerNestingLevel = 666;
-			input.AddTypeParameter (new DomReturnType ("System.String"));
-			input.AddTypeParameter (new DomReturnType ("System.Int32"));
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, DefaultNameEncoder, input);
-			byte[] bytes = ms.ToArray ();
-			
-			IReturnType result = DomPersistence.ReadReturnType (CreateReader (bytes), DefaultNameDecoder, null);
-			Assert.AreEqual ("Test", result.Name);
-			Assert.AreEqual ("Namespace", result.Namespace);
-			Assert.AreEqual ("Namespace.Test", result.FullName);
-			Assert.AreEqual (5, result.ArrayDimensions);
-			Assert.AreEqual (true, result.IsByRef);
-			Assert.AreEqual (true, result.IsNullable);
-			Assert.AreEqual ("System.String", result.GenericArguments[0].FullName);
-			Assert.AreEqual ("System.Int32", result.GenericArguments[1].FullName);
-		}
-		
-		[Test()]
-		public void ReadWriteMethodTest ()
-		{
-			DomMethod input = new DomMethod ();
-			input.Name      = "Test";
-			input.MethodModifier = MethodModifier.IsConstructor;
-			input.Add (new DomParameter (input, "par1", DomReturnType.Void));
-			input.AddTypeParameter (new TypeParameter ("T"));
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, DefaultNameEncoder, input);
-			byte[] bytes = ms.ToArray ();
-			
-			DomMethod result = DomPersistence.ReadMethod (CreateReader (bytes), DefaultNameDecoder, null);
-			Assert.AreEqual ("Test", result.Name);
-			Assert.AreEqual (true, result.IsConstructor);
-			Assert.AreEqual ("par1", result.Parameters [0].Name);
-			Assert.AreEqual ("Void", result.Parameters [0].ReturnType.Name);
-			Assert.AreEqual (1, result.TypeParameters.Count);
-			Assert.AreEqual ("T", result.TypeParameters [0].Name);
-		}
-		
-		[Test()]
-		public void ReadWriteDelegateTest ()
-		{
-			DomType input = DomType.CreateDelegate (null, "TestDelegate", new DomLocation (10, 10), DomReturnType.Void, new List<IParameter> ());
-			
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, DefaultNameEncoder, input);
-			byte[] bytes = ms.ToArray ();
-			
-			DomType result = DomPersistence.ReadType (CreateReader (bytes), DefaultNameDecoder, null);
-			Assert.AreEqual ("TestDelegate", result.Name);
-			Assert.AreEqual (ClassType.Delegate, result.ClassType);
-		}
-		
-		[Test()]
-		public void ReadWritePropertyTest ()
-		{
-			DomProperty input = new DomProperty ();
-			input.Name      = "Test";
-			input.PropertyModifier = PropertyModifier.IsIndexer | PropertyModifier.HasGet | PropertyModifier.HasSet;
-			
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, DefaultNameEncoder, input);
-			byte[] bytes = ms.ToArray ();
-			
-			DomProperty result = DomPersistence.ReadProperty (CreateReader (bytes), DefaultNameDecoder, null);
-			Assert.AreEqual ("Test", result.Name);
-			Assert.AreEqual (true, result.IsIndexer);
-			Assert.AreEqual (true, result.HasGet);
-			Assert.AreEqual (true, result.HasSet);
-		}
-		
-		[Test()]
-		public void ReadWriteEventTest ()
-		{
-			DomEvent input     = new DomEvent ();
-			input.Name         = "Test";
-			input.AddMethod    = new DomMethod ("AddMethod", Modifiers.New, MethodModifier.None, DomLocation.Empty, DomRegion.Empty);
-			input.RemoveMethod = new DomMethod ("RemoveMethod", Modifiers.New, MethodModifier.None, DomLocation.Empty, DomRegion.Empty);
-			input.RaiseMethod  = new DomMethod ("RaiseMethod", Modifiers.New, MethodModifier.None, DomLocation.Empty, DomRegion.Empty);
-			
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, DefaultNameEncoder, input);
-			byte[] bytes = ms.ToArray ();
-			
-			DomEvent result = DomPersistence.ReadEvent (CreateReader (bytes), DefaultNameDecoder, null);
-			Assert.AreEqual ("Test", result.Name);
-			Assert.AreEqual ("AddMethod", result.AddMethod.Name);
-			Assert.AreEqual ("RemoveMethod", result.RemoveMethod.Name);
-			Assert.AreEqual ("RaiseMethod", result.RaiseMethod.Name);
-		}
-		
-		[Test()]
-		public void ReadWriteTypeTest ()
-		{
-			DomType input     = new DomType ();
-			input.Name         = "Test";
-			input.ClassType    = ClassType.Struct;
-			input.BaseType     = new DomReturnType ("BaseClass");
-			
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, DefaultNameEncoder, input);
-			byte[] bytes = ms.ToArray ();
-			
-			DomType result = DomPersistence.ReadType (CreateReader (bytes), DefaultNameDecoder, null);
-			Assert.AreEqual ("Test", result.Name);
-			Assert.AreEqual (ClassType.Struct, result.ClassType);
-			Assert.AreEqual ("BaseClass", result.BaseType.Name);
-		}
-		
-		[Test()]
-		public void ReadWriteTypeTestComplex ()
-		{
-			DomType input   = new DomType ();
-			
-			input.Name      = "Test";
-			input.ClassType = ClassType.Struct;
-			input.BaseType  = new DomReturnType ("BaseClass");
-			input.AddInterfaceImplementation (new DomReturnType ("Interface1"));
-			input.AddInterfaceImplementation (new DomReturnType ("Interface2"));
-			
-			input.Add (new DomMethod ("TestMethod", Modifiers.None, MethodModifier.None, DomLocation.Empty, DomRegion.Empty));
-			input.Add (new DomMethod (".ctor", Modifiers.None, MethodModifier.IsConstructor, DomLocation.Empty, DomRegion.Empty));
-			
-			input.Add (new DomField ("TestField", Modifiers.None, DomLocation.Empty, DomReturnType.Void));
-			input.Add (new DomProperty ("TestProperty", Modifiers.None, DomLocation.Empty, DomRegion.Empty, DomReturnType.Void));
-			input.Add (new DomEvent ("TestEvent", Modifiers.None, DomLocation.Empty, DomReturnType.Void));
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, DefaultNameEncoder, input);
-			byte[] bytes = ms.ToArray ();
-			
-			DomType result = DomPersistence.ReadType (CreateReader (bytes), DefaultNameDecoder, null);
-			Assert.AreEqual ("Test", result.Name);
-			Assert.AreEqual (ClassType.Struct, result.ClassType);
-			Assert.AreEqual ("BaseClass", result.BaseType.Name);
-			Assert.AreEqual (1, result.MethodCount);
-			Assert.AreEqual (1, result.ConstructorCount);
-			Assert.AreEqual (1, result.FieldCount);
-			Assert.AreEqual (1, result.PropertyCount);
-			Assert.AreEqual (1, result.EventCount);
-			
-		}
-		
-		[Test()]
-		public void ReadWriteAttributeTest ()
-		{
-			DomAttribute attr = new DomAttribute ();
-			
-			CodePropertyReferenceExpression exp1 = new CodePropertyReferenceExpression ();
-			exp1.TargetObject = new CodeTypeReferenceExpression ("SomeType");
-			exp1.PropertyName = "SomeProperty";
-			
-			CodeTypeOfExpression exp2 = new CodeTypeOfExpression ("SomeTypeOf");
-			
-			CodeBinaryOperatorExpression exp3 = new CodeBinaryOperatorExpression ();
-			exp3.Left = new CodePrimitiveExpression ("one");
-			exp3.Right = new CodePrimitiveExpression ("two");
-			exp3.Operator = CodeBinaryOperatorType.Add;
-			
-			CodePrimitiveExpression exp4 = new CodePrimitiveExpression (37);
-			
-			attr.AddPositionalArgument (exp1);
-			attr.AddPositionalArgument (exp2);
-			attr.AddPositionalArgument (exp3);
-			attr.AddPositionalArgument (exp4);
-			
-			MemoryStream ms = new MemoryStream ();
-			BinaryWriter writer = new BinaryWriter (ms);
-			DomPersistence.Write (writer, DefaultNameEncoder, attr);
-			byte[] bytes = ms.ToArray ();
-			DomAttribute result = DomPersistence.ReadAttribute (CreateReader (bytes), DefaultNameDecoder, null);
-			
-			Assert.AreEqual (4, result.PositionalArguments.Count);
-			
-			Assert.AreEqual (typeof(CodePropertyReferenceExpression), result.PositionalArguments [0].GetType ());
-			CodePropertyReferenceExpression rexp1 = (CodePropertyReferenceExpression) result.PositionalArguments [0];
-			Assert.AreEqual (typeof(CodeTypeReferenceExpression), rexp1.TargetObject.GetType ());
-			Assert.AreEqual ("SomeType", ((CodeTypeReferenceExpression)rexp1.TargetObject).Type.BaseType);
-			Assert.AreEqual ("SomeProperty", rexp1.PropertyName);
-			
-			Assert.AreEqual (typeof(CodeTypeOfExpression), result.PositionalArguments [1].GetType ());
-			Assert.AreEqual ("SomeTypeOf", ((CodeTypeOfExpression)result.PositionalArguments [1]).Type.BaseType);
-			
-			Assert.AreEqual (typeof(CodeBinaryOperatorExpression), result.PositionalArguments [2].GetType ());
-			CodeBinaryOperatorExpression rexp3 = (CodeBinaryOperatorExpression) result.PositionalArguments [2];
-			Assert.AreEqual (typeof(CodePrimitiveExpression), rexp3.Left.GetType ());
-			Assert.AreEqual ("one", ((CodePrimitiveExpression)rexp3.Left).Value);
-			Assert.AreEqual (typeof(CodePrimitiveExpression), rexp3.Right.GetType ());
-			Assert.AreEqual ("two", ((CodePrimitiveExpression)rexp3.Right).Value);
-			
-			Assert.AreEqual (typeof(CodePrimitiveExpression), result.PositionalArguments [3].GetType ());
-			Assert.AreEqual (37, ((CodePrimitiveExpression)result.PositionalArguments [3]).Value);
-		}
-		
-		static BinaryReader CreateReader (byte[] bytes)
-		{
-			return new BinaryReader (new MemoryStream (bytes));
-		}
-
-//	Doesn't work: ?
-//		byte[] Write<T> (T input)
-//		{
-//			MemoryStream ms = new MemoryStream ();
-//			BinaryWriter writer = new BinaryWriter (ms);
-//			DomPersistence.Write (writer, null, input);
-//			return ms.ToArray ();
-//		}
-		
-		
-		static StringNameTable DefaultNameEncoder;
-		static StringNameTable DefaultNameDecoder;
-		
-		static DomPersistenceTests ()
-		{
-			DefaultNameEncoder = new StringNameTable (sharedNameTable);
-			DefaultNameDecoder = new StringNameTable (sharedNameTable);
-		}
-		
-		static readonly string[] sharedNameTable = new string[] {
-			"", // 505195
-			"System.Void", // 116020
-			"To be added", // 78598
-			"System.Int32", // 72669
-			"System.String", // 72097
-			"System.Object", // 48530
-			"System.Boolean", // 46200
-			".ctor", // 39938
-			"System.IntPtr", // 35184
-			"To be added.", // 19082
-			"value", // 11906
-			"System.Byte", // 8524
-			"To be added: an object of type 'string'", // 7928
-			"e", // 7858
-			"raw", // 7830
-			"System.IAsyncResult", // 7760
-			"System.Type", // 7518
-			"name", // 7188
-			"object", // 6982
-			"System.UInt32", // 6966
-			"index", // 6038
-			"To be added: an object of type 'int'", // 5196
-			"System.Int64", // 4166
-			"callback", // 4158
-			"System.EventArgs", // 4140
-			"method", // 4030
-			"System.Enum", // 3980
-			"value__", // 3954
-			"Invoke", // 3906
-			"result", // 3856
-			"System.AsyncCallback", // 3850
-			"System.MulticastDelegate", // 3698
-			"BeginInvoke", // 3650
-			"EndInvoke", // 3562
-			"node", // 3416
-			"sender", // 3398
-			"context", // 3310
-			"System.EventHandler", // 3218
-			"System.Double", // 3206
-			"type", // 3094
-			"x", // 3056
-			"System.Single", // 2940
-			"data", // 2930
-			"args", // 2926
-			"System.Char", // 2813
-			"Gdk.Key", // 2684
-			"ToString", // 2634
-			"'a", // 2594
-			"System.Drawing.Color", // 2550
-			"y", // 2458
-			"To be added: an object of type 'object'", // 2430
-			"System.DateTime", // 2420
-			"message", // 2352
-			"GLib.GType", // 2292
-			"o", // 2280
-			"a <see cref=\"T:System.Int32\" />", // 2176
-			"path", // 2062
-			"obj", // 2018
-			"Nemerle.Core.list`1", // 1950
-			"System.Windows.Forms", // 1942
-			"System.Collections.ArrayList", // 1918
-			"a <see cref=\"T:System.String\" />", // 1894
-			"key", // 1868
-			"Add", // 1864
-			"arg0", // 1796
-			"System.IO.Stream", // 1794
-			"s", // 1784
-			"arg1", // 1742
-			"provider", // 1704
-			"System.UInt64", // 1700
-			"System.Drawing.Rectangle", // 1684
-			"System.IFormatProvider", // 1684
-			"gch", // 1680
-			"System.Exception", // 1652
-			"Equals", // 1590
-			"System.Drawing.Pen", // 1584
-			"count", // 1548
-			"System.Collections.IEnumerator", // 1546
-			"info", // 1526
-			"Name", // 1512
-			"System.Attribute", // 1494
-			"gtype", // 1470
-			"To be added: an object of type 'Type'", // 1444
-			"System.Collections.Hashtable", // 1416
-			"array", // 1380
-			"System.Int16", // 1374
-			"Gtk", // 1350
-			"System.ComponentModel.ITypeDescriptorContext", // 1344
-			"System.Collections.ICollection", // 1330
-			"Dispose", // 1330
-			"Gtk.Widget", // 1326
-			"System.Runtime.Serialization.StreamingContext", // 1318
-			"Nemerle.Compiler.Parsetree.PExpr", // 1312
-			"System.Guid", // 1310
-			"i", // 1302
-			"Gtk.TreeIter", // 1300
-			"text", // 1290
-			"System.Runtime.Serialization.SerializationInfo", // 1272
-			"state", // 1264
-			"Remove" // 1256
-		};		
-	}
-}
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/DomTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/DomTests.cs
deleted file mode 100644
index 29760a7a29..0000000000
--- a/main/tests/UnitTests/MonoDevelop.Projects/DomTests.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-// 
-// DomTests.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using NUnit.Framework;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Serialization;
-using MonoDevelop.Projects.Dom.Parser;
-using MonoDevelop.Core.Assemblies;
-
-namespace MonoDevelop.Projects.DomTests
-{
-	[TestFixture()]
-	public class DomTests : UnitTests.TestBase
-	{
-		[Test()]
-		public void InstantiatedMethodByArgumentTest ()
-		{
-			// build "T MyMethod<T> (T a)"
-			DomMethod method = new DomMethod ();
-			method.Name = "MyMethod";
-			method.ReturnType = new DomReturnType ("T");
-			method.AddTypeParameter (new TypeParameter ("T"));
-			method.Add (new DomParameter (method, "a", new DomReturnType ("T")));
-			
-			// give int as param type
-			List<IReturnType> genArgs = new List<IReturnType> ();
-			List<IReturnType> args    = new List<IReturnType> ();
-			args.Add (DomReturnType.Int32);
-			IMethod instMethod = DomMethod.CreateInstantiatedGenericMethod (method, genArgs, args);
-			
-			// check 
-			Assert.AreEqual (DomReturnType.Int32.FullName, instMethod.ReturnType.FullName);
-			Assert.AreEqual (DomReturnType.Int32.FullName, instMethod.Parameters[0].ReturnType.FullName);
-		}
-		
-		[Test()]
-		public void InstantiatedMethodByParameterTest ()
-		{
-			// build "T MyMethod<T> (T[] a)"
-			DomMethod method = new DomMethod ();
-			method.Name = "MyMethod";
-			method.ReturnType = new DomReturnType ("T");
-			method.AddTypeParameter (new TypeParameter ("T"));
-			DomReturnType returnType = new DomReturnType ("T");
-			returnType.ArrayDimensions = 1;
-			method.Add (new DomParameter (method, "a", returnType));
-			
-			// give int[] as param type.
-			List<IReturnType> genArgs = new List<IReturnType> ();
-			List<IReturnType> args    = new List<IReturnType> ();
-			returnType = new DomReturnType (DomReturnType.Int32.FullName);
-			returnType.ArrayDimensions = 1;
-			args.Add (returnType);
-			
-			IMethod instMethod = DomMethod.CreateInstantiatedGenericMethod (method, genArgs, args);
-			
-			// check (note that return type should be int and not int[])
-			Assert.AreEqual (DomReturnType.Int32.FullName, instMethod.ReturnType.FullName);
-			Assert.AreEqual (0, instMethod.ReturnType.ArrayDimensions);
-			Assert.AreEqual (DomReturnType.Int32.FullName, instMethod.Parameters[0].ReturnType.FullName);
-		}
-		
-		[Test()]
-		public void InstantiatedMethodByArgumentTest_Complex ()
-		{
-			// build "T MyMethod<T,S> (S b, KeyValuePair<S, T> a)"
-			DomMethod method = new DomMethod ();
-			method.Name = "MyMethod";
-			method.ReturnType = new DomReturnType ("T");
-			method.AddTypeParameter (new TypeParameter ("T"));
-			method.AddTypeParameter (new TypeParameter ("S"));
-			method.Add (new DomParameter (method, "b", new DomReturnType ("S")));
-			
-			DomReturnType returnType = new DomReturnType ("KeyValuePair");
-			returnType.AddTypeParameter (new DomReturnType ("T"));
-			returnType.AddTypeParameter (new DomReturnType ("S"));
-			method.Add (new DomParameter (method, "a", returnType));
-			
-			// give int, object as param type
-			List<IReturnType> genArgs = new List<IReturnType> ();
-			List<IReturnType> args    = new List<IReturnType> ();
-			genArgs.Add (DomReturnType.Int32);
-			genArgs.Add (DomReturnType.Object);
-			
-			IMethod instMethod = DomMethod.CreateInstantiatedGenericMethod (method, genArgs, args);
-			
-			// check
-			Assert.AreEqual (DomReturnType.Int32.FullName, instMethod.ReturnType.FullName);
-			Assert.AreEqual (DomReturnType.Object.FullName, instMethod.Parameters[0].ReturnType.FullName);
-			
-			Assert.AreEqual (DomReturnType.Int32.FullName, instMethod.Parameters[1].ReturnType.GenericArguments[0].FullName);
-			Assert.AreEqual (DomReturnType.Object.FullName, instMethod.Parameters[1].ReturnType.GenericArguments[1].FullName);
-		}
-		
-		[Test()]
-		public void ExtensionMethodTest ()
-		{
-			// build "T MyMethod<T, S> (this KeyValuePair<T, S> a, S b)"
-			DomMethod method = new DomMethod ();
-			method.Name = "MyMethod";
-			method.ReturnType = new DomReturnType ("T");
-			method.AddTypeParameter (new TypeParameter ("T"));
-			method.AddTypeParameter (new TypeParameter ("S"));
-			
-			DomReturnType returnType = new DomReturnType ("KeyValuePair");
-			returnType.AddTypeParameter (new DomReturnType ("T"));
-			returnType.AddTypeParameter (new DomReturnType ("S"));
-			method.Add (new DomParameter (method, "a", returnType));
-			method.Add (new DomParameter (method, "b", new DomReturnType ("S")));
-			
-			// Build extendet type KeyValuePair<int, object>
-			DomType type = new DomType ("KeyValuePair");
-			type.AddTypeParameter (new TypeParameter ("T"));
-			type.AddTypeParameter (new TypeParameter ("S"));
-			IType extType = DomType.CreateInstantiatedGenericTypeInternal (type, new IReturnType[] { DomReturnType.Int32, DomReturnType.Object });
-			Console.WriteLine (extType);
-			
-			// extend method
-			List<IReturnType> genArgs = new List<IReturnType> ();
-			List<IReturnType> args    = new List<IReturnType> ();
-			
-			ExtensionMethod extMethod = new ExtensionMethod (extType, method, genArgs, args);
-			
-			Console.WriteLine (extMethod);
-			// check 
-			Assert.AreEqual (DomReturnType.Int32.FullName, extMethod.ReturnType.FullName);
-			Assert.AreEqual (DomReturnType.Object.FullName, extMethod.Parameters[0].ReturnType.FullName);
-		}
-		
-			
-		[Test()]
-		public void ExtensionMethodPreserveParameterTest ()
-		{
-			// build "T MyMethod<T, S> (T a, S b)"
-			DomMethod method = new DomMethod ();
-			method.Name = "MyMethod";
-			method.ReturnType = new DomReturnType ("T");
-			method.AddTypeParameter (new TypeParameter ("T"));
-			method.AddTypeParameter (new TypeParameter ("S"));
-			
-			method.Add (new DomParameter (method, "a", new DomReturnType ("T")));
-			method.Add (new DomParameter (method, "b", new DomReturnType ("S")));
-			
-			// extend method
-			List<IReturnType> genArgs = new List<IReturnType> ();
-			List<IReturnType> args    = new List<IReturnType> ();
-			DomType extType = new DomType ("MyType");
-			
-			ExtensionMethod extMethod = new ExtensionMethod (extType, method, genArgs, args);
-			
-			// check for MyType MyMethod<S> (S b)
-			Assert.AreEqual ("MyType", extMethod.ReturnType.FullName);
-			Assert.AreEqual ("S", extMethod.Parameters[0].ReturnType.FullName);
-			Assert.AreEqual (1, extMethod.TypeParameters.Count);
-			Assert.AreEqual ("S", extMethod.TypeParameters[0].Name);
-		}
-		
-		[Test()]
-		public void InstantiatedMethodByArgumentTestComplex2 ()
-		{
-			// build "T MyMethod<T> (MyType<T> a)"
-			DomMethod method = new DomMethod ();
-			method.Name = "MyMethod";
-			method.ReturnType = new DomReturnType ("T");
-			method.AddTypeParameter (new TypeParameter ("T"));
-			
-			DomReturnType returnType = new DomReturnType ("MyType");
-			returnType.AddTypeParameter (new DomReturnType ("T"));
-			method.Add (new DomParameter (method, "a", returnType));
-			
-			// give int as param type
-			List<IReturnType> genArgs = new List<IReturnType> ();
-			List<IReturnType> args = new List<IReturnType> ();
-			returnType = new DomReturnType ("MyType");
-			returnType.AddTypeParameter (DomReturnType.Int32);
-			args.Add (returnType);
-			IMethod instMethod = DomMethod.CreateInstantiatedGenericMethod (method, genArgs, args);
-			
-			// check 
-			Assert.AreEqual (DomReturnType.Int32.FullName, instMethod.ReturnType.FullName);
-		}
-		
-		[Test()]
-		public void ParseAssemblyUriTests ()
-		{
-			TargetRuntime runtime;
-			TargetFramework fx;
-			string file;
-			ProjectDomService.ParseAssemblyUri ("Assembly:Mono 2.4.2.3:/usr/lib/mono/2.0/mscorlib.dll", out runtime, out fx, out file);
-			Assert.AreEqual ("/usr/lib/mono/2.0/mscorlib.dll", file);
-			
-			ProjectDomService.ParseAssemblyUri ("Assembly:MS.NET:C:\\Windows\\Microsoft.NET\\Framework\\v2.0.50727\\mscorlib.dll", out runtime, out fx, out file);
-			Assert.AreEqual ("C:\\Windows\\Microsoft.NET\\Framework\\v2.0.50727\\mscorlib.dll", file);
-			
-			ProjectDomService.ParseAssemblyUri ("Assembly:Mono r142024 Wed Sep 16 11:39:25 BST 2009:/usr/local/lib/mono/2.0/mscorlib.dll", out runtime, out fx, out file);
-			Assert.AreEqual ("/usr/local/lib/mono/2.0/mscorlib.dll", file);
-			
-			
-		}
-		
-	}
-}
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
index 4b288fe6f4..512f93ebb9 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
@@ -391,7 +391,7 @@ namespace MonoDevelop.Projects
 			
 			SolutionConfigurationSelector config = (SolutionConfigurationSelector) "Debug";
 			
-			Assert.IsTrue (p.NeedsBuilding (config));
+			Assert.IsTrue (p. NeedsBuilding (config));
 			Assert.IsTrue (lib1.NeedsBuilding (config));
 			Assert.IsTrue (lib2.NeedsBuilding (config));
 			
diff --git a/main/tests/UnitTests/MonoDevelop.SourceEditor/DebugTooltipTests.cs b/main/tests/UnitTests/MonoDevelop.SourceEditor/DebugTooltipTests.cs
index 683df8fe39..f84bdc2d0a 100644
--- a/main/tests/UnitTests/MonoDevelop.SourceEditor/DebugTooltipTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.SourceEditor/DebugTooltipTests.cs
@@ -28,7 +28,6 @@ using NUnit.Framework;
 using Mono.TextEditor;
 using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.CSharp.Resolver;
 using MonoDevelop.CSharpBinding;
 using MonoDevelop.CSharpBinding.Tests;
 using MonoDevelop.CSharp.Completion;
@@ -37,37 +36,62 @@ using ICSharpCode.NRefactory.CSharp;
 using ICSharpCode.NRefactory.CSharp.TypeSystem;
 using ICSharpCode.NRefactory.CSharp.Resolver;
 using MonoDevelop.CSharp;
+using MonoDevelop.Projects;
+using MonoDevelop.Core.ProgressMonitoring;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Debugger;
+using UnitTests;
 
 namespace MonoDevelop.SourceEditor
 {
 	[TestFixture]
-	public class DebugTooltipTests
+	public class DebugTooltipTests : TestBase
 	{
 		Document document;
 		string content;
+		MonoDevelop.Projects.Solution solution;
 
-		static Document CreateDocument (string input)
+		Document CreateDocument (string input)
 		{
-			var tww = new TestWorkbenchWindow ();
-			var content = new TestViewContent ();
-			tww.ViewContent = content;
-			content.ContentName = "a.cs";
-			content.GetTextEditorData ().Document.MimeType = "text/x-csharp";
-			var doc = new Document (tww);
-
 			var text = input;
 			int endPos = text.IndexOf ('$');
 			if (endPos >= 0)
 				text = text.Substring (0, endPos) + text.Substring (endPos + 1);
 
+			var project = new DotNetAssemblyProject (Microsoft.CodeAnalysis.LanguageNames.CSharp);
+			project.Name = "test";
+			project.References.Add (new MonoDevelop.Projects.ProjectReference (ReferenceType.Package, "mscorlib"));
+			project.References.Add (new MonoDevelop.Projects.ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
+			project.References.Add (new MonoDevelop.Projects.ProjectReference (ReferenceType.Package, "System.Core"));
+
+			project.FileName = "test.csproj";
+			project.Files.Add (new ProjectFile ("/a.cs", BuildAction.Compile)); 
+
+			solution = new MonoDevelop.Projects.Solution ();
+			var config = solution.AddConfiguration ("", true); 
+			solution.DefaultSolutionFolder.AddItem (project);
+			using (var monitor = new NullProgressMonitor ())
+				TypeSystemService.Load (solution, monitor, false);
+
+			var tww = new TestWorkbenchWindow ();
+			var content = new TestViewContent ();
+			tww.ViewContent = content;
+			content.ContentName = "/a.cs";
+			content.Data.MimeType = "text/x-csharp";
+			content.Project = project;
+
+
 			content.Text = text;
 			content.CursorPosition = Math.Max (0, endPos);
+			var doc = new Document (tww);
+			doc.SetProject (project);
 
 			var compExt = new CSharpCompletionTextEditorExtension ();
-			compExt.Initialize (doc);
+			compExt.Initialize (doc.Editor, doc);
 			content.Contents.Add (compExt);
 
 			doc.UpdateParseDocument ();
+
 			return doc;
 		}
 
@@ -177,18 +201,19 @@ namespace DebuggerTooltipTests
 			document = CreateDocument (content);
 		}
 
+		public override void TearDown()
+		{
+			TypeSystemService.Unload (solution);
+			base.TearDown ();
+		}
+
 		static string ResolveExpression (Document doc, string content, int offset)
 		{
 			var editor = doc.Editor;
-			ResolveResult result;
-			int startOffset;
-			AstNode node;
-
 			var loc = editor.OffsetToLocation (offset);
-			if (!doc.TryResolveAt (loc, out result, out node))
-				return null;
+			var resolver = doc.GetContent<IDebuggerExpressionResolver> ();
 
-			return CSharpCompletionTextEditorExtension.ResolveExpression (doc.Editor, result, node, out startOffset);
+			return resolver.ResolveExpressionAsync (editor, doc, offset, default(System.Threading.CancellationToken)).Result.Text;
 		}
 
 		int GetBasicOffset (string expr)
@@ -264,15 +289,15 @@ namespace DebuggerTooltipTests
 		public void TestFieldDeclarations ()
 		{
 			Assert.AreEqual ("DebuggerTooltipTests.Abc.StaticField", ResolveExpression (document, content, GetBasicOffset ("StaticField")));
-			Assert.AreEqual ("this.@double", ResolveExpression (document, content, GetBasicOffset ("@double")));
-			Assert.AreEqual ("this.field", ResolveExpression (document, content, GetBasicOffset ("field")));
+			Assert.AreEqual ("@double", ResolveExpression (document, content, GetBasicOffset ("@double")));
+			Assert.AreEqual ("field", ResolveExpression (document, content, GetBasicOffset ("field")));
 		}
 
 		[Test]
 		public void TestPropertyDeclarations ()
 		{
 			Assert.AreEqual ("DebuggerTooltipTests.Abc.StaticProperty", ResolveExpression (document, content, GetBasicOffset ("StaticProperty")));
-			Assert.AreEqual ("this.Text", ResolveExpression (document, content, GetBasicOffset ("Text")));
+			Assert.AreEqual ("Text", ResolveExpression (document, content, GetBasicOffset ("Text")));
 		}
 
 		[Test]
diff --git a/main/tests/UnitTests/MonoDevelop.SourceEditor/JSonIndentEngineTests.cs b/main/tests/UnitTests/MonoDevelop.SourceEditor/JSonIndentEngineTests.cs
index ac7b5d0d40..a0b75b1cd6 100644
--- a/main/tests/UnitTests/MonoDevelop.SourceEditor/JSonIndentEngineTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.SourceEditor/JSonIndentEngineTests.cs
@@ -25,18 +25,20 @@
 // THE SOFTWARE.
 using System;
 using NUnit.Framework;
-using MonoDevelop.Ide.CodeCompletion;
-using ICSharpCode.NRefactory.CSharp;
 using System.Text;
-using ICSharpCode.NRefactory.Editor;
-using MonoDevelop.SourceEditor.JSon;
-using Mono.TextEditor;
+using MonoDevelop.JSon;
+using UnitTests;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharpBinding;
+using MonoDevelop.CSharpBinding.Tests;
 
 namespace MonoDevelop.SourceEditor
 {
 	[TestFixture]
-	public class JSonIndentEngineTests
+	public class JSonIndentEngineTests : TestBase
 	{
+		const string indentString = "    ";
+
 		public static IDocumentIndentEngine CreateEngine (string text)
 		{
 			var sb = new StringBuilder ();
@@ -50,11 +52,18 @@ namespace MonoDevelop.SourceEditor
 				sb.Append (ch);
 			}
 
-			var data = new TextEditorData ();
-			data.Text = sb.ToString ();
-			var csi = new JSonIndentEngine (data);
+			var tww = new TestWorkbenchWindow ();
+			var content = new TestViewContent ();
+			tww.ViewContent = content;
+			content.ContentName = "/a.json";
+			content.Data.MimeType = "application/json";
+
+			content.Data.Text = sb.ToString ();
+			var doc = new MonoDevelop.Ide.Gui.Document (tww);
+
+			var csi = new JSonIndentEngine (content.Data, doc);
 			var result = new CacheIndentEngine (csi);
-			result.Update (offset);
+			result.Update (content.Data, offset);
 			return result;
 		}
 
@@ -66,8 +75,8 @@ namespace MonoDevelop.SourceEditor
 {
 $
 ");
-			Assert.AreEqual ("\t", engine.ThisLineIndent);
-			Assert.AreEqual ("\t", engine.NextLineIndent);
+			Assert.AreEqual (indentString, engine.ThisLineIndent);
+			Assert.AreEqual (indentString, engine.NextLineIndent);
 		}
 
 		[Test]
@@ -79,8 +88,8 @@ $
 	""foo"":""bar"",
 $
 ");
-			Assert.AreEqual ("\t", engine.ThisLineIndent);
-			Assert.AreEqual ("\t", engine.NextLineIndent);
+			Assert.AreEqual (indentString, engine.ThisLineIndent);
+			Assert.AreEqual (indentString, engine.NextLineIndent);
 		}
 
 		[Test]
@@ -92,16 +101,16 @@ $
 	""test"":[
 $
 ");
-			Assert.AreEqual ("\t\t", engine.ThisLineIndent);
-			Assert.AreEqual ("\t\t", engine.NextLineIndent);
+			Assert.AreEqual (indentString + indentString, engine.ThisLineIndent);
+			Assert.AreEqual (indentString + indentString, engine.NextLineIndent);
 		}
 
 		[Test]
 		public void TestWindowsEOL ()
 		{
 			var engine = CreateEngine ("\r\n{\r\n$\r\n");
-			Assert.AreEqual ("\t", engine.ThisLineIndent);
-			Assert.AreEqual ("\t", engine.NextLineIndent);
+			Assert.AreEqual (indentString, engine.ThisLineIndent);
+			Assert.AreEqual (indentString, engine.NextLineIndent);
 		}
 	}
 }
diff --git a/main/tests/UnitTests/TestBase.cs b/main/tests/UnitTests/TestBase.cs
index 50d9e04926..6770a3133a 100644
--- a/main/tests/UnitTests/TestBase.cs
+++ b/main/tests/UnitTests/TestBase.cs
@@ -42,7 +42,7 @@ namespace UnitTests
 		
 		
 		[TestFixtureSetUp]
-		public virtual void Setup ()
+		public void Simulate ()
 		{
 			if (firstRun) {
 				string rootDir = Path.Combine (Util.TestsRootDir, "config");
@@ -62,12 +62,13 @@ namespace UnitTests
 			}
 		}
 
-		static void InternalSetup (string rootDir)
+		protected virtual void InternalSetup (string rootDir)
 		{
 			Util.ClearTmpDir ();
 			Environment.SetEnvironmentVariable ("MONO_ADDINS_REGISTRY", rootDir);
 			Environment.SetEnvironmentVariable ("XDG_CONFIG_HOME", rootDir);
 			Runtime.Initialize (true);
+			Xwt.Application.Initialize ();
 			Gtk.Application.Init ();
 			TypeSystemService.TrackFileChanges = true;
 			DesktopService.Initialize ();
diff --git a/main/tests/UnitTests/UnitTests.csproj b/main/tests/UnitTests/UnitTests.csproj
index b9b03e3275..99c65bfb52 100644
--- a/main/tests/UnitTests/UnitTests.csproj
+++ b/main/tests/UnitTests/UnitTests.csproj
@@ -62,6 +62,24 @@
       <HintPath>..\..\external\guiunit\bin\net_4_0\GuiUnit.exe</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop">
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -203,6 +221,11 @@
       <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project>
       <Name>MonoDevelop.NUnit</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\external\NRefactory6\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory6.CSharp.csproj">
+      <Project>{7E891659-45F3-42B5-B940-A728780CCAE9}</Project>
+      <Name>ICSharpCode.NRefactory6.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Util.cs" />
@@ -220,17 +243,12 @@
     <Compile Include="MonoDevelop.VersionControl.Views\EditorCompareWidgetBaseTest.cs" />
     <Compile Include="MonoDevelop.CSharpBinding\TestWorkbenchWindow.cs" />
     <Compile Include="MonoDevelop.CSharpBinding\TestViewContent.cs" />
-    <Compile Include="MonoDevelop.CSharpBinding\MemberTests.cs" />
     <Compile Include="MonoDevelop.CSharpBinding\FindMemberVisitorTests.cs" />
-    <Compile Include="MonoDevelop.CSharpBinding\ProjectDomTests.cs" />
     <Compile Include="MonoDevelop.CSharpBinding\TestDocument.cs" />
     <Compile Include="MonoDevelop.CSharpBinding\FoldingParserTests.cs" />
     <Compile Include="MonoDevelop.CSharpBinding\CSharpTextEditorIndentationTests.cs" />
     <Compile Include="MonoDevelop.CSharpBinding\OnTheFlyFormatterTests.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\CompletionListWindowTests.cs" />
-    <Compile Include="MonoDevelop.CSharpBinding.Refactoring\ResolveNamespaceTests.cs" />
-    <Compile Include="MonoDevelop.Ide.FindInFiles\MemberCollectorTests.cs" />
-    <Compile Include="MonoDevelop.Ide.FindInFiles\SearchCollectorTests.cs" />
     <Compile Include="MonoDevelop.CSharpBinding.Refactoring\GenerateNewMemberTests.cs" />
     <Compile Include="MonoDevelop.SourceEditor\SourceEditorTests.cs" />
     <Compile Include="MonoDevelop.Projects\FileServiceTests.cs" />
@@ -238,20 +256,10 @@
     <Compile Include="MonoDevelop.Core\BacktrackingStringMatcherTests.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\SearchPopupWindowTests.cs" />
     <Compile Include="MonoDevelop.Core\LaneStringMatcherTests.cs" />
-    <Compile Include="MonoDevelop.Refactoring\IssueGroupTests.cs" />
-    <Compile Include="MonoDevelop.Refactoring\MockGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.Refactoring\GroupingProviderTestBase.cs" />
-    <Compile Include="MonoDevelop.Refactoring\CategoryGroupingProviderTests.cs" />
-    <Compile Include="MonoDevelop.Refactoring\ProviderGroupingProviderTests.cs" />
-    <Compile Include="MonoDevelop.Refactoring\SeverityGroupingProviderTests.cs" />
     <Compile Include="MonoDevelop.CSharpBinding\AutomaticBracketInsertionTests.cs" />
     <Compile Include="MonoDevelop.CSharpBinding\NamedArgumentCompletionTests.cs" />
     <Compile Include="MonoDevelop.SourceEditor\DebugTooltipTests.cs" />
     <Compile Include="MonoDevelop.CSharpBinding\UnitTesteditorIntegrationTests.cs" />
-    <Compile Include="MonoDevelop.Refactoring\AnalysisJobQueueTests.cs" />
-    <Compile Include="MonoDevelop.Refactoring\SimpleAnalysisJobTests.cs" />
-    <Compile Include="MonoDevelop.Refactoring\ProjectGroupingProviderTests.cs" />
-    <Compile Include="MonoDevelop.Refactoring\FileGroupingProviderTests.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\LogViewTests.cs" />
     <Compile Include="MonoDevelop.SourceEditor\JSonIndentEngineTests.cs" />
     <Compile Include="MonoDevelop.Projects\SharedAssetsProjectTests.cs" />
@@ -271,19 +279,43 @@
     <Compile Include="MonoDevelop.Ide.Templates\FileTemplateParserTests.cs" />
     <Compile Include="MonoDevelop.Ide.Templates\ProjectCreateInformationTests.cs" />
     <Compile Include="MonoDevelop.Projects\PolicyTests.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextSourceTestBase.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\ReadonlyTextDocumentTestBase.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextDocumentTestBase.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Tests\StringTextSource_Tests.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextEditorTestBase.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Tests\SimpleReadonlyDocument_Tests.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Tests\MonoTextEditorImplementationTests.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Commands\CodeCommentTests.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TextEditorProjectionTests.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\SimpleBracketMatcherTests.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Commands\SortSelectedLinesTests.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\md.targets" />
   <ItemGroup>
     <None Include="Makefile.am" />
-    <None Include="MonoDevelop.Projects\CompletionDatabaseTests.cs" />
-    <None Include="MonoDevelop.Projects\DomPersistenceTests.cs" />
-    <None Include="MonoDevelop.Projects\DomCompilationUnitTests.cs" />
-    <None Include="MonoDevelop.Projects\DomTests.cs" />
+    <None Include="MonoDevelop.AspNet\AspNetCompletionTests.cs" />
+    <None Include="MonoDevelop.AspNet\AspNetTesting.cs" />
+    <None Include="MonoDevelop.Refactoring\IssueGroupTests.cs" />
+    <None Include="MonoDevelop.Refactoring\MockGroupingProvider.cs" />
+    <None Include="MonoDevelop.Refactoring\GroupingProviderTestBase.cs" />
+    <None Include="MonoDevelop.Refactoring\CategoryGroupingProviderTests.cs" />
+    <None Include="MonoDevelop.Refactoring\ProviderGroupingProviderTests.cs" />
+    <None Include="MonoDevelop.Refactoring\SeverityGroupingProviderTests.cs" />
+    <None Include="MonoDevelop.Refactoring\AnalysisJobQueueTests.cs" />
+    <None Include="MonoDevelop.Refactoring\SimpleAnalysisJobTests.cs" />
+    <None Include="MonoDevelop.Refactoring\ProjectGroupingProviderTests.cs" />
+    <None Include="MonoDevelop.Refactoring\FileGroupingProviderTests.cs" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
     <Folder Include="MonoDevelop.Refactoring\" />
+    <Folder Include="MonoDevelop.Xml.StateEngine\" />
     <Folder Include="MonoDevelop.Ide.Templates\" />
+    <Folder Include="MonoDevelop.Ide.Editor\" />
+    <Folder Include="MonoDevelop.Ide.Editor\Tests\" />
+    <Folder Include="MonoDevelop.Ide.Editor\Commands\" />
   </ItemGroup>
 </Project>
diff --git a/main/tests/UnitTests/packages.config b/main/tests/UnitTests/packages.config
new file mode 100644
index 0000000000..f8f771207f
--- /dev/null
+++ b/main/tests/UnitTests/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" targetFramework="net45" />

+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />

+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />

+</packages>
\ No newline at end of file
diff --git a/main/winbuild.bat b/main/winbuild.bat
index dec63ce9d9..9485daf413 100644
--- a/main/winbuild.bat
+++ b/main/winbuild.bat
@@ -1 +1,2 @@
-"%WinDir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" Main.sln /m /p:Configuration=DebugWin32 /p:Platform="Any CPU"

+".nuget\NuGet.exe" restore Main.sln

+"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" Main.sln /m /p:Configuration=DebugWin32 /p:Platform="Any CPU"

diff --git a/main/winbuild.sh b/main/winbuild.sh
index 57ea7b537a..5d71de36bc 100644
--- a/main/winbuild.sh
+++ b/main/winbuild.sh
@@ -1,4 +1,4 @@
-./external/nuget-binary/NuGet.exe restore Main.sln
-export PATH="/c/Windows/Microsoft.NET/Framework/v4.0.30319:$PATH"
+./.nuget/NuGet.exe restore Main.sln
+export PATH="/c/Program Files (x86)/MSBuild/14.0/Bin:$PATH"
 pushd ..; git submodule update --init --recursive || exit 1; popd
 MSBuild.exe -m Main.sln -p:Configuration=DebugWin32 $*
diff --git a/profiles/mac b/profiles/mac
index 91f5c8a42d..9cc804993f 100644
--- a/profiles/mac
+++ b/profiles/mac
@@ -1,2 +1,2 @@
 main --disable-update-mimedb --disable-update-desktopdb --disable-gnomeplatform --enable-macplatform --enable-tests
-main/external/fsharpbinding/monodevelop --addins-dir=bin/mac-linux/Debug --no-prefix
+main/external/fsharpbinding --addins-dir=bin/mac-linux/Debug --no-prefix
diff --git a/version-checks b/version-checks
index 6d85a24765..afb52e45ad 100755
--- a/version-checks
+++ b/version-checks
@@ -17,15 +17,20 @@ DEP[0]=md-addins
 DEP_NAME[0]=MDADDINS
 DEP_PATH[0]=${top_srcdir}/../md-addins
 DEP_MODULE[0]=git@github.com:xamarin/md-addins.git
+<<<<<<< HEAD
 DEP_NEEDED_VERSION[0]=6d12a0fa86dfea73b8bfde67cc960decd59efae7
 DEP_BRANCH_AND_REMOTE[0]="new-project-model origin/new-project-model"
+=======
+DEP_NEEDED_VERSION[0]=72883b1936ad1211e553cb49b4496160cbff7cc6
+DEP_BRANCH_AND_REMOTE[0]="roslyn origin/roslyn"
+>>>>>>> origin/roslyn
 
 # heap-shot
 DEP[1]=heap-shot
 DEP_NAME[1]=HEAPSHOT
 DEP_PATH[1]=${top_srcdir}/../heap-shot
 DEP_MODULE[1]=git://github.com/mono/heap-shot.git
-DEP_NEEDED_VERSION[1]=8822b2285aa09daae71c48f4a1ebf73be751155c
+DEP_NEEDED_VERSION[1]=30d34139b33e908356cdf7007e0f84d8cc483f60
 DEP_BRANCH_AND_REMOTE[1]="master origin/master"
 
 # other dependencies