Merge pull request #17276 from tamasvajk/impr/change-partial-method-location

C#: Change reporting location of partial methods

Author: tamasvajk

csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs

@@ -21,7 +21,7 @@ protected OrdinaryMethod(Context cx, IMethodSymbol init)
         public override Microsoft.CodeAnalysis.Location ReportingLocation =>
             IsCompilerGeneratedDelegate()
                 ? Symbol.ContainingType.GetSymbolLocation()
-                : Symbol.GetSymbolLocation();
+                : BodyDeclaringSymbol.GetSymbolLocation();
 
         public override bool NeedsPopulation => base.NeedsPopulation || IsCompilerGeneratedDelegate();
 

csharp/ql/lib/change-notes/2024-08-21-partial-methods.md

@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The reported location of `partial` methods has been changed from the definition to the implementation part.

csharp/ql/test/library-tests/partial/MethodIsPartial.expected

@@ -1,6 +1,6 @@
-| Partial.cs:3:18:3:39 | PartialMethodWithBody1 | true |
 | Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 | true |
 | Partial.cs:5:17:5:23 | Method2 | false |
+| Partial.cs:10:18:10:39 | PartialMethodWithBody1 | true |
 | Partial.cs:11:17:11:23 | Method3 | false |
 | Partial.cs:16:18:16:42 | PartialMethodWithoutBody2 | true |
 | Partial.cs:17:17:17:23 | Method4 | false |

csharp/ql/test/library-tests/partial/Partial1.expected

@@ -1,6 +1,6 @@
 | Partial.cs:1:15:1:26 | TwoPartClass |
-| Partial.cs:3:18:3:39 | PartialMethodWithBody1 |
 | Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 |
 | Partial.cs:8:15:8:26 | TwoPartClass |
+| Partial.cs:10:18:10:39 | PartialMethodWithBody1 |
 | Partial.cs:14:15:14:33 | OnePartPartialClass |
 | Partial.cs:16:18:16:42 | PartialMethodWithoutBody2 |

csharp/ql/test/library-tests/partial/Partial2.expected

@@ -1,10 +1,10 @@
-| Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:3:18:3:39 | PartialMethodWithBody1 |
 | Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 |
 | Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:5:17:5:23 | Method2 |
+| Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:10:18:10:39 | PartialMethodWithBody1 |
 | Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:11:17:11:23 | Method3 |
-| Partial.cs:8:15:8:26 | TwoPartClass | Partial.cs:3:18:3:39 | PartialMethodWithBody1 |
 | Partial.cs:8:15:8:26 | TwoPartClass | Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 |
 | Partial.cs:8:15:8:26 | TwoPartClass | Partial.cs:5:17:5:23 | Method2 |
+| Partial.cs:8:15:8:26 | TwoPartClass | Partial.cs:10:18:10:39 | PartialMethodWithBody1 |
 | Partial.cs:8:15:8:26 | TwoPartClass | Partial.cs:11:17:11:23 | Method3 |
 | Partial.cs:14:15:14:33 | OnePartPartialClass | Partial.cs:16:18:16:42 | PartialMethodWithoutBody2 |
 | Partial.cs:14:15:14:33 | OnePartPartialClass | Partial.cs:17:17:17:23 | Method4 |

csharp/ql/test/library-tests/partial/PartialMethodBody.expected

@@ -1,3 +1,3 @@
-| Partial.cs:3:18:3:39 | PartialMethodWithBody1 | true |
 | Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 | false |
+| Partial.cs:10:18:10:39 | PartialMethodWithBody1 | true |
 | Partial.cs:16:18:16:42 | PartialMethodWithoutBody2 | false |

csharp/ql/test/library-tests/partial/PrintAst.expected

@@ -1,13 +1,13 @@
 Partial.cs:
 #    1| [Class] TwoPartClass
-#    3|   5: [Method] PartialMethodWithBody1
-#    3|     -1: [TypeMention] Void
-#   10|     4: [BlockStmt] {...}
-#    4|   6: [Method] PartialMethodWithoutBody1
+#    4|   5: [Method] PartialMethodWithoutBody1
 #    4|     -1: [TypeMention] Void
-#    5|   7: [Method] Method2
+#    5|   6: [Method] Method2
 #    5|     -1: [TypeMention] Void
 #    5|     4: [BlockStmt] {...}
+#   10|   7: [Method] PartialMethodWithBody1
+#    3|     -1: [TypeMention] Void
+#   10|     4: [BlockStmt] {...}
 #   11|   8: [Method] Method3
 #   11|     -1: [TypeMention] Void
 #   11|     4: [BlockStmt] {...}