diff --git a/build/Defaults/Net460/app.config b/build/Defaults/Net460/app.config
index 8db45c0c5c11bf1a57f4fd7c799a564bc7368a61..5194a2fa0a970167e76cd90303ec674dd26ac626 100644
--- a/build/Defaults/Net460/app.config
+++ b/build/Defaults/Net460/app.config
@@ -75,7 +75,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
       </dependentAssembly>
 
       <!-- Even though all of our references are to Dev15 binaries we are still pulling in BasicUndo
diff --git a/build/Defaults/Net462/app.config b/build/Defaults/Net462/app.config
index 65a0c73b38b43aa137a580c8ca422be871b100da..7f9cf2c4f51d1d850b00a6a09e2cea3faffa09bf 100644
--- a/build/Defaults/Net462/app.config
+++ b/build/Defaults/Net462/app.config
@@ -83,7 +83,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
       </dependentAssembly>
 
       <!-- Even though all of our references are to Dev15 binaries we are still pulling in BasicUndo
diff --git a/build/Targets/Packages.props b/build/Targets/Packages.props
index 6833448bd7223f6ba7b05cd3769b82a7758f6694..b4d06c6a6b167a1a8aeb6cbd59e78c746a77957e 100644
--- a/build/Targets/Packages.props
+++ b/build/Targets/Packages.props
@@ -41,7 +41,7 @@
     <MicrosoftDiaSymReaderPortablePdbVersion>1.3.0</MicrosoftDiaSymReaderPortablePdbVersion>
     <MicrosoftDotNetIBCMerge>4.7.2-alpha-00001</MicrosoftDotNetIBCMerge>
     <MicrosoftIdentityModelClientsActiveDirectoryVersion>3.13.8</MicrosoftIdentityModelClientsActiveDirectoryVersion>
-    <MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>15.0.26507-alpha</MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>
+    <MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>15.0.26606-alpha</MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>
     <MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>14.3.25407-alpha</MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>
     <MicrosoftMetadataVisualizerVersion>1.0.0-beta1-61531-03</MicrosoftMetadataVisualizerVersion>
     <MicrosoftMSXMLVersion>8.0.0.0-alpha</MicrosoftMSXMLVersion>
@@ -60,35 +60,35 @@
     <MicrosoftNetSdkVersion>2.0.0-alpha-20170405-2</MicrosoftNetSdkVersion>
     <MicrosoftNuGetBuildTasksVersion>0.1.0</MicrosoftNuGetBuildTasksVersion>
     <MicrosoftPortableTargetsVersion>0.1.2-dev</MicrosoftPortableTargetsVersion>
-    <MicrosoftServiceHubClientVersion>1.1.18-rc-g92b2150dd1</MicrosoftServiceHubClientVersion>
+    <MicrosoftServiceHubClientVersion>1.1.31-rc</MicrosoftServiceHubClientVersion>
     <MicrosoftTplDataflowVersion>4.5.24</MicrosoftTplDataflowVersion>
     <MicrosoftVisualBasicVersion>10.1.0</MicrosoftVisualBasicVersion>
-    <MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>15.0.26507-alpha</MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>
-    <MicrosoftVisualStudioCodeAnalysisSdkUIVersion>15.0.26507-alpha</MicrosoftVisualStudioCodeAnalysisSdkUIVersion>
-    <MicrosoftVisualStudioComponentModelHostVersion>15.0.26507-alpha</MicrosoftVisualStudioComponentModelHostVersion>
+    <MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>15.0.26606-alpha</MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>
+    <MicrosoftVisualStudioCodeAnalysisSdkUIVersion>15.0.26606-alpha</MicrosoftVisualStudioCodeAnalysisSdkUIVersion>
+    <MicrosoftVisualStudioComponentModelHostVersion>15.0.26606-alpha</MicrosoftVisualStudioComponentModelHostVersion>
     <MicrosoftVisualStudioCompositionVersion>15.0.66-rc</MicrosoftVisualStudioCompositionVersion>
-    <MicrosoftVisualStudioCoreUtilityVersion>15.0.26507-alpha</MicrosoftVisualStudioCoreUtilityVersion>
+    <MicrosoftVisualStudioCoreUtilityVersion>15.0.26606-alpha</MicrosoftVisualStudioCoreUtilityVersion>
     <MicrosoftVisualStudioDebuggerEngineVersion>15.0.26201-gamma</MicrosoftVisualStudioDebuggerEngineVersion>
     <MicrosoftVisualStudioDebuggerMetadataVersion>15.0.26201-gamma</MicrosoftVisualStudioDebuggerMetadataVersion>
     <MicrosoftVisualStudioDebuggerInterop100Version>10.0.30319</MicrosoftVisualStudioDebuggerInterop100Version>
     <MicrosoftVisualStudioDesignerInterfacesVersion>1.1.4322</MicrosoftVisualStudioDesignerInterfacesVersion>
-    <MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion>15.0.26507-alpha</MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion>
-    <MicrosoftVisualStudioEditorVersion>15.0.26507-alpha</MicrosoftVisualStudioEditorVersion>
-    <MicrosoftVisualStudioGraphModelVersion>15.0.26507-alpha</MicrosoftVisualStudioGraphModelVersion>
-    <MicrosoftVisualStudioImageCatalogVersion>15.0.26507-alpha</MicrosoftVisualStudioImageCatalogVersion>
-    <MicrosoftVisualStudioImagingVersion>15.0.26507-alpha</MicrosoftVisualStudioImagingVersion>
+    <MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion>15.0.26606-alpha</MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion>
+    <MicrosoftVisualStudioEditorVersion>15.0.26606-alpha</MicrosoftVisualStudioEditorVersion>
+    <MicrosoftVisualStudioGraphModelVersion>15.0.26606-alpha</MicrosoftVisualStudioGraphModelVersion>
+    <MicrosoftVisualStudioImageCatalogVersion>15.0.26606-alpha</MicrosoftVisualStudioImageCatalogVersion>
+    <MicrosoftVisualStudioImagingVersion>15.0.26606-alpha</MicrosoftVisualStudioImagingVersion>
     <MicrosoftVisualStudioImagingInterop140DesignTimeVersion>14.3.25407</MicrosoftVisualStudioImagingInterop140DesignTimeVersion>
     <MicrosoftVisualStudioInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioInteractiveWindowVersion>
-    <MicrosoftVisualStudioLanguageCallHierarchyVersion>15.0.26507-alpha</MicrosoftVisualStudioLanguageCallHierarchyVersion>
-    <MicrosoftVisualStudioLanguageIntellisenseVersion>15.0.26507-alpha</MicrosoftVisualStudioLanguageIntellisenseVersion>
-    <MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>15.0.26507-alpha</MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>
-    <MicrosoftVisualStudioLanguageStandardClassificationVersion>15.0.26507-alpha</MicrosoftVisualStudioLanguageStandardClassificationVersion>
+    <MicrosoftVisualStudioLanguageCallHierarchyVersion>15.0.26606-alpha</MicrosoftVisualStudioLanguageCallHierarchyVersion>
+    <MicrosoftVisualStudioLanguageIntellisenseVersion>15.0.26606-alpha</MicrosoftVisualStudioLanguageIntellisenseVersion>
+    <MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>15.0.26606-alpha</MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>
+    <MicrosoftVisualStudioLanguageStandardClassificationVersion>15.0.26606-alpha</MicrosoftVisualStudioLanguageStandardClassificationVersion>
     <MicrosoftVisualStudioOLEInteropVersion>7.10.6070</MicrosoftVisualStudioOLEInteropVersion>
