Move dispatcher to workspaces.

src/Microsoft.CodeAnalysis.Razor.Workspaces/ForegroundDispatcher.cs

@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. 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.Runtime.CompilerServices;
+using Microsoft.CodeAnalysis.Host;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal abstract class ForegroundDispatcher : IWorkspaceService
+    {
+        public abstract bool IsForegroundThread { get; }
+
+        public virtual void AssertForegroundThread([CallerMemberName] string caller = null)
+        {
+            if (!IsForegroundThread)
+            {
+                caller = caller == null ? Workspaces.Resources.ForegroundDispatcher_NoMethodNamePlaceholder : $"'{caller}'";
+                throw new InvalidOperationException(Workspaces.Resources.FormatForegroundDispatcher_AssertForegroundThread(caller));
+            }
+        }
+
+        public virtual void AssertBackgroundThread([CallerMemberName] string caller = null)
+        {
+            if (IsForegroundThread)
+            {
+                caller = caller == null ? Workspaces.Resources.ForegroundDispatcher_NoMethodNamePlaceholder : $"'{caller}'";
+                throw new InvalidOperationException(Workspaces.Resources.FormatForegroundDispatcher_AssertBackgroundThread(caller));
+            }
+        }
+    }
+}

src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/Resources.Designer.cs

@@ -0,0 +1,86 @@
+// <auto-generated />
+namespace Microsoft.CodeAnalysis.Razor.Workspaces
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.CodeAnalysis.Razor.Workspaces.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Value cannot be null or an empty string.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpty
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Value cannot be null or an empty string.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpty()
+            => GetString("ArgumentCannotBeNullOrEmpty");
+
+        /// <summary>
+        /// {0} must be called on a background thread.
+        /// </summary>
+        internal static string ForegroundDispatcher_AssertBackgroundThread
+        {
+            get => GetString("ForegroundDispatcher_AssertBackgroundThread");
+        }
+
+        /// <summary>
+        /// {0} must be called on a background thread.
+        /// </summary>
+        internal static string FormatForegroundDispatcher_AssertBackgroundThread(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ForegroundDispatcher_AssertBackgroundThread"), p0);
+
+        /// <summary>
+        /// {0} must be called on the foreground thread.
+        /// </summary>
+        internal static string ForegroundDispatcher_AssertForegroundThread
+        {
+            get => GetString("ForegroundDispatcher_AssertForegroundThread");
+        }
+
+        /// <summary>
+        /// {0} must be called on the foreground thread.
+        /// </summary>
+        internal static string FormatForegroundDispatcher_AssertForegroundThread(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ForegroundDispatcher_AssertForegroundThread"), p0);
+
+        /// <summary>
+        /// The method
+        /// </summary>
+        internal static string ForegroundDispatcher_NoMethodNamePlaceholder
+        {
+            get => GetString("ForegroundDispatcher_NoMethodNamePlaceholder");
+        }
+
+        /// <summary>
+        /// The method
+        /// </summary>
+        internal static string FormatForegroundDispatcher_NoMethodNamePlaceholder()
+            => GetString("ForegroundDispatcher_NoMethodNamePlaceholder");
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}

src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources.resx

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>Value cannot be null or an empty string.</value>
+  </data>
+  <data name="ForegroundDispatcher_AssertBackgroundThread" xml:space="preserve">
+    <value>{0} must be called on a background thread.</value>
+  </data>
+  <data name="ForegroundDispatcher_AssertForegroundThread" xml:space="preserve">
+    <value>{0} must be called on the foreground thread.</value>
+  </data>
+  <data name="ForegroundDispatcher_NoMethodNamePlaceholder" xml:space="preserve">
+    <value>The method</value>
+  </data>
+</root>

src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/VisualStudioRazorParser.cs

@@ -5,6 +5,7 @@ using System;
 using System.Timers;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;

src/Microsoft.VisualStudio.LanguageServices.Razor/ForegroundDispatcher.cs

@@ -1,31 +0,0 @@
-// Copyright (c) .NET Foundation. 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.Runtime.CompilerServices;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    internal abstract class ForegroundDispatcher
-    {
-        public abstract bool IsForegroundThread { get; }
-
-        public virtual void AssertForegroundThread([CallerMemberName] string caller = null)
-        {
-            if (!IsForegroundThread)
-            {
-                caller = caller == null ? Resources.ForegroundDispatcher_NoMethodNamePlaceholder : $"'{caller}'";
-                throw new InvalidOperationException(Resources.FormatForegroundDispatcher_AssertForegroundThread(caller));
-            }
-        }
-
-        public virtual void AssertBackgroundThread([CallerMemberName] string caller = null)
-        {
-            if (IsForegroundThread)
-            {
-                caller = caller == null ? Resources.ForegroundDispatcher_NoMethodNamePlaceholder : $"'{caller}'";
-                throw new InvalidOperationException(Resources.FormatForegroundDispatcher_AssertBackgroundThread(caller));
-            }
-        }
-    }
-}

