CR feedback

src/EditorFeatures/Core/Implementation/CallHierarchy/CallHierarchyProvider.cs

@@ -132,7 +132,7 @@ public void NavigateTo(SymbolKey id, Project project, CancellationToken cancella
         {
             var compilation = project.GetCompilationAsync(cancellationToken).WaitAndGetResult(cancellationToken);
             var resolution = id.Resolve(compilation, cancellationToken: cancellationToken);
-            project.Solution.Workspace.Services.GetService<ISymbolNavigationService>().TryNavigateToSymbol(resolution.Symbol, project, usePreviewTab: true);
+            project.Solution.Workspace.Services.GetService<ISymbolNavigationService>().TryNavigateToSymbol(resolution.Symbol, project, usePreviewTab: true, cancellationToken: CancellationToken.None);
         }
     }
 }

src/EditorFeatures/Core/Implementation/GoToDefinition/GoToDefinitionHelpers.cs

@@ -70,7 +70,7 @@ internal static class GoToDefinitionHelpers
                 // to a metadata-as-source view.
 
                 var symbolNavigationService = solution.Workspace.Services.GetService<ISymbolNavigationService>();
-                return symbolNavigationService.TryNavigateToSymbol(symbol, project, usePreviewTab: true, cancellationToken: cancellationToken);
+                return symbolNavigationService.TryNavigateToSymbol(symbol, project, cancellationToken: cancellationToken, usePreviewTab: true);
             }
 
             // If we have a single location, then just navigate to it.

src/EditorFeatures/Test2/Utilities/MockSymbolNavigationServiceProvider.vb

@@ -37,7 +37,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Utilities
             Public NavigationLineNumberReturnValue As Integer = 0
             Public NavigationCharOffsetReturnValue As Integer = 0
 
-            Public Function TryNavigateToSymbol(symbol As ISymbol, project As Project, Optional usePreviewTab As Boolean = False, Optional cancellationToken As CancellationToken = Nothing) As Boolean Implements ISymbolNavigationService.TryNavigateToSymbol
+            Public Function TryNavigateToSymbol(symbol As ISymbol, project As Project, cancellationToken As CancellationToken, Optional usePreviewTab As Boolean = False) As Boolean Implements ISymbolNavigationService.TryNavigateToSymbol
                 Me.TryNavigateToSymbolProvidedSymbol = symbol
                 Me.TryNavigateToSymbolProvidedProject = project
                 Me.TryNavigateToSymbolProvidedUsePreviewTab = usePreviewTab

src/Features/Core/Portable/Navigation/DefaultSymbolNavigationService.cs

