diff --git a/analysis_options.yaml b/analysis_options.yaml index 89f4150259..4735751da8 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,6 +1,6 @@ # Change analysis_options.yaml and analysis_options_presubmit.yaml # together. -include: package:pedantic/analysis_options.1.9.0.yaml +include: package:pedantic/analysis_options.1.11.0.yaml analyzer: errors: diff --git a/analysis_options_presubmit.yaml b/analysis_options_presubmit.yaml index c01c5a5294..98bdeb11ba 100644 --- a/analysis_options_presubmit.yaml +++ b/analysis_options_presubmit.yaml @@ -1,6 +1,6 @@ # Change analysis_options.yaml and analysis_options_presubmit.yaml # together. -include: package:pedantic/analysis_options.1.9.0.yaml +include: package:pedantic/analysis_options.1.11.0.yaml analyzer: errors: diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart index dce9194c64..ac9d326c4a 100644 --- a/lib/dartdoc.dart +++ b/lib/dartdoc.dart @@ -68,7 +68,7 @@ class DartdocFileWriter implements FileWriter { if (!allowOverwrite) { if (_fileElementMap.containsKey(outFile)) { assert(element != null, - 'Attempted overwrite of ${outFile} without corresponding element'); + 'Attempted overwrite of $outFile without corresponding element'); var originalElement = _fileElementMap[outFile]; Iterable referredFrom = originalElement != null ? [originalElement] : null; @@ -183,7 +183,7 @@ class Dartdoc { packageGraph = await packageBuilder.buildPackageGraph(); seconds = _stopwatch.elapsedMilliseconds / 1000.0; var libs = packageGraph.libraries.length; - logInfo("Initialized dartdoc with ${libs} librar${libs == 1 ? 'y' : 'ies'} " + logInfo("Initialized dartdoc with $libs librar${libs == 1 ? 'y' : 'ies'} " 'in ${seconds.toStringAsFixed(1)} seconds'); _stopwatch.reset(); @@ -206,13 +206,13 @@ class Dartdoc { if (warnings == 0 && errors == 0) { logInfo('no issues found'); } else { - logWarning("Found ${warnings} ${pluralize('warning', warnings)} " - "and ${errors} ${pluralize('error', errors)}."); + logWarning("Found $warnings ${pluralize('warning', warnings)} " + "and $errors ${pluralize('error', errors)}."); } seconds = _stopwatch.elapsedMilliseconds / 1000.0; libs = packageGraph.localPublicLibraries.length; - logInfo("Documented ${libs} public librar${libs == 1 ? 'y' : 'ies'} " + logInfo("Documented $libs public librar${libs == 1 ? 'y' : 'ies'} " 'in ${seconds.toStringAsFixed(1)} seconds'); return DartdocResults(config.topLevelPackageMeta, packageGraph, outputDir); } @@ -489,10 +489,10 @@ class Dartdoc { }, (e, chain) { if (e is DartdocFailure) { - stderr.writeln('\ndartdoc failed: ${e}.'); + stderr.writeln('\ndartdoc failed: $e.'); exitCode = 1; } else { - stderr.writeln('\ndartdoc failed: ${e}\n${chain}'); + stderr.writeln('\ndartdoc failed: $e\n$chain'); exitCode = 255; } }, diff --git a/lib/options.dart b/lib/options.dart index 76948087fc..03917a345e 100644 --- a/lib/options.dart +++ b/lib/options.dart @@ -99,5 +99,5 @@ void _printUsage(ArgParser parser) { /// Print version information. void _printVersion(ArgParser parser) { - print('dartdoc version: ${dartdocVersion}'); + print('dartdoc version: $dartdocVersion'); } diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart index 8244865683..ee6ae5180b 100644 --- a/lib/src/dartdoc_options.dart +++ b/lib/src/dartdoc_options.dart @@ -100,7 +100,7 @@ class CategoryConfiguration { .join(canonicalYamlPath, documentationMarkdown)); if (!resourceProvider.getFile(documentationMarkdown).exists) { throw DartdocFileMissing( - 'In categories definition for ${name}, "markdown" resolves to ' + 'In categories definition for $name, "markdown" resolves to ' 'the missing file $documentationMarkdown'); } } @@ -860,10 +860,10 @@ abstract class DartdocSyntheticOption implements DartdocOption { void _onMissingFromSynthetic( _OptionValueWithContext valueWithContext, String missingPath) { - var description = 'Synthetic configuration option ${name} from '; + var description = 'Synthetic configuration option $name from '; throw DartdocFileMissing( '$description, computed as ${valueWithContext.value}, resolves to ' - 'missing path: "${missingPath}"'); + 'missing path: "$missingPath"'); } } @@ -1062,9 +1062,8 @@ abstract class _DartdocFileOption implements DartdocOption { _OptionValueWithContext valueWithContext, String missingPath) { var dartdocYaml = resourceProvider.pathContext.join( valueWithContext.canonicalDirectoryPath, valueWithContext.definingFile); - throw DartdocFileMissing('Field ${fieldName} from ${dartdocYaml}, set to ' - '${valueWithContext.value}, resolves to missing path: ' - '"${missingPath}"'); + throw DartdocFileMissing('Field $fieldName from $dartdocYaml, set to ' + '${valueWithContext.value}, resolves to missing path: "$missingPath"'); } @override @@ -1174,7 +1173,7 @@ abstract class _DartdocFileOption implements DartdocOption { returnData = yamlData; } } else { - throw UnsupportedError('Type ${T} is not supported'); + throw UnsupportedError('Type $T is not supported'); } return _OptionValueWithContext(returnData as T, contextPath, definingFile: 'dartdoc_options.yaml'); @@ -1245,8 +1244,8 @@ abstract class _DartdocArgOption implements DartdocOption { example = '0.76'; } throw DartdocOptionError( - 'Invalid argument value: --${argName}, set to "${value}", must be a ' - '${T}. Example: --${argName} ${example}'); + 'Invalid argument value: --$argName, set to "$value", must be a ' + '$T. Example: --$argName $example'); } /// Returns null if no argument was given on the command line. @@ -1263,8 +1262,8 @@ abstract class _DartdocArgOption implements DartdocOption { void _onMissingFromArgs( _OptionValueWithContext valueWithContext, String missingPath) { throw DartdocFileMissing( - 'Argument --${argName}, set to ${valueWithContext.value}, resolves to ' - 'missing path: "${missingPath}"'); + 'Argument --$argName, set to ${valueWithContext.value}, resolves to ' + 'missing path: "$missingPath"'); } /// Generates an _OptionValueWithContext using the value of the argument from @@ -1299,7 +1298,7 @@ abstract class _DartdocArgOption implements DartdocOption { (retval as Map)[pairList.first] = pairList.last; } } else { - throw UnsupportedError('Type ${T} is not supported'); + throw UnsupportedError('Type $T is not supported'); } return _OptionValueWithContext(retval, _directoryCurrentPath); } @@ -1319,7 +1318,7 @@ abstract class _DartdocArgOption implements DartdocOption { argName = argName.replaceAllMapped(camelCaseRegexp, (Match m) { var before = m.group(1); var after = m.group(2).toLowerCase(); - return '${before}-${after}'; + return '$before-$after'; }); return argName; } @@ -1358,7 +1357,7 @@ abstract class _DartdocArgOption implements DartdocOption { hide: hide, splitCommas: splitCommas); } else { - throw UnsupportedError('Type ${T} is not supported'); + throw UnsupportedError('Type $T is not supported'); } } } diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart index b4326070be..fd517d617c 100644 --- a/lib/src/element_type.dart +++ b/lib/src/element_type.dart @@ -136,7 +136,7 @@ class UndefinedElementType extends ElementType { } @override - String get nameWithGenerics => '$name${nullabilitySuffix}'; + String get nameWithGenerics => '$name$nullabilitySuffix'; /// Assume that undefined elements don't have useful bounds. @override @@ -230,10 +230,10 @@ class TypeParameterElementType extends DefinedElementType { TypeParameterType get type => super.type; @override - String get linkedName => '${name}${nullabilitySuffix}'; + String get linkedName => '$name$nullabilitySuffix'; @override - String get nameWithGenerics => '${name}${nullabilitySuffix}'; + String get nameWithGenerics => '$name$nullabilitySuffix'; @override DartType get _bound => type.bound; diff --git a/lib/src/generator/dartdoc_generator_backend.dart b/lib/src/generator/dartdoc_generator_backend.dart index 1f8c45c3f1..75993706e0 100644 --- a/lib/src/generator/dartdoc_generator_backend.dart +++ b/lib/src/generator/dartdoc_generator_backend.dart @@ -95,7 +95,7 @@ abstract class DartdocGeneratorBackend implements GeneratorBackend { } } - writer.write(_pathContext.join('categories.json'), '${json}\n'); + writer.write(_pathContext.join('categories.json'), '$json\n'); } @override @@ -105,7 +105,7 @@ abstract class DartdocGeneratorBackend implements GeneratorBackend { if (!options.useBaseHref) { json = json.replaceAll(htmlBasePlaceholder, ''); } - writer.write(_pathContext.join('index.json'), '${json}\n'); + writer.write(_pathContext.join('index.json'), '$json\n'); } @override diff --git a/lib/src/generator/template_data.dart b/lib/src/generator/template_data.dart index eaafc55710..673b50e3da 100644 --- a/lib/src/generator/template_data.dart +++ b/lib/src/generator/template_data.dart @@ -322,7 +322,7 @@ class ConstructorTemplateData extends TemplateData @override String get metaDescription => 'API docs for the ${constructor.name} constructor from the ' - '${clazz} class from the ${library.name} library, ' + '$clazz class from the ${library.name} library, ' 'for the Dart programming language.'; } @@ -398,7 +398,7 @@ class MethodTemplateData extends TemplateData Method get self => method; @override String get title => - '${method.name} method - ${container.name} ${containerDesc} - ' + '${method.name} method - ${container.name} $containerDesc - ' '${library.name} library - Dart API'; @override String get layoutTitle => _layoutTitle( @@ -406,7 +406,7 @@ class MethodTemplateData extends TemplateData @override String get metaDescription => 'API docs for the ${method.name} method from the ' - '${container.name} ${containerDesc}, for the Dart programming language.'; + '${container.name} $containerDesc, for the Dart programming language.'; @override List get navLinks => [_packageGraph.defaultPackage, library]; @override @@ -440,7 +440,7 @@ class PropertyTemplateData extends TemplateData @override String get title => - '${property.name} ${property.kind} - ${container.name} ${containerDesc} - ' + '${property.name} ${property.kind} - ${container.name} $containerDesc - ' '${library.name} library - Dart API'; @override String get layoutTitle => @@ -448,7 +448,7 @@ class PropertyTemplateData extends TemplateData @override String get metaDescription => 'API docs for the ${property.name} ${property.kind} from the ' - '${container.name} ${containerDesc}, for the Dart programming language.'; + '${container.name} $containerDesc, for the Dart programming language.'; @override List get navLinks => [_packageGraph.defaultPackage, library]; @override diff --git a/lib/src/logging.dart b/lib/src/logging.dart index 4eff16fe70..5002318bed 100644 --- a/lib/src/logging.dart +++ b/lib/src/logging.dart @@ -118,7 +118,7 @@ void startLogging(LoggingContext config) { // the backspace to occur for stderr as well. stderr.write('${ansi.backspace} ${ansi.backspace}'); } - stderr.write('${message}\n'); + stderr.writeln('$message'); } writingProgress = false; }); diff --git a/lib/src/markdown_processor.dart b/lib/src/markdown_processor.dart index 0d0834a57b..707e101a53 100644 --- a/lib/src/markdown_processor.dart +++ b/lib/src/markdown_processor.dart @@ -516,7 +516,7 @@ class _MarkdownCommentReference { void _reducePreferReferencesIncludingFullyQualifiedName() { var startName = '${element.fullyQualifiedName}.'; - var realName = '${element.fullyQualifiedName}.${codeRefChomped}'; + var realName = '${element.fullyQualifiedName}.$codeRefChomped'; if (results.any((r) => r.fullyQualifiedName == realName)) { results.removeWhere((r) => r.fullyQualifiedName != realName); } diff --git a/lib/src/model/canonicalization.dart b/lib/src/model/canonicalization.dart index c7b31b08db..658cfc3c6a 100644 --- a/lib/src/model/canonicalization.dart +++ b/lib/src/model/canonicalization.dart @@ -107,7 +107,7 @@ class ScoredCandidate implements Comparable { score += scoreDelta; if (scoreDelta != 0) { _reasons.add( - "${reason} (${scoreDelta >= 0 ? '+' : ''}${scoreDelta.toStringAsPrecision(4)})"); + "$reason (${scoreDelta >= 0 ? '+' : ''}${scoreDelta.toStringAsPrecision(4)})"); } } diff --git a/lib/src/model/class.dart b/lib/src/model/class.dart index 4d615dc756..8e6bc356ca 100644 --- a/lib/src/model/class.dart +++ b/lib/src/model/class.dart @@ -295,7 +295,7 @@ class Class extends Container false, 'Can not handle intermediate non-public interfaces ' 'created by ModelElements that are not classes or mixins: ' - '${fullyQualifiedName} contains an interface {$i}, ' + '$fullyQualifiedName contains an interface {$i}, ' 'defined by ${i.element}'); continue; } diff --git a/lib/src/model/constructor.dart b/lib/src/model/constructor.dart index 923b93289f..b7cd94cdfb 100644 --- a/lib/src/model/constructor.dart +++ b/lib/src/model/constructor.dart @@ -100,10 +100,10 @@ class Constructor extends ModelElement if (_nameWithGenerics == null) { var constructorName = element.name; if (constructorName.isEmpty) { - _nameWithGenerics = '${enclosingElement.name}${genericParameters}'; + _nameWithGenerics = '${enclosingElement.name}$genericParameters'; } else { _nameWithGenerics = - '${enclosingElement.name}${genericParameters}.$constructorName'; + '${enclosingElement.name}$genericParameters.$constructorName'; } } return _nameWithGenerics; diff --git a/lib/src/model/inheritable.dart b/lib/src/model/inheritable.dart index e741cd7e38..7c4e03ccd5 100644 --- a/lib/src/model/inheritable.dart +++ b/lib/src/model/inheritable.dart @@ -54,7 +54,7 @@ mixin Inheritable on ContainerMember { orElse: () => null); } if (canonicalEnclosingContainer != null) { - throw UnimplementedError('${canonicalEnclosingContainer}: unknown type'); + throw UnimplementedError('$canonicalEnclosingContainer: unknown type'); } return null; } diff --git a/lib/src/model/package.dart b/lib/src/model/package.dart index fd90a81b32..b194d4b6ae 100644 --- a/lib/src/model/package.dart +++ b/lib/src/model/package.dart @@ -243,7 +243,7 @@ class Package extends LibraryContainer if (documentedWhere == DocumentLocation.remote) { _baseHref = _remoteBaseHref; - if (!_baseHref.endsWith('/')) _baseHref = '${_baseHref}/'; + if (!_baseHref.endsWith('/')) _baseHref = '$_baseHref/'; } else { _baseHref = config.useBaseHref ? '' : htmlBasePlaceholder; } diff --git a/lib/src/model/package_builder.dart b/lib/src/model/package_builder.dart index a24dcaf161..514d920502 100644 --- a/lib/src/model/package_builder.dart +++ b/lib/src/model/package_builder.dart @@ -218,7 +218,7 @@ class PubPackageBuilder implements PackageBuilder { } _addKnownFiles(r.element); if (!libraries.contains(r.element) && isLibraryIncluded(r.element)) { - logDebug('parsing ${f}...'); + logDebug('parsing $f...'); libraryAdder(r); libraries.add(r.element); } @@ -273,8 +273,8 @@ class PubPackageBuilder implements PackageBuilder { for (var lib in _listDir(packageDir, recursive: true, listDir: _packageDirList)) { if (lib.endsWith('.dart') && - (!lib.contains('${sep}packages${sep}') || - packageDir.contains('${sep}packages${sep}'))) { + (!lib.contains('${sep}packages$sep') || + packageDir.contains('${sep}packages$sep'))) { // Only include libraries within the lib dir that are not in 'lib/src'. if (_pathContext.isWithin(packageLibDir, lib) && !_pathContext.isWithin(packageLibSrcDir, lib)) { diff --git a/lib/src/model/package_graph.dart b/lib/src/model/package_graph.dart index d1ad528c3f..4d147a85d6 100644 --- a/lib/src/model/package_graph.dart +++ b/lib/src/model/package_graph.dart @@ -501,7 +501,7 @@ class PackageGraph { warnOnElement( null, PackageWarning.packageOrderGivesMissingPackageName, message: - "${packageName}, packages: ${packages.map((p) => p.name).join(',')}"); + "$packageName, packages: ${packages.map((p) => p.name).join(',')}"); } } _publicPackages = packages.where((p) => p.isPublic).toList()..sort(); diff --git a/lib/src/model/parameter.dart b/lib/src/model/parameter.dart index e57e00d37d..3655503b4f 100644 --- a/lib/src/model/parameter.dart +++ b/lib/src/model/parameter.dart @@ -52,9 +52,9 @@ class Parameter extends ModelElement implements EnclosedElement { if (enclosingName != null && enclosingName.isNotEmpty) break; } } - return '${enclosingName}-param-${name}'; + return '$enclosingName-param-$name'; } else { - return 'param-${name}'; + return 'param-$name'; } } diff --git a/lib/src/render/model_element_renderer.dart b/lib/src/render/model_element_renderer.dart index d7755d4851..6cf61bbde2 100644 --- a/lib/src/render/model_element_renderer.dart +++ b/lib/src/render/model_element_renderer.dart @@ -19,7 +19,7 @@ class ModelElementRendererHtml extends ModelElementRenderer { @override String renderLinkedName(ModelElement modelElement) { var cssClass = modelElement.isDeprecated ? ' class="deprecated"' : ''; - return '${modelElement.name}'; + return '${modelElement.name}'; } @override @@ -61,7 +61,7 @@ class ModelElementRendererHtml extends ModelElementRenderer { return '''
-
$parameter'; + '$parameter'; @override String parameterName(String parameterName) => '$parameterName'; diff --git a/lib/src/render/template_renderer.dart b/lib/src/render/template_renderer.dart index e18ab4ac41..456d20c74a 100644 --- a/lib/src/render/template_renderer.dart +++ b/lib/src/render/template_renderer.dart @@ -10,9 +10,9 @@ class HtmlTemplateRenderer implements TemplateRenderer { @override String composeLayoutTitle(String name, String kind, bool isDeprecated) { if (isDeprecated) { - return '${name} ${kind}'; + return '$name $kind'; } else { - return '${name} ${kind}'; + return '$name $kind'; } } } @@ -21,9 +21,9 @@ class MdTemplateRenderer implements TemplateRenderer { @override String composeLayoutTitle(String name, String kind, bool isDeprecated) { if (isDeprecated) { - return '~~${name}~~ ${kind}'; + return '~~$name~~ $kind'; } else { - return '${name} ${kind}'; + return '$name $kind'; } } } diff --git a/lib/src/render/type_parameters_renderer.dart b/lib/src/render/type_parameters_renderer.dart index b99f0e612e..544803d53d 100644 --- a/lib/src/render/type_parameters_renderer.dart +++ b/lib/src/render/type_parameters_renderer.dart @@ -19,7 +19,7 @@ class TypeParametersRendererHtml extends TypeParametersRenderer { var joined = typeParameters.typeParameters .map((t) => t.name) .join(', '); - return '<${joined}>'; + return '<$joined>'; } @override @@ -30,7 +30,7 @@ class TypeParametersRendererHtml extends TypeParametersRenderer { var joined = typeParameters.typeParameters .map((t) => t.linkedName) .join(', '); - return '<${joined}>'; + return '<$joined>'; } } @@ -49,6 +49,6 @@ class TypeParametersRendererMd extends TypeParametersRenderer { return ''; } var joined = typeParameters.map(mapfn).join(', '); - return '<${joined}>'; + return '<$joined>'; } } diff --git a/pubspec.yaml b/pubspec.yaml index 4daa1f0123..f68be26d6f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,7 +35,7 @@ dev_dependencies: dart_style: ^1.3.9 grinder: ^0.9.0-nullsafety.0 http: ^0.13.0 - pedantic: ^1.9.0 + pedantic: ^1.11.0 test: ^1.3.0 executables: diff --git a/test/end2end/dartdoc_integration_test.dart b/test/end2end/dartdoc_integration_test.dart index 6c6dcde98f..5b1c3887b1 100644 --- a/test/end2end/dartdoc_integration_test.dart +++ b/test/end2end/dartdoc_integration_test.dart @@ -122,7 +122,7 @@ void main() { expect( outputLines.firstWhere((l) => l.startsWith(' fatal')), startsWith( - ' fatal error: Argument --input, set to ${impossiblePath}, resolves to missing path: ')); + ' fatal error: Argument --input, set to $impossiblePath, resolves to missing path: ')); }); test('errors cause non-zero exit when warnings are off', () async { @@ -212,7 +212,7 @@ void main() { var args = [ dartdocPath, - '--footer-text=${footerTextPath}', + '--footer-text=$footerTextPath', '--include', 'ex', '--output', diff --git a/test/src/utils.dart b/test/src/utils.dart index 9de5eb3d61..ac854a201e 100644 --- a/test/src/utils.dart +++ b/test/src/utils.dart @@ -181,7 +181,7 @@ two:lib/ '''); projectFolder.getChildAssumingFolder('lib').create(); packageConfigProvider.addPackageToConfigFor(projectRoot, packageName, - Uri.file('${projectRoot}${resourceProvider.pathContext.separator}')); + Uri.file('$projectRoot${resourceProvider.pathContext.separator}')); return projectFolder; } diff --git a/test/tool_runner_test.dart b/test/tool_runner_test.dart index 4c8c171bb7..f416287af5 100644 --- a/test/tool_runner_test.dart +++ b/test/tool_runner_test.dart @@ -33,7 +33,7 @@ void main() { result = Process.runSync( Platform.resolvedExecutable, [ - '--snapshot=${snapshotFile}', + '--snapshot=$snapshotFile', '--snapshot-kind=app-jit', 'bin/drill.dart' ], diff --git a/tool/doc_packages.dart b/tool/doc_packages.dart index bdcfc9b457..b8b0d1b8a4 100644 --- a/tool/doc_packages.dart +++ b/tool/doc_packages.dart @@ -68,7 +68,7 @@ void _printUsageAndExit(ArgParser parser, {int exitCode = 0}) { } void performList(int page) { - print('Listing pub packages for page ${page}'); + print('Listing pub packages for page $page'); print(''); _packageUrls(page).then((List packages) { @@ -79,7 +79,7 @@ void performList(int page) { } void performGenerate(int page) { - print('Generating docs for page ${page} into ${_rootDir}/'); + print('Generating docs for page $page into $_rootDir/'); print(''); _packageUrls(page).then((List packages) { @@ -92,12 +92,11 @@ void performGenerate(int page) { } void generateForPackages(List packages) { - print('Generating docs into ${_rootDir}/'); + print('Generating docs into $_rootDir/'); print(''); - var urls = packages - .map((s) => 'https://pub.dartlang.org/packages/${s}.json') - .toList(); + var urls = + packages.map((s) => 'https://pub.dartlang.org/packages/$s.json').toList(); _getPackageInfos(urls).then((List infos) { return Future.forEach(infos, (PackageInfo info) { @@ -112,18 +111,18 @@ Future _printGenerationResult( return generationResult.then((bool result) { if (result) { - print('${name}: passed'); + print('$name: passed'); } else { - print('${name}: (skipped)'); + print('$name: (skipped)'); } }).catchError((e) { - print('${name}: * failed *'); + print('$name: * failed *'); }); } Future> _packageUrls(int page) { return http - .get(Uri.parse('https://pub.dartlang.org/packages.json?page=${page}')) + .get(Uri.parse('https://pub.dartlang.org/packages.json?page=$page')) .then((response) { return List.from(json.decode(response.body)['packages']); }); @@ -154,7 +153,7 @@ Future _generateFor(PackageInfo package) async { var response = await http.get(Uri.parse(package.archiveUrl)); if (response.statusCode != 200) throw response; - var output = Directory('${_rootDir}/${package.name}'); + var output = Directory('$_rootDir/${package.name}'); output.createSync(recursive: true); try { @@ -207,9 +206,9 @@ Future _exec(String command, List args, if (timeout != null) { return f.timeout(timeout, onTimeout: () { - _log('Timing out operation ${command}.'); + _log('Timing out operation $command.'); process.kill(); - throw 'timeout on ${command}'; + throw 'timeout on $command'; }); } else { return f; @@ -228,7 +227,7 @@ bool _isOldSdkConstraint(var pubspecInfo) { version = version.substring(0, version.indexOf(' ')); } if (!constraint.allows(Version.parse(version))) { - _log('sdk constraint = ${constraint}'); + _log('sdk constraint = $constraint'); return true; } else { return false; @@ -250,8 +249,8 @@ class PackageInfo { PackageInfo(this.name, this.version); String get archiveUrl => - 'https://storage.googleapis.com/pub.dartlang.org/packages/${name}-${version}.tar.gz'; + 'https://storage.googleapis.com/pub.dartlang.org/packages/$name-$version.tar.gz'; @override - String toString() => '${name}, ${version}'; + String toString() => '$name, $version'; } diff --git a/tool/grind.dart b/tool/grind.dart index 5d6ebcc7c2..5526c0f182 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -27,11 +27,11 @@ class GrindTestFailure { void expectFileContains(String path, List items) { var source = File(path); if (!source.existsSync()) { - throw GrindTestFailure('file not found: ${path}'); + throw GrindTestFailure('file not found: $path'); } for (var item in items) { if (!File(path).readAsStringSync().contains(item)) { - throw GrindTestFailure('Can not find ${item} in ${path}'); + throw GrindTestFailure('Can not find $item in $path'); } } } @@ -507,7 +507,7 @@ Future> _buildSdkDocs(String sdkDocsPath, Future futureCwd, '--enable-asserts', path.join('bin', 'dartdoc.dart'), '--output', - '${sdkDocsPath}', + '$sdkDocsPath', '--sdk-docs', '--json', '--show-progress', @@ -822,7 +822,7 @@ Future _buildPubPackageDocs( ]) async { var env = _createThrowawayPubCache(); var launcher = SubprocessLauncher( - 'build-${pubPackageName}${version == null ? "" : "-$version"}${label == null ? "" : "-$label"}', + 'build-$pubPackageName${version == null ? "" : "-$version"}${label == null ? "" : "-$label"}', env); var args = ['cache', 'add']; if (version != null) args.addAll(['-v', version]); @@ -902,8 +902,8 @@ Future checkChangelogHasVersion() async { var version = _getPackageVersion(); - if (!changelog.readAsLinesSync().contains('## ${version}')) { - fail('ERROR: CHANGELOG.md does not mention version ${version}'); + if (!changelog.readAsLinesSync().contains('## $version')) { + fail('ERROR: CHANGELOG.md does not mention version $version'); } } @@ -932,7 +932,7 @@ Future build() async { await dartdocOptions.writeAsString('''dartdoc: linkToSource: root: '.' - uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v${version}/%f%#L%l%' + uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v$version/%f%#L%l%' '''); } diff --git a/tool/subprocess_launcher.dart b/tool/subprocess_launcher.dart index fb0d132c97..bfa1a17262 100644 --- a/tool/subprocess_launcher.dart +++ b/tool/subprocess_launcher.dart @@ -40,7 +40,7 @@ class CoverageSubprocessLauncher extends SubprocessLauncher { } static String buildNextCoverageFilename() => - p.join(tempDir.path, 'dart-cov-${pid}-${nextRun++}.json'); + p.join(tempDir.path, 'dart-cov-$pid-${nextRun++}.json'); /// Call once all coverage runs have been generated by calling runStreamed /// on all [CoverageSubprocessLaunchers].