Skip to content

Commit e1b3807

Browse files
committed
Merge remote-tracking branch 'origin/rc/3.9' into henrymercer/merge-back-3.9
2 parents be6af4b + 0e1d2ad commit e1b3807

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

docs/codeql/reusables/supported-versions-compilers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
Kotlin [6]_,"Kotlin 1.5.0 to 1.8.20","kotlinc",``.kt``
2424
JavaScript,ECMAScript 2022 or lower,Not applicable,"``.js``, ``.jsx``, ``.mjs``, ``.es``, ``.es6``, ``.htm``, ``.html``, ``.xhtm``, ``.xhtml``, ``.vue``, ``.hbs``, ``.ejs``, ``.njk``, ``.json``, ``.yaml``, ``.yml``, ``.raml``, ``.xml`` [7]_"
2525
Python [8]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11",Not applicable,``.py``
26-
Ruby [9]_,"up to 3.1",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
26+
Ruby [9]_,"up to 3.2",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
2727
TypeScript [10]_,"2.6-5.0",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``"
2828

2929
.. container:: footnote-group

javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,12 +1239,11 @@ private void doExtract(FileExtractor extractor, Path file, ExtractorState state)
12391239
String msg = "A parse error occurred: " + StringUtil.quoteWithBackticks(err.getMessage().trim())
12401240
+ ". 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.";
12411241
// file, relative to the source root
1242-
String relativeFilePath = null;
1242+
DiagnosticLocation.Builder builder = DiagnosticLocation.builder();
12431243
if (file.startsWith(LGTM_SRC)) {
1244-
relativeFilePath = file.subpath(LGTM_SRC.getNameCount(), file.getNameCount()).toString();
1244+
builder = builder.setFile(file.subpath(LGTM_SRC.getNameCount(), file.getNameCount()).toString());
12451245
}
1246-
DiagnosticLocation diagLoc = DiagnosticLocation.builder()
1247-
.setFile(relativeFilePath)
1246+
DiagnosticLocation diagLoc = builder
12481247
.setStartLine(err.getPosition().getLine())
12491248
.setStartColumn(err.getPosition().getColumn())
12501249
.setEndLine(err.getPosition().getLine())

0 commit comments

Comments
 (0)