Link to cancellable property

robertbrignull · robertbrignull · commit 4346cc6e984d · 2024-03-13T17:08:55.000Z
diff --git a/.github/codeql/queries/ProgressBar.qll b/.github/codeql/queries/ProgressBar.qll
@@ -9,8 +9,10 @@ abstract class ProgressBar extends CallExpr {
 
   predicate usesToken() { this.getCallback().getNumParameter() >= 2 }
 
+  Property getCancellableProperty() { result = this.getOptions().getPropertyByName("cancellable") }
+
   predicate isCancellable() {
-    this.getOptions().getPropertyByName("cancellable").getInit().(BooleanLiteral).getBoolValue() =
+    this.getCancellableProperty().getInit().(BooleanLiteral).getBoolValue() =
       true
   }
 }
diff --git a/.github/codeql/queries/token-not-used.ql b/.github/codeql/queries/token-not-used.ql
@@ -14,4 +14,4 @@ import ProgressBar
 
 from ProgressBar t
 where t.isCancellable() and not t.usesToken()
-select t, "This progress bar is cancelable but the token is not used"
+select t, "This progress bar is $@ but the token is not used", t.getCancellableProperty(), "cancellable"

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,10 @@ abstract class ProgressBar extends CallExpr {`
`9`	`9`
`10`	`10`	`predicate usesToken() { this.getCallback().getNumParameter() >= 2 }`
`11`	`11`
	`12`	`+ Property getCancellableProperty() { result = this.getOptions().getPropertyByName("cancellable") }`
	`13`	`+`
`12`	`14`	`predicate isCancellable() {`
`13`		`- this.getOptions().getPropertyByName("cancellable").getInit().(BooleanLiteral).getBoolValue() =`
	`15`	`+ this.getCancellableProperty().getInit().(BooleanLiteral).getBoolValue() =`
`14`	`16`	`true`
`15`	`17`	`}`
`16`	`18`	`}`