Merge pull request #3478 from github/robertbrignull/token-query

Simplify query now we've deleted withInheritedProgress

.github/codeql/queries/ProgressBar.qll

@@ -1,36 +1,16 @@
 import javascript
 
-abstract class ProgressBar extends CallExpr {
+class WithProgressCall extends CallExpr {
-  ProgressBar() { any() }
+  WithProgressCall() { this.getCalleeName() = "withProgress" }
-
-  abstract Function getCallback();
-
-  abstract ObjectExpr getOptions();
 
   predicate usesToken() { exists(this.getTokenParameter()) }
 
-  Parameter getTokenParameter() { result = this.getCallback().getParameter(1) }
+  Parameter getTokenParameter() { result = this.getArgument(0).(Function).getParameter(1) }
 
-  Property getCancellableProperty() { result = this.getOptions().getPropertyByName("cancellable") }
+  Property getCancellableProperty() { result = this.getArgument(1).(ObjectExpr).getPropertyByName("cancellable") }
 
   predicate isCancellable() {
     this.getCancellableProperty().getInit().(BooleanLiteral).getBoolValue() =
       true
   }
 }
-
-class WithProgressCall extends ProgressBar {
-  WithProgressCall() { this.getCalleeName() = "withProgress" }
-
-  override Function getCallback() { result = this.getArgument(0) }
-
-  override ObjectExpr getOptions() { result = this.getArgument(1) }
-}
-
-class WithInheritedProgressCall extends ProgressBar {
-  WithInheritedProgressCall() { this.getCalleeName() = "withInheritedProgress" }
-
-  override Function getCallback() { result = this.getArgument(1) }
-
-  override ObjectExpr getOptions() { result = this.getArgument(2) }
-}

.github/codeql/queries/progress-not-cancellable.ql

@@ -12,7 +12,7 @@
 import javascript
 import ProgressBar
 
-from ProgressBar t
+from WithProgressCall t
 where not t.isCancellable() and t.usesToken()
 select t,
   "The $@ should not be used when the progress bar is not cancellable. Either stop using the $@ or mark the progress bar as cancellable.",

.github/codeql/queries/token-not-used.ql

@@ -13,6 +13,6 @@
 import javascript
 import ProgressBar
 
-from ProgressBar t
+from WithProgressCall t
 where t.isCancellable() and not t.usesToken()
 select t, "This progress bar is $@ but the token is not used. Either use the token or mark the progress bar as not cancellable.", t.getCancellableProperty(), "cancellable"