microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-06 04:35:21 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

use deduplicate

Browse Source
This commit is contained in:
Arthur Ozga
2017-02-14 11:30:19 -08:00
parent 21355982fd
commit 6c2c2f8f3f
2 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/harness/fourslash.ts
View File

@@ -2150,30 +2150,21 @@ namespace FourSlash {
* @param fileName Path to file where error should be retrieved from.
*/
private getCodeFixActions(fileName: string, errorCode?: number): ts.CodeAction[] {
const diagnostics: ts.Diagnostic[] = this.getDiagnostics(fileName);
let actions: ts.CodeAction[] = undefined;
const checkedDiagnostics = ts.createMap<boolean>();
for (const diagnostic of diagnostics) {
if (errorCode && errorCode !== diagnostic.code) {
continue;
}
const summary = JSON.stringify({
const diagnosticsForCodeFix = this.getDiagnostics(fileName).map(diagnostic => {
return {
start: diagnostic.start,
length: diagnostic.length,
code: diagnostic.code
});
if (checkedDiagnostics.has(summary)) {
// Don't want to ask for code fixes in an identical position for the same error code twice.
continue;
}
else {
checkedDiagnostics.set(summary, true);
});
const dedupedDiagnositcs = ts.deduplicate(diagnosticsForCodeFix, ts.equalOwnProperties);
let actions: ts.CodeAction[] = undefined;
for (const diagnostic of dedupedDiagnositcs) {
if (errorCode && errorCode !== diagnostic.code) {
continue;
}
const newActions = this.languageService.getCodeFixesAtPosition(fileName, diagnostic.start, diagnostic.length, [diagnostic.code]);

8
src/services/services.ts
View File

@@ -1688,13 +1688,7 @@ namespace ts {
let allFixes: CodeAction[] = [];
// De-duplicate error codes.
const errorCodeSet: number[] = [];
for (const code of errorCodes) {
errorCodeSet[code] = code;
}
forEach(errorCodeSet, error => {
forEach(deduplicate(errorCodes), error => {
cancellationToken.throwIfCancellationRequested();
const context = {