From 8f8fec433eb1e47aa9d0ac7459ee06edfb3ef326 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 5 Feb 2018 14:48:50 -0800 Subject: [PATCH] Rename switch `--emitDeclarationsOnly` to `--emitDeclarationOnly` (#21651) * Rename `--emitDeclarationsOnly` to `--renameDeclarationOnly` * Rename test files --- src/compiler/commandLineParser.ts | 2 +- src/compiler/emitter.ts | 2 +- src/compiler/program.ts | 8 ++++---- src/compiler/types.ts | 2 +- src/harness/harness.ts | 6 +++--- tests/baselines/reference/api/tsserverlibrary.d.ts | 2 +- tests/baselines/reference/api/typescript.d.ts | 2 +- ...eclarationsOnly.js => declFileEmitDeclarationOnly.js} | 0 ...sOnly.symbols => declFileEmitDeclarationOnly.symbols} | 0 ...tionsOnly.types => declFileEmitDeclarationOnly.types} | 0 .../declFileEmitDeclarationOnlyError1.errors.txt | 7 +++++++ ...symbols => declFileEmitDeclarationOnlyError1.symbols} | 0 ...or1.types => declFileEmitDeclarationOnlyError1.types} | 0 .../declFileEmitDeclarationOnlyError2.errors.txt | 9 +++++++++ ...symbols => declFileEmitDeclarationOnlyError2.symbols} | 0 ...or2.types => declFileEmitDeclarationOnlyError2.types} | 0 .../declFileEmitDeclarationsOnlyError1.errors.txt | 7 ------- .../declFileEmitDeclarationsOnlyError2.errors.txt | 9 --------- ...eclarationsOnly.ts => declFileEmitDeclarationOnly.ts} | 2 +- ...nlyError1.ts => declFileEmitDeclarationOnlyError1.ts} | 2 +- ...nlyError2.ts => declFileEmitDeclarationOnlyError2.ts} | 2 +- 21 files changed, 31 insertions(+), 31 deletions(-) rename tests/baselines/reference/{declFileEmitDeclarationsOnly.js => declFileEmitDeclarationOnly.js} (100%) rename tests/baselines/reference/{declFileEmitDeclarationsOnly.symbols => declFileEmitDeclarationOnly.symbols} (100%) rename tests/baselines/reference/{declFileEmitDeclarationsOnly.types => declFileEmitDeclarationOnly.types} (100%) create mode 100644 tests/baselines/reference/declFileEmitDeclarationOnlyError1.errors.txt rename tests/baselines/reference/{declFileEmitDeclarationsOnlyError1.symbols => declFileEmitDeclarationOnlyError1.symbols} (100%) rename tests/baselines/reference/{declFileEmitDeclarationsOnlyError1.types => declFileEmitDeclarationOnlyError1.types} (100%) create mode 100644 tests/baselines/reference/declFileEmitDeclarationOnlyError2.errors.txt rename tests/baselines/reference/{declFileEmitDeclarationsOnlyError2.symbols => declFileEmitDeclarationOnlyError2.symbols} (100%) rename tests/baselines/reference/{declFileEmitDeclarationsOnlyError2.types => declFileEmitDeclarationOnlyError2.types} (100%) delete mode 100644 tests/baselines/reference/declFileEmitDeclarationsOnlyError1.errors.txt delete mode 100644 tests/baselines/reference/declFileEmitDeclarationsOnlyError2.errors.txt rename tests/cases/compiler/{declFileEmitDeclarationsOnly.ts => declFileEmitDeclarationOnly.ts} (87%) rename tests/cases/compiler/{declFileEmitDeclarationsOnlyError1.ts => declFileEmitDeclarationOnlyError1.ts} (58%) rename tests/cases/compiler/{declFileEmitDeclarationsOnlyError2.ts => declFileEmitDeclarationOnlyError2.ts} (65%) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index b6921253f57..825f2c632e7 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -187,7 +187,7 @@ namespace ts { description: Diagnostics.Generates_corresponding_d_ts_file, }, { - name: "emitDeclarationsOnly", + name: "emitDeclarationOnly", type: "boolean", category: Diagnostics.Advanced_Options, description: Diagnostics.Only_emit_d_ts_declaration_files, diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 58aa2c7a563..3c9866b3536 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -135,7 +135,7 @@ namespace ts { function emitSourceFileOrBundle({ jsFilePath, sourceMapFilePath, declarationFilePath }: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle) { // Make sure not to write js file and source map file if any of them cannot be written - if (!host.isEmitBlocked(jsFilePath) && !compilerOptions.noEmit && !compilerOptions.emitDeclarationsOnly) { + if (!host.isEmitBlocked(jsFilePath) && !compilerOptions.noEmit && !compilerOptions.emitDeclarationOnly) { if (!emitOnlyDtsFiles) { printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle); } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 24a1a0eb106..1f2a3bfcd5d 100755 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -2201,13 +2201,13 @@ namespace ts { programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "checkJs", "allowJs")); } - if (options.emitDeclarationsOnly) { + if (options.emitDeclarationOnly) { if (!options.declaration) { - createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDeclarationsOnly", "declarations"); + createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDeclarationOnly", "declarations"); } if (options.noEmit) { - createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, "emitDeclarationsOnly", "noEmit"); + createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, "emitDeclarationOnly", "noEmit"); } } @@ -2233,7 +2233,7 @@ namespace ts { const emitHost = getEmitHost(); const emitFilesSeen = createMap(); forEachEmittedFile(emitHost, (emitFileNames) => { - if (!options.emitDeclarationsOnly) { + if (!options.emitDeclarationOnly) { verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen); } verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5a31abb5e6c..e235c953ac5 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -4025,7 +4025,7 @@ namespace ts { /** configFile is set as non enumerable property so as to avoid checking of json source files */ /* @internal */ readonly configFile?: JsonSourceFile; declaration?: boolean; - emitDeclarationsOnly?: boolean; + emitDeclarationOnly?: boolean; declarationDir?: string; /* @internal */ diagnostics?: boolean; /* @internal */ extendedDiagnostics?: boolean; diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 3e6f4cfa163..53f8133b8e5 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1255,9 +1255,9 @@ namespace Harness { if (result.errors.length === 0) { if (options.declaration) { - if (options.emitDeclarationsOnly) { + if (options.emitDeclarationOnly) { if (result.files.length > 0 || result.declFilesCode.length === 0) { - throw new Error("Only declaration files should be generated when emitDeclarationsOnly:true"); + throw new Error("Only declaration files should be generated when emitDeclarationOnly:true"); } } else if (result.declFilesCode.length !== result.files.length) { @@ -1664,7 +1664,7 @@ namespace Harness { } export function doJsEmitBaseline(baselinePath: string, header: string, options: ts.CompilerOptions, result: CompilerResult, tsConfigFiles: Harness.Compiler.TestFile[], toBeCompiled: Harness.Compiler.TestFile[], otherFiles: Harness.Compiler.TestFile[], harnessSettings: Harness.TestCaseParser.CompilerSettings) { - if (!options.noEmit && !options.emitDeclarationsOnly && result.files.length === 0 && result.errors.length === 0) { + if (!options.noEmit && !options.emitDeclarationOnly && result.files.length === 0 && result.errors.length === 0) { throw new Error("Expected at least one js file to be emitted or at least one error to be created."); } diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index d6081ff72ac..4f31edd8884 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -2301,7 +2301,7 @@ declare namespace ts { charset?: string; checkJs?: boolean; declaration?: boolean; - emitDeclarationsOnly?: boolean; + emitDeclarationOnly?: boolean; declarationDir?: string; disableSizeLimit?: boolean; downlevelIteration?: boolean; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 07445d1a168..82025291379 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -2301,7 +2301,7 @@ declare namespace ts { charset?: string; checkJs?: boolean; declaration?: boolean; - emitDeclarationsOnly?: boolean; + emitDeclarationOnly?: boolean; declarationDir?: string; disableSizeLimit?: boolean; downlevelIteration?: boolean; diff --git a/tests/baselines/reference/declFileEmitDeclarationsOnly.js b/tests/baselines/reference/declFileEmitDeclarationOnly.js similarity index 100% rename from tests/baselines/reference/declFileEmitDeclarationsOnly.js rename to tests/baselines/reference/declFileEmitDeclarationOnly.js diff --git a/tests/baselines/reference/declFileEmitDeclarationsOnly.symbols b/tests/baselines/reference/declFileEmitDeclarationOnly.symbols similarity index 100% rename from tests/baselines/reference/declFileEmitDeclarationsOnly.symbols rename to tests/baselines/reference/declFileEmitDeclarationOnly.symbols diff --git a/tests/baselines/reference/declFileEmitDeclarationsOnly.types b/tests/baselines/reference/declFileEmitDeclarationOnly.types similarity index 100% rename from tests/baselines/reference/declFileEmitDeclarationsOnly.types rename to tests/baselines/reference/declFileEmitDeclarationOnly.types diff --git a/tests/baselines/reference/declFileEmitDeclarationOnlyError1.errors.txt b/tests/baselines/reference/declFileEmitDeclarationOnlyError1.errors.txt new file mode 100644 index 00000000000..9c4455f773a --- /dev/null +++ b/tests/baselines/reference/declFileEmitDeclarationOnlyError1.errors.txt @@ -0,0 +1,7 @@ +error TS5052: Option 'emitDeclarationOnly' cannot be specified without specifying option 'declarations'. + + +!!! error TS5052: Option 'emitDeclarationOnly' cannot be specified without specifying option 'declarations'. +==== tests/cases/compiler/hello.ts (0 errors) ==== + var hello = "yo!"; + \ No newline at end of file diff --git a/tests/baselines/reference/declFileEmitDeclarationsOnlyError1.symbols b/tests/baselines/reference/declFileEmitDeclarationOnlyError1.symbols similarity index 100% rename from tests/baselines/reference/declFileEmitDeclarationsOnlyError1.symbols rename to tests/baselines/reference/declFileEmitDeclarationOnlyError1.symbols diff --git a/tests/baselines/reference/declFileEmitDeclarationsOnlyError1.types b/tests/baselines/reference/declFileEmitDeclarationOnlyError1.types similarity index 100% rename from tests/baselines/reference/declFileEmitDeclarationsOnlyError1.types rename to tests/baselines/reference/declFileEmitDeclarationOnlyError1.types diff --git a/tests/baselines/reference/declFileEmitDeclarationOnlyError2.errors.txt b/tests/baselines/reference/declFileEmitDeclarationOnlyError2.errors.txt new file mode 100644 index 00000000000..03db2ae409b --- /dev/null +++ b/tests/baselines/reference/declFileEmitDeclarationOnlyError2.errors.txt @@ -0,0 +1,9 @@ +error TS5052: Option 'emitDeclarationOnly' cannot be specified without specifying option 'declarations'. +error TS5053: Option 'emitDeclarationOnly' cannot be specified with option 'noEmit'. + + +!!! error TS5052: Option 'emitDeclarationOnly' cannot be specified without specifying option 'declarations'. +!!! error TS5053: Option 'emitDeclarationOnly' cannot be specified with option 'noEmit'. +==== tests/cases/compiler/hello.ts (0 errors) ==== + var hello = "yo!"; + \ No newline at end of file diff --git a/tests/baselines/reference/declFileEmitDeclarationsOnlyError2.symbols b/tests/baselines/reference/declFileEmitDeclarationOnlyError2.symbols similarity index 100% rename from tests/baselines/reference/declFileEmitDeclarationsOnlyError2.symbols rename to tests/baselines/reference/declFileEmitDeclarationOnlyError2.symbols diff --git a/tests/baselines/reference/declFileEmitDeclarationsOnlyError2.types b/tests/baselines/reference/declFileEmitDeclarationOnlyError2.types similarity index 100% rename from tests/baselines/reference/declFileEmitDeclarationsOnlyError2.types rename to tests/baselines/reference/declFileEmitDeclarationOnlyError2.types diff --git a/tests/baselines/reference/declFileEmitDeclarationsOnlyError1.errors.txt b/tests/baselines/reference/declFileEmitDeclarationsOnlyError1.errors.txt deleted file mode 100644 index 88a154cc508..00000000000 --- a/tests/baselines/reference/declFileEmitDeclarationsOnlyError1.errors.txt +++ /dev/null @@ -1,7 +0,0 @@ -error TS5052: Option 'emitDeclarationsOnly' cannot be specified without specifying option 'declarations'. - - -!!! error TS5052: Option 'emitDeclarationsOnly' cannot be specified without specifying option 'declarations'. -==== tests/cases/compiler/hello.ts (0 errors) ==== - var hello = "yo!"; - \ No newline at end of file diff --git a/tests/baselines/reference/declFileEmitDeclarationsOnlyError2.errors.txt b/tests/baselines/reference/declFileEmitDeclarationsOnlyError2.errors.txt deleted file mode 100644 index 7c067d83ba2..00000000000 --- a/tests/baselines/reference/declFileEmitDeclarationsOnlyError2.errors.txt +++ /dev/null @@ -1,9 +0,0 @@ -error TS5052: Option 'emitDeclarationsOnly' cannot be specified without specifying option 'declarations'. -error TS5053: Option 'emitDeclarationsOnly' cannot be specified with option 'noEmit'. - - -!!! error TS5052: Option 'emitDeclarationsOnly' cannot be specified without specifying option 'declarations'. -!!! error TS5053: Option 'emitDeclarationsOnly' cannot be specified with option 'noEmit'. -==== tests/cases/compiler/hello.ts (0 errors) ==== - var hello = "yo!"; - \ No newline at end of file diff --git a/tests/cases/compiler/declFileEmitDeclarationsOnly.ts b/tests/cases/compiler/declFileEmitDeclarationOnly.ts similarity index 87% rename from tests/cases/compiler/declFileEmitDeclarationsOnly.ts rename to tests/cases/compiler/declFileEmitDeclarationOnly.ts index e55496e4ca3..bc6f88ea364 100644 --- a/tests/cases/compiler/declFileEmitDeclarationsOnly.ts +++ b/tests/cases/compiler/declFileEmitDeclarationOnly.ts @@ -1,5 +1,5 @@ // @declaration: true -// @emitDeclarationsOnly: true +// @emitDeclarationOnly: true // @filename: helloworld.ts const Log = { diff --git a/tests/cases/compiler/declFileEmitDeclarationsOnlyError1.ts b/tests/cases/compiler/declFileEmitDeclarationOnlyError1.ts similarity index 58% rename from tests/cases/compiler/declFileEmitDeclarationsOnlyError1.ts rename to tests/cases/compiler/declFileEmitDeclarationOnlyError1.ts index 477934a7b2a..c98edc2483b 100644 --- a/tests/cases/compiler/declFileEmitDeclarationsOnlyError1.ts +++ b/tests/cases/compiler/declFileEmitDeclarationOnlyError1.ts @@ -1,4 +1,4 @@ -// @emitDeclarationsOnly: true +// @emitDeclarationOnly: true // @filename: hello.ts var hello = "yo!"; diff --git a/tests/cases/compiler/declFileEmitDeclarationsOnlyError2.ts b/tests/cases/compiler/declFileEmitDeclarationOnlyError2.ts similarity index 65% rename from tests/cases/compiler/declFileEmitDeclarationsOnlyError2.ts rename to tests/cases/compiler/declFileEmitDeclarationOnlyError2.ts index 994a6a5dbd8..ea782402a6f 100644 --- a/tests/cases/compiler/declFileEmitDeclarationsOnlyError2.ts +++ b/tests/cases/compiler/declFileEmitDeclarationOnlyError2.ts @@ -1,5 +1,5 @@ // @noEmit: true -// @emitDeclarationsOnly: true +// @emitDeclarationOnly: true // @filename: hello.ts var hello = "yo!";