Fix build & control flow analysis

Mike Krüger · Mike Krüger · commit 96cf74664fd5 · 2017-08-23T09:16:12.000+02:00
diff --git a/RefactoringEssentials/CSharp/Diagnostics/Synced/CodeQuality/FunctionNeverReturnsAnalyzer.cs b/RefactoringEssentials/CSharp/Diagnostics/Synced/CodeQuality/FunctionNeverReturnsAnalyzer.cs
@@ -6,7 +6,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using RefactoringEssentials.Util.Analysis;
-
+/*
 namespace RefactoringEssentials.CSharp.Diagnostics
 {
 	[DiagnosticAnalyzer(LanguageNames.CSharp)]
@@ -294,4 +294,4 @@ bool CheckRecursion(SyntaxNode node)
             }
         }
     }
-}
+}*/
diff --git a/RefactoringEssentials/Util/Analysis/ControlFlow.cs b/RefactoringEssentials/Util/Analysis/ControlFlow.cs
@@ -393,7 +393,7 @@ public override void VisitLocalDeclarationStatement(LocalDeclarationStatementSyn
             {
                 CreateConnectedEndNode(node);
             }
-
+            
             public override void VisitExpressionStatement(ExpressionStatementSyntax node)
             {
                 CreateConnectedEndNode(node);
@@ -770,6 +770,11 @@ public override void VisitFixedStatement(FixedStatementSyntax node)
                 HandleEmbeddedStatement(node.Statement, curNode);
                 CreateConnectedEndNode(node);
             }
+
+            public override void VisitLocalFunctionStatement(LocalFunctionStatementSyntax node)
+            {
+                // not connected to the control flow
+            }
         }
 
         ///// <summary>
diff --git a/Tests/CSharp/CodeRefactorings/CreateIndexerTests.cs b/Tests/CSharp/CodeRefactorings/CreateIndexerTests.cs
@@ -1,7 +1,7 @@
 using System;
 using RefactoringEssentials.CSharp.CodeRefactorings;
 using Xunit;
-
+/*
 namespace RefactoringEssentials.Tests.CSharp.CodeRefactorings
 {
     public class CreateIndexerTests : CSharpCodeRefactoringTestBase
@@ -162,3 +162,4 @@ public void Test ()
     }
 }
 
+*/
diff --git a/Tests/CSharp/CodeRefactorings/IntroduceConstantTests.cs b/Tests/CSharp/CodeRefactorings/IntroduceConstantTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.CodeRefactorings;
 using Xunit;
 
@@ -119,4 +120,4 @@ public void TestIntroduceConstantInInitializer()
 }");
         }
     }
-}
+}*/
diff --git a/Tests/CSharp/CodeRefactorings/LinqFluentToQueryTests.cs b/Tests/CSharp/CodeRefactorings/LinqFluentToQueryTests.cs
@@ -1,4 +1,4 @@
-using RefactoringEssentials.CSharp.CodeRefactorings;
+/*using RefactoringEssentials.CSharp.CodeRefactorings;
 using Xunit;
 
 namespace RefactoringEssentials.Tests.CSharp.CodeRefactorings
@@ -599,3 +599,4 @@ select _2
     }
 }
 
+*/
diff --git a/Tests/CSharp/CodeRefactorings/LinqQueryToFluentTests.cs b/Tests/CSharp/CodeRefactorings/LinqQueryToFluentTests.cs
@@ -1,4 +1,4 @@
-using RefactoringEssentials.CSharp.CodeRefactorings;
+/*using RefactoringEssentials.CSharp.CodeRefactorings;
 using Xunit;
 
 namespace RefactoringEssentials.Tests.CSharp.CodeRefactorings
@@ -660,3 +660,4 @@ public void TestMethod()
     }
 }
 
+*/
diff --git a/Tests/CSharp/CodeRefactorings/MoveToOuterScopeTests.cs b/Tests/CSharp/CodeRefactorings/MoveToOuterScopeTests.cs
@@ -1,4 +1,4 @@
-using RefactoringEssentials.CSharp.CodeRefactorings;
+/*using RefactoringEssentials.CSharp.CodeRefactorings;
 using Xunit;
 
 namespace RefactoringEssentials.Tests.CSharp.CodeRefactorings
@@ -126,3 +126,4 @@ public A()
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/AdditionalOfTypeTests.cs b/Tests/CSharp/Diagnostics/AdditionalOfTypeTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -38,4 +39,4 @@ public void Foo(object[] obj)
 }");
         }
     }
-}
+}*/
diff --git a/Tests/CSharp/Diagnostics/CS1573ParameterHasNoMatchingParamTagTests.cs b/Tests/CSharp/Diagnostics/CS1573ParameterHasNoMatchingParamTagTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -79,3 +80,4 @@ public void FooBar(int x, int y, int z)
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/CheckNamespaceTests.cs b/Tests/CSharp/Diagnostics/CheckNamespaceTests.cs
@@ -1,4 +1,4 @@
-using RefactoringEssentials.CSharp.Diagnostics;
+/*using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
 namespace RefactoringEssentials.Tests.CSharp.Diagnostics
@@ -42,3 +42,4 @@ namespace Foo {}");
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/ConvertToAutoPropertyTests.cs b/Tests/CSharp/Diagnostics/ConvertToAutoPropertyTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -159,3 +160,4 @@ Boolean WillUpdate {
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/ConvertToConstantTests.cs b/Tests/CSharp/Diagnostics/ConvertToConstantTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -417,3 +418,4 @@ public static void Main (string[] args)
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/ConvertToLambdaExpressionTests.cs b/Tests/CSharp/Diagnostics/ConvertToLambdaExpressionTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -172,3 +173,4 @@ void TestMethod ()
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/ForCanBeConvertedToForeachTests.cs b/Tests/CSharp/Diagnostics/ForCanBeConvertedToForeachTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -199,3 +200,4 @@ void Foo (object[] o)
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/FunctionNeverReturnsTests.cs b/Tests/CSharp/Diagnostics/FunctionNeverReturnsTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -636,3 +637,4 @@ void Test()
         }
     }
 }
+*/
diff --git a/Tests/CSharp/Diagnostics/LockThisTests.cs b/Tests/CSharp/Diagnostics/LockThisTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -714,3 +715,4 @@ public void TestMethod ()
         }
     }
 }
+*/
diff --git a/Tests/CSharp/Diagnostics/NegativeRelationalExpressionTests.cs b/Tests/CSharp/Diagnostics/NegativeRelationalExpressionTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -126,3 +127,4 @@ void TestMethod (bool a, bool b)
 
     }
 }
+*/
diff --git a/Tests/CSharp/Diagnostics/OptionalParameterHierarchyMismatchTests.cs b/Tests/CSharp/Diagnostics/OptionalParameterHierarchyMismatchTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -292,4 +293,4 @@ void IA.Foo(int a)
 }");
         }
     }
-}
+}*/
diff --git a/Tests/CSharp/Diagnostics/ParameterCanBeDemotedIssue/ParameterCanBeDeclaredWithBaseTypeIssueTests.cs b/Tests/CSharp/Diagnostics/ParameterCanBeDemotedIssue/ParameterCanBeDeclaredWithBaseTypeIssueTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -881,3 +882,4 @@ int Foo (ICollection<object> arr)
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/PolymorphicFieldLikeEventInvocationTests.cs b/Tests/CSharp/Diagnostics/PolymorphicFieldLikeEventInvocationTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -83,3 +84,4 @@ public void FooBar()
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/PossibleAssignmentToReadonlyFieldTests.cs b/Tests/CSharp/Diagnostics/PossibleAssignmentToReadonlyFieldTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -169,3 +170,4 @@ void Test ()
 
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/PossibleMultipleEnumerationTests.cs b/Tests/CSharp/Diagnostics/PossibleMultipleEnumerationTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -702,3 +703,4 @@ void TestMethod ()
         }
     }
 }
+*/
diff --git a/Tests/CSharp/Diagnostics/RedundantArgumentDefaultValueTests.cs b/Tests/CSharp/Diagnostics/RedundantArgumentDefaultValueTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -406,3 +407,4 @@ void Bar()
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/RedundantAssignmentIssueTests.cs b/Tests/CSharp/Diagnostics/RedundantAssignmentIssueTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -519,4 +520,4 @@ public static void Main ()
 ", 0);
         }
     }
-}
+}*/
diff --git a/Tests/CSharp/Diagnostics/RedundantBoolCompareTests.cs b/Tests/CSharp/Diagnostics/RedundantBoolCompareTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -89,3 +90,4 @@ void TestMethod (bool? x)
         }
     }
 }
+*/
diff --git a/Tests/CSharp/Diagnostics/RedundantCatchClauseTests.cs b/Tests/CSharp/Diagnostics/RedundantCatchClauseTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -258,3 +259,4 @@ public void Foo() {
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/RedundantComparisonWithNullTests.cs b/Tests/CSharp/Diagnostics/RedundantComparisonWithNullTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -99,4 +100,4 @@ public void Test(object o)
 }");
         }
     }
-}
+}*/
diff --git a/Tests/CSharp/Diagnostics/RedundantEnumerableCastCallTests.cs b/Tests/CSharp/Diagnostics/RedundantEnumerableCastCallTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -167,3 +168,4 @@ static void Main (IEnumerable<string> args)
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/RedundantExplicitArrayCreationTests.cs b/Tests/CSharp/Diagnostics/RedundantExplicitArrayCreationTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -73,3 +74,4 @@ void Foo ()
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/RedundantExtendsListEntryTests.cs b/Tests/CSharp/Diagnostics/RedundantExtendsListEntryTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -173,4 +174,4 @@ public class Foo: baseClass, interf
 ");
         }
     }
-}
+}*/
diff --git a/Tests/CSharp/Diagnostics/RedundantLambdaParameterTypeTests.cs b/Tests/CSharp/Diagnostics/RedundantLambdaParameterTypeTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -174,4 +175,4 @@ public static void ExecuteCSharp3_0()
 }");
         }
     }
-}
+}*/
diff --git a/Tests/CSharp/Diagnostics/RedundantLambdaSignatureParenthesesTests.cs b/Tests/CSharp/Diagnostics/RedundantLambdaSignatureParenthesesTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -103,3 +104,4 @@ public static void Foo()
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/RedundantLogicalConditionalExpressionOperandTests.cs b/Tests/CSharp/Diagnostics/RedundantLogicalConditionalExpressionOperandTests.cs
@@ -1,3 +1,4 @@
+/*
 using RefactoringEssentials.CSharp.Diagnostics;
 using Xunit;
 
@@ -139,3 +140,4 @@ void Foo ()
     }
 }
 
+*/
diff --git a/Tests/CSharp/Diagnostics/RedundantObjectOrCollectionInitializerTests.cs b/Tests/CSharp/Diagnostics/RedundantObjectOrCollectionInitializerTests.cs
diff --git a/Tests/CSharp/Diagnostics/RedundantOverriddenMemberTests.cs b/Tests/CSharp/Diagnostics/RedundantOverriddenMemberTests.cs
diff --git a/Tests/CSharp/Diagnostics/ReferenceEqualsWithValueTypeTests.cs b/Tests/CSharp/Diagnostics/ReferenceEqualsWithValueTypeTests.cs
diff --git a/Tests/CSharp/Diagnostics/StaticEventSubscriptionTests.cs b/Tests/CSharp/Diagnostics/StaticEventSubscriptionTests.cs
diff --git a/Tests/CSharp/Diagnostics/StringCompareIsCultureSpecificTests.cs b/Tests/CSharp/Diagnostics/StringCompareIsCultureSpecificTests.cs
diff --git a/Tests/CSharp/Diagnostics/UnusedAnonymousMethodSignatureTests.cs b/Tests/CSharp/Diagnostics/UnusedAnonymousMethodSignatureTests.cs
diff --git a/Tests/CSharp/Diagnostics/UseArrayCreationExpressionTests.cs b/Tests/CSharp/Diagnostics/UseArrayCreationExpressionTests.cs
diff --git a/Tests/CSharp/Diagnostics/UseIsOperatorTests.cs b/Tests/CSharp/Diagnostics/UseIsOperatorTests.cs
diff --git a/Tests/CSharp/Diagnostics/UseMethodIsInstanceOfTypeTests.cs b/Tests/CSharp/Diagnostics/UseMethodIsInstanceOfTypeTests.cs

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using Microsoft.CodeAnalysis.CSharp;`
`7`	`7`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
`8`	`8`	`using RefactoringEssentials.Util.Analysis;`
`9`		`-`
	`9`	`+/*`
`10`	`10`	`namespace RefactoringEssentials.CSharp.Diagnostics`
`11`	`11`	`{`
`12`	`12`	`[DiagnosticAnalyzer(LanguageNames.CSharp)]`
`@@ -294,4 +294,4 @@ bool CheckRecursion(SyntaxNode node)`
`294`	`294`	`}`
`295`	`295`	`}`
`296`	`296`	`}`
`297`		`-}`
	`297`	`+}*/`
Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ public override void VisitLocalDeclarationStatement(LocalDeclarationStatementSyn`
`393`	`393`	`{`
`394`	`394`	`CreateConnectedEndNode(node);`
`395`	`395`	`}`
`396`		`-`
	`396`	`+`
`397`	`397`	`public override void VisitExpressionStatement(ExpressionStatementSyntax node)`
`398`	`398`	`{`
`399`	`399`	`CreateConnectedEndNode(node);`
`@@ -770,6 +770,11 @@ public override void VisitFixedStatement(FixedStatementSyntax node)`
`770`	`770`	`HandleEmbeddedStatement(node.Statement, curNode);`
`771`	`771`	`CreateConnectedEndNode(node);`
`772`	`772`	`}`
	`773`	`+`
	`774`	`+ public override void VisitLocalFunctionStatement(LocalFunctionStatementSyntax node)`
	`775`	`+ {`
	`776`	`+ // not connected to the control flow`
	`777`	`+ }`
`773`	`778`	`}`
`774`	`779`
`775`	`780`	`///// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using RefactoringEssentials.CSharp.CodeRefactorings;`
`3`	`3`	`using Xunit;`
`4`		`-`
	`4`	`+/*`
`5`	`5`	`namespace RefactoringEssentials.Tests.CSharp.CodeRefactorings`
`6`	`6`	`{`
`7`	`7`	`public class CreateIndexerTests : CSharpCodeRefactoringTestBase`
`@@ -162,3 +162,4 @@ public void Test ()`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
	`165`	`+*/`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/*`
`1`	`2`	`using RefactoringEssentials.CSharp.CodeRefactorings;`
`2`	`3`	`using Xunit;`
`3`	`4`
`@@ -119,4 +120,4 @@ public void TestIntroduceConstantInInitializer()`
`119`	`120`	`}");`
`120`	`121`	`}`
`121`	`122`	`}`
`122`		`-}`
	`123`	`+}*/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using RefactoringEssentials.CSharp.CodeRefactorings;`
	`1`	`+/*using RefactoringEssentials.CSharp.CodeRefactorings;`
`2`	`2`	`using Xunit;`
`3`	`3`
`4`	`4`	`namespace RefactoringEssentials.Tests.CSharp.CodeRefactorings`
`@@ -599,3 +599,4 @@ select _2`
`599`	`599`	`}`
`600`	`600`	`}`
`601`	`601`
	`602`	`+*/`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/*`
`1`	`2`	`using RefactoringEssentials.CSharp.Diagnostics;`
`2`	`3`	`using Xunit;`
`3`	`4`
`@@ -38,4 +39,4 @@ public void Foo(object[] obj)`
`38`	`39`	`}");`
`39`	`40`	`}`
`40`	`41`	`}`
`41`		`-}`
	`42`	`+}*/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using RefactoringEssentials.CSharp.Diagnostics;`
	`1`	`+/*using RefactoringEssentials.CSharp.Diagnostics;`
`2`	`2`	`using Xunit;`
`3`	`3`
`4`	`4`	`namespace RefactoringEssentials.Tests.CSharp.Diagnostics`
`@@ -42,3 +42,4 @@ namespace Foo {}");`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
	`45`	`+*/`