Skip to content

Commit fcab2e4

Browse files
nshahanpull[bot]
authored andcommitted
[ddc] Enforce unnecessary_breaks lint
Ignore violations in the js_ast sub-directory to avoid unnecessary diffs with the original package. Change-Id: Iac8c942e5e2446b8433e2073b546c28e42a8f5cf Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/392700 Reviewed-by: Kevin Moore <[email protected]> Commit-Queue: Nicholas Shahan <[email protected]>
1 parent 6050401 commit fcab2e4

File tree

7 files changed

+2
-36
lines changed

7 files changed

+2
-36
lines changed

pkg/dev_compiler/analysis_options.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ linter:
2727
- prefer_single_quotes
2828
- prefer_relative_imports
2929
- unawaited_futures
30+
- unnecessary_breaks

pkg/dev_compiler/lib/src/js_ast/printer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// ignore_for_file: omit_local_variable_types
5+
// ignore_for_file: omit_local_variable_types, unnecessary_breaks
66

77
import 'characters.dart' as char_codes;
88
import 'nodes.dart';

pkg/dev_compiler/lib/src/kernel/compiler.dart

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -763,10 +763,8 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
763763
switch (component.mode) {
764764
case NonNullableByDefaultCompiledMode.Strong:
765765
soundNullSafety = js_ast.LiteralBool(true);
766-
break;
767766
case NonNullableByDefaultCompiledMode.Weak:
768767
soundNullSafety = js_ast.LiteralBool(false);
769-
break;
770768
default:
771769
throw StateError('Unsupported Null Safety mode ${component.mode}, '
772770
'in ${component.location?.file}.');
@@ -2952,7 +2950,6 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
29522950
// Reserved by JS, not a valid static member name.
29532951
case 'prototype':
29542952
name += '_';
2955-
break;
29562953
default:
29572954
// All trailing underscores static names are reserved for the compiler
29582955
// or SDK libraries.
@@ -3656,7 +3653,6 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
36563653
wrapBody:
36573654
_emitTopLevelNameNoExternalInterop(_asyncWrapJsFunctionMember),
36583655
bodyName: bodyName);
3659-
break;
36603656
case AsyncMarker.SyncStar:
36613657
asyncRewriter = SyncStarRewriter(
36623658
makeSyncStarIterable:
@@ -3669,7 +3665,6 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
36693665
yieldStarSelector: _emitMemberName('_yieldStar',
36703666
member: _syncStarIteratorYieldStarMember),
36713667
bodyName: bodyName);
3672-
break;
36733668
case AsyncMarker.AsyncStar:
36743669
asyncRewriter = AsyncStarRewriter(
36753670
asyncStarHelper:
@@ -3686,7 +3681,6 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
36863681
wrapBody:
36873682
_emitTopLevelNameNoExternalInterop(_asyncWrapJsFunctionMember),
36883683
bodyName: bodyName);
3689-
break;
36903684
}
36913685
if (asyncRewriter != null) {
36923686
return asyncRewriter.rewrite(fun, functionBody, functionEnd,
@@ -6684,7 +6678,6 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
66846678
var rti = _emitType(mapType);
66856679
return js.call('new #.new(#)', [mapClass, rti]);
66866680
}
6687-
break;
66886681
case 'Set':
66896682
case 'HashSet':
66906683
case 'LinkedHashSet':
@@ -6699,12 +6692,10 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
66996692
var rti = _emitType(setType);
67006693
return js.call('new #.new(#)', [setClass, rti]);
67016694
}
6702-
break;
67036695
case 'List':
67046696
if (ctor.name.text == '') {
67056697
return _emitList(type.typeArguments[0], []);
67066698
}
6707-
break;
67086699
}
67096700
}
67106701
var rti = _requiresRtiForInstantiation(ctorClass)

pkg/dev_compiler/lib/src/kernel/compiler_new.dart

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -893,10 +893,8 @@ class LibraryCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
893893
switch (_component.mode) {
894894
case NonNullableByDefaultCompiledMode.Strong:
895895
soundNullSafety = js_ast.LiteralBool(true);
896-
break;
897896
case NonNullableByDefaultCompiledMode.Weak:
898897
soundNullSafety = js_ast.LiteralBool(false);
899-
break;
900898
default:
901899
throw StateError('Unsupported Null Safety mode ${_component.mode}, '
902900
'in ${_component.location?.file}.');
@@ -3125,7 +3123,6 @@ class LibraryCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
31253123
// Reserved by JS, not a valid static member name.
31263124
case 'prototype':
31273125
name += '_';
3128-
break;
31293126
default:
31303127
// All trailing underscores static names are reserved for the compiler
31313128
// or SDK libraries.
@@ -3829,7 +3826,6 @@ class LibraryCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
38293826
wrapBody:
38303827
_emitTopLevelNameNoExternalInterop(_asyncWrapJsFunctionMember),
38313828
bodyName: bodyName);
3832-
break;
38333829
case AsyncMarker.SyncStar:
38343830
asyncRewriter = SyncStarRewriter(
38353831
makeSyncStarIterable:
@@ -3842,7 +3838,6 @@ class LibraryCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
38423838
yieldStarSelector: _emitMemberName('_yieldStar',
38433839
member: _syncStarIteratorYieldStarMember),
38443840
bodyName: bodyName);
3845-
break;
38463841
case AsyncMarker.AsyncStar:
38473842
asyncRewriter = AsyncStarRewriter(
38483843
asyncStarHelper:
@@ -3859,7 +3854,6 @@ class LibraryCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
38593854
wrapBody:
38603855
_emitTopLevelNameNoExternalInterop(_asyncWrapJsFunctionMember),
38613856
bodyName: bodyName);
3862-
break;
38633857
}
38643858
if (asyncRewriter != null) {
38653859
return asyncRewriter.rewrite(fun, functionBody, functionEnd,
@@ -6856,7 +6850,6 @@ class LibraryCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
68566850
var rti = _emitType(mapType);
68576851
return js.call('new #.new(#)', [mapClass, rti]);
68586852
}
6859-
break;
68606853
case 'Set':
68616854
case 'HashSet':
68626855
case 'LinkedHashSet':
@@ -6871,12 +6864,10 @@ class LibraryCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
68716864
var rti = _emitType(setType);
68726865
return js.call('new #.new(#)', [setClass, rti]);
68736866
}
6874-
break;
68756867
case 'List':
68766868
if (ctor.name.text == '') {
68776869
return _emitList(type.typeArguments[0], []);
68786870
}
6879-
break;
68806871
}
68816872
}
68826873
var rti = _requiresRtiForInstantiation(ctorClass)

