Skip to content

Commit

Permalink
Merge pull request #33170 from sharwell/rm-dead-code
Browse files Browse the repository at this point in the history
Remove dead code
  • Loading branch information
sharwell committed Feb 11, 2019
2 parents d260ee0 + da78b3e commit 5571adf
Showing 1 changed file with 0 additions and 20 deletions.
Expand Up @@ -37,11 +37,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Formatting
End If

Dim combinedTrivia = previousToken.TrailingTrivia.Concat(currentToken.LeadingTrivia)

If ColonTriviaFollowedByLineContinuation(combinedTrivia) Then
Return FormattingOperations.CreateAdjustNewLinesOperation(0, AdjustNewLinesOption.PreserveLines)
End If

Dim lastTrivia = combinedTrivia.LastOrDefault(AddressOf ColonOrLineContinuationTrivia)
If lastTrivia.RawKind = SyntaxKind.ColonTrivia Then
Return FormattingOperations.CreateAdjustNewLinesOperation(0, AdjustNewLinesOption.PreserveLines)
Expand Down Expand Up @@ -102,21 +97,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Formatting
Return trivia.RawKind = SyntaxKind.ColonTrivia OrElse trivia.RawKind = SyntaxKind.LineContinuationTrivia
End Function

Private Function ColonTriviaFollowedByLineContinuation(triviaList As IEnumerable(Of SyntaxTrivia)) As Boolean
Dim previousTrivia As SyntaxTrivia = Nothing
For Each trivia In triviaList
If previousTrivia.RawKind = SyntaxKind.None OrElse trivia.RawKind = SyntaxKind.None Then
Continue For
End If

If previousTrivia.RawKind = SyntaxKind.ColonTrivia AndAlso trivia.RawKind = SyntaxKind.LineContinuationTrivia Then
Return True
End If
Next

Return False
End Function

Private Function ContainEndOfLine(previousToken As SyntaxToken, nextToken As SyntaxToken) As Boolean
Return previousToken.TrailingTrivia.Any(SyntaxKind.EndOfLineTrivia) OrElse nextToken.LeadingTrivia.Any(SyntaxKind.EndOfLineTrivia)
End Function
Expand Down

0 comments on commit 5571adf

Please sign in to comment.