Incorrect expansion of selection if followed by 'Else'

[sharwell]

Version Used: 15.3 Preview 1

🔗 Originally reported by Kevin O'Donovan: https://developercommunity.visualstudio.com/content/problem/65499/extract-method-refactoring-ignores-selection.html

Steps to Reproduce:

1. Use the following code

   Public Class Class1
   
       Private Function Method(arg As Integer?) As Boolean
           Dim something As Boolean
           If arg.HasValue Then
               something = True
           ElseIf arg.Value < 50 Then
               something = arg.Value > 15
           Else
               something = False
           End If
   
           Return something
       End Function
   
   End Class

2. Click in the left margin to select the line something = arg.Value > 15

3. Use the Extract Method refactoring

Expected Behavior:

Public Class Class1

    Private Function Method(arg As Integer?) As Boolean
        Dim something As Boolean
        If arg.HasValue Then
            something = True
        ElseIf arg.Value < 50 Then
            something = NewMethod(arg)
        Else
            something = False
        End If

        Return something
    End Function

    Private Shared Function NewMethod(arg As Integer?) As Boolean
        Return arg.Value > 15
    End Function
End Class

Actual Behavior:

Public Class Class1

    Private Function Method(arg As Integer?) As Boolean
        Dim something As Boolean
        something = NewMethod(arg)

        Return something
    End Function

    Private Shared Function NewMethod(arg As Integer?) As Boolean
        Dim something As Boolean

        If arg.HasValue Then
            something = True
        ElseIf arg.Value < 50 Then
            something = arg.Value > 15
        Else
            something = False
        End If

        Return something
    End Function
End Class