-    <MicrosoftVisualStudioPlatformVSEditorVersion>15.0.26507-alpha</MicrosoftVisualStudioPlatformVSEditorVersion>
-    <MicrosoftVisualStudioPlatformVSEditorInteropVersion>15.0.26507-alpha</MicrosoftVisualStudioPlatformVSEditorInteropVersion>
-    <MicrosoftVisualStudioProgressionCodeSchemaVersion>15.0.26507-alpha</MicrosoftVisualStudioProgressionCodeSchemaVersion>
-    <MicrosoftVisualStudioProgressionCommonVersion>15.0.26507-alpha</MicrosoftVisualStudioProgressionCommonVersion>
-    <MicrosoftVisualStudioProgressionInterfacesVersion>15.0.26507-alpha</MicrosoftVisualStudioProgressionInterfacesVersion>
+    <MicrosoftVisualStudioPlatformVSEditorVersion>15.0.26606-alpha</MicrosoftVisualStudioPlatformVSEditorVersion>
+    <MicrosoftVisualStudioPlatformVSEditorInteropVersion>15.0.26606-alpha</MicrosoftVisualStudioPlatformVSEditorInteropVersion>
+    <MicrosoftVisualStudioProgressionCodeSchemaVersion>15.0.26606-alpha</MicrosoftVisualStudioProgressionCodeSchemaVersion>
+    <MicrosoftVisualStudioProgressionCommonVersion>15.0.26606-alpha</MicrosoftVisualStudioProgressionCommonVersion>
+    <MicrosoftVisualStudioProgressionInterfacesVersion>15.0.26606-alpha</MicrosoftVisualStudioProgressionInterfacesVersion>
     <MicrosoftVisualStudioProjectSystemVersion>15.3.178-pre-g209fb07c2e</MicrosoftVisualStudioProjectSystemVersion>
     <MicrosoftVisualStudioQualityToolsUnitTestFrameworkVersion>10.0.0.0-alpha</MicrosoftVisualStudioQualityToolsUnitTestFrameworkVersion>
     <MicrosoftVisualStudioRemoteControlVersion>14.0.249-master2E2DC10C</MicrosoftVisualStudioRemoteControlVersion>
@@ -96,32 +96,33 @@
     <MicrosoftVisualStudioSetupConfigurationNativex86Version>1.3.269-rc</MicrosoftVisualStudioSetupConfigurationNativex86Version>
     <MicrosoftVisualStudioSettings140Version>14.3.25407</MicrosoftVisualStudioSettings140Version>
     <MicrosoftVisualStudioShell140Version>14.3.25407</MicrosoftVisualStudioShell140Version>
-    <MicrosoftVisualStudioShell150Version>15.0.26507-alpha</MicrosoftVisualStudioShell150Version>
-    <MicrosoftVisualStudioShellDesignVersion>15.0.26507-alpha</MicrosoftVisualStudioShellDesignVersion>
-    <MicrosoftVisualStudioShellFrameworkVersion>15.0.26507-alpha</MicrosoftVisualStudioShellFrameworkVersion>
-    <MicrosoftVisualStudioShellImmutable100Version>15.0.26507-alpha</MicrosoftVisualStudioShellImmutable100Version>
+    <MicrosoftVisualStudioShell150Version>15.0.26606-alpha</MicrosoftVisualStudioShell150Version>
+    <MicrosoftVisualStudioShellDesignVersion>15.0.26606-alpha</MicrosoftVisualStudioShellDesignVersion>
+	  <MicrosoftVisualStudioShellInterop153DesignTimeVersion>15.0.26606-alpha</MicrosoftVisualStudioShellInterop153DesignTimeVersion>
+    <MicrosoftVisualStudioShellFrameworkVersion>15.0.26606-alpha</MicrosoftVisualStudioShellFrameworkVersion>
+    <MicrosoftVisualStudioShellImmutable100Version>15.0.26606-alpha</MicrosoftVisualStudioShellImmutable100Version>
     <MicrosoftVisualStudioShellImmutable110Version>15.0.25413-Preview5</MicrosoftVisualStudioShellImmutable110Version>
     <MicrosoftVisualStudioShellInteropVersion>7.10.6071</MicrosoftVisualStudioShellInteropVersion>
     <MicrosoftVisualStudioShellInterop100Version>10.0.30319</MicrosoftVisualStudioShellInterop100Version>
     <MicrosoftVisualStudioShellInterop110Version>11.0.61030</MicrosoftVisualStudioShellInterop110Version>
     <MicrosoftVisualStudioShellInterop121DesignTimeVersion>12.1.30328</MicrosoftVisualStudioShellInterop121DesignTimeVersion>
     <MicrosoftVisualStudioShellInterop140DesignTimeVersion>14.3.25407</MicrosoftVisualStudioShellInterop140DesignTimeVersion>
-    <MicrosoftVisualStudioShellInterop150DesignTimeVersion>15.0.26507-alpha</MicrosoftVisualStudioShellInterop150DesignTimeVersion>
+    <MicrosoftVisualStudioShellInterop150DesignTimeVersion>15.0.26606-alpha</MicrosoftVisualStudioShellInterop150DesignTimeVersion>
     <MicrosoftVisualStudioShellInterop80Version>8.0.50727</MicrosoftVisualStudioShellInterop80Version>
     <MicrosoftVisualStudioShellInterop90Version>9.0.30729</MicrosoftVisualStudioShellInterop90Version>
-    <MicrosoftVisualStudioTelemetryVersion>15.0.26507-alpha</MicrosoftVisualStudioTelemetryVersion>
+    <MicrosoftVisualStudioTelemetryVersion>15.0.26606-alpha</MicrosoftVisualStudioTelemetryVersion>
     <MicrosoftVisualStudioTemplateWizardInterfaceVersion>8.0.0.0-alpha</MicrosoftVisualStudioTemplateWizardInterfaceVersion>
-    <MicrosoftVisualStudioTextDataVersion>15.0.26507-alpha</MicrosoftVisualStudioTextDataVersion>
-    <MicrosoftVisualStudioTextInternalVersion>15.0.26507-alpha</MicrosoftVisualStudioTextInternalVersion>
-    <MicrosoftVisualStudioTextLogicVersion>15.0.26507-alpha</MicrosoftVisualStudioTextLogicVersion>
-    <MicrosoftVisualStudioTextUIVersion>15.0.26507-alpha</MicrosoftVisualStudioTextUIVersion>
-    <MicrosoftVisualStudioTextUIWpfVersion>15.0.26507-alpha</MicrosoftVisualStudioTextUIWpfVersion>
+    <MicrosoftVisualStudioTextDataVersion>15.0.26606-alpha</MicrosoftVisualStudioTextDataVersion>
+    <MicrosoftVisualStudioTextInternalVersion>15.0.26606-alpha</MicrosoftVisualStudioTextInternalVersion>
+    <MicrosoftVisualStudioTextLogicVersion>15.0.26606-alpha</MicrosoftVisualStudioTextLogicVersion>
+    <MicrosoftVisualStudioTextUIVersion>15.0.26606-alpha</MicrosoftVisualStudioTextUIVersion>
+    <MicrosoftVisualStudioTextUIWpfVersion>15.0.26606-alpha</MicrosoftVisualStudioTextUIWpfVersion>
     <MicrosoftVisualStudioTextManagerInteropVersion>7.10.6070</MicrosoftVisualStudioTextManagerInteropVersion>
     <MicrosoftVisualStudioTextManagerInterop100Version>10.0.30319</MicrosoftVisualStudioTextManagerInterop100Version>
     <MicrosoftVisualStudioTextManagerInterop120Version>12.0.30110</MicrosoftVisualStudioTextManagerInterop120Version>
     <MicrosoftVisualStudioTextManagerInterop121DesignTimeVersion>12.1.30328</MicrosoftVisualStudioTextManagerInterop121DesignTimeVersion>
     <MicrosoftVisualStudioThreadingVersion>15.3.20</MicrosoftVisualStudioThreadingVersion>
-    <MicrosoftVisualStudioUtilitiesVersion>15.0.26507-alpha</MicrosoftVisualStudioUtilitiesVersion>
+    <MicrosoftVisualStudioUtilitiesVersion>15.0.26606-alpha</MicrosoftVisualStudioUtilitiesVersion>
     <MicrosoftVisualStudioValidationVersion>15.3.15</MicrosoftVisualStudioValidationVersion>
     <MicrosoftVisualStudioVsInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioVsInteractiveWindowVersion>
     <MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
