Remove unnecessary type declarations.

Author: gspencergoog

lib/src/dartdoc_options.dart

@@ -148,16 +148,16 @@ class ToolConfiguration {
 
   static ToolConfiguration fromYamlMap(
       YamlMap yamlMap, pathLib.Context pathContext) {
-    Map<String, ToolDefinition> newToolDefinitions = {};
-    for (MapEntry entry in yamlMap.entries) {
-      String name = entry.key.toString();
+    var newToolDefinitions = <String, ToolDefinition>{};
+    for (var entry in yamlMap.entries) {
+      var name = entry.key.toString();
       var toolMap = entry.value;
-      String description;
+      var description;
       List<String> command;
       if (toolMap is Map) {
         description = toolMap['description']?.toString();
         // If the command key is given, then it applies to all platforms.
-        String commandFrom = toolMap.containsKey('command')
+        var commandFrom = toolMap.containsKey('command')
             ? 'command'
             : Platform.operatingSystem;
         if (toolMap.containsKey(commandFrom)) {
@@ -195,10 +195,10 @@ class ToolConfiguration {
             'At least one of "command" or "${Platform.operatingSystem}" must '
             'be defined for the tool $name.');
       }
-      String executable = command.removeAt(0);
+      var executable = command.removeAt(0);
       executable = pathContext.canonicalize(executable);
-      File executableFile = new File(executable);
-      FileStat exeStat = executableFile.statSync();
+      var executableFile = new File(executable);
+      var exeStat = executableFile.statSync();
       if (exeStat.type == FileSystemEntityType.notFound) {
         throw new DartdocOptionError('Command executables must exist. '
             'The file "$executable" does not exist for tool $name.');

lib/src/model.dart

@@ -3699,11 +3699,11 @@ abstract class ModelElement extends Canonicalization
     // Matches all tool directives (even some invalid ones). This is so
     // we can give good error messages if the directive is malformed, instead of
     // just silently emitting it as-is.
-    final RegExp basicToolRegExp = new RegExp(
+    final basicToolRegExp = new RegExp(
         r'[ ]*{@tool\s+([^}]+)}\n?([\s\S]+?)\n?{@end-tool}[ ]*\n?',
         multiLine: true);
 
-    ToolRunner runner = new ToolRunner(config.tools, (String message) {
+    var runner = new ToolRunner(config.tools, (String message) {
       warn(PackageWarning.toolError, message: message);
     });
     try {
@@ -3972,7 +3972,7 @@ abstract class ModelElement extends Canonicalization
     // args that look like assignments (start with valid option names followed
     // by an equals sign), add a "--" in front so that they parse as options.
     return matches.map<String>((Match match) {
-      String option = '';
+      var option = '';
       if (convertToArgs && match[1] != null && !match[1].startsWith('-'))
         option = '--';
       if (match[2] != null) {
@@ -3990,7 +3990,7 @@ abstract class ModelElement extends Canonicalization
   /// normally with [argParser] and returns the result.
   ArgResults _parseArgs(
       String argsAsString, ArgParser argParser, String directiveName) {
-    Iterable<String> args =
+    var args =
         _splitUpQuotedArgs(argsAsString, convertToArgs: true);
     try {
       return argParser.parse(args);

lib/src/tool_runner.dart

@@ -61,14 +61,14 @@ class ToolRunner {
     assert(args != null);
     assert(args.isNotEmpty);
     content ??= '';
-    String tool = args.removeAt(0);
+    var tool = args.removeAt(0);
     if (!toolConfiguration.tools.containsKey(tool)) {
       _error('Unable to find definition for tool "$tool" in tool map. '
           'Did you add it to dartdoc_options.yaml?');
       return '';
     }
-    ToolDefinition toolDefinition = toolConfiguration.tools[tool];
-    List<String> toolArgs = toolDefinition.command;
+    var toolDefinition = toolConfiguration.tools[tool];
+    var toolArgs = toolDefinition.command;
     if (pathLib.extension(toolDefinition.command.first) == '.dart') {
       // For dart tools, we want to invoke them with Dart.
       toolArgs.insert(0, Platform.resolvedExecutable);
@@ -83,21 +83,21 @@ class ToolRunner {
     // the input to a temporary file before running the tool synchronously.
 
     // Write the content to a temp file.
-    File tmpFile = _createTemporaryFile();
+    var tmpFile = _createTemporaryFile();
     tmpFile.writeAsStringSync(content);
 
     // Substitute the temp filename for the "$INPUT" token.
-    RegExp fileToken = new RegExp(r'\$INPUT\b');
-    List<String> argsWithInput = <String>[];
-    for (String arg in args) {
+    var fileToken = new RegExp(r'\$INPUT\b');
+    var argsWithInput = <String>[];
+    for (var arg in args) {
       argsWithInput.add(arg.replaceAll(fileToken, tmpFile.absolute.path));
     }
 
     argsWithInput = toolArgs + argsWithInput;
-    final String commandPath = argsWithInput.removeAt(0);
+    final commandPath = argsWithInput.removeAt(0);
     String commandString() => ([commandPath] + argsWithInput).join(' ');
     try {
-      ProcessResult result = Process.runSync(commandPath, argsWithInput);
+      var result = Process.runSync(commandPath, argsWithInput);
       if (result.exitCode != 0) {
         _error('Tool "$tool" returned non-zero exit code '
             '(${result.exitCode}) when run as '

test/tool_runner_test.dart

@@ -14,7 +14,7 @@ import 'package:test/test.dart';
 import 'src/utils.dart' as utils;
 
 void main() {
-  ToolConfiguration toolMap = ToolConfiguration.empty;
+  var toolMap = ToolConfiguration.empty;
 
   toolMap.tools.addAll({
     'missing': new ToolDefinition(['/a/missing/executable'], "missing"),
@@ -28,7 +28,7 @@ void main() {
         new ToolDefinition([Platform.resolvedExecutable], 'non-dart tool'),
   });
   ToolRunner runner;
-  final List<String> errors = <String>[];
+  final errors = <String>[];
 
   setUpAll(() async {
     runner = new ToolRunner(toolMap, (String message) => errors.add(message));
@@ -42,7 +42,7 @@ void main() {
       errors.clear();
     });
     test('can invoke a Dart tool', () {
-      String result = runner.run(
+      var result = runner.run(
         ['drill', r'--file=$INPUT'],
         'TEST INPUT',
       );