Merge pull request microsoft#25809 from ajafff/verify-strict-options

mhegazy · web-flow · commit feca91c67ba0 · 2018-07-19T15:56:45.000-07:00
correctly detect if strictNullChecks is enabled
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -2366,7 +2366,7 @@ namespace ts {
         }
 
         function verifyCompilerOptions() {
-            if (options.strictPropertyInitialization && !options.strictNullChecks) {
+            if (options.strictPropertyInitialization && !getStrictOptionValue(options, "strictNullChecks")) {
                 createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "strictPropertyInitialization", "strictNullChecks");
             }
 
diff --git a/tests/baselines/reference/optionsStrictPropertyInitializationStrict.js b/tests/baselines/reference/optionsStrictPropertyInitializationStrict.js
@@ -0,0 +1,7 @@
+//// [optionsStrictPropertyInitializationStrict.ts]
+var x;
+
+
+//// [optionsStrictPropertyInitializationStrict.js]
+"use strict";
+var x;
diff --git a/tests/baselines/reference/optionsStrictPropertyInitializationStrict.symbols b/tests/baselines/reference/optionsStrictPropertyInitializationStrict.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/optionsStrictPropertyInitializationStrict.ts ===
+var x;
+>x : Symbol(x, Decl(optionsStrictPropertyInitializationStrict.ts, 0, 3))
+
diff --git a/tests/baselines/reference/optionsStrictPropertyInitializationStrict.types b/tests/baselines/reference/optionsStrictPropertyInitializationStrict.types
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/optionsStrictPropertyInitializationStrict.ts ===
+var x;
+>x : any
+
diff --git a/tests/cases/compiler/optionsStrictPropertyInitializationStrict.ts b/tests/cases/compiler/optionsStrictPropertyInitializationStrict.ts
@@ -0,0 +1,4 @@
+// @strict: true
+// @strictPropertyInitialization: true
+
+var x;

Original file line number	Diff line number	Diff line change
`@@ -2366,7 +2366,7 @@ namespace ts {`
`2366`	`2366`	`}`
`2367`	`2367`
`2368`	`2368`	`function verifyCompilerOptions() {`
`2369`		`- if (options.strictPropertyInitialization && !options.strictNullChecks) {`
	`2369`	`+ if (options.strictPropertyInitialization && !getStrictOptionValue(options, "strictNullChecks")) {`
`2370`	`2370`	`createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "strictPropertyInitialization", "strictNullChecks");`
`2371`	`2371`	`}`
`2372`	`2372`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +=== tests/cases/compiler/optionsStrictPropertyInitializationStrict.ts ===
 +var x;
 +>x : Symbol(x, Decl(optionsStrictPropertyInitializationStrict.ts, 0, 3))
++