Merge pull request #36124 from CyrusNajmabadi/directiveCheck

Don't offer 'convert if to conditional' if it crosses a preprocessor directive.

Author: mavasani

src/EditorFeatures/CSharpTest/UseConditionalExpression/UseConditionalExpressionForReturnTests.cs

@@ -821,6 +821,26 @@ IEnumerable<bool> M(int a)
     {
         yield return a != 0;
     }
+}");
+        }
+
+        [WorkItem(36117, "https://github.com/dotnet/roslyn/issues/36117")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsUseConditionalExpression)]
+        public async Task TestMissingWhenCrossingPreprocessorDirective()
+        {
+            await TestMissingInRegularAndScriptAsync(
+@"
+class C
+{
+    int M()
+    {
+        bool check = true;
+#if true
+        [||]if (check)
+            return 3;
+#endif
+        return 2;
+    }
 }");
         }
     }

src/EditorFeatures/VisualBasicTest/UseConditionalExpression/UseConditionalExpressionForReturnTests.vb

@@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.UseConditionalExpr
         Public Async Function TestOnSimpleReturn() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         [||]if true
             return 0
@@ -28,7 +28,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as integer
         Return If(true, 0, 1)
     end function
@@ -39,7 +39,7 @@ end class")
         Public Async Function TestOnSimpleReturnNoBlocks() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         [||]if true
             return 0
@@ -49,7 +49,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as integer
         Return If(true, 0, 1)
     end function
@@ -60,7 +60,7 @@ end class")
         Public Async Function TestOnSimpleReturnNoBlocks_NotInBlock() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         if true
             [||]if true
@@ -72,7 +72,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as integer
         if true
             Return If(true, 0, 1)
@@ -85,7 +85,7 @@ end class")
         Public Async Function TestMissingReturnValue1() As Task
             Await TestMissingInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         [||]if true
             return 0
@@ -100,7 +100,7 @@ end class")
         Public Async Function TestMissingReturnValue2() As Task
             Await TestMissingInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         [||]if true
             return
@@ -115,7 +115,7 @@ end class")
         Public Async Function TestMissingReturnValue3() As Task
             Await TestMissingInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         [||]if true
             return
@@ -130,7 +130,7 @@ end class")
         Public Async Function TestWithNoElseBlockButFollowingReturn() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         [||]if true
             return 0
@@ -140,7 +140,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as integer
         Return If(true, 0, 1)
     end function
@@ -151,7 +151,7 @@ end class")
         Public Async Function TestMissingWithoutElse() As Task
             Await TestMissingInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         [||]if true
             return 0
@@ -164,7 +164,7 @@ end class")
         Public Async Function TestConversion1() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as object
         [||]if true
             return ""a""
@@ -174,7 +174,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as object
         Return If(true, ""a"", ""b"")
     end function
@@ -185,7 +185,7 @@ end class")
         Public Async Function TestConversion2() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as string
         [||]if true
             return ""a""
@@ -195,7 +195,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as string
         Return If(true, ""a"", nothing)
     end function
@@ -206,7 +206,7 @@ end class")
         Public Async Function TestConversion3() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as string
         [||]if true
             return nothing
@@ -216,7 +216,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as string
         Return If(true, nothing, DirectCast(nothing, String))
     end function
@@ -227,7 +227,7 @@ end class")
         Public Async Function TestKeepTriviaAroundIf() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         ' leading
         [||]if true
@@ -238,7 +238,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as integer
         ' leading
         Return If(true, 0, 1) ' trailing
@@ -250,7 +250,7 @@ end class")
         Public Async Function TestFixAll1() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         {|FixAllInDocument:if|} true
             return 0
@@ -266,7 +266,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as integer
         Return If(true, 0, 1)
 
@@ -279,7 +279,7 @@ end class")
         Public Async Function TestMultiLine1() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         [||]if true
             return Foo(
@@ -290,7 +290,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as integer
         Return If(true,
             Foo(
@@ -304,7 +304,7 @@ end class")
         Public Async Function TestMultiLine2() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         [||]if true
             return 0
@@ -315,7 +315,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as integer
         Return If(true,
             0,
@@ -329,7 +329,7 @@ end class")
         Public Async Function TestMultiLine3() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     function M() as integer
         [||]if true
             return Foo(
@@ -341,7 +341,7 @@ class
     end function
 end class",
 "
-class 
+class C
     function M() as integer
         Return If(true,
             Foo(
@@ -357,7 +357,7 @@ end class")
         Public Async Function TestOnYield() As Task
             Await TestInRegularAndScriptAsync(
 "
-class 
+class C
     iterator function M() as integer
         [||]if true
             yield 0
@@ -367,7 +367,7 @@ class
     end function
 end class",
 "
-class 
+class C
     iterator function M() as integer
         Yield If(true, 0, 1)
     end function
@@ -381,7 +381,7 @@ end class")
 "
 imports system.collections.generic
 
-class 
+class C
     iterator function M() as IEnumerable(of integer)
         [||]if true
             yield 0
@@ -393,10 +393,45 @@ end class",
 "
 imports system.collections.generic
 
-class 
+class C
     iterator function M() as IEnumerable(of integer)
         Yield If(true, 0, 1)
     end function
+end class")
+        End Function
+
+        <WorkItem(36117, "https://github.com/dotnet/roslyn/issues/36117")>
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsUseConditionalExpression)>
+        Public Async Function TestMissingWhenCrossingPreprocessorDirective1() As Task
+            Await TestMissingInRegularAndScriptAsync(
+"
+class C
+    function M() as integer
+        dim check as boolean = true
+#if true
+        [||]if check
+            return 3
+#end if
+        return 2
+    end function
+end class")
+        End Function
+
+        <WorkItem(36117, "https://github.com/dotnet/roslyn/issues/36117")>
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsUseConditionalExpression)>
+        Public Async Function TestMissingWhenCrossingPreprocessorDirective2() As Task
+            Await TestMissingInRegularAndScriptAsync(
+"
+class C
+    function M() as integer
+        dim check as boolean = true
+#if true
+        [||]if check
+            return 3
+        end if
+#end if
+        return 2
+    end function
 end class")
         End Function
     End Class

src/Features/Core/Portable/UseConditionalExpression/AbstractUseConditionalExpressionDiagnosticAnalyzer.cs

@@ -39,8 +39,7 @@ protected sealed override void InitializeWorker(AnalysisContext context)
         private void AnalyzeOperation(OperationAnalysisContext context)
         {
             var ifOperation = (IConditionalOperation)context.Operation;
-            var ifStatement = ifOperation.Syntax as TIfStatementSyntax;
-            if (ifStatement == null)
+            if (!(ifOperation.Syntax is TIfStatementSyntax ifStatement))
             {
                 return;
             }

src/Features/Core/Portable/UseConditionalExpression/ForReturn/UseConditionalExpressionForReturnHelpers.cs

@@ -35,8 +35,7 @@ public static bool TryMatchPattern(
 
             if (falseStatement == null)
             {
-                var parentBlock = ifOperation.Parent as IBlockOperation;
-                if (parentBlock == null)
+                if (!(ifOperation.Parent is IBlockOperation parentBlock))
                 {
                     return false;
                 }