CQ. Remove unnecessary 'async' where no 'await'.
Change-Id: I58f56c098c9cec753325ab56d0aad37e1fde0ec6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/403082
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/benchmark/integration/driver.dart b/pkg/analysis_server/benchmark/integration/driver.dart
index 07882b8..f551d70 100644
--- a/pkg/analysis_server/benchmark/integration/driver.dart
+++ b/pkg/analysis_server/benchmark/integration/driver.dart
@@ -70,7 +70,7 @@
/// Launch the analysis server.
///
/// Return a [Future] that completes when analysis server has started.
- Future<void> startServer() async {
+ Future<void> startServer() {
logger.log(Level.FINE, 'starting server');
server = Server();
var serverConnected = Completer<void>();
diff --git a/pkg/analysis_server/lib/src/cider/completion.dart b/pkg/analysis_server/lib/src/cider/completion.dart
index 6420567..4cb286ee 100644
--- a/pkg/analysis_server/lib/src/cider/completion.dart
+++ b/pkg/analysis_server/lib/src/cider/completion.dart
@@ -55,11 +55,11 @@
required int column,
@visibleForTesting
void Function(ResolvedForCompletionResultImpl)? testResolvedUnit,
- }) async {
+ }) {
return _performanceRoot.runAsync('completion', (performance) async {
var resolvedUnit = await performance.runAsync('resolution', (
performance,
- ) async {
+ ) {
return _fileResolver.resolveForCompletion(
completionLine: line,
completionColumn: column,
diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
index 4409bc4..7b3b158 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -553,7 +553,7 @@
/// rebuild will occur only once it has exited.
///
/// Returns a [Future] that completes once the requested rebuild completes.
- Future<void> _createAnalysisContexts() async {
+ Future<void> _createAnalysisContexts() {
/// A helper that performs a context rebuild while monitoring the included
/// paths for changes until the contexts file watchers are ready.
///
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart
index 2ae8777..6366d13 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart
@@ -39,7 +39,7 @@
CodeActionParams params,
MessageInfo message,
CancellationToken token,
- ) async {
+ ) {
var performance = message.performance;
var textDocument = params.textDocument;
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_semantic_tokens.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_semantic_tokens.dart
index 27aef5a..b296b99 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_semantic_tokens.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_semantic_tokens.dart
@@ -58,7 +58,7 @@
TextDocumentIdentifier textDocument,
CancellationToken token, {
Range? range,
- }) async {
+ }) {
var path = pathOfDoc(textDocument);
return path.mapResult((path) async {
diff --git a/pkg/analysis_server/lib/src/lsp/temporary_overlay_operation.dart b/pkg/analysis_server/lib/src/lsp/temporary_overlay_operation.dart
index 4acf203..811ee93 100644
--- a/pkg/analysis_server/lib/src/lsp/temporary_overlay_operation.dart
+++ b/pkg/analysis_server/lib/src/lsp/temporary_overlay_operation.dart
@@ -86,7 +86,7 @@
/// temporary overlays and re-enabled after the overlays are restored.
Future<T> lockRequestsWithTemporaryOverlays<T>(
Future<T> Function() operation,
- ) async {
+ ) {
return server.lockRequestsWhile(() async {
// Wait for any in-progress analysis to complete before we start
// suppressing analysis results.
diff --git a/pkg/analysis_server/lib/src/search/element_references.dart b/pkg/analysis_server/lib/src/search/element_references.dart
index 2fd41bd..42ad32a 100644
--- a/pkg/analysis_server/lib/src/search/element_references.dart
+++ b/pkg/analysis_server/lib/src/search/element_references.dart
@@ -68,9 +68,7 @@
}
/// Returns a [Future] completing with a [List] of references to [element].
- Future<List<SearchMatch>> _findSingleElementReferences(
- Element2 element,
- ) async {
+ Future<List<SearchMatch>> _findSingleElementReferences(Element2 element) {
return searchEngine.searchReferences(element);
}
diff --git a/pkg/analysis_server/lib/src/server/driver.dart b/pkg/analysis_server/lib/src/server/driver.dart
index 75f1684..28b9aea 100644
--- a/pkg/analysis_server/lib/src/server/driver.dart
+++ b/pkg/analysis_server/lib/src/server/driver.dart
@@ -512,7 +512,7 @@
capture(instrumentationService, () {
var stdioServer = LspStdioAnalysisServer(socketServer);
- stdioServer.serveStdio().then((_) async {
+ stdioServer.serveStdio().then((_) {
// Only shutdown the server and exit if the server is not already
// handling the shutdown.
if (!socketServer.analysisServer!.willExit) {
diff --git a/pkg/analysis_server/lib/src/server/http_server.dart b/pkg/analysis_server/lib/src/server/http_server.dart
index 91dd513..b2f91fd 100644
--- a/pkg/analysis_server/lib/src/server/http_server.dart
+++ b/pkg/analysis_server/lib/src/server/http_server.dart
@@ -93,7 +93,7 @@
/// Attach a listener to a newly created HTTP server.
void _handleServer(HttpServer httpServer) {
- httpServer.listen((HttpRequest request) async {
+ httpServer.listen((HttpRequest request) {
var updateValues = request.headers[HttpHeaders.upgradeHeader];
if (request.method == 'GET') {
_httpHandler.handleGetRequest(request);
diff --git a/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart b/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
index 2515696..b039816 100644
--- a/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
+++ b/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
@@ -133,7 +133,7 @@
static Future<PostfixCompletion?> expandAssert(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(kind, processor.findAssertExpression, (expr) {
return 'assert(${processor.utils.getNodeText(expr)});';
}, withBraces: false);
@@ -142,7 +142,7 @@
static Future<PostfixCompletion?> expandElse(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(
kind,
processor.findBoolExpression,
@@ -153,7 +153,7 @@
static Future<PostfixCompletion?> expandFor(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(kind, processor.findIterableExpression, (expr) {
var value = processor.newVariable('value');
return 'for (var $value in ${processor.utils.getNodeText(expr)})';
@@ -163,7 +163,7 @@
static Future<PostfixCompletion?> expandFori(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(kind, processor.findIntExpression, (expr) {
var index = processor.newVariable('i');
return 'for (int $index = 0; $index < ${processor.utils.getNodeText(expr)}; $index++)';
@@ -173,7 +173,7 @@
static Future<PostfixCompletion?> expandIf(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(
kind,
processor.findBoolExpression,
@@ -184,7 +184,7 @@
static Future<PostfixCompletion?> expandNegate(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(
kind,
processor.findBoolExpression,
@@ -196,7 +196,7 @@
static Future<PostfixCompletion?> expandNotNull(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(kind, processor.findObjectExpression, (expr) {
return expr is NullLiteral
? 'if (false)'
@@ -207,7 +207,7 @@
static Future<PostfixCompletion?> expandNull(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(kind, processor.findObjectExpression, (expr) {
return expr is NullLiteral
? 'if (true)'
@@ -218,7 +218,7 @@
static Future<PostfixCompletion?> expandParen(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(
kind,
processor.findObjectExpression,
@@ -230,7 +230,7 @@
static Future<PostfixCompletion?> expandReturn(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(
kind,
processor.findObjectExpression,
@@ -242,7 +242,7 @@
static Future<PostfixCompletion?> expandSwitch(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(
kind,
processor.findObjectExpression,
@@ -253,21 +253,21 @@
static Future<PostfixCompletion?> expandTry(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expandTry(kind, processor.findStatement);
}
static Future<PostfixCompletion?> expandTryon(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expandTry(kind, processor.findStatement, withOn: true);
}
static Future<PostfixCompletion?> expandWhile(
PostfixCompletionProcessor processor,
PostfixCompletionKind kind,
- ) async {
+ ) {
return processor.expand(
kind,
processor.findBoolExpression,
diff --git a/pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart b/pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart
index e53e875..4a7ae9a 100644
--- a/pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart
+++ b/pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart
@@ -1100,7 +1100,7 @@
OperationPerformanceImpl performance,
String path, {
required bool autoTriggered,
- }) async {
+ }) {
return performance.runAsync('IterativeBulkFixProcessor.fixErrorsForFile', (
performance,
) async {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/remove_const.dart b/pkg/analysis_server/lib/src/services/correction/dart/remove_const.dart
index 08ebd21..ee04dfd 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/remove_const.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/remove_const.dart
@@ -134,12 +134,12 @@
if (constKeyword != null) {
switch (constantContext.$1) {
case InstanceCreationExpression contextNode:
- await builder.addDartFileEdit(file, (builder) async {
+ await builder.addDartFileEdit(file, (builder) {
_deleteToken(builder, constKeyword);
contextNode.accept(_PushConstVisitor(builder, expression));
});
case TypedLiteral contextNode:
- await builder.addDartFileEdit(file, (builder) async {
+ await builder.addDartFileEdit(file, (builder) {
_deleteToken(builder, constKeyword);
contextNode.accept(_PushConstVisitor(builder, expression));
});
diff --git a/pkg/analysis_server/lib/src/services/dart_tooling_daemon/dtd_services.dart b/pkg/analysis_server/lib/src/services/dart_tooling_daemon/dtd_services.dart
index a726089..4899305 100644
--- a/pkg/analysis_server/lib/src/services/dart_tooling_daemon/dtd_services.dart
+++ b/pkg/analysis_server/lib/src/services/dart_tooling_daemon/dtd_services.dart
@@ -84,7 +84,7 @@
IncomingMessage message,
OperationPerformanceImpl performance,
Completer<Map<String, Object?>> completer,
- Completer<void> schedulerCompleter,
+ Completer<void> schedulerCompleter,
) async {
var info = MessageInfo(
performance: performance,
@@ -189,7 +189,7 @@
Method method,
Parameters params,
OperationPerformanceImpl performance,
- ) async {
+ ) {
// Map the incoming request into types we use for LSP request handling.
var message = IncomingMessage(
jsonrpc: jsonRpcVersion,
diff --git a/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart b/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart
index 0d430eb..7de2c63 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart
@@ -36,7 +36,7 @@
/// Continues analysis of the selection in [available], and returns either
/// a [ValidSelectionState], or one of [ErrorSelectionState] subtypes.
-Future<SelectionState> analyzeSelection({required Available available}) async {
+Future<SelectionState> analyzeSelection({required Available available}) {
return _SelectionAnalyzer(available: available).analyze();
}
diff --git a/pkg/analysis_server/test/analysis/get_signature_test.dart b/pkg/analysis_server/test/analysis/get_signature_test.dart
index b18dc23..433b81b 100644
--- a/pkg/analysis_server/test/analysis/get_signature_test.dart
+++ b/pkg/analysis_server/test/analysis/get_signature_test.dart
@@ -21,7 +21,7 @@
return prepareRawSignatureAt(offset);
}
- Future<Response> prepareRawSignatureAt(int offset, {String? file}) async {
+ Future<Response> prepareRawSignatureAt(int offset, {String? file}) {
var request = AnalysisGetSignatureParams(
file ?? testFile.path,
offset,
diff --git a/pkg/analysis_server/test/domain_completion_test.dart b/pkg/analysis_server/test/domain_completion_test.dart
index 5991bb8..906b9a1 100644
--- a/pkg/analysis_server/test/domain_completion_test.dart
+++ b/pkg/analysis_server/test/domain_completion_test.dart
@@ -242,7 +242,7 @@
String content, {
required String completion,
required String libraryUri,
- }) async {
+ }) {
return _getCodeDetails(
path: convertPath(testFilePath),
content: content,
diff --git a/pkg/analysis_server/test/edit/refactoring_test.dart b/pkg/analysis_server/test/edit/refactoring_test.dart
index a364dab..c722009 100644
--- a/pkg/analysis_server/test/edit/refactoring_test.dart
+++ b/pkg/analysis_server/test/edit/refactoring_test.dart
@@ -933,7 +933,7 @@
}
/// Tests that there is a RENAME refactoring available at the [search] offset.
- Future<void> assertHasRenameRefactoring(String code, String search) async {
+ Future<void> assertHasRenameRefactoring(String code, String search) {
return assertHasKind(code, search, RefactoringKind.RENAME, true);
}
@@ -1516,7 +1516,7 @@
import 'original_folder/file.dart';
''');
_setOptions('$testPackageLibPath/new_folder');
- return assertEmptySuccessfulRefactoring(() async {
+ return assertEmptySuccessfulRefactoring(() {
return _sendAndCancelMoveRequest(
getFolder('$testPackageLibPath/original_folder').path,
);
@@ -1531,7 +1531,7 @@
''');
_setOptions('$testPackageLibPath/new_folder');
return assertSuccessfulRefactoring(
- () async {
+ () {
return _sendMoveRequest(
getFolder('$testPackageLibPath/original_folder').path,
);
diff --git a/pkg/analysis_server/test/edit/sort_members_test.dart b/pkg/analysis_server/test/edit/sort_members_test.dart
index 097f8ee..94d51ff 100644
--- a/pkg/analysis_server/test/edit/sort_members_test.dart
+++ b/pkg/analysis_server/test/edit/sort_members_test.dart
@@ -109,7 +109,7 @@
''');
}
- Future<void> test_OK_classMembers_method() async {
+ Future<void> test_OK_classMembers_method() {
addTestFile('''
class A {
c() {}
@@ -126,7 +126,7 @@
''');
}
- Future<void> test_OK_directives() async {
+ Future<void> test_OK_directives() {
addTestFile('''
library lib;
@@ -177,7 +177,7 @@
''');
}
- Future<void> test_OK_directives_withAnnotation() async {
+ Future<void> test_OK_directives_withAnnotation() {
addTestFile('''
library lib;
@@ -211,7 +211,7 @@
''');
}
- Future<void> test_OK_genericFunctionType() async {
+ Future<void> test_OK_genericFunctionType() {
addTestFile('''
class C {
void caller() {
@@ -278,7 +278,7 @@
''');
}
- Future<void> test_OK_unitMembers_class() async {
+ Future<void> test_OK_unitMembers_class() {
addTestFile('''
class C {}
class A {}
diff --git a/pkg/analysis_server/test/integration/analysis/get_hover_test.dart b/pkg/analysis_server/test/integration/analysis/get_hover_test.dart
index d7c2273..b4cbdb4 100644
--- a/pkg/analysis_server/test/integration/analysis/get_hover_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/get_hover_test.dart
@@ -65,7 +65,7 @@
Matcher? parameter = isNull,
}) {
var offset = text.indexOf(target);
- return sendAnalysisGetHover(pathname, offset).then((result) async {
+ return sendAnalysisGetHover(pathname, offset).then((result) {
expect(result.hovers, hasLength(1));
var info = result.hovers[0];
expect(info.offset, equals(offset));
diff --git a/pkg/analysis_server/test/integration/server/message_scheduler_test.dart b/pkg/analysis_server/test/integration/server/message_scheduler_test.dart
index 15c0bad..2e50de8 100644
--- a/pkg/analysis_server/test/integration/server/message_scheduler_test.dart
+++ b/pkg/analysis_server/test/integration/server/message_scheduler_test.dart
@@ -303,7 +303,7 @@
// Respond to any applyEdit requests from the server with successful responses
// and capturing the last edit.
- requestsFromServer.listen((request) async {
+ requestsFromServer.listen((request) {
if (request.method == Method.workspace_applyEdit) {
ApplyWorkspaceEditParams.fromJson(
request.params as Map<String, Object?>,
diff --git a/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart b/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart
index 84d6ced..b1275cc 100644
--- a/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart
+++ b/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart
@@ -170,7 +170,7 @@
// Respond to any applyEdit requests from the server with successful responses
// and capturing the last edit.
late WorkspaceEdit edit;
- requestsFromServer.listen((request) async {
+ requestsFromServer.listen((request) {
if (request.method == Method.workspace_applyEdit) {
var params = ApplyWorkspaceEditParams.fromJson(
request.params as Map<String, Object?>,
diff --git a/pkg/analysis_server/test/lsp/rename_test.dart b/pkg/analysis_server/test/lsp/rename_test.dart
index 4748d73..c0510e9 100644
--- a/pkg/analysis_server/test/lsp/rename_test.dart
+++ b/pkg/analysis_server/test/lsp/rename_test.dart
@@ -30,7 +30,7 @@
return _test_prepare(content, 'MyClass');
}
- Future<void> test_prepare_class_newKeyword() async {
+ Future<void> test_prepare_class_newKeyword() {
const content = '''
class MyClass {}
final a = n^ew [!MyClass!]();
@@ -47,7 +47,7 @@
return _test_prepare(content, 'MyClass');
}
- Future<void> test_prepare_class_typeParameter_atDeclaration() async {
+ Future<void> test_prepare_class_typeParameter_atDeclaration() {
const content = '''
class A<[!T^!]> {
final List<T> values = [];
@@ -57,7 +57,7 @@
return _test_prepare(content, 'T');
}
- Future<void> test_prepare_class_typeParameter_atReference() async {
+ Future<void> test_prepare_class_typeParameter_atReference() {
const content = '''
class A<T> {
final List<[!T^!]> values = [];
@@ -92,7 +92,7 @@
return _test_prepare(content, 'one');
}
- Future<void> test_prepare_extensionType_onName_begin() async {
+ Future<void> test_prepare_extensionType_onName_begin() {
const content = '''
extension type [!^MyType!](int it) {}
''';
@@ -100,7 +100,7 @@
return _test_prepare(content, 'MyType');
}
- Future<void> test_prepare_extensionType_onName_end() async {
+ Future<void> test_prepare_extensionType_onName_end() {
const content = '''
extension type [!MyType^!](int it) {}
''';
@@ -108,7 +108,7 @@
return _test_prepare(content, 'MyType');
}
- Future<void> test_prepare_extensionType_onName_inside() async {
+ Future<void> test_prepare_extensionType_onName_inside() {
const content = '''
extension type [!My^Type!](int it) {}
''';
@@ -132,7 +132,7 @@
return _test_prepare(content, 'aaaa');
}
- Future<void> test_prepare_importPrefix() async {
+ Future<void> test_prepare_importPrefix() {
const content = '''
import 'dart:async' as [!myPr^efix!];
''';
@@ -140,7 +140,7 @@
return _test_prepare(content, 'myPrefix');
}
- Future<void> test_prepare_importWithoutPrefix() async {
+ Future<void> test_prepare_importWithoutPrefix() {
const content = '''
imp[!^!]ort 'dart:async';
''';
@@ -148,7 +148,7 @@
return _test_prepare(content, '');
}
- Future<void> test_prepare_importWithPrefix() async {
+ Future<void> test_prepare_importWithPrefix() {
const content = '''
imp^ort 'dart:async' as [!myPrefix!];
''';
@@ -156,7 +156,7 @@
return _test_prepare(content, 'myPrefix');
}
- Future<void> test_prepare_invalidRenameLocation() async {
+ Future<void> test_prepare_invalidRenameLocation() {
const content = '''
void f() {
// comm^ent
@@ -210,7 +210,7 @@
expect(response.error!.message, contains('is defined in the SDK'));
}
- Future<void> test_prepare_variable() async {
+ Future<void> test_prepare_variable() {
const content = '''
void f() {
var variable = 0;
@@ -221,7 +221,7 @@
return _test_prepare(content, 'variable');
}
- Future<void> test_prepare_variable_forEach_statement() async {
+ Future<void> test_prepare_variable_forEach_statement() {
const content = '''
void f(List<int> values) {
for (final [!value^!] in values) {
@@ -290,7 +290,7 @@
);
}
- Future<void> test_rename_class_doesRenameFile_afterPrompt() async {
+ Future<void> test_rename_class_doesRenameFile_afterPrompt() {
const content = '''
class Main {}
final a = new [!Ma^in!]();
diff --git a/pkg/analysis_server/test/lsp/request_helpers_mixin.dart b/pkg/analysis_server/test/lsp/request_helpers_mixin.dart
index 50dd536..093736c 100644
--- a/pkg/analysis_server/test/lsp/request_helpers_mixin.dart
+++ b/pkg/analysis_server/test/lsp/request_helpers_mixin.dart
@@ -99,7 +99,7 @@
requestsFromServer
.where((r) => r.method == Method.window_workDoneProgress_create)
- .listen((request) async {
+ .listen((request) {
var params = WorkDoneProgressCreateParams.fromJson(
request.params as Map<String, Object?>,
);
diff --git a/pkg/analysis_server/test/lsp/server_abstract.dart b/pkg/analysis_server/test/lsp/server_abstract.dart
index f00321b..fd8512a 100644
--- a/pkg/analysis_server/test/lsp/server_abstract.dart
+++ b/pkg/analysis_server/test/lsp/server_abstract.dart
@@ -214,8 +214,8 @@
List<TextDocumentEdit> extractTextDocumentEdits(
DocumentChanges documentChanges,
) =>
- // Extract TextDocumentEdits from union of resource changes
- documentChanges
+ // Extract TextDocumentEdits from union of resource changes
+ documentChanges
.map(
(change) => change.map(
(create) => null,
@@ -323,7 +323,7 @@
httpClient: httpClient,
processRunner: processRunner,
dartFixPromptManager: dartFixPromptManager,
- retainDataForTesting: retainDataForTesting,
+ retainDataForTesting: retainDataForTesting,
);
errorNotifier.server = server;
server.pluginManager = pluginManager;
@@ -1057,9 +1057,7 @@
await sendNotificationToServer(notification);
}
- Future<Object?> executeCodeAction(
- Either2<Command, CodeAction> codeAction,
- ) async {
+ Future<Object?> executeCodeAction(Either2<Command, CodeAction> codeAction) {
var command = codeAction.map(
(command) => command,
(codeAction) => codeAction.command!,
@@ -1071,7 +1069,7 @@
Command command, {
T Function(Map<String, Object?>)? decoder,
ProgressToken? workDoneToken,
- }) async {
+ }) {
var supportedCommands =
_serverCapabilities?.executeCommandProvider?.commands ?? [];
if (!supportedCommands.contains(command.command)) {
@@ -1677,7 +1675,7 @@
return closingLabelsParams.labels;
}
- Future<List<Diagnostic>?> waitForDiagnostics(Uri uri) async {
+ Future<List<Diagnostic>?> waitForDiagnostics(Uri uri) {
return publishedDiagnostics
.where((params) => params.uri == uri)
.map<List<Diagnostic>?>((params) => params.diagnostics)
diff --git a/pkg/analysis_server/test/lsp/server_test.dart b/pkg/analysis_server/test/lsp/server_test.dart
index 13b3312..a4e23f4 100644
--- a/pkg/analysis_server/test/lsp/server_test.dart
+++ b/pkg/analysis_server/test/lsp/server_test.dart
@@ -148,7 +148,7 @@
failTestOnAnyErrorNotification = false;
await initialize();
- var error = await expectErrorNotification(() async {
+ var error = await expectErrorNotification(() {
errorNotifier.logException(Exception('dummy exception'));
});
@@ -161,7 +161,7 @@
failTestOnAnyErrorNotification = false;
await initialize();
- var error = await expectErrorNotification(() async {
+ var error = await expectErrorNotification(() {
server.sendServerErrorNotification(
'message',
Exception('dummy exception'),
diff --git a/pkg/analysis_server/test/services/user_prompts/survey_manager_test.dart b/pkg/analysis_server/test/services/user_prompts/survey_manager_test.dart
index bffc0864..c21f50b 100644
--- a/pkg/analysis_server/test/services/user_prompts/survey_manager_test.dart
+++ b/pkg/analysis_server/test/services/user_prompts/survey_manager_test.dart
@@ -234,7 +234,7 @@
});
@override
- Future<void> checkForSurveys() async {
+ Future<void> checkForSurveys() {
numberOfChecksPerformed++;
return super.checkForSurveys();
}
diff --git a/pkg/analysis_server/test/src/cider/document_symbols_test.dart b/pkg/analysis_server/test/src/cider/document_symbols_test.dart
index d2a0dda..43a2599 100644
--- a/pkg/analysis_server/test/src/cider/document_symbols_test.dart
+++ b/pkg/analysis_server/test/src/cider/document_symbols_test.dart
@@ -304,7 +304,7 @@
);
}
- Future<List<DocumentSymbol>> _compute(String content) async {
+ Future<List<DocumentSymbol>> _compute(String content) {
newFile(testPath, content);
return CiderDocumentSymbolsComputer(
fileResolver,
diff --git a/pkg/analysis_server/test/src/cider/rename_test.dart b/pkg/analysis_server/test/src/cider/rename_test.dart
index d35d4d4..dfe172b 100644
--- a/pkg/analysis_server/test/src/cider/rename_test.dart
+++ b/pkg/analysis_server/test/src/cider/rename_test.dart
@@ -904,7 +904,7 @@
return canRename?.checkNewName(newName);
}
- Future<CanRenameResponse?> _compute(String content) async {
+ Future<CanRenameResponse?> _compute(String content) {
_updateFile(content);
return CiderRenameComputer(fileResolver).canRename2(
diff --git a/pkg/analysis_server/test/src/cider/signature_help_test.dart b/pkg/analysis_server/test/src/cider/signature_help_test.dart
index a23ae4e..8aa4d3e 100644
--- a/pkg/analysis_server/test/src/cider/signature_help_test.dart
+++ b/pkg/analysis_server/test/src/cider/signature_help_test.dart
@@ -191,7 +191,7 @@
expect(result.callStart == leftParenLocation, isTrue);
}
- Future<SignatureHelpResponse?> _compute(String content) async {
+ Future<SignatureHelpResponse?> _compute(String content) {
_updateFile(content);
return CiderSignatureHelpComputer(fileResolver).compute2(
diff --git a/pkg/analysis_server/test/src/services/flutter/widget_description.dart b/pkg/analysis_server/test/src/services/flutter/widget_description.dart
index 11d1843..bb5cd399 100644
--- a/pkg/analysis_server/test/src/services/flutter/widget_description.dart
+++ b/pkg/analysis_server/test/src/services/flutter/widget_description.dart
@@ -50,7 +50,7 @@
Future<protocol.FlutterGetWidgetDescriptionResult?> getDescription(
String search,
- ) async {
+ ) {
var content = testAnalysisResult.content;
var offset = content.indexOf(search);
diff --git a/pkg/analysis_server/test/src/utilities/profiling_test.dart b/pkg/analysis_server/test/src/utilities/profiling_test.dart
index 1d66d7f..670bfff 100644
--- a/pkg/analysis_server/test/src/utilities/profiling_test.dart
+++ b/pkg/analysis_server/test/src/utilities/profiling_test.dart
@@ -10,7 +10,7 @@
void main() {
group('ProcessProfiler', () {
- test('getProfilerForPlatform', () async {
+ test('getProfilerForPlatform', () {
expect(ProcessProfiler.getProfilerForPlatform(), isNotNull);
});
diff --git a/pkg/analysis_server/test/verify_sorted_test.dart b/pkg/analysis_server/test/verify_sorted_test.dart
index 89be1cf..93fc172 100644
--- a/pkg/analysis_server/test/verify_sorted_test.dart
+++ b/pkg/analysis_server/test/verify_sorted_test.dart
@@ -144,7 +144,7 @@
continue;
}
var relativePath = pathContext.relative(path, from: testDirPath);
- test(relativePath, () async {
+ test(relativePath, () {
var result = session.getParsedUnit(path);
if (result is! ParsedUnitResult) {
fail('Could not parse $path');
diff --git a/pkg/analysis_server_plugin/lib/edit/fix/dart_fix_context.dart b/pkg/analysis_server_plugin/lib/edit/fix/dart_fix_context.dart
index f0652e5..a488fa8 100644
--- a/pkg/analysis_server_plugin/lib/edit/fix/dart_fix_context.dart
+++ b/pkg/analysis_server_plugin/lib/edit/fix/dart_fix_context.dart
@@ -55,8 +55,7 @@
/// this library, and has the requested base name.
///
/// For getters and setters the corresponding top-level variable is returned.
- Future<Map<LibraryElement2, Element2>> getTopLevelDeclarations(
- String name) async {
+ Future<Map<LibraryElement2, Element2>> getTopLevelDeclarations(String name) {
return TopLevelDeclarations(unitResult).withName(name);
}
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
index 01fa4e1..38b40fe 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -711,7 +711,7 @@
}
/// Notify the driver that the client is going to stop using it.
- Future<void> dispose2() async {
+ Future<void> dispose2() {
var completer = Completer<void>();
_disposed = true;
_disposeRequests.add(completer);
@@ -784,7 +784,7 @@
///
/// This method does not use analysis priorities, and must not be used in
/// interactive analysis, such as Analysis Server or its plugins.
- Future<SomeErrorsResult> getErrors(String path) async {
+ Future<SomeErrorsResult> getErrors(String path) {
if (!_isAbsolutePath(path)) {
return Future.value(
InvalidPathResult(),
@@ -1299,7 +1299,7 @@
required String path,
required int offset,
required OperationPerformanceImpl performance,
- }) async {
+ }) {
var request = _ResolveForCompletionRequest(
path: path,
offset: offset,
@@ -1325,7 +1325,7 @@
Future<void> _analyzeFileImpl({
required String path,
required OperationPerformanceImpl performance,
- }) async {
+ }) {
// We will produce the result for this file, at least.
// And for any other files of the same library.
_fileTracker.fileWasAnalyzed(path);
@@ -2037,7 +2037,7 @@
Future<ResolvedForCompletionResultImpl?> _resolveForCompletion(
_ResolveForCompletionRequest request,
- ) async {
+ ) {
return request.performance.runAsync('body', (performance) async {
var path = request.path;
if (!_isAbsolutePath(path)) {
diff --git a/pkg/analyzer/lib/src/dart/analysis/search.dart b/pkg/analyzer/lib/src/dart/analysis/search.dart
index ef48c95..31f8b00 100644
--- a/pkg/analyzer/lib/src/dart/analysis/search.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/search.dart
@@ -420,7 +420,7 @@
/// Returns references to the [element].
Future<List<SearchResult>> references2(
- Element2? element, SearchedFiles searchedFiles) async {
+ Element2? element, SearchedFiles searchedFiles) {
return references(element.asElement, searchedFiles);
}
diff --git a/pkg/analyzer/lib/src/dart/micro/analysis_context.dart b/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
index c32de27..d8b54dc 100644
--- a/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
+++ b/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
@@ -166,12 +166,12 @@
}
@override
- Future<SomeResolvedLibraryResult> getResolvedLibrary(String path) async {
+ Future<SomeResolvedLibraryResult> getResolvedLibrary(String path) {
return analysisContext.fileResolver.resolveLibrary2(path: path);
}
@override
- Future<SomeResolvedUnitResult> getResolvedUnit(String path) async {
+ Future<SomeResolvedUnitResult> getResolvedUnit(String path) {
return analysisContext.fileResolver.resolve(path: path);
}
diff --git a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
index 4a96331..606d36c 100644
--- a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
+++ b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
@@ -254,7 +254,7 @@
/// Looks for references to the given Element. All the files currently
/// cached by the resolver are searched, generated files are ignored.
Future<List<CiderSearchMatch>> findReferences2(Element element,
- {OperationPerformanceImpl? performance}) async {
+ {OperationPerformanceImpl? performance}) {
return logger.runAsync('findReferences for ${element.name}', () async {
var references = <CiderSearchMatch>[];
@@ -302,7 +302,7 @@
Future<ErrorsResult> getErrors2({
required String path,
OperationPerformanceImpl? performance,
- }) async {
+ }) {
_throwIfNotAbsoluteNormalizedPath(path);
performance ??= OperationPerformanceImpl('<default>');
@@ -514,7 +514,7 @@
Future<ResolvedUnitResult> resolve({
required String path,
OperationPerformanceImpl? performance,
- }) async {
+ }) {
_throwIfNotAbsoluteNormalizedPath(path);
performance ??= OperationPerformanceImpl('<default>');
@@ -552,7 +552,7 @@
required int completionColumn,
required String path,
OperationPerformanceImpl? performance,
- }) async {
+ }) {
_throwIfNotAbsoluteNormalizedPath(path);
performance ??= OperationPerformanceImpl('<default>');
diff --git a/pkg/analyzer/lib/src/summary2/kernel_compilation_service.dart b/pkg/analyzer/lib/src/summary2/kernel_compilation_service.dart
index cc52f3d..dfd4b3b 100644
--- a/pkg/analyzer/lib/src/summary2/kernel_compilation_service.dart
+++ b/pkg/analyzer/lib/src/summary2/kernel_compilation_service.dart
@@ -40,7 +40,7 @@
var socketCompleter = Completer<io.Socket>();
var serverSocket = await _loopbackServerSocket();
- serverSocket.listen((socket) async {
+ serverSocket.listen((socket) {
socketCompleter.complete(socket);
socket.setOption(io.SocketOption.tcpNoDelay, true);
});
@@ -133,7 +133,7 @@
/// Stops the running `frontend_server` process.
static Future<void> dispose() {
- return _lock.synchronized(() async {
+ return _lock.synchronized(() {
var instance = _currentInstance;
if (instance != null) {
_currentInstance = null;
diff --git a/pkg/analyzer/lib/src/summary2/macro.dart b/pkg/analyzer/lib/src/summary2/macro.dart
index f1bb3ca..2ee109e 100644
--- a/pkg/analyzer/lib/src/summary2/macro.dart
+++ b/pkg/analyzer/lib/src/summary2/macro.dart
@@ -229,7 +229,7 @@
required MacroFileSystem fileSystem,
required String packageFilePath,
required List<MacroLibrary> libraries,
- }) async {
+ }) {
var macroMainContent = macro.bootstrapMacroIsolate(
{
for (var library in libraries)
diff --git a/pkg/analyzer/test/id_tests/assigned_variables_test.dart b/pkg/analyzer/test/id_tests/assigned_variables_test.dart
index a28400b..d3adab0 100644
--- a/pkg/analyzer/test/id_tests/assigned_variables_test.dart
+++ b/pkg/analyzer/test/id_tests/assigned_variables_test.dart
@@ -15,7 +15,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(Platform.script.resolve(
'../../../_fe_analyzer_shared/test/flow_analysis/assigned_variables/'
'data'));
diff --git a/pkg/analyzer/test/id_tests/constant_test.dart b/pkg/analyzer/test/id_tests/constant_test.dart
index df82542..b585eef 100644
--- a/pkg/analyzer/test/id_tests/constant_test.dart
+++ b/pkg/analyzer/test/id_tests/constant_test.dart
@@ -19,7 +19,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(Platform.script
.resolve('../../../_fe_analyzer_shared/test/constants/data'));
return runTests<String>(dataDir,
diff --git a/pkg/analyzer/test/id_tests/definite_assignment_test.dart b/pkg/analyzer/test/id_tests/definite_assignment_test.dart
index ed10e60..030ed6b 100644
--- a/pkg/analyzer/test/id_tests/definite_assignment_test.dart
+++ b/pkg/analyzer/test/id_tests/definite_assignment_test.dart
@@ -16,7 +16,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(Platform.script.resolve(
'../../../_fe_analyzer_shared/test/flow_analysis/definite_assignment/'
'data'));
diff --git a/pkg/analyzer/test/id_tests/definite_unassignment_test.dart b/pkg/analyzer/test/id_tests/definite_unassignment_test.dart
index 2989998..77a1b21 100644
--- a/pkg/analyzer/test/id_tests/definite_unassignment_test.dart
+++ b/pkg/analyzer/test/id_tests/definite_unassignment_test.dart
@@ -16,7 +16,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(Platform.script.resolve(
'../../../_fe_analyzer_shared/test/flow_analysis/definite_unassignment/'
'data'));
diff --git a/pkg/analyzer/test/id_tests/exhaustiveness_test.dart b/pkg/analyzer/test/id_tests/exhaustiveness_test.dart
index 18108ee..9503629 100644
--- a/pkg/analyzer/test/id_tests/exhaustiveness_test.dart
+++ b/pkg/analyzer/test/id_tests/exhaustiveness_test.dart
@@ -21,7 +21,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(Platform.script
.resolve('../../../_fe_analyzer_shared/test/exhaustiveness/data'));
return runTests<Features>(dataDir,
diff --git a/pkg/analyzer/test/id_tests/inferred_type_arguments_test.dart b/pkg/analyzer/test/id_tests/inferred_type_arguments_test.dart
index 34000c2..705fc6f 100644
--- a/pkg/analyzer/test/id_tests/inferred_type_arguments_test.dart
+++ b/pkg/analyzer/test/id_tests/inferred_type_arguments_test.dart
@@ -13,7 +13,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(
Platform.script.resolve('../../../_fe_analyzer_shared/test/inference/'
'inferred_type_arguments/data'));
diff --git a/pkg/analyzer/test/id_tests/inferred_variable_types_test.dart b/pkg/analyzer/test/id_tests/inferred_variable_types_test.dart
index ad02273..c67b0eb 100644
--- a/pkg/analyzer/test/id_tests/inferred_variable_types_test.dart
+++ b/pkg/analyzer/test/id_tests/inferred_variable_types_test.dart
@@ -13,7 +13,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(
Platform.script.resolve('../../../_fe_analyzer_shared/test/inference/'
'inferred_variable_types/data'));
diff --git a/pkg/analyzer/test/id_tests/inheritance_test.dart b/pkg/analyzer/test/id_tests/inheritance_test.dart
index 239b558..e7073cf 100644
--- a/pkg/analyzer/test/id_tests/inheritance_test.dart
+++ b/pkg/analyzer/test/id_tests/inheritance_test.dart
@@ -16,7 +16,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(Platform.script
.resolve('../../../_fe_analyzer_shared/test/inheritance/data'));
return runTests<String>(
diff --git a/pkg/analyzer/test/id_tests/metadata_evaluate_test.dart b/pkg/analyzer/test/id_tests/metadata_evaluate_test.dart
index 358a58c..bc58f09 100644
--- a/pkg/analyzer/test/id_tests/metadata_evaluate_test.dart
+++ b/pkg/analyzer/test/id_tests/metadata_evaluate_test.dart
@@ -17,7 +17,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(Platform.script
.resolve('../../../_fe_analyzer_shared/test/metadata/evaluate_data'));
return runTests<String>(
diff --git a/pkg/analyzer/test/id_tests/metadata_test.dart b/pkg/analyzer/test/id_tests/metadata_test.dart
index 026f7d7..d25c700 100644
--- a/pkg/analyzer/test/id_tests/metadata_test.dart
+++ b/pkg/analyzer/test/id_tests/metadata_test.dart
@@ -17,7 +17,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(Platform.script
.resolve('../../../_fe_analyzer_shared/test/metadata/data'));
return runTests<String>(
diff --git a/pkg/analyzer/test/id_tests/nullability_test.dart b/pkg/analyzer/test/id_tests/nullability_test.dart
index 8c34dd6..1d07150 100644
--- a/pkg/analyzer/test/id_tests/nullability_test.dart
+++ b/pkg/analyzer/test/id_tests/nullability_test.dart
@@ -16,7 +16,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(Platform.script.resolve(
'../../../_fe_analyzer_shared/test/flow_analysis/nullability/data'));
return runTests<String>(dataDir,
diff --git a/pkg/analyzer/test/id_tests/reachability_test.dart b/pkg/analyzer/test/id_tests/reachability_test.dart
index ef59b21..c448532 100644
--- a/pkg/analyzer/test/id_tests/reachability_test.dart
+++ b/pkg/analyzer/test/id_tests/reachability_test.dart
@@ -13,7 +13,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(Platform.script.resolve(
'../../../_fe_analyzer_shared/test/flow_analysis/reachability/data'));
return runTests<Set<_ReachabilityAssertion>>(dataDir,
diff --git a/pkg/analyzer/test/id_tests/type_constraint_generation_test.dart b/pkg/analyzer/test/id_tests/type_constraint_generation_test.dart
index 3216563..7e888cb 100644
--- a/pkg/analyzer/test/id_tests/type_constraint_generation_test.dart
+++ b/pkg/analyzer/test/id_tests/type_constraint_generation_test.dart
@@ -13,7 +13,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(
Platform.script.resolve('../../../_fe_analyzer_shared/test/inference/'
'type_constraint_generation/data'));
diff --git a/pkg/analyzer/test/id_tests/type_promotion_test.dart b/pkg/analyzer/test/id_tests/type_promotion_test.dart
index 1b1e1fa..7de4a45 100644
--- a/pkg/analyzer/test/id_tests/type_promotion_test.dart
+++ b/pkg/analyzer/test/id_tests/type_promotion_test.dart
@@ -14,7 +14,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(Platform.script
.resolve('../../../_fe_analyzer_shared/test/flow_analysis/type_promotion/'
'data'));
diff --git a/pkg/analyzer/test/id_tests/why_not_promoted_test.dart b/pkg/analyzer/test/id_tests/why_not_promoted_test.dart
index 6099240..1625fb1 100644
--- a/pkg/analyzer/test/id_tests/why_not_promoted_test.dart
+++ b/pkg/analyzer/test/id_tests/why_not_promoted_test.dart
@@ -13,7 +13,7 @@
import '../util/id_testing_helper.dart';
-main(List<String> args) async {
+main(List<String> args) {
Directory dataDir = Directory.fromUri(
Platform.script.resolve('../../../_fe_analyzer_shared/test/flow_analysis/'
'why_not_promoted/data'));
diff --git a/pkg/analyzer/test/src/dart/micro/file_resolution.dart b/pkg/analyzer/test/src/dart/micro/file_resolution.dart
index de33ec2..615fe0e 100644
--- a/pkg/analyzer/test/src/dart/micro/file_resolution.dart
+++ b/pkg/analyzer/test/src/dart/micro/file_resolution.dart
@@ -117,7 +117,7 @@
);
}
- Future<ErrorsResult> getTestErrors() async {
+ Future<ErrorsResult> getTestErrors() {
return fileResolver.getErrors2(path: testFile.path);
}
diff --git a/pkg/analyzer/test/src/summary/macro/code_generation.dart b/pkg/analyzer/test/src/summary/macro/code_generation.dart
index fd879b5..c6e3621 100644
--- a/pkg/analyzer/test/src/summary/macro/code_generation.dart
+++ b/pkg/analyzer/test/src/summary/macro/code_generation.dart
@@ -13,14 +13,14 @@
const AugmentForOmittedTypes();
@override
- FutureOr<void> buildDefinitionForField(declaration, builder) async {
+ FutureOr<void> buildDefinitionForField(declaration, builder) {
builder.augment(
initializer: ExpressionCode.fromString('0'),
);
}
@override
- FutureOr<void> buildDefinitionForFunction(declaration, builder) async {
+ FutureOr<void> buildDefinitionForFunction(declaration, builder) {
builder.augment(
FunctionBodyCode.fromString('{}'),
);
@@ -149,7 +149,7 @@
FutureOr<void> buildDefinitionForMethod(
MethodDeclaration method,
FunctionDefinitionBuilder builder,
- ) async {
+ ) {
builder.augment(
FunctionBodyCode.fromString("=> '${method.definingType.name}';"),
);
diff --git a/pkg/analyzer/test/src/summary/macro/introspect.dart b/pkg/analyzer/test/src/summary/macro/introspect.dart
index 8db2835..a666f14 100644
--- a/pkg/analyzer/test/src/summary/macro/introspect.dart
+++ b/pkg/analyzer/test/src/summary/macro/introspect.dart
@@ -397,7 +397,7 @@
Future<void> writeFlags(Map<String, bool> flags) async {
if (flags.values.any((flag) => flag)) {
- await writeIndentedLine(() async {
+ await writeIndentedLine(() {
write('flags:');
for (var entry in flags.entries) {
if (entry.value) {
@@ -737,7 +737,7 @@
ExpressionCode code, {
String? name,
}) async {
- await sink.writeIndentedLine(() async {
+ await sink.writeIndentedLine(() {
if (name != null) {
sink.write('$name: ');
}
diff --git a/pkg/analyzer/test/src/summary/macro/order.dart b/pkg/analyzer/test/src/summary/macro/order.dart
index 30ad5db..51edc91 100644
--- a/pkg/analyzer/test/src/summary/macro/order.dart
+++ b/pkg/analyzer/test/src/summary/macro/order.dart
@@ -19,22 +19,22 @@
const AddClass(this.name);
@override
- buildTypesForClass(clazz, builder) async {
+ buildTypesForClass(clazz, builder) {
_add(builder);
}
@override
- buildTypesForEnum(declaration, builder) async {
+ buildTypesForEnum(declaration, builder) {
_add(builder);
}
@override
- buildTypesForEnumValue(declaration, builder) async {
+ buildTypesForEnumValue(declaration, builder) {
_add(builder);
}
@override
- buildTypesForLibrary(declaration, builder) async {
+ buildTypesForLibrary(declaration, builder) {
_add(builder);
}
@@ -64,7 +64,7 @@
const AddFunction(this.name);
@override
- buildDeclarationsForClass(clazz, builder) async {
+ buildDeclarationsForClass(clazz, builder) {
_add(builder);
}
diff --git a/pkg/analyzer/test/src/summary/macro/single/addClass_addMethod_addMethod.dart b/pkg/analyzer/test/src/summary/macro/single/addClass_addMethod_addMethod.dart
index bae5462..59fa138 100644
--- a/pkg/analyzer/test/src/summary/macro/single/addClass_addMethod_addMethod.dart
+++ b/pkg/analyzer/test/src/summary/macro/single/addClass_addMethod_addMethod.dart
@@ -29,7 +29,7 @@
const AddMethodBar();
@override
- buildDeclarationsForMethod(method, builder) async {
+ buildDeclarationsForMethod(method, builder) {
builder.declareInType(
DeclarationCode.fromString(' void bar() {}'),
);
diff --git a/pkg/analyzer/test/src/summary/macro_test.dart b/pkg/analyzer/test/src/summary/macro_test.dart
index 2647faa..bff2563 100644
--- a/pkg/analyzer/test/src/summary/macro_test.dart
+++ b/pkg/analyzer/test/src/summary/macro_test.dart
@@ -17452,7 +17452,7 @@
bool get retainDataForTesting => true;
@override
- Future<void> tearDown() async {
+ Future<void> tearDown() {
for (var directory in _ioDirectoriesToDelete) {
try {
directory.deleteSync(
diff --git a/pkg/analyzer_plugin/test/plugin/plugin_test.dart b/pkg/analyzer_plugin/test/plugin/plugin_test.dart
index f98a6b7..2b8f313 100644
--- a/pkg/analyzer_plugin/test/plugin/plugin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/plugin_test.dart
@@ -529,7 +529,7 @@
@override
Future<void> afterNewContextCollection({
required AnalysisContextCollection contextCollection,
- }) async {
+ }) {
invoked_afterNewContextCollection = true;
return super.afterNewContextCollection(
contextCollection: contextCollection,
diff --git a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
index dbed86d..5c06ae8 100644
--- a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
@@ -2171,7 +2171,7 @@
@reflectiveTest
class DartFileEditBuilderImplTest extends AbstractContextTest
with DartChangeBuilderMixin {
- Future<ResolvedUnitResult> resolveContent(String path, String content) async {
+ Future<ResolvedUnitResult> resolveContent(String path, String content) {
path = convertPath(path);
addSource(path, content);
return resolveFile(path);
diff --git a/pkg/analyzer_plugin/test/utilities/completion/completion_contributor_util.dart b/pkg/analyzer_plugin/test/utilities/completion/completion_contributor_util.dart
index cf3ea3e..52f57d5 100644
--- a/pkg/analyzer_plugin/test/utilities/completion/completion_contributor_util.dart
+++ b/pkg/analyzer_plugin/test/utilities/completion/completion_contributor_util.dart
@@ -476,7 +476,7 @@
return cs;
}
- Future<E> performAnalysis<E>(int times, Completer<E> completer) async {
+ Future<E> performAnalysis<E>(int times, Completer<E> completer) {
if (completer.isCompleted) {
return completer.future;
}
