Upgrade to package:pedantic 1.9.0 (#641)

Fix newly enforced lints: - prefer_conditional_assignment - prefer_if_null_operators - unnecessary_this Drop unused author field from pubspec.
dart-archive · Dec 10, 2019 · 5cbc172 · 5cbc172
1 parent 10bf2b8
commit 5cbc172
Show file tree

Hide file tree

Showing 23 changed files with 85 additions and 96 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.3.5-dev
+
+- Internal cleanup.
+
 ## 3.3.4
 
 - Dropped `flutter_web_preview`, because you can now use the Flutter SDK to 

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:pedantic/analysis_options.1.8.0.yaml
+include: package:pedantic/analysis_options.1.9.0.yaml
 analyzer:
   exclude:
     - 'templates/**'

diff --git a/lib/src/cli_app.dart b/lib/src/cli_app.dart
@@ -49,7 +49,7 @@ class CliApp {
     generators.sort();
   }
 
-  io.Directory get cwd => _cwd != null ? _cwd : io.Directory.current;
+  io.Directory get cwd => _cwd ?? io.Directory.current;
 
   /// An override for the directory to generate into; public for testing.
   set cwd(io.Directory value) {
@@ -159,9 +159,7 @@ additional analytics to help us improve Stagehand [y/yes/no]?''');
     var projectName = path.basename(dir.path);
     projectName = normalizeProjectName(projectName);
 
-    if (target == null) {
-      target = _DirectoryGeneratorTarget(logger, dir);
-    }
+    target ??= _DirectoryGeneratorTarget(logger, dir);
 
     _out('Creating $generatorName application `$projectName`:');
 

diff --git a/lib/src/generators/console_full.g.dart b/lib/src/generators/console_full.g.dart
diff --git a/lib/src/generators/package_simple.g.dart b/lib/src/generators/package_simple.g.dart
diff --git a/lib/src/generators/server_shelf.g.dart b/lib/src/generators/server_shelf.g.dart
diff --git a/lib/src/generators/web_angular.g.dart b/lib/src/generators/web_angular.g.dart
diff --git a/lib/src/generators/web_simple.g.dart b/lib/src/generators/web_simple.g.dart
diff --git a/lib/src/generators/web_stagexl.g.dart b/lib/src/generators/web_stagexl.g.dart
diff --git a/lib/src/version.dart b/lib/src/version.dart
diff --git a/lib/stagehand.dart b/lib/stagehand.dart
@@ -87,7 +87,7 @@ abstract class Generator implements Comparable<Generator> {
   void setEntrypoint(TemplateFile entrypoint) {
     if (_entrypoint != null) throw StateError('entrypoint already set');
     if (entrypoint == null) throw StateError('entrypoint is null');
-    this._entrypoint = entrypoint;
+    _entrypoint = entrypoint;
   }
 
   Future generate(String projectName, GeneratorTarget target,
@@ -116,7 +116,7 @@ abstract class Generator implements Comparable<Generator> {
 
   @override
   int compareTo(Generator other) =>
-      this.id.toLowerCase().compareTo(other.id.toLowerCase());
+      id.toLowerCase().compareTo(other.id.toLowerCase());
 
   /// Return some user facing instructions about how to finish installation of
   /// the template.
@@ -145,7 +145,7 @@ class TemplateFile {
 
   TemplateFile(this.path, this.content);
 
-  TemplateFile.fromBinary(this.path, this._binaryData) : this.content = null;
+  TemplateFile.fromBinary(this.path, this._binaryData) : content = null;
 
   FileContents runSubstitution(Map<String, String> parameters) {
     if (path == 'pubspec.yaml' && parameters['author'] == '<your name>') {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -7,9 +7,8 @@ description: >
   A scaffolding generator for your Dart projects. Stagehand helps you get set
   up!
 # After changing the version, run `pub run build_runner build`.
-version: 3.3.4
+version: 3.3.5-dev
 homepage: https://github.com/dart-lang/stagehand
-author: Dart Team <misc@dartlang.org>
 
 environment:
   # Make sure this Dart SDK version is no higher than the stable Flutter Dart

diff --git a/templates/console-full/bin/main.dart b/templates/console-full/bin/main.dart
@@ -1,5 +1,5 @@
 import 'package:__projectName__/__projectName__.dart' as __projectName__;
 
-main(List<String> arguments) {
+void main(List<String> arguments) {
   print('Hello world: ${__projectName__.calculate()}!');
 }
diff --git a/templates/console-full/pubspec.yaml b/templates/console-full/pubspec.yaml
@@ -2,7 +2,6 @@ name: __projectName__
 description: A sample command-line application.
 # version: 1.0.0
 # homepage: https://www.example.com
-# author: __author__ <__email__>
 
 environment:
   sdk: '>=2.5.0 <3.0.0'

diff --git a/templates/package-simple/example/__projectName___example.dart b/templates/package-simple/example/__projectName___example.dart
@@ -1,6 +1,6 @@
 import 'package:__projectName__/__projectName__.dart';
 
-main() {
+void main() {
   var awesome = Awesome();
   print('awesome: ${awesome.isAwesome}');
 }
diff --git a/templates/package-simple/pubspec.yaml b/templates/package-simple/pubspec.yaml
@@ -2,7 +2,6 @@ name: __projectName__
 description: A starting point for Dart libraries or applications.
 # version: 1.0.0
 # homepage: https://www.example.com
-# author: __author__ <__email__>
 
 environment:
   sdk: '>=2.5.0 <3.0.0'

diff --git a/templates/server-shelf/bin/server.dart b/templates/server-shelf/bin/server.dart
@@ -7,7 +7,7 @@ import 'package:shelf/shelf_io.dart' as io;
 // For Google Cloud Run, set _hostname to '0.0.0.0'.
 const _hostname = 'localhost';
 
-main(List<String> args) async {
+void main(List<String> args) async {
   var parser = ArgParser()..addOption('port', abbr: 'p');
   var result = parser.parse(args);
 

diff --git a/templates/server-shelf/pubspec.yaml b/templates/server-shelf/pubspec.yaml
@@ -2,7 +2,6 @@ name: __projectName__
 description: A web server built using the shelf package.
 # version: 1.0.0
 # homepage: https://www.example.com
-# author: __author__ <__email__>
 
 environment:
   sdk: '>=2.5.0 <3.0.0'

diff --git a/templates/web-angular/pubspec.yaml b/templates/web-angular/pubspec.yaml
@@ -2,7 +2,6 @@ name: __projectName__
 description: A web app that uses AngularDart Components
 # version: 1.0.0
 # homepage: https://www.example.com
-# author: __author__ <__email__>
 
 environment:
   sdk: '>=2.5.0 <3.0.0'

diff --git a/templates/web-simple/pubspec.yaml b/templates/web-simple/pubspec.yaml
@@ -2,7 +2,6 @@ name: __projectName__
 description: An absolute bare-bones web app.
 # version: 1.0.0
 #homepage: https://www.example.com
-#author: __author__ <__email__>
 
 environment:
   sdk: '>=2.5.0 <3.0.0'

diff --git a/templates/web-stagexl/pubspec.yaml b/templates/web-stagexl/pubspec.yaml
@@ -2,7 +2,6 @@ name: __projectName__
 description: A simple StageXL web app.
 # version: 1.0.0
 #homepage: https://www.example.com
-#author: __author__ <__email__>
 
 environment:
   sdk: '>=2.5.0 <3.0.0'

diff --git a/templates/web-stagexl/web/main.dart b/templates/web-stagexl/web/main.dart
@@ -3,8 +3,8 @@ import 'dart:html' as html;
 import 'package:stagexl/stagexl.dart';
 import 'dart:math';
 
-Future<Null> main() async {
-  StageOptions options = StageOptions()
+Future<void> main() async {
+  var options = StageOptions()
     ..backgroundColor = Color.White
     ..renderEngine = RenderEngine.WebGL;
 
@@ -15,11 +15,11 @@ Future<Null> main() async {
   renderLoop.addStage(stage);
 
   var resourceManager = ResourceManager();
-  resourceManager.addBitmapData("dart", "images/dart@1x.png");
+  resourceManager.addBitmapData('dart', 'images/dart@1x.png');
 
   await resourceManager.load();
 
-  var logoData = resourceManager.getBitmapData("dart");
+  var logoData = resourceManager.getBitmapData('dart');
   var logo = Sprite();
   logo.addChild(Bitmap(logoData));
 

diff --git a/test/validate_templates.dart b/test/validate_templates.dart
@@ -18,7 +18,6 @@ final _pubspecOrder = const [
   'description',
   'version',
   'homepage',
-  'author(s)?',
   'environment',
   'dependencies',
   'dev_dependencies',