pkg/dev_compiler/lib/src/kernel/expression_compiler_worker.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,11 +287,9 @@ class ExpressionCompilerWorker {
287287
case 'UpdateDeps':
288288
sendResponse(await _updateDependencies(
289289
UpdateDependenciesRequest.fromJson(request)));
290-
break;
291290
case 'CompileExpression':
292291
sendResponse(await _compileExpression(
293292
CompileExpressionRequest.fromJson(request)));
294-
break;
295293
default:
296294
throw ArgumentError(
297295
'Unrecognized command `$command`, full request was `$request`');
@@ -787,13 +785,10 @@ void Function(DiagnosticMessage) _onDiagnosticHandler(
787785
case Severity.error:
788786
case Severity.internalProblem:
789787
errors.add(message.plainTextFormatted.join('\n'));
790-
break;
791788
case Severity.warning:
792789
warnings.add(message.plainTextFormatted.join('\n'));
793-
break;
794790
case Severity.info:
795791
infos.add(message.plainTextFormatted.join('\n'));
796-
break;
797792
case Severity.context:
798793
case Severity.ignored:
799794
throw 'Unexpected severity: ${message.severity}';

pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_suite.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ class ExpressionEvaluationTestDriver {
223223
};
224224
</script>
225225
''');
226-
break;
227226
case ModuleFormat.amd:
228227
var dartSdkPathNoExtension = escaped(SetupCompilerOptions.buildRoot
229228
.resolve(p.join(
@@ -288,7 +287,6 @@ class ExpressionEvaluationTestDriver {
288287
</script>
289288
''');
290289

291-
break;
292290
default:
293291
throw Exception('Unsupported module format for SDK evaluation tests: '
294292
'${setup.moduleFormat}');
@@ -841,7 +839,6 @@ class ExpressionEvaluationTestDriver {
841839
switch (type) {
842840
case 'function':
843841
str = obj.description ?? '';
844-
break;
845842
case 'object':
846843
if (obj.subtype == 'null') {
847844
return 'null';
@@ -860,10 +857,8 @@ class ExpressionEvaluationTestDriver {
860857
} catch (e, s) {
861858
throw StateError('Failed to stringify remote object $obj: $e:$s');
862859
}
863-
break;
864860
default:
865861
str = '${obj.value}';
866-
break;
867862
}
868863
return str;
869864
}

pkg/dev_compiler/test/hot_reload_suite.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ Future<void> main(List<String> args) async {
195195
'--target=dartdevc',
196196
];
197197
controller = HotReloadFrontendServerController(fesArgs);
198-
break;
199198
case RuntimePlatforms.vm:
200199
final vmPlatformDillFromSdkRoot = fe_shared.relativizeUri(
201200
sdkRoot, vmPlatformDillUri, fe_shared.isWindows);
@@ -205,7 +204,6 @@ Future<void> main(List<String> args) async {
205204
'--target=vm',
206205
];
207206
controller = HotReloadFrontendServerController(fesArgs);
208-
break;
209207
}
210208
controller.start();
211209

@@ -424,7 +422,6 @@ Future<void> main(List<String> args) async {
424422
}
425423
});
426424
});
427-
break;
428425
case DiffMode.write:
429426
_print('Generating source file diffs.', label: testName);
430427
filesByGeneration.forEach((basename, filesQueue) {
@@ -462,7 +459,6 @@ Future<void> main(List<String> args) async {
462459
reportDiffOutcome(file, 'diff updated for $file', true);
463460
});
464461
});
465-
break;
466462
case DiffMode.ignore:
467463
_print('Ignoring source file diffs.', label: testName);
468464
filesByGeneration.forEach((basename, filesQueue) {
@@ -471,7 +467,6 @@ Future<void> main(List<String> args) async {
471467
reportDiffOutcome(file, 'Ignoring diff for $file', true);
472468
});
473469
});
474-
break;
475470
}
476471

477472
// Skip this test directory if this platform is excluded.
@@ -658,7 +653,6 @@ Future<void> main(List<String> args) async {
658653
final d8ExitCode = await d8Suite.runTest(testName: testName);
659654
testPassed = d8ExitCode == 0;
660655
await d8Suite.teardownTest(testName: testName);
661-
break;
662656
case RuntimePlatforms.chrome:
663657
// Run the compiled JS generations with Chrome.
664658
_print('Creating Chrome hot reload test suite.', label: testName);
@@ -683,7 +677,6 @@ Future<void> main(List<String> args) async {
683677
final exitCode = await suite.runTest(testName: testName);
684678
testPassed = exitCode == 0;
685679
await suite.teardownTest(testName: testName);
686-
break;
687680
case RuntimePlatforms.vm:
688681
final firstGenerationDillUri =
689682
tempUri.resolve('generation0/$testName.dill');

0 commit comments

Comments
 (0)