-
Notifications
You must be signed in to change notification settings - Fork 6
Add analyzer and code fix for public types in Lucene.Net.Support, #1100 #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
fa11b30
Add analyzer for public types in Support namespace
paulirwin 3c8150c
Remove migrated resource for code fix title
paulirwin 2c17fe9
Remove .globalconfig file
paulirwin 5f7624f
Upgrade RAT to 0.16.1, clean up line endings after running
paulirwin a091021
Fix casing of code fix provider name
paulirwin 729e2d5
Fix code fix with partial classes
paulirwin fe58038
Revert Markdown changes and exclude from RAT
paulirwin 13a7c86
RAT exclude only AnalyzerReleases files; fix warning about AnalyzerRe…
paulirwin ca536ff
Use MajorMinorVersion instead of Version
paulirwin bd72042
Fix code fix to preserve license headers and comments
paulirwin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,2 @@ | ||
| roslyn_correctness.assembly_reference_validation = relaxed | ||
|
|
||
This file contains hidden or 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
102 changes: 102 additions & 0 deletions
102
...Dev.CodeFixes/LuceneDev1xxx/LuceneDev1005_LuceneNetSupportPublicTypesCsCodeFixProvider.cs
This file contains hidden or 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,102 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| using System.Collections.Immutable; | ||
| using System.Composition; | ||
| using System.Linq; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using Lucene.Net.CodeAnalysis.Dev.CodeFixes; | ||
| using Lucene.Net.CodeAnalysis.Dev.CodeFixes.Utility; | ||
| using Lucene.Net.CodeAnalysis.Dev.Utility; | ||
| using Microsoft.CodeAnalysis; | ||
| using Microsoft.CodeAnalysis.CodeFixes; | ||
| using Microsoft.CodeAnalysis.CSharp.Syntax; | ||
| using SyntaxFactory = Microsoft.CodeAnalysis.CSharp.SyntaxFactory; | ||
| using SyntaxKind = Microsoft.CodeAnalysis.CSharp.SyntaxKind; | ||
|
|
||
| namespace Lucene.Net.CodeAnalysis.Dev; | ||
|
|
||
| [ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(LuceneDev1005_LuceneNetSupportPublicTypesCsCodeFixProvider)), Shared] | ||
| public class LuceneDev1005_LuceneNetSupportPublicTypesCsCodeFixProvider : CodeFixProvider | ||
|
paulirwin marked this conversation as resolved.
Outdated
|
||
| { | ||
| // Specify the diagnostic IDs of analyzers that are expected to be linked. | ||
| public sealed override ImmutableArray<string> FixableDiagnosticIds { get; } = | ||
| [Descriptors.LuceneDev1005_LuceneNetSupportPublicTypes.Id]; | ||
|
|
||
| public override FixAllProvider? GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer; | ||
|
|
||
| public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context) | ||
| { | ||
| // We link only one diagnostic and assume there is only one diagnostic in the context. | ||
| var diagnostic = context.Diagnostics.Single(); | ||
|
|
||
| // 'SourceSpan' of 'Location' is the highlighted area. We're going to use this area to find the 'SyntaxNode' to rename. | ||
| var diagnosticSpan = diagnostic.Location.SourceSpan; | ||
|
|
||
| // Get the root of Syntax Tree that contains the highlighted diagnostic. | ||
| var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false); | ||
|
|
||
| // Find SyntaxNode corresponding to the diagnostic. | ||
| var diagnosticNode = root?.FindNode(diagnosticSpan); | ||
|
|
||
| if (diagnosticNode is MemberDeclarationSyntax declaration) | ||
| { | ||
| var name = declaration switch | ||
| { | ||
| BaseTypeDeclarationSyntax baseTypeDeclaration => baseTypeDeclaration.Identifier.ToString(), | ||
| DelegateDeclarationSyntax delegateDeclaration => delegateDeclaration.Identifier.ToString(), | ||
| _ => null | ||
| }; | ||
|
|
||
| if (name == null) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| // Register a code action that will invoke the fix. | ||
| context.RegisterCodeFix( | ||
| CodeActionHelper.CreateFromResource( | ||
| CodeFixResources.MakeXInternal, | ||
| createChangedSolution: c => MakeDeclarationInternal(context.Document, declaration, c), | ||
| "MakeDeclarationInternal", | ||
| name), | ||
| diagnostic); | ||
| } | ||
| } | ||
|
|
||
| private async Task<Solution> MakeDeclarationInternal(Document document, | ||
| MemberDeclarationSyntax memberDeclaration, | ||
| CancellationToken cancellationToken) | ||
| { | ||
| var syntaxRoot = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false); | ||
| if (syntaxRoot == null) return document.Project.Solution; | ||
|
|
||
| // Remove existing accessibility modifiers | ||
| var newModifiers = SyntaxFactory.TokenList( | ||
| memberDeclaration.Modifiers | ||
| .Where(modifier => !modifier.IsKind(SyntaxKind.PrivateKeyword) && | ||
| !modifier.IsKind(SyntaxKind.ProtectedKeyword) && | ||
| !modifier.IsKind(SyntaxKind.InternalKeyword) && | ||
| !modifier.IsKind(SyntaxKind.PublicKeyword)) | ||
| ).Insert(0, SyntaxFactory.Token(SyntaxKind.InternalKeyword)); // Ensure 'internal' is the first modifier | ||
|
|
||
| var newMemberDeclaration = memberDeclaration.WithModifiers(newModifiers); | ||
| var newRoot = syntaxRoot.ReplaceNode(memberDeclaration, newMemberDeclaration); | ||
| return document.Project.Solution.WithDocumentSyntaxRoot(document.Id, newRoot); | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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
28 changes: 28 additions & 0 deletions
28
src/Lucene.Net.CodeAnalysis.Dev.Sample/LuceneDev1005Sample_BlockScopedNamespace.cs
This file contains hidden or 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,28 @@ | ||
| namespace Lucene.Net.Support.BlockScoped | ||
| { | ||
| public class PublicClass | ||
| { | ||
| } | ||
|
|
||
| public interface PublicInterface | ||
| { | ||
| } | ||
|
|
||
| public enum PublicEnum | ||
| { | ||
| } | ||
|
|
||
| public delegate void PublicDelegate(); | ||
|
|
||
| public struct PublicStruct | ||
| { | ||
| } | ||
|
|
||
| public record PublicRecord | ||
| { | ||
| } | ||
|
|
||
| public record struct PublicRecordStruct | ||
| { | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
src/Lucene.Net.CodeAnalysis.Dev.Sample/LuceneDev1005Sample_FileScopedNamespace.cs
This file contains hidden or 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,27 @@ | ||
| namespace Lucene.Net.Support; | ||
|
|
||
| public class PublicClass | ||
| { | ||
| } | ||
|
|
||
| public interface PublicInterface | ||
| { | ||
| } | ||
|
|
||
| public enum PublicEnum | ||
| { | ||
| } | ||
|
|
||
| public delegate void PublicDelegate(); | ||
|
|
||
| public struct PublicStruct | ||
| { | ||
| } | ||
|
|
||
| public record PublicRecord | ||
| { | ||
| } | ||
|
|
||
| public record struct PublicRecordStruct | ||
| { | ||
| } |
This file contains hidden or 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 |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| ### New Rules | ||
|
|
||
| Rule ID | Category | Severity | Notes | ||
| Rule ID | Category | Severity | Notes | ||
| ---------------|----------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------- | ||
| LuceneDev1005 | Design | Warning | Types in the Lucene.Net.Support namespace should not be public |
81 changes: 81 additions & 0 deletions
81
...CodeAnalysis.Dev/LuceneDev1xxx/LuceneDev1005_LuceneNetSupportPublicTypesCSCodeAnalyzer.cs
This file contains hidden or 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,81 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| using Microsoft.CodeAnalysis; | ||
| using Microsoft.CodeAnalysis.CSharp; | ||
| using Microsoft.CodeAnalysis.CSharp.Syntax; | ||
| using Microsoft.CodeAnalysis.Diagnostics; | ||
| using System.Collections.Immutable; | ||
| using Lucene.Net.CodeAnalysis.Dev.Utility; | ||
|
|
||
| namespace Lucene.Net.CodeAnalysis.Dev | ||
| { | ||
| [DiagnosticAnalyzer(LanguageNames.CSharp)] | ||
| public class LuceneDev1005_LuceneNetSupportPublicTypesCSCodeAnalyzer : DiagnosticAnalyzer | ||
|
paulirwin marked this conversation as resolved.
|
||
| { | ||
| public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => [Descriptors.LuceneDev1005_LuceneNetSupportPublicTypes]; | ||
|
|
||
| public override void Initialize(AnalysisContext context) | ||
| { | ||
| context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze); | ||
| context.EnableConcurrentExecution(); | ||
| context.RegisterSyntaxNodeAction(AnalyzeSyntax, | ||
| SyntaxKind.ClassDeclaration, | ||
| SyntaxKind.EnumDeclaration, | ||
| SyntaxKind.InterfaceDeclaration, | ||
| SyntaxKind.RecordDeclaration, | ||
| SyntaxKind.StructDeclaration, | ||
| SyntaxKind.RecordStructDeclaration, | ||
| SyntaxKind.DelegateDeclaration); | ||
| } | ||
|
|
||
| private static void AnalyzeSyntax(SyntaxNodeAnalysisContext context) | ||
| { | ||
| // any public types in the Lucene.Net.Support (or child) namespace should raise the diagnostic | ||
| if (context.Node.Parent is not BaseNamespaceDeclarationSyntax namespaceDeclarationSyntax | ||
| || !namespaceDeclarationSyntax.Name.ToString().StartsWith("Lucene.Net.Support")) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| if (context.Node is DelegateDeclarationSyntax delegateDeclarationSyntax | ||
| && delegateDeclarationSyntax.Modifiers.Any(SyntaxKind.PublicKeyword)) | ||
| { | ||
| const string typeKind = "Delegate"; | ||
| context.ReportDiagnostic(Diagnostic.Create(Descriptors.LuceneDev1005_LuceneNetSupportPublicTypes, delegateDeclarationSyntax.GetLocation(), typeKind, delegateDeclarationSyntax.Identifier.ToString())); | ||
| } | ||
| else if (context.Node is BaseTypeDeclarationSyntax baseTypeDeclarationSyntax | ||
| && baseTypeDeclarationSyntax.Modifiers.Any(SyntaxKind.PublicKeyword)) | ||
| { | ||
| var typeKind = context.Node switch | ||
| { | ||
| ClassDeclarationSyntax => "Class", | ||
| EnumDeclarationSyntax => "Enum", | ||
| InterfaceDeclarationSyntax => "Interface", | ||
| RecordDeclarationSyntax record when record.ClassOrStructKeyword.IsKind(SyntaxKind.StructKeyword) => "Record struct", | ||
| RecordDeclarationSyntax => "Record", | ||
| StructDeclarationSyntax => "Struct", | ||
| _ => "Type", // should not happen | ||
| }; | ||
|
|
||
| context.ReportDiagnostic(Diagnostic.Create(Descriptors.LuceneDev1005_LuceneNetSupportPublicTypes, baseTypeDeclarationSyntax.GetLocation(), typeKind, baseTypeDeclarationSyntax.Identifier.ToString())); | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.