Skip to content

Commit 3a443a2

Browse files
zspitzzspitz
committed
Merge pull request #1 from Microsoft/master
Merge 1
2 parents 5330db6 + e13dc1d commit 3a443a2

12 files changed

+5
-53
lines changed

Diff for: ‎src/compiler/commandLineParser.ts

-8
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ module ts {
99
name: "charset",
1010
type: "string",
1111
},
12-
{
13-
name: "codepage",
14-
type: "number",
15-
},
1612
{
1713
name: "declaration",
1814
shortName: "d",
@@ -78,10 +74,6 @@ module ts {
7874
name: "noLib",
7975
type: "boolean",
8076
},
81-
{
82-
name: "noLibCheck",
83-
type: "boolean",
84-
},
8577
{
8678
name: "noResolve",
8779
type: "boolean",

Diff for: ‎src/compiler/types.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,6 @@ module ts {
15601560
export interface CompilerOptions {
15611561
allowNonTsExtensions?: boolean;
15621562
charset?: string;
1563-
codepage?: number;
15641563
declaration?: boolean;
15651564
diagnostics?: boolean;
15661565
emitBOM?: boolean;
@@ -1574,7 +1573,6 @@ module ts {
15741573
noErrorTruncation?: boolean;
15751574
noImplicitAny?: boolean;
15761575
noLib?: boolean;
1577-
noLibCheck?: boolean;
15781576
noResolve?: boolean;
15791577
out?: string;
15801578
outDir?: string;

Diff for: ‎src/harness/harness.ts

-10
Original file line numberDiff line numberDiff line change
@@ -1036,17 +1036,7 @@ module Harness {
10361036
useCaseSensitiveFileNames = setting.value === 'true';
10371037
break;
10381038

1039-
case 'mapsourcefiles':
1040-
case 'maproot':
1041-
case 'generatedeclarationfiles':
1042-
case 'gatherDiagnostics':
1043-
case 'codepage':
1044-
case 'createFileLog':
10451039
case 'filename':
1046-
case 'removecomments':
1047-
case 'watch':
1048-
case 'allowautomaticsemicoloninsertion':
1049-
case 'locale':
10501040
// Not supported yet
10511041
break;
10521042

Diff for: ‎src/lib/scriptHost.d.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
/// Windows Script Host APIS
55
/////////////////////////////
66

7-
declare var ActiveXObject: { new (s: string): any; };
7+
8+
interface ActiveXObject {
9+
new (s: string): any;
10+
}
11+
declare var ActiveXObject: ActiveXObject;
812

913
interface ITextWriter {
1014
Write(s: string): void;

Diff for: ‎tests/baselines/reference/APISample_compile.js

-2
Original file line numberDiff line numberDiff line change
@@ -1216,7 +1216,6 @@ declare module "typescript" {
12161216
interface CompilerOptions {
12171217
allowNonTsExtensions?: boolean;
12181218
charset?: string;
1219-
codepage?: number;
12201219
declaration?: boolean;
12211220
diagnostics?: boolean;
12221221
emitBOM?: boolean;
@@ -1230,7 +1229,6 @@ declare module "typescript" {
12301229
noErrorTruncation?: boolean;
12311230
noImplicitAny?: boolean;
12321231
noLib?: boolean;
1233-
noLibCheck?: boolean;
12341232
noResolve?: boolean;
12351233
out?: string;
12361234
outDir?: string;

Diff for: ‎tests/baselines/reference/APISample_compile.types

-6
Original file line numberDiff line numberDiff line change
@@ -3901,9 +3901,6 @@ declare module "typescript" {
39013901
charset?: string;
39023902
>charset : string
39033903

3904-
codepage?: number;
3905-
>codepage : number
3906-
39073904
declaration?: boolean;
39083905
>declaration : boolean
39093906

@@ -3944,9 +3941,6 @@ declare module "typescript" {
39443941
noLib?: boolean;
39453942
>noLib : boolean
39463943

3947-
noLibCheck?: boolean;
3948-
>noLibCheck : boolean
3949-
39503944
noResolve?: boolean;
39513945
>noResolve : boolean
39523946

Diff for: ‎tests/baselines/reference/APISample_linter.js

-2
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,6 @@ declare module "typescript" {
12471247
interface CompilerOptions {
12481248
allowNonTsExtensions?: boolean;
12491249
charset?: string;
1250-
codepage?: number;
12511250
declaration?: boolean;
12521251
diagnostics?: boolean;
12531252
emitBOM?: boolean;
@@ -1261,7 +1260,6 @@ declare module "typescript" {
12611260
noErrorTruncation?: boolean;
12621261
noImplicitAny?: boolean;
12631262
noLib?: boolean;
1264-
noLibCheck?: boolean;
12651263
noResolve?: boolean;
12661264
out?: string;
12671265
outDir?: string;

Diff for: ‎tests/baselines/reference/APISample_linter.types

-6
Original file line numberDiff line numberDiff line change
@@ -4047,9 +4047,6 @@ declare module "typescript" {
40474047
charset?: string;
40484048
>charset : string
40494049

4050-
codepage?: number;
4051-
>codepage : number
4052-
40534050
declaration?: boolean;
40544051
>declaration : boolean
40554052

@@ -4090,9 +4087,6 @@ declare module "typescript" {
40904087
noLib?: boolean;
40914088
>noLib : boolean
40924089

4093-
noLibCheck?: boolean;
4094-
>noLibCheck : boolean
4095-
40964090
noResolve?: boolean;
40974091
>noResolve : boolean
40984092

Diff for: ‎tests/baselines/reference/APISample_transform.js

-2
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,6 @@ declare module "typescript" {
12481248
interface CompilerOptions {
12491249
allowNonTsExtensions?: boolean;
12501250
charset?: string;
1251-
codepage?: number;
12521251
declaration?: boolean;
12531252
diagnostics?: boolean;
12541253
emitBOM?: boolean;
@@ -1262,7 +1261,6 @@ declare module "typescript" {
12621261
noErrorTruncation?: boolean;
12631262
noImplicitAny?: boolean;
12641263
noLib?: boolean;
1265-
noLibCheck?: boolean;
12661264
noResolve?: boolean;
12671265
out?: string;
12681266
outDir?: string;

Diff for: ‎tests/baselines/reference/APISample_transform.types

-6
Original file line numberDiff line numberDiff line change
@@ -3997,9 +3997,6 @@ declare module "typescript" {
39973997
charset?: string;
39983998
>charset : string
39993999

4000-
codepage?: number;
4001-
>codepage : number
4002-
40034000
declaration?: boolean;
40044001
>declaration : boolean
40054002

@@ -4040,9 +4037,6 @@ declare module "typescript" {
40404037
noLib?: boolean;
40414038
>noLib : boolean
40424039

4043-
noLibCheck?: boolean;
4044-
>noLibCheck : boolean
4045-
40464040
noResolve?: boolean;
40474041
>noResolve : boolean
40484042

Diff for: ‎tests/baselines/reference/APISample_watcher.js

-2
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,6 @@ declare module "typescript" {
12851285
interface CompilerOptions {
12861286
allowNonTsExtensions?: boolean;
12871287
charset?: string;
1288-
codepage?: number;
12891288
declaration?: boolean;
12901289
diagnostics?: boolean;
12911290
emitBOM?: boolean;
@@ -1299,7 +1298,6 @@ declare module "typescript" {
12991298
noErrorTruncation?: boolean;
13001299
noImplicitAny?: boolean;
13011300
noLib?: boolean;
1302-
noLibCheck?: boolean;
13031301
noResolve?: boolean;
13041302
out?: string;
13051303
outDir?: string;

Diff for: ‎tests/baselines/reference/APISample_watcher.types

-6
Original file line numberDiff line numberDiff line change
@@ -4170,9 +4170,6 @@ declare module "typescript" {
41704170
charset?: string;
41714171
>charset : string
41724172

4173-
codepage?: number;
4174-
>codepage : number
4175-
41764173
declaration?: boolean;
41774174
>declaration : boolean
41784175

@@ -4213,9 +4210,6 @@ declare module "typescript" {
42134210
noLib?: boolean;
42144211
>noLib : boolean
42154212

4216-
noLibCheck?: boolean;
4217-
>noLibCheck : boolean
4218-
42194213
noResolve?: boolean;
42204214
>noResolve : boolean
42214215

0 commit comments

Comments
 (0)