Merge pull request #621 from calumgrant/cs/invalid-key

hvitved · web-flow · commit 2a30dee8df95 · 2018-12-07T11:24:45.000+01:00
C#: Fix [INVALID_KEY] error
diff --git a/csharp/ql/test/library-tests/extractor/tagstack/A.cs b/csharp/ql/test/library-tests/extractor/tagstack/A.cs
@@ -2,10 +2,6 @@
 
 class C
 {
-    E M1() { M2(); M2(); return null; }
+    object M1() { M2(); M2(); return null; }
     void M2() { }
 }
-
-class E
-{
-}
diff --git a/csharp/ql/test/library-tests/extractor/tagstack/B.cs b/csharp/ql/test/library-tests/extractor/tagstack/B.cs
@@ -2,10 +2,6 @@
 
 class C
 {
-    D M1() { M3(); return null; }
+    object M1() { M3(); return null; }
     void M3() { }
 }
-
-class D
-{
-}
diff --git a/csharp/ql/test/library-tests/extractor/tagstack/Bodies.expected b/csharp/ql/test/library-tests/extractor/tagstack/Bodies.expected
diff --git a/csharp/ql/test/library-tests/extractor/tagstack/Bodies.ql b/csharp/ql/test/library-tests/extractor/tagstack/Bodies.ql
@@ -0,0 +1,5 @@
+import csharp
+
+from Method m
+where strictcount(m.getBody()) > 1
+select m, "This method has multiple bodies."
diff --git a/csharp/ql/test/library-tests/extractor/tagstack/Classes.expected b/csharp/ql/test/library-tests/extractor/tagstack/Classes.expected
@@ -1,3 +1 @@
 | A.cs:3:7:3:7 | C |
-| A.cs:9:7:9:7 | E |
-| B.cs:9:7:9:7 | D |
diff --git a/csharp/ql/test/library-tests/extractor/tagstack/Methods.expected b/csharp/ql/test/library-tests/extractor/tagstack/Methods.expected
@@ -1,2 +1,2 @@
-| A.cs:5:7:5:8 | M1 |
+| A.cs:5:12:5:13 | M1 |
 | A.cs:6:10:6:11 | M2 |
