Merge pull request github#13888 from github/revert-13757-sources

MathiasVP · web-flow · commit e14e0cdbb794 · 2023-08-07T09:31:10.000+01:00
Revert "Swift: Pragmatic fix for CustomUrlSchemes.qll."
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/CustomUrlSchemes.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/CustomUrlSchemes.qll
@@ -56,9 +56,7 @@ private class ApplicationWithLaunchOptionsFunc extends Function {
 
 private class LaunchOptionsUrlVarDecl extends VarDecl {
   LaunchOptionsUrlVarDecl() {
-    // ideally this would be the more accurate, but currently less robust:
-    // this.getEnclosingDecl().asNominalTypeDecl().getFullName() = "UIApplication.LaunchOptionsKey" and
-    this.getType().(NominalType).getFullName() = "UIApplication.LaunchOptionsKey" and
+    this.getEnclosingDecl().asNominalTypeDecl().getFullName() = "UIApplication.LaunchOptionsKey" and
     this.getName() = "url"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,7 @@ private class ApplicationWithLaunchOptionsFunc extends Function {`
`56`	`56`
`57`	`57`	`private class LaunchOptionsUrlVarDecl extends VarDecl {`
`58`	`58`	`LaunchOptionsUrlVarDecl() {`
`59`		`- // ideally this would be the more accurate, but currently less robust:`
`60`		`- // this.getEnclosingDecl().asNominalTypeDecl().getFullName() = "UIApplication.LaunchOptionsKey" and`
`61`		`- this.getType().(NominalType).getFullName() = "UIApplication.LaunchOptionsKey" and`
	`59`	`+ this.getEnclosingDecl().asNominalTypeDecl().getFullName() = "UIApplication.LaunchOptionsKey" and`
`62`	`60`	`this.getName() = "url"`
`63`	`61`	`}`
`64`	`62`	`}`