AST Comparison : diff on Method Declarations

- Implemented very simple SyntaxWalker to collect Method Declaration

Author: gboya

SemanticDiff.Core/AST.Comparison.fs

@@ -0,0 +1,31 @@
+namespace SemanticDiff.Core.AST
+
+module Comparison = 
+
+    open Roslyn.Compilers
+    open Roslyn.Compilers.CSharp
+    open Roslyn.Compilers.Common
+    open Roslyn.Services
+    open Roslyn.Services.CSharp
+    
+    type MethodCollector () = 
+        inherit SyntaxWalker()
+        let mutable i = 0
+        let mutable visitedMethods = []
+
+        member this.VisitedMethods
+            with get() = visitedMethods
+
+        override this.VisitMethodDeclaration node = 
+            i <- i + 1
+            visitedMethods <- node :: visitedMethods
+            // good-old printf debugging :-)
+            printfn "Visiting %s : %dth method" <| node.Identifier.ValueText <| i
+
+    let internal collectMethodsInternal (collector:MethodCollector) (node:SyntaxNode) = 
+        collector.Visit(node)
+        collector.VisitedMethods
+
+    let collectMethods node = 
+        let collector = new MethodCollector()
+        collectMethodsInternal collector node

SemanticDiff.Core/SemanticDiff.Core.fsproj

@@ -31,6 +31,14 @@
     <WarningLevel>3</WarningLevel>
     <DocumentationFile>bin\Release\SemanticDiff.Core.XML</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
+  <ItemGroup>
+    <None Include="packages.config" />
+    <Compile Include="AST.Comparison.fs" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -61,13 +69,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <PropertyGroup>
-    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

SemanticDiff.Tests/Experiments.fs

@@ -9,6 +9,8 @@ open Roslyn.Compilers.Common
 open Roslyn.Services
 open Roslyn.Services.CSharp
 
+open SemanticDiff.Core.AST.Comparison
+
 let sampleCode = "void foo()\
                   {
                   int i = 1 + 1;
@@ -21,6 +23,19 @@ let sampleCode2 = "void foo()\
                    // ... and whitespace changes
                    }"
 
+let codeWithMethods = "void foo()
+                    {
+                    return;
+                    }
+                    int bar()
+                    {
+                    return 1;
+                    }
+                    int foobar()
+                    {
+                    return bar() + bar ();
+                    }"
+
 [<TestClass>]
 type RoslynBasicExperiments() = 
 
@@ -36,3 +51,12 @@ type RoslynBasicExperiments() =
 
         (* The "IsEquivalentTo" disregards SyntaxTrivia *)
         Assert.IsTrue(ast1.IsEquivalentTo ast2)
+
+    [<TestMethod>]
+    member this.FindMethodDeclarationInAST() = 
+        let ast = SyntaxTree.ParseText codeWithMethods
+        let visitor = new MethodCollector()
+        
+        visitor.Visit(ast.GetRoot())
+
+        Assert.AreEqual(3, List.length visitor.VisitedMethods)

SemanticDiff.Tests/SemanticDiff.Tests.fsproj

@@ -68,6 +68,13 @@
     <None Include="packages.config" />
     <Compile Include="Experiments.fs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SemanticDiff.Core\SemanticDiff.Core.fsproj">
+      <Name>SemanticDiff.Core</Name>
+      <Project>{9c582785-e24e-441c-b2f7-2c2a979f6a3e}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
   </PropertyGroup>