Skip to content

Commit 213d374

Browse files
author
Andy Hanson
committed
Make equalityComparer non-optional
1 parent ac7c2ba commit 213d374

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

src/compiler/core.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ namespace ts {
775775
return deduplicated.map(i => array[i]);
776776
}
777777

778-
function deduplicateEquality<T>(array: ReadonlyArray<T>, equalityComparer?: EqualityComparer<T>) {
778+
function deduplicateEquality<T>(array: ReadonlyArray<T>, equalityComparer: EqualityComparer<T>) {
779779
const result: T[] = [];
780780
for (const item of array) {
781781
pushIfUnique(result, item, equalityComparer);
@@ -789,10 +789,10 @@ namespace ts {
789789
* @param comparer An optional `Comparer` used to sort entries before comparison, though the
790790
* result will remain in the original order in `array`.
791791
*/
792-
export function deduplicate<T>(array: ReadonlyArray<T>, equalityComparer?: EqualityComparer<T>, comparer?: Comparer<T>): T[] {
792+
export function deduplicate<T>(array: ReadonlyArray<T>, equalityComparer: EqualityComparer<T>, comparer?: Comparer<T>): T[] {
793793
return array.length === 0 ? [] :
794794
array.length === 1 ? array.slice() :
795-
comparer ? deduplicateRelational(array, equalityComparer!, comparer) :
795+
comparer ? deduplicateRelational(array, equalityComparer, comparer) :
796796
deduplicateEquality(array, equalityComparer);
797797
}
798798

src/server/session.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,6 @@ namespace ts.server {
266266
getValue: (path: Path) => T,
267267
projects: Projects,
268268
action: (project: Project, value: T) => ReadonlyArray<U> | U | undefined,
269-
comparer?: (a: U, b: U) => number,
270-
areEqual?: (a: U, b: U) => boolean,
271269
): U[] {
272270
const outputs = flatMap(isArray(projects) ? projects : projects.projects, project => action(project, defaultValue));
273271
if (!isArray(projects) && projects.symLinkedProjects) {
@@ -276,10 +274,7 @@ namespace ts.server {
276274
outputs.push(...flatMap(projects, project => action(project, value)));
277275
});
278276
}
279-
280-
return comparer
281-
? sortAndDeduplicate(outputs, comparer, areEqual)
282-
: deduplicate(outputs, areEqual);
277+
return deduplicate(outputs, equateValues);
283278
}
284279

285280
function combineProjectOutputFromEveryProject<T>(projectService: ProjectService, action: (project: Project) => ReadonlyArray<T>, areEqual: (a: T, b: T) => boolean) {

0 commit comments

Comments
 (0)