From 906e350edc2932c0252e677db14b636e07f88555 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Sat, 16 Feb 2019 16:17:51 +0100
Subject: [PATCH] Add PDB test case "LambdaCapturing".

---
 .../ICSharpCode.Decompiler.Tests.csproj       |  1 +
 .../PdbGenerationTestRunner.cs                | 26 ++++++--
 .../TestCases/PdbGen/LambdaCapturing.xml      | 63 +++++++++++++++++++
 3 files changed, 84 insertions(+), 6 deletions(-)
 create mode 100644 ICSharpCode.Decompiler.Tests/TestCases/PdbGen/LambdaCapturing.xml

diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
index 679c27753..e492a0799 100644
--- a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
+++ b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
@@ -204,6 +204,7 @@
 
   <ItemGroup>
     <Content Include="TestCases\PdbGen\HelloWorld.xml" />
+    <Content Include="TestCases\PdbGen\LambdaCapturing.xml" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ICSharpCode.Decompiler.Tests/PdbGenerationTestRunner.cs b/ICSharpCode.Decompiler.Tests/PdbGenerationTestRunner.cs
index 965044f17..0d5ad1884 100644
--- a/ICSharpCode.Decompiler.Tests/PdbGenerationTestRunner.cs
+++ b/ICSharpCode.Decompiler.Tests/PdbGenerationTestRunner.cs
@@ -29,6 +29,13 @@ namespace ICSharpCode.Decompiler.Tests
 			TestGeneratePdb();
 		}
 
+		[Test]
+		[Ignore("differences in il ranges")]
+		public void LambdaCapturing()
+		{
+			TestGeneratePdb();
+		}
+
 		private void TestGeneratePdb([CallerMemberName] string testName = null)
 		{
 			const PdbToXmlOptions options = PdbToXmlOptions.IncludeEmbeddedSources | PdbToXmlOptions.ThrowOnError | PdbToXmlOptions.IncludeTokens | PdbToXmlOptions.ResolveTokens | PdbToXmlOptions.IncludeMethodSpans;
@@ -59,20 +66,27 @@ namespace ICSharpCode.Decompiler.Tests
 					}
 				}
 			}
-			ProcessXmlFile(Path.ChangeExtension(pdbFileName, ".xml"));
-			ProcessXmlFile(Path.ChangeExtension(xmlFile, ".generated.xml"));
-			Assert.AreEqual(File.ReadAllText(xmlFile), File.ReadAllText(Path.ChangeExtension(xmlFile, ".generated.xml")));
+			string expectedFileName = Path.ChangeExtension(xmlFile, ".expected.xml");
+			ProcessXmlFile(expectedFileName);
+			string generatedFileName = Path.ChangeExtension(xmlFile, ".generated.xml");
+			ProcessXmlFile(generatedFileName);
+			Assert.AreEqual(Normalize(expectedFileName), Normalize(generatedFileName));
 		}
 
-		private void ProcessXmlFile(string v)
+		private void ProcessXmlFile(string fileName)
 		{
-			var document = XDocument.Load(v);
+			var document = XDocument.Load(fileName);
 			foreach (var file in document.Descendants("file")) {
 				file.Attribute("checksum").Remove();
 				file.Attribute("embeddedSourceLength").Remove();
 				file.ReplaceNodes(new XCData(file.Value.Replace("\uFEFF", "")));
 			}
-			document.Save(v, SaveOptions.None);
+			document.Save(fileName, SaveOptions.None);
+		}
+
+		private string Normalize(string inputFileName)
+		{
+			return File.ReadAllText(inputFileName).Replace("\r\n", "\n").Replace("\r", "\n");
 		}
 	}
 
diff --git a/ICSharpCode.Decompiler.Tests/TestCases/PdbGen/LambdaCapturing.xml b/ICSharpCode.Decompiler.Tests/TestCases/PdbGen/LambdaCapturing.xml
new file mode 100644
index 000000000..62e069886
--- /dev/null
+++ b/ICSharpCode.Decompiler.Tests/TestCases/PdbGen/LambdaCapturing.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<symbols>
+  <files>
+    <file id="1" name="ICSharpCode\Decompiler\Tests\TestCases\PdbGen\LambdaCapturing.cs" language="C#" checksumAlgorithm="SHA256"><![CDATA[using System;
+
+namespace ICSharpCode.Decompiler.Tests.TestCases.PdbGen
+{
+	public class LambdaCapturing
+	{
+		public static void Main(string[] args)
+		{
+			int num = 4;
+			int captured = Environment.TickCount + num;
+			Test((int a, int b) => a + b + captured);
+		}
+
+		private static void Test(Func<int, int, int> p)
+		{
+			p(1, 2);
+		}
+	}
+}
+]]></file>
+  </files>
+  <methods>
+    <method containingType="ICSharpCode.Decompiler.Tests.TestCases.PdbGen.LambdaCapturing" name="Main" parameterNames="args" token="0x6000001">
+      <sequencePoints>
+        <entry offset="0x0" hidden="true" document="1" />
+        <entry offset="0x5" startLine="9" startColumn="13" endLine="9" endColumn="27" document="1" />
+        <entry offset="0x7" startLine="10" startColumn="13" endLine="10" endColumn="58" document="1" />
+        <entry offset="0x14" startLine="11" startColumn="13" endLine="11" endColumn="46" document="1" />
+        <entry offset="0x24" startLine="12" startColumn="9" endLine="12" endColumn="10" document="1" />
+      </sequencePoints>
+      <scope startOffset="0x0" endOffset="0x25">
+        <local name="local" il_index="0" il_start="0x0" il_end="0x25" attributes="0" />
+      </scope>
+    </method>
+    <method containingType="ICSharpCode.Decompiler.Tests.TestCases.PdbGen.LambdaCapturing" name="Test" parameterNames="p" token="0x6000002">
+      <sequencePoints>
+        <entry offset="0x0" startLine="16" startColumn="13" endLine="16" endColumn="21" document="1" />
+        <entry offset="0x9" startLine="17" startColumn="9" endLine="17" endColumn="10" document="1" />
+      </sequencePoints>
+      <scope startOffset="0x0" endOffset="0xa" />
+    </method>
+    <method containingType="ICSharpCode.Decompiler.Tests.TestCases.PdbGen.LambdaCapturing+&lt;&gt;c__DisplayClass0_0" name="&lt;Main&gt;b__0" parameterNames="a, b" token="0x6000005">
+      <sequencePoints>
+        <entry offset="0x0" startLine="11" startColumn="28" endLine="11" endColumn="44" document="1" />
+      </sequencePoints>
+      <scope startOffset="0x0" endOffset="0xb" />
+    </method>
+  </methods>
+  <method-spans>
+    <method declaringType="ICSharpCode.Decompiler.Tests.TestCases.PdbGen.LambdaCapturing" methodName="Main" parameterNames="args" token="0x6000001">
+      <document startLine="9" endLine="12" />
+    </method>
+    <method declaringType="ICSharpCode.Decompiler.Tests.TestCases.PdbGen.LambdaCapturing" methodName="Test" parameterNames="p" token="0x6000002">
+      <document startLine="16" endLine="17" />
+    </method>
+    <method declaringType="ICSharpCode.Decompiler.Tests.TestCases.PdbGen.LambdaCapturing+&lt;&gt;c__DisplayClass0_0" methodName="&lt;Main&gt;b__0" parameterNames="a, b" token="0x6000005">
+      <document startLine="11" endLine="11" />
+    </method>
+  </method-spans>
+</symbols>
\ No newline at end of file