src/Microsoft.VisualStudio.LanguageServices.Razor/Properties/Resources.Designer.cs

@@ -24,48 +24,6 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
         internal static string FormatArgumentCannotBeNullOrEmpty()
             => GetString("ArgumentCannotBeNullOrEmpty");
 
-        /// <summary>
-        /// {0} must be called on a background thread.
-        /// </summary>
-        internal static string ForegroundDispatcher_AssertBackgroundThread
-        {
-            get => GetString("ForegroundDispatcher_AssertBackgroundThread");
-        }
-
-        /// <summary>
-        /// {0} must be called on a background thread.
-        /// </summary>
-        internal static string FormatForegroundDispatcher_AssertBackgroundThread(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ForegroundDispatcher_AssertBackgroundThread"), p0);
-
-        /// <summary>
-        /// {0} must be called on the foreground thread.
-        /// </summary>
-        internal static string ForegroundDispatcher_AssertForegroundThread
-        {
-            get => GetString("ForegroundDispatcher_AssertForegroundThread");
-        }
-
-        /// <summary>
-        /// {0} must be called on the foreground thread.
-        /// </summary>
-        internal static string FormatForegroundDispatcher_AssertForegroundThread(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ForegroundDispatcher_AssertForegroundThread"), p0);
-
-        /// <summary>
-        /// The method
-        /// </summary>
-        internal static string ForegroundDispatcher_NoMethodNamePlaceholder
-        {
-            get => GetString("ForegroundDispatcher_NoMethodNamePlaceholder");
-        }
-
-        /// <summary>
-        /// The method
-        /// </summary>
-        internal static string FormatForegroundDispatcher_NoMethodNamePlaceholder()
-            => GetString("ForegroundDispatcher_NoMethodNamePlaceholder");
-
         /// <summary>
         /// An unexpected exception occurred when invoking '{0}.{1}' on the Razor language service.
         /// </summary>

src/Microsoft.VisualStudio.LanguageServices.Razor/Resources.resx

@@ -120,15 +120,6 @@
   <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
     <value>Value cannot be null or an empty string.</value>
   </data>
-  <data name="ForegroundDispatcher_AssertBackgroundThread" xml:space="preserve">
-    <value>{0} must be called on a background thread.</value>
-  </data>
-  <data name="ForegroundDispatcher_AssertForegroundThread" xml:space="preserve">
-    <value>{0} must be called on the foreground thread.</value>
-  </data>
-  <data name="ForegroundDispatcher_NoMethodNamePlaceholder" xml:space="preserve">
-    <value>The method</value>
-  </data>
   <data name="UnexpectedException" xml:space="preserve">
     <value>An unexpected exception occurred when invoking '{0}.{1}' on the Razor language service.</value>
   </data>

src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioForegroundDispatcher.cs

@@ -1,12 +1,15 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.VisualStudio.Shell;
 
 namespace Microsoft.VisualStudio.LanguageServices.Razor
 {
-    [Export(typeof(ForegroundDispatcher))]
+    [Shared]
+    [ExportWorkspaceService(typeof(ForegroundDispatcher), ServiceLayer.Host)]
     internal class VisualStudioForegroundDispatcher : ForegroundDispatcher
     {
         public override bool IsForegroundThread => ThreadHelper.CheckAccess();

test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ForegroundDispatcherTestBase.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading;
+using Microsoft.CodeAnalysis.Razor;
 
 namespace Microsoft.VisualStudio.LanguageServices.Razor
 {