address feedback

src/EditorFeatures/Core.Wpf/InlineRename/CommandHandlers/RenameCommandHandler_RenameHandler.cs

@@ -26,7 +26,7 @@ public VSCommanding.CommandState GetCommandState(RenameCommandArgs args)
 
             if (!args.SubjectBuffer.TryGetOwningWorkspace(out var workspace) ||
                 !workspace.CanApplyChange(ApplyChangesKind.ChangeDocument) ||
-                !args.SubjectBuffer.SupportsRename(workspace))
+                !args.SubjectBuffer.SupportsRename())
             {
                 return VSCommanding.CommandState.Unspecified;
             }

src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameSession.cs

@@ -245,7 +245,7 @@ private bool TryPopulateOpenTextBufferManagerForBuffer(ITextBuffer buffer)
                 }
             }
 
-            if (!_openTextBuffers.ContainsKey(buffer) && buffer.SupportsRename(_workspace))
+            if (!_openTextBuffers.ContainsKey(buffer) && buffer.SupportsRename())
             {
                 _openTextBuffers[buffer] = new OpenTextBufferManager(this, buffer, _workspace, _textBufferFactoryService);
                 return true;

src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSource.cs

@@ -790,10 +790,8 @@ private static SuggestedActionSetPriority GetSuggestedActionSetPriority(CodeActi
                 SnapshotSpan range,
                 CancellationToken cancellationToken)
             {
-                var workspace = document.Project.Solution.Workspace;
-
                 if (provider._codeFixService != null &&
-                    _subjectBuffer.SupportsCodeFixes(workspace))
+                    _subjectBuffer.SupportsCodeFixes())
                 {
                     var result = await provider._codeFixService.GetMostSevereFixableDiagnosticAsync(
                             document, range.Span.ToTextSpan(), cancellationToken).ConfigureAwait(false);
@@ -828,11 +826,9 @@ private static SuggestedActionSetPriority GetSuggestedActionSetPriority(CodeActi
                     return null;
                 }
 
-                var workspace = document.Project.Solution.Workspace;
-
                 if (document.Project.Solution.Options.GetOption(EditorComponentOnOffOptions.CodeRefactorings) &&
                     provider._codeRefactoringService != null &&
-                    _subjectBuffer.SupportsRefactorings(workspace))
+                    _subjectBuffer.SupportsRefactorings())
                 {
                     if (await provider._codeRefactoringService.HasRefactoringsAsync(
                             document, selection.Value, cancellationToken).ConfigureAwait(false))

src/EditorFeatures/Core/CommandHandlers/GoToAdjacentMemberCommandHandler.cs

@@ -75,21 +75,8 @@ private VSCommanding.CommandState GetCommandStateImpl(EditorCommandArgs args)
             return VSCommanding.CommandState.Available;
         }
 
-        private static bool IsAvailable(SnapshotPoint? caretPoint, ITextBuffer subjectBuffer)
-        {
-            if (!caretPoint.HasValue)
-            {
-                return false;
-            }
-
-            if (!subjectBuffer.TryGetOwningWorkspace(out var workspace) ||
-                !subjectBuffer.SupportsNavigationToAnyPosition(workspace))
-            {
-                return false;
-            }
-
-            return true;
-        }
+        private static bool IsAvailable(SnapshotPoint? caretPoint, ITextBuffer subjectBuffer) =>
+            caretPoint.HasValue && subjectBuffer.SupportsNavigationToAnyPosition();
 
         private bool ExecuteCommandImpl(EditorCommandArgs args, bool gotoNextMember, CommandExecutionContext context)
         {

src/EditorFeatures/Core/Implementation/ChangeSignature/AbstractChangeSignatureCommandHandler.cs

@@ -28,10 +28,8 @@ public VSCommanding.CommandState GetCommandState(ReorderParametersCommandArgs ar
         public VSCommanding.CommandState GetCommandState(RemoveParametersCommandArgs args)
             => GetCommandState(args.SubjectBuffer);
 
-        private static VSCommanding.CommandState GetCommandState(ITextBuffer subjectBuffer)
-        {
-            return IsAvailable(subjectBuffer) ? VSCommanding.CommandState.Available : VSCommanding.CommandState.Unspecified;
-        }
+        private static VSCommanding.CommandState GetCommandState(ITextBuffer subjectBuffer) =>
+            IsAvailable(subjectBuffer, out _) ? VSCommanding.CommandState.Available : VSCommanding.CommandState.Unspecified;
 
         public bool ExecuteCommand(RemoveParametersCommandArgs args, CommandExecutionContext context)
             => ExecuteCommand(args.TextView, args.SubjectBuffer, context);
@@ -39,23 +37,16 @@ public bool ExecuteCommand(RemoveParametersCommandArgs args, CommandExecutionCon
         public bool ExecuteCommand(ReorderParametersCommandArgs args, CommandExecutionContext context)
             => ExecuteCommand(args.TextView, args.SubjectBuffer, context);
 
-        private static bool IsAvailable(ITextBuffer subjectBuffer)
-        {
-            if (!subjectBuffer.TryGetOwningWorkspace(out var workspace) ||
-                !workspace.CanApplyChange(ApplyChangesKind.ChangeDocument) ||
-                !subjectBuffer.SupportsRefactorings(workspace))
-            {
-                return false;
-            }
-
-            return true;
-        }
+        private static bool IsAvailable(ITextBuffer subjectBuffer, out Workspace workspace) =>
+            subjectBuffer.TryGetOwningWorkspace(out workspace) &&
+                workspace.CanApplyChange(ApplyChangesKind.ChangeDocument) &&
+                subjectBuffer.SupportsRefactorings();
 
         private bool ExecuteCommand(ITextView textView, ITextBuffer subjectBuffer, CommandExecutionContext context)
         {
             using (context.OperationContext.AddScope(allowCancellation: true, FeaturesResources.Change_signature))
             {
-                if (IsAvailable(subjectBuffer))
+                if (!IsAvailable(subjectBuffer, out var workspace))
                 {
                     return false;
                 }

src/EditorFeatures/Core/Implementation/EncapsulateField/AbstractEncapsulateFieldCommandHandler.cs

@@ -117,9 +117,7 @@ private bool Execute(EncapsulateFieldCommandArgs args, IUIThreadOperationScope w
             }
         }
 
-        public VSCommanding.CommandState GetCommandState(EncapsulateFieldCommandArgs args)
-        {
-            return args.SubjectBuffer.SupportsRefactorings() ? VSCommanding.CommandState.Available : VSCommanding.CommandState.Unspecified;
-        }
+        public VSCommanding.CommandState GetCommandState(EncapsulateFieldCommandArgs args) =>
+            args.SubjectBuffer.SupportsRefactorings() ? VSCommanding.CommandState.Available : VSCommanding.CommandState.Unspecified;
     }
 }

src/EditorFeatures/Core/Implementation/ExtractInterface/AbstractExtractInterfaceCommandHandler.cs

@@ -28,10 +28,8 @@ protected AbstractExtractInterfaceCommandHandler(IThreadingContext threadingCont
 
         public string DisplayName => EditorFeaturesResources.Extract_Interface;
 
-        public VSCommanding.CommandState GetCommandState(ExtractInterfaceCommandArgs args)
-        {
-            return IsAvailable(args.SubjectBuffer, out var _) ? VSCommanding.CommandState.Available : VSCommanding.CommandState.Unspecified;
-        }
+        public VSCommanding.CommandState GetCommandState(ExtractInterfaceCommandArgs args) =>
+            IsAvailable(args.SubjectBuffer, out var _) ? VSCommanding.CommandState.Available : VSCommanding.CommandState.Unspecified;
 
         public bool ExecuteCommand(ExtractInterfaceCommandArgs args, CommandExecutionContext context)
         {
@@ -86,19 +84,10 @@ public bool ExecuteCommand(ExtractInterfaceCommandArgs args, CommandExecutionCon
             }
         }
 
-        private static bool IsAvailable(ITextBuffer subjectBuffer, out Workspace workspace)
-        {
-            if (!subjectBuffer.TryGetOwningWorkspace(out var retrievedWorkspace) ||
-                    !retrievedWorkspace.CanApplyChange(ApplyChangesKind.AddDocument) ||
-                    !retrievedWorkspace.CanApplyChange(ApplyChangesKind.ChangeDocument) ||
-                    !subjectBuffer.SupportsRefactorings(retrievedWorkspace))
-            {
-                workspace = retrievedWorkspace;
-                return false;
-            }
-
-            workspace = retrievedWorkspace;
-            return true;
-        }
+        private static bool IsAvailable(ITextBuffer subjectBuffer, out Workspace workspace) =>
+            subjectBuffer.TryGetOwningWorkspace(out workspace) &&
+                    workspace.CanApplyChange(ApplyChangesKind.AddDocument) &&
+                    workspace.CanApplyChange(ApplyChangesKind.ChangeDocument) &&
+                    subjectBuffer.SupportsRefactorings();
     }
 }

src/EditorFeatures/Core/Implementation/ExtractMethod/AbstractExtractMethodCommandHandler.cs

@@ -52,7 +52,7 @@ public VSCommanding.CommandState GetCommandState(ExtractMethodCommandArgs args)
 
             if (!args.SubjectBuffer.TryGetOwningWorkspace(out var workspace) ||
                 !workspace.CanApplyChange(ApplyChangesKind.ChangeDocument) ||
-                !args.SubjectBuffer.SupportsRefactorings(workspace))
+                !args.SubjectBuffer.SupportsRefactorings())
             {
                 return VSCommanding.CommandState.Unspecified;
             }

src/EditorFeatures/Core/Implementation/Organizing/OrganizeDocumentCommandHandler.cs

@@ -90,7 +90,7 @@ private bool IsCommandSupported(EditorCommandArgs args, out Workspace workspace)
                     return false;
                 }
 
