Merge remote-tracking branch 'upstream/master' into a11y

1 files changed, 379 insertions, 26 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
index ce467c44c9..2f53a84e78 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
@@ -144,10 +144,6 @@
       <HintPath>..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Collections.Immutable">
       <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath>
     </Reference>
@@ -160,12 +156,41 @@
     <Reference Include="Microsoft.CodeAnalysis.Workspaces">
       <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
     </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
     <Reference Include="System.Composition.AttributedModel">
       <HintPath>..\..\..\build\bin\System.Composition.AttributedModel.dll</HintPath>
     </Reference>
     <Reference Include="System.Composition.Runtime">
       <HintPath>..\..\..\build\bin\System.Composition.Runtime.dll</HintPath>
     </Reference>
+    <Reference Include="YamlDotNet">
+      <HintPath>..\..\..\packages\YamlDotNet.Signed.4.0.1-pre291\lib\net35\YamlDotNet.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="Microsoft.TemplateEngine.Abstractions">
+      <HintPath>..\..\..\packages\Microsoft.TemplateEngine.Abstractions.1.0.0-beta1-20170223-126\lib\net45\Microsoft.TemplateEngine.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.TemplateEngine.Core.Contracts">
+      <HintPath>..\..\..\packages\Microsoft.TemplateEngine.Core.Contracts.1.0.0-beta1-20170223-126\lib\net45\Microsoft.TemplateEngine.Core.Contracts.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.TemplateEngine.Utils">
+      <HintPath>..\..\..\packages\Microsoft.TemplateEngine.Utils.1.0.0-beta1-20170223-126\lib\net45\Microsoft.TemplateEngine.Utils.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.TemplateEngine.Core">
+      <HintPath>..\..\..\packages\Microsoft.TemplateEngine.Core.1.0.0-beta1-20170223-126\lib\net45\Microsoft.TemplateEngine.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects">
+      <HintPath>..\..\..\packages\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.1.0.0-beta1-20170223-126\lib\net45\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.TemplateEngine.Edge">
+      <HintPath>..\..\..\packages\Microsoft.TemplateEngine.Edge.1.0.0-beta1-20170223-126\lib\net45\Microsoft.TemplateEngine.Edge.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -211,10 +236,6 @@
       <Project>{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}</Project>
       <Name>Mono.Debugging</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.IKVM\ICSharpCode.NRefactory.IKVM.csproj">
-      <Project>{A727169F-D94F-443F-B305-B057D7F3B420}</Project>
-      <Name>ICSharpCode.NRefactory.IKVM</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\ikvm\reflect\IKVM.Reflection.csproj">
       <Project>{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}</Project>
       <Name>IKVM.Reflection</Name>
@@ -6610,6 +6631,126 @@
     <EmbeddedResource Include="icons\folder-assets-16~dark~sel%402x.png">
       <LogicalName>folder-assets-16~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\palette-16.png">
