Skip to content

Commit

Permalink
Version 3.2.0-132.0.dev
Browse files Browse the repository at this point in the history 
Merge 44bcd89 into dev
  • Loading branch information
Dart CI committed Sep 4, 2023
2 parents a5c7102 + 44bcd89 commit 671cf05
Show file tree
Hide file tree
Showing 511 changed files with 1,415 additions and 920 deletions.
74 changes: 37 additions & 37 deletions DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,18 @@ vars = {
# revision.

"args_rev": "da56b18ebcb600e050bf57b9c1103b1d2a9fb2ff",
"async_rev": "b65622afa33c5bfc574ae6b34d5a61f18a98f83c",
"bazel_worker_rev": "c29d1620b1a935dc88d13a4eec0d9950d3e9df27",
"async_rev": "75efa6cc08b2fc906fac4b6fdfdbcf6da7d0a2da",
"bazel_worker_rev": "f950bbfa4ccb0fe196bd031fae9b824bff25c287",
"benchmark_harness_rev": "fde73cb8810b1f8efed41e1994bc7b8327047379",
"boolean_selector_rev": "303635d0262e679fb6a81686724a5dc1dbc850a7",
"browser_launcher_rev": "27ec600af41b0d0ebe9a3db6ad36e9ed11976b84",
"boolean_selector_rev": "f255921c7155da2167e8c96e04e527180787aafb",
"browser_launcher_rev": "1f69393d63a2f8d36d00b86cdd20df70c347af82",
"characters_rev": "ec844db851b940d9013719f8474f064e35a01d0f",
"cli_util_rev": "9b7ce784c2889d62be0d6f66022331cb1e53b5b6",
"clock_rev": "263e508a36ed90e4d85b60dd70552d20e71a9ae9",
"cli_util_rev": "44118e35e55c75f84fbc5ead051424ee1e73e406",
"clock_rev": "1e75f08d3428bcd6f4b7cf70e788f24fc9b661e1",
"collection_rev": "1a9b7eb64be10a8ba4ced7eb36b4b265a49d5d41",
"convert_rev": "79ee174280149817f9925db0613983aadb46eeca",
"crypto_rev": "8b704c601f4843050624cd334e3b74f6c17315a4",
"csslib_rev": "7e91228c2c2428455e5bc63bbf89c7bf0f3401b0",
"convert_rev": "c058c8f4ebfdc09a5122db7988acd9e117a7da48",
"crypto_rev": "1e26879c8f166850288e8722c590a465b4461f1f",
"csslib_rev": "bd30a1a773ec66d3e435dfc53fc140f1967716da",
# Note: Updates to dart_style have to be coordinated with the infrastructure
# team so that the internal formatter `tools/sdks/dart-sdk/bin/dart format`
# matches the version here. Please follow this process to make updates:
Expand All @@ -142,58 +142,58 @@ vars = {
#
# For more details, see https://github.com/dart-lang/sdk/issues/30164.
"dart_style_rev": "2956b1a705953f880a5dae9d3a0969df0fc45e99", # disable rev_sdk_deps.dart
"dartdoc_rev": "5fda5eb2e004b6cf7c73fbcffbc246a71119be98",
"ecosystem_rev": "f777da70c65d158fa3b9dbfe7483bdc70b67c709",
"ffi_rev": "e2c01a960b84d1074b0a1849909ae2d269d004be",
"dartdoc_rev": "695b218c50dd17a58afa7613da7f0daae3b7f55b",
"ecosystem_rev": "89e58de5f1838eb52cc7dcb3efb7fc01718b5e21",
"ffi_rev": "d36e05af55293bcc511d6b3a99ea4b8cb69f6323",
"file_rev": "5d9a6027756b5846e8f5380f983390f61f564a75",
"fixnum_rev": "00fa1207768bd07d04c895cbe0f1fe99af14e727",
"fixnum_rev": "87ed0658f32f992dc7360b77513eadfa7056aa9d",
"flute_rev": "f42b09f77132210499ec8ed819a60c260af03db6",
"glob_rev": "5b243935154daf53c54981b98f625bace90b2112",
"html_rev": "4060496b0443451c38f8b789db2e44c0d7966171",
"http_rev": "cad7d609b18512d74cc30ef8ad9faf02d2ea4451",
"http_rev": "7fb6fd686f6ce60af300be71a84defcc336d272e",
"http_multi_server_rev": "aa128cfaf6ef1c9c1ace962ca2dcf6e5dddad441",
"http_parser_rev": "c14fbf6aa7ada5e8912eab4581eb26ff4d101452",
"intl_rev": "5d65e3808ce40e6282e40881492607df4e35669f",
"json_rpc_2_rev": "509f71eef90ec5afb5486b69dab7fed97b9f1eef",
"leak_tracker_rev": "098bafcf99a5220e3c352d895d991e163568ee03", # b/292240713
"lints_rev": "54cd7a033881ccfd9ec66133bf9a4f128870cb9e",
"logging_rev": "521498757ed3eeae151c2d4796404e8947baa04c",
"markdown_rev": "56e75df897ac01a886358e79124844977aa8157c",
"matcher_rev": "ce8f40934c90e12992071172795b3bca29fac295",
"mime_rev": "799b398140817fdb134f639d84e91c552e129136",
"lints_rev": "da44af3d262d6747a4e700a0916a4e0fd535e305",
"logging_rev": "bcaad0f781a889d6e5cf8fc564fd0722c446b96e",
"markdown_rev": "6cfd6f17651a8ba31b5a268f1139bb2c039dd4d4",
"matcher_rev": "80910d6698576ba486ace6e5fdf0e27324f138db",
"mime_rev": "37ef637c35896e289fdd37c0ea4680df4ab9f543",
"mockito_rev": "f5abf11f8e21e61eebc2081e322bdfcab057e988",
"native_rev": "5a1361b6d98a84f8070c97872e3d3587fc0ba435",
"native_rev": "a2dfedc35960711eb24cb04dcb906793d2222295",
"package_config_rev": "981c49dfec1e3e3e90f336dcd7c225923d2fd321",
"path_rev": "7c2324bdb4c75a17de8a3d1e6afe8cc0756ef5f9",
"pool_rev": "77001024a16126cc5718e654ea3e57bbf6e7fac3",
"path_rev": "96d9183ad4f9e48109fa8d4b8269cf75f13922dd",
"pool_rev": "a5bee3540a2b5b3a3c34038667e7cd7bb514dc62",
"protobuf_rev": "5e8f36b48f015532cd1165b47686b659fc8870da",
"pub_rev": "42819a1e10f803eb7f6296692c5a976e1c647360", # disable rev_sdk_deps.dart
"pub_semver_rev": "028b43506a3f7ec7f7b4673a78ba3da3d5fb138d",
"shelf_rev": "73edd2b6e18ee50afac57e4e224b8c714b81e66d",
"source_map_stack_trace_rev": "16e54fd9fc088961773340cb5c3688a089387135",
"shelf_rev": "2926f76dc0f713b46ba5d9dbc391e29c6d1521a9",
"source_map_stack_trace_rev": "196d7bfa58ef307687907c323ab8e5fb1f382afa",
"source_maps_rev": "97c4833100b1bd8ea7e4a2fa1808383007e2d1e8",
"source_span_rev": "37735aecc5d8c0fb75ed61691bae056510b357bb",
"sse_rev": "8cc5b11aa0c82cd0d89758d20782221cc6ac6dec",
"stack_trace_rev": "4ddd86d5d22aad9a8e8e9a06fd0a6a6271736135",
"stream_channel_rev": "e54234f94da929153b012de2bba75c5246a52538",
"string_scanner_rev": "413b57a3b14fa273e8ed52578edfbe0446084795",
"sse_rev": "eeb2588ce56a5b2f1e4bbd88c2b35c910c505b71",
"stack_trace_rev": "bcf2a0b1b7d4abaeedcb8b18ff41e4994aea1b17",
"stream_channel_rev": "0ce7ab69c3a2ab83cdeb9dc60e1bacbb83abc165",
"string_scanner_rev": "da9142cf9809e7e1364144b8193ec60d87f0a4b8",
"sync_http_rev": "c3d6ad48ec997c56b7f076bc9f8b4134c4a9225c",
"term_glyph_rev": "423700a3c019dc67f93d2bd6578016a1402506f7",
"test_rev": "d0fc4bde2e05e62c75bc3ac7b3de3f510816ea44",
"test_descriptor_rev": "36d8617fafccbe36dfcf74ad4921c61911a6a411",
"test_process_rev": "b360784a9149b15888aed8d7cf167bb46fe733d5",
"term_glyph_rev": "1b28285a7e818b8e87c4d2119d968c5b36d73c7a",
"test_rev": "27dcae11f6630c0d980f521cf372e962d286e9d3",
"test_descriptor_rev": "030193dfdfbf85930eae8536909c546151da9e9c",
"test_process_rev": "2a6ee23fc2550fa466105819f5335fcfbab14035",
"test_reflective_loader_rev": "0bfaad91ed308ce9da11b48395c8210d7542c16b",
"tools_rev": "b72fae8673a5fa30b0eff4077005ac95f960dc9b",
"typed_data_rev": "a20be901e11eddcbd6e5735fb01b64d28c94c49d",
"tools_rev": "2c8cbd63b96d94ef4fbc0c7df6fd5eff65fc9a85",
"typed_data_rev": "80e8943524a627f7ff421ace824f38105983e89a",
"usage_rev": "09bb8472fdafff2c48a19aabbcf57b3af0f43934",
"vector_math_rev": "88bada3c32ba3f1d53073a003085131d60b09213",
"watcher_rev": "7457413060ed7403b90b01533a61bd959932122e",
"watcher_rev": "1aed03e2a8005f45083fdb38cbd4b684cd23082f",
"web_socket_channel_rev": "4d1b5438d1bdfc6317bf99fd9d9c6e4edb7e9ec5",
"webdev_rev": "fc876cb0de59526160ed17efaa920557a6e2ba32", # https://github.com/dart-lang/webdev/issues/2201
"webdriver_rev": "20ec47f1976c5deaf5106f85f5bf4a025d2afb1e",
"webkit_inspection_protocol_rev": "39a3c297ff573635e7936b015ce4f3466e4739d6",
"yaml_rev": "7930148a3d03d7985ce2b53bc5eb2be9c878dab8",
"yaml_edit_rev": "87dcf31fcaada207ae7c3527f9885982534badce",
"yaml_rev": "ae001879aa377afee2e70cf11b8716d6cc3e2658",
"yaml_edit_rev": "4a9734dda12f63ef9eee4121f87ff4401e25a607",

# Windows deps
"crashpad_rev": "bf327d8ceb6a669607b0dbab5a83a275d03f99ed",
Expand Down
126 changes: 103 additions & 23 deletions pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3516,6 +3516,28 @@ Message _withArgumentsExpectedButGot(String string) {
arguments: {'string': string});
}

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeExpectedCatchClauseBody = messageExpectedCatchClauseBody;

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageExpectedCatchClauseBody = const MessageCode(
"ExpectedCatchClauseBody",
index: 169,
problemMessage:
r"""A catch clause must have a body, even if it is empty.""",
correctionMessage: r"""Try adding an empty body.""");

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeExpectedClassBody = messageExpectedClassBody;

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageExpectedClassBody = const MessageCode(
"ExpectedClassBody",
index: 8,
problemMessage:
r"""A class declaration must have a body, even if it is empty.""",
correctionMessage: r"""Try adding an empty body.""");

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Template<Message Function(Token token)> templateExpectedClassMember =
const Template<Message Function(Token token)>(
Expand All @@ -3536,29 +3558,6 @@ Message _withArgumentsExpectedClassMember(Token token) {
arguments: {'lexeme': token});
}

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Template<Message Function(String string)>
templateExpectedClassOrMixinBody =
const Template<Message Function(String string)>(
problemMessageTemplate:
r"""A #string must have a body, even if it is empty.""",
correctionMessageTemplate: r"""Try adding an empty body.""",
withArguments: _withArgumentsExpectedClassOrMixinBody);

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Message Function(String string)> codeExpectedClassOrMixinBody =
const Code<Message Function(String string)>("ExpectedClassOrMixinBody",
index: 8);

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
Message _withArgumentsExpectedClassOrMixinBody(String string) {
if (string.isEmpty) throw 'No string provided';
return new Message(codeExpectedClassOrMixinBody,
problemMessage: """A ${string} must have a body, even if it is empty.""",
correctionMessage: """Try adding an empty body.""",
arguments: {'string': string});
}

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Template<Message Function(Token token)> templateExpectedDeclaration =
const Template<Message Function(Token token)>(
Expand Down Expand Up @@ -3612,6 +3611,41 @@ Message _withArgumentsExpectedEnumBody(Token token) {
arguments: {'lexeme': token});
}

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeExpectedExtensionBody = messageExpectedExtensionBody;

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageExpectedExtensionBody = const MessageCode(
"ExpectedExtensionBody",
index: 173,
problemMessage:
r"""An extension declaration must have a body, even if it is empty.""",
correctionMessage: r"""Try adding an empty body.""");

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeExpectedExtensionTypeBody =
messageExpectedExtensionTypeBody;

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageExpectedExtensionTypeBody = const MessageCode(
"ExpectedExtensionTypeBody",
index: 167,
problemMessage:
r"""An extension type declaration must have a body, even if it is empty.""",
correctionMessage: r"""Try adding an empty body.""");

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeExpectedFinallyClauseBody =
messageExpectedFinallyClauseBody;

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageExpectedFinallyClauseBody = const MessageCode(
"ExpectedFinallyClauseBody",
index: 170,
problemMessage:
r"""A finally clause must have a body, even if it is empty.""",
correctionMessage: r"""Try adding an empty body.""");

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Template<Message Function(Token token)> templateExpectedFunctionBody =
const Template<Message Function(Token token)>(
Expand Down Expand Up @@ -3709,6 +3743,17 @@ Message _withArgumentsExpectedInstead(String string) {
arguments: {'string': string});
}

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeExpectedMixinBody = messageExpectedMixinBody;

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageExpectedMixinBody = const MessageCode(
"ExpectedMixinBody",
index: 166,
problemMessage:
r"""A mixin declaration must have a body, even if it is empty.""",
correctionMessage: r"""Try adding an empty body.""");

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeExpectedNamedArgument = messageExpectedNamedArgument;

Expand Down Expand Up @@ -3763,6 +3808,30 @@ Message _withArgumentsExpectedString(Token token) {
arguments: {'lexeme': token});
}

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeExpectedSwitchExpressionBody =
messageExpectedSwitchExpressionBody;

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageExpectedSwitchExpressionBody = const MessageCode(
"ExpectedSwitchExpressionBody",
index: 171,
problemMessage:
r"""A switch expression must have a body, even if it is empty.""",
correctionMessage: r"""Try adding an empty body.""");

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeExpectedSwitchStatementBody =
messageExpectedSwitchStatementBody;

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageExpectedSwitchStatementBody = const MessageCode(
"ExpectedSwitchStatementBody",
index: 172,
problemMessage:
r"""A switch statement must have a body, even if it is empty.""",
correctionMessage: r"""Try adding an empty body.""");

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Template<Message Function(String string)> templateExpectedToken =
const Template<Message Function(String string)>(
Expand All @@ -3782,6 +3851,17 @@ Message _withArgumentsExpectedToken(String string) {
arguments: {'string': string});
}

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeExpectedTryStatementBody = messageExpectedTryStatementBody;

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageExpectedTryStatementBody = const MessageCode(
"ExpectedTryStatementBody",
index: 168,
problemMessage:
r"""A try statement must have a body, even if it is empty.""",
correctionMessage: r"""Try adding an empty body.""");

// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Template<Message Function(Token token)> templateExpectedType =
const Template<Message Function(Token token)>(
Expand Down
58 changes: 32 additions & 26 deletions pkg/_fe_analyzer_shared/lib/src/parser/block_kind.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,48 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

import '../messages/codes.dart' as codes;
import '../scanner/token.dart';

class BlockKind {
final String name;

final bool useNameForMissingBlock;
final codes.Message? message;

const BlockKind._(this.name, this.useNameForMissingBlock);
final codes.Template<codes.Message Function(Token token)>? template;

/// Returns the name to use for this block if it is missing in
/// [templateExpectedClassOrMixinBody].
///
/// If `null` the generic [templateExpectedButGot] is used instead.
String? get missingBlockName => useNameForMissingBlock ? name : null;
const BlockKind._(this.name, {this.template, this.message});

@override
String toString() => 'BlockKind($name)';

static const BlockKind catchClause =
const BlockKind._('catch clause', /* useNameForMissingBlock = */ true);
static const BlockKind catchClause = const BlockKind._('catch clause',
message: codes.messageExpectedCatchClauseBody);
static const BlockKind classDeclaration = const BlockKind._(
'class declaration', /* useNameForMissingBlock = */ false);
static const BlockKind enumDeclaration = const BlockKind._(
'enum declaration', /* useNameForMissingBlock = */ false);
'class declaration',
message: codes.messageExpectedClassBody);
static const BlockKind enumDeclaration = const BlockKind._('enum declaration',
template: codes.templateExpectedEnumBody);
static const BlockKind extensionDeclaration = const BlockKind._(
'extension declaration', /* useNameForMissingBlock = */ false);
static const BlockKind finallyClause =
const BlockKind._('finally clause', /* useNameForMissingBlock = */ true);
static const BlockKind functionBody =
const BlockKind._('function body', /* useNameForMissingBlock = */ false);
static const BlockKind invalid =
const BlockKind._('invalid', /* useNameForMissingBlock = */ false);
'extension declaration',
message: codes.messageExpectedExtensionBody);
static const BlockKind extensionTypeDeclaration = const BlockKind._(
'extension type declaration',
message: codes.messageExpectedExtensionTypeBody);
static const BlockKind finallyClause = const BlockKind._('finally clause',
message: codes.messageExpectedFinallyClauseBody);
static const BlockKind functionBody = const BlockKind._('function body',
template: codes.templateExpectedFunctionBody);
static const BlockKind invalid = const BlockKind._('invalid');
static const BlockKind mixinDeclaration = const BlockKind._(
'mixin declaration', /* useNameForMissingBlock = */ false);
static const BlockKind statement =
const BlockKind._('statement', /* useNameForMissingBlock = */ false);
static const BlockKind switchStatement = const BlockKind._(
'switch statement', /* useNameForMissingBlock = */ false);
static const BlockKind tryStatement =
const BlockKind._('try statement', /* useNameForMissingBlock = */ true);
'mixin declaration',
message: codes.messageExpectedMixinBody);
static const BlockKind statement = const BlockKind._('statement');
static const BlockKind switchExpression = const BlockKind._(
'switch expression',
message: codes.messageExpectedSwitchExpressionBody);
static const BlockKind switchStatement = const BlockKind._('switch statement',
message: codes.messageExpectedSwitchStatementBody);
static const BlockKind tryStatement = const BlockKind._('try statement',
message: codes.messageExpectedTryStatementBody);
}
Loading

0 comments on commit 671cf05

Please sign in to comment.