Use package lints

analysis_options.yaml

@@ -1,5 +1,6 @@
 # Dart analyzer dislikes this line. https://github.com/dart-lang/dart-pad/issues/1720
 # include: package:pedantic/analysis_options.1.11.0.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
   language:
@@ -16,9 +17,12 @@ analyzer:
 
 linter:
   rules:
+    - always_declare_return_types
     - directives_ordering
     - prefer_final_fields
     - prefer_final_in_for_each
     - prefer_final_locals
     - prefer_relative_imports
+    - prefer_single_quotes
     - sort_pub_dependencies
+    - unawaited_futures

lib/src/analysis_server.dart

@@ -27,12 +27,12 @@ final Logger _logger = Logger('analysis_server');
 /// to stdout.
 bool dumpServerMessages = false;
 
-const String _WARMUP_SRC_HTML =
+const String _warmupSrcHtml =
     "import 'dart:html'; main() { int b = 2;  b++;   b. }";
-const String _WARMUP_SRC = 'main() { int b = 2;  b++;   b. }';
+const String _warmupSrc = 'main() { int b = 2;  b++;   b. }';
 
 // Use very long timeouts to ensure that the server has enough time to restart.
-const Duration _ANALYSIS_SERVER_TIMEOUT = Duration(seconds: 35);
+const Duration _analysisServerTimeout = Duration(seconds: 35);
 
 class DartAnalysisServerWrapper extends AnalysisServerWrapper {
   DartAnalysisServerWrapper(this._nullSafety) : super(Sdk.sdkPath);
@@ -102,7 +102,7 @@ abstract class AnalysisServerWrapper {
         final analysisComplete = getAnalysisCompleteCompleter();
         await analysisServer.analysis
             .setAnalysisRoots(<String>[_sourceDirPath], <String>[]);
-        await _sendAddOverlays(<String, String>{mainPath: _WARMUP_SRC});
+        await _sendAddOverlays(<String, String>{mainPath: _warmupSrc});
         await analysisComplete.future;
         await _sendRemoveOverlays();
 
@@ -262,7 +262,7 @@ abstract class AnalysisServerWrapper {
       }
 
       return m;
-    }, timeoutDuration: _ANALYSIS_SERVER_TIMEOUT));
+    }, timeoutDuration: _analysisServerTimeout));
   }
 
   Future<proto.AnalysisResults> analyze(String source) {
@@ -322,7 +322,7 @@ abstract class AnalysisServerWrapper {
       return proto.AnalysisResults()
         ..issues.addAll(issues)
         ..packageImports.addAll(packageImports);
-    }, timeoutDuration: _ANALYSIS_SERVER_TIMEOUT));
+    }, timeoutDuration: _analysisServerTimeout));
   }
 
   Future<AssistsResult> _getAssistsImpl(
@@ -344,7 +344,7 @@ abstract class AnalysisServerWrapper {
           await analysisServer.edit.getAssists(path, offset, length);
       await _unloadSources();
       return assists;
-    }, timeoutDuration: _ANALYSIS_SERVER_TIMEOUT));
+    }, timeoutDuration: _analysisServerTimeout));
   }
 
   /// Convert between the Analysis Server type and the API protocol types.
