hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-01-03 01:30:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/rc/3.9' into henrymercer/merge-back-3.9

Browse Source
This commit is contained in:
Henry Mercer
2023-04-05 14:57:57 +01:00
parent be6af4b3f9 0e1d2ad67f
commit e1b3807dfc
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1239,12 +1239,11 @@ protected DependencyInstallationResult preparePackagesAndDependencies(Set<Path>
String msg = "A parse error occurred: " + StringUtil.quoteWithBackticks(err.getMessage().trim())
+ ". Check the syntax of the file. If the file is invalid, correct the error or [exclude](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning) the file from analysis.";
// file, relative to the source root
String relativeFilePath = null;
DiagnosticLocation.Builder builder = DiagnosticLocation.builder();
if (file.startsWith(LGTM_SRC)) {
relativeFilePath = file.subpath(LGTM_SRC.getNameCount(), file.getNameCount()).toString();
builder = builder.setFile(file.subpath(LGTM_SRC.getNameCount(), file.getNameCount()).toString());
}
DiagnosticLocation diagLoc = DiagnosticLocation.builder()
.setFile(relativeFilePath)
DiagnosticLocation diagLoc = builder
.setStartLine(err.getPosition().getLine())
.setStartColumn(err.getPosition().getColumn())
.setEndLine(err.getPosition().getLine())