@@ -130,7 +131,7 @@
     <MoqVersion>4.2.1402.2112</MoqVersion>
     <NerdbankFullDuplexStreamVersion>1.0.1</NerdbankFullDuplexStreamVersion>
     <NETStandardLibraryVersion>1.6.1</NETStandardLibraryVersion>
-    <NewtonsoftJsonVersion>8.0.3</NewtonsoftJsonVersion>
+    <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
     <NuGetCommandLineVersion>2.8.5</NuGetCommandLineVersion>
     <NuGetCommandLineXPlatVersion>3.5.0-beta2-1484</NuGetCommandLineXPlatVersion>
     <NuGetVisualStudioVersion>4.0.0-rc-2048</NuGetVisualStudioVersion>
@@ -145,7 +146,7 @@
     <RoslynToolsMicrosoftVSIXExpInstallerVersion>0.4.0-beta</RoslynToolsMicrosoftVSIXExpInstallerVersion>
     <RoslynToolsReferenceAssembliesVersion>0.1.1</RoslynToolsReferenceAssembliesVersion>
     <RoslynMicrosoftVisualStudioExtensionManagerVersion>0.0.4</RoslynMicrosoftVisualStudioExtensionManagerVersion>
-    <StreamJsonRpcVersion>1.0.2-rc</StreamJsonRpcVersion>
+    <StreamJsonRpcVersion>1.1.73</StreamJsonRpcVersion>
     <SystemAppContextVersion>4.3.0</SystemAppContextVersion>
     <SystemCollectionsVersion>4.3.0</SystemCollectionsVersion>
     <SystemCollectionsConcurrentVersion>4.3.0</SystemCollectionsConcurrentVersion>
@@ -228,4 +229,4 @@
     <xunitrunnervisualstudioVersion>2.2.0-beta4-build1194</xunitrunnervisualstudioVersion>
   </PropertyGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Compilers/Extension/CompilerExtension.csproj b/src/Compilers/Extension/CompilerExtension.csproj
index ee0f23cc2b85ae166aff698905d94a560cd2eddf..f42791562d849cfefbbc87f7c2ac29fda3e2c3f3 100644
--- a/src/Compilers/Extension/CompilerExtension.csproj
+++ b/src/Compilers/Extension/CompilerExtension.csproj
@@ -171,6 +171,9 @@
     <PackageReference Include="Microsoft.VisualStudio.Utilities">
       <Version>$(MicrosoftVisualStudioUtilitiesVersion)</Version>
     </PackageReference>
+	<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime">
+		<Version>$(MicrosoftVisualStudioShellInterop153DesignTimeVersion)</Version>
+	</PackageReference>
   </ItemGroup>
   <Import Project="..\..\..\build\Targets\Imports.targets" />
 </Project>
diff --git a/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj b/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj
index 4369095c0de1408cd5472c9aee6b9c9703abbd91..eebe79e1fb7995d5de53759427300242270feae1 100644
--- a/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj
+++ b/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj
@@ -116,7 +116,9 @@
     <Compile Include="Formatting\Indentation\SmartTokenFormatterCommandHandler.cs" />
     <Compile Include="Formatting\Indentation\WhitespaceExtensions.cs" />
     <Compile Include="Formatting\CSharpEditorFormattingService.PasteFormattingRule.cs" />
+    <Compile Include="GoToDefinition\CSharpGoToDefinitionItemService.cs" />
     <Compile Include="GoToDefinition\CSharpGoToDefinitionService.cs" />
+    <Compile Include="GoToDefinition\CSharpGoToDefinitionSymbolService.cs" />
     <Compile Include="Highlighting\KeywordHighlighters\AbstractAsyncHighlighter.cs" />
     <Compile Include="Highlighting\KeywordHighlighters\AsyncAnonymousMethodHighlighter.cs" />
     <Compile Include="Highlighting\KeywordHighlighters\AsyncMethodHighlighter.cs" />
diff --git a/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionItemService.cs b/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionItemService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..40548e25f498d27e49ccc80f7ee36de00f5ff79a
--- /dev/null
+++ b/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionItemService.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editor.GoToDefinition;
+using Microsoft.CodeAnalysis.Host.Mef;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.GoToDefinition
+{
+    [ExportLanguageService(typeof(IGoToSymbolService), LanguageNames.CSharp), Shared]
+    internal class CSharpGoToDefinitionItemService : AbstractGoToDefinitionItemService
+    {
+    }
+}
diff --git a/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionService.cs b/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionService.cs
index 8df42b4b440b4f1084d50f9796235cb526a1d761..b58b6ccfd5c9d2bb6cc33817b77f08d3a706f5d6 100644
--- a/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionService.cs
+++ b/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionService.cs
@@ -18,10 +18,5 @@ internal class CSharpGoToDefinitionService : AbstractGoToDefinitionService
             : base(streamingPresenters)
         {
         }