-                return args.SubjectBuffer.SupportsRefactorings(workspace);
+                return args.SubjectBuffer.SupportsRefactorings();
             }
 
             return false;

src/EditorFeatures/Core/Shared/Extensions/ITextBufferExtensions.cs

@@ -44,61 +44,41 @@ internal static bool GetFeatureOnOffOption(this ITextBuffer buffer, PerLanguageO
             }
         }
 
-        internal static bool TryGetOwningWorkspace(this ITextBuffer buffer, out Workspace workspace)
-        {
-            workspace = null;
-            if (Workspace.TryGetWorkspace(buffer.AsTextContainer(), out var retrievedWorkspace))
-            {
-                workspace = retrievedWorkspace;
-            }
-
-            return workspace != null;
-        }
-
-        /// <summary>
-        /// Checks if the buffer supports refactorings.
-        /// Additionally retrieves the workspace for the buffer.
-        /// </summary>
-        internal static bool SupportsRefactorings(this ITextBuffer buffer)
-        {
-            return buffer.TryGetOwningWorkspace(out var workspace) && buffer.SupportsRefactorings(workspace);
-        }
+        internal static bool TryGetOwningWorkspace(this ITextBuffer buffer, out Workspace workspace) =>
+            Workspace.TryGetWorkspace(buffer.AsTextContainer(), out workspace);
 
         /// <summary>
         /// Checks if a buffer supports refactorings.
         /// </summary>
