analyzer cleanups

Author: gocal

README.md

@@ -49,7 +49,7 @@ Create [Google Sheets API credentials](doc/Authentication.md) either by using Cl
 1. Add gsheet_to_arb dev dependency to the pubspec.yaml
     ```yaml
     dev_dependencies:
-      gsheet_to_arb: ^0.0.6
+      gsheet_to_arb: ^0.1.0
     ```
 
 2. Updated dependencies

analysis_options.yaml

@@ -1,14 +1 @@
-analyzer:
-#   exclude:
-#     - path/to/excluded/files/**
-
-# Lint rules and documentation, see http://dart-lang.github.io/linter/lints
-linter:
-  rules:
-  - cancel_subscriptions
-  - hash_and_equals
-  - iterable_contains_unrelated_type
-  - list_remove_unrelated_type
-  - test_types_in_equals
-  - unrelated_type_equality_checks
-  - valid_regexps
+include: package:pedantic/analysis_options.yaml

bin/arb_to_dart.dart

@@ -11,19 +11,19 @@ import 'dart:io';
 import 'package:args/args.dart';
 import 'package:gsheet_to_arb/gsheet_to_arb.dart';
 
-main(List<String> args) async {
-  var parser = new ArgParser();
-  var configFilePath = "./gsheet_to_arb.yaml";
+void main(List<String> args) async {
+  var parser = ArgParser();
+  var configFilePath = './gsheet_to_arb.yaml';
 
-  parser.addOption("config",
+  parser.addOption('config',
       defaultsTo: configFilePath,
       callback: (x) => configFilePath = x,
       help: 'config yaml file name');
 
-  parser.addFlag("help", help: 'show helps');
+  parser.addFlag('help', help: 'show helps');
 
   parser.parse(args);
-  if (args.length == 0) {
+  if (args.isEmpty) {
     Log.i('Converts ARB file to Dart i18n');
     Log.i('Usage: gsheet_to_arb [options]');
     Log.i(parser.usage);
@@ -33,7 +33,7 @@ main(List<String> args) async {
   final config = PluginConfigHelper().fromYamlFile(configFilePath);
   final serializer = ArbSerializer();
   final document =
-      serializer.loadArbDocument("${config.outputDirectoryPath}/intl_en.arb");
+      serializer.loadArbDocument('${config.outputDirectoryPath}/intl_en.arb');
   final localizationFileName = config.localizationFileName;
   final generator = TranslationsGenerator();
   generator.buildTranslations(

bin/import.dart

@@ -12,17 +12,17 @@ import 'package:args/args.dart';
 import 'package:gsheet_to_arb/gsheet_to_arb.dart';
 import 'package:gsheet_to_arb/src/utils/log.dart';
 
-main(List<String> args) async {
-  var parser = new ArgParser();
-  var configFilePath = "./gsheet_to_arb.yaml";
+void main(List<String> args) async {
+  var parser = ArgParser();
+  var configFilePath = './gsheet_to_arb.yaml';
 
-  parser.addOption("config",
+  parser.addOption('config',
       defaultsTo: configFilePath,
       callback: (x) => configFilePath = x,
       help: 'config yaml file name');
 
   parser.parse(args);
-  if (args.length == 0) {
+  if (args.isEmpty) {
     Log.i('Imports ARB file from exisiting GSheet document');
     Log.i('Usage: gsheet_to_arb [options]');
     Log.i(parser.usage);

lib/gsheet_to_arb.dart

@@ -9,12 +9,11 @@
 /// More dartdocs go here.
 library gsheet_to_arb;
 
-export 'package:gsheet_to_arb/src/sheet/sheet_parser.dart';
-
 export 'src/arb/arb_generator.dart';
 export 'src/arb/arb_serializer.dart';
 export 'src/arb/intl_translation_helper.dart';
-export 'src/arb_to_class_generator.dart';
 export 'src/config/plugin_config.dart';
 export 'src/config/plugin_config_helper.dart';
 export 'src/utils/log.dart';
+export 'src/gsheet/sheet_parser.dart';
+export 'src/output/arb_to_class_generator.dart';

lib/src/arb/intl_translation_helper.dart

@@ -16,8 +16,8 @@ import 'package:path/path.dart' as path;
 
 class IntlTranslationHelper {
   void aaa(String outputDirectoryPath, String localizationFileName) {
-    var extraction = new MessageExtraction();
-    var generation = new MessageGeneration();
+    var extraction = MessageExtraction();
+    var generation = MessageGeneration();
 
     generation.generatedFilePrefix = "_";
 
@@ -33,27 +33,26 @@ class IntlTranslationHelper {
     var targetDir = outputDirectoryPath;
 
     extraction.suppressWarnings = true;
-    var allMessages =
-        dartFiles.map((each) => extraction.parseFile(new File(each)));
+    var allMessages = dartFiles.map((each) => extraction.parseFile(File(each)));
 
-    messages = new Map();
+    messages = Map();
     for (var eachMap in allMessages) {
       eachMap.forEach(
           (key, value) => messages.putIfAbsent(key, () => []).add(value));
     }
     for (var arg in jsonFiles) {
-      var file = new File(arg);
+      var file = File(arg);
       generateLocaleFile(file, targetDir, generation);
     }
 
-    var mainImportFile = new File(path.join(
+    var mainImportFile = File(path.join(
         targetDir, '${generation.generatedFilePrefix}messages_all.dart'));
     mainImportFile.writeAsStringSync(generation.generateMainImportFile());
   }
 
-  final pluralAndGenderParser = new IcuParser().message;
+  final pluralAndGenderParser = IcuParser().message;
 
-  final plainParser = new IcuParser().nonIcuMessage;
+  final plainParser = IcuParser().nonIcuMessage;
 
   /// Keeps track of all the messages we have processed so far, keyed by message
   /// name.
@@ -70,15 +69,15 @@ class IntlTranslationHelper {
       File file, String targetDir, MessageGeneration generation) {
     var src = file.readAsStringSync();
     var data = jsonDecoder.decode(src);
-    var locale = data["@@locale"] ?? data["_locale"];
+    var locale = data['@@locale'] ?? data['_locale'];
     if (locale == null) {
       // Get the locale from the end of the file name. This assumes that the file
       // name doesn't contain any underscores except to begin the language tag
       // and to separate language from country. Otherwise we can't tell if
       // my_file_fr.arb is locale "fr" or "file_fr".
       var name = path.basenameWithoutExtension(file.path);
-      locale = name.split("_").skip(1).join("_");
-      Log.i("No @@locale or _locale field found in $name, "
+      locale = name.split('_').skip(1).join('_');
+      Log.i('No @@locale or _locale field found in $name, '
           "assuming '$locale' based on the file name.");
     }
     generation.allLocales.add(locale);

lib/src/config/plugin_config.dart

@@ -30,13 +30,13 @@ class PluginConfigRoot {
 ///
 @JsonSerializable()
 class PluginConfig {
-  @JsonKey(name: 'output_directory', defaultValue: "lib/src/i18n")
+  @JsonKey(name: 'output_directory', defaultValue: 'lib/src/i18n')
   String outputDirectoryPath;
 
-  @JsonKey(name: 'arb_file_prefix', defaultValue: "intl")
+  @JsonKey(name: 'arb_file_prefix', defaultValue: 'intl')
   String arbFilePrefix;
 
-  @JsonKey(name: 'localization_file_name', defaultValue: "S")
+  @JsonKey(name: 'localization_file_name', defaultValue: 'S')
   String localizationFileName;
 
   @JsonKey(name: 'gsheet', nullable: false)
@@ -61,10 +61,10 @@ class GoogleSheetConfig {
   @JsonKey(name: 'document_id')
   String documentId;
 
-  @JsonKey(name: 'sheet_id', defaultValue: "0")
+  @JsonKey(name: 'sheet_id', defaultValue: '0')
   String sheetId;
 
-  @JsonKey(name: 'category_prefix', defaultValue: "# ")
+  @JsonKey(name: 'category_prefix', defaultValue: '# ')
   String categoryPrefix;
 
   GoogleSheetConfig(

lib/src/gsheet/sheet_parser.dart

@@ -18,8 +18,8 @@ class SheetParser {
 
   SheetParser({this.auth, this.categoryPrefix});
 
-  var _languages = List<ArbDocumentBuilder>();
-  var _scopes = [SheetsApi.SpreadsheetsReadonlyScope];
+  final _languages = <ArbDocumentBuilder>[];
+  final _scopes = [SheetsApi.SpreadsheetsReadonlyScope];
 
   Future<ArbBundle> parseSheet(String documentId) async {
     var authClient = await _authClient(auth);
@@ -38,17 +38,18 @@ class SheetParser {
           auth.serviceAccountKey.privateKey);
       authClient = await clientViaServiceAccount(accountCredentials, _scopes);
     } else if (auth.oauthClientId != null) {
-      var id = new ClientId(
+      var id = ClientId(
           auth.oauthClientId.clientId, auth.oauthClientId.clientSecret);
       authClient = await clientViaUserConsent(id, _scopes, _prompt);
     }
     return authClient;
   }
 
   void _prompt(String url) {
-    Log.i("Please go to the following URL and grant Google Spreasheet access:");
-    Log.i("  => $url");
-    Log.i("");
+    Log.i(
+        'Please go to the following URL and grant Google Spreadsheet access:');
+    Log.i('  => $url');
+    Log.i('');
   }
 
   Future<ArbBundle> _handleSheetsAuth(
@@ -65,7 +66,7 @@ class SheetParser {
   }
 
   ArbBundle _handleSpreadsheet(Spreadsheet spreadsheet) {
-    Log.i("Opening ${spreadsheet.spreadsheetUrl}");
+    Log.i('Opening ${spreadsheet.spreadsheetUrl}');
 
     var sheet = spreadsheet.sheets[0];
     var rows = sheet.data[0].rowData;
@@ -89,7 +90,7 @@ class SheetParser {
     // Skip header row
     var firstTranslationsRow = 1;
 
-    var currentCategory = "";
+    var currentCategory = '';
 
     for (var i = firstTranslationsRow; i < rows.length; i++) {
       var row = rows[i];

pubspec.yaml

@@ -1,5 +1,5 @@
 name: gsheet_to_arb
-version: 0.0.8
+version: 0.1.0
 author: Marcin Marek Gocał <[email protected]>
 description: Imports Application Resource Bundle (ARB) from Google Sheets documents