From 5003f8e40e41e432174b63853bd2e6846763b85d Mon Sep 17 00:00:00 2001
From: AlekseyTs <alekseyt@microsoft.com>
Date: Thu, 15 Dec 2016 15:39:19 -0800
Subject: [PATCH] =?UTF-8?q?Account=20for=20the=20fact=20that=20=E2=80=9CNo?=
 =?UTF-8?q?t=20<null=20of=20Boolean=3F>=E2=80=9D=20is=20not=20true.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #15223.
---
 .../ExtractMethod/ExtractMethodTests.ControlFlowAnalysis.vb   | 4 ++--
 .../ExtractMethod/ExtractMethodTests.SelectionValidator.vb    | 2 +-
 .../Portable/ExtractMethod/VisualBasicSelectionValidator.vb   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.ControlFlowAnalysis.vb b/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.ControlFlowAnalysis.vb
index c3dec1c5969..fea0c8d9351 100644
--- a/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.ControlFlowAnalysis.vb
+++ b/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.ControlFlowAnalysis.vb
@@ -248,7 +248,7 @@ End Class</text>
             End Function
 
             <WorkItem(540154, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540154")>
-            <Fact(Skip:= "https://github.com/dotnet/roslyn/issues/15223"), Trait(Traits.Feature, Traits.Features.ExtractMethod)>
+            <Fact, Trait(Traits.Feature, Traits.Features.ExtractMethod)>
             Public Async Function BugFix6313_1() As Task
                 Dim code = <text>Imports System
 
@@ -424,7 +424,7 @@ End Class</text>
             End Function
 
             <WorkItem(540154, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540154"), WorkItem(541484, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541484")>
-            <Fact(Skip:= "https://github.com/dotnet/roslyn/issues/15223"), Trait(Traits.Feature, Traits.Features.ExtractMethod)>
+            <Fact, Trait(Traits.Feature, Traits.Features.ExtractMethod)>
             Public Async Function BugFix6313_6() As Task
                 Dim code = <text>Imports System
 
diff --git a/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.SelectionValidator.vb b/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.SelectionValidator.vb
index 1cd1b9a0462..8af0e668107 100644
--- a/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.SelectionValidator.vb
+++ b/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.SelectionValidator.vb
@@ -512,7 +512,7 @@ End Class</text>
                 Await TestSelectionAsync(code)
             End Function
 
-            <Fact(Skip:= "https://github.com/dotnet/roslyn/issues/15223"), Trait(Traits.Feature, Traits.Features.ExtractMethod)>
+            <Fact, Trait(Traits.Feature, Traits.Features.ExtractMethod)>
             Public Async Function TestSelectReturnButNotAllCodePathsContainAReturn() As Task
                 Dim code = <text>Imports System
 Class A
diff --git a/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicSelectionValidator.vb b/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicSelectionValidator.vb
index 5edf0b90080..263da990bf1 100644
--- a/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicSelectionValidator.vb
+++ b/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicSelectionValidator.vb
@@ -593,8 +593,8 @@ result.ReadOutside().Any(Function(s) s Is local) Then
                 Return False
             End If
 
-            Dim match = (TryCast(container, MethodBlockBaseSyntax)?.EndBlockStatement.EndKeyword = nextToken) OrElse
-                        (TryCast(container, MultiLineLambdaExpressionSyntax)?.EndSubOrFunctionStatement.EndKeyword = nextToken)
+            Dim match = (TryCast(container, MethodBlockBaseSyntax)?.EndBlockStatement.EndKeyword = nextToken).GetValueOrDefault() OrElse
+                        (TryCast(container, MultiLineLambdaExpressionSyntax)?.EndSubOrFunctionStatement.EndKeyword = nextToken).GetValueOrDefault()
 
             If Not match Then
                 Return False
-- 
GitLab