From ac74ef6000818eb745026b0d323532503e3fc6d8 Mon Sep 17 00:00:00 2001
From: Paul Vick <paulv@microsoft.com>
Date: Thu, 15 Sep 2016 13:29:30 -0700
Subject: [PATCH] Add features language service to remote

---
 src/Features/CSharp/Portable/CSharpFeatures.csproj   |  1 +
 .../VisualBasic/Portable/BasicFeatures.vbproj        |  1 +
 src/Workspaces/Remote/Core/RemoteWorkspaces.csproj   | 12 ++++++++++++
 .../Remote/Core/Services/RoslynServices.cs           |  5 ++++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Features/CSharp/Portable/CSharpFeatures.csproj b/src/Features/CSharp/Portable/CSharpFeatures.csproj
index b44f0407e98..ae694a68f5d 100644
--- a/src/Features/CSharp/Portable/CSharpFeatures.csproj
+++ b/src/Features/CSharp/Portable/CSharpFeatures.csproj
@@ -45,6 +45,7 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures" />
     <InternalsVisibleTo Include="MonoDevelop.CSharpBinding" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.Workspaces" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests2" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.UnitTests" />
diff --git a/src/Features/VisualBasic/Portable/BasicFeatures.vbproj b/src/Features/VisualBasic/Portable/BasicFeatures.vbproj
index 3fd28d75376..1c33ca6e744 100644
--- a/src/Features/VisualBasic/Portable/BasicFeatures.vbproj
+++ b/src/Features/VisualBasic/Portable/BasicFeatures.vbproj
@@ -55,6 +55,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.VisualBasic" />
     <InternalsVisibleTo Include="MonoDevelop.VBNetBinding" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.Workspaces" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.UnitTests2" />
diff --git a/src/Workspaces/Remote/Core/RemoteWorkspaces.csproj b/src/Workspaces/Remote/Core/RemoteWorkspaces.csproj
index 1542f45b166..d022a998123 100644
--- a/src/Workspaces/Remote/Core/RemoteWorkspaces.csproj
+++ b/src/Workspaces/Remote/Core/RemoteWorkspaces.csproj
@@ -19,6 +19,18 @@
       <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
       <Name>CodeAnalysis</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Features\Core\Portable\Features.csproj">
+      <Project>{edc68a0e-c68d-4a74-91b7-bf38ec909888}</Project>
+      <Name>Features</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Features\CSharp\Portable\CSharpFeatures.csproj">
+      <Project>{3973b09a-4fbf-44a5-8359-3d22ceb71f71}</Project>
+      <Name>CSharpFeatures</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Features\VisualBasic\Portable\BasicFeatures.vbproj">
+      <Project>{a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d}</Project>
+      <Name>BasicFeatures</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Core\Desktop\Workspaces.Desktop.csproj">
       <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
       <Name>Workspaces.Desktop</Name>
diff --git a/src/Workspaces/Remote/Core/Services/RoslynServices.cs b/src/Workspaces/Remote/Core/Services/RoslynServices.cs
index 6a0a1688a65..cd89fab3cf0 100644
--- a/src/Workspaces/Remote/Core/Services/RoslynServices.cs
+++ b/src/Workspaces/Remote/Core/Services/RoslynServices.cs
@@ -14,7 +14,10 @@ internal static class RoslynServices
     {
         // TODO: probably need to split this to private and public services
         public static readonly HostServices HostServices = MefHostServices.Create(
-            MefHostServices.DefaultAssemblies.Add(typeof(Host.TemporaryStorageServiceFactory.TemporaryStorageService).Assembly));
+            MefHostServices.DefaultAssemblies
+                .Add(typeof(Host.TemporaryStorageServiceFactory.TemporaryStorageService).Assembly)
+                .Add(typeof(CSharp.CodeLens.CSharpCodeLensDisplayInfoService).Assembly)
+                .Add(typeof(VisualBasic.CodeLens.VisualBasicDisplayInfoService).Assembly));
 
         public static readonly AssetService AssetService = new AssetService();
         public static readonly SolutionService SolutionService = new SolutionService();
-- 
GitLab