JavaScriptBench
diff --git a/Collapse file
‎src/compiler/checker.ts‎
Copy file name to clipboardExpand all lines: src/compiler/checker.ts
+1-2Lines changed: 1 addition & 2 deletions b/Collapse file
‎src/compiler/checker.ts‎
Copy file name to clipboardExpand all lines: src/compiler/checker.ts
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/Collapse file
‎src/compiler/commandLineParser.ts‎
Copy file name to clipboardExpand all lines: src/compiler/commandLineParser.ts
+2Lines changed: 2 additions & 0 deletions b/Collapse file
‎src/compiler/commandLineParser.ts‎
Copy file name to clipboardExpand all lines: src/compiler/commandLineParser.ts
+2Lines changed: 2 additions & 0 deletions
diff --git a/Collapse file
‎src/compiler/program.ts‎
Copy file name to clipboardExpand all lines: src/compiler/program.ts
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎src/compiler/program.ts‎
Copy file name to clipboardExpand all lines: src/compiler/program.ts
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎src/compiler/utilities.ts‎
Copy file name to clipboardExpand all lines: src/compiler/utilities.ts
+7-13Lines changed: 7 additions & 13 deletions b/Collapse file
‎src/compiler/utilities.ts‎
Copy file name to clipboardExpand all lines: src/compiler/utilities.ts
+7-13Lines changed: 7 additions & 13 deletions
@@ -4719,8 +4719,7 @@ namespace ts {
                 }
                 // Handle export default expressions
                 if (isSourceFile(declaration)) {
-                    Debug.assert(isJsonSourceFile(declaration));
-                    const jsonSourceFile = <JsonSourceFile>declaration;
+                    const jsonSourceFile = cast(declaration, isJsonSourceFile);
                     return links.type = jsonSourceFile.statements.length ? checkExpression(jsonSourceFile.statements[0].expression) : emptyObjectType;
                 }
                 if (declaration.kind === SyntaxKind.ExportAssignment) {
 
@@ -1076,6 +1076,8 @@ namespace ts {
 
     /**
      * Convert the json syntax tree into the json value and report errors
+     * This returns the json value (apart from checking errors) only if returnValue provided is true.
+     * Otherwise it just checks the errors and returns undefined
      */
     /*@internal*/
     export function convertToObjectWorker(
 
@@ -2433,7 +2433,7 @@ namespace ts {
         switch (extension) {
             case Extension.Ts:
             case Extension.Dts:
-            case Extension.Json:
+            case Extension.Json: // Since module is resolved to json file only when --resolveJsonModule, we dont need further check
                 // These are always allowed.
                 return undefined;
             case Extension.Tsx:
 
@@ -1076,26 +1076,20 @@ namespace ts {
         });
     }
 
-    export function getTsConfigObjectLiteralExpression(tsConfigSourceFile: TsConfigSourceFile) {
+    export function getTsConfigObjectLiteralExpression(tsConfigSourceFile: TsConfigSourceFile | undefined) {
         if (tsConfigSourceFile && tsConfigSourceFile.statements.length) {
             const expression = tsConfigSourceFile.statements[0].expression;
             return isObjectLiteralExpression(expression) && expression;
         }
     }
 
-    export function getTsConfigPropArrayElementValue(tsConfigSourceFile: TsConfigSourceFile, propKey: string, elementValue: string): StringLiteral {
+    export function getTsConfigPropArrayElementValue(tsConfigSourceFile: TsConfigSourceFile | undefined, propKey: string, elementValue: string): StringLiteral | undefined {
         const jsonObjectLiteral = getTsConfigObjectLiteralExpression(tsConfigSourceFile);
-        if (jsonObjectLiteral) {
-            for (const property of getPropertyAssignment(jsonObjectLiteral, propKey)) {
-                if (isArrayLiteralExpression(property.initializer)) {
-                    for (const element of property.initializer.elements) {
-                        if (isStringLiteral(element) && element.text === elementValue) {
-                            return element;
-                        }
-                    }
-                }
-            }
-        }
+        return jsonObjectLiteral &&
+            firstDefined(getPropertyAssignment(jsonObjectLiteral, propKey), property =>
+                isArrayLiteralExpression(property.initializer) ?
+                    find(property.initializer.elements, (element): element is StringLiteral => isStringLiteral(element) && element.text === elementValue) :
+                    undefined);
     }
 
     export function getContainingFunction(node: Node): SignatureDeclaration {
Original file line number	Diff line number	Diff line change
`@@ -4719,8 +4719,7 @@ namespace ts {`
`4719`	`4719`	`}`
`4720`	`4720`	`// Handle export default expressions`
`4721`	`4721`	`if (isSourceFile(declaration)) {`
`4722`		`- Debug.assert(isJsonSourceFile(declaration));`
`4723`		`- const jsonSourceFile = <JsonSourceFile>declaration;`
	`4722`	`+ const jsonSourceFile = cast(declaration, isJsonSourceFile);`
`4724`	`4723`	`return links.type = jsonSourceFile.statements.length ? checkExpression(jsonSourceFile.statements[0].expression) : emptyObjectType;`
`4725`	`4724`	`}`
`4726`	`4725`	`if (declaration.kind === SyntaxKind.ExportAssignment) {`