-        internal static bool SupportsRefactorings(this ITextBuffer buffer, Workspace workspace)
-        {
-            return TryGetSupportsFeatureService(workspace, out var service) && service.SupportsRefactorings(buffer);
-        }
+        internal static bool SupportsRefactorings(this ITextBuffer buffer) =>
+            TryGetSupportsFeatureService(buffer, out var service) && service.SupportsRefactorings(buffer);
 
         /// <summary>
         /// Checks if a buffer supports rename.
         /// </summary>
-        internal static bool SupportsRename(this ITextBuffer buffer, Workspace workspace)
-        {
-            return TryGetSupportsFeatureService(workspace, out var service) && service.SupportsRename(buffer);
-        }
+        internal static bool SupportsRename(this ITextBuffer buffer) =>
+            TryGetSupportsFeatureService(buffer, out var service) && service.SupportsRename(buffer);
 
         /// <summary>
         /// Checks if a buffer supports code fixes.
         /// </summary>
-        internal static bool SupportsCodeFixes(this ITextBuffer buffer, Workspace workspace)
-        {
-            return TryGetSupportsFeatureService(workspace, out var service) && service.SupportsCodeFixes(buffer);
-        }
+        internal static bool SupportsCodeFixes(this ITextBuffer buffer) =>
+            TryGetSupportsFeatureService(buffer, out var service) && service.SupportsCodeFixes(buffer);
 
         /// <summary>
         /// Checks if a buffer supports navigation.
         /// </summary>
-        internal static bool SupportsNavigationToAnyPosition(this ITextBuffer buffer, Workspace workspace)
-        {
-            return TryGetSupportsFeatureService(workspace, out var service) && service.SupportsNavigationToAnyPosition(buffer);
-        }
+        internal static bool SupportsNavigationToAnyPosition(this ITextBuffer buffer) =>
+            TryGetSupportsFeatureService(buffer, out var service) && service.SupportsNavigationToAnyPosition(buffer);
 
-        private static bool TryGetSupportsFeatureService(Workspace workspace, out ITextBufferSupportsFeatureService service)
+        private static bool TryGetSupportsFeatureService(ITextBuffer buffer, out ITextBufferSupportsFeatureService service)
         {
-            service = workspace.Services.GetService<ITextBufferSupportsFeatureService>();
+            service = null;
+            if (buffer.TryGetOwningWorkspace(out var workspace))
+            {
+                service = workspace.Services.GetService<ITextBufferSupportsFeatureService>();
+            }
+
             return service != null;
         }
     }