Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 2ace65b

Browse files
author
Dart CI
committed
Version 2.16.0-85.0.dev
Merge commit '0d98f6ab5d56505033f0b3b29c8bb46f85461011' into 'dev'
2 parents f9a936a + 0d98f6a commit 2ace65b

38 files changed

+519
-154
lines changed

pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:analysis_server/src/provisional/completion/dart/completion_dart.
77
import 'package:analysis_server/src/services/completion/dart/completion_manager.dart';
88
import 'package:analysis_server/src/services/completion/dart/suggestion_builder.dart';
99
import 'package:analysis_server/src/utilities/flutter.dart';
10+
import 'package:analyzer/dart/analysis/features.dart';
1011
import 'package:analyzer/dart/ast/ast.dart';
1112
import 'package:analyzer/dart/ast/token.dart';
1213
import 'package:analyzer/dart/element/element.dart';
@@ -100,7 +101,9 @@ class ArgListContributor extends DartCompletionContributor {
100101
if (_isEditingNamedArgLabel() ||
101102
_isAppendingToArgList() ||
102103
_isAddingLabelToPositional()) {
103-
if (requiredCount == 0 || requiredCount < _argCount()) {
104+
if (request.featureSet.isEnabled(Feature.named_arguments_anywhere) ||
105+
requiredCount == 0 ||
106+
requiredCount < _argCount()) {
104107
// If there's a replacement range that starts at the caret, it will be
105108
// for an identifier that is not the named label and therefore it should
106109
// not be replaced.

pkg/analysis_server/lib/src/services/correction/assist_internal.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ class AssistProcessor extends BaseProcessor {
221221
for (var multiGenerator in multiGenerators) {
222222
var multiProducer = multiGenerator();
223223
multiProducer.configure(context);
224-
for (var producer in multiProducer.producers) {
224+
await for (var producer in multiProducer.producers) {
225225
await compute(producer);
226226
}
227227
}

pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ class BulkFixProcessor {
383383
for (var multiGenerator in multiGenerators) {
384384
var multiProducer = multiGenerator();
385385
multiProducer.configure(context);
386-
for (var producer in multiProducer.producers) {
386+
await for (var producer in multiProducer.producers) {
387387
await _generateFix(context, producer, codeName);
388388
}
389389
}

pkg/analysis_server/lib/src/services/correction/dart/abstract_producer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ abstract class CorrectionProducerWithDiagnostic extends CorrectionProducer {
302302
/// assists).
303303
abstract class MultiCorrectionProducer extends _AbstractCorrectionProducer {
304304
/// Return each of the individual producers generated by this producer.
305-
Iterable<CorrectionProducer> get producers;
305+
Stream<CorrectionProducer> get producers;
306306
}
307307

308308
/// An object that can compute a correction (fix or assist) in a Dart file.

pkg/analysis_server/lib/src/services/correction/dart/add_missing_parameter.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
1111

1212
class AddMissingParameter extends MultiCorrectionProducer {
1313
@override
14-
Iterable<CorrectionProducer> get producers sync* {
14+
Stream<CorrectionProducer> get producers async* {
1515
// node is the unmatched argument.
1616
var argumentList = node.parent;
1717
if (argumentList is! ArgumentList) {

pkg/analysis_server/lib/src/services/correction/dart/add_super_constructor_invocation.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
1313

1414
class AddSuperConstructorInvocation extends MultiCorrectionProducer {
1515
@override
16-
Iterable<CorrectionProducer> get producers sync* {
16+
Stream<CorrectionProducer> get producers async* {
1717
var targetConstructor = node.parent;
1818
if (targetConstructor is! ConstructorDeclaration) {
1919
return;

pkg/analysis_server/lib/src/services/correction/dart/change_argument_name.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ChangeArgumentName extends MultiCorrectionProducer {
1717
static const _maxDistance = 4;
1818

1919
@override
20-
Iterable<CorrectionProducer> get producers sync* {
20+
Stream<CorrectionProducer> get producers async* {
2121
var namedContext = _getNamedParameterNames();
2222
if (namedContext == null) {
2323
return;

pkg/analysis_server/lib/src/services/correction/dart/create_constructor_super.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
1212

1313
class CreateConstructorSuper extends MultiCorrectionProducer {
1414
@override
15-
Iterable<CorrectionProducer> get producers sync* {
15+
Stream<CorrectionProducer> get producers async* {
1616
var targetClassNode = node.thisOrAncestorOfType<ClassDeclaration>();
1717
if (targetClassNode == null) {
1818
return;

pkg/analysis_server/lib/src/services/correction/dart/data_driven.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class DataDriven extends MultiCorrectionProducer {
2121
static List<TransformSet>? transformSetsForTests;
2222

2323
@override
24-
Iterable<CorrectionProducer> get producers sync* {
24+
Stream<CorrectionProducer> get producers async* {
2525
var importedUris = <Uri>[];
2626
var library = resolvedResult.libraryElement;
2727
for (var importElement in library.imports) {

pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import 'package:analyzer_plugin/utilities/range_factory.dart';
1515

1616
class FlutterWrap extends MultiCorrectionProducer {
1717
@override
18-
Iterable<CorrectionProducer> get producers sync* {
18+
Stream<CorrectionProducer> get producers async* {
1919
var widgetExpr = flutter.identifyWidgetExpression(node);
2020
if (widgetExpr != null) {
2121
var widgetType = widgetExpr.typeOrThrow;
@@ -36,7 +36,7 @@ class FlutterWrap extends MultiCorrectionProducer {
3636
yield* _wrapMultipleWidgets();
3737
}
3838

39-
Iterable<CorrectionProducer> _wrapMultipleWidgets() sync* {
39+
Stream<CorrectionProducer> _wrapMultipleWidgets() async* {
4040
var selectionRange = SourceRange(selectionOffset, selectionLength);
4141
var analyzer = SelectionAnalyzer(selectionRange);
4242
resolvedResult.unit.accept(analyzer);

0 commit comments

Comments
 (0)