@@ -469,7 +469,7 @@ abstract class AnalysisServerWrapper {
       final results = await getCompletionResults(id.id);
       await _unloadSources();
       return results;
-    }, timeoutDuration: _ANALYSIS_SERVER_TIMEOUT));
+    }, timeoutDuration: _analysisServerTimeout));
   }
 
   Future<FixesResult> _getFixesImpl(
@@ -489,7 +489,7 @@ abstract class AnalysisServerWrapper {
       final fixes = await analysisServer.edit.getFixes(path, offset);
       await _unloadSources();
       return fixes;
-    }, timeoutDuration: _ANALYSIS_SERVER_TIMEOUT));
+    }, timeoutDuration: _analysisServerTimeout));
   }
 
   Future<FormatResult> _formatImpl(String src, int offset) async {
@@ -500,7 +500,7 @@ abstract class AnalysisServerWrapper {
       final result = await analysisServer.edit.format(mainPath, offset, 0);
       await _unloadSources();
       return result;
-    }, timeoutDuration: _ANALYSIS_SERVER_TIMEOUT));
+    }, timeoutDuration: _analysisServerTimeout));
   }
 
   Map<String, String> _getOverlayMapWithPaths(Map<String, String> overlay) {
@@ -516,7 +516,7 @@ abstract class AnalysisServerWrapper {
 
   /// Warm up the analysis server to be ready for use.
   Future<proto.CompleteResponse> warmup({bool useHtml = false}) =>
-      complete(useHtml ? _WARMUP_SRC_HTML : _WARMUP_SRC, 10);
+      complete(useHtml ? _warmupSrcHtml : _warmupSrc, 10);
 
   final Set<String> _overlayPaths = <String>{};
 

lib/src/common_server_api.dart

@@ -19,88 +19,88 @@ export 'common_server_impl.dart' show log, ServerContainer;
 
 part 'common_server_api.g.dart'; // generated with 'pub run build_runner build'
 
-const PROTOBUF_CONTENT_TYPE = 'application/x-protobuf';
-const JSON_CONTENT_TYPE = 'application/json; charset=utf-8';
-const PROTO_API_URL_PREFIX = '/api/dartservices/<apiVersion>';
+const protobufContentType = 'application/x-protobuf';
+const jsonContentType = 'application/json; charset=utf-8';
+const protoApiUrlPrefix = '/api/dartservices/<apiVersion>';
 
 class CommonServerApi {
   final CommonServerImpl _impl;
 
   CommonServerApi(this._impl);
 
-  @Route.post('$PROTO_API_URL_PREFIX/analyze')
+  @Route.post('$protoApiUrlPrefix/analyze')
   Future<Response> analyze(Request request, String apiVersion) =>
       _processRequest(request,
           decodeFromJSON: (json) =>
               proto.SourceRequest.create()..mergeFromProto3Json(json),
           decodeFromProto: (bytes) => proto.SourceRequest.fromBuffer(bytes),
           transform: _impl.analyze);
 
-  @Route.post('$PROTO_API_URL_PREFIX/compile')
+  @Route.post('$protoApiUrlPrefix/compile')
   Future<Response> compile(Request request, String apiVersion) =>
       _processRequest(request,
           decodeFromJSON: (json) =>
               proto.CompileRequest.create()..mergeFromProto3Json(json),
           decodeFromProto: (bytes) => proto.CompileRequest.fromBuffer(bytes),
           transform: _impl.compile);
 
-  @Route.post('$PROTO_API_URL_PREFIX/compileDDC')
+  @Route.post('$protoApiUrlPrefix/compileDDC')
   Future<Response> compileDDC(Request request, String apiVersion) =>
       _processRequest(request,
           decodeFromJSON: (json) =>
               proto.CompileDDCRequest.create()..mergeFromProto3Json(json),
           decodeFromProto: (bytes) => proto.CompileDDCRequest.fromBuffer(bytes),
           transform: _impl.compileDDC);
 
-  @Route.post('$PROTO_API_URL_PREFIX/complete')
+  @Route.post('$protoApiUrlPrefix/complete')
   Future<Response> complete(Request request, String apiVersion) =>
       _processRequest(request,
           decodeFromJSON: (json) =>
               proto.SourceRequest.create()..mergeFromProto3Json(json),
           decodeFromProto: (bytes) => proto.SourceRequest.fromBuffer(bytes),
           transform: _impl.complete);
 
-  @Route.post('$PROTO_API_URL_PREFIX/fixes')
+  @Route.post('$protoApiUrlPrefix/fixes')
   Future<Response> fixes(Request request, String apiVersion) =>
       _processRequest(request,
           decodeFromJSON: (json) =>
               proto.SourceRequest.create()..mergeFromProto3Json(json),
           decodeFromProto: (bytes) => proto.SourceRequest.fromBuffer(bytes),
           transform: _impl.fixes);
 
-  @Route.post('$PROTO_API_URL_PREFIX/assists')
+  @Route.post('$protoApiUrlPrefix/assists')
   Future<Response> assists(Request request, String apiVersion) =>
       _processRequest(request,
           decodeFromJSON: (json) =>
               proto.SourceRequest.create()..mergeFromProto3Json(json),
           decodeFromProto: (bytes) => proto.SourceRequest.fromBuffer(bytes),
           transform: _impl.assists);
 
-  @Route.post('$PROTO_API_URL_PREFIX/format')
+  @Route.post('$protoApiUrlPrefix/format')
   Future<Response> format(Request request, String apiVersion) =>
       _processRequest(request,
           decodeFromJSON: (json) =>
               proto.SourceRequest.create()..mergeFromProto3Json(json),
           decodeFromProto: (bytes) => proto.SourceRequest.fromBuffer(bytes),
           transform: _impl.format);
 
-  @Route.post('$PROTO_API_URL_PREFIX/document')
+  @Route.post('$protoApiUrlPrefix/document')
   Future<Response> document(Request request, String apiVersion) =>
       _processRequest(request,
           decodeFromJSON: (json) =>
               proto.SourceRequest.create()..mergeFromProto3Json(json),
           decodeFromProto: (bytes) => proto.SourceRequest.fromBuffer(bytes),
           transform: _impl.document);
 
-  @Route.post('$PROTO_API_URL_PREFIX/version')
+  @Route.post('$protoApiUrlPrefix/version')
   Future<Response> versionPost(Request request, String apiVersion) =>
       _processRequest(request,
           decodeFromJSON: (json) =>
               proto.VersionRequest.create()..mergeFromProto3Json(json),
           decodeFromProto: (bytes) => proto.VersionRequest.fromBuffer(bytes),
           transform: _impl.version);
 
-  @Route.get('$PROTO_API_URL_PREFIX/version')
+  @Route.get('$protoApiUrlPrefix/version')
   Future<Response> versionGet(Request request, String apiVersion) =>
       _processRequest(request,
           decodeFromJSON: (json) =>
@@ -121,7 +121,7 @@ class CommonServerApi {
     @required I Function(Object json) decodeFromJSON,
     @required Future<O> Function(I input) transform,
   }) async {
-    if (request.mimeType == PROTOBUF_CONTENT_TYPE) {
+    if (request.mimeType == protobufContentType) {
       // Dealing with binary Protobufs
       final body = <int>[];
       await for (final chunk in request.read()) {
@@ -131,11 +131,11 @@ class CommonServerApi {
         final response = await transform(decodeFromProto(body));
         return Response.ok(
           response.writeToBuffer(),
-          headers: _PROTOBUF_HEADERS,
+          headers: _protobufHeaders,
         );
       } on BadRequest catch (e) {
         return Response(400,
-            headers: _PROTOBUF_HEADERS,
+            headers: _protobufHeaders,
             body: (proto.BadRequest.create()
                   ..error = (proto.ErrorMessage.create()..message = e.cause))
                 .writeToBuffer());
@@ -149,11 +149,11 @@ class CommonServerApi {
         return Response.ok(
           _jsonEncoder.convert(response.toProto3Json()),
           encoding: utf8,
-          headers: _JSON_HEADERS,
+          headers: _jsonHeaders,
         );
       } on BadRequest catch (e) {
         return Response(400,
-            headers: _JSON_HEADERS,
+            headers: _jsonHeaders,
             encoding: utf8,
             body: _jsonEncoder.convert((proto.BadRequest.create()
                   ..error = (proto.ErrorMessage.create()..message = e.cause))
@@ -164,13 +164,13 @@ class CommonServerApi {
 
   final JsonEncoder _jsonEncoder = const JsonEncoder.withIndent(' ');
 
-  static const _JSON_HEADERS = {
+  static const _jsonHeaders = {
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': JSON_CONTENT_TYPE
+    'Content-Type': jsonContentType
   };
 
-  static const _PROTOBUF_HEADERS = {
+  static const _protobufHeaders = {
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': PROTOBUF_CONTENT_TYPE
+    'Content-Type': protobufContentType
   };
 }

lib/src/compiler.dart

@@ -279,7 +279,7 @@ class CompilationProblem implements Comparable<CompilationProblem> {
 /// * If [from] and [to] are canonically the same, no operation occurs.
 ///
 /// Returns a future that completes when complete.
-Future<Null> copyPath(String from, String to) async {
+Future<void> copyPath(String from, String to) async {
   if (_doNothing(from, to)) {
     return;
   }

lib/src/server_cache.dart

@@ -191,7 +191,7 @@ class RedisCache implements ServerCache {
     key = _genKey(key);
     if (!_isConnected()) {
       log.warning('$_logPrefix: no cache available when setting key $key');
-      return null;
+      return;
     }
 
     final commands = redisClient.asCommands<String, String>();

lib/src/summarize.dart

@@ -242,18 +242,18 @@ class Summarizer {
       }
       summary += '${_sentenceFiller('errorCount', storage.errorCount)} ';
       summary += 'errors and warnings';
-      summary += '${_featureList(_codeSearch())}';
-      summary += '${_htmlCSS()}';
-      summary += '${_packageList(storage.packageImports, source: 'packages')}';
-      summary += '${_additionList(_additionSearch())}';
+      summary += _featureList(_codeSearch());
+      summary += _htmlCSS();
+      summary += _packageList(storage.packageImports, source: 'packages');
+      summary += _additionList(_additionSearch());
       return summary.trim();
     } else {
       var summary = 'Summary: ';
       summary += 'This is a ${_sentenceFiller('size', storage.linesCode)} ';
-      summary += '${_sentenceFiller('compiledQuantifier')}';
-      summary += '${_featureList(_codeSearch())}';
-      summary += '${_htmlCSS()}';
-      summary += '${_additionList(_additionSearch())}';
+      summary += _sentenceFiller('compiledQuantifier');
+      summary += _featureList(_codeSearch());
+      summary += _htmlCSS();
+      summary += _additionList(_additionSearch());
       return summary.trim();
     }
   }

pubspec.lock

@@ -274,6 +274,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.1"
+  lints:
+    dependency: "direct dev"
+    description:
+      name: lints
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   logging:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -28,6 +28,7 @@ dev_dependencies:
   coverage: ^0.15.2
   expected_output: ^2.0.0
   grinder: ^0.9.0
+  lints: ^1.0.1
   mock_request: ^1.0.7
   pedantic: ^1.11.0
   shelf_router_generator: ^0.7.0+1

test/common_server_api_protobuf_test.dart

@@ -67,7 +67,7 @@ void defineTests() {
     assert(commonServerApi != null);
     final uri = Uri.parse('/api/$path');
     final request = MockHttpRequest('POST', uri);
-    request.headers.add('content-type', JSON_CONTENT_TYPE);
+    request.headers.add('content-type', jsonContentType);
     request.add(utf8.encode(json.encode(message.toProto3Json())));
     await request.close();
     await shelf_io.handleRequest(request, commonServerApi.router);
@@ -80,7 +80,7 @@ void defineTests() {
     assert(commonServerApi != null);
     final uri = Uri.parse('/api/$path');
     final request = MockHttpRequest('POST', uri);
-    request.headers.add('content-type', JSON_CONTENT_TYPE);
+    request.headers.add('content-type', jsonContentType);
     await request.close();
     await shelf_io.handleRequest(request, commonServerApi.router);
     return request.response;

test/common_server_api_test.dart

@@ -252,7 +252,7 @@ void defineTests() {
     assert(commonServerApi != null);
     final uri = Uri.parse('/api/$path');
     final request = MockHttpRequest('POST', uri);
-    request.headers.add('content-type', JSON_CONTENT_TYPE);
+    request.headers.add('content-type', jsonContentType);
     request.add(utf8.encode(json.encode(jsonData)));
     await request.close();
     await shelf_io.handleRequest(request, commonServerApi.router);
@@ -265,7 +265,7 @@ void defineTests() {
     assert(commonServerApi != null);
     final uri = Uri.parse('/api/$path');
     final request = MockHttpRequest('POST', uri);
-    request.headers.add('content-type', JSON_CONTENT_TYPE);
+    request.headers.add('content-type', jsonContentType);
     await request.close();
     await shelf_io.handleRequest(request, commonServerApi.router);
     return request.response;

test/flutter_web_test.dart

@@ -82,17 +82,21 @@ void defineTests() {
 }
 
 class _FakeImportDirective implements ImportDirective {
+  @override
   final _FakeStringLiteral uri;
 
   _FakeImportDirective(String uri) : uri = _FakeStringLiteral(uri);
 
+  @override
   dynamic noSuchMethod(_) => throw UnimplementedError();
 }
 
 class _FakeStringLiteral implements StringLiteral {
+  @override
   final String stringValue;
 
   _FakeStringLiteral(this.stringValue);
 
+  @override
   dynamic noSuchMethod(_) => throw UnimplementedError();
 }