Skip to content

Fix crash and record diagnostic location in preview feature analyzer #5809

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.

Sign up for GitHub

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
buyaa-n merged 5 commits into from
Jan 27, 2022
Merged

Fix crash and record diagnostic location in preview feature analyzer #5809

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ba073c
Fix crash and record diagnostic location in preview feature analyzer
Youssef1313 Jan 24, 2022
f148db1
Update DetectPreviewFeatureAnalyzer.cs
Youssef1313 Jan 24, 2022
8dfb5c0
Update DetectPreviewFeatureAnalyzer.cs
Youssef1313 Jan 24, 2022
38ac4f0
Address feedback
Youssef1313 Jan 27, 2022
10921b2
Merge branch 'preview-features-nre' of https://github.com/Youssef1313…
Youssef1313 Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address feedback
  • Loading branch information
@Youssef1313
Youssef1313 committed Jan 27, 2022
commit 38ac4f0a83033161da4a18b5a83e4723db30a8ab
3 changes: 2 additions & 1 deletion ...lyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DetectPreviewFeatureTests.Classes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the MIT license. See License.txt in the project root for license information.

using System.Threading.Tasks;
using Test.Utilities;
using Xunit;
using VerifyCS = Test.Utilities.CSharpCodeFixVerifier<
Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer,
Expand Down Expand Up @@ -164,7 +165,7 @@ public abstract {type} AbClass
await test.RunAsync();
}

[Fact]
[Fact, WorkItem(5802, "https://github.com/dotnet/roslyn-analyzers/issues/5802")]
public async Task TestPartialClassWithFirstDeclarationNotHavingBaseTypes()
{
var test = TestCS(@"
Expand Down
44 changes: 6 additions & 38 deletions ...zers/VisualBasic/Microsoft.NetCore.Analyzers/Runtime/BasicDetectPreviewFeatureAnalyzer.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,47 +126,15 @@ Namespace Microsoft.NetCore.VisualBasic.Analyzers.Runtime

For Each syntaxReference In typeSymbolDeclaringReferences
Dim typeSymbolDefinition = syntaxReference.GetSyntax()
Dim classStatement = TryCast(typeSymbolDefinition, ClassStatementSyntax)
If classStatement IsNot Nothing Then
Dim classBlock = TryCast(classStatement.Parent, ClassBlockSyntax)
If classBlock IsNot Nothing Then
Dim typeStatement = TryCast(typeSymbolDefinition, TypeStatementSyntax)
If typeStatement IsNot Nothing Then
Dim typeBlock = TryCast(typeStatement.Parent, TypeBlockSyntax)
If typeBlock IsNot Nothing Then
Dim syntaxNode As SyntaxNode = Nothing
If TryGetPreviewInterfaceNodeForClassOrStructImplementingPreviewInterface(classBlock.Inherits, previewInterfaceSymbol, syntaxNode) Then
If TryGetPreviewInterfaceNodeForClassOrStructImplementingPreviewInterface(typeBlock.Inherits, previewInterfaceSymbol, syntaxNode) Then
Return syntaxNode
Else
If TryGetPreviewInterfaceNodeForClassOrStructImplementingPreviewInterface(classBlock.Implements, previewInterfaceSymbol, syntaxNode) Then
Return syntaxNode
End If
End If
End If
End If

Dim structStatement = TryCast(typeSymbolDefinition, StructureStatementSyntax)
If structStatement IsNot Nothing Then
Dim structBlock = TryCast(structStatement.Parent, StructureBlockSyntax)
If structBlock IsNot Nothing Then
Dim syntaxNode As SyntaxNode = Nothing
If TryGetPreviewInterfaceNodeForClassOrStructImplementingPreviewInterface(structBlock.Inherits, previewInterfaceSymbol, syntaxNode) Then
Return syntaxNode
Else
If TryGetPreviewInterfaceNodeForClassOrStructImplementingPreviewInterface(structBlock.Implements, previewInterfaceSymbol, syntaxNode) Then
Return syntaxNode
End If
End If
End If
End If

Dim interfaceStatement = TryCast(typeSymbolDefinition, InterfaceStatementSyntax)
If interfaceStatement IsNot Nothing Then
Dim interfaceBlock = TryCast(interfaceStatement.Parent, InterfaceBlockSyntax)
If interfaceBlock IsNot Nothing Then
Dim syntaxNode As SyntaxNode = Nothing
If TryGetPreviewInterfaceNodeForClassOrStructImplementingPreviewInterface(interfaceBlock.Implements, previewInterfaceSymbol, syntaxNode) Then
ElseIf TryGetPreviewInterfaceNodeForClassOrStructImplementingPreviewInterface(typeBlock.Implements, previewInterfaceSymbol, syntaxNode) Then
Return syntaxNode
Else
If TryGetPreviewInterfaceNodeForClassOrStructImplementingPreviewInterface(interfaceBlock.Inherits, previewInterfaceSymbol, syntaxNode) Then
Return syntaxNode
End If
End If
End If
End If
Expand Down