add BREAK suggestions to switch cases

pq · commit-bot@chromium.org · commit 851701d2a49a · 2019-08-28T20:27:51.000Z
fixes: #36605 Change-Id: I29e3b6a46c542895995b5eedcc64262352bb49a0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114748 Reviewed-by: Dan Rubel <danrubel@google.com> Commit-Queue: Phil Quitslund <pquitslund@google.com>
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.dart
@@ -646,6 +646,12 @@ class _KeywordVisitor extends GeneralizingAstVisitor {
     }
   }
 
+  @override
+  visitSwitchCase(SwitchCase node) {
+    _addSuggestion(Keyword.BREAK);
+    return super.visitSwitchCase(node);
+  }
+
   @override
   visitTryStatement(TryStatement node) {
     var obj = entity;
diff --git a/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart
@@ -1983,6 +1983,18 @@ f() => [...^];
         relevance: DART_RELEVANCE_HIGH);
   }
 
+  test_switch_statement_case_break_insideClass() async {
+    addTestSource('class A{foo() {switch(1) {case 1: b^}}}');
+    await computeSuggestions();
+    assertSuggestKeywords([Keyword.BREAK]);
+  }
+
+  test_switch_statement_case_break_outsideClass() async {
+    addTestSource('foo() {switch(1) {case 1: b^}}');
+    await computeSuggestions();
+    assertSuggestKeywords([Keyword.BREAK]);
+  }
+
   test_switch_statement_insideClass() async {
     addTestSource('class A{foo() {switch(1) {case 1:^}}}');
     await computeSuggestions();

Original file line number	Diff line number	Diff line change
`@@ -646,6 +646,12 @@ class _KeywordVisitor extends GeneralizingAstVisitor {`
`646`	`646`	`}`
`647`	`647`	`}`
`648`	`648`
	`649`	`+ @override`
	`650`	`+ visitSwitchCase(SwitchCase node) {`
	`651`	`+ _addSuggestion(Keyword.BREAK);`
	`652`	`+ return super.visitSwitchCase(node);`
	`653`	`+ }`
	`654`	`+`
`649`	`655`	`@override`
`650`	`656`	`visitTryStatement(TryStatement node) {`
`651`	`657`	`var obj = entity;`