Skip to content

Show 'else' within Ifs within Elses #734

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
rchande merged 2 commits into from
Feb 26, 2015
Merged

Show 'else' within Ifs within Elses #734

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73a916d
Show 'else' within Ifs within Elses
Feb 20, 2015
769a863
Don't walk up the tree to find the if/elseif block
Feb 20, 2015
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
31 changes: 31 additions & 0 deletions src/EditorFeatures/VisualBasicTest/Recommendations/Statements/ElseKeywordRecommenderTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,37 @@ Select Case x
Select Case x
Case |
Case 1
</MethodBody>, "Else")
End Sub

<Fact>
<Trait(Traits.Feature, Traits.Features.KeywordRecommending)>

@dpoeschl dpoeschl Feb 20, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<WorkItem(...)>

Public Sub ElseWithinIfWithinElse()
VerifyRecommendationsContain(
<MethodBody>
If True Then

Else
If False Then
|
End If
End If
</MethodBody>, "Else")
End Sub

<Fact>
<Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
Public Sub ElseWithinElseIfWithinElse()
VerifyRecommendationsContain(
<MethodBody>
If True Then

Else
If False Then
ElseIf True
|
End If
End If
</MethodBody>, "Else")
End Sub
End Class
Expand Down
20 changes: 19 additions & 1 deletion src/Features/VisualBasic/Completion/KeywordRecommenders/Statements/ElseKeywordRecommender.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.KeywordRecommenders.Stat

If context.IsSingleLineStatementContext AndAlso
context.IsInStatementBlockOfKind(SyntaxKind.MultiLineIfBlock, SyntaxKind.ElseIfBlock) AndAlso
Not context.IsInStatementBlockOfKind(SyntaxKind.ElseBlock) Then
IsNotDirectlyInElseBlock(context) Then

Return SpecializedCollections.SingletonEnumerable(New RecommendedKeyword("Else", VBFeaturesResources.ElseKeywordToolTip))
End If
Expand All @@ -45,5 +45,23 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.KeywordRecommenders.Stat

Return SpecializedCollections.EmptyEnumerable(Of RecommendedKeyword)()
End Function

Private Function IsNotDirectlyInElseBlock(context As VisualBasicSyntaxContext) As Boolean

@dpoeschl dpoeschl Feb 20, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on the current implementation, this method name seems wrong ("directness" isn't required)

Dim parent = context.TargetToken.Parent
Do While parent IsNot Nothing
If parent.IsKind(SyntaxKind.MultiLineIfBlock, SyntaxKind.ElseIfBlock) Then
Return True
End If

If parent.IsKind(SyntaxKind.ElseBlock) Then
Return False
End If

parent = parent.Parent

@Pilchie Pilchie Feb 20, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a case where we actually have to go up multiple levels, or should this just look at parent and then stop?

@dpoeschl dpoeschl Feb 20, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will we offer "Else" inside a more nested scope (say, a Do While loop) just because the Do While loop itself is in an If?

@rchande rchande Feb 20, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we can just look at the parents of the TargetToken.

Loop

' We already know we're inside a Multiline If or ElseIf
Throw ExceptionUtilities.Unreachable
End Function
End Class
End Namespace