Merge pull request #9738 from geoffw0/misc

MathiasVP · web-flow · commit f2ae73b6bec8 · 2022-06-28T16:44:02.000+01:00
Swift: Add a Locatable.getFile() shortcut similar to the one in CPP.
diff --git a/swift/ql/lib/codeql/swift/elements/Locatable.qll b/swift/ql/lib/codeql/swift/elements/Locatable.qll
@@ -1,4 +1,5 @@
 private import codeql.swift.generated.Locatable
+private import codeql.swift.elements.File
 
 class Locatable extends LocatableBase {
   pragma[nomagic]
@@ -7,4 +8,9 @@ class Locatable extends LocatableBase {
     or
     not exists(LocatableBase.super.getLocation()) and result instanceof UnknownLocation
   }
+
+  /**
+   * Gets the primary file where this element occurs.
+   */
+  File getFile() { result = getLocation().getFile() }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`private import codeql.swift.generated.Locatable`
	`2`	`+private import codeql.swift.elements.File`
`2`	`3`
`3`	`4`	`class Locatable extends LocatableBase {`
`4`	`5`	`pragma[nomagic]`
`@@ -7,4 +8,9 @@ class Locatable extends LocatableBase {`
`7`	`8`	`or`
`8`	`9`	`not exists(LocatableBase.super.getLocation()) and result instanceof UnknownLocation`
`9`	`10`	`}`
	`11`	`+`
	`12`	`+ /**`
	`13`	`+ * Gets the primary file where this element occurs.`
	`14`	`+ */`
	`15`	`+ File getFile() { result = getLocation().getFile() }`
`10`	`16`	`}`