maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update messages

Browse source
This commit is contained in:
Ryan Cavanaugh 2018-06-06 13:03:03 -07:00
parent 856fc79ae7
commit 291289f8c2
3 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/compiler/diagnosticMessages.json
View file

@ -3633,19 +3633,19 @@
"code": 6352
},
"Project '{0}' is up to date with its upstream types": {
"Project '{0}' is up to date with .d.ts files from its dependencies": {
"category": "Message",
"code": 6353
},
"Sorted list of input projects: {0}": {
"Projects in this build: {0}": {
"category": "Message",
"code": 6354
},
"Would delete the following files:{0}": {
"A non-dry build would delete the following files: {0}": {
"category": "Message",
"code": 6355
},
"Would build project '{0}'": {
"A non-dry build would build project '{0}'": {
"category": "Message",
"code": 6356
},
@ -3657,7 +3657,7 @@
"category": "Message",
"code": 6358
},
"Project '{0}' is up to date because it was previously built": {
"delete this - Project '{0}' is up to date because it was previously built": {
"category": "Message",
"code": 6359
},
@ -3665,15 +3665,15 @@
"category": "Message",
"code": 6360
},
"Skipping build of project '{0}' because its upstream project '{1}' has errors": {
"Skipping build of project '{0}' because its dependency '{1}' has errors": {
"category": "Message",
"code": 6361
},
"Project '{0}' can't be built because it depends on a project with errors": {
"Project '{0}' can't be built because its dependency '{1}' has errors": {
"category": "Message",
"code": 6362
},
"Build one or more projects and their dependencies, if out-of-date": {
"Build one or more projects and their dependencies, if out of date": {
"category": "Message",
"code": 6363
},
@ -3685,11 +3685,11 @@
"category": "Message",
"code": 6365
},
"Show what would be built (or deleted, if specified with --clean)": {
"Show what would be built (or deleted, if specified with '--clean')": {
"category": "Message",
"code": 6366
},
"Build all projects, including those that appear to be up-to-date": {
"Build all projects, including those that appear to be up to date": {
"category": "Message",
"code": 6367
},

25
src/compiler/tsbuild.ts
View file

@ -641,7 +641,7 @@ namespace ts {
reportProjectStatus(next, status);
if (status.type === UpToDateStatusType.UpstreamBlocked) {
context.verbose(Diagnostics.Skipping_build_of_project_0_because_its_upstream_project_1_has_errors, resolved, status.upstreamProjectName);
context.verbose(Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, resolved, status.upstreamProjectName);
continue;
}
@ -859,7 +859,7 @@ namespace ts {
function buildSingleProject(proj: ResolvedConfigFileName): BuildResultFlags {
if (context.options.dry) {
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Would_build_project_0, proj));
reportDiagnostic(createCompilerDiagnostic(Diagnostics.A_non_dry_build_would_build_project_0, proj));
return BuildResultFlags.Success;
}
@ -948,7 +948,7 @@ namespace ts {
function updateOutputTimestamps(proj: ParsedCommandLine) {
if (context.options.dry) {
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Would_build_project_0, proj.options.configFilePath));
reportDiagnostic(createCompilerDiagnostic(Diagnostics.A_non_dry_build_would_build_project_0, proj.options.configFilePath));
return;
}
@ -1013,7 +1013,7 @@ namespace ts {
}
if (context.options.dry) {
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Would_delete_the_following_files_Colon_0, filesToDelete.map(f => `\r\n * ${f}`).join("")));
reportDiagnostic(createCompilerDiagnostic(Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(f => `\r\n * ${f}`).join("")));
}
else {
if (!host.deleteFile) {
@ -1083,7 +1083,7 @@ namespace ts {
}
if (status.type === UpToDateStatusType.UpstreamBlocked) {
context.verbose(Diagnostics.Skipping_build_of_project_0_because_its_upstream_project_1_has_errors, projName, status.upstreamProjectName);
context.verbose(Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, projName, status.upstreamProjectName);
continue;
}
@ -1101,7 +1101,7 @@ namespace ts {
for (const name of graph.buildQueue) {
names.push(name);
}
context.verbose(Diagnostics.Sorted_list_of_input_projects_Colon_0, names.map(s => "\r\n * " + s).join(""));
context.verbose(Diagnostics.Projects_in_this_build_Colon_0, names.map(s => "\r\n * " + s).join(""));
}
/**
@ -1123,22 +1123,19 @@ namespace ts {
if (status.newestInputFileTime !== undefined) {
context.verbose(Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, configFileName, status.newestInputFileTime, status.newestOutputFileTime);
}
else {
context.verbose(Diagnostics.Project_0_is_up_to_date_because_it_was_previously_built, configFileName);
}
// Don't report anything for "up to date because it was already built" -- too verbose
return;
case UpToDateStatusType.UpToDateWithUpstreamTypes:
context.verbose(Diagnostics.Project_0_is_up_to_date_with_its_upstream_types, configFileName);
context.verbose(Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, configFileName);
return;
case UpToDateStatusType.UpstreamOutOfDate:
context.verbose(Diagnostics.Project_0_is_up_to_date_with_its_upstream_types, configFileName);
context.verbose(Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, configFileName);
return;
case UpToDateStatusType.UpstreamBlocked:
context.verbose(Diagnostics.Project_0_can_t_be_built_because_it_depends_on_a_project_with_errors, configFileName);
context.verbose(Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, configFileName, status.upstreamProjectName);
return;
case UpToDateStatusType.Unbuildable:
// TODO different error
context.verbose(Diagnostics.Project_0_can_t_be_built_because_it_depends_on_a_project_with_errors, configFileName);
context.verbose(Diagnostics.Failed_to_parse_file_0_Colon_1, configFileName, status.reason);
return;
default:
assertTypeIsNever(status);

20
src/harness/unittests/tsbuild.ts
View file

@ -35,7 +35,7 @@ namespace ts {
const host = new fakes.CompilerHost(fs);
const builder = createSolutionBuilder(host, ["/src/tests"], reportDiagnostic, { dry: true, force: false, verbose: false });
builder.buildAllProjects();
assertDiagnosticMessages(Diagnostics.Would_build_project_0, Diagnostics.Would_build_project_0, Diagnostics.Would_build_project_0);
assertDiagnosticMessages(Diagnostics.A_non_dry_build_would_build_project_0, Diagnostics.A_non_dry_build_would_build_project_0, Diagnostics.A_non_dry_build_would_build_project_0);
// Check for outputs to not be written. Not an exhaustive list
for (const output of allExpectedOutputs) {
@ -116,7 +116,7 @@ namespace ts {
clearDiagnostics();
builder.resetBuildContext();
builder.buildAllProjects();
assertDiagnosticMessages(Diagnostics.Sorted_list_of_input_projects_Colon_0,
assertDiagnosticMessages(Diagnostics.Projects_in_this_build_Colon_0,
Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist,
Diagnostics.Building_project_0,
Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist,
@ -131,7 +131,7 @@ namespace ts {
clearDiagnostics();
builder.resetBuildContext();
builder.buildAllProjects();
assertDiagnosticMessages(Diagnostics.Sorted_list_of_input_projects_Colon_0,
assertDiagnosticMessages(Diagnostics.Projects_in_this_build_Colon_0,
Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2,
Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2,
Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2);
@ -145,7 +145,7 @@ namespace ts {
builder.resetBuildContext();
builder.buildAllProjects();
assertDiagnosticMessages(Diagnostics.Sorted_list_of_input_projects_Colon_0,
assertDiagnosticMessages(Diagnostics.Projects_in_this_build_Colon_0,
Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2,
Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2,
Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2,
@ -160,12 +160,12 @@ namespace ts {
builder.resetBuildContext();
builder.buildAllProjects();
assertDiagnosticMessages(Diagnostics.Sorted_list_of_input_projects_Colon_0,
assertDiagnosticMessages(Diagnostics.Projects_in_this_build_Colon_0,
Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2,
Diagnostics.Building_project_0,
Diagnostics.Project_0_is_up_to_date_with_its_upstream_types,
Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies,
Diagnostics.Updating_output_timestamps_of_project_0,
Diagnostics.Project_0_is_up_to_date_with_its_upstream_types,
Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies,
Diagnostics.Updating_output_timestamps_of_project_0);
});
});
@ -182,14 +182,14 @@ namespace ts {
replaceText(fs, "/src/logic/index.ts", "c.multiply(10, 15)", `c.muitply()`);
builder.buildAllProjects();
assertDiagnosticMessages(
Diagnostics.Sorted_list_of_input_projects_Colon_0,
Diagnostics.Projects_in_this_build_Colon_0,
Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist,
Diagnostics.Building_project_0,
Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist,
Diagnostics.Building_project_0,
Diagnostics.Property_0_does_not_exist_on_type_1,
Diagnostics.Project_0_can_t_be_built_because_it_depends_on_a_project_with_errors,
Diagnostics.Skipping_build_of_project_0_because_its_upstream_project_1_has_errors
Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors,
Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors
);
});
});