itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
arsdragonfly 2019-09-27 17:33:14 -04:00
parent 84340db87a
commit 945679e42f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/code/src/test/utils/diagnotics/rust.test.ts
View File

@ -50,7 +50,7 @@ describe('mapRustDiagnosticToVsCode', () => {
].join('\n') ].join('\n')
); );
assert.strictEqual(diagnostic.code, 'E0053'); assert.strictEqual(diagnostic.code, 'E0053');
assert.strictEqual(diagnostic.tags, undefined); assert.deepStrictEqual(diagnostic.tags, []);
// No related information // No related information
assert.deepStrictEqual(diagnostic.relatedInformation, []); assert.deepStrictEqual(diagnostic.relatedInformation, []);
@ -115,7 +115,7 @@ describe('mapRustDiagnosticToVsCode', () => {
); );
assert.strictEqual(diagnostic.code, 'E0061'); assert.strictEqual(diagnostic.code, 'E0061');
assert.strictEqual(diagnostic.source, 'rustc'); assert.strictEqual(diagnostic.source, 'rustc');
assert.strictEqual(diagnostic.tags, undefined); assert.deepStrictEqual(diagnostic.tags, []);
// One related information for the original definition // One related information for the original definition
const relatedInformation = diagnostic.relatedInformation; const relatedInformation = diagnostic.relatedInformation;
@ -149,7 +149,7 @@ describe('mapRustDiagnosticToVsCode', () => {
].join('\n') ].join('\n')
); );
assert.strictEqual(diagnostic.code, 'trivially_copy_pass_by_ref'); assert.strictEqual(diagnostic.code, 'trivially_copy_pass_by_ref');
assert.strictEqual(diagnostic.tags, undefined); assert.deepStrictEqual(diagnostic.tags, []);
// One related information for the lint definition // One related information for the lint definition
const relatedInformation = diagnostic.relatedInformation; const relatedInformation = diagnostic.relatedInformation;
@ -189,7 +189,7 @@ describe('mapRustDiagnosticToVsCode', () => {
); );
assert.strictEqual(diagnostic.code, 'E0308'); assert.strictEqual(diagnostic.code, 'E0308');
assert.strictEqual(diagnostic.source, 'rustc'); assert.strictEqual(diagnostic.source, 'rustc');
assert.strictEqual(diagnostic.tags, undefined); assert.deepStrictEqual(diagnostic.tags, []);
// No related information // No related information
assert.deepStrictEqual(diagnostic.relatedInformation, []); assert.deepStrictEqual(diagnostic.relatedInformation, []);

3
editors/code/src/utils/diagnostics/rust.ts
View File

@ -213,6 +213,7 @@ export function mapRustDiagnosticToVsCode(
vd.source = source; vd.source = source;
vd.code = code; vd.code = code;
vd.relatedInformation = []; vd.relatedInformation = [];
vd.tags = [];
for (const secondarySpan of secondarySpans) { for (const secondarySpan of secondarySpans) {
const related = mapSecondarySpanToRelated(secondarySpan); const related = mapSecondarySpanToRelated(secondarySpan);
@ -246,8 +247,6 @@ export function mapRustDiagnosticToVsCode(
vd.message += `\n${primarySpanLabel}`; vd.message += `\n${primarySpanLabel}`;
} }
vd.tags = []
if (isUnusedOrUnnecessary(rd)) { if (isUnusedOrUnnecessary(rd)) {
vd.tags.push(vscode.DiagnosticTag.Unnecessary); vd.tags.push(vscode.DiagnosticTag.Unnecessary);
} }