Skip to content

Commit 8f2f84f

Browse files
committed
Merge pull request microsoft#3923 from kimamula/string_includes
Add includes method to String interface, and remove contains
2 parents 2c5ba08 + 9c9e39e commit 8f2f84f

File tree

5 files changed

+55
-1
lines changed

5 files changed

+55
-1
lines changed

src/lib/es6.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ interface String {
377377
* @param searchString search string
378378
* @param position If position is undefined, 0 is assumed, so as to search all of the String.
379379
*/
380-
contains(searchString: string, position?: number): boolean;
380+
includes(searchString: string, position?: number): boolean;
381381

382382
/**
383383
* Returns true if the sequence of elements of searchString converted to a String is the
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//// [stringIncludes.ts]
2+
3+
var includes: boolean;
4+
includes = "abcde".includes("cd");
5+
includes = "abcde".includes("cd", 2);
6+
7+
//// [stringIncludes.js]
8+
var includes;
9+
includes = "abcde".includes("cd");
10+
includes = "abcde".includes("cd", 2);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
=== tests/cases/compiler/stringIncludes.ts ===
2+
3+
var includes: boolean;
4+
>includes : Symbol(includes, Decl(stringIncludes.ts, 1, 3))
5+
6+
includes = "abcde".includes("cd");
7+
>includes : Symbol(includes, Decl(stringIncludes.ts, 1, 3))
8+
>"abcde".includes : Symbol(String.includes, Decl(lib.d.ts, 1569, 37))
9+
>includes : Symbol(String.includes, Decl(lib.d.ts, 1569, 37))
10+
11+
includes = "abcde".includes("cd", 2);
12+
>includes : Symbol(includes, Decl(stringIncludes.ts, 1, 3))
13+
>"abcde".includes : Symbol(String.includes, Decl(lib.d.ts, 1569, 37))
14+
>includes : Symbol(String.includes, Decl(lib.d.ts, 1569, 37))
15+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
=== tests/cases/compiler/stringIncludes.ts ===
2+
3+
var includes: boolean;
4+
>includes : boolean
5+
6+
includes = "abcde".includes("cd");
7+
>includes = "abcde".includes("cd") : boolean
8+
>includes : boolean
9+
>"abcde".includes("cd") : boolean
10+
>"abcde".includes : (searchString: string, position?: number) => boolean
11+
>"abcde" : string
12+
>includes : (searchString: string, position?: number) => boolean
13+
>"cd" : string
14+
15+
includes = "abcde".includes("cd", 2);
16+
>includes = "abcde".includes("cd", 2) : boolean
17+
>includes : boolean
18+
>"abcde".includes("cd", 2) : boolean
19+
>"abcde".includes : (searchString: string, position?: number) => boolean
20+
>"abcde" : string
21+
>includes : (searchString: string, position?: number) => boolean
22+
>"cd" : string
23+
>2 : number
24+
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
//@target: ES6
2+
3+
var includes: boolean;
4+
includes = "abcde".includes("cd");
5+
includes = "abcde".includes("cd", 2);

0 commit comments

Comments
 (0)