Merge pull request #2478 from jbj/mergeback-20191202

Mergeback from rc/1.23 to master
This commit is contained in:
Nick Rolfe
2019-12-02 12:28:20 +00:00
committed by GitHub
38 changed files with 567 additions and 245 deletions

View File

@@ -162,12 +162,11 @@ private predicate moduleInFile(Module m, File f) { m.getFile() = f }
* ```
*/
class Require extends CallExpr, Import {
cached
Require() {
exists(RequireVariable req |
this.getCallee() = req.getAnAccess() and
// `mjs` files explicitly disallow `require`
not getFile().getExtension() = "mjs"
)
any(RequireVariable req).getAnAccess() = getCallee() and
// `mjs` files explicitly disallow `require`
not getFile().getExtension() = "mjs"
}
override PathExpr getImportedPath() { result = getArgument(0) }