Skip to content

Commit 47ab41b

Browse files
committed
Use Folder::Resolve<...>::resolve instead of Folder::Append<...>::append
The two have roughly the same usage but the latter is incompatible with `Files::Folder`.
1 parent 2473864 commit 47ab41b

File tree

1 file changed

+8
-6
lines changed
  • javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5

1 file changed

+8
-6
lines changed

javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/UI5.qll

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@ private predicate isAnUnResolvedResourceRoot(WebApp webApp, string name, string
3434
)
3535
}
3636

37-
private predicate shouldAppend(Folder f, string relativePath) {
38-
exists(WebApp webApp |
39-
f = webApp.getWebAppFolder() and
40-
isAnUnResolvedResourceRoot(webApp, _, relativePath)
41-
)
37+
private module UI5WebAppResolverConfig implements Folder::ResolveSig {
38+
predicate shouldResolve(Container f, string relativePath) {
39+
exists(WebApp webApp |
40+
f = webApp.getWebAppFolder() and
41+
isAnUnResolvedResourceRoot(webApp, _, relativePath)
42+
)
43+
}
4244
}
4345

4446
class ResourceRoot extends Container {
@@ -48,7 +50,7 @@ class ResourceRoot extends Container {
4850

4951
ResourceRoot() {
5052
isAnUnResolvedResourceRoot(webApp, name, path) and
51-
Folder::Append<shouldAppend/2>::append(webApp.getWebAppFolder(), path) = this
53+
Folder::Resolve<UI5WebAppResolverConfig>::resolve(webApp.getWebAppFolder(), path) = this
5254
}
5355

5456
string getName() { result = name }

0 commit comments

Comments
 (0)