mirrors/compiler-explorer
1
0
Fork 0
mirror of https://github.com/compiler-explorer/compiler-explorer.git synced 2025-12-27 09:23:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

[rust] attach quickfixes to the line containing the quickfix, not to the original diagnostic

Browse Source
This commit is contained in:
Paul Gey
2025-12-26 19:05:02 +01:00
parent f1a3a25dd0
commit 94622a71cd
2 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/utils.ts
View File

@@ -314,7 +314,6 @@ export function parseRustOutput(lines: string, inputFilename?: string, pathPrefi
column,
text,
severity: parseSeverity(text),
fixes: [],
};
result.push(currentDiagnostic);
}
@@ -328,13 +327,17 @@ export function parseRustOutput(lines: string, inputFilename?: string, pathPrefi
};
}
if (currentDiagnostic?.tag?.fixes !== undefined) {
for (const {re, makeFix} of quickfixes) {
const match = filteredLine.match(re);
if (match) {
currentDiagnostic.tag.fixes.push(makeFix(match));
}
const fixes = quickfixes.flatMap(({re, makeFix}) => {
const match = filteredLine.match(re);
if (match) {
return [makeFix(match)];
} else {
return [];
}
});
if (currentDiagnostic?.tag && fixes.length !== 0) {
lineObj.tag = {...currentDiagnostic.tag, fixes};
}
result.push(lineObj);

67
test/utils-tests.ts
View File

@@ -250,7 +250,7 @@ describe('Rust compiler output', () => {
expect(utils.parseRustOutput('Unrelated\nLine one\n --> bob.rs:1:0\nUnrelated', 'bob.rs')).toEqual([
{text: 'Unrelated'},
{
tag: {file: 'bob.rs', column: 0, line: 1, text: 'Line one', severity: 3, fixes: []},
tag: {file: 'bob.rs', column: 0, line: 1, text: 'Line one', severity: 3},
text: 'Line one',
},
{
@@ -261,7 +261,7 @@ describe('Rust compiler output', () => {
]);
expect(utils.parseRustOutput('Line one\n --> bob.rs:1:5', 'bob.rs')).toEqual([
{
tag: {file: 'bob.rs', column: 5, line: 1, text: 'Line one', severity: 3, fixes: []},
tag: {file: 'bob.rs', column: 5, line: 1, text: 'Line one', severity: 3},
text: 'Line one',
},
{
@@ -271,7 +271,7 @@ describe('Rust compiler output', () => {
]);
expect(utils.parseRustOutput('Multiple spaces\n --> bob.rs:1:5', 'bob.rs')).toEqual([
{
tag: {file: 'bob.rs', column: 5, line: 1, text: 'Multiple spaces', severity: 3, fixes: []},
tag: {file: 'bob.rs', column: 5, line: 1, text: 'Multiple spaces', severity: 3},
text: 'Multiple spaces',
},
{
@@ -284,7 +284,7 @@ describe('Rust compiler output', () => {
it('replaces all references to input source', () => {
expect(utils.parseRustOutput('error: Error in bob.rs\n --> bob.rs:1:42', 'bob.rs')).toEqual([
{
tag: {file: 'bob.rs', column: 42, line: 1, text: 'error: Error in <source>', severity: 3, fixes: []},
tag: {file: 'bob.rs', column: 42, line: 1, text: 'error: Error in <source>', severity: 3},
text: 'error: Error in <source>',
},
{
@@ -297,7 +297,7 @@ describe('Rust compiler output', () => {
it('treats <stdin> as if it were the compiler source', () => {
expect(utils.parseRustOutput('error: <stdin> is sad\n --> <stdin>:120:25', 'bob.rs')).toEqual([
{
tag: {file: 'bob.rs', column: 25, line: 120, text: 'error: <source> is sad', severity: 3, fixes: []},
tag: {file: 'bob.rs', column: 25, line: 120, text: 'error: <source> is sad', severity: 3},
text: 'error: <source> is sad',
},
{
@@ -319,7 +319,6 @@ describe('Rust compiler output', () => {
column: 27,
text: 'error[E0425]: cannot find value `x` in this scope',
severity: 3,
fixes: [],
},
text: 'error[\x1B]8;;https://doc.rust-lang.org/error_codes/E0425.html\x07E0425\x1B]8;;\x07]: cannot find value `x` in this scope',
},
@@ -338,6 +337,25 @@ describe('Rust compiler output', () => {
it('emits quickfixes', () => {
expect(utils.parseRustOutput('error\n --> <source>:42:27\n15 + use std::collections::HashMap;')).toEqual([
{
tag: {
line: 42,
column: 27,
text: 'error',
severity: 3,
},
text: 'error',
},
{
tag: {
line: 42,
column: 27,
text: '',
severity: 3,
},
text: ' --> <source>:42:27',
},
{
text: '15 + use std::collections::HashMap;',
tag: {
line: 42,
column: 27,
@@ -358,6 +376,21 @@ describe('Rust compiler output', () => {
},
],
},
},
]);
expect(
utils.parseRustOutput(
'error\n --> <source>:42:27\n = help: add `#![feature(num_midpoint_signed)]` to the crate attributes to enable',
),
).toEqual([
{
tag: {
line: 42,
column: 27,
text: 'error',
severity: 3,
},
text: 'error',
},
{
@@ -369,15 +402,8 @@ describe('Rust compiler output', () => {
},
text: ' --> <source>:42:27',
},
{text: '15 + use std::collections::HashMap;'},
]);
expect(
utils.parseRustOutput(
'error\n --> <source>:42:27\n = help: add `#![feature(num_midpoint_signed)]` to the crate attributes to enable',
),
).toEqual([
{
text: ' = help: add `#![feature(num_midpoint_signed)]` to the crate attributes to enable',
tag: {
line: 42,
column: 27,
@@ -398,18 +424,7 @@ describe('Rust compiler output', () => {
},
],
},
text: 'error',
},
{
tag: {
line: 42,
column: 27,
text: '',
severity: 3,
},
text: ' --> <source>:42:27',
},
{text: ' = help: add `#![feature(num_midpoint_signed)]` to the crate attributes to enable'},
]);
});
@@ -435,7 +450,6 @@ warning: 2 warnings emitted`,
file: 'example.rs',
severity: 2,
text: 'warning: function `f1` is never used',
fixes: [],
},
},
{
@@ -457,7 +471,6 @@ warning: 2 warnings emitted`,
file: 'm.rs',
severity: 2,
text: 'warning: function `f2` is never used',
fixes: [],
},
},
{