microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 21:06:50 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Replace usage of jsonObject on JsonSourceFile

Browse Source
This commit is contained in:
Sheetal Nandi
2018-01-26 14:06:22 -08:00
parent 5771adbbe7
commit ee2e267d38
7 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/commandLineParser.ts
View File

@@ -1056,11 +1056,11 @@ namespace ts {
errors: Push<Diagnostic>,
knownRootOptions: Map<CommandLineOption> | undefined,
jsonConversionNotifier: JsonConversionNotifier | undefined): any {
if (!sourceFile.jsonObject) {
if (!sourceFile.statements.length) {
return {};
}
return convertObjectLiteralExpressionToJson(sourceFile.jsonObject, knownRootOptions,
return convertObjectLiteralExpressionToJson(sourceFile.statements[0].expression, knownRootOptions,
/*extraKeyDiagnosticMessage*/ undefined, /*parentOption*/ undefined);
function convertObjectLiteralExpressionToJson(
@@ -2092,8 +2092,8 @@ namespace ts {
});
function createDiagnostic(message: DiagnosticMessage, spec: string): Diagnostic {
if (jsonSourceFile && jsonSourceFile.jsonObject) {
for (const property of getPropertyAssignment(jsonSourceFile.jsonObject, specKey)) {
if (jsonSourceFile && jsonSourceFile.statements.length) {
for (const property of getPropertyAssignment(jsonSourceFile.statements[0].expression, specKey)) {
if (isArrayLiteralExpression(property.initializer)) {
for (const element of property.initializer.elements) {
if (isStringLiteral(element) && element.text === spec) {