Move more code down to shared layer #74539

CyrusNajmabadi · 2024-07-24T17:43:34Z

Allows 'implement abstract class' to be a code fixer in the code-style layer.

CyrusNajmabadi · 2024-07-24T20:03:10Z

src/Analyzers/Core/CodeFixes/ImplementInterface/IImplementInterfaceInfo.cs

+
+namespace Microsoft.CodeAnalysis.ImplementInterface;
+
+internal interface IImplementInterfaceInfo


was in a file related to implement-interface, which itself hasn't moved to this layer yet. that will be in followup pr.

I thought implement interface required a VS UI dialog - is that necessary to move to the code style layer? Is there any SDK tool that could use it?

CyrusNajmabadi · 2024-07-24T20:03:32Z

src/Features/Core/Portable/Completion/Providers/AbstractPartialMethodCompletionProvider.cs

@@ -61,7 +61,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)

    protected override async Task<ISymbol> GenerateMemberAsync(ISymbol member, INamedTypeSymbol containingType, Document document, CompletionItem item, CancellationToken cancellationToken)
    {
-        var syntaxFactory = document.GetLanguageService<SyntaxGenerator>();
+        var syntaxFactory = document.GetRequiredLanguageService<SyntaxGenerator>();


i ended up getting NRT warnings. not sure how htat started happening.

CyrusNajmabadi · 2024-07-24T20:03:56Z

src/Workspaces/Core/Portable/Shared/Extensions/IMethodSymbolExtensions.cs

@@ -54,129 +54,6 @@ public static bool CompatibleSignatureToDelegate(this IMethodSymbol method, INam
        return true;
    }

-    public static IMethodSymbol RenameTypeParameters(this IMethodSymbol method, ImmutableArray<string> newNames)


helper extensions that moved to shared location

CyrusNajmabadi · 2024-07-24T20:04:16Z

src/Workspaces/Core/Portable/Shared/Extensions/IParameterSymbolExtensions.cs

@@ -10,21 +10,6 @@ namespace Microsoft.CodeAnalysis.Shared.Extensions;

 internal static partial class IParameterSymbolExtensions
 {
-    public static IParameterSymbol RenameParameter(this IParameterSymbol parameter, string parameterName)


helper extensions that moved to shared location

CyrusNajmabadi · 2024-07-24T20:04:23Z

src/Workspaces/Core/Portable/Shared/Extensions/ITypeSymbolExtensions.cs

@@ -208,28 +208,6 @@ where SymbolEquivalenceComparer.Instance.Equals(explicitInterfaceMethod, constru
        return type?.Accept(new UnnamedErrorTypeRemover(compilation));
    }

-    [return: NotNullIfNotNull(parameterName: nameof(type))]


helper extensions that moved to shared location

CyrusNajmabadi · 2024-07-24T20:04:37Z

src/Workspaces/Core/Portable/Shared/Extensions/SyntaxGeneratorExtensions.cs

-    /// Generates a call to a method *through* an existing field or property symbol.
-    /// </summary>
-    /// <returns></returns>
-    public static SyntaxNode GenerateDelegateThroughMemberStatement(


helper extensions that moved to shared location

CyrusNajmabadi · 2024-07-24T20:04:55Z

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CodeCleanup/CodeCleanupOptions.cs

-
-internal static class CodeCleanupOptionsProviders
-{
-#if !CODE_STYLE


moved to shared location. was able to remove this IFDEF

CyrusNajmabadi · 2024-07-24T20:05:05Z

...orkspaces/SharedUtilitiesAndExtensions/Compiler/Core/CodeGeneration/CodeGenerationOptions.cs

@@ -63,40 +63,3 @@ internal static CodeAndImportGenerationOptions GetDefault(LanguageServices langu
        };
 #endif
 }
-
-internal static class CodeGenerationOptionsProviders


moved to shared location. was able to remove this IFDEF

CyrusNajmabadi · 2024-07-24T20:07:33Z

.../SharedUtilitiesAndExtensions/Workspace/Core/AddImport/AddImportPlacementOptionsProviders.cs

@@ -21,10 +21,8 @@ public static bool AllowImportsInHiddenRegions(this Document document)
        => document.Services.GetService<Host.ISpanMappingService>()?.SupportsMappingImportDirectives == true;
 #endif

-#if !CODE_STYLE


happyhapppy.

CyrusNajmabadi · 2024-07-24T20:08:04Z

...paces/SharedUtilitiesAndExtensions/Workspace/Core/CodeCleanup/CodeCleanupOptionsProviders.cs

+
+internal static class CodeCleanupOptionsProviders
+{
+    public static CodeCleanupOptions GetCodeCleanupOptions(this IOptionsReader options, LanguageServices languageServices, bool? allowImportsInHiddenRegions = null)


just a move.

CyrusNajmabadi · 2024-07-24T20:08:15Z

.../SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationOptionsProvider.cs

+
+internal static class CodeGenerationOptionsProviders
+{
+    public static CodeGenerationOptions GetCodeGenerationOptions(this IOptionsReader options, LanguageServices languageServices)


just a move.

src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensions.projitems

…kspaceExtensions.projitems

dibarbet

~~@sharwell is this impacted by the stuff you were looking at about code fixes in the SDK?~~

~~Should we be adding more shared code here if we still have issues with API changes between an older SDK and newer VS?~~

~~Reference #72811~~

Answered offline - this is tangential, moving to the code style layer still needs to happen to run code fixes in SDK tools like dotnet format.

src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensions.projitems

…kspaceExtensions.projitems

dibarbet

Mostly looks fine - didn't take a close look at everything since it looks like mainly moves.

dibarbet · 2024-07-24T21:48:02Z

src/Analyzers/Core/CodeFixes/ImplementInterface/IImplementInterfaceInfo.cs

+
+namespace Microsoft.CodeAnalysis.ImplementInterface;
+
+internal interface IImplementInterfaceInfo


I thought implement interface required a VS UI dialog - is that necessary to move to the code style layer? Is there any SDK tool that could use it?

tmat · 2024-07-25T00:55:29Z

...Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/Extensions/IMethodSymbolExtensions.cs

+
+internal static partial class IMethodSymbolExtensions
+{
+    public static IMethodSymbol EnsureNonConflictingNames(


These are odd methods to be extension methods for a very general interface in a non-specific namespace. Why not move these to CodeGenerationSymbolFactory or some other code-generation related type?

don't care for now. :)

CyrusNajmabadi and others added 5 commits July 24, 2024 10:11

In progress

17c970b

In progress

ebb6991

In progress

b11d4e1

In progress

29f3e3c

Move resources

ad9bf76

dotnet-issue-labeler bot added Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead labels Jul 24, 2024

CyrusNajmabadi added 14 commits July 24, 2024 10:46

Move resource

fdc8cee

Move resource

e183d2c

Move resource

9ad4bc1

Move

a1ee3f6

in progress

1a338b7

Fix test

6b5d839

make sealed

b49477d

Move types

ec29304

Move types

83f9596

Fixes

9c5f335

Move vb code

46c42bd

Remove resource

a597b6c

more changes

55e6d50

Seal

7d18fa5

CyrusNajmabadi changed the title ~~WIP~~ Move more code down to shared layer Jul 24, 2024

CyrusNajmabadi requested a review from tmat July 24, 2024 19:57

Move file

01416b1

CyrusNajmabadi marked this pull request as ready for review July 24, 2024 20:02

CyrusNajmabadi requested a review from a team as a code owner July 24, 2024 20:02

CyrusNajmabadi commented Jul 24, 2024

View reviewed changes

CyrusNajmabadi added 4 commits July 24, 2024 13:14

lint

1749cac

lint

0238af9

lint

01d8963

lint

bfa85eb

CyrusNajmabadi commented Jul 24, 2024

View reviewed changes

src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensions.projitems Outdated Show resolved Hide resolved

Update src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/Wor…

80a5a1c

…kspaceExtensions.projitems

dibarbet reviewed Jul 24, 2024

View reviewed changes

CyrusNajmabadi commented Jul 24, 2024

View reviewed changes

src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensions.projitems Outdated Show resolved Hide resolved

Update src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/Wor…

d915982

…kspaceExtensions.projitems

CyrusNajmabadi enabled auto-merge July 24, 2024 21:45

dibarbet approved these changes Jul 24, 2024

View reviewed changes

tmat reviewed Jul 25, 2024

View reviewed changes

CyrusNajmabadi merged commit ed5fa5e into dotnet:main Jul 25, 2024
25 checks passed

CyrusNajmabadi deleted the moveImplementAbstractClassToShared branch July 25, 2024 03:49

dotnet-policy-service bot added this to the Next milestone Jul 25, 2024

This was referenced Jul 26, 2024

[Automated] PRs inserted in VS build main-35125.79 #74565

Closed

[Automated] PRs inserted in VS build feature.debugger.main-35125.232 #74573

Closed

RikkiGibson modified the milestones: Next, 17.12 P1 Jul 29, 2024

dotnet-bot mentioned this pull request Aug 2, 2024

[Automated] PRs inserted in VS build feature.debugger.shadowDebug-35201.55 #74635

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move more code down to shared layer #74539

Move more code down to shared layer #74539

CyrusNajmabadi commented Jul 24, 2024 •

edited

Loading

CyrusNajmabadi Jul 24, 2024

dibarbet Jul 24, 2024

CyrusNajmabadi Jul 24, 2024

CyrusNajmabadi Jul 24, 2024

CyrusNajmabadi Jul 24, 2024

CyrusNajmabadi Jul 24, 2024

CyrusNajmabadi Jul 24, 2024

CyrusNajmabadi Jul 24, 2024

CyrusNajmabadi Jul 24, 2024

CyrusNajmabadi Jul 24, 2024

CyrusNajmabadi Jul 24, 2024

CyrusNajmabadi Jul 24, 2024

dibarbet left a comment •

edited

Loading

dibarbet left a comment

dibarbet Jul 24, 2024

tmat Jul 25, 2024 •

edited

Loading

CyrusNajmabadi Jul 25, 2024


		namespace Microsoft.CodeAnalysis.ImplementInterface;

		internal interface IImplementInterfaceInfo

Move more code down to shared layer #74539

Move more code down to shared layer #74539

Conversation

CyrusNajmabadi commented Jul 24, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dibarbet left a comment • edited Loading

Choose a reason for hiding this comment

dibarbet left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tmat Jul 25, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CyrusNajmabadi commented Jul 24, 2024 •

edited

Loading

dibarbet left a comment •

edited

Loading

tmat Jul 25, 2024 •

edited

Loading