correctly detect if strictNullChecks is enabled

ajafff · ajafff · commit 7031c439782b · 2018-07-20T00:16:59.000+02:00
Fixes: microsoft#25808
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/src/testRunner/unittests/convertCompilerOptionsFromJson.ts b/src/testRunner/unittests/convertCompilerOptionsFromJson.ts
@@ -436,6 +436,51 @@ namespace ts {
             );
         });
 
+        it("Correctly detects implicitly enabled strictNullChecks ", () => {
+            assertCompilerOptions(
+                {
+                    compilerOptions: {
+                        strict: true,
+                        strictPropertyInitialization: true
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: {
+                        strict: true,
+                        strictPropertyInitialization: true
+                    },
+                    errors: []
+                }
+            );
+        });
+
+        it("Checks dependency of strict options ", () => {
+            assertCompilerOptions(
+                {
+                    compilerOptions: {
+                        strict: true,
+                        strictNullChecks: false,
+                        strictPropertyInitialization: true
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: {
+                        strict: true,
+                        strictNullChecks: false,
+                        strictPropertyInitialization: true
+                    },
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Option 'strictPropertyInitialization' cannot be specified without specifying option 'strictNullChecks'.",
+                        code: Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1.code,
+                        category: Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1.category
+                    }]
+                }
+            );
+        });
+
         // jsconfig.json
         it("Convert correctly format jsconfig.json to compiler-options ", () => {
             assertCompilerOptions(

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`