Skip to content

Commit 385bfa9

Browse files
authored
stdout/stderr cleanup (#1427)
* Partial revert of #1413 * remove extra line * dartfmt
1 parent 475eea1 commit 385bfa9

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

lib/dartdoc.dart

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -187,22 +187,21 @@ class DartDoc {
187187
writtenFiles.addAll(generator.writtenFiles.map(path.normalize));
188188
}
189189

190-
double seconds = _stopwatch.elapsedMilliseconds / 1000.0;
191-
print(
192-
"documented ${package.libraries.length} librar${package.libraries.length == 1 ? 'y' : 'ies'} "
193-
"in ${seconds.toStringAsFixed(1)} seconds");
194-
print('');
195-
196190
verifyLinks(package, outputDir.path);
197191
int warnings = package.packageWarningCounter.warningCount;
198192
int errors = package.packageWarningCounter.errorCount;
199193
if (warnings == 0 && errors == 0) {
200-
print("no issues found");
194+
print("\nno issues found");
201195
} else {
202-
print("found ${warnings} ${pluralize('warning', warnings)} "
196+
print("\nfound ${warnings} ${pluralize('warning', warnings)} "
203197
"and ${errors} ${pluralize('error', errors)}");
204198
}
205199

200+
double seconds = _stopwatch.elapsedMilliseconds / 1000.0;
201+
print(
202+
"\ndocumented ${package.libraries.length} librar${package.libraries.length == 1 ? 'y' : 'ies'} "
203+
"in ${seconds.toStringAsFixed(1)} seconds");
204+
206205
if (package.libraries.isEmpty) {
207206
throw new DartDocFailure(
208207
"dartdoc could not find any libraries to document. Run `pub get` and try again.");
@@ -356,7 +355,7 @@ class DartDoc {
356355
final Set<String> visited = new Set();
357356
final String start = 'index.html';
358357
visited.add(start);
359-
print('validating docs...');
358+
stdout.write('\nvalidating docs...');
360359
_doCheck(package, origin, visited, start);
361360
_doOrphanCheck(package, origin, visited);
362361
}
@@ -517,7 +516,6 @@ class DartDoc {
517516
double seconds = _stopwatch.elapsedMilliseconds / 1000.0;
518517
print("parsed ${libraries.length} ${pluralize('file', libraries.length)} "
519518
"in ${seconds.toStringAsFixed(1)} seconds");
520-
print('');
521519
_stopwatch.reset();
522520

523521
if (errors.isNotEmpty) {

lib/src/html/html_generator_instance.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'dart:async' show Future, StreamController;
66
import 'dart:convert' show JsonEncoder;
7-
import 'dart:io' show Directory, File;
7+
import 'dart:io' show Directory, File, stdout;
88
import 'dart:typed_data' show Uint8List;
99

1010
import 'package:collection/collection.dart' show compareNatural;
@@ -181,12 +181,14 @@ class HtmlGeneratorInstance implements HtmlOptions {
181181

182182
void generatePackage() {
183183
TemplateData data = new PackageTemplateData(this, package, useCategories);
184+
stdout.write('\ndocumenting ${package.name}');
184185

185186
_build('index.html', _templates.indexTemplate, data);
186187
}
187188

188189
void generateLibrary(Package package, Library lib) {
189-
print('generating docs for library ${lib.name} from ${lib.path}...');
190+
stdout
191+
.write('\ngenerating docs for library ${lib.name} from ${lib.path}...');
190192
if (!lib.isAnonymous && !lib.hasDocumentation) {
191193
package.warnOnElement(lib, PackageWarning.noLibraryLevelDocs);
192194
}

lib/src/model.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2850,7 +2850,7 @@ class PackageWarningCounter {
28502850
} else {
28512851
if (options.asErrors.contains(kind)) toWrite = "error: ${fullMessage}";
28522852
}
2853-
if (toWrite != null) print(" ${toWrite}");
2853+
if (toWrite != null) stderr.write("\n ${toWrite}");
28542854
}
28552855

28562856
/// Returns true if we've already warned for this.

0 commit comments

Comments
 (0)