Issue 21879. Don't include 'this' and 'super' keywords if not in a method/constructor body.

pkg/analysis_server/test/services/completion/keyword_computer_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // 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.
 
 library test.services.completion.dart.keyword;
 
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
 import 'package:analysis_server/src/services/completion/keyword_computer.dart';
 import 'package:analyzer/src/generated/scanner.dart';
 import 'package:unittest/unittest.dart';
 
 import '../../reflective_tests.dart';
 import 'completion_test_util.dart';
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(KeywordComputerTest);
 }
 
 @reflectiveTest
 class KeywordComputerTest extends AbstractCompletionTest {
+  static const List<Keyword> IN_BLOCK_IN_CLASS =
+      const [
+          Keyword.ASSERT,
+          Keyword.CASE,
+          Keyword.CONTINUE,
+          Keyword.DO,
+          Keyword.FINAL,
+          Keyword.FOR,
+          Keyword.IF,
+          Keyword.NEW,
+          Keyword.RETHROW,
+          Keyword.RETURN,
+          Keyword.SUPER,
+          Keyword.SWITCH,
+          Keyword.THIS,
+          Keyword.THROW,
+          Keyword.TRY,
+          Keyword.VAR,
+          Keyword.VOID,
+          Keyword.WHILE];
+
+  static const List<Keyword> IN_BLOCK_NOT_IN_CLASS =
+      const [
+          Keyword.ASSERT,
+          Keyword.CASE,
+          Keyword.CONTINUE,
+          Keyword.DO,
+          Keyword.FINAL,
+          Keyword.FOR,
+          Keyword.IF,
+          Keyword.NEW,
+          Keyword.RETHROW,
+          Keyword.RETURN,
+          Keyword.SWITCH,
+          Keyword.THROW,
+          Keyword.TRY,
+          Keyword.VAR,
+          Keyword.VOID,
+          Keyword.WHILE];
 
   void assertSuggestKeywords(Iterable<Keyword> expectedKeywords, [int relevance
       = DART_RELEVANCE_KEYWORD]) {
     Set<Keyword> actualKeywords = new Set<Keyword>();
     request.suggestions.forEach((CompletionSuggestion s) {
       if (s.kind == CompletionSuggestionKind.KEYWORD) {
         Keyword k = Keyword.keywords[s.completion];
         if (k == null) {
           fail('Invalid keyword suggested: ${s.completion}');
         } else {
@@ skipping 227 matching lines @@
             Keyword.EXPORT,
             Keyword.FINAL,
             Keyword.IMPORT,
             Keyword.LIBRARY,
             Keyword.PART,
             Keyword.TYPEDEF,
             Keyword.VAR],
         DART_RELEVANCE_HIGH);
   }
 
-  test_function_body() {
+  test_function_body_inClass_constructorInitializer() {
+    addTestSource(r'''
+foo(p) {}
+class A {
+  final f;
+  A() : f = foo(() {^});
+}
+''');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(IN_BLOCK_NOT_IN_CLASS);
+  }
+
+  test_function_body_inClass_field() {
+    addTestSource(r'''
+class A {
+  var f = () {^};
+}
+''');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(IN_BLOCK_NOT_IN_CLASS);
+  }
+
+  test_function_body_inClass_methodBody() {
+    addTestSource(r'''
+class A {
+  m() {
+    f() {^};
+  }
+}
+''');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(IN_BLOCK_IN_CLASS);
+  }
+
+  test_function_body_inClass_methodBody_inFunction() {
+    addTestSource(r'''
+class A {
+  m() {
+    f() {
+      f2() {^};
+    };
+  }
+}
+''');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(IN_BLOCK_IN_CLASS);
+  }
+
+  test_function_body_inUnit() {
     addTestSource('main() {^}');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords(
-        [
-            Keyword.ASSERT,
-            Keyword.CASE,
-            Keyword.CONTINUE,
-            Keyword.DO,
-            Keyword.FACTORY,
-            Keyword.FINAL,
-            Keyword.FOR,
-            Keyword.IF,
-            Keyword.NEW,
-            Keyword.RETHROW,
-            Keyword.RETURN,
-            Keyword.SUPER,
-            Keyword.SWITCH,
-            Keyword.THIS,
-            Keyword.THROW,
-            Keyword.TRY,
-            Keyword.VAR,
-            Keyword.VOID,
-            Keyword.WHILE]);
+    assertSuggestKeywords(IN_BLOCK_NOT_IN_CLASS);
   }
 
-  test_function_body2() {
+  test_function_body_inUnit_afterBlock() {
     addTestSource('main() {{}^}');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords(
-        [
-            Keyword.ASSERT,
-            Keyword.CASE,
-            Keyword.CONTINUE,
-            Keyword.DO,
-            Keyword.FACTORY,
-            Keyword.FINAL,
-            Keyword.FOR,
-            Keyword.IF,
-            Keyword.NEW,
-            Keyword.RETHROW,
-            Keyword.RETURN,
-            Keyword.SUPER,
-            Keyword.SWITCH,
-            Keyword.THIS,
-            Keyword.THROW,
-            Keyword.TRY,
-            Keyword.VAR,
-            Keyword.VOID,
-            Keyword.WHILE]);
+    assertSuggestKeywords(IN_BLOCK_NOT_IN_CLASS);
   }
 
   test_in_class() {
     addTestSource('class A {^}');
     expect(computeFast(), isTrue);
     assertSuggestKeywords(
         [
             Keyword.CONST,
             Keyword.DYNAMIC,
             Keyword.FACTORY,
@@ skipping 25 matching lines @@
 
   test_library_name() {
     addTestSource('library ^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([]);
   }
 
   test_method_body() {
     addTestSource('class A { foo() {^}}');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords(
-        [
-            Keyword.ASSERT,
-            Keyword.CASE,
-            Keyword.CONTINUE,
-            Keyword.DO,
-            Keyword.FACTORY,
-            Keyword.FINAL,
-            Keyword.FOR,
-            Keyword.IF,
-            Keyword.NEW,
-            Keyword.RETHROW,
-            Keyword.RETURN,
-            Keyword.SUPER,
-            Keyword.SWITCH,
-            Keyword.THIS,
-            Keyword.THROW,
-            Keyword.TRY,
-            Keyword.VAR,
-            Keyword.VOID,
-            Keyword.WHILE]);
+    assertSuggestKeywords(IN_BLOCK_IN_CLASS);
   }
 
   test_named_constructor_invocation() {
     addTestSource('void main() {new Future.^}');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([]);
   }
 
   test_part_of() {
     addTestSource('part of foo;^');
@@ skipping 53 matching lines @@
     sorted.forEach((k) => msg.writeln('  Keyword.${k.name},'));
   }
 
   bool _equalSets(Iterable<Keyword> iter1, Iterable<Keyword> iter2) {
     if (iter1.length != iter2.length) return false;
     if (iter1.any((k) => !iter2.contains(k))) return false;
     if (iter2.any((k) => !iter1.contains(k))) return false;
     return true;
   }
 }