-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main-vs-deps' into merges/main-to-main-vs-deps
- Loading branch information
Showing
186 changed files
with
7,314 additions
and
560 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
src/EditorFeatures/CSharp/InheritanceMargin/CSharpInheritanceMarginService.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Collections.Immutable; | ||
| using System.Composition; | ||
| using System.Linq; | ||
| using Microsoft.CodeAnalysis.CSharp; | ||
| using Microsoft.CodeAnalysis.CSharp.Extensions; | ||
| using Microsoft.CodeAnalysis.CSharp.Syntax; | ||
| using Microsoft.CodeAnalysis.Host.Mef; | ||
| using Microsoft.CodeAnalysis.InheritanceMargin; | ||
| using Roslyn.Utilities; | ||
|
|
||
| namespace Microsoft.CodeAnalysis.Editor.CSharp.InheritanceMargin | ||
| { | ||
| [ExportLanguageService(typeof(IInheritanceMarginService), LanguageNames.CSharp), Shared] | ||
| internal class CSharpInheritanceMarginService : AbstractInheritanceMarginService | ||
| { | ||
| [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] | ||
| [ImportingConstructor] | ||
| public CSharpInheritanceMarginService() | ||
| { | ||
| } | ||
|
|
||
| protected override ImmutableArray<SyntaxNode> GetMembers(IEnumerable<SyntaxNode> nodesToSearch) | ||
| { | ||
| var typeDeclarationNodes = nodesToSearch.OfType<TypeDeclarationSyntax>(); | ||
|
|
||
| using var _ = PooledObjects.ArrayBuilder<SyntaxNode>.GetInstance(out var builder); | ||
| foreach (var typeDeclarationNode in typeDeclarationNodes) | ||
| { | ||
| // 1. Add the type declaration node.(e.g. class, struct etc..) | ||
| // Use its identifier's position as the line number, since we want the margin to be placed with the identifier | ||
| builder.Add(typeDeclarationNode); | ||
|
|
||
| // 2. Add type members inside this type declaration. | ||
| foreach (var member in typeDeclarationNode.Members) | ||
| { | ||
| if (member.IsKind( | ||
| SyntaxKind.MethodDeclaration, | ||
| SyntaxKind.PropertyDeclaration, | ||
| SyntaxKind.EventDeclaration, | ||
| SyntaxKind.IndexerDeclaration)) | ||
| { | ||
| builder.Add(member); | ||
| } | ||
|
|
||
| // For multiple events that declared in the same EventFieldDeclaration, | ||
| // add all VariableDeclarators | ||
| if (member is EventFieldDeclarationSyntax eventFieldDeclarationNode) | ||
| { | ||
| builder.AddRange(eventFieldDeclarationNode.Declaration.Variables); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return builder.ToImmutableArray(); | ||
| } | ||
|
|
||
| protected override SyntaxToken GetDeclarationToken(SyntaxNode declarationNode) | ||
| => declarationNode switch | ||
| { | ||
| MethodDeclarationSyntax methodDeclarationNode => methodDeclarationNode.Identifier, | ||
| PropertyDeclarationSyntax propertyDeclarationNode => propertyDeclarationNode.Identifier, | ||
| EventDeclarationSyntax eventDeclarationNode => eventDeclarationNode.Identifier, | ||
| VariableDeclaratorSyntax variableDeclaratorNode => variableDeclaratorNode.Identifier, | ||
| TypeDeclarationSyntax baseTypeDeclarationNode => baseTypeDeclarationNode.Identifier, | ||
| IndexerDeclarationSyntax indexerDeclarationNode => indexerDeclarationNode.ThisKeyword, | ||
| // Shouldn't reach here since the input declaration nodes are coming from GetMembers() method above | ||
| _ => throw ExceptionUtilities.UnexpectedValue(declarationNode), | ||
| }; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.