Use void in place of Null in analysis_server
Change-Id: Ifef805cb3c0111e237a6147f71a968958d5651e5
Reviewed-on: https://dart-review.googlesource.com/69560
Reviewed-by: Mike Fairhurst <mfairhurst@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
index 53b2bc4..7c82392 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -339,11 +339,6 @@
DiagnosticServer diagnosticServer;
/**
- * The analytics instance; note, this object can be `null`.
- */
- telemetry.Analytics get analytics => options.analytics;
-
- /**
* Initialize a newly created server to receive requests from and send
* responses to the given [channel].
*
@@ -444,6 +439,11 @@
}
/**
+ * The analytics instance; note, this object can be `null`.
+ */
+ telemetry.Analytics get analytics => options.analytics;
+
+ /**
* Return a list of the globs used to determine which files should be analyzed.
*/
List<Glob> get analyzedFilesGlobs {
@@ -1009,7 +1009,7 @@
return contextManager.isInAnalysisRoot(file);
}
- Future<Null> shutdown() async {
+ Future<void> shutdown() async {
running = false;
if (options.analytics != null) {
diff --git a/pkg/analysis_server/lib/src/domain_analysis.dart b/pkg/analysis_server/lib/src/domain_analysis.dart
index a308777..a8e0598 100644
--- a/pkg/analysis_server/lib/src/domain_analysis.dart
+++ b/pkg/analysis_server/lib/src/domain_analysis.dart
@@ -45,7 +45,7 @@
/**
* Implement the `analysis.getErrors` request.
*/
- Future<Null> getErrors(Request request) async {
+ Future<void> getErrors(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
String file = new AnalysisGetErrorsParams.fromRequest(request).file;
@@ -79,7 +79,7 @@
/**
* Implement the `analysis.getHover` request.
*/
- Future<Null> getHover(Request request) async {
+ Future<void> getHover(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
var params = new AnalysisGetHoverParams.fromRequest(request);
@@ -106,7 +106,7 @@
/**
* Implement the `analysis.getImportedElements` request.
*/
- Future<Null> getImportedElements(Request request) async {
+ Future<void> getImportedElements(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AnalysisGetImportedElementsParams params =
@@ -164,7 +164,7 @@
/**
* Implement the `analysis.getNavigation` request.
*/
- Future<Null> getNavigation(Request request) async {
+ Future<void> getNavigation(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
var params = new AnalysisGetNavigationParams.fromRequest(request);
@@ -251,7 +251,7 @@
/**
* Implement the `analysis.getSignature` request.
*/
- Future<Null> getSignature(Request request) async {
+ Future<void> getSignature(Request request) async {
var params = new AnalysisGetSignatureParams.fromRequest(request);
// Prepare the resolved units.
diff --git a/pkg/analysis_server/lib/src/domain_completion.dart b/pkg/analysis_server/lib/src/domain_completion.dart
index f634061..d4bd1c2 100644
--- a/pkg/analysis_server/lib/src/domain_completion.dart
+++ b/pkg/analysis_server/lib/src/domain_completion.dart
@@ -91,8 +91,7 @@
performance.logStartTime(COMPUTE_SUGGESTIONS_TAG);
CompletionContributor contributor = new DartCompletionManager();
- String contributorTag = 'computeSuggestions - ${contributor
- .runtimeType}';
+ String contributorTag = 'computeSuggestions - ${contributor.runtimeType}';
performance.logStartTime(contributorTag);
try {
suggestions.addAll(await contributor.computeSuggestions(request));
@@ -162,7 +161,7 @@
/**
* Process a `completion.getSuggestions` request.
*/
- Future<Null> processRequest(Request request) async {
+ Future<void> processRequest(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
performance = new CompletionPerformance();
diff --git a/pkg/analysis_server/lib/src/domain_kythe.dart b/pkg/analysis_server/lib/src/domain_kythe.dart
index 2529bb1..4b7447d 100644
--- a/pkg/analysis_server/lib/src/domain_kythe.dart
+++ b/pkg/analysis_server/lib/src/domain_kythe.dart
@@ -34,7 +34,7 @@
/**
* Implement the `kythe.getKytheEntries` request.
*/
- Future<Null> getKytheEntries(Request request) async {
+ Future<void> getKytheEntries(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
String file = new KytheGetKytheEntriesParams.fromRequest(request).file;
diff --git a/pkg/analysis_server/lib/src/domain_server.dart b/pkg/analysis_server/lib/src/domain_server.dart
index ccd12bc..39497ac 100644
--- a/pkg/analysis_server/lib/src/domain_server.dart
+++ b/pkg/analysis_server/lib/src/domain_server.dart
@@ -66,7 +66,7 @@
/**
* Cleanly shutdown the analysis server.
*/
- Future<Null> shutdown(Request request) async {
+ Future<void> shutdown(Request request) async {
await server.shutdown();
Response response = new ServerShutdownResult().toResponse(request.id);
server.sendResponse(response);
diff --git a/pkg/analysis_server/lib/src/edit/edit_domain.dart b/pkg/analysis_server/lib/src/edit/edit_domain.dart
index 12f358e..80cb8d2 100644
--- a/pkg/analysis_server/lib/src/edit/edit_domain.dart
+++ b/pkg/analysis_server/lib/src/edit/edit_domain.dart
@@ -380,7 +380,7 @@
/**
* Implement the `edit.importElements` request.
*/
- Future<Null> importElements(Request request) async {
+ Future<void> importElements(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
EditImportElementsParams params =
@@ -462,7 +462,7 @@
server.sendResponse(response);
}
- Future<Null> organizeDirectives(Request request) async {
+ Future<void> organizeDirectives(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
server.options.analytics?.sendEvent('edit', 'organizeDirectives');
@@ -499,7 +499,7 @@
new EditOrganizeDirectivesResult(fileEdit).toResponse(request.id));
}
- Future<Null> sortMembers(Request request) async {
+ Future<void> sortMembers(Request request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
var params = new EditSortMembersParams.fromRequest(request);
diff --git a/pkg/analysis_server/lib/src/operation/operation_analysis.dart b/pkg/analysis_server/lib/src/operation/operation_analysis.dart
index a103f5c..32b9153 100644
--- a/pkg/analysis_server/lib/src/operation/operation_analysis.dart
+++ b/pkg/analysis_server/lib/src/operation/operation_analysis.dart
@@ -18,7 +18,7 @@
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/generated/source.dart';
-Future<Null> scheduleImplementedNotification(
+Future<void> scheduleImplementedNotification(
AnalysisServer server, Iterable<String> files) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
diff --git a/pkg/analysis_server/lib/src/plugin/plugin_manager.dart b/pkg/analysis_server/lib/src/plugin/plugin_manager.dart
index dace1bd..6f95fd4a 100644
--- a/pkg/analysis_server/lib/src/plugin/plugin_manager.dart
+++ b/pkg/analysis_server/lib/src/plugin/plugin_manager.dart
@@ -262,11 +262,11 @@
/**
* Request that the plugin shutdown.
*/
- Future<Null> stop() {
+ Future<void> stop() {
if (currentSession == null) {
throw new StateError('Cannot stop a plugin that is not running.');
}
- Future<Null> doneFuture = currentSession.stop();
+ Future<void> doneFuture = currentSession.stop();
currentSession = null;
return doneFuture;
}
@@ -378,7 +378,7 @@
* used when analyzing code for the given [contextRoot]. If the plugin had not
* yet been started, then it will be started by this method.
*/
- Future<Null> addPluginToContextRoot(
+ Future<void> addPluginToContextRoot(
analyzer.ContextRoot contextRoot, String path) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
@@ -577,7 +577,7 @@
/**
* Restart all currently running plugins.
*/
- Future<Null> restartPlugins() async {
+ Future<void> restartPlugins() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
for (PluginInfo plugin in _pluginMap.values.toList()) {
@@ -674,7 +674,7 @@
/**
* Stop all of the plugins that are currently running.
*/
- Future<List<Null>> stopAll() {
+ Future<List<void>> stopAll() {
return Future.wait(_pluginMap.values.map((PluginInfo info) => info.stop()));
}
@@ -895,7 +895,7 @@
/**
* The completer used to signal when the plugin has stopped.
*/
- Completer<Null> pluginStoppedCompleter = new Completer<Null>();
+ Completer<void> pluginStoppedCompleter = new Completer<void>();
/**
* The channel used to communicate with the plugin.
@@ -955,7 +955,7 @@
/**
* Return a future that will complete when the plugin has stopped.
*/
- Future<Null> get onDone => pluginStoppedCompleter.future;
+ Future<void> get onDone => pluginStoppedCompleter.future;
/**
* Handle the given [notification].
@@ -1105,7 +1105,7 @@
/**
* Request that the plugin shutdown.
*/
- Future<Null> stop() {
+ Future<void> stop() {
if (channel == null) {
throw new StateError('Cannot stop a plugin that is not running.');
}
diff --git a/pkg/analysis_server/lib/src/server/http_server.dart b/pkg/analysis_server/lib/src/server/http_server.dart
index 783cb9c..aee5eb0 100644
--- a/pkg/analysis_server/lib/src/server/http_server.dart
+++ b/pkg/analysis_server/lib/src/server/http_server.dart
@@ -130,7 +130,7 @@
/**
* Handle a GET request received by the HTTP server.
*/
- Future<Null> _handleGetRequest(HttpRequest request) async {
+ Future<void> _handleGetRequest(HttpRequest request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (getHandler == null) {
diff --git a/pkg/analysis_server/lib/src/services/correction/assist_internal.dart b/pkg/analysis_server/lib/src/services/correction/assist_internal.dart
index 3a773af..92498bd 100644
--- a/pkg/analysis_server/lib/src/services/correction/assist_internal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/assist_internal.dart
@@ -220,7 +220,7 @@
assists.add(new Assist(kind, change));
}
- Future<Null> _addProposal_addTypeAnnotation_DeclaredIdentifier() async {
+ Future<void> _addProposal_addTypeAnnotation_DeclaredIdentifier() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
DeclaredIdentifier declaredIdentifier =
@@ -271,7 +271,7 @@
}
}
- Future<Null> _addProposal_addTypeAnnotation_SimpleFormalParameter() async {
+ Future<void> _addProposal_addTypeAnnotation_SimpleFormalParameter() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = this.node;
@@ -313,7 +313,7 @@
}
}
- Future<Null> _addProposal_addTypeAnnotation_VariableDeclaration() async {
+ Future<void> _addProposal_addTypeAnnotation_VariableDeclaration() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = this.node;
@@ -376,7 +376,7 @@
}
}
- Future<Null> _addProposal_assignToLocalVariable() async {
+ Future<void> _addProposal_assignToLocalVariable() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// prepare enclosing ExpressionStatement
@@ -431,7 +431,7 @@
}
}
- Future<Null> _addProposal_convertDocumentationIntoBlock() async {
+ Future<void> _addProposal_convertDocumentationIntoBlock() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
Comment comment = node.getAncestor((n) => n is Comment);
@@ -464,7 +464,7 @@
changeBuilder, DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK);
}
- Future<Null> _addProposal_convertDocumentationIntoLine() async {
+ Future<void> _addProposal_convertDocumentationIntoLine() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
Comment comment = node.getAncestor((n) => n is Comment);
@@ -525,7 +525,7 @@
changeBuilder, DartAssistKind.CONVERT_DOCUMENTATION_INTO_LINE);
}
- Future<Null> _addProposal_convertIntoFinalField() async {
+ Future<void> _addProposal_convertIntoFinalField() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// Find the enclosing getter.
@@ -596,7 +596,7 @@
}
}
- Future<Null> _addProposal_convertIntoGetter() async {
+ Future<void> _addProposal_convertIntoGetter() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// Find the enclosing field declaration.
@@ -647,7 +647,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.CONVERT_INTO_GETTER);
}
- Future<Null> _addProposal_convertPartOfToUri() async {
+ Future<void> _addProposal_convertPartOfToUri() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
PartOfDirective directive =
@@ -667,7 +667,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.CONVERT_PART_OF_TO_URI);
}
- Future<Null> _addProposal_convertToAsyncFunctionBody() async {
+ Future<void> _addProposal_convertToAsyncFunctionBody() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
FunctionBody body = getEnclosingFunctionBody();
@@ -700,7 +700,7 @@
changeBuilder, DartAssistKind.CONVERT_INTO_ASYNC_BODY);
}
- Future<Null> _addProposal_convertToBlockFunctionBody() async {
+ Future<void> _addProposal_convertToBlockFunctionBody() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
FunctionBody body = getEnclosingFunctionBody();
@@ -745,13 +745,13 @@
changeBuilder, DartAssistKind.CONVERT_INTO_BLOCK_BODY);
}
- Future<Null> _addProposal_convertToDoubleQuotedString() async {
+ Future<void> _addProposal_convertToDoubleQuotedString() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
await _convertQuotes(false, DartAssistKind.CONVERT_TO_DOUBLE_QUOTED_STRING);
}
- Future<Null> _addProposal_convertToExpressionFunctionBody() async {
+ Future<void> _addProposal_convertToExpressionFunctionBody() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// prepare current body
@@ -804,7 +804,7 @@
changeBuilder, DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
}
- Future<Null> _addProposal_convertToFieldParameter() async {
+ Future<void> _addProposal_convertToFieldParameter() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node == null) {
@@ -898,7 +898,7 @@
}
}
- Future<Null> _addProposal_convertToForIndexLoop() async {
+ Future<void> _addProposal_convertToForIndexLoop() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// find enclosing ForEachStatement
@@ -978,7 +978,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.CONVERT_INTO_FOR_INDEX);
}
- Future<Null> _addProposal_convertToGenericFunctionSyntax() async {
+ Future<void> _addProposal_convertToGenericFunctionSyntax() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = this.node;
@@ -998,7 +998,7 @@
}
}
- Future<Null> _addProposal_convertToIsNot_onIs() async {
+ Future<void> _addProposal_convertToIsNot_onIs() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// may be child of "is"
@@ -1051,7 +1051,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.CONVERT_INTO_IS_NOT);
}
- Future<Null> _addProposal_convertToIsNot_onNot() async {
+ Future<void> _addProposal_convertToIsNot_onNot() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// may be () in prefix expression
@@ -1107,7 +1107,7 @@
/**
* Converts "!isEmpty" -> "isNotEmpty" if possible.
*/
- Future<Null> _addProposal_convertToIsNotEmpty() async {
+ Future<void> _addProposal_convertToIsNotEmpty() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// prepare "expr.isEmpty"
@@ -1167,7 +1167,7 @@
changeBuilder, DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
}
- Future<Null> _addProposal_convertToNormalParameter() async {
+ Future<void> _addProposal_convertToNormalParameter() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleIdentifier &&
@@ -1208,13 +1208,13 @@
}
}
- Future<Null> _addProposal_convertToSingleQuotedString() async {
+ Future<void> _addProposal_convertToSingleQuotedString() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
await _convertQuotes(true, DartAssistKind.CONVERT_TO_SINGLE_QUOTED_STRING);
}
- Future<Null> _addProposal_encapsulateField() async {
+ Future<void> _addProposal_encapsulateField() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// find FieldDeclaration
@@ -1315,7 +1315,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.ENCAPSULATE_FIELD);
}
- Future<Null> _addProposal_exchangeOperands() async {
+ Future<void> _addProposal_exchangeOperands() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// check that user invokes quick assist on binary expression
@@ -1372,7 +1372,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.EXCHANGE_OPERANDS);
}
- Future<Null> _addProposal_flutterConvertToChildren() async {
+ Future<void> _addProposal_flutterConvertToChildren() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// Find "child: widget" under selection.
@@ -1403,7 +1403,7 @@
changeBuilder, DartAssistKind.FLUTTER_CONVERT_TO_CHILDREN);
}
- Future<Null> _addProposal_flutterConvertToStatefulWidget() async {
+ Future<void> _addProposal_flutterConvertToStatefulWidget() async {
ClassDeclaration widgetClass =
node.getAncestor((n) => n is ClassDeclaration);
TypeName superclass = widgetClass?.extendsClause?.superclass;
@@ -1639,7 +1639,7 @@
changeBuilder, DartAssistKind.FLUTTER_CONVERT_TO_STATEFUL_WIDGET);
}
- Future<Null> _addProposal_flutterMoveWidgetDown() async {
+ Future<void> _addProposal_flutterMoveWidgetDown() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
var widget = flutter.identifyWidgetExpression(node);
@@ -1673,7 +1673,7 @@
}
}
- Future<Null> _addProposal_flutterMoveWidgetUp() async {
+ Future<void> _addProposal_flutterMoveWidgetUp() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
var widget = flutter.identifyWidgetExpression(node);
@@ -1706,7 +1706,7 @@
}
}
- Future<Null> _addProposal_flutterRemoveWidget_multipleChildren() async {
+ Future<void> _addProposal_flutterRemoveWidget_multipleChildren() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
var widgetCreation = flutter.identifyNewExpression(node);
@@ -1746,7 +1746,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.FLUTTER_REMOVE_WIDGET);
}
- Future<Null> _addProposal_flutterRemoveWidget_singleChild() async {
+ Future<void> _addProposal_flutterRemoveWidget_singleChild() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
var widgetCreation = flutter.identifyNewExpression(node);
@@ -1773,7 +1773,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.FLUTTER_REMOVE_WIDGET);
}
- Future<Null> _addProposal_flutterSwapWithChild() async {
+ Future<void> _addProposal_flutterSwapWithChild() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
InstanceCreationExpression parent = flutter.identifyNewExpression(node);
@@ -1794,7 +1794,7 @@
parent, child, DartAssistKind.FLUTTER_SWAP_WITH_CHILD);
}
- Future<Null> _addProposal_flutterSwapWithParent() async {
+ Future<void> _addProposal_flutterSwapWithParent() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
InstanceCreationExpression child = flutter.identifyNewExpression(node);
@@ -1815,7 +1815,7 @@
parent, child, DartAssistKind.FLUTTER_SWAP_WITH_PARENT);
}
- Future<Null> _addProposal_flutterWrapWidget() async {
+ Future<void> _addProposal_flutterWrapWidget() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
await _addProposal_flutterWrapWidgetImpl();
@@ -1836,7 +1836,7 @@
});
}
- Future<Null> _addProposal_flutterWrapWidgetImpl(
+ Future<void> _addProposal_flutterWrapWidgetImpl(
{AssistKind kind: DartAssistKind.FLUTTER_WRAP_GENERIC,
bool Function(Expression widgetExpr) widgetValidator,
String parentLibraryUri,
@@ -1906,7 +1906,7 @@
_addAssistFromBuilder(changeBuilder, kind);
}
- Future<Null> _addProposal_flutterWrapWidgets() async {
+ Future<void> _addProposal_flutterWrapWidgets() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
var selectionRange = new SourceRange(selectionOffset, selectionLength);
@@ -1936,7 +1936,7 @@
var selectedRange = range.startEnd(firstWidget, lastWidget);
String src = utils.getRangeText(selectedRange);
- Future<Null> addAssist(
+ Future<void> addAssist(
{@required AssistKind kind,
@required String parentLibraryUri,
@required String parentClassName}) async {
@@ -1998,7 +1998,7 @@
parentClassName: 'Row');
}
- Future<Null> _addProposal_importAddShow() async {
+ Future<void> _addProposal_importAddShow() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// prepare ImportDirective
@@ -2043,7 +2043,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.IMPORT_ADD_SHOW);
}
- Future<Null> _addProposal_introduceLocalTestedType() async {
+ Future<void> _addProposal_introduceLocalTestedType() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = this.node;
@@ -2116,7 +2116,7 @@
}
}
- Future<Null> _addProposal_invertIf() async {
+ Future<void> _addProposal_invertIf() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is! IfStatement) {
@@ -2144,7 +2144,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.INVERT_IF_STATEMENT);
}
- Future<Null> _addProposal_joinIfStatementInner() async {
+ Future<void> _addProposal_joinIfStatementInner() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// climb up condition to the (supposedly) "if" statement
@@ -2206,7 +2206,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.JOIN_IF_WITH_INNER);
}
- Future<Null> _addProposal_joinIfStatementOuter() async {
+ Future<void> _addProposal_joinIfStatementOuter() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// climb up condition to the (supposedly) "if" statement
@@ -2272,7 +2272,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.JOIN_IF_WITH_OUTER);
}
- Future<Null> _addProposal_joinVariableDeclaration_onAssignment() async {
+ Future<void> _addProposal_joinVariableDeclaration_onAssignment() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// check that node is LHS in assignment
@@ -2349,7 +2349,7 @@
changeBuilder, DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- Future<Null> _addProposal_joinVariableDeclaration_onDeclaration() async {
+ Future<void> _addProposal_joinVariableDeclaration_onDeclaration() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// prepare enclosing VariableDeclarationList
@@ -2419,7 +2419,7 @@
changeBuilder, DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- Future<Null> _addProposal_removeTypeAnnotation() async {
+ Future<void> _addProposal_removeTypeAnnotation() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
VariableDeclarationList declarationList =
@@ -2465,7 +2465,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.REMOVE_TYPE_ANNOTATION);
}
- Future<Null> _addProposal_reparentFlutterList() async {
+ Future<void> _addProposal_reparentFlutterList() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is! ListLiteral) {
@@ -2514,7 +2514,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.FLUTTER_WRAP_GENERIC);
}
- Future<Null> _addProposal_replaceConditionalWithIfElse() async {
+ Future<void> _addProposal_replaceConditionalWithIfElse() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
ConditionalExpression conditional = null;
@@ -2620,7 +2620,7 @@
}
}
- Future<Null> _addProposal_replaceIfElseWithConditional() async {
+ Future<void> _addProposal_replaceIfElseWithConditional() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// should be "if"
@@ -2688,7 +2688,7 @@
}
}
- Future<Null> _addProposal_splitAndCondition() async {
+ Future<void> _addProposal_splitAndCondition() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// check that user invokes quick assist on binary expression
@@ -2781,7 +2781,7 @@
_addAssistFromBuilder(changeBuilder, DartAssistKind.SPLIT_AND_CONDITION);
}
- Future<Null> _addProposal_splitVariableDeclaration() async {
+ Future<void> _addProposal_splitVariableDeclaration() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// prepare DartVariableStatement, should be part of Block
@@ -2821,7 +2821,7 @@
changeBuilder, DartAssistKind.SPLIT_VARIABLE_DECLARATION);
}
- Future<Null> _addProposal_surroundWith() async {
+ Future<void> _addProposal_surroundWith() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// prepare selected statements
@@ -3107,7 +3107,7 @@
}
}
- Future<Null> _convertFunctionTypeAliasToGenericTypeAlias(
+ Future<void> _convertFunctionTypeAliasToGenericTypeAlias(
FunctionTypeAlias node) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
@@ -3138,7 +3138,7 @@
changeBuilder, DartAssistKind.CONVERT_INTO_GENERIC_FUNCTION_SYNTAX);
}
- Future<Null> _convertFunctionTypedFormalParameterToSimpleFormalParameter(
+ Future<void> _convertFunctionTypedFormalParameterToSimpleFormalParameter(
FunctionTypedFormalParameter node) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
@@ -3167,7 +3167,7 @@
changeBuilder, DartAssistKind.CONVERT_INTO_GENERIC_FUNCTION_SYNTAX);
}
- Future<Null> _convertQuotes(bool fromDouble, AssistKind kind) async {
+ Future<void> _convertQuotes(bool fromDouble, AssistKind kind) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleStringLiteral) {
diff --git a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
index caeae6f..65931a3 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
@@ -595,7 +595,7 @@
return fixes;
}
- Future<Null> _addFix_addAsync() async {
+ Future<void> _addFix_addAsync() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
FunctionBody body = node.getAncestor((n) => n is FunctionBody);
@@ -609,7 +609,7 @@
}
}
- Future<Null> _addFix_addExplicitCast() async {
+ Future<void> _addFix_addExplicitCast() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (coveredNode is! Expression) {
@@ -710,7 +710,7 @@
}
}
- Future<Null> _addFix_addMissingNamedArgument() async {
+ Future<void> _addFix_addMissingNamedArgument() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// Prepare the name of the missing parameter.
@@ -774,7 +774,7 @@
}
}
- Future<Null> _addFix_addMissingParameter() async {
+ Future<void> _addFix_addMissingParameter() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// The error is reported on ArgumentList.
@@ -844,7 +844,7 @@
}
}
- Future<Null> _addFix_addMissingRequiredArgument() async {
+ Future<void> _addFix_addMissingRequiredArgument() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
InstanceCreationExpression creation;
@@ -913,7 +913,7 @@
}
}
- Future<Null> _addFix_addOverrideAnnotation() async {
+ Future<void> _addFix_addOverrideAnnotation() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
ClassMember member = node.getAncestor((n) => n is ClassMember);
@@ -940,7 +940,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.LINT_ADD_OVERRIDE);
}
- Future<Null> _addFix_addRequiredAnnotation() async {
+ Future<void> _addFix_addRequiredAnnotation() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
DartChangeBuilder changeBuilder = new DartChangeBuilder(session);
@@ -950,7 +950,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.LINT_ADD_REQUIRED);
}
- Future<Null> _addFix_addStatic() async {
+ Future<void> _addFix_addStatic() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
FieldDeclaration declaration =
@@ -962,7 +962,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.ADD_STATIC);
}
- Future<Null> _addFix_boolInsteadOfBoolean() async {
+ Future<void> _addFix_boolInsteadOfBoolean() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
DartChangeBuilder changeBuilder = new DartChangeBuilder(session);
@@ -972,7 +972,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.REPLACE_BOOLEAN_WITH_BOOL);
}
- Future<Null> _addFix_canBeNullAfterNullAware() async {
+ Future<void> _addFix_canBeNullAfterNullAware() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = coveredNode;
@@ -996,7 +996,7 @@
}
}
- Future<Null> _addFix_changeTypeAnnotation() async {
+ Future<void> _addFix_changeTypeAnnotation() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode declaration = coveredNode.parent;
@@ -1029,7 +1029,7 @@
}
}
- Future<Null> _addFix_convertFlutterChild() async {
+ Future<void> _addFix_convertFlutterChild() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
NamedExpression named = flutter.findNamedExpression(node, 'child');
@@ -1071,7 +1071,7 @@
}
}
- Future<Null> _addFix_convertFlutterChildren() async {
+ Future<void> _addFix_convertFlutterChildren() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = this.node;
@@ -1101,7 +1101,7 @@
}
}
- Future<Null> _addFix_convertToNamedArgument() async {
+ Future<void> _addFix_convertToNamedArgument() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
var argumentList = this.node;
@@ -1171,7 +1171,7 @@
}
}
- Future<Null> _addFix_createClass() async {
+ Future<void> _addFix_createClass() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
Element prefixElement = null;
@@ -1256,7 +1256,7 @@
* Here we handle cases when there are no constructors in a class, and the
* class has uninitialized final fields.
*/
- Future<Null> _addFix_createConstructor_forUninitializedFinalFields() async {
+ Future<void> _addFix_createConstructor_forUninitializedFinalFields() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is! SimpleIdentifier || node.parent is! VariableDeclaration) {
@@ -1334,7 +1334,7 @@
changeBuilder, DartFixKind.CREATE_CONSTRUCTOR_FOR_FINAL_FIELDS);
}
- Future<Null> _addFix_createConstructor_insteadOfSyntheticDefault() async {
+ Future<void> _addFix_createConstructor_insteadOfSyntheticDefault() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is! ArgumentList) {
@@ -1379,7 +1379,7 @@
args: [constructorName]);
}
- Future<Null> _addFix_createConstructor_named() async {
+ Future<void> _addFix_createConstructor_named() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
SimpleIdentifier name = null;
@@ -1439,7 +1439,7 @@
args: [constructorName]);
}
- Future<Null> _addFix_createConstructorSuperExplicit() async {
+ Future<void> _addFix_createConstructorSuperExplicit() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node.parent is! ConstructorDeclaration ||
@@ -1510,7 +1510,7 @@
}
}
- Future<Null> _addFix_createConstructorSuperImplicit() async {
+ Future<void> _addFix_createConstructorSuperImplicit() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
ClassDeclaration targetClassNode = node.parent as ClassDeclaration;
@@ -1579,7 +1579,7 @@
}
}
- Future<Null> _addFix_createField() async {
+ Future<void> _addFix_createField() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is! SimpleIdentifier) {
@@ -1656,7 +1656,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.CREATE_FIELD, args: [name]);
}
- Future<Null> _addFix_createField_initializingFormal() async {
+ Future<void> _addFix_createField_initializingFormal() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
//
@@ -1692,7 +1692,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.CREATE_FIELD, args: [name]);
}
- Future<Null> _addFix_createFunction_forFunctionType() async {
+ Future<void> _addFix_createFunction_forFunctionType() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleIdentifier) {
@@ -1742,7 +1742,7 @@
}
}
- Future<Null> _addFix_createGetter() async {
+ Future<void> _addFix_createGetter() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is! SimpleIdentifier) {
@@ -1819,7 +1819,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.CREATE_GETTER, args: [name]);
}
- Future<Null> _addFix_createImportUri() async {
+ Future<void> _addFix_createImportUri() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// TODO(brianwilkerson) Generalize this to allow other valid string literals.
@@ -1847,7 +1847,7 @@
}
}
- Future<Null> _addFix_createLocalVariable() async {
+ Future<void> _addFix_createLocalVariable() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is! SimpleIdentifier) {
@@ -1900,7 +1900,7 @@
args: [name]);
}
- Future<Null> _addFix_createMissingOverrides() async {
+ Future<void> _addFix_createMissingOverrides() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node.parent is! ClassDeclaration) {
@@ -2049,7 +2049,7 @@
utils.targetExecutableElement = null;
}
- Future<Null> _addFix_createNoSuchMethod() async {
+ Future<void> _addFix_createNoSuchMethod() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node.parent is! ClassDeclaration) {
@@ -2077,7 +2077,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.CREATE_NO_SUCH_METHOD);
}
- Future<Null> _addFix_createPartUri() async {
+ Future<void> _addFix_createPartUri() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// TODO(brianwilkerson) Generalize this to allow other valid string literals.
@@ -2098,7 +2098,7 @@
}
}
- Future<Null> _addFix_illegalAsyncReturnType() async {
+ Future<void> _addFix_illegalAsyncReturnType() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// prepare the existing type
@@ -2111,7 +2111,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.REPLACE_RETURN_TYPE_FUTURE);
}
- Future<Null> _addFix_importLibrary(FixKind kind, Uri library) async {
+ Future<void> _addFix_importLibrary(FixKind kind, Uri library) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
String uriText;
@@ -2122,7 +2122,7 @@
_addFixFromBuilder(changeBuilder, kind, args: [uriText]);
}
- Future<Null> _addFix_importLibrary_withElement(String name,
+ Future<void> _addFix_importLibrary_withElement(String name,
List<ElementKind> elementKinds, TopLevelDeclarationKind kind2) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
@@ -2226,7 +2226,7 @@
}
}
- Future<Null> _addFix_importLibrary_withFunction() async {
+ Future<void> _addFix_importLibrary_withFunction() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleIdentifier && node.parent is MethodInvocation) {
@@ -2239,7 +2239,7 @@
}
}
- Future<Null> _addFix_importLibrary_withTopLevelVariable() async {
+ Future<void> _addFix_importLibrary_withTopLevelVariable() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleIdentifier) {
@@ -2251,7 +2251,7 @@
}
}
- Future<Null> _addFix_importLibrary_withType() async {
+ Future<void> _addFix_importLibrary_withType() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (_mayBeTypeIdentifier(node)) {
@@ -2267,7 +2267,7 @@
}
}
- Future<Null> _addFix_insertSemicolon() async {
+ Future<void> _addFix_insertSemicolon() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (error.message.contains("';'")) {
@@ -2283,7 +2283,7 @@
}
}
- Future<Null> _addFix_isNotEmpty() async {
+ Future<void> _addFix_isNotEmpty() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is! PrefixExpression) {
@@ -2311,7 +2311,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.USE_IS_NOT_EMPTY);
}
- Future<Null> _addFix_isNotNull() async {
+ Future<void> _addFix_isNotNull() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (coveredNode is IsExpression) {
@@ -2328,7 +2328,7 @@
}
}
- Future<Null> _addFix_isNull() async {
+ Future<void> _addFix_isNull() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (coveredNode is IsExpression) {
@@ -2345,7 +2345,7 @@
}
}
- Future<Null> _addFix_makeEnclosingClassAbstract() async {
+ Future<void> _addFix_makeEnclosingClassAbstract() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
ClassDeclaration enclosingClass =
@@ -2363,7 +2363,7 @@
args: [className]);
}
- Future<Null> _addFix_makeFieldNotFinal() async {
+ Future<void> _addFix_makeFieldNotFinal() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = this.node;
@@ -2408,7 +2408,7 @@
}
}
- Future<Null> _addFix_makeVariableFinal() async {
+ Future<void> _addFix_makeVariableFinal() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = this.node;
@@ -2429,7 +2429,7 @@
}
}
- Future<Null> _addFix_nonBoolCondition_addNotNull() async {
+ Future<void> _addFix_nonBoolCondition_addNotNull() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
DartChangeBuilder changeBuilder = new DartChangeBuilder(session);
@@ -2439,7 +2439,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.ADD_NE_NULL);
}
- Future<Null> _addFix_removeAwait() async {
+ Future<void> _addFix_removeAwait() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
final awaitExpression = node;
@@ -2453,7 +2453,7 @@
}
}
- Future<Null> _addFix_removeDeadCode() async {
+ Future<void> _addFix_removeDeadCode() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode coveringNode = this.coveredNode;
@@ -2496,7 +2496,7 @@
}
}
- Future<Null> _addFix_removeEmptyCatch() async {
+ Future<void> _addFix_removeEmptyCatch() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
DartChangeBuilder changeBuilder = new DartChangeBuilder(session);
@@ -2506,7 +2506,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.REMOVE_EMPTY_CATCH);
}
- Future<Null> _addFix_removeEmptyConstructorBody() async {
+ Future<void> _addFix_removeEmptyConstructorBody() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
DartChangeBuilder changeBuilder = new DartChangeBuilder(session);
@@ -2518,7 +2518,7 @@
changeBuilder, DartFixKind.REMOVE_EMPTY_CONSTRUCTOR_BODY);
}
- Future<Null> _addFix_removeEmptyElse() async {
+ Future<void> _addFix_removeEmptyElse() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
IfStatement ifStatement = node.parent;
@@ -2530,7 +2530,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.REMOVE_EMPTY_ELSE);
}
- Future<Null> _addFix_removeEmptyStatement() async {
+ Future<void> _addFix_removeEmptyStatement() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
EmptyStatement emptyStatement = node;
@@ -2553,7 +2553,7 @@
}
}
- Future<Null> _addFix_removeInitializer() async {
+ Future<void> _addFix_removeInitializer() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// Retrieve the linted node.
@@ -2569,7 +2569,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.REMOVE_INITIALIZER);
}
- Future<Null> _addFix_removeInterpolationBraces() async {
+ Future<void> _addFix_removeInterpolationBraces() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = this.node;
@@ -2588,7 +2588,7 @@
}
}
- Future<Null> _addFix_removeMethodDeclaration() async {
+ Future<void> _addFix_removeMethodDeclaration() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
MethodDeclaration declaration =
@@ -2602,7 +2602,7 @@
}
}
- Future<Null> _addFix_removeParameters_inGetterDeclaration() async {
+ Future<void> _addFix_removeParameters_inGetterDeclaration() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is MethodDeclaration) {
@@ -2620,7 +2620,7 @@
}
}
- Future<Null> _addFix_removeParentheses_inGetterInvocation() async {
+ Future<void> _addFix_removeParentheses_inGetterInvocation() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleIdentifier && node.parent is MethodInvocation) {
@@ -2636,7 +2636,7 @@
}
}
- Future<Null> _addFix_removeThisExpression() async {
+ Future<void> _addFix_removeThisExpression() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
final thisExpression = node is ThisExpression
@@ -2658,7 +2658,7 @@
}
}
- Future<Null> _addFix_removeTypeAnnotation() async {
+ Future<void> _addFix_removeTypeAnnotation() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
final TypeAnnotation type =
@@ -2672,7 +2672,7 @@
}
}
- Future<Null> _addFix_removeUnnecessaryCast() async {
+ Future<void> _addFix_removeUnnecessaryCast() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (coveredNode is! AsExpression) {
@@ -2690,7 +2690,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.REMOVE_UNNECESSARY_CAST);
}
- Future<Null> _addFix_removeUnusedCatchClause() async {
+ Future<void> _addFix_removeUnusedCatchClause() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleIdentifier) {
@@ -2708,7 +2708,7 @@
}
}
- Future<Null> _addFix_removeUnusedCatchStack() async {
+ Future<void> _addFix_removeUnusedCatchStack() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleIdentifier) {
@@ -2727,7 +2727,7 @@
}
}
- Future<Null> _addFix_removeUnusedImport() async {
+ Future<void> _addFix_removeUnusedImport() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// prepare ImportDirective
@@ -2744,7 +2744,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.REMOVE_UNUSED_IMPORT);
}
- Future<Null> _addFix_renameToCamelCase() async {
+ Future<void> _addFix_renameToCamelCase() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is! SimpleIdentifier) {
@@ -2787,7 +2787,7 @@
args: [newName]);
}
- Future<Null> _addFix_replaceFinalWithConst() async {
+ Future<void> _addFix_replaceFinalWithConst() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is VariableDeclarationList) {
@@ -2800,7 +2800,7 @@
}
}
- Future<Null> _addFix_replaceVarWithDynamic() async {
+ Future<void> _addFix_replaceVarWithDynamic() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
DartChangeBuilder changeBuilder = new DartChangeBuilder(session);
@@ -2810,7 +2810,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.REPLACE_VAR_WITH_DYNAMIC);
}
- Future<Null> _addFix_replaceWithConditionalAssignment() async {
+ Future<void> _addFix_replaceWithConditionalAssignment() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
IfStatement ifStatement = node is IfStatement
@@ -2847,7 +2847,7 @@
}
}
- Future<Null> _addFix_replaceWithConstInstanceCreation() async {
+ Future<void> _addFix_replaceWithConstInstanceCreation() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (coveredNode is InstanceCreationExpression) {
@@ -2866,7 +2866,7 @@
}
}
- Future<Null> _addFix_replaceWithIdentifier() async {
+ Future<void> _addFix_replaceWithIdentifier() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
final FunctionTypedFormalParameter functionTyped =
@@ -2883,7 +2883,7 @@
}
}
- Future<Null> _addFix_replaceWithLiteral() async {
+ Future<void> _addFix_replaceWithLiteral() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
final InstanceCreationExpression instanceCreation =
@@ -2907,7 +2907,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.REPLACE_WITH_LITERAL);
}
- Future<Null> _addFix_replaceWithTearOff() async {
+ Future<void> _addFix_replaceWithTearOff() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
FunctionExpression ancestor =
@@ -2915,7 +2915,7 @@
if (ancestor == null) {
return;
}
- Future<Null> addFixOfExpression(InvocationExpression expression) async {
+ Future<void> addFixOfExpression(InvocationExpression expression) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
DartChangeBuilder changeBuilder = new DartChangeBuilder(session);
@@ -2947,7 +2947,7 @@
}
}
- Future<Null> _addFix_undefinedClass_useSimilar() async {
+ Future<void> _addFix_undefinedClass_useSimilar() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = this.node;
@@ -2998,7 +2998,7 @@
}
}
- Future<Null> _addFix_undefinedClassAccessor_useSimilar() async {
+ Future<void> _addFix_undefinedClassAccessor_useSimilar() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = this.node;
@@ -3028,7 +3028,7 @@
}
}
- Future<Null> _addFix_undefinedClassMember_useSimilar(
+ Future<void> _addFix_undefinedClassMember_useSimilar(
Expression target, ElementPredicate predicate) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
@@ -3064,7 +3064,7 @@
}
}
- Future<Null> _addFix_undefinedFunction_create() async {
+ Future<void> _addFix_undefinedFunction_create() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// should be the name of the invocation
@@ -3113,7 +3113,7 @@
args: [name]);
}
- Future<Null> _addFix_undefinedFunction_useSimilar() async {
+ Future<void> _addFix_undefinedFunction_useSimilar() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
AstNode node = this.node;
@@ -3161,7 +3161,7 @@
}
}
- Future<Null> _addFix_undefinedMethod_create() async {
+ Future<void> _addFix_undefinedMethod_create() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleIdentifier && node.parent is MethodInvocation) {
@@ -3247,7 +3247,7 @@
}
}
- Future<Null> _addFix_undefinedMethod_useSimilar() async {
+ Future<void> _addFix_undefinedMethod_useSimilar() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node.parent is MethodInvocation) {
@@ -3257,7 +3257,7 @@
}
}
- Future<Null> _addFix_undefinedMethodWithContructor() async {
+ Future<void> _addFix_undefinedMethodWithContructor() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleIdentifier && node.parent is MethodInvocation) {
@@ -3277,7 +3277,7 @@
* Here we handle cases when a constructors does not initialize all of the
* final fields.
*/
- Future<Null> _addFix_updateConstructor_forUninitializedFinalFields() async {
+ Future<void> _addFix_updateConstructor_forUninitializedFinalFields() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is! SimpleIdentifier || node.parent is! ConstructorDeclaration) {
@@ -3339,7 +3339,7 @@
_addFixFromBuilder(changeBuilder, DartFixKind.ADD_FIELD_FORMAL_PARAMETERS);
}
- Future<Null> _addFix_useEffectiveIntegerDivision() async {
+ Future<void> _addFix_useEffectiveIntegerDivision() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
for (AstNode n = node; n != null; n = n.parent) {
@@ -3368,7 +3368,7 @@
* Adds a fix that replaces [target] with a reference to the class declaring
* the given [element].
*/
- Future<Null> _addFix_useStaticAccess(AstNode target, Element element) async {
+ Future<void> _addFix_useStaticAccess(AstNode target, Element element) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
Element declaringElement = element.enclosingElement;
@@ -3386,7 +3386,7 @@
}
}
- Future<Null> _addFix_useStaticAccess_method() async {
+ Future<void> _addFix_useStaticAccess_method() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleIdentifier && node.parent is MethodInvocation) {
@@ -3399,7 +3399,7 @@
}
}
- Future<Null> _addFix_useStaticAccess_property() async {
+ Future<void> _addFix_useStaticAccess_property() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (node is SimpleIdentifier && node.parent is PrefixedIdentifier) {
@@ -3498,7 +3498,7 @@
* Adds proposal for creating method corresponding to the given [FunctionType] in the given
* [ClassElement].
*/
- Future<Null> _addProposal_createFunction_function(
+ Future<void> _addProposal_createFunction_function(
FunctionType functionType) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
@@ -3527,7 +3527,7 @@
* Adds proposal for creating method corresponding to the given [FunctionType] in the given
* [ClassElement].
*/
- Future<Null> _addProposal_createFunction_method(
+ Future<void> _addProposal_createFunction_method(
ClassElement targetClassElement, FunctionType functionType) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/convert_getter_to_method.dart b/pkg/analysis_server/lib/src/services/refactoring/convert_getter_to_method.dart
index 598057e..b24a839 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/convert_getter_to_method.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/convert_getter_to_method.dart
@@ -88,7 +88,7 @@
return new RefactoringStatus();
}
- Future<Null> _updateElementDeclaration(
+ Future<void> _updateElementDeclaration(
PropertyAccessorElement element) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.dart b/pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.dart
index a6a2c7b..068f5a7 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.dart
@@ -97,7 +97,7 @@
@override
bool requiresPreview() => false;
- Future<Null> _updateElementDeclaration(Element element) async {
+ Future<void> _updateElementDeclaration(Element element) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
// prepare parameters
@@ -125,7 +125,7 @@
}
}
- Future<Null> _updateElementReferences(Element element) async {
+ Future<void> _updateElementReferences(Element element) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
List<SearchMatch> matches = await searchEngine.searchReferences(element);
diff --git a/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart b/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart
index 2b3e43a..2d260ed 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart
@@ -782,7 +782,7 @@
return result;
}
- Future<Null> _initializeReturnType() async {
+ Future<void> _initializeReturnType() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
TypeProvider typeProvider = await session.typeProvider;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart b/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart
index 7a28fc7..a57352f 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart
@@ -464,7 +464,7 @@
_ReferenceProcessor(this.ref, this.reference);
- Future<Null> init() async {
+ Future<void> init() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
refElement = reference.element;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart
index 847b333..cf80af9 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart
@@ -342,7 +342,7 @@
}
}
-class _LocalElementsCollector extends GeneralizingAstVisitor<Null> {
+class _LocalElementsCollector extends GeneralizingAstVisitor<void> {
final String name;
final List<LocalElement> elements = [];
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart
index 661eea2..ff84856 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart
@@ -113,7 +113,7 @@
sourceRange));
}
- Future<Null> _replaceSynthetic() async {
+ Future<void> _replaceSynthetic() async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
ClassElement classElement = element.enclosingElement;
diff --git a/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart b/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
index a0d3130..f16268b 100644
--- a/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
+++ b/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
@@ -29,7 +29,7 @@
Set<String> visitedIds = new Set<String>();
Set<String> members = new Set<String>();
- Future<Null> addMembers(ClassElement type, SubtypeResult subtype) async {
+ Future<void> addMembers(ClassElement type, SubtypeResult subtype) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (subtype != null && !visitedIds.add(subtype.id)) {
@@ -62,7 +62,7 @@
await null;
Set<ClassElement> allSubtypes = new Set<ClassElement>();
- Future<Null> addSubtypes(ClassElement type) async {
+ Future<void> addSubtypes(ClassElement type) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
List<SearchResult> directResults = await _searchDirectSubtypes(type);
diff --git a/pkg/analysis_server/lib/src/status/diagnostics.dart b/pkg/analysis_server/lib/src/status/diagnostics.dart
index 9f9f312..ba99f69 100644
--- a/pkg/analysis_server/lib/src/status/diagnostics.dart
+++ b/pkg/analysis_server/lib/src/status/diagnostics.dart
@@ -171,7 +171,7 @@
bool get showInNav => false;
@override
- Future<Null> generateContent(Map<String, String> params) async {
+ Future<void> generateContent(Map<String, String> params) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
String path = params['file'];
@@ -199,7 +199,7 @@
}
@override
- Future<Null> generatePage(Map<String, String> params) async {
+ Future<void> generatePage(Map<String, String> params) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
try {
@@ -584,7 +584,7 @@
AnalysisServer get server =>
(site as DiagnosticsSite).socketServer.analysisServer;
- Future<Null> generateContainer(Map<String, String> params) async {
+ Future<void> generateContainer(Map<String, String> params) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
buf.writeln('<div class="columns docs-layout">');
@@ -600,7 +600,7 @@
buf.writeln('</div>');
}
- Future generateContent(Map<String, String> params);
+ Future<void> generateContent(Map<String, String> params);
void generateFooter() {
buf.writeln('''
@@ -630,7 +630,7 @@
''');
}
- Future<Null> generatePage(Map<String, String> params) async {
+ Future<void> generatePage(Map<String, String> params) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
buf.writeln('<!DOCTYPE html><html lang="en">');
@@ -670,7 +670,7 @@
bool get showInNav => true;
- Future<Null> generateContainer(Map<String, String> params) async {
+ Future<void> generateContainer(Map<String, String> params) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
buf.writeln('<div class="columns docs-layout">');
@@ -768,7 +768,7 @@
bool get showInNav => false;
@override
- Future<Null> generateContent(Map<String, String> params) async {
+ Future<void> generateContent(Map<String, String> params) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
String path = params['file'];
@@ -796,7 +796,7 @@
}
@override
- Future<Null> generatePage(Map<String, String> params) async {
+ Future<void> generatePage(Map<String, String> params) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
try {
diff --git a/pkg/analysis_server/lib/src/status/pages.dart b/pkg/analysis_server/lib/src/status/pages.dart
index e727bf5..b270a3c 100644
--- a/pkg/analysis_server/lib/src/status/pages.dart
+++ b/pkg/analysis_server/lib/src/status/pages.dart
@@ -30,7 +30,7 @@
String get path => '/$id';
- Future<Null> asyncDiv(void gen(), {String classes}) async {
+ Future<void> asyncDiv(void gen(), {String classes}) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
if (classes != null) {
@@ -68,7 +68,7 @@
return buf.toString();
}
- void generatePage(Map<String, String> params);
+ Future<void> generatePage(Map<String, String> params);
void h1(String text, {String classes}) {
if (classes != null) {
@@ -146,7 +146,7 @@
Page createUnknownPage(String unknownPath);
- Future<Null> handleGetRequest(HttpRequest request) async {
+ Future<void> handleGetRequest(HttpRequest request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
try {
@@ -182,7 +182,7 @@
}
}
- Future<Null> respond(HttpRequest request, Page page,
+ Future<void> respond(HttpRequest request, Page page,
[int code = HttpStatus.ok]) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
diff --git a/pkg/analysis_server/test/abstract_single_unit.dart b/pkg/analysis_server/test/abstract_single_unit.dart
index c61e9d7..78e2280 100644
--- a/pkg/analysis_server/test/abstract_single_unit.dart
+++ b/pkg/analysis_server/test/abstract_single_unit.dart
@@ -110,7 +110,7 @@
return length;
}
- Future<Null> resolveTestUnit(String code) async {
+ Future<void> resolveTestUnit(String code) async {
addTestSource(code);
testAnalysisResult = await driver.getResult(convertPath(testFile));
testUnit = testAnalysisResult.unit;
@@ -136,7 +136,7 @@
}
}
-class _ElementsByNameFinder extends RecursiveAstVisitor<Null> {
+class _ElementsByNameFinder extends RecursiveAstVisitor<void> {
final String name;
final List<Element> elements = [];
diff --git a/pkg/analysis_server/test/analysis/notification_analyzedFiles_test.dart b/pkg/analysis_server/test/analysis/notification_analyzedFiles_test.dart
index 4132c93..7227629 100644
--- a/pkg/analysis_server/test/analysis/notification_analyzedFiles_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_analyzedFiles_test.dart
@@ -35,7 +35,7 @@
expect(analyzedFiles, isNot(contains(filePath)));
}
- Future<Null> prepareAnalyzedFiles() async {
+ Future<void> prepareAnalyzedFiles() async {
addGeneralAnalysisSubscription(GeneralAnalysisService.ANALYZED_FILES);
await pumpEventQueue(times: 5000);
}
diff --git a/pkg/analysis_server/test/analysis_abstract.dart b/pkg/analysis_server/test/analysis_abstract.dart
index c237034..f89e91d 100644
--- a/pkg/analysis_server/test/analysis_abstract.dart
+++ b/pkg/analysis_server/test/analysis_abstract.dart
@@ -283,7 +283,7 @@
}
@override
- Future<Null> addPluginToContextRoot(
+ Future<void> addPluginToContextRoot(
analyzer.ContextRoot contextRoot, String path) async {
fail('Unexpected invocation of addPluginToContextRoot');
}
@@ -323,7 +323,7 @@
}
@override
- Future<Null> restartPlugins() async {
+ Future<void> restartPlugins() async {
// Nothing to restart.
return null;
}
@@ -347,7 +347,7 @@
}
@override
- Future<List<Null>> stopAll() async {
+ Future<List<void>> stopAll() async {
fail('Unexpected invocation of stopAll');
}
}
diff --git a/pkg/analysis_server/test/domain_completion_util.dart b/pkg/analysis_server/test/domain_completion_util.dart
index 996b070..7d0721b 100644
--- a/pkg/analysis_server/test/domain_completion_util.dart
+++ b/pkg/analysis_server/test/domain_completion_util.dart
@@ -20,7 +20,7 @@
int completionOffset;
int replacementOffset;
int replacementLength;
- Map<String, Completer<Null>> receivedSuggestionsCompleters = {};
+ Map<String, Completer<void>> receivedSuggestionsCompleters = {};
List<CompletionSuggestion> suggestions = [];
bool suggestionsDone = false;
Map<String, List<CompletionSuggestion>> allSuggestions = {};
@@ -128,8 +128,8 @@
handler = new CompletionDomainHandler(server);
}
- Completer<Null> _getResultsCompleter(String id) {
+ Completer<void> _getResultsCompleter(String id) {
return receivedSuggestionsCompleters.putIfAbsent(
- id, () => new Completer<Null>());
+ id, () => new Completer<void>());
}
}
diff --git a/pkg/analysis_server/test/edit/refactoring_test.dart b/pkg/analysis_server/test/edit/refactoring_test.dart
index 346f288..7a60834 100644
--- a/pkg/analysis_server/test/edit/refactoring_test.dart
+++ b/pkg/analysis_server/test/edit/refactoring_test.dart
@@ -437,7 +437,7 @@
}
''');
- Future<Null> checkUpdate(doUpdate()) async {
+ Future<void> checkUpdate(doUpdate()) async {
await getRefactoringResult(() {
return sendStringRequest('1 + 2', 'res', true);
});
diff --git a/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart b/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart
index 655fa65..3e2fad7 100644
--- a/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart
@@ -85,7 +85,7 @@
* Check that an analysis.getImportedElements request on the region matching
* [target] produces an empty list of elements.
*/
- Future<Null> checkNoElements(String target) async {
+ Future<void> checkNoElements(String target) async {
int offset = text.indexOf(target);
AnalysisGetImportedElementsResult result =
await sendAnalysisGetImportedElements(pathname, offset, target.length);
diff --git a/pkg/analysis_server/test/integration/edit/import_elements_test.dart b/pkg/analysis_server/test/integration/edit/import_elements_test.dart
index fef3f82..c2b6972 100644
--- a/pkg/analysis_server/test/integration/edit/import_elements_test.dart
+++ b/pkg/analysis_server/test/integration/edit/import_elements_test.dart
@@ -75,7 +75,7 @@
* Check that an edit.importElements request with the given list of [elements]
* produces no edits.
*/
- Future<Null> checkNoEdits(List<ImportedElements> elements) async {
+ Future<void> checkNoEdits(List<ImportedElements> elements) async {
EditImportElementsResult result =
await sendEditImportElements(pathname, <ImportedElements>[]);
diff --git a/pkg/analysis_server/test/search/declarations_test.dart b/pkg/analysis_server/test/search/declarations_test.dart
index 6659953..d6a495d 100644
--- a/pkg/analysis_server/test/search/declarations_test.dart
+++ b/pkg/analysis_server/test/search/declarations_test.dart
@@ -186,7 +186,7 @@
assertHas('tf2', ElementKind.FUNCTION_TYPE_ALIAS);
}
- Future<Null> _getDeclarations(
+ Future<void> _getDeclarations(
{String file, String pattern, int maxResults}) async {
Request request = new SearchGetElementDeclarationsParams(
file: file, pattern: pattern, maxResults: maxResults)
diff --git a/pkg/analysis_server/test/search/element_references_test.dart b/pkg/analysis_server/test/search/element_references_test.dart
index a2281af..5450ed7 100644
--- a/pkg/analysis_server/test/search/element_references_test.dart
+++ b/pkg/analysis_server/test/search/element_references_test.dart
@@ -28,7 +28,7 @@
expect(result.isPotential, isPotential);
}
- Future<Null> findElementReferences(
+ Future<void> findElementReferences(
String search, bool includePotential) async {
int offset = findOffset(search);
await waitForTasksFinished();
diff --git a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
index 407c458..b243c9d 100644
--- a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
+++ b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
@@ -464,7 +464,7 @@
* Return a [Future] that completes with the containing library information
* after it is accessible via [context.getLibrariesContaining].
*/
- Future<Null> computeLibrariesContaining([int times = 200]) {
+ Future<void> computeLibrariesContaining([int times = 200]) {
return driver.getResult(testFile).then((result) => null);
}
diff --git a/pkg/analysis_server/test/services/correction/fix_test.dart b/pkg/analysis_server/test/services/correction/fix_test.dart
index 6d4393f..da87c3d 100644
--- a/pkg/analysis_server/test/services/correction/fix_test.dart
+++ b/pkg/analysis_server/test/services/correction/fix_test.dart
@@ -7937,7 +7937,7 @@
await _assertNoFix(kind, error);
}
- Future<Null> findLint(String src, String lintCode, {int length: 1}) async {
+ Future<void> findLint(String src, String lintCode, {int length: 1}) async {
int errorOffset = src.indexOf('/*LINT*/');
await resolveTestUnit(src.replaceAll('/*LINT*/', ''));
error = new AnalysisError(
diff --git a/pkg/analysis_server/test/services/correction/organize_directives_test.dart b/pkg/analysis_server/test/services/correction/organize_directives_test.dart
index 15de1b9..cf5adfb 100644
--- a/pkg/analysis_server/test/services/correction/organize_directives_test.dart
+++ b/pkg/analysis_server/test/services/correction/organize_directives_test.dart
@@ -334,7 +334,7 @@
expect(result, expectedCode);
}
- Future<Null> _computeUnitAndErrors(String code) async {
+ Future<void> _computeUnitAndErrors(String code) async {
addTestSource(code);
AnalysisResult result = await driver.getResult(testSource.fullName);
testUnit = result.unit;
diff --git a/pkg/analysis_server/test/services/correction/sort_members_test.dart b/pkg/analysis_server/test/services/correction/sort_members_test.dart
index a299f93..88942ee 100644
--- a/pkg/analysis_server/test/services/correction/sort_members_test.dart
+++ b/pkg/analysis_server/test/services/correction/sort_members_test.dart
@@ -803,7 +803,7 @@
expect(result, expectedCode);
}
- Future<Null> _parseTestUnit(String code) async {
+ Future<void> _parseTestUnit(String code) async {
addTestSource(code);
ParseResult result = await driver.parseFile(testSource.fullName);
testUnit = result.unit;
diff --git a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
index 2685442..7acb0ce 100644
--- a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
+++ b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
@@ -159,11 +159,11 @@
.resolveCompilationUnit(element.source, element.library);
}
- Future<Null> indexTestUnit(String code) async {
+ Future<void> indexTestUnit(String code) async {
await resolveTestUnit(code);
}
- Future<Null> indexUnit(String file, String code) async {
+ Future<void> indexUnit(String file, String code) async {
addSource(file, code);
}
diff --git a/pkg/analysis_server/test/services/search/hierarchy_test.dart b/pkg/analysis_server/test/services/search/hierarchy_test.dart
index e4a5e08..b36529c 100644
--- a/pkg/analysis_server/test/services/search/hierarchy_test.dart
+++ b/pkg/analysis_server/test/services/search/hierarchy_test.dart
@@ -446,7 +446,7 @@
}
}
- Future<Null> _indexTestUnit(String code) async {
+ Future<void> _indexTestUnit(String code) async {
await resolveTestUnit(code);
}
}
diff --git a/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart b/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart
index 939f15b..631177c 100644
--- a/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart
@@ -38,7 +38,7 @@
expect(sourceFileEdit, isNull);
}
- Future<Null> computeChanges(List<ImportedElements> importedElements) async {
+ Future<void> computeChanges(List<ImportedElements> importedElements) async {
SourceChange change = await computer.createEdits(importedElements);
expect(change, isNotNull);
List<SourceFileEdit> edits = change.edits;
@@ -50,7 +50,7 @@
}
}
- Future<Null> createBuilder(String content) async {
+ Future<void> createBuilder(String content) async {
originalContent = content;
newFile(path, content: content);
AnalysisResult result = await driver.getResult(path);
diff --git a/pkg/analysis_server/test/src/plugin/plugin_manager_test.dart b/pkg/analysis_server/test/src/plugin/plugin_manager_test.dart
index 2448c48..6837470 100644
--- a/pkg/analysis_server/test/src/plugin/plugin_manager_test.dart
+++ b/pkg/analysis_server/test/src/plugin/plugin_manager_test.dart
@@ -672,10 +672,10 @@
* content that implements a minimal plugin if the contents are not given. The
* [test] function will be passed the path of the directory that was created.
*/
- Future<Null> withPlugin(
+ Future<void> withPlugin(
{String content,
String pluginName,
- Future<Null> test(String pluginPath)}) async {
+ Future<void> test(String pluginPath)}) async {
io.Directory tempDirectory =
io.Directory.systemTemp.createTempSync(pluginName ?? 'test_plugin');
try {
@@ -720,10 +720,10 @@
* content that implements a minimal plugin if the contents are not given. The
* [test] function will be passed the path of the directory that was created.
*/
- Future<Null> withPubspecPlugin(
+ Future<void> withPubspecPlugin(
{String content,
String pluginName,
- Future<Null> test(String pluginPath)}) async {
+ Future<void> test(String pluginPath)}) async {
io.Directory tempDirectory =
io.Directory.systemTemp.createTempSync(pluginName ?? 'test_plugin');
try {
diff --git a/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart b/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart
index 4798194..6029159 100644
--- a/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart
+++ b/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart
@@ -148,7 +148,7 @@
Stream<AnalysisResult> get results => _resultController.stream;
- Future<Null> computeResult(String uri) {
+ Future<void> computeResult(String uri) {
FileState file = fsState.getFileForUri(Uri.parse(uri));
AnalysisResult result = new AnalysisResult(this, null, file.path, null,
true, null, null, false, null, null, null, null);
@@ -165,7 +165,7 @@
List<ContextRoot> removedContextRoots = <ContextRoot>[];
@override
- Future<Null> addPluginToContextRoot(
+ Future<void> addPluginToContextRoot(
ContextRoot contextRoot, String path) async {
addedContextRoots.add(contextRoot);
return null;
diff --git a/pkg/analysis_server/test/stress/replay/replay.dart b/pkg/analysis_server/test/stress/replay/replay.dart
index 36ef8fd..d713f0a 100644
--- a/pkg/analysis_server/test/stress/replay/replay.dart
+++ b/pkg/analysis_server/test/stress/replay/replay.dart
@@ -29,7 +29,7 @@
/**
* Run the simulation based on the given command-line [arguments].
*/
-Future<Null> main(List<String> arguments) async {
+Future<void> main(List<String> arguments) async {
Driver driver = new Driver();
await driver.run(arguments);
}
@@ -135,14 +135,14 @@
/**
* Allow the output from the server to be read and processed.
*/
- Future<Null> readServerOutput() async {
+ Future<void> readServerOutput() async {
await new Future.delayed(new Duration(milliseconds: 2));
}
/**
* Run the simulation based on the given command-line arguments ([args]).
*/
- Future<Null> run(List<String> args) async {
+ Future<void> run(List<String> args) async {
//
// Process the command-line arguments.
//
@@ -358,7 +358,7 @@
/**
* Replay the changes in each commit.
*/
- Future<Null> _replayChanges() async {
+ Future<void> _replayChanges() async {
//
// Get the revision history of the repo.
//
@@ -428,7 +428,7 @@
* Replay the changes between two commits, as represented by the given
* [commitDelta].
*/
- Future<Null> _replayDiff(CommitDelta commitDelta) async {
+ Future<void> _replayDiff(CommitDelta commitDelta) async {
List<FileEdit> editList = <FileEdit>[];
for (DiffRecord record in commitDelta.diffRecords) {
FileEdit edit = new FileEdit(overlayStyle, record);
@@ -475,7 +475,7 @@
/**
* Run the simulation by starting up a server and sending it requests.
*/
- Future<Null> _runSimulation() async {
+ Future<void> _runSimulation() async {
server = new Server(logger: logger);
Stopwatch stopwatch = new Stopwatch();
statistics.stopwatch = stopwatch;
diff --git a/pkg/analysis_server/test/stress/utilities/server.dart b/pkg/analysis_server/test/stress/utilities/server.dart
index 0beb104..ccd2ac5 100644
--- a/pkg/analysis_server/test/stress/utilities/server.dart
+++ b/pkg/analysis_server/test/stress/utilities/server.dart
@@ -211,13 +211,13 @@
* The completer that will be completed the next time a 'server.status'
* notification is received from the server with 'analyzing' set to false.
*/
- Completer<Null> _analysisFinishedCompleter;
+ Completer<void> _analysisFinishedCompleter;
/**
* The completer that will be completed the next time a 'server.connected'
* notification is received from the server.
*/
- Completer<Null> _serverConnectedCompleter;
+ Completer<void> _serverConnectedCompleter;
/**
* A table mapping the ids of requests that have been sent to the server to
@@ -251,7 +251,7 @@
*/
Future get analysisFinished {
if (_analysisFinishedCompleter == null) {
- _analysisFinishedCompleter = new Completer();
+ _analysisFinishedCompleter = new Completer<void>();
}
return _analysisFinishedCompleter.future;
}
@@ -619,7 +619,7 @@
* If [useAnalysisHighlight2] is `true`, the server will use the new highlight
* APIs.
*/
- Future<Null> start(
+ Future<void> start(
{bool checked: true,
int diagnosticPort,
bool profileServer: false,
@@ -680,7 +680,7 @@
}
});
_listenToOutput();
- _serverConnectedCompleter = new Completer();
+ _serverConnectedCompleter = new Completer<void>();
return _serverConnectedCompleter.future;
}
diff --git a/pkg/analysis_server/tool/instrumentation/server.dart b/pkg/analysis_server/tool/instrumentation/server.dart
index 558cac1..bfeb7cc 100644
--- a/pkg/analysis_server/tool/instrumentation/server.dart
+++ b/pkg/analysis_server/tool/instrumentation/server.dart
@@ -152,7 +152,7 @@
/**
* Handle a POST [request] received by the HTTP server.
*/
- Future<Null> _handlePostRequest(HttpRequest request) async {
+ Future<void> _handlePostRequest(HttpRequest request) async {
_returnUnknownRequest(request);
}
@@ -181,8 +181,8 @@
response.statusCode = HttpStatus.notFound;
response.headers.contentType =
new ContentType("text", "html", charset: "utf-8");
- response.write('<html><head></head><body><h3>Page not found: "${request.uri
- .path}".</h3></body></html>');
+ response.write(
+ '<html><head></head><body><h3>Page not found: "${request.uri.path}".</h3></body></html>');
response.close();
}
