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

Commit 5d44fae

Browse files
author
Dart CI
committed
Version 2.18.0-167.0.dev
Merge commit '55a4649075343b7202b38fce41edeac3e84696ce' into 'dev'
2 parents d8fa5b4 + 55a4649 commit 5d44fae

File tree

257 files changed

+7894
-17877
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+7894
-17877
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

DEPS

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ vars = {
7777
# Revisions of /third_party/* dependencies.
7878
"args_rev": "862d929b980b993334974d38485a39d891d83918",
7979
"async_rev": "f3ed5f690e2ec9dbe1bfc5184705575b4f6480e5",
80-
"bazel_worker_rev": "ceeba0982d4ff40d32371c9d35f3d2dc1868de20",
80+
"bazel_worker_rev": "9710de6c9c70b1b583183db9d9721ba64e5a16fe",
8181
"benchmark_harness_rev": "0530da692a5d689f4b5450a7c8d1a8abe3e2d555",
8282
"boolean_selector_rev": "1d3565e2651d16566bb556955b96ea75018cbd0c",
8383
"boringssl_gen_rev": "ced85ef0a00bbca77ce5a91261a5f2ae61b1e62f",
@@ -89,7 +89,7 @@ vars = {
8989
"chrome_rev": "19997",
9090
"cli_util_rev": "b0adbba89442b2ea6fef39c7a82fe79cb31e1168",
9191
"clock_rev": "f594d86da123015186d5680b0d0e8255c52fc162",
92-
"collection_rev": "e1407da23b9f17400b3a905aafe2b8fa10db3d86",
92+
"collection_rev": "69766daafbaa8535d1343fb7cd87e713f57c107f",
9393
"convert_rev": "00b251529c074df394b3391c7e3eea3dd9e5778e",
9494
"crypto_rev": "4297d240b0e1e780ec0a9eab23eaf1ad491f3e68",
9595
"csslib_rev": "518761b166974537f334dbf264e7f56cb157a96a",
@@ -127,35 +127,35 @@ vars = {
127127
"markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
128128
"matcher_rev": "12cdc5fbafd666ed908359ae215d5d0306087969",
129129
"mime_rev": "c2c5ffd594674f32dc277521369da1557a1622d3",
130-
"mockito_rev": "1e977a727e82a2e1bdb49b79ef1dce0f23aa1faa",
130+
"mockito_rev": "fcd6b285f7c4a631778890cf02b52a9a68171a71",
131131
"oauth2_rev": "199ebf15cbd5b07958438184f32e41c4447a57bf",
132132
"package_config_rev": "cff98c90acc457a3b0750f0a7da0e351a35e5d0c",
133133
"path_rev": "3d41ea582f5b0b18de3d90008809b877ff3f69bc",
134134
"ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93",
135135
"pool_rev": "c40cc32eabecb9d60f1045d1403108d968805f9a",
136136
"protobuf_rev": "b149f801cf7a5e959cf1dbf72d61068ac275f24b",
137137
"pub_rev": "51435efcd574b7bc18d47a5dd620cb9759dea8f8",
138-
"pub_semver_rev": "ea6c54019948dc03042c595ce9413e17aaf7aa38",
138+
"pub_semver_rev": "5c0b4bfd5ca57fe16f1319c581dc8c882e9b8cb2",
139139
"root_certificates_rev": "692f6d6488af68e0121317a9c2c9eb393eb0ee50",
140140
"rust_revision": "b7856f695d65a8ebc846754f97d15814bcb1c244",
141141
"shelf_rev": "05f42601d22c9bfe490ceda50e812f83b7d1de77",
142142
"source_map_stack_trace_rev": "8eabd96b1811e30a11d3c54c9b4afae4fb72e98f",
143143
"source_maps_rev": "c07a01b8d5547ce3a47ee7a7a2b938a2bc09afe3",
144144
"source_span_rev": "8ae724c3e67f5afaacead44e93ff145bfb8775c7",
145145
"sse_rev": "9a54f1cdd91c8d79a6bf5ef8e849a12756607453",
146-
"stack_trace_rev": "5220580872625ddee41e9ca9a5f3364789b2f0f6",
146+
"stack_trace_rev": "17f09c2c6845bb31c7c385acecce5befb8527a13",
147147
"stream_channel_rev": "3fa3e40c75c210d617b8b943b9b8f580e9866a89",
148148
"string_scanner_rev": "6579871b528036767b3200b390a3ecef28e4900d",
149149
"sync_http_rev": "b6bd47965694dddffb6e62fb8a6c12d17c4ae4cd",
150150
"term_glyph_rev": "d0f205c67ea70eea47b9f41c8440129a72a9c86e",
151-
"test_descriptor_rev": "ead23c1e7df079ac0f6457a35f7a71432892e527",
151+
"test_descriptor_rev": "5ed5d7f6bf1191592995dcb8eedbbc17df69d386",
152152
"test_process_rev": "3e695bcfeab551473ddc288970f345f30e5e1375",
153153
"test_reflective_loader_rev": "8d0de01bbe852fea1f8e33aba907abcba50a8a1e",
154154
"test_rev": "d54846bc2b5cfa4e1445fda85c5e48a00940aa68",
155155
"typed_data_rev": "8b19e29bcf4077147de4d67adeabeb48270c65eb",
156-
"usage_rev": "e85d575d6decb921c57a43b9844bba3607479f56",
156+
"usage_rev": "79eef484e7403f24b414354a4af2008967484e46",
157157
"vector_math_rev": "1c72944e8c2f02340a1d90b32aab2e3836cef8cc",
158-
"watcher_rev": "f76997ab0c857dc5537ac0975a9ada92b54ef949",
158+
"watcher_rev": "e00c0ea769e32821d91c0880da8eb736839a6e6d",
159159
"web_components_rev": "8f57dac273412a7172c8ade6f361b407e2e4ed02",
160160
"web_socket_channel_rev": "99dbdc5769e19b9eeaf69449a59079153c6a8b1f",
161161
"WebCore_rev": "bcb10901266c884e7b3740abc597ab95373ab55c",

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,18 @@ class _MatcherBuilder {
406406
ElementKind.setterKind
407407
],
408408
);
409+
} else if (container is ExtensionElement) {
410+
_addMatcher(
411+
components: [node.identifier.name, container.displayName],
412+
kinds: const [
413+
ElementKind.constantKind,
414+
ElementKind.fieldKind,
415+
ElementKind.functionKind, // tear-off
416+
ElementKind.getterKind,
417+
ElementKind.methodKind, // tear-off
418+
ElementKind.setterKind
419+
],
420+
);
409421
}
410422
}
411423

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,9 @@ class FixProcessor extends BaseProcessor {
777777
CompileTimeErrorCode.UNDEFINED_CONSTRUCTOR_IN_INITIALIZER_DEFAULT: [
778778
AddSuperConstructorInvocation.new,
779779
],
780+
CompileTimeErrorCode.UNDEFINED_EXTENSION_GETTER: [
781+
DataDriven.new,
782+
],
780783
CompileTimeErrorCode.UNDEFINED_FUNCTION: [
781784
DataDriven.new,
782785
ImportLibrary.forExtension,

pkg/analysis_server/test/src/analytics/google_analytics_manager_test.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ void main() {
2020
@reflectiveTest
2121
class GoogleAnalyticsManagerTest {
2222
final analytics = _MockAnalytics();
23-
late final GoogleAnalyticsManager manager;
24-
25-
void setUp() {
26-
manager = GoogleAnalyticsManager(analytics);
27-
}
23+
late final manager = GoogleAnalyticsManager(analytics);
2824

2925
void test_plugin_request() {
3026
_defaultStartup();

pkg/analysis_server/test/src/services/correction/fix/data_driven/rename_test.dart

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,29 @@ void f() {
833833
await assertHasFix('''
834834
import '$importUri';
835835
836+
void f() {
837+
C.b;
838+
}
839+
''');
840+
}
841+
842+
Future<void> test_static_reference_removed_extension() async {
843+
setPackageContent('''
844+
extension C {
845+
static int b;
846+
}
847+
''');
848+
setPackageData(_rename(['a', 'C'], 'b'));
849+
await resolveTestCode('''
850+
import '$importUri';
851+
852+
void f() {
853+
C.a;
854+
}
855+
''');
856+
await assertHasFix('''
857+
import '$importUri';
858+
836859
void f() {
837860
C.b;
838861
}

pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -656,11 +656,11 @@ InstanceCreationExpression
656656
argumentList: ArgumentList
657657
leftParenthesis: (
658658
rightParenthesis: )
659-
parameter: <null>
660659
staticInvokeType: C? Function()
661660
staticType: C?
662661
typeArgumentTypes
663662
C?
663+
parameter: self::@class::X::@constructor::•::@parameter::c
664664
MethodInvocation
665665
methodName: SimpleIdentifier
666666
token: g2
@@ -689,11 +689,11 @@ InstanceCreationExpression
689689
argumentList: ArgumentList
690690
leftParenthesis: (
691691
rightParenthesis: )
692-
parameter: <null>
693692
staticInvokeType: D? Function()
694693
staticType: D?
695694
typeArgumentTypes
696695
D?
696+
parameter: self::@class::X::@constructor::•::@parameter::d
697697
rightParenthesis: )
698698
staticType: X
699699
''');

pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -702,11 +702,11 @@ MethodInvocation
702702
argumentList: ArgumentList
703703
leftParenthesis: (
704704
rightParenthesis: )
705-
parameter: <null>
706705
staticInvokeType: C? Function()
707706
staticType: C?
708707
typeArgumentTypes
709708
C?
709+
parameter: self::@function::foo::@parameter::c
710710
MethodInvocation
711711
methodName: SimpleIdentifier
712712
token: g2
@@ -735,11 +735,11 @@ MethodInvocation
735735
argumentList: ArgumentList
736736
leftParenthesis: (
737737
rightParenthesis: )
738-
parameter: <null>
739738
staticInvokeType: D? Function()
740739
staticType: D?
741740
typeArgumentTypes
742741
D?
742+
parameter: self::@function::foo::@parameter::d
743743
rightParenthesis: )
744744
staticInvokeType: void Function(A, B, {C? c, D? d})
745745
staticType: void
@@ -7388,8 +7388,8 @@ MethodInvocation
73887388
colon: :
73897389
expression: BooleanLiteral
73907390
literal: false
7391-
parameter: <null>
73927391
staticType: bool
7392+
parameter: self::@function::foo::@parameter::b
73937393
NamedExpression
73947394
name: Label
73957395
label: SimpleIdentifier
@@ -7399,8 +7399,8 @@ MethodInvocation
73997399
colon: :
74007400
expression: IntegerLiteral
74017401
literal: 0
7402-
parameter: <null>
74037402
staticType: int
7403+
parameter: self::@function::foo::@parameter::a
74047404
rightParenthesis: )
74057405
staticInvokeType: void Function({int? a, bool? b})
74067406
staticType: void
@@ -7424,8 +7424,8 @@ MethodInvocation
74247424
colon: :
74257425
expression: BooleanLiteral
74267426
literal: false
7427-
parameter: <null>
74287427
staticType: bool*
7428+
parameter: self::@function::foo::@parameter::b
74297429
NamedExpression
74307430
name: Label
74317431
label: SimpleIdentifier
@@ -7435,8 +7435,8 @@ MethodInvocation
74357435
colon: :
74367436
expression: IntegerLiteral
74377437
literal: 0
7438-
parameter: <null>
74397438
staticType: int*
7439+
parameter: self::@function::foo::@parameter::a
74407440
rightParenthesis: )
74417441
staticInvokeType: void Function({int* a, bool* b})*
74427442
staticType: void

pkg/analyzer/test/src/summary/resolved_ast_printer.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,7 @@ class ResolvedAstPrinter extends ThrowingAstVisitor<void> {
830830
_writeln('NamedExpression');
831831
_withIndent(() {
832832
_writeNamedChildEntities(node);
833+
_writeParameterElement(node);
833834
});
834835
}
835836

@@ -1461,8 +1462,7 @@ class ResolvedAstPrinter extends ThrowingAstVisitor<void> {
14611462
if (parent is ArgumentList ||
14621463
parent is AssignmentExpression && parent.rightHandSide == node ||
14631464
parent is BinaryExpression && parent.rightOperand == node ||
1464-
parent is IndexExpression && parent.index == node ||
1465-
parent is NamedExpression && parent.expression == node) {
1465+
parent is IndexExpression && parent.index == node) {
14661466
_writeElement('parameter', node.staticParameterElement);
14671467
}
14681468
}

pkg/compiler/lib/src/inferrer/engine.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,6 @@ class InferrerEngine {
261261

262262
info.bailedOut = false;
263263
info.elementType.inferred = true;
264-
if (abstractValueDomain.isSpecializationOf(
265-
info.originalType, abstractValueDomain.fixedListType)) {
266-
info.checksGrowable = tracer.callsGrowableMethod;
267-
}
268264
tracer.inputs.forEach(info.elementType.addInput);
269265
// Enqueue the list for later refinement
270266
_workQueue.add(info);

0 commit comments

Comments
 (0)