microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-26 10:43:51 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge changes from master in services.ts

Browse Source
This commit is contained in:
Mohamed Hegazy
2014-10-13 14:06:16 -07:00
parent fc842b177e
commit 4f4f59a781
10 changed files with 49 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/cases/fourslash/bestCommonTypeObjectLiterals1.ts
View File

@@ -28,10 +28,19 @@ goTo.marker('2');
verify.quickInfoIs('(var) c1: {\n name: string;\n age: number;\n}[]');
goTo.marker('3');
verify.quickInfoIs('(var) c2: {}[]');
verify.quickInfoIs('(var) c2: Array<{\n\
name: string;\n\
age: number;\n\
address: string;\n\
} | {\n\
name: string;\n\
age: number;\n\
dob: Date;\n\
}>');
goTo.marker('4');
verify.quickInfoIs('(var) c2a: {\n name: string;\n age: number;\n}[]');
goTo.marker('5');
verify.quickInfoIs('(var) c3: I[]');
verify.quickInfoIs('(var) c3: I[]');

4
tests/cases/fourslash/completionEntryForUnionProperty.ts
View File

@@ -15,6 +15,6 @@
////x./**/
goTo.marker();
verify.memberListContains("commonProperty", "string | number", undefined, undefined, "property");
verify.memberListContains("commonFunction", "() => number", undefined, undefined, "method");
verify.memberListContains("commonProperty", "(property) commonProperty: string | number");
verify.memberListContains("commonFunction", "(method) commonFunction(): number");
verify.memberListCount(2);

2
tests/cases/fourslash/completionEntryForUnionProperty2.ts
View File

@@ -15,5 +15,5 @@
////x.commonProperty./**/
goTo.marker();
verify.memberListContains("toString", "() => string", undefined, undefined, "method");
verify.memberListContains("toString", "(method) toString(): string");
verify.memberListCount(1);

4
tests/cases/fourslash/contextualTypingOfArrayLiterals1.ts
View File

@@ -43,7 +43,7 @@ goTo.marker('4');
verify.quickInfoIs('(var) r4: C');
goTo.marker('5');
verify.quickInfoIs('(var) x5: {\n name: string;\n age: number;\n}[]');
verify.quickInfoIs('(var) x5: C[]');
goTo.marker('6');
verify.quickInfoIs('(var) r5: {\n name: string;\n age: number;\n}');
verify.quickInfoIs('(var) r5: C');

6
tests/cases/fourslash/genericTypeArgumentInference1.ts
View File

@@ -18,9 +18,9 @@
////var /*4*/r4 = _./*41*/all([<any>true], _.identity);
goTo.marker('1');
verify.quickInfoIs('(var) r: {}');
verify.quickInfoIs('(var) r: string | number | boolean');
goTo.marker('11');
verify.quickInfoIs('(method) Underscore.Static.all<{}>(list: {}[], iterator?: Underscore.Iterator<{}, boolean>, context?: any): {}');
verify.quickInfoIs('(method) Underscore.Static.all<string | number | boolean>(list: Array<string | number | boolean>, iterator?: Underscore.Iterator<string | number | boolean, boolean>, context?: any): string | number | boolean');
goTo.marker('2');
verify.quickInfoIs('(var) r2: boolean');
@@ -37,4 +37,4 @@ verify.quickInfoIs('(var) r4: any');
goTo.marker('41');
verify.quickInfoIs('(method) Underscore.Static.all<any>(list: any[], iterator?: Underscore.Iterator<any, boolean>, context?: any): any');
verify.numberOfErrorsInCurrentFile(0);
verify.numberOfErrorsInCurrentFile(0);

4
tests/cases/fourslash/genericTypeArgumentInference2.ts
View File

@@ -18,9 +18,9 @@
////var /*4*/r4 = _./*41*/all([<any>true], _.identity);
goTo.marker('1');
verify.quickInfoIs('(var) r: {}');
verify.quickInfoIs('(var) r: string | number | boolean');
goTo.marker('11');
verify.quickInfoIs('(method) Underscore.Static.all<{}>(list: {}[], iterator?: Underscore.Iterator<{}, boolean>, context?: any): {}');
verify.quickInfoIs('(method) Underscore.Static.all<string | number | boolean>(list: Array<string | number | boolean>, iterator?: Underscore.Iterator<string | number | boolean, boolean>, context?: any): string | number | boolean');
goTo.marker('2');
verify.quickInfoIs('(var) r2: boolean');

6
tests/cases/fourslash/quickinfoForUnionProperty.ts
View File

@@ -17,11 +17,11 @@
goTo.marker("1");
verify.quickInfoIs("One | Two", "", "x", "var");
verify.quickInfoIs('(var) x: One | Two');
goTo.marker("2");
verify.quickInfoIs("string | number", "", "commonProperty", "property");
verify.quickInfoIs('(property) commonProperty: string | number');
goTo.marker("3");
verify.quickInfoIs("() => number", "", "commonFunction", "method");
verify.quickInfoIs('(method) commonFunction(): number');