-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master-vs-deps' into LSPFindAl…
…lReferencesIcons
- Loading branch information
Showing
259 changed files
with
6,262 additions
and
1,855 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // <auto-generated/> | ||
|
|
||
| using System.Runtime.CompilerServices; | ||
| using Roslyn.Test.Utilities; | ||
|
|
||
| internal sealed class InitializeTestModule | ||
| { | ||
| [ModuleInitializer] | ||
| internal static void Initializer() | ||
| { | ||
| RuntimeHelpers.RunModuleConstructor(typeof(TestBase).Module.ModuleHandle); | ||
| } | ||
| } |
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
126 changes: 126 additions & 0 deletions
126
.../Analyzers/UseImplicitObjectCreation/CSharpUseImplicitObjectCreationDiagnosticAnalyzer.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,126 @@ | ||
| // 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. | ||
|
|
||
| #nullable enable | ||
|
|
||
| using System.Collections.Immutable; | ||
| using Microsoft.CodeAnalysis.CodeStyle; | ||
| using Microsoft.CodeAnalysis.CSharp.CodeStyle; | ||
| using Microsoft.CodeAnalysis.CSharp.Syntax; | ||
| using Microsoft.CodeAnalysis.CSharp.Utilities; | ||
| using Microsoft.CodeAnalysis.Diagnostics; | ||
| using Microsoft.CodeAnalysis.Shared.Extensions; | ||
|
|
||
| namespace Microsoft.CodeAnalysis.CSharp.UseImplicitObjectCreation | ||
| { | ||
| [DiagnosticAnalyzer(LanguageNames.CSharp)] | ||
| internal class CSharpUseImplicitObjectCreationDiagnosticAnalyzer : AbstractBuiltInCodeStyleDiagnosticAnalyzer | ||
| { | ||
| public CSharpUseImplicitObjectCreationDiagnosticAnalyzer() | ||
| : base(IDEDiagnosticIds.UseImplicitObjectCreationDiagnosticId, | ||
| CSharpCodeStyleOptions.ImplicitObjectCreationWhenTypeIsApparent, | ||
| LanguageNames.CSharp, | ||
| new LocalizableResourceString(nameof(CSharpAnalyzersResources.Use_new), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)), | ||
| new LocalizableResourceString(nameof(CSharpAnalyzersResources.new_expression_can_be_simplified), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources))) | ||
| { | ||
| } | ||
|
|
||
| public override DiagnosticAnalyzerCategory GetAnalyzerCategory() | ||
| => DiagnosticAnalyzerCategory.SemanticSpanAnalysis; | ||
|
|
||
| protected override void InitializeWorker(AnalysisContext context) | ||
| => context.RegisterSyntaxNodeAction(AnalyzeSyntax, SyntaxKind.ObjectCreationExpression); | ||
|
|
||
| private void AnalyzeSyntax(SyntaxNodeAnalysisContext context) | ||
| { | ||
| var options = context.Options; | ||
| var syntaxTree = context.Node.SyntaxTree; | ||
| var semanticModel = context.SemanticModel; | ||
| var cancellationToken = context.CancellationToken; | ||
|
|
||
| // Not available prior to C# 9. | ||
| if (((CSharpParseOptions)syntaxTree.Options).LanguageVersion < LanguageVersion.CSharp9) | ||
| return; | ||
|
|
||
| var optionSet = options.GetAnalyzerOptionSet(syntaxTree, cancellationToken); | ||
| var styleOption = options.GetOption(CSharpCodeStyleOptions.ImplicitObjectCreationWhenTypeIsApparent, syntaxTree, cancellationToken); | ||
| if (!styleOption.Value) | ||
| { | ||
| // Bail immediately if the user has disabled this feature. | ||
| return; | ||
| } | ||
|
|
||
| // type is apparent if we the object creation location is closely tied (spatially) to the explicit type. Specifically: | ||
| // | ||
| // 1. Variable declarations. i.e. `List<int> list = new ...`. Note: we will suppress ourselves if this | ||
| // is a field and the 'var' preferences would lead to preferring this as `var list = ...` | ||
| // 2. Expression-bodied constructs with an explicit return type. i.e. `List<int> Prop => new ...` or | ||
| // `List<int> GetValue(...) => ...` The latter doesn't necessarily have the object creation spatially next to | ||
| // the type. However, the type is always in a very easy to ascertain location in C#, so it is treated as | ||
| // apparent. | ||
|
|
||
| var objectCreation = (ObjectCreationExpressionSyntax)context.Node; | ||
|
|
||
| TypeSyntax? typeNode; | ||
|
|
||
| if (objectCreation.Parent.IsKind(SyntaxKind.EqualsValueClause) && | ||
| objectCreation.Parent.Parent.IsKind(SyntaxKind.VariableDeclarator) && | ||
| objectCreation.Parent.Parent.Parent is VariableDeclarationSyntax variableDeclaration && | ||
| !variableDeclaration.Type.IsVar) | ||
| { | ||
| typeNode = variableDeclaration.Type; | ||
|
|
||
| var helper = CSharpUseImplicitTypeHelper.Instance; | ||
| if (helper.ShouldAnalyzeVariableDeclaration(variableDeclaration, cancellationToken) && | ||
| helper.AnalyzeTypeName(typeNode, semanticModel, optionSet, cancellationToken).IsStylePreferred) | ||
| { | ||
| // this is a case where the user would prefer 'var'. don't offer to use an implicit object here. | ||
| return; | ||
| } | ||
| } | ||
| else if (objectCreation.Parent.IsKind(SyntaxKind.ArrowExpressionClause)) | ||
| { | ||
| typeNode = objectCreation.Parent.Parent switch | ||
| { | ||
| LocalFunctionStatementSyntax localFunction => localFunction.ReturnType, | ||
| MethodDeclarationSyntax method => method.ReturnType, | ||
| ConversionOperatorDeclarationSyntax conversion => conversion.Type, | ||
| OperatorDeclarationSyntax op => op.ReturnType, | ||
| BasePropertyDeclarationSyntax property => property.Type, | ||
| AccessorDeclarationSyntax { RawKind: (int)SyntaxKind.GetAccessorDeclaration, Parent: AccessorListSyntax { Parent: BasePropertyDeclarationSyntax baseProperty } } accessor => baseProperty.Type, | ||
| _ => null, | ||
| }; | ||
| } | ||
| else | ||
| { | ||
| // more cases can be added here if we discover more cases we think the type is readily apparent from context. | ||
| return; | ||
| } | ||
|
|
||
| if (typeNode == null) | ||
| return; | ||
|
|
||
| // Only offer if the type being constructed is the exact same as the type being assigned into. We don't | ||
| // want to change semantics by trying to instantiate something else. | ||
| var leftType = semanticModel.GetTypeInfo(typeNode, cancellationToken).Type; | ||
| var rightType = semanticModel.GetTypeInfo(objectCreation, cancellationToken).Type; | ||
|
|
||
| if (leftType is null || rightType is null) | ||
| return; | ||
|
|
||
| if (leftType.IsErrorType() || rightType.IsErrorType()) | ||
| return; | ||
|
|
||
| if (!leftType.Equals(rightType, SymbolEqualityComparer.Default)) | ||
| return; | ||
|
|
||
| context.ReportDiagnostic(DiagnosticHelper.Create( | ||
| Descriptor, | ||
| objectCreation.Type.GetLocation(), | ||
| styleOption.Notification.Severity, | ||
| ImmutableArray.Create(objectCreation.GetLocation()), | ||
| properties: null)); | ||
| } | ||
| } | ||
| } |
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
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.