Swift: Improve ExtensionDecl.toString.

geoffw0 · geoffw0 · commit e9ffefaa96a0 · 2023-04-19T13:38:04.000+01:00
diff --git a/swift/ql/lib/codeql/swift/elements/decl/ExtensionDecl.qll b/swift/ql/lib/codeql/swift/elements/decl/ExtensionDecl.qll
@@ -2,6 +2,9 @@ private import codeql.swift.generated.decl.ExtensionDecl
 
 class ExtensionDecl extends Generated::ExtensionDecl {
   override string toString() {
-    result = "extension" // TODO: Once we extract the name of this one we can provide a better `toString`.
+    result = "extension of " + getExtendedTypeDecl().toString()
+    or
+    not exists(getExtendedTypeDecl()) and
+    result = "extension"
   }
 }
diff --git a/swift/ql/test/library-tests/elements/decl/extensiondecl/extensiondecl.expected b/swift/ql/test/library-tests/elements/decl/extensiondecl/extensiondecl.expected
@@ -1,4 +1,4 @@
-| extensiondecl.swift:11:1:12:1 | extension | getExtendedTypeDecl:MyClass |
-| extensiondecl.swift:14:1:15:1 | extension | getExtendedTypeDecl:MyClass, getProtocol(0):MyProtocol1, getProtocol(1):MyProtocol2 |
-| extensiondecl.swift:17:1:18:1 | extension | getExtendedTypeDecl:Int |
-| extensiondecl.swift:20:1:21:1 | extension | getExtendedTypeDecl:String |
+| extensiondecl.swift:11:1:12:1 | extension of MyClass | getExtendedTypeDecl:MyClass |
+| extensiondecl.swift:14:1:15:1 | extension of MyClass | getExtendedTypeDecl:MyClass, getProtocol(0):MyProtocol1, getProtocol(1):MyProtocol2 |
+| extensiondecl.swift:17:1:18:1 | extension of Int | getExtendedTypeDecl:Int |
+| extensiondecl.swift:20:1:21:1 | extension of String | getExtendedTypeDecl:String |

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@ private import codeql.swift.generated.decl.ExtensionDecl`
`2`	`2`
`3`	`3`	`class ExtensionDecl extends Generated::ExtensionDecl {`
`4`	`4`	`override string toString() {`
`5`		- result = "extension" // TODO: Once we extract the name of this one we can provide a better `toString`.
	`5`	`+ result = "extension of " + getExtendedTypeDecl().toString()`
	`6`	`+ or`
	`7`	`+ not exists(getExtendedTypeDecl()) and`
	`8`	`+ result = "extension"`
`6`	`9`	`}`
`7`	`10`	`}`