Adjust getMappedLocation to not include line directives

tamasvajk · tamasvajk · commit 899e52a68ac8 · 2021-02-04T08:42:39.000+01:00
diff --git a/csharp/ql/src/semmle/code/csharp/ExprOrStmtParent.qll b/csharp/ql/src/semmle/code/csharp/ExprOrStmtParent.qll
@@ -58,13 +58,9 @@ private module Cached {
   cached
   Location bestLocation(Element e) {
     result = e.getALocation().(SourceLocation) and
-    (
-      not exists(e.getALocation().(SourceLocation).getMappedLocation()) or
-      e instanceof LineDirective
-    )
+    not exists(e.getALocation().(SourceLocation).getMappedLocation())
     or
-    result = e.getALocation().(SourceLocation).getMappedLocation() and
-    not e instanceof LineDirective
+    result = e.getALocation().(SourceLocation).getMappedLocation()
     or
     hasNoSourceLocation(e) and
     result = min(Location l | l = e.getALocation() | l order by l.getFile().toString())
diff --git a/csharp/ql/src/semmle/code/csharp/Location.qll b/csharp/ql/src/semmle/code/csharp/Location.qll
@@ -63,7 +63,10 @@ class EmptyLocation extends Location {
  */
 class SourceLocation extends Location, @location_default {
   /** Gets the location that takes into account `#line` directives, if any. */
-  Location getMappedLocation() { locations_mapped(this, result) }
+  Location getMappedLocation() {
+    locations_mapped(this, result) and
+    not exists(LineDirective l | l.getALocation() = this)
+  }
 
   override File getFile() { locations_default(this, result, _, _, _, _) }
 
diff --git a/csharp/ql/test/library-tests/comments/LineDirectives.expected b/csharp/ql/test/library-tests/comments/LineDirectives.expected
@@ -19,4 +19,3 @@ mapped
 | trivia.cs:20:9:20:11 | trivia.cs:20:9:20:11 | comments1.cs:2:9:2:11 | comments1.cs:2:9:2:11 |
 | trivia.cs:20:9:20:14 | trivia.cs:20:9:20:14 | comments1.cs:2:9:2:14 | comments1.cs:2:9:2:14 |
 | trivia.cs:20:13:20:13 | trivia.cs:20:13:20:13 | comments1.cs:2:13:2:13 | comments1.cs:2:13:2:13 |
-| trivia.cs:21:1:21:13 | trivia.cs:21:1:21:13 | comments1.cs:3:1:3:13 | comments1.cs:3:1:3:13 |