@@ -6,7 +6,7 @@ namespace Microsoft.CodeAnalysis.Navigation
 {
     internal class DefaultSymbolNavigationService : ISymbolNavigationService
     {
-        public bool TryNavigateToSymbol(ISymbol symbol, Project project, bool usePreviewTab = false, CancellationToken cancellationToken = default(CancellationToken))
+        public bool TryNavigateToSymbol(ISymbol symbol, Project project, CancellationToken cancellationToken = default(CancellationToken), bool usePreviewTab = false)
         {
             return false;
         }

src/Features/Core/Portable/Navigation/ISymbolNavigationService.cs

@@ -15,7 +15,7 @@ internal interface ISymbolNavigationService : IWorkspaceService
         /// <param name="symbol">The symbol to navigate to</param>
         /// <param name="usePreviewTab">Indicates whether a preview tab should be used if the
         /// containing document is opened in a new tab. Defaults to false.</param>
-        bool TryNavigateToSymbol(ISymbol symbol, Project project, bool usePreviewTab = false, CancellationToken cancellationToken = default(CancellationToken));
+        bool TryNavigateToSymbol(ISymbol symbol, Project project, CancellationToken cancellationToken, bool usePreviewTab = false);
 
         /// <returns>True if the navigation was handled, indicating that the caller should not 
         /// perform the navigation.</returns>

src/VisualStudio/Core/Def/Implementation/Library/FindResults/TreeItems/MetadataDefinitionTreeItem.cs

@@ -40,7 +40,7 @@ public override int GoToSource()
             if (symbol != null && referencingProject != null)
             {
                 var navigationService = _workspace.Services.GetService<ISymbolNavigationService>();
-                return navigationService.TryNavigateToSymbol(symbol, referencingProject)
+                return navigationService.TryNavigateToSymbol(symbol, referencingProject, CancellationToken.None)
                     ? VSConstants.S_OK
                     : VSConstants.E_FAIL;
             }

src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioSymbolNavigationService.cs

@@ -49,7 +49,7 @@ internal partial class VisualStudioSymbolNavigationService : ForegroundThreadAff
             _metadataAsSourceFileService = componentModel.GetService<IMetadataAsSourceFileService>();
         }
 
-        public bool TryNavigateToSymbol(ISymbol symbol, Project project, bool usePreviewTab = false, CancellationToken cancellationToken = default(CancellationToken))
+        public bool TryNavigateToSymbol(ISymbol symbol, Project project, CancellationToken cancellationToken = default(CancellationToken), bool usePreviewTab = false)
         {
             if (project == null || symbol == null)
             {

src/Workspaces/Core/Portable/CodeGeneration/AbstractCodeGenerationService.cs

@@ -303,7 +303,7 @@ public Task<Document> AddEventAsync(Solution solution, INamedTypeSymbol destinat
             return GetEditAsync(
                 solution,
                 destination,
-                (t, opts, ai, _) => AddEvent(t, @event, opts, ai),
+                (t, opts, ai, ct) => AddEvent(t, @event, opts, ai),
                 options,
                 new[] { @event },
                 cancellationToken);
@@ -314,7 +314,7 @@ public Task<Document> AddFieldAsync(Solution solution, INamedTypeSymbol destinat
             return GetEditAsync(
                 solution,
                 destination,
-                (t, opts, ai, _) => AddField(t, field, opts, ai),
+                (t, opts, ai, ct) => AddField(t, field, opts, ai),
                 options,
                 new[] { field },
                 cancellationToken);
@@ -324,7 +324,7 @@ public Task<Document> AddPropertyAsync(Solution solution, INamedTypeSymbol desti
         {
             return GetEditAsync(
                 solution, destination,
-                (t, opts, ai, _) => AddProperty(t, property, opts, ai),
+                (t, opts, ai, ct) => AddProperty(t, property, opts, ai),
                 options, new[] { property },
                 cancellationToken);
         }
@@ -333,7 +333,7 @@ public Task<Document> AddNamedTypeAsync(Solution solution, INamedTypeSymbol dest
         {
             return GetEditAsync(
                 solution, destination,
-                (t, opts, ai, _) => AddNamedType(t, namedType, opts, ai, _),
+                (t, opts, ai, ct) => AddNamedType(t, namedType, opts, ai, ct),
                 options, new[] { namedType },
                 cancellationToken);
         }
@@ -358,7 +358,7 @@ public Task<Document> AddMethodAsync(Solution solution, INamedTypeSymbol destina
         {
             return GetEditAsync(
                 solution, destination,
-                (t, opts, ai, _) => AddMethod(t, method, opts, ai),
+                (t, opts, ai, ct) => AddMethod(t, method, opts, ai),
                 options, new[] { method }, cancellationToken);
         }
 

src/Workspaces/VisualBasic/Portable/CodeGeneration/NamespaceGenerator.vb

@@ -15,7 +15,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGeneration
                                     [namespace] As INamespaceSymbol,
                                     options As CodeGenerationOptions,
                                     availableIndices As IList(Of Boolean),
-                                       cancellationToken As CancellationToken) As CompilationUnitSyntax
+                                    cancellationToken As CancellationToken) As CompilationUnitSyntax
             Dim declaration = GenerateNamespaceDeclaration(service, [namespace], options, cancellationToken)
             If Not TypeOf declaration Is NamespaceBlockSyntax Then
                 Throw New ArgumentException(VBWorkspaceResources.NamespaceCannotBeAdded)