提交 48c7a2b2 编写于 作者: J John Hamby

Corrected formatting of a source file.

上级 8b7ac37b
......@@ -1009,71 +1009,71 @@ End Class
Dim isGeneratedCode = True
AddExpectedLocalDiagnostics(builder, isGeneratedCode, squiggledText, line, column, generatedCodeAnalysisFlagsOpt, diagnosticArgument)
' Type "Nested{0}"
squiggledText = String.Format("Nested{0}", i)
diagnosticArgument = squiggledText
line = 4
column = 16
isGeneratedCode = True
AddExpectedLocalDiagnostics(builder, isGeneratedCode, squiggledText, line, column, generatedCodeAnalysisFlagsOpt, diagnosticArgument)
' Type "NonGeneratedCode{0}"
squiggledText = String.Format("NonGeneratedCode{0}", i)
diagnosticArgument = squiggledText
line = 8
column = 7
isGeneratedCode = isGeneratedFile
AddExpectedLocalDiagnostics(builder, isGeneratedCode, squiggledText, line, column, generatedCodeAnalysisFlagsOpt, diagnosticArgument)
' Type "NestedGeneratedCode{0}"
squiggledText = String.Format("NestedGeneratedCode{0}", i)
diagnosticArgument = squiggledText
line = 10
column = 16
isGeneratedCode = True
AddExpectedLocalDiagnostics(builder, isGeneratedCode, squiggledText, line, column, generatedCodeAnalysisFlagsOpt, diagnosticArgument)
' File diagnostic
squiggledText = "Class" ' last token in file.
diagnosticArgument = file
line = 12
column = 5
isGeneratedCode = isGeneratedFile
AddExpectedLocalDiagnostics(builder, isGeneratedCode, squiggledText, line, column, generatedCodeAnalysisFlagsOpt, diagnosticArgument)
' Compilation end summary diagnostic (verify callbacks into analyzer)
' Analyzer always called for generated code, unless generated code analysis is explicitly disabled.
If generatedCodeAnalysisFlagsOpt Is Nothing OrElse (generatedCodeAnalysisFlagsOpt And GeneratedCodeAnalysisFlags.Analyze) <> 0 Then
sortedCallbackSymbolNames.Add(String.Format("GeneratedCode{0}", i))
sortedCallbackSymbolNames.Add(String.Format("Nested{0}", i))
sortedCallbackSymbolNames.Add(String.Format("NonGeneratedCode{0}", i))
sortedCallbackSymbolNames.Add(String.Format("NestedGeneratedCode{0}", i))
sortedCallbackTreePaths.Add(file)
ElseIf Not isGeneratedFile Then
' Analyzer always called for non-generated code.
sortedCallbackSymbolNames.Add(String.Format("NonGeneratedCode{0}", i))
sortedCallbackTreePaths.Add(file)
End If
Next
' Type "Nested{0}"
squiggledText = String.Format("Nested{0}", i)
diagnosticArgument = squiggledText
line = 4
column = 16
isGeneratedCode = True
AddExpectedLocalDiagnostics(builder, isGeneratedCode, squiggledText, line, column, generatedCodeAnalysisFlagsOpt, diagnosticArgument)
' Type "NonGeneratedCode{0}"
squiggledText = String.Format("NonGeneratedCode{0}", i)
diagnosticArgument = squiggledText
line = 8
column = 7
isGeneratedCode = isGeneratedFile
AddExpectedLocalDiagnostics(builder, isGeneratedCode, squiggledText, line, column, generatedCodeAnalysisFlagsOpt, diagnosticArgument)
' Type "NestedGeneratedCode{0}"
squiggledText = String.Format("NestedGeneratedCode{0}", i)
diagnosticArgument = squiggledText
line = 10
column = 16
isGeneratedCode = True
AddExpectedLocalDiagnostics(builder, isGeneratedCode, squiggledText, line, column, generatedCodeAnalysisFlagsOpt, diagnosticArgument)
' File diagnostic
squiggledText = "Class" ' last token in file.
diagnosticArgument = file
line = 12
column = 5
isGeneratedCode = isGeneratedFile
AddExpectedLocalDiagnostics(builder, isGeneratedCode, squiggledText, line, column, generatedCodeAnalysisFlagsOpt, diagnosticArgument)
' Compilation end summary diagnostic (verify callbacks into analyzer)
Dim arg1 = sortedCallbackSymbolNames.Join(",")
Dim arg2 = sortedCallbackTreePaths.Join(",")
AddExpectedNonLocalDiagnostic(builder, {arg1, arg2})
If compilation.Options.GeneralDiagnosticOption = ReportDiagnostic.Error Then
For i As Integer = 0 To builder.Count - 1
If DirectCast(builder(i).Code, String) <> GeneratedCodeAnalyzer.Error.Id Then
builder(i) = builder(i).WithWarningAsError(True)
End If
Next
' Analyzer always called for generated code, unless generated code analysis is explicitly disabled.
If generatedCodeAnalysisFlagsOpt Is Nothing OrElse (generatedCodeAnalysisFlagsOpt And GeneratedCodeAnalysisFlags.Analyze) <> 0 Then
sortedCallbackSymbolNames.Add(String.Format("GeneratedCode{0}", i))
sortedCallbackSymbolNames.Add(String.Format("Nested{0}", i))
sortedCallbackSymbolNames.Add(String.Format("NonGeneratedCode{0}", i))
sortedCallbackSymbolNames.Add(String.Format("NestedGeneratedCode{0}", i))
sortedCallbackTreePaths.Add(file)
ElseIf Not isGeneratedFile Then
' Analyzer always called for non-generated code.
sortedCallbackSymbolNames.Add(String.Format("NonGeneratedCode{0}", i))
sortedCallbackTreePaths.Add(file)
End If
Next
' Compilation end summary diagnostic (verify callbacks into analyzer)
Dim arg1 = sortedCallbackSymbolNames.Join(",")
Dim arg2 = sortedCallbackTreePaths.Join(",")
AddExpectedNonLocalDiagnostic(builder, {arg1, arg2})
If compilation.Options.GeneralDiagnosticOption = ReportDiagnostic.Error Then
For i As Integer = 0 To builder.Count - 1
If DirectCast(builder(i).Code, String) <> GeneratedCodeAnalyzer.Error.Id Then
builder(i) = builder(i).WithWarningAsError(True)
End If
Next
End If
Return builder.ToArrayAndFree()
End Function
Return builder.ToArrayAndFree()
End Function
Private Shared Sub AddExpectedLocalDiagnostics(
Private Shared Sub AddExpectedLocalDiagnostics(
builder As ArrayBuilder(Of DiagnosticDescription),
isGeneratedCode As Boolean,
squiggledText As String,
......@@ -1082,27 +1082,27 @@ End Class
generatedCodeAnalysisFlagsOpt As GeneratedCodeAnalysisFlags?,
ParamArray arguments As String())
' Always report diagnostics in generated code, unless explicitly suppressed or we are not even analyzing generated code.
Dim reportInGeneratedCode = generatedCodeAnalysisFlagsOpt Is Nothing OrElse
' Always report diagnostics in generated code, unless explicitly suppressed or we are not even analyzing generated code.
Dim reportInGeneratedCode = generatedCodeAnalysisFlagsOpt Is Nothing OrElse
((generatedCodeAnalysisFlagsOpt And GeneratedCodeAnalysisFlags.ReportDiagnostics) <> 0 AndAlso
(generatedCodeAnalysisFlagsOpt And GeneratedCodeAnalysisFlags.Analyze) <> 0)
If Not isGeneratedCode OrElse reportInGeneratedCode Then
Dim diag = Diagnostic(GeneratedCodeAnalyzer.Warning.Id, squiggledText).WithArguments(arguments).WithLocation(line, column)
builder.Add(diag)
If Not isGeneratedCode OrElse reportInGeneratedCode Then
Dim diag = Diagnostic(GeneratedCodeAnalyzer.Warning.Id, squiggledText).WithArguments(arguments).WithLocation(line, column)
builder.Add(diag)
diag = Diagnostic(GeneratedCodeAnalyzer.Error.Id, squiggledText).WithArguments(arguments).WithLocation(line, column)
builder.Add(diag)
End If
End Sub
diag = Diagnostic(GeneratedCodeAnalyzer.Error.Id, squiggledText).WithArguments(arguments).WithLocation(line, column)
builder.Add(diag)
End If
End Sub
Private Shared Sub AddExpectedNonLocalDiagnostic(builder As ArrayBuilder(Of DiagnosticDescription), ParamArray arguments As String())
AddExpectedDiagnostic(builder, GeneratedCodeAnalyzer.Summary.Id, Nothing, 1, 1, arguments)
End Sub
Private Shared Sub AddExpectedNonLocalDiagnostic(builder As ArrayBuilder(Of DiagnosticDescription), ParamArray arguments As String())
AddExpectedDiagnostic(builder, GeneratedCodeAnalyzer.Summary.Id, Nothing, 1, 1, arguments)
End Sub
Private Shared Sub AddExpectedDiagnostic(builder As ArrayBuilder(Of DiagnosticDescription), diagnosticId As String, squiggledText As String, line As Integer, column As Integer, ParamArray arguments As String())
Dim diag = Diagnostic(diagnosticId, squiggledText).WithArguments(arguments).WithLocation(line, column)
builder.Add(diag)
End Sub
End Class
Private Shared Sub AddExpectedDiagnostic(builder As ArrayBuilder(Of DiagnosticDescription), diagnosticId As String, squiggledText As String, line As Integer, column As Integer, ParamArray arguments As String())
Dim diag = Diagnostic(diagnosticId, squiggledText).WithArguments(arguments).WithLocation(line, column)
builder.Add(diag)
End Sub
End Class
End Namespace
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册