+      <LogicalName>palette-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\palette-16%402x.png">
+      <LogicalName>palette-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\palette-16~dark.png">
+      <LogicalName>palette-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\palette-16~dark%402x.png">
+      <LogicalName>palette-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\palette-16~sel.png">
+      <LogicalName>palette-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\palette-16~sel%402x.png">
+      <LogicalName>palette-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\palette-16~dark~sel.png">
+      <LogicalName>palette-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\palette-16~dark~sel%402x.png">
+      <LogicalName>palette-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\style-16.png">
+      <LogicalName>style-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\style-16%402x.png">
+      <LogicalName>style-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\style-16~dark.png">
+      <LogicalName>style-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\style-16~dark%402x.png">
+      <LogicalName>style-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\style-16~sel.png">
+      <LogicalName>style-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\style-16~sel%402x.png">
+      <LogicalName>style-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\style-16~dark~sel.png">
+      <LogicalName>style-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\style-16~dark~sel%402x.png">
+      <LogicalName>style-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\typography-16.png">
+      <LogicalName>typography-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\typography-16%402x.png">
+      <LogicalName>typography-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\typography-16~dark.png">
+      <LogicalName>typography-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\typography-16~dark%402x.png">
+      <LogicalName>typography-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\typography-16~sel.png">
+      <LogicalName>typography-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\typography-16~sel%402x.png">
+      <LogicalName>typography-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\typography-16~dark~sel.png">
+      <LogicalName>typography-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\typography-16~dark~sel%402x.png">
+      <LogicalName>typography-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\scroll-16.png">
+      <LogicalName>scroll-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\scroll-16%402x.png">
+      <LogicalName>scroll-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\scroll-16~dark.png">
+      <LogicalName>scroll-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\scroll-16~dark%402x.png">
+      <LogicalName>scroll-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\scroll-16~sel.png">
+      <LogicalName>scroll-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\scroll-16~sel%402x.png">
+      <LogicalName>scroll-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\scroll-16~dark~sel.png">
+      <LogicalName>scroll-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\scroll-16~dark~sel%402x.png">
+      <LogicalName>scroll-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\widget-16.png">
+      <LogicalName>widget-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\widget-16%402x.png">
+      <LogicalName>widget-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\widget-16~dark.png">
+      <LogicalName>widget-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\widget-16~dark%402x.png">
+      <LogicalName>widget-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\widget-16~sel.png">
+      <LogicalName>widget-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\widget-16~sel%402x.png">
+      <LogicalName>widget-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\widget-16~dark~sel.png">
+      <LogicalName>widget-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\widget-16~dark~sel%402x.png">
+      <LogicalName>widget-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\parser-16.png">
       <LogicalName>parser-16.png</LogicalName>
     </EmbeddedResource>
@@ -7450,7 +7591,6 @@
     <EmbeddedResource Include="icons\folder-services-16~sel%402x.png">
       <LogicalName>folder-services-16~sel@2x.png</LogicalName>
     </EmbeddedResource>
-
     <EmbeddedResource Include="icons\folder-code-16.png">
       <LogicalName>folder-code-16.png</LogicalName>
     </EmbeddedResource>
@@ -7475,7 +7615,6 @@
     <EmbeddedResource Include="icons\folder-code-16~sel%402x.png">
       <LogicalName>folder-code-16~sel@2x.png</LogicalName>
     </EmbeddedResource>
-
     <EmbeddedResource Include="icons\service-16.png">
       <LogicalName>service-16.png</LogicalName>
     </EmbeddedResource>
@@ -7524,7 +7663,6 @@
     <EmbeddedResource Include="icons\service-24~dark~sel%402x.png">
       <LogicalName>service-24~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
-
     <EmbeddedResource Include="icons\expander-arrow-closed-8.png">
       <LogicalName>expander-arrow-closed-8.png</LogicalName>
     </EmbeddedResource>
@@ -7549,7 +7687,6 @@
     <EmbeddedResource Include="icons\expander-arrow-closed-8~dark~sel%402x.png">
       <LogicalName>expander-arrow-closed-8~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
-
     <EmbeddedResource Include="icons\expander-arrow-expanded-8.png">
       <LogicalName>expander-arrow-expanded-8.png</LogicalName>
     </EmbeddedResource>
@@ -7574,7 +7711,6 @@
     <EmbeddedResource Include="icons\expander-arrow-expanded-8~dark~sel%402x.png">
       <LogicalName>expander-arrow-expanded-8~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
-
     <EmbeddedResource Include="icons\code-16.png">
       <LogicalName>code-16.png</LogicalName>
     </EmbeddedResource>
@@ -7599,7 +7735,6 @@
     <EmbeddedResource Include="icons\code-16~dark~sel%402x.png">
       <LogicalName>code-16~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
-
     <EmbeddedResource Include="icons\checkmark-16.png">
       <LogicalName>checkmark-16.png</LogicalName>
     </EmbeddedResource>
@@ -7624,7 +7759,6 @@
     <EmbeddedResource Include="icons\checkmark-16~dark~sel%402x.png">
       <LogicalName>checkmark-16~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
-
     <EmbeddedResource Include="icons\dependency-16.png">
       <LogicalName>dependency-16.png</LogicalName>
     </EmbeddedResource>
