From be46d2a4f41df6068e76858c74f398b8b740d29a Mon Sep 17 00:00:00 2001
From: Raul Perez <raperez@microsoft.com>
Date: Thu, 19 Jan 2017 13:22:07 -0800
Subject: [PATCH] Revert "Merge providers"

This reverts commit 2209f5cd28677cc72c26486db8312edef876302f.
---
 ...raphProvider.cs => CSharpGraphProvider.cs} |  6 ++---
 .../Progression/VisualBasicGraphProvider.cs   | 27 +++++++++++++++++++
 .../Next/ServicesVisualStudio.Next.csproj     |  3 ++-
 3 files changed, 32 insertions(+), 4 deletions(-)
 rename src/VisualStudio/Core/Next/Progression/{RoslynGraphProvider.cs => CSharpGraphProvider.cs} (83%)
 create mode 100644 src/VisualStudio/Core/Next/Progression/VisualBasicGraphProvider.cs

diff --git a/src/VisualStudio/Core/Next/Progression/RoslynGraphProvider.cs b/src/VisualStudio/Core/Next/Progression/CSharpGraphProvider.cs
similarity index 83%
rename from src/VisualStudio/Core/Next/Progression/RoslynGraphProvider.cs
rename to src/VisualStudio/Core/Next/Progression/CSharpGraphProvider.cs
index f93e991775d..28044df8249 100644
--- a/src/VisualStudio/Core/Next/Progression/RoslynGraphProvider.cs
+++ b/src/VisualStudio/Core/Next/Progression/CSharpGraphProvider.cs
@@ -11,11 +11,11 @@
 
 namespace Microsoft.VisualStudio.LanguageServices.CSharp.Progression
 {
-    [GraphProvider(Name = "RoslynGraphProvider", ProjectCapability = "CSharp | VisualBasic")]
-    internal sealed class RoslynGraphProvider : AbstractGraphProvider
+    [GraphProvider(Name = "CSharpRoslynProvider", ProjectCapability = "CSharp")]
+    internal sealed class CSharpGraphProvider : AbstractGraphProvider
     {
         [ImportingConstructor]
-        public RoslynGraphProvider(
+        public CSharpGraphProvider(
             IGlyphService glyphService,
             SVsServiceProvider serviceProvider,
             IProgressionPrimaryWorkspaceProvider workspaceProvider,
diff --git a/src/VisualStudio/Core/Next/Progression/VisualBasicGraphProvider.cs b/src/VisualStudio/Core/Next/Progression/VisualBasicGraphProvider.cs
new file mode 100644
index 00000000000..065d1ba1ae4
--- /dev/null
+++ b/src/VisualStudio/Core/Next/Progression/VisualBasicGraphProvider.cs
@@ -0,0 +1,27 @@
+// 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.ComponentModel.Composition;
+using Microsoft.CodeAnalysis.Shared.TestHooks;
+using Microsoft.VisualStudio.GraphModel;
+using Microsoft.VisualStudio.Language.Intellisense;
+using Microsoft.VisualStudio.LanguageServices.Implementation.Progression;
+using Microsoft.VisualStudio.Shell;
+
+namespace Microsoft.VisualStudio.LanguageServices.CSharp.Progression
+{
+    [GraphProvider(Name = "VisualBasicRoslynProvider", ProjectCapability = "VisualBasic")]
+    internal sealed class VisualBasicGraphProvider : AbstractGraphProvider
+    {
+        [ImportingConstructor]
+        public VisualBasicGraphProvider(
+            IGlyphService glyphService,
+            SVsServiceProvider serviceProvider,
+            IProgressionPrimaryWorkspaceProvider workspaceProvider,
+            [ImportMany] IEnumerable<Lazy<IAsynchronousOperationListener, FeatureMetadata>> asyncListeners) :
+            base(glyphService, serviceProvider, workspaceProvider.PrimaryWorkspace, asyncListeners)
+        {
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj b/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj
index efa96ffb86a..1c86966200f 100644
--- a/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj
+++ b/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj
@@ -92,7 +92,8 @@
     <Compile Include="FindReferences\StreamingFindUsagesPresenter.TableDataSourceFindUsagesContext.cs" />
     <Compile Include="FindReferences\StreamingFindUsagesPresenter.TableEntriesSnapshot.cs" />
     <Compile Include="FindReferences\TaggedTextAndHighlightSpan.cs" />
-    <Compile Include="Progression\RoslynGraphProvider.cs" />
+    <Compile Include="Progression\VisualBasicGraphProvider.cs" />
+    <Compile Include="Progression\CSharpGraphProvider.cs" />
     <Compile Include="ProjectSystem\DeferredProjectWorkspaceService.cs" />
     <Compile Include="Remote\JsonRpcClient.cs" />
     <Compile Include="Remote\JsonRpcSession.cs" />
-- 
GitLab