replace request.node with request.target

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';
@@ skipping 45 matching lines @@
     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) {
+    for (CompletionSuggestion s in request.suggestions) {
       if (s.kind == CompletionSuggestionKind.KEYWORD) {
         Keyword k = Keyword.keywords[s.completion];
         if (k == null) {
           fail('Invalid keyword suggested: ${s.completion}');
         } else {
           if (!actualKeywords.add(k)) {
             fail('Duplicate keyword suggested: ${s.completion}');
           }
         }
-        expect(s.relevance, equals(relevance), reason: k.toString());
-        expect(s.selectionOffset, equals(s.completion.length));
-        expect(s.selectionLength, equals(0));
-        expect(s.isDeprecated, equals(false));
-        expect(s.isPotential, equals(false));
       }
-    });
+    };
     if (expectedKeywords.any((k) => k is String)) {
       StringBuffer msg = new StringBuffer();
       msg.writeln('Expected set should be:');
       expectedKeywords.forEach((n) {
         Keyword k = Keyword.keywords[n];
         msg.writeln('  Keyword.${k.name},');
       });
       fail(msg.toString());
     }
     if (!_equalSets(expectedKeywords, actualKeywords)) {
       StringBuffer msg = new StringBuffer();
       msg.writeln('Expected:');
       _appendKeywords(msg, expectedKeywords);
       msg.writeln('but found:');
       _appendKeywords(msg, actualKeywords);
       fail(msg.toString());
     }
+    for (CompletionSuggestion s in request.suggestions) {
+      if (s.kind == CompletionSuggestionKind.KEYWORD) {
+        Keyword k = Keyword.keywords[s.completion];
+        expect(s.relevance, equals(relevance), reason: k.toString());
+        expect(s.selectionOffset, equals(s.completion.length));
+        expect(s.selectionLength, equals(0));
+        expect(s.isDeprecated, equals(false));
+        expect(s.isPotential, equals(false));
+      }
+    };
   }
 
   @override
   void setUpComputer() {
     computer = new KeywordComputer();
   }
 
   test_after_class() {
     addTestSource('class A {} ^');
     expect(computeFast(), isTrue);
@@ skipping 56 matching lines @@
     addTestSource('^ import foo;');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([
       Keyword.EXPORT,
       Keyword.IMPORT,
       Keyword.LIBRARY,
       Keyword.PART
     ], DART_RELEVANCE_HIGH);
   }
 
-  test_class() {
-    addTestSource('class A ^');
-    expect(computeFast(), isTrue);
-    assertSuggestKeywords(
-        [Keyword.EXTENDS, Keyword.IMPLEMENTS], DART_RELEVANCE_HIGH);
-  }
-
-  test_class2() {
-    addTestSource('class A e^');
-    expect(computeFast(), isTrue);
-    assertSuggestKeywords(
-        [Keyword.EXTENDS, Keyword.IMPLEMENTS], DART_RELEVANCE_HIGH);
-  }
-
-  test_class3() {
+  test_class4() {
     addTestSource('class A e^ { }');
     expect(computeFast(), isTrue);
     assertSuggestKeywords(
         [Keyword.EXTENDS, Keyword.IMPLEMENTS], DART_RELEVANCE_HIGH);
   }
 
   test_class_extends() {
     addTestSource('class A extends foo ^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords(
@@ skipping 47 matching lines @@
     expect(computeFast(), isTrue);
     assertSuggestKeywords([]);
   }
 
   test_class_name() {
     addTestSource('class ^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([]);
   }
 
+  test_class_noBody() {
+    addTestSource('class A ^');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(
+        [Keyword.EXTENDS, Keyword.IMPLEMENTS], DART_RELEVANCE_HIGH);
+  }
+
+  test_class_noBody2() {
+    addTestSource('class A e^');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(
+        [Keyword.EXTENDS, Keyword.IMPLEMENTS], DART_RELEVANCE_HIGH);
+  }
+
+  test_class_noBody3() {
+    addTestSource('class A e^ String foo;');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(
+        [Keyword.EXTENDS, Keyword.IMPLEMENTS], DART_RELEVANCE_HIGH);
+  }
+
   test_class_with() {
     addTestSource('class A extends foo with bar ^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([Keyword.IMPLEMENTS], DART_RELEVANCE_HIGH);
   }
 
   test_class_with2() {
     addTestSource('class A extends foo with bar i^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([Keyword.IMPLEMENTS], DART_RELEVANCE_HIGH);
@@ skipping 194 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;
   }
 }