feat: pedantic 1.9

Author: alextekartik

.travis.yml

@@ -2,8 +2,8 @@ language: dart
 sudo: required
 dist: trusty
 dart:
-  - '2.4.0'
   - stable
+  - 2.6.1
   - dev
 before_script:
   - source $(pub run chrome_travis:env_rc)

example/google_jsapi_picker_example.dart

@@ -44,30 +44,29 @@ String _authToken;
 InputElement mimeTypesInput;
 
 void _pick() {
-  String mimeTypesText = mimeTypesInput.value;
+  final mimeTypesText = mimeTypesInput.value;
   storageSet(appMimeTypesKey, mimeTypesText);
 
-  PickerBuilder builder = PickerBuilder(gpicker);
+  final builder = PickerBuilder(gpicker);
 
   PickerView pickerView;
 
-  bool selectFolderEnabled =
+  final selectFolderEnabled =
       storageGet(selectFolderEnabledKey) == true.toString();
-  bool includeFolders = storageGet(includeFoldersKey) == true.toString();
+  final includeFolders = storageGet(includeFoldersKey) == true.toString();
 
   print('selectFolderEnbled: $selectFolderEnabled');
   print('includeFolders: $includeFolders');
   // use docs view for folder
   if (selectFolderEnabled || includeFolders) {
-    PickerDocsView pickerDocsView =
-        PickerDocsView(gpicker, gpicker.viewId.docs);
+    final pickerDocsView = PickerDocsView(gpicker, gpicker.viewId.docs);
     pickerDocsView.selectFolderEnabled = true;
     pickerDocsView.includeFolders = true;
     pickerView = pickerDocsView;
   } else {
     pickerView = PickerView(gpicker, gpicker.viewId.docs);
   }
-  List<String> mimeTypes = mimeTypesText.split(',');
+  final mimeTypes = mimeTypesText.split(',');
   if (mimeTypes.isNotEmpty && mimeTypes[0].isNotEmpty) {
     pickerView.mimeTypes = mimeTypes;
   }
@@ -76,7 +75,7 @@ void _pick() {
 
   builder.developerKey = appOptions.developerKey;
   builder.oauthToken = _authToken;
-  Picker uiPicker = builder.build();
+  final uiPicker = builder.build();
   uiPicker.pick().then((PickerDataDocuments docs) {
     pickResult.innerHtml = docs.toString();
 
@@ -89,16 +88,16 @@ void pickerMain(String authToken) {
   print('token: $authToken');
   _authToken = authToken;
 
-  Element pickerForm = querySelector('form.app-picker');
+  final pickerForm = querySelector('form.app-picker');
   pickResult = pickerForm.querySelector('.app-result');
   pickerForm.classes.remove('hidden');
   mimeTypesInput =
       pickerForm.querySelector('input#appInputMimeTypes') as InputElement;
-  Element pickButton = pickerForm.querySelector('button.app-pick');
+  final pickButton = pickerForm.querySelector('button.app-pick');
 
   final selectFolderEnabledInput = pickerForm
       .querySelector('#appInputSelectFolderEnabled') as CheckboxInputElement;
-  bool selectFolderEnabled =
+  final selectFolderEnabled =
       storageGet(selectFolderEnabledKey) == true.toString();
   selectFolderEnabledInput.checked = selectFolderEnabled;
   selectFolderEnabledInput.onChange.listen((_) {
@@ -108,7 +107,7 @@ void pickerMain(String authToken) {
 
   final includeFoldersInput = pickerForm
       .querySelector('#appInputIncludeFolders') as CheckboxInputElement;
-  bool includeFolders = storageGet(includeFoldersKey) == true.toString();
+  final includeFolders = storageGet(includeFoldersKey) == true.toString();
   includeFoldersInput.checked = includeFolders;
   includeFoldersInput.onChange.listen((_) {
     storageSet(includeFoldersKey, includeFoldersInput.checked.toString());
@@ -139,8 +138,8 @@ ERROR: Missing clientId, clientSecret or developerKey
 Create local.config.yaml from sample.local.config.yaml''';
         }
 
-        String clientId = appOptions?.clientId;
-        String clientSecret = appOptions?.clientSecret;
+        final clientId = appOptions?.clientId;
+        final clientSecret = appOptions?.clientSecret;
         if (clientId?.isNotEmpty != true ||
             clientSecret?.isNotEmpty != true ||
             appOptions.developerKey?.isNotEmpty != true) {
@@ -150,7 +149,7 @@ Create local.config.yaml from sample.local.config.yaml''';
 
         var authClientId =
             ClientId(appOptions.clientId, appOptions.clientSecret);
-        List<String> scopes = [GooglePicker.scopeDriveAppFile];
+        final scopes = <String>[GooglePicker.scopeDriveAppFile];
 
         auth2flow?.close();
         auth2flow = await createImplicitBrowserFlow(authClientId, scopes);
@@ -169,9 +168,9 @@ Future _authorize({bool auto}) async {
 }
 
 void authMain() {
-  Element authForm = querySelector('form.app-auth');
+  final authForm = querySelector('form.app-auth');
   authForm.classes.remove('hidden');
-  Element authorizeButton = authForm.querySelector('button.app-authorize');
+  final authorizeButton = authForm.querySelector('button.app-authorize');
 
   authorizeResult = authForm.querySelector('.app-result');
   final autoAuthCheckbox =
@@ -182,7 +181,7 @@ void authMain() {
     _authorize();
   });
 
-  bool autoAuth = storageGet(appAuthAutoAuth) == true.toString();
+  final autoAuth = storageGet(appAuthAutoAuth) == true.toString();
 
   autoAuthCheckbox.onChange.listen((_) {
     storageSet(appAuthAutoAuth, autoAuthCheckbox.checked.toString());
@@ -199,7 +198,7 @@ Element loadGapiResult;
 Future _loadPicker() async {
   loadGapiResult.innerHtml = 'loading Gapi...';
   try {
-    Gapi gapi = await loadGapiPlatform();
+    final gapi = await loadGapiPlatform();
     loadGapiResult.innerHtml = 'loading GooglePicker...';
     gpicker = await loadPicker(gapi);
     loadGapiResult.innerHtml = 'GooglePicker loaded';
@@ -211,7 +210,7 @@ Future _loadPicker() async {
 }
 
 Future main() async {
-  Element loadGapiForm = querySelector('form.app-gapi');
+  final loadGapiForm = querySelector('form.app-gapi');
   loadGapiResult = loadGapiForm.querySelector('.app-result');
 
   await await _loadPicker();

lib/picker.dart

@@ -24,7 +24,7 @@ class Picker {
 
   void _callback(JsObject jsData) {
     //print(jsObjectAsMap(jsData));
-    PickerData data = PickerData(picker, jsData);
+    final data = PickerData(picker, jsData);
     ctlr.add(data);
   }
 
@@ -39,7 +39,7 @@ class Picker {
     stream.listen((PickerData data) {
       // print(data);
       if (data.action == picker.action.cancel) {
-        completer.completeError(const GapiException("cancel"));
+        completer.completeError(const GapiException('cancel'));
       }
       if (data.action == picker.action.picked) {
         completer.complete(data.documents);
@@ -121,9 +121,9 @@ class PickerBuilder {
   }
 
   Picker build() {
-    Picker picker = Picker._(gpicker);
+    final picker = Picker._(gpicker);
     jsPickerBuilder.callMethod('setCallback', [picker._callback]);
-    JsObject jsPicker = jsPickerBuilder.callMethod('build') as JsObject;
+    final jsPicker = jsPickerBuilder.callMethod('build') as JsObject;
     picker._jsObject = jsPicker;
     return picker;
   }
@@ -182,9 +182,9 @@ class PickerDataDocuments {
 
   int get length => jsArray.length;
 
-  List asList() {
-    List<Map> docs = [];
-    for (int i = 0; i < length; i++) {
+  List<Map> asList() {
+    final docs = <Map>[];
+    for (var i = 0; i < length; i++) {
       docs.add(this[i].asMap());
     }
     return docs;
@@ -205,13 +205,8 @@ class PickerData {
   String get action => jsObject[picker.response.action] as String;
   PickerDataDocuments _documents;
 
-  PickerDataDocuments get documents {
-    if (_documents == null) {
-      _documents = PickerDataDocuments(
-          picker, jsObject[picker.response.documents] as JsArray);
-    }
-    return _documents;
-  }
+  PickerDataDocuments get documents => _documents ??= PickerDataDocuments(
+      picker, jsObject[picker.response.documents] as JsArray);
 
   @override
   String toString() {
@@ -280,7 +275,7 @@ class PickerResponse {
 }
 
 class PickerFeature {
-  JsObject _jsObject;
+  final _jsObject;
 
   PickerFeature(this._jsObject);
 
@@ -344,48 +339,27 @@ class GooglePicker {
 
   PickerAction _action;
 
-  PickerAction get action {
-    if (_action == null) {
-      _action = PickerAction(jsObject['Action'] as JsObject);
-    }
-    return _action;
-  }
+  PickerAction get action =>
+      _action ??= PickerAction(jsObject['Action'] as JsObject);
 
   PickerResponse _response;
 
-  PickerResponse get response {
-    if (_response == null) {
-      _response = PickerResponse(jsObject['Response'] as JsObject);
-    }
-    return _response;
-  }
+  PickerResponse get response =>
+      _response ??= PickerResponse(jsObject['Response'] as JsObject);
 
   PickerDocument _document;
 
-  PickerDocument get document {
-    if (_document == null) {
-      _document = PickerDocument(jsObject['Document'] as JsObject);
-    }
-    return _document;
-  }
+  PickerDocument get document =>
+      _document ??= PickerDocument(jsObject['Document'] as JsObject);
 
   PickerFeature _feature;
 
-  PickerFeature get feature {
-    if (_feature == null) {
-      _feature = PickerFeature(jsObject['Feature'] as JsObject);
-    }
-    return _feature;
-  }
+  PickerFeature get feature =>
+      _feature ??= PickerFeature(jsObject['Feature'] as JsObject);
 
   ViewId _viewId;
 
-  ViewId get viewId {
-    if (_viewId == null) {
-      _viewId = ViewId(jsObject['ViewId'] as JsObject);
-    }
-    return _viewId;
-  }
+  ViewId get viewId => _viewId ??= ViewId(jsObject['ViewId'] as JsObject);
 
   JsFunction get _pickerBuilderConstructor =>
       jsObject['PickerBuilder'] as JsFunction;

test/picker_test.dart

@@ -1,4 +1,4 @@
-@TestOn("browser")
+@TestOn('browser')
 library picker_test;
 
 import 'dart:async';
@@ -48,15 +48,15 @@ void pickerMain() {
 
   test('picker', () async {
     if (options != null) {
-      GapiAuth gapiAuth = await loadGapiAuth(gapi);
+      final gapiAuth = await loadGapiAuth(gapi);
       return gapiAuth
           .authorize(options.clientId, [GooglePicker.scopeDriveAppFile]).then(
               (String oauthToken) {
-        PickerBuilder builder = PickerBuilder(gpicker);
+        final builder = PickerBuilder(gpicker);
         builder.addViewId(gpicker.viewId.photos);
         builder.developerKey = options.developerKey;
         builder.oauthToken = null; // optopnnull;
-        Picker uiPicker = builder.build();
+        final uiPicker = builder.build();
         uiPicker.visible = true;
       });
     }

tool/travis.dart

@@ -5,8 +5,9 @@ Future main() async {
 
   await shell.run('''
 
-  dartanalyzer --fatal-warnings --fatal-infos lib test tool example
-  dartfmt -w lib test tool example --set-exit-if-changed
+  # Analyze code
+  dartanalyzer --fatal-warnings --fatal-infos .
+  dartfmt -n --set-exit-if-changed .
 
   pub run test -p vm -j 1
   # pub run build_runner test -- -p vm -j 1 test/multiplatform