switch case statement completions

pq · commit-bot@chromium.org · commit ea09fbe45d05 · 2019-08-28T23:26:45.000Z
follow-up from: https://dart-review.googlesource.com/c/sdk/+/114748 Change-Id: If92ac6e67298e8950d7da57c0d1892cb29ae8c7b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114756 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> 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
@@ -648,7 +648,7 @@ class _KeywordVisitor extends GeneralizingAstVisitor {
 
   @override
   visitSwitchCase(SwitchCase node) {
-    _addSuggestion(Keyword.BREAK);
+    _addStatementKeywords(node);
     return super.visitSwitchCase(node);
   }
 
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
@@ -174,6 +174,44 @@ class KeywordContributorTest extends DartCompletionContributorTest {
         Keyword.WHILE
       ];
 
+  List<Keyword> get statementStartInSwitchCaseInClass => [
+        Keyword.ASSERT,
+        Keyword.BREAK,
+        Keyword.CONST,
+        Keyword.DO,
+        Keyword.FINAL,
+        Keyword.FOR,
+        Keyword.IF,
+        Keyword.NEW,
+        Keyword.RETURN,
+        Keyword.SUPER,
+        Keyword.THIS,
+        Keyword.SWITCH,
+        Keyword.THROW,
+        Keyword.TRY,
+        Keyword.VAR,
+        Keyword.VOID,
+        Keyword.WHILE
+      ];
+
+  List<Keyword> get statementStartInSwitchCaseOutsideClass => [
+        Keyword.ASSERT,
+        Keyword.BREAK,
+        Keyword.CONST,
+        Keyword.DO,
+        Keyword.FINAL,
+        Keyword.FOR,
+        Keyword.IF,
+        Keyword.NEW,
+        Keyword.RETURN,
+        Keyword.SWITCH,
+        Keyword.THROW,
+        Keyword.TRY,
+        Keyword.VAR,
+        Keyword.VOID,
+        Keyword.WHILE
+      ];
+
   List<Keyword> get statementStartInSwitchInClass => [
         Keyword.ASSERT,
         Keyword.BREAK,
@@ -1986,13 +2024,13 @@ f() => [...^];
   test_switch_statement_case_break_insideClass() async {
     addTestSource('class A{foo() {switch(1) {case 1: b^}}}');
     await computeSuggestions();
-    assertSuggestKeywords([Keyword.BREAK]);
+    assertSuggestKeywords(statementStartInSwitchCaseInClass);
   }
 
   test_switch_statement_case_break_outsideClass() async {
     addTestSource('foo() {switch(1) {case 1: b^}}');
     await computeSuggestions();
-    assertSuggestKeywords([Keyword.BREAK]);
+    assertSuggestKeywords(statementStartInSwitchCaseOutsideClass);
   }
 
   test_switch_statement_insideClass() async {
@@ -2169,6 +2207,14 @@ class KeywordContributorWithNnbdTest extends KeywordContributorTest {
   List<Keyword> get statementStartInLoopOutsideClass =>
       super.statementStartInLoopOutsideClass..add(Keyword.LATE);
 
+  @override
+  List<Keyword> get statementStartInSwitchCaseInClass =>
+      super.statementStartInSwitchCaseInClass..add(Keyword.LATE);
+
+  @override
+  List<Keyword> get statementStartInSwitchCaseOutsideClass =>
+      super.statementStartInSwitchCaseOutsideClass..add(Keyword.LATE);
+
   @override
   List<Keyword> get statementStartInSwitchInClass =>
       super.statementStartInSwitchInClass..add(Keyword.LATE);

Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ class _KeywordVisitor extends GeneralizingAstVisitor {`
`648`	`648`
`649`	`649`	`@override`
`650`	`650`	`visitSwitchCase(SwitchCase node) {`
`651`		`- _addSuggestion(Keyword.BREAK);`
	`651`	`+ _addStatementKeywords(node);`
`652`	`652`	`return super.visitSwitchCase(node);`
`653`	`653`	`}`
`654`	`654`