-
-        protected override ISymbol FindRelatedExplicitlyDeclaredSymbol(ISymbol symbol, Compilation compilation)
-        {
-            return symbol;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionSymbolService.cs b/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionSymbolService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..d87c74057b0eb4789a789d7eebd26d7941f70bba
--- /dev/null
+++ b/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionSymbolService.cs
@@ -0,0 +1,20 @@
+// 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 Microsoft.CodeAnalysis.Editor.GoToDefinition;
+using Microsoft.CodeAnalysis.Editor.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.GoToDefinition
+{
+    [ExportLanguageService(typeof(IGoToDefinitionSymbolService), LanguageNames.CSharp), Shared]
+    internal class CSharpGoToDefinitionSymbolService : AbstractGoToDefinitionSymbolService
+    {
+        protected override ISymbol FindRelatedExplicitlyDeclaredSymbol(ISymbol symbol, Compilation compilation)
+        {
+            return symbol;
+        }
+    }
+}
diff --git a/src/EditorFeatures/Core/EditorFeatures.csproj b/src/EditorFeatures/Core/EditorFeatures.csproj
index db68ede2853f51f51bbb40116fbff1f916a99722..304c7df634c70146c202b8508ddb7cc03cb5628c 100644
--- a/src/EditorFeatures/Core/EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/EditorFeatures.csproj
@@ -161,6 +161,12 @@
     <Compile Include="FindUsages\IFindUsagesContext.cs" />
     <Compile Include="FindUsages\IFindUsagesService.cs" />
     <Compile Include="FindUsages\SimpleFindUsagesContext.cs" />
+    <Compile Include="GoToDefinition\AbstractGoToDefinitionItemService.cs" />
+    <Compile Include="GoToDefinition\AbstractGoToDefinitionSymbolService.cs" />
+    <Compile Include="GoToDefinition\GoToDefinitionContext.cs" />
+    <Compile Include="GoToDefinition\IGoToDefinitionSymbolService.cs" />
+    <Compile Include="GoToDefinition\IGoToSymbolService.cs" />
+    <Compile Include="GoToDefinition\WellKnownDefinitionTypes.cs" />
     <Compile Include="Implementation\InlineRename\Dashboard\DashboardAutomationPeer.cs" />
     <Compile Include="Implementation\InlineRename\HighlightTags\RenameConflictTag.cs" />
     <Compile Include="Implementation\InlineRename\HighlightTags\RenameConflictTagDefinition.cs" />
diff --git a/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionItemService.cs b/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionItemService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..7b74101ecab65c7bf7b93425b768f3d782a0f6ac
--- /dev/null
+++ b/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionItemService.cs
@@ -0,0 +1,48 @@
+// 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 System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editor.FindUsages;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.FindUsages;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace Microsoft.CodeAnalysis.Editor.GoToDefinition
+{
+    internal abstract class AbstractGoToDefinitionItemService : ForegroundThreadAffinitizedObject, IGoToSymbolService
+    {
+        public async Task GetDefinitionsAsync(GoToDefinitionContext context)
+        {
+            var document = context.Document;
+            var position = context.Position;
+            var cancellationToken = context.CancellationToken;
+
+            var service = document.GetLanguageService<IGoToDefinitionSymbolService>();
+            var (symbol, span) = await service.GetSymbolAndBoundSpanAsync(document, position, cancellationToken).ConfigureAwait(false);
+
+            if (symbol == null)
+            {
+                return;
+            }
+
+            // We want ctrl-click GTD to be as close to regular GTD as possible.
+            // This means we have to query for "third party navigation", from
+            // XAML, etc. That call has to be done on the UI thread.
+            var definitions = await Task.Factory.StartNew(() =>
+                GoToDefinitionHelpers.GetDefinitions(symbol, document.Project, thirdPartyNavigationAllowed: true, cancellationToken: cancellationToken)
+                .WhereAsArray(d => d.CanNavigateTo(document.Project.Solution.Workspace)),
+                cancellationToken,
+                TaskCreationOptions.None,
+                ForegroundTaskScheduler).ConfigureAwait(false);
+
+            foreach (var definition in definitions)
+            {
+                context.AddItem(WellKnownDefinitionTypes.Definition, definition);
+            }
+
+            context.Span = span;
+        }
+    }
+}
diff --git a/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionService.cs b/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionService.cs
index e96091c18688b0033ac3d993e66b95f657152725..0181b7c8ef9a76f221a104d2c0561d43da83d7b6 100644
--- a/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionService.cs
+++ b/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionService.cs
@@ -6,7 +6,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor.Host;
-using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Navigation;
 using Microsoft.CodeAnalysis.Shared.Extensions;
@@ -18,42 +17,17 @@ internal abstract class AbstractGoToDefinitionService : IGoToDefinitionService
     {
         private readonly IEnumerable<Lazy<IStreamingFindUsagesPresenter>> _streamingPresenters;
 
-        protected abstract ISymbol FindRelatedExplicitlyDeclaredSymbol(ISymbol symbol, Compilation compilation);
-
         protected AbstractGoToDefinitionService(
             IEnumerable<Lazy<IStreamingFindUsagesPresenter>> streamingPresenters)
         {
             _streamingPresenters = streamingPresenters;
         }
 
-        private async Task<ISymbol> FindSymbolAsync(Document document, int position, CancellationToken cancellationToken)
-        {
-            if (!document.SupportsSemanticModel)
-            {
-                return null;
-            }
-
-            var workspace = document.Project.Solution.Workspace;
-
-            var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            var semanticInfo = await SymbolFinder.GetSemanticInfoAtPositionAsync(semanticModel, position, workspace, cancellationToken).ConfigureAwait(false);
-
-            // prefer references to declarations.  It's more likely that the user is attempting to 
-            // go to a definition at some other location, rather than the definition they're on.  
-            // This can happen when a token is at a location that is both a reference and a definition.
-            // For example, on an anonymous type member declaration.
-            var symbol = semanticInfo.AliasSymbol ??
-                         semanticInfo.ReferencedSymbols.FirstOrDefault() ??
-                         semanticInfo.DeclaredSymbol ??
-                         semanticInfo.Type;
-
-            return FindRelatedExplicitlyDeclaredSymbol(symbol, semanticModel.Compilation);
-        }
-
         public async Task<IEnumerable<INavigableItem>> FindDefinitionsAsync(
             Document document, int position, CancellationToken cancellationToken)
         {
-            var symbol = await FindSymbolAsync(document, position, cancellationToken).ConfigureAwait(false);
+            var symbolService = document.GetLanguageService<IGoToDefinitionSymbolService>();
+            var (symbol, span) = await symbolService.GetSymbolAndBoundSpanAsync(document, position, cancellationToken).ConfigureAwait(false);
 
             // Try to compute source definitions from symbol.
             var items = symbol != null
@@ -68,7 +42,8 @@ private async Task<ISymbol> FindSymbolAsync(Document document, int position, Can
         public bool TryGoToDefinition(Document document, int position, CancellationToken cancellationToken)
         {
             // First try to compute the referenced symbol and attempt to go to definition for the symbol.
-            var symbol = FindSymbolAsync(document, position, cancellationToken).WaitAndGetResult(cancellationToken);
+            var symbolService = document.GetLanguageService<IGoToDefinitionSymbolService>();
+            var (symbol, span) = symbolService.GetSymbolAndBoundSpanAsync(document, position, cancellationToken).WaitAndGetResult(cancellationToken);
             if (symbol == null)
             {
                 return false;
diff --git a/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionSymbolService.cs b/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionSymbolService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..ef984af83835c5f885fea3d4aa1751132ec8de42
--- /dev/null
+++ b/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionSymbolService.cs
@@ -0,0 +1,35 @@
+// 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.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.GoToDefinition
+{
+    internal abstract class AbstractGoToDefinitionSymbolService : IGoToDefinitionSymbolService
+    {
+        protected abstract ISymbol FindRelatedExplicitlyDeclaredSymbol(ISymbol symbol, Compilation compilation);
+
+        public async Task<(ISymbol, TextSpan)> GetSymbolAndBoundSpanAsync(Document document, int position, CancellationToken cancellationToken)
+        {
+            var workspace = document.Project.Solution.Workspace;
+
+            var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            var semanticInfo = await SymbolFinder.GetSemanticInfoAtPositionAsync(semanticModel, position, workspace, cancellationToken).ConfigureAwait(false);
+
+            // prefer references to declarations.  It's more likely that the user is attempting to 
+            // go to a definition at some other location, rather than the definition they're on.  
+            // This can happen when a token is at a location that is both a reference and a definition.
+            // For example, on an anonymous type member declaration.
+            var symbol = semanticInfo.AliasSymbol ??
+                         semanticInfo.ReferencedSymbols.FirstOrDefault() ??
+                         semanticInfo.DeclaredSymbol ??
+                         semanticInfo.Type;
+
+            return (FindRelatedExplicitlyDeclaredSymbol(symbol, semanticModel.Compilation), semanticInfo.Span);
+        }
+    }
+}
diff --git a/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionContext.cs b/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionContext.cs
new file mode 100644
index 0000000000000000000000000000000000000000..40f576903bf650f067e66483966c40a92b85d0eb
--- /dev/null
+++ b/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionContext.cs
@@ -0,0 +1,43 @@
+// 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.Threading;
+using Microsoft.CodeAnalysis.FindUsages;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.GoToDefinition
+{
+    internal class GoToDefinitionContext
+    {
+        private readonly object _gate = new object();
+
+        private readonly Dictionary<string, List<DefinitionItem>> _items = new Dictionary<string, List<DefinitionItem>>();
+
+        public GoToDefinitionContext(Document document, int position, CancellationToken cancellationToken)
+        {
+            Document = document;
+            Position = position;
+            CancellationToken = cancellationToken;
+        }
+
+        public Document Document { get; }
+        public int Position { get; }
+        public CancellationToken CancellationToken { get; }
+
+        public IReadOnlyDictionary<string, List<DefinitionItem>> Items => _items;
+        public TextSpan Span { get; set; }
+
+        public void AddItem(string key, DefinitionItem item)
+        {
+            lock (_gate)
+            {
+                if (!_items.ContainsKey(key))
+                {
+                    _items[key] = new List<DefinitionItem>();
+                }
+
+                _items[key].Add(item);
+            }
+        }
+    }
+}
diff --git a/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionHelpers.cs b/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionHelpers.cs
index fc576377d12941d5bf4adf44294545ef4627d486..613fa7a604766d9b87bfd897e267bf2bc8bcefc1 100644
--- a/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionHelpers.cs
+++ b/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionHelpers.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis.Editor.FindUsages;
@@ -15,13 +16,11 @@ namespace Microsoft.CodeAnalysis.Editor.GoToDefinition
 {
     internal static class GoToDefinitionHelpers
     {
-        public static bool TryGoToDefinition(
+        public static ImmutableArray<DefinitionItem> GetDefinitions(
             ISymbol symbol,
             Project project,
-            IEnumerable<Lazy<IStreamingFindUsagesPresenter>> streamingPresenters,
-            CancellationToken cancellationToken,
-            bool thirdPartyNavigationAllowed = true,
-            bool throwOnHiddenDefinition = false)
+            bool thirdPartyNavigationAllowed,
+            CancellationToken cancellationToken)
         {
             var alias = symbol as IAliasSymbol;
             if (alias != null)
@@ -29,7 +28,7 @@ internal static class GoToDefinitionHelpers
                 var ns = alias.Target as INamespaceSymbol;
                 if (ns != null && ns.IsGlobalNamespace)
                 {
-                    return false;
+                    return ImmutableArray.Create<DefinitionItem>();
                 }
             }
 
@@ -91,13 +90,43 @@ internal static class GoToDefinitionHelpers
             }
 
             definitions.Add(definitionItem);
+            return definitions.ToImmutableAndFree();
+        }
+
+        public static bool TryGoToDefinition(
+            ISymbol symbol,
+            Project project,
+            IEnumerable<Lazy<IStreamingFindUsagesPresenter>> streamingPresenters,
+            CancellationToken cancellationToken,
+            bool thirdPartyNavigationAllowed = true,
+            bool throwOnHiddenDefinition = false)
+        {
+            var definitions = GetDefinitions(symbol, project, thirdPartyNavigationAllowed, cancellationToken);
 
             var presenter = streamingPresenters.FirstOrDefault()?.Value;
             var title = string.Format(EditorFeaturesResources._0_declarations,
                 FindUsagesHelpers.GetDisplayName(symbol));
 
             return presenter.TryNavigateToOrPresentItemsAsync(
-                project.Solution.Workspace, title, definitions.ToImmutableAndFree()).WaitAndGetResult(cancellationToken);
+                project.Solution.Workspace, title, definitions).WaitAndGetResult(cancellationToken);
+        }
+
+        public static bool TryGoToDefinition(
+            ImmutableArray<DefinitionItem> definitions,
+            Project project,
+            string title,
+            IEnumerable<Lazy<IStreamingFindUsagesPresenter>> streamingPresenters,
+            CancellationToken cancellationToken)
+        {
+            if (definitions.IsDefaultOrEmpty)
+            {
+                return false;
+            }
+
+            var presenter = streamingPresenters.FirstOrDefault()?.Value;
+
+            return presenter.TryNavigateToOrPresentItemsAsync(
+                project.Solution.Workspace, title, definitions).WaitAndGetResult(cancellationToken);
         }
     }
 }
\ No newline at end of file
diff --git a/src/EditorFeatures/Core/GoToDefinition/IGoToDefinitionSymbolService.cs b/src/EditorFeatures/Core/GoToDefinition/IGoToDefinitionSymbolService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..99a30194235f74dc51dfe3c9e9477a4de48d072b
--- /dev/null
+++ b/src/EditorFeatures/Core/GoToDefinition/IGoToDefinitionSymbolService.cs
@@ -0,0 +1,14 @@
+// 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.Host;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.GoToDefinition
+{
+    internal interface IGoToDefinitionSymbolService : ILanguageService
+    {
+        Task<(ISymbol, TextSpan)> GetSymbolAndBoundSpanAsync(Document document, int position, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/EditorFeatures/Core/GoToDefinition/IGoToSymbolService.cs b/src/EditorFeatures/Core/GoToDefinition/IGoToSymbolService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..59b5e560f71020b4abd16f5cad2340e2a9f8ac98
--- /dev/null
+++ b/src/EditorFeatures/Core/GoToDefinition/IGoToSymbolService.cs
@@ -0,0 +1,18 @@
+// 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.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Host;
+
+namespace Microsoft.CodeAnalysis.Editor.GoToDefinition
+{
+    internal interface IGoToSymbolService : ILanguageService
+    {
+        Task GetDefinitionsAsync(GoToDefinitionContext context);
+    }
+}
diff --git a/src/EditorFeatures/Core/GoToDefinition/WellKnownDefinitionTypes.cs b/src/EditorFeatures/Core/GoToDefinition/WellKnownDefinitionTypes.cs
new file mode 100644
index 0000000000000000000000000000000000000000..7de843a6cc9b8ec09b976439a59f67a9cecfd3d2
--- /dev/null
+++ b/src/EditorFeatures/Core/GoToDefinition/WellKnownDefinitionTypes.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+
+namespace Microsoft.CodeAnalysis.Editor.GoToDefinition
+{
+    internal class WellKnownDefinitionTypes
+    {
+        public const string Definition = nameof(Definition);
+    }
+}
diff --git a/src/EditorFeatures/Core/NavigableSymbols/NavigableSymbolService.NavigableSymbol.cs b/src/EditorFeatures/Core/NavigableSymbols/NavigableSymbolService.NavigableSymbol.cs
new file mode 100644
index 0000000000000000000000000000000000000000..94921c91aca09fe1544849f843292dffa4db64d1
--- /dev/null
+++ b/src/EditorFeatures/Core/NavigableSymbols/NavigableSymbolService.NavigableSymbol.cs
@@ -0,0 +1,61 @@
+// 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 Microsoft.CodeAnalysis.Editor.GoToDefinition;
+using Microsoft.CodeAnalysis.Editor.Host;
+using Microsoft.CodeAnalysis.FindUsages;
+using Microsoft.VisualStudio.Language.Intellisense;
+using Microsoft.VisualStudio.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.NavigableSymbols
+{
+    internal partial class NavigableSymbolService
+    {
+        private class NavigableSymbol : INavigableSymbol
+        {
+            private readonly ImmutableArray<DefinitionItem> _definitions;
+            private readonly SnapshotSpan _span;
+            private readonly Document _document;
+            private readonly IEnumerable<Lazy<IStreamingFindUsagesPresenter>> _presenters;
+            private readonly IWaitIndicator _waitIndicator;
+
+            public NavigableSymbol(
+                ImmutableArray<DefinitionItem> definitions,
+                SnapshotSpan span,
+                Document document,
+                IEnumerable<Lazy<IStreamingFindUsagesPresenter>> streamingPresenters,
+                IWaitIndicator waitIndicator)
+            {
+                Contract.ThrowIfFalse(definitions.Length > 0);
+
+                _definitions = definitions;
+                _span = span;
+                _document = document;
+                _presenters = streamingPresenters;
+                _waitIndicator = waitIndicator;
+            }
+
+            public SnapshotSpan SymbolSpan => _span;
+
+            public IEnumerable<INavigableRelationship> Relationships =>
+                SpecializedCollections.SingletonEnumerable(PredefinedNavigableRelationships.Definition);
+
+            public void Navigate(INavigableRelationship relationship) =>
+                _waitIndicator.Wait(
+                    title: EditorFeaturesResources.Go_to_Definition,
+                    message: EditorFeaturesResources.Navigating_to_definition,
+                    allowCancel: true,
+                    showProgress: false,
+                    action: context => GoToDefinitionHelpers.TryGoToDefinition(
+                        _definitions,
+                        _document.Project,
+                        _definitions[0].NameDisplayParts.GetFullText(),
+                        _presenters,
+                        context.CancellationToken)
+                    );
+        }
+    }
+}
diff --git a/src/EditorFeatures/Core/NavigableSymbols/NavigableSymbolService.NavigableSymbolSource.cs b/src/EditorFeatures/Core/NavigableSymbols/NavigableSymbolService.NavigableSymbolSource.cs
new file mode 100644
index 0000000000000000000000000000000000000000..418279a87be0ac297bc3c3e43a872b136096312e
--- /dev/null
+++ b/src/EditorFeatures/Core/NavigableSymbols/NavigableSymbolService.NavigableSymbolSource.cs
@@ -0,0 +1,76 @@
+// 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 System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editor.GoToDefinition;
+using Microsoft.CodeAnalysis.Editor.Host;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.Language.Intellisense;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
+
+namespace Microsoft.CodeAnalysis.Editor.NavigableSymbols
+{
+    internal partial class NavigableSymbolService
+    {
+        private partial class NavigableSymbolSource : INavigableSymbolSource
+        {
+            private readonly IEnumerable<Lazy<IStreamingFindUsagesPresenter>> _presenters;
+            private readonly IWaitIndicator _waitIndicator;
+
+            private bool _disposed;
+
+            public NavigableSymbolSource(
+                IEnumerable<Lazy<IStreamingFindUsagesPresenter>> streamingPresenters,
+                IWaitIndicator waitIndicator)
+            {
+                _presenters = streamingPresenters;
+                _waitIndicator = waitIndicator;
+            }
+
+            public void Dispose()
+            {
+                _disposed = true;
+            }
+
+            public async Task<INavigableSymbol> GetNavigableSymbolAsync(SnapshotSpan triggerSpan, CancellationToken cancellationToken)
+            {
+                if (_disposed)
+                {
+                    return null;
+                }
+
+                var snapshot = triggerSpan.Snapshot;
+                var position = triggerSpan.Start;
+                var document = snapshot.GetOpenDocumentInCurrentContextWithChanges();
+                if (document == null)
+                {
+                    return null;
+                }
+
+                var service = document.GetLanguageService<IGoToSymbolService>();
+
+                var context = new GoToDefinitionContext(
+                    document, 
+                    position, 
+                    cancellationToken: cancellationToken);
+
+                await service.GetDefinitionsAsync(context).ConfigureAwait(false);
+
+                if (!context.Items.TryGetValue(WellKnownDefinitionTypes.Definition, out var definitions))
+                {
+                    return null;
+                }
+
+                var span = context.Span;
+                var snapshotSpan = new SnapshotSpan(snapshot, span.Start, span.Length);
+                return new NavigableSymbol(definitions.ToImmutableArray(), snapshotSpan, document, _presenters, _waitIndicator);
+            }
+        }
+    }
+}
diff --git a/src/EditorFeatures/Core/NavigableSymbols/NavigableSymbolService.cs b/src/EditorFeatures/Core/NavigableSymbols/NavigableSymbolService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..c1b6c945ea297d6627b1e82c081682352bb7d93d
--- /dev/null
+++ b/src/EditorFeatures/Core/NavigableSymbols/NavigableSymbolService.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;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using Microsoft.CodeAnalysis.Editor.Host;
+using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
+using Microsoft.VisualStudio.Language.Intellisense;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.NavigableSymbols
+{
+    [Export(typeof(INavigableSymbolSourceProvider))]
+    [Name(nameof(NavigableSymbolService))]
+    [ContentType(ContentTypeNames.RoslynContentType)]
+    internal partial class NavigableSymbolService : INavigableSymbolSourceProvider
+    {
+        private static readonly object s_key = new object();
+        private readonly IEnumerable<Lazy<IStreamingFindUsagesPresenter>> _streamingPresenters;
+        private readonly IWaitIndicator _waitIndicator;
+
+        [ImportingConstructor]
+        public NavigableSymbolService(
+            IWaitIndicator waitIndicator,
+            [ImportMany] IEnumerable<Lazy<IStreamingFindUsagesPresenter>> streamingPresenters)
+        {
+            _waitIndicator = waitIndicator;
+            _streamingPresenters = streamingPresenters;
+        }
+
+        public INavigableSymbolSource TryCreateNavigableSymbolSource(ITextView textView, ITextBuffer buffer)
+        {
+            return textView.GetOrCreatePerSubjectBufferProperty(buffer, s_key,
+                (v, b) => new NavigableSymbolSource(_streamingPresenters, _waitIndicator));
+        }
+    }
+}
diff --git a/src/EditorFeatures/Test/CommentSelection/CommentUncommentSelectionCommandHandlerTests.cs b/src/EditorFeatures/Test/CommentSelection/CommentUncommentSelectionCommandHandlerTests.cs
index c0d9e5b4ef04838a27cfc9944b5a3979923455f3..34a2d8aa63f72fb03f8184b37f189fab104c7977 100644
--- a/src/EditorFeatures/Test/CommentSelection/CommentUncommentSelectionCommandHandlerTests.cs
+++ b/src/EditorFeatures/Test/CommentSelection/CommentUncommentSelectionCommandHandlerTests.cs
@@ -562,7 +562,7 @@ private static void CommentSelection(ITextView textView, IEnumerable<TextChange>
             commandHandler.CollectEdits(service,
                 textView.Selection.GetSnapshotSpansOnBuffer(textView.TextBuffer), textChanges, trackingSpans, operation);
 
-            AssertEx.SetEqual(expectedChanges, textChanges);
+            Roslyn.Test.Utilities.AssertEx.SetEqual(expectedChanges, textChanges);
 
             // Actually apply the edit to let the tracking spans adjust.
             using (var edit = textView.TextBuffer.CreateEdit())
@@ -579,7 +579,7 @@ private static void CommentSelection(ITextView textView, IEnumerable<TextChange>
 
             if (expectedSelectedSpans != null)
             {
-                AssertEx.Equal(expectedSelectedSpans, textView.Selection.SelectedSpans.Select(snapshotSpan => snapshotSpan.Span));
+                Roslyn.Test.Utilities.AssertEx.Equal(expectedSelectedSpans, textView.Selection.SelectedSpans.Select(snapshotSpan => snapshotSpan.Span));
             }
         }
 
diff --git a/src/EditorFeatures/Test/Utilities/PatternMatcherTests.cs b/src/EditorFeatures/Test/Utilities/PatternMatcherTests.cs
index 90d1201e9bb4da9cd2d6a69977ac7e26417ea8e9..363f23f778bdeb7b13683ed2b050dd8a4c6372c8 100644
--- a/src/EditorFeatures/Test/Utilities/PatternMatcherTests.cs
+++ b/src/EditorFeatures/Test/Utilities/PatternMatcherTests.cs
@@ -159,12 +159,12 @@ public void BreakIntoWordParts_TwoUppercaseCharacters()
 
         private void VerifyBreakIntoWordParts(string original, params string[] parts)
         {
-            AssertEx.Equal(parts, BreakIntoWordParts(original));
+            Roslyn.Test.Utilities.AssertEx.Equal(parts, BreakIntoWordParts(original));
         }
 
         private void VerifyBreakIntoCharacterParts(string original, params string[] parts)
         {
-            AssertEx.Equal(parts, BreakIntoCharacterParts(original));
+            Roslyn.Test.Utilities.AssertEx.Equal(parts, BreakIntoCharacterParts(original));
         }
 
         private const bool CaseSensitive = true;
diff --git a/src/EditorFeatures/Test2/NavigableSymbols/NavigableSymbolsTest.vb b/src/EditorFeatures/Test2/NavigableSymbols/NavigableSymbolsTest.vb
new file mode 100644
index 0000000000000000000000000000000000000000..5c3d2ecaee32386835d386bceac6418a966f5000
--- /dev/null
+++ b/src/EditorFeatures/Test2/NavigableSymbols/NavigableSymbolsTest.vb
@@ -0,0 +1,73 @@
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+Imports System
+Imports System.Linq
+Imports System.Threading
+Imports System.Threading.Tasks
+Imports Microsoft.CodeAnalysis.Editor.Host
+Imports Microsoft.CodeAnalysis.Editor.NavigableSymbols
+Imports Microsoft.CodeAnalysis.Editor.UnitTests.BraceMatching
+Imports Microsoft.CodeAnalysis.Editor.UnitTests.Utilities
+Imports Microsoft.CodeAnalysis.Editor.UnitTests.Utilities.GoToHelpers
+Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
+Imports Microsoft.CodeAnalysis.Navigation
+Imports Microsoft.VisualStudio.Composition
+Imports Microsoft.VisualStudio.Text
+Imports Roslyn.Test.Utilities
+Imports Xunit
+
+Namespace Microsoft.CodeAnalysis.Editor.UnitTests.NavigableSymbols
+
+    Public Class NavigableSymbolsTest
+
+        Private Shared ReadOnly s_exportProvider As ExportProvider = MinimalTestExportProvider.CreateExportProvider(
+            TestExportProvider.EntireAssemblyCatalogWithCSharpAndVisualBasic.WithParts(
+                GetType(MockDocumentNavigationServiceProvider),
+                GetType(MockSymbolNavigationServiceProvider)))
+
+        <WpfFact>
+        Public Async Function TestCharp() As Task
+            Using workspace = TestWorkspace.CreateCSharp("
+class C
+{
+    C$$ c
+}", exportProvider:=s_exportProvider)
+
+
+                Await TestNavigated(workspace)
+            End Using
+        End Function
+
+        <WpfFact>
+        Public Async Function TestVB() As Task
+            Using workspace = TestWorkspace.CreateVisualBasic("
+Class C
+    Dim c as C$$
+End Class", exportProvider:=s_exportProvider)
+
+
+                Await TestNavigated(workspace)
+            End Using
+        End Function
+
+        Private Async Function TestNavigated(workspace As TestWorkspace) As Task
+
+            Dim presenter = {New Lazy(Of IStreamingFindUsagesPresenter)(Function() New MockStreamingFindUsagesPresenter(Sub() Return))}
+            Dim service = New NavigableSymbolService(TestWaitIndicator.Default, presenter)
+            Dim view = workspace.Documents.First().GetTextView()
+            Dim Buffer = workspace.Documents.First().GetTextBuffer()
+            Dim caretPosition = view.Caret.Position.BufferPosition.Position
+            Dim Span = New SnapshotSpan(Buffer.CurrentSnapshot, New Span(caretPosition, 0))
+            Dim source = service.TryCreateNavigableSymbolSource(view, Buffer)
+            Dim symbol = Await source.GetNavigableSymbolAsync(Span, CancellationToken.None)
+
+            Assert.NotNull(symbol)
+            symbol.Navigate(symbol.Relationships.First())
+
+            Dim navigationService = DirectCast(workspace.Services.GetService(Of IDocumentNavigationService)(), MockDocumentNavigationServiceProvider.MockDocumentNavigationService)
+            Assert.Equal(True, navigationService.TryNavigateToLineAndOffsetReturnValue)
+            Assert.Equal(True, navigationService.TryNavigateToPositionReturnValue)
+            Assert.Equal(True, navigationService.TryNavigateToSpanReturnValue)
+        End Function
+    End Class
+End Namespace
diff --git a/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs b/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs
index 0332c0c778e8ffaf1fe48a261aba72a2156b7e38..228928231472a4b6f2982867021c07240ac0b033 100644
--- a/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs
+++ b/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs
@@ -15,7 +15,17 @@ public static DisposableTextView CreateDisposableTextView(this ITextEditorFactor
 
         public static DisposableTextView CreateDisposableTextView(this ITextEditorFactoryService textEditorFactory, ITextBuffer buffer)
         {
-            return new DisposableTextView(textEditorFactory.CreateTextView(buffer));
+            // Every default role but outlining. Starting in 15.2, the editor
+            // OutliningManager imports JoinableTaskContext in a way that's 
+            // difficult to satisfy in our unit tests. Since we don't directly
+            // depend on it, just disable it
+            var roles = textEditorFactory.CreateTextViewRoleSet(PredefinedTextViewRoles.Analyzable,
+                PredefinedTextViewRoles.Document,
+                PredefinedTextViewRoles.Editable,
+                PredefinedTextViewRoles.Interactive,
+                PredefinedTextViewRoles.Zoomable);
+
+            return new DisposableTextView(textEditorFactory.CreateTextView(buffer, roles));
         }
     }
 
diff --git a/src/EditorFeatures/TestUtilities/Workspaces/TestHostDocument.cs b/src/EditorFeatures/TestUtilities/Workspaces/TestHostDocument.cs
index ff7fc26918752bc332b206cba83cd64de6b92654..7606af0ebed6abd2485f3e0bf5afbafea920e6db 100644
--- a/src/EditorFeatures/TestUtilities/Workspaces/TestHostDocument.cs
+++ b/src/EditorFeatures/TestUtilities/Workspaces/TestHostDocument.cs
@@ -135,8 +135,8 @@ public bool IsGenerated
         }
 
         public TestHostDocument(
-            string text = "", string displayName = "", 
-            SourceCodeKind sourceCodeKind = SourceCodeKind.Regular, 
+            string text = "", string displayName = "",
+            SourceCodeKind sourceCodeKind = SourceCodeKind.Regular,
             DocumentId id = null, string filePath = null,
             IReadOnlyList<string> folders = null)
         {
@@ -194,7 +194,7 @@ public override Task<TextAndVersion> LoadTextAndVersionAsync(Workspace workspace
                 return Task.FromResult(TextAndVersion.Create(text, VersionStamp.Create(), _hostDocument.FilePath));
             }
         }
-        
+
         public IWpfTextView GetTextView()
         {
             if (_textView == null)
@@ -203,7 +203,18 @@ public IWpfTextView GetTextView()
 
                 WpfTestCase.RequireWpfFact($"Creates an IWpfTextView through {nameof(TestHostDocument)}.{nameof(GetTextView)}");
 
-                _textView = _exportProvider.GetExportedValue<ITextEditorFactoryService>().CreateTextView(this.TextBuffer);
+                var factory = _exportProvider.GetExportedValue<ITextEditorFactoryService>();
+
+                // Every default role but outlining. Starting in 15.2, the editor
+                // OutliningManager imports JoinableTaskContext in a way that's 
+                // difficult to satisfy in our unit tests. Since we don't directly
+                // depend on it, just disable it
+                var roles = factory.CreateTextViewRoleSet(PredefinedTextViewRoles.Analyzable,
+                    PredefinedTextViewRoles.Document,
+                    PredefinedTextViewRoles.Editable,
+                    PredefinedTextViewRoles.Interactive,
+                    PredefinedTextViewRoles.Zoomable);
+                _textView = factory.CreateTextView(this.TextBuffer, roles);
                 if (this.CursorPosition.HasValue)
                 {
                     _textView.Caret.MoveTo(new SnapshotPoint(_textView.TextSnapshot, CursorPosition.Value));
diff --git a/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj b/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj
index 8be12b57b5585b8d8fb654e908c46ab891792f3d..96ff80e86d2b7e9b1b0bd47a4088d50b897bb037 100644
--- a/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj
+++ b/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj
@@ -151,6 +151,7 @@
   <ItemGroup>
     <InternalsVisibleToTest Include="Roslyn.VisualStudio.Services.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor2.UnitTests" />
+    <InternalsVisibleToTest Include="Roslyn.Services.Editor.UnitTests" />
   </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.CodeAnalysis.Editor" />
diff --git a/src/EditorFeatures/TestUtilities2/Utilities/GoToHelpers/GoToTestHelpers.vb b/src/EditorFeatures/TestUtilities2/Utilities/GoToHelpers/GoToTestHelpers.vb
index c7c42d392eab78c24902d5a0abe5aea146f31883..3f29c283b4a991a58c9e28d066dbf5fa6b5a124f 100644
--- a/src/EditorFeatures/TestUtilities2/Utilities/GoToHelpers/GoToTestHelpers.vb
+++ b/src/EditorFeatures/TestUtilities2/Utilities/GoToHelpers/GoToTestHelpers.vb
@@ -1,5 +1,7 @@
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+Imports Microsoft.CodeAnalysis.Editor.CSharp.GoToDefinition
+Imports Microsoft.CodeAnalysis.Editor.VisualBasic.GoToDefinition
 Imports Microsoft.CodeAnalysis.Editor.Host
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
 Imports Microsoft.CodeAnalysis.GeneratedCodeRecognition
@@ -13,7 +15,9 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Utilities.GoToHelpers
         Public ReadOnly Catalog As ComposableCatalog = TestExportProvider.MinimumCatalogWithCSharpAndVisualBasic.WithParts(
                         GetType(MockDocumentNavigationServiceFactory),
                         GetType(DefaultSymbolNavigationServiceFactory),
-                        GetType(GeneratedCodeRecognitionService))
+                        GetType(GeneratedCodeRecognitionService),
+                        GetType(CSharpGoToDefinitionSymbolService),
+                        GetType(VisualBasicGoToDefinitionSymbolService))
 
         Public ReadOnly ExportProvider As ExportProvider = MinimalTestExportProvider.CreateExportProvider(Catalog)
 
diff --git a/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj b/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj
index 79ee5ff8d6c4c5c8d8f86bde27d5f0717bb94426..9f4e8c1ec32907d7317d503dc4d67c541fd17123 100644
--- a/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj
+++ b/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj
@@ -97,7 +97,9 @@
     <Compile Include="Formatting\Indentation\SpecialFormattingOperation.vb" />
     <Compile Include="Formatting\Indentation\VisualBasicIndentationService.Indenter.vb" />
     <Compile Include="Formatting\Indentation\VisualBasicIndentationService.vb" />
+    <Compile Include="GoToDefinition\VisualBasicGoToDefinitionItemService.vb" />
     <Compile Include="GoToDefinition\VisualBasicGoToDefinitionService.vb" />
+    <Compile Include="GoToDefinition\VisualBasicGoToDefinitionSymbolService.vb" />
     <Compile Include="Highlighting\KeywordHighlighters\AccessorDeclarationHighlighter.vb" />
     <Compile Include="Highlighting\KeywordHighlighters\ConditionalPreprocessorHighlighter.vb" />
     <Compile Include="Highlighting\KeywordHighlighters\ConstructorDeclarationHighlighter.vb" />
diff --git a/src/EditorFeatures/VisualBasic/GoToDefinition/VisualBasicGoToDefinitionItemService.vb b/src/EditorFeatures/VisualBasic/GoToDefinition/VisualBasicGoToDefinitionItemService.vb
new file mode 100644
index 0000000000000000000000000000000000000000..df953bf33714d1d8c951b177f5f8e0da5167a363
--- /dev/null
+++ b/src/EditorFeatures/VisualBasic/GoToDefinition/VisualBasicGoToDefinitionItemService.vb
@@ -0,0 +1,11 @@
+Imports System.Composition
+Imports Microsoft.CodeAnalysis.Editor.GoToDefinition
+Imports Microsoft.CodeAnalysis.Host.Mef
+
+Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.GoToDefinition
+    <ExportLanguageService(GetType(IGoToSymbolService), LanguageNames.VisualBasic), [Shared]>
+    Friend Class VisualBasicGoToDefinitionItemService
+        Inherits AbstractGoToDefinitionItemService
+
+    End Class
+End Namespace
diff --git a/src/EditorFeatures/VisualBasic/GoToDefinition/VisualBasicGoToDefinitionService.vb b/src/EditorFeatures/VisualBasic/GoToDefinition/VisualBasicGoToDefinitionService.vb
index b4298240d42798d633bb5169031d577ad4cb09ad..be3905bc47d65dfe3cabdb21a32a9ad2c1751f19 100644
--- a/src/EditorFeatures/VisualBasic/GoToDefinition/VisualBasicGoToDefinitionService.vb
+++ b/src/EditorFeatures/VisualBasic/GoToDefinition/VisualBasicGoToDefinitionService.vb
@@ -15,9 +15,5 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.GoToDefinition
         Public Sub New(<ImportMany> streamingPresenters As IEnumerable(Of Lazy(Of IStreamingFindUsagesPresenter)))
             MyBase.New(streamingPresenters)
         End Sub
-
-        Protected Overrides Function FindRelatedExplicitlyDeclaredSymbol(symbol As ISymbol, compilation As Compilation) As ISymbol
-            Return symbol.FindRelatedExplicitlyDeclaredSymbol(compilation)
-        End Function
     End Class
 End Namespace
\ No newline at end of file
diff --git a/src/EditorFeatures/VisualBasic/GoToDefinition/VisualBasicGoToDefinitionSymbolService.vb b/src/EditorFeatures/VisualBasic/GoToDefinition/VisualBasicGoToDefinitionSymbolService.vb
new file mode 100644
index 0000000000000000000000000000000000000000..228b4a7d70945c2b504e19ef88ce2ccb4a0f1451
--- /dev/null
+++ b/src/EditorFeatures/VisualBasic/GoToDefinition/VisualBasicGoToDefinitionSymbolService.vb
@@ -0,0 +1,18 @@
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+Imports System.Composition
+Imports Microsoft.CodeAnalysis.Editor.GoToDefinition
+Imports Microsoft.CodeAnalysis.Editor.Host
+Imports Microsoft.CodeAnalysis.Host.Mef
+Imports Microsoft.CodeAnalysis.VisualBasic.Utilities
+
+Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.GoToDefinition
+    <ExportLanguageService(GetType(IGoToDefinitionSymbolService), LanguageNames.VisualBasic), [Shared]>
+    Friend Class VisualBasicGoToDefinitionSymbolService
+        Inherits AbstractGoToDefinitionSymbolService
+
+        Protected Overrides Function FindRelatedExplicitlyDeclaredSymbol(symbol As ISymbol, compilation As Compilation) As ISymbol
+            Return symbol.FindRelatedExplicitlyDeclaredSymbol(compilation)
+        End Function
+    End Class
+End Namespace
\ No newline at end of file
diff --git a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
index f3d937caeaeba7cdfc62e98243be230d0b161ad1..fe82739d4b5384b94a0f8388c2a13da9468adaed 100644
--- a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
+++ b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
@@ -448,6 +448,9 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>$(NewtonsoftJsonVersion)</Version>
     </PackageReference>
+	<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime">
+		<Version>$(MicrosoftVisualStudioShellInterop153DesignTimeVersion)</Version>
+	</PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CodeMarkers\ManagedCodeMarkers.cs" />
diff --git a/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj b/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj
index 226aa9490b044f5646087ca08e1b1eb653d5e9e5..425d0f835e7d197540ea1abde879710ebd1b370d 100644
--- a/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj
+++ b/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj
@@ -126,6 +126,12 @@
     <PackageReference Include="Microsoft.VisualStudio.Diagnostics.PerformanceProvider">
       <Version>$(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion)</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime">
+      <Version>$(MicrosoftVisualStudioShellInterop153DesignTimeVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="StreamJsonRPC">
+      <Version>$(StreamJsonRPCVersion)</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <PublicAPI Include="PublicAPI.Shipped.txt" />
diff --git a/src/Workspaces/Core/Portable/Shared/Extensions/SemanticModelExtensions.cs b/src/Workspaces/Core/Portable/Shared/Extensions/SemanticModelExtensions.cs
index de8e9c1668e98748548c7d23a0269f306a3a2f07..f774fa052ec658896002709c1274f2131f12cce7 100644
--- a/src/Workspaces/Core/Portable/Shared/Extensions/SemanticModelExtensions.cs
+++ b/src/Workspaces/Core/Portable/Shared/Extensions/SemanticModelExtensions.cs
@@ -6,6 +6,7 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Shared.Extensions
@@ -13,23 +14,26 @@ namespace Microsoft.CodeAnalysis.Shared.Extensions
     internal struct TokenSemanticInfo
     {
         public static readonly TokenSemanticInfo Empty = new TokenSemanticInfo(
-            null, null, ImmutableArray<ISymbol>.Empty, null);
+            null, null, ImmutableArray<ISymbol>.Empty, null, default(TextSpan));
 
         public readonly ISymbol DeclaredSymbol;
         public readonly IAliasSymbol AliasSymbol;
         public readonly ImmutableArray<ISymbol> ReferencedSymbols;
         public readonly ITypeSymbol Type;
+        public readonly TextSpan Span;
 
         public TokenSemanticInfo(
             ISymbol declaredSymbol, 
             IAliasSymbol aliasSymbol,
             ImmutableArray<ISymbol> referencedSymbols,
-            ITypeSymbol type)
+            ITypeSymbol type,
+            TextSpan span)
         {
             DeclaredSymbol = declaredSymbol;
             AliasSymbol = aliasSymbol;
             ReferencedSymbols = referencedSymbols;
             Type = type;
+            Span = span;
         }
 
         public ImmutableArray<ISymbol> GetSymbols(bool includeType)
@@ -206,7 +210,7 @@ private static ISymbol MapSymbol(ISymbol symbol, ITypeSymbol type)
                 }
             }
 
-            return new TokenSemanticInfo(declaredSymbol, aliasSymbol, allSymbols, type);
+            return new TokenSemanticInfo(declaredSymbol, aliasSymbol, allSymbols, type, token.Span);
         }
 
         public static SemanticModel GetOriginalSemanticModel(this SemanticModel semanticModel)