hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-01-06 11:10:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

JavaScript: Teach AutoBuilder to extract YAML files by default.

Browse Source
This commit is contained in:
Max Schaefer
2019-04-10 08:21:49 -07:00
parent 2f84aac7df
commit f22cb186e3
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
View File

@@ -128,6 +128,8 @@ import java.util.stream.Stream;
* FileType#JS} (currently ".js", ".jsx", ".mjs", ".es6", ".es").
* <li>All HTML files, that is, files with with one of the extensions supported by {@link
* FileType#HTML} (currently ".htm", ".html", ".xhtm", ".xhtml", ".vue").
* <li>All YAML files, that is, files with one of the extensions supported by {@link
* FileType#YAML} (currently ".raml", ".yaml", ".yml").
* <li>Files with base name "package.json".
* <li>JavaScript, JSON or YAML files whose base name starts with ".eslintrc".
* <li>All extension-less files.
@@ -338,10 +340,11 @@ public class AutoBuild {
// exclude all files with extensions
patterns.add("-**/*.*");
// but include HTML, JavaScript and (optionally) TypeScript
// but include HTML, JavaScript, YAML and (optionally) TypeScript
Set<FileType> defaultExtract = new LinkedHashSet<FileType>();
defaultExtract.add(FileType.HTML);
defaultExtract.add(FileType.JS);
defaultExtract.add(FileType.YAML);
if (typeScriptMode != TypeScriptMode.NONE) defaultExtract.add(FileType.TYPESCRIPT);
for (FileType filetype : defaultExtract)
for (String extension : filetype.getExtensions()) patterns.add("**/*" + extension);

8
javascript/extractor/src/com/semmle/js/extractor/test/AutoBuildTests.java
View File

@@ -491,4 +491,12 @@ public class AutoBuildTests {
Assert.assertEquals("Invalid file type 'javascript'.", ue.getMessage());
}
}
@Test
public void includeYaml() throws IOException {
addFile(true, LGTM_SRC, "tst.yaml");
addFile(true, LGTM_SRC, "tst.yml");
addFile(true, LGTM_SRC, "tst.raml");
addFile(true, LGTM_SRC, "tst2.YML");
}
}