Rename 'find' functions

Andy Hanson · Andy Hanson · commit 2eb159e269f7 · 2016-08-15T10:34:07.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1032,7 +1032,7 @@ namespace ts {
         }
 
         function getDeclarationOfAliasSymbol(symbol: Symbol): Declaration {
-            return find(symbol.declarations, d => isAliasSymbolDeclaration(d) ? d : undefined);
+            return findMap(symbol.declarations, d => isAliasSymbolDeclaration(d) ? d : undefined);
         }
 
         function getTargetOfImportEqualsDeclaration(node: ImportEqualsDeclaration): Symbol {
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -110,7 +110,7 @@ namespace ts {
     }
 
     /** Works like Array.prototype.find, returning `undefined` if no element satisfying the predicate is found. */
-    export function tryFind<T>(array: T[], predicate: (element: T, index: number) => boolean): T | undefined {
+    export function find<T>(array: T[], predicate: (element: T, index: number) => boolean): T | undefined {
         for (let i = 0, len = array.length; i < len; i++) {
             const value = array[i];
             if (predicate(value, i)) {
@@ -120,8 +120,11 @@ namespace ts {
         return undefined;
     }
 
-    /** Like `forEach`, but assumes existence of array and fails if no truthy value is found. */
-    export function find<T, U>(array: T[], callback: (element: T, index: number) => U | undefined): U {
+    /**
+     * Returns the first truthy result of `callback`, or else fails.
+     * This is like `forEach`, but never returns undefined.
+     */
+    export function findMap<T, U>(array: T[], callback: (element: T, index: number) => U | undefined): U {
         for (let i = 0, len = array.length; i < len; i++) {
             const result = callback(array[i], i);
             if (result) {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -2715,7 +2715,7 @@ namespace ts {
 
     /** Return ".ts" or ".tsx" if that is the extension. */
     export function tryExtractTypeScriptExtension(fileName: string): string | undefined {
-        return tryFind(supportedTypescriptExtensionsWithDtsFirst, extension => fileExtensionIs(fileName, extension));
+        return find(supportedTypescriptExtensionsWithDtsFirst, extension => fileExtensionIs(fileName, extension));
     }
     // Must have '.d.ts' first because if '.ts' goes first, that will be detected as the extension instead of '.d.ts'.
     const supportedTypescriptExtensionsWithDtsFirst = supportedTypeScriptExtensions.slice().reverse();

Original file line number	Diff line number	Diff line change
`@@ -1032,7 +1032,7 @@ namespace ts {`
`1032`	`1032`	`}`
`1033`	`1033`
`1034`	`1034`	`function getDeclarationOfAliasSymbol(symbol: Symbol): Declaration {`
`1035`		`- return find(symbol.declarations, d => isAliasSymbolDeclaration(d) ? d : undefined);`
	`1035`	`+ return findMap(symbol.declarations, d => isAliasSymbolDeclaration(d) ? d : undefined);`
`1036`	`1036`	`}`
`1037`	`1037`
`1038`	`1038`	`function getTargetOfImportEqualsDeclaration(node: ImportEqualsDeclaration): Symbol {`
Original file line number	Diff line number	Diff line change
`@@ -2715,7 +2715,7 @@ namespace ts {`
`2715`	`2715`
`2716`	`2716`	`/** Return ".ts" or ".tsx" if that is the extension. */`
`2717`	`2717`	`export function tryExtractTypeScriptExtension(fileName: string): string \| undefined {`
`2718`		`- return tryFind(supportedTypescriptExtensionsWithDtsFirst, extension => fileExtensionIs(fileName, extension));`
	`2718`	`+ return find(supportedTypescriptExtensionsWithDtsFirst, extension => fileExtensionIs(fileName, extension));`
`2719`	`2719`	`}`
`2720`	`2720`	`// Must have '.d.ts' first because if '.ts' goes first, that will be detected as the extension instead of '.d.ts'.`
`2721`	`2721`	`const supportedTypescriptExtensionsWithDtsFirst = supportedTypeScriptExtensions.slice().reverse();`