Skip to content

Commit 0e9eed1

Browse files
author
Dart CI
committed
Version 3.9.0-239.0.dev
Merge ab4f935 into dev
2 parents 4fad612 + ab4f935 commit 0e9eed1

File tree

89 files changed

+238
-224
lines changed

Some content is hidden

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

89 files changed

+238
-224
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ vars = {
114114
"ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93",
115115
"protobuf_gn_rev": "ca669f79945418f6229e4fef89b666b2a88cbb10",
116116
"WebCore_rev": "bcb10901266c884e7b3740abc597ab95373ab55c",
117-
"zlib_rev": "108fa50cda23ed4a712a098d058dccbbfd248206",
117+
"zlib_rev": "470d3a2ee4ef721688ce6961bc865a99fcb64070",
118118

119119
# Note: Updates to dart_style have to be coordinated with the infrastructure
120120
# team so that the internal formatter `tools/sdks/dart-sdk/bin/dart format`

PRESUBMIT.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ def _CheckAnalyzerFiles(input_api, output_api):
380380

381381
# Verify the "error fix status" file.
382382
code_files = [
383-
"pkg/analyzer/lib/src/error/error_code_values.g.dart",
383+
"pkg/analyzer/lib/src/diagnostic/diagnostic_code_values.g.dart",
384384
"pkg/linter/lib/src/rules.dart",
385385
]
386386

benchmarks/SDKArtifactSizes/dart/SDKArtifactSizes.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ import 'dart:io';
88

99
const executables = <String>['dart', 'dartaotruntime'];
1010

11-
const libs = <String>[
12-
'vm_platform_strong.dill',
13-
'vm_platform_strong_product.dill',
14-
];
11+
const libs = <String>['vm_platform.dill', 'vm_platform_product.dill'];
1512

1613
const snapshots = <String>[
1714
'analysis_server',

build/gn_dart_compile_exe.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def main(argv):
9090
return 1
9191

9292
platform_dill = os.path.join(prebuilt_sdk, "lib", "_internal",
93-
"vm_platform_strong.dill")
93+
"vm_platform.dill")
9494
if not os.path.isfile(platform_dill):
9595
print("Binary not found: " + platform_dill)
9696
return 1

build/rbe/rewrapper_dart.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,7 @@ def parse_dart(self):
360360
self.extra_paths.add(self.rebase(arg))
361361
self.extra_paths.add(
362362
self.rebase(
363-
os.path.join(self.dart_subdir,
364-
'vm_platform_strong.dill')))
363+
os.path.join(self.dart_subdir, 'vm_platform.dill')))
365364
return self.parse_kernel_service_snapshot()
366365
else:
367366
self.unsupported('dart', arg)
@@ -509,7 +508,7 @@ def parse_compile_platform(self):
509508
if sdk.endswith('libraries.json'):
510509
sdk = os.path.dirname(sdk)
511510
self.extra_paths.add(self.rebase(sdk))
512-
elif len(compile_platform_args) == 2: # vm_outline_strong dill
511+
elif len(compile_platform_args) == 2: # vm_outline dill
513512
arg = self.rebase(arg)
514513
elif len(compile_platform_args) == 3: # platform dill
515514
arg = self.rebase(arg)

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2885,9 +2885,6 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
28852885
keywordHelper.addKeyword(Keyword.CASE);
28862886
keywordHelper.addKeywordAndText(Keyword.DEFAULT, ':');
28872887
if (members.isNotEmpty) {
2888-
if (!members.any((element) => element is SwitchDefault)) {
2889-
keywordHelper.addKeywordAndText(Keyword.DEFAULT, ':');
2890-
}
28912888
var element = members.elementBefore(offset);
28922889
if (element != null) {
28932890
_forStatement(element);

pkg/analysis_server/lib/src/services/completion/yaml/analysis_options_generator.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ class _ErrorProducer extends KeyValueProducer {
7474
@override
7575
Iterable<CompletionSuggestion> suggestions(YamlCompletionRequest request) {
7676
return [
77-
for (var error in errorCodeValues)
78-
identifier('${error.name.toLowerCase()}: '),
77+
for (var diagnostic in diagnosticCodeValues)
78+
identifier('${diagnostic.name.toLowerCase()}: '),
7979
for (var rule in Registry.ruleRegistry.rules)
8080
identifier('${rule.name}: '),
8181
];

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
@@ -157,7 +157,7 @@ class BulkFixProcessor {
157157
static final Map<DiagnosticCode, bool> _bulkFixableCodes = {};
158158

159159
static final Set<String> _diagnosticCodes =
160-
errorCodeValues.map((code) => code.name.toLowerCase()).toSet();
160+
diagnosticCodeValues.map((code) => code.name.toLowerCase()).toSet();
161161

162162
static final Set<String> _lintCodes =
163163
Registry.ruleRegistry.rules.map((rule) => rule.name).toSet();

pkg/analysis_server/tool/presubmit/verify_error_fix_status.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ String? verifyErrorFixStatus() {
5757
var lintRuleNames = {for (var lintCode in lintRuleCodes) lintCode.uniqueName};
5858

5959
var errorData = ErrorData();
60-
for (var code in errorCodeValues) {
60+
for (var code in diagnosticCodeValues) {
6161
var name = code.uniqueName;
6262
if (name.startsWith('TodoCode.')) {
6363
// To-do codes are ignored.
@@ -99,10 +99,10 @@ String? verifyErrorFixStatus() {
9999
}
100100
}
101101

102-
var errorCodeNames = {for (var code in errorCodeValues) code.uniqueName};
102+
var codeNames = {for (var code in diagnosticCodeValues) code.uniqueName};
103103
for (var key in statusInfo.keys) {
104104
if (key is String) {
105-
if (!errorCodeNames.contains(key) && !lintRuleNames.contains(key)) {
105+
if (!codeNames.contains(key) && !lintRuleNames.contains(key)) {
106106
errorData.entriesWithNoCode.add(key);
107107
}
108108
}

pkg/analyzer/api.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4685,7 +4685,8 @@ package:analyzer/diagnostic/diagnostic.dart:
46854685
values (static getter: List<Severity>)
46864686
warning (static getter: Severity)
46874687
package:analyzer/error/error.dart:
4688-
errorCodeValues (static getter: List<DiagnosticCode>)
4688+
diagnosticCodeValues (static getter: List<DiagnosticCode>)
4689+
errorCodeValues (static getter: List<DiagnosticCode>, deprecated)
46894690
errorCodeByUniqueName (function: DiagnosticCode? Function(String))
46904691
DiagnosticCode (class extends Object):
46914692
new (constructor: DiagnosticCode Function({String? correctionMessage, bool hasPublishedDocs, bool isUnresolvedIdentifier, required String name, required String problemMessage, required String uniqueName}))

0 commit comments

Comments
 (0)