@@ -7649,7 +7783,6 @@
     <EmbeddedResource Include="icons\dependency-16~dark~sel%402x.png">
       <LogicalName>dependency-16~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
-
     <EmbeddedResource Include="templates\images\workspace-template.png">
       <LogicalName>workspace-template.png</LogicalName>
     </EmbeddedResource>
@@ -8025,6 +8158,138 @@
     <EmbeddedResource Include="options\KeyBindingSchemeRider-mac.xml">
       <LogicalName>KeyBindingSchemeRider-mac.xml</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\FallbackStyle.json">
+      <LogicalName>FallbackStyle.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\DarkStyle.json">
+      <LogicalName>DarkStyle.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\GruvboxStyle.json">
+      <LogicalName>GruvboxStyle.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\LightStyle.json">
+      <LogicalName>LightStyle.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\MonokaiStyle.json">
+      <LogicalName>MonokaiStyle.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\NightshadeStyle.json">
+      <LogicalName>NightshadeStyle.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\OblivionStyle.json">
+      <LogicalName>OblivionStyle.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\SolarizedDarkStyle.json">
+      <LogicalName>SolarizedDarkStyle.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\SolarizedLightStyle.json">
+      <LogicalName>SolarizedLightStyle.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\TangoStyle.json">
+      <LogicalName>TangoStyle.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\VisualStudioStyle.json">
+      <LogicalName>VisualStudioStyle.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\CSharp\C#.sublime-syntax">
+      <LogicalName>C#.sublime-syntax</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\css\syntaxes\css.plist">
+      <LogicalName>css.tmLanguage</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\javascript\syntaxes\JavaScript.tmLanguage.json">
+      <LogicalName>JavaScript.tmLanguage.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\javascript\syntaxes\RegexJavaScript.tmLanguage">
+      <LogicalName>RegexJavaScript.tmLanguage</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\xml\syntaxes\xml.json">
+      <LogicalName>xml.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\xml\syntaxes\xsl.json">
+      <LogicalName>xsl.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\typescript\syntaxes\TypeScript.tmLanguage.json">
+      <LogicalName>TypeScript.tmLanguage.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\typescript\syntaxes\TypeScriptReact.tmLanguage.json">
+      <LogicalName>TypeScriptReact.tmLanguage.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\less\syntaxes\LESS.tmLanguage">
+      <LogicalName>LESS.tmLanguage</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\json\syntaxes\JSON.tmLanguage">
+      <LogicalName>JSON.tmLanguage</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\html\syntaxes\html.json">
+      <LogicalName>html.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\diff\syntaxes\diff.tmLanguage">
+      <LogicalName>diff.tmLanguage</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\CSharp\CSharpComments.tmPreferences">
+      <LogicalName>CSharpComments.tmPreferences</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\FSharp\F#.sublime-syntax">
+      <LogicalName>F#.sublime-syntax</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\FSharp\FSharpComments.tmPreferences">
+      <LogicalName>FSharpComments.tmPreferences</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\IL\ILComments.tmPreferences">
+      <LogicalName>ILComments.tmPreferences</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\IL\IL.sublime-syntax">
+      <LogicalName>IL.sublime-syntax</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\ChangeLog\ChangeLog.sublime-syntax">
+      <LogicalName>ChangeLog.sublime-syntax</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\Yaml\Yaml.sublime-syntax">
+      <LogicalName>Yaml.sublime-syntax</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\make\syntaxes\Makefile.json">
+      <LogicalName>Makefile.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\java\syntaxes\java.json">
+      <LogicalName>java.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\powershell\syntaxes\PowershellSyntax.tmLanguage">
+      <LogicalName>PowershellSyntax.tmLanguage</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\shellscript\syntaxes\Shell-Unix-Bash.tmLanguage.json">
+      <LogicalName>Shell-Unix-Bash.tmLanguage.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\swift\syntaxes\swift.json">
+      <LogicalName>swift.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\bat\syntaxes\BatchFile.tmLanguage">
+      <LogicalName>BatchFile.tmLanguage</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\objective-c\syntaxes\Objective-C.tmLanguage">
+      <LogicalName>Objective-C.tmLanguage</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\cpp\syntaxes\c++.json">
+      <LogicalName>c++.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\cpp\syntaxes\c.json">
+      <LogicalName>c.json</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\CgShader\CgShader.sublime-syntax">
+      <LogicalName>CgShader.sublime-syntax</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\T4\T4.sublime-syntax">
+      <LogicalName>T4.sublime-syntax</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\ASP\AspNet.sublime-syntax">
+      <LogicalName>AspNet.sublime-syntax</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\ASP\Ashx.sublime-syntax">
+      <LogicalName>Ashx.sublime-syntax</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\ASP\Razor.sublime-syntax">
+      <LogicalName>Razor.sublime-syntax</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-metadata-16.png">
       <LogicalName>prefs-metadata-16.png</LogicalName>
     </EmbeddedResource>
@@ -8802,10 +9067,7 @@
     <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\SyntaxHighlightingService.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" />
@@ -8836,6 +9098,7 @@
     <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.Highlighting\ColorDescriptionAttribute.cs" />
     <Compile Include="MonoDevelop.Ide.Editor\TextMarkerFactory.cs" />
     <Compile Include="MonoDevelop.Ide.Editor\InternalExtensionAPI\ITextEditorImpl.cs" />
     <Compile Include="MonoDevelop.Ide.Editor\InternalExtensionAPI\ITextMarkerFactory.cs" />
@@ -9009,6 +9272,49 @@
     <Compile Include="MonoDevelop.Ide.Editor.Extension\DefaultCommandTextEditorExtension.cs" />
     <Compile Include="MonoDevelop.Ide.Editor\EditSession.cs" />
     <Compile Include="MonoDevelop.Ide.Editor.Extension\AutoInsertBracketTextEditorExtension.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Caret.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\Selection.cs" />
+    <Compile Include="MonoDevelop.Ide.Extensions\ErrorDocumentationProvider.cs" />
+    <Compile Include="MonoDevelop.Ide\LocalizationService.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\SyntaxHighlighting.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\ISyntaxHighlighting.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\Regex.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexBoyerMoore.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexCapture.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexCaptureCollection.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexCharClass.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexCode.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexCompilationInfo.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexCompiler.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexFCD.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexGroup.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexGroupCollection.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexInterpreter.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexMatch.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexMatchCollection.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexMatchTimeoutException.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexNode.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexOptions.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexParser.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexReplacement.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexRunner.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexRunnerFactory.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexTree.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\RegexWriter.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\compiledregexrunner.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\RegexEngine\compiledregexrunnerfactory.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\PObject.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\EditorTheme.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\SyntaxHighlightingDefinition.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\TmSetting.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\TmSnippet.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\EditorThemeColors.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.TextMate\TextMateIndentationTextEditorExtension.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.TextMate\TextMateIndentationTracker.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.TextMate\IIndentEngine.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.TextMate\TextMateDocumentIndentEngine.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.TextMate\TextMateLanguage.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.TextMate\TextMateFoldingTextEditorExtension.cs" />
     <Compile Include="MonoDevelop.Ide.Execution\RunConfigurationEditor.cs" />
     <Compile Include="MonoDevelop.Ide.Extensions\RunConfigurationEditorExtensionNode.cs" />
     <Compile Include="MonoDevelop.Ide.Projects.OptionPanels\RunConfigurationsPanel.cs" />
@@ -9020,12 +9326,21 @@
     <Compile Include="MonoDevelop.Ide.Execution\ExecutionModeSelectorDialog.cs" />
     <Compile Include="MonoDevelop.Ide.Projects.OptionPanels\RunConfigurationsList.cs" />
     <Compile Include="MonoDevelop.Ide.Projects.OptionPanels\ProcessRunConfigurationEditor.cs" />
-    <Compile Include="MonoDevelop.Ide.Extensions\ErrorDocumentationProvider.cs" />
-    <Compile Include="MonoDevelop.Ide\LocalizationService.cs" />
     <Compile Include="MonoDevelop.Ide.CustomTools\SingleProjectFileCustomTool.cs" />
     <Compile Include="MonoDevelop.Ide.Execution\RunWithCustomParametersDialog.cs" />
     <Compile Include="MonoDevelop.Components\InformationPopoverWidget.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.TextMate\ShowTextMateScopesHandler.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor\TooltipWindowOptions.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\Formats\OldFormat.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\Formats\Sublime3Format.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\Formats\TextMateFormat.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.TextMate\TextMateCompletionTextEditorExtension.cs" />
     <Compile Include="MonoDevelop.Ide.Editor\MarkupOptions.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.TextMate\TextMateBundleOptionsPanel.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.TextMate\TextMateBundleOptionsPanelWidget.cs" />
+    <Compile Include="gtk-gui\MonoDevelop.Ide.Editor.TextMate.TextMateBundleOptionsPanelWidget.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\LanguageBundle.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\StackMatchExpression.cs" />
     <Compile Include="MonoDevelop.Ide.Projects.OptionPanels\SolutionRunConfigurationsPanel.cs" />
     <Compile Include="MonoDevelop.Ide.Projects.OptionPanels\SolutionRunConfigurationPanel.cs" />
     <Compile Include="MonoDevelop.Ide.GettingStarted\GettingStarted.cs" />
@@ -9049,6 +9364,14 @@
     <Compile Include="MonoDevelop.Components.AtkCocoaHelper\AtkCocoaHelper.cs" />
     <Compile Include="MonoDevelop.Components.AtkCocoaHelper\AtkCocoaHelperMac.cs" />
     <Compile Include="MonoDevelop.Components.AtkCocoaHelper\AtkCocoaHelperNoOp.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Highlighting\ScopeStack.cs" />
+    <Compile Include="MonoDevelop.Ide.Editor.Extension\HighlightUrlExtension.cs" />
+    <Compile Include="MonoDevelop.Ide.CodeCompletion\CompletionTriggerInfo.cs" />
+    <Compile Include="MonoDevelop.Ide.CodeCompletion\CompletionTriggerReason.cs" />
+    <Compile Include="MonoDevelop.Ide.Templates\MicrosoftTemplateEngineProjectTemplatingProvider.cs" />
+    <Compile Include="MonoDevelop.Ide.Templates\MicrosoftTemplateEngineSolutionTemplate.cs" />
+    <Compile Include="MonoDevelop.Ide.Templates\MicrosoftTemplateEngineProcessedTemplateResult.cs" />
+    <Compile Include="MonoDevelop.Ide.Codons\TemplateExtensionNode.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
@@ -9061,6 +9384,33 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\FSharp\F#Comments.tmPreferences" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\AppleStrings\AppleStrings.sublime-syntax" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\make\OSSREADME.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\make\language-configuration.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\make\package.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\shellscript\OSSREADME.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\shellscript\language-configuration.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\shellscript\package.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\powershell\OSSREADME.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\powershell\language-configuration.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\powershell\package.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\java\package.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\swift\LICENSE.md" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\swift\OSSREADME.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\swift\language-configuration.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\swift\package.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\swift\snippets\swift.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\bat\OSSREADME.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\bat\language-configuration.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\bat\package.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\cpp\OSSREADME.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\cpp\language-configuration.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\cpp\package.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\cpp\syntaxes\Platform.tmLanguage" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\objective-c\OSSREADME.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\objective-c\language-configuration.json" />
+    <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\objective-c\package.json" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
@@ -9093,14 +9443,17 @@
     <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="MonoDevelop.Components\Windows\" />
     <Folder Include="MonoDevelop.Ide.GettingStarted\" />
     <Folder Include="MonoDevelop.Ide.Gui.Wizard\" />
     <Folder Include="MonoDevelop.Components.AtkCocoaHelper\" />
+    <Folder Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\IL\" />
+    <Folder Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\AppleStrings\" />
+    <Folder Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\ChangeLog\" />
+    <Folder Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\Yaml\" />
+    <Folder Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\CgShader\" />
+    <Folder Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\T4\" />
+    <Folder Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\ASP\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="gtkrc">