Remove duplicate startsWith and endsWith functions

Andy Hanson · Andy Hanson · commit 8e679b7021ba · 2016-07-13T10:04:21.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -900,7 +900,7 @@ namespace ts {
     }
 
     export function fileExtensionIs(path: string, extension: string): boolean {
-        return stringEndsWith(path, extension);
+        return path.length > extension.length && endsWith(path, extension);
     }
 
     export function fileExtensionIsAny(path: string, extensions: string[]): boolean {
@@ -913,18 +913,6 @@ namespace ts {
         return false;
     }
 
-    // Should act like String.prototype.startsWith
-    export function stringStartsWith(s: string, start: string): boolean {
-        return s.length > start.length && s.substr(0, start.length) === start;
-    }
-
-    // Should act like String.prototype.endsWith
-    export function stringEndsWith(s: string, end: string): boolean {
-        const sLen = s.length;
-        const endLen = end.length;
-        return sLen > endLen && s.substr(sLen - endLen, endLen) === end;
-    }
-
     // Reserved characters, forces escaping of any non-word (or digit), non-whitespace character.
     // It may be inefficient (we could just match (/[-[\]{}()*+?.,\\^$|#\s]/g), but this is future
     // proof.
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -1377,31 +1377,27 @@ namespace Harness {
             writeByteOrderMark: boolean;
         }
 
-        function stringEndsWith(str: string, end: string) {
-            return str.substr(str.length - end.length) === end;
-        }
-
         export function isTS(fileName: string) {
-            return stringEndsWith(fileName, ".ts");
+            return ts.endsWith(fileName, ".ts");
         }
 
         export function isTSX(fileName: string) {
-            return stringEndsWith(fileName, ".tsx");
+            return ts.endsWith(fileName, ".tsx");
         }
 
         export function isDTS(fileName: string) {
-            return stringEndsWith(fileName, ".d.ts");
+            return ts.endsWith(fileName, ".d.ts");
         }
 
         export function isJS(fileName: string) {
-            return stringEndsWith(fileName, ".js");
+            return ts.endsWith(fileName, ".js");
         }
         export function isJSX(fileName: string) {
-            return stringEndsWith(fileName, ".jsx");
+            return ts.endsWith(fileName, ".jsx");
         }
 
         export function isJSMap(fileName: string) {
-            return stringEndsWith(fileName, ".js.map") || stringEndsWith(fileName, ".jsx.map");
+            return ts.endsWith(fileName, ".js.map") || ts.endsWith(fileName, ".jsx.map");
         }
 
         /** Contains the code and errors of a compilation and some helper methods to check its status. */
diff --git a/src/services/patternMatcher.ts b/src/services/patternMatcher.ts
@@ -514,16 +514,6 @@ namespace ts {
         return str === str.toLowerCase();
     }
 
-    function startsWith(string: string, search: string) {
-        for (let i = 0, n = search.length; i < n; i++) {
-            if (string.charCodeAt(i) !== search.charCodeAt(i)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     // Assumes 'value' is already lowercase.
     function indexOfIgnoringCase(string: string, value: string): number {
         for (let i = 0, n = string.length - value.length; i <= n; i++) {

Original file line number	Diff line number	Diff line change
`@@ -1377,31 +1377,27 @@ namespace Harness {`
`1377`	`1377`	`writeByteOrderMark: boolean;`
`1378`	`1378`	`}`
`1379`	`1379`
`1380`		`- function stringEndsWith(str: string, end: string) {`
`1381`		`- return str.substr(str.length - end.length) === end;`
`1382`		`- }`
`1383`		`-`
`1384`	`1380`	`export function isTS(fileName: string) {`
`1385`		`- return stringEndsWith(fileName, ".ts");`
	`1381`	`+ return ts.endsWith(fileName, ".ts");`
`1386`	`1382`	`}`
`1387`	`1383`
`1388`	`1384`	`export function isTSX(fileName: string) {`
`1389`		`- return stringEndsWith(fileName, ".tsx");`
	`1385`	`+ return ts.endsWith(fileName, ".tsx");`
`1390`	`1386`	`}`
`1391`	`1387`
`1392`	`1388`	`export function isDTS(fileName: string) {`
`1393`		`- return stringEndsWith(fileName, ".d.ts");`
	`1389`	`+ return ts.endsWith(fileName, ".d.ts");`
`1394`	`1390`	`}`
`1395`	`1391`
`1396`	`1392`	`export function isJS(fileName: string) {`
`1397`		`- return stringEndsWith(fileName, ".js");`
	`1393`	`+ return ts.endsWith(fileName, ".js");`
`1398`	`1394`	`}`
`1399`	`1395`	`export function isJSX(fileName: string) {`
`1400`		`- return stringEndsWith(fileName, ".jsx");`
	`1396`	`+ return ts.endsWith(fileName, ".jsx");`
`1401`	`1397`	`}`
`1402`	`1398`
`1403`	`1399`	`export function isJSMap(fileName: string) {`
`1404`		`- return stringEndsWith(fileName, ".js.map") \|\| stringEndsWith(fileName, ".jsx.map");`
	`1400`	`+ return ts.endsWith(fileName, ".js.map") \|\| ts.endsWith(fileName, ".jsx.map");`
`1405`	`1401`	`}`
`1406`	`1402`
`1407`	`1403`	`/** Contains the code and errors of a compilation and some helper methods to check its status. */`