From d72c63aa31b543069d3737d493089d2ba7540edf Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrus.najmabadi@gmail.com>
Date: Fri, 28 Jun 2019 16:04:36 -0700
Subject: [PATCH] Use local functions

---
 .../CSharp/Impl/CodeModel/CSharpCodeModelService.cs  |  3 +--
 .../Impl/CodeModel/MethodXml/MethodXmlBuilder.cs     |  3 +--
 .../Portable/CodeGeneration/CSharpSyntaxGenerator.cs |  5 +----
 .../CoreTest/SolutionTests/SolutionTests.cs          | 12 ++++++------
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/VisualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.cs b/src/VisualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.cs
index 5ee155d1872..cbc27ffdc69 100644
--- a/src/VisualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.cs
+++ b/src/VisualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.cs
@@ -2693,8 +2693,7 @@ public override EnvDTE80.vsCMPropertyKind GetReadWrite(SyntaxNode memberNode)
         {
             Debug.Assert(memberNode is BasePropertyDeclarationSyntax);
 
-            var property = memberNode as BasePropertyDeclarationSyntax;
-            if (property == null)
+            if (!(memberNode is BasePropertyDeclarationSyntax property))
             {
                 throw Exceptions.ThrowEFail();
             }
diff --git a/src/VisualStudio/CSharp/Impl/CodeModel/MethodXml/MethodXmlBuilder.cs b/src/VisualStudio/CSharp/Impl/CodeModel/MethodXml/MethodXmlBuilder.cs
index a46193d12d7..1c5377f5a86 100644
--- a/src/VisualStudio/CSharp/Impl/CodeModel/MethodXml/MethodXmlBuilder.cs
+++ b/src/VisualStudio/CSharp/Impl/CodeModel/MethodXml/MethodXmlBuilder.cs
@@ -384,8 +384,7 @@ private bool TryGenerateCast(CastExpressionSyntax castExpression)
 
         private bool TryGenerateNewClass(ObjectCreationExpressionSyntax objectCreationExpression)
         {
-            var type = SemanticModel.GetSymbolInfo(objectCreationExpression.Type).Symbol as ITypeSymbol;
-            if (type == null)
+            if (!(SemanticModel.GetSymbolInfo(objectCreationExpression.Type).Symbol is ITypeSymbol type))
             {
                 return false;
             }
diff --git a/src/Workspaces/CSharp/Portable/CodeGeneration/CSharpSyntaxGenerator.cs b/src/Workspaces/CSharp/Portable/CodeGeneration/CSharpSyntaxGenerator.cs
index 85dd2b276a8..e29510331d2 100644
--- a/src/Workspaces/CSharp/Portable/CodeGeneration/CSharpSyntaxGenerator.cs
+++ b/src/Workspaces/CSharp/Portable/CodeGeneration/CSharpSyntaxGenerator.cs
@@ -3915,10 +3915,7 @@ public override SyntaxNode ValueReturningLambdaExpression(IEnumerable<SyntaxNode
         }
 
         private static bool IsSimpleLambdaParameter(SyntaxNode node)
-        {
-            var p = node as ParameterSyntax;
-            return p != null && p.Type == null && p.Default == null && p.Modifiers.Count == 0;
-        }
+            => node is ParameterSyntax p && p.Type == null && p.Default == null && p.Modifiers.Count == 0;
 
         public override SyntaxNode VoidReturningLambdaExpression(IEnumerable<SyntaxNode> lambdaParameters, SyntaxNode expression)
         {
diff --git a/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs b/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs
index fe837c64189..24494543587 100644
--- a/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs
+++ b/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs
@@ -1530,12 +1530,12 @@ public void TestUpdateDocumentsOrder()
             var solution = CreateSolution();
             var pid = ProjectId.CreateNewId();
 
-            Func<VersionStamp> GetVersion = () => solution.GetProject(pid).Version;
-            Func<ImmutableArray<DocumentId>> GetDocumentIds = () => solution.GetProject(pid).DocumentIds.ToImmutableArray();
-            Func<ImmutableArray<SyntaxTree>> GetSyntaxTrees = () =>
-                {
-                    return solution.GetProject(pid).GetCompilationAsync().Result.SyntaxTrees.ToImmutableArray();
-                };
+            VersionStamp GetVersion() => solution.GetProject(pid).Version;
+            ImmutableArray<DocumentId> GetDocumentIds() => solution.GetProject(pid).DocumentIds.ToImmutableArray();
+            ImmutableArray<SyntaxTree> GetSyntaxTrees()
+            {
+                return solution.GetProject(pid).GetCompilationAsync().Result.SyntaxTrees.ToImmutableArray();
+            }
 
             solution = solution.AddProject(pid, "test", "test.dll", LanguageNames.CSharp);
 
-- 
GitLab