refactor and cleanup code completion

pkg/analysis_services/test/completion/local_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.local;
 
 import 'package:analysis_services/src/completion/local_computer.dart';
 import 'package:analysis_testing/reflective_tests.dart';
 import 'package:unittest/unittest.dart';
 
 import 'completion_test_util.dart';
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(LocalComputerTest);
 }
 
 @ReflectiveTestCase()
 class LocalComputerTest extends AbstractCompletionTest {
 
   @override
   void setUp() {
     super.setUp();
     computer = new LocalComputer();
   }
 
   test_block() {
     addTestSource('class A {a() {var f; {var x;} ^ var g;}}');
     expect(computeFast(), isTrue);
-    assertSuggestVariable('f');
+    assertSuggestLocalVariable('f');
     assertNotSuggested('g');
     assertNotSuggested('x');
   }
 
   test_catch() {
     addTestSource('class A {a() {try{} catch (e) {^}}}');
     expect(computeFast(), isTrue);
     assertSuggestParameter('e');
   }
 
@@ skipping 29 matching lines @@
     expect(computeFast(), isTrue);
     //TODO (danrubel) should not be suggested
     // but var ^ in this test
     // parses differently than B ^ in test above
     assertSuggestClass('A');
   }
 
   test_for() {
     addTestSource('main(args) {for (int i; i < 10; ++i) {^}}');
     expect(computeFast(), isTrue);
-    assertSuggestVariable('i');
+    assertSuggestLocalVariable('i');
   }
 
   test_forEach() {
     addTestSource('main(args) {for (foo in bar) {^}}');
     expect(computeFast(), isTrue);
-    assertSuggestVariable('foo');
+    assertSuggestLocalVariable('foo');
   }
 
   test_function() {
     addTestSource('main(args) {x.then((b) {^});}');
     expect(computeFast(), isTrue);
     assertSuggestFunction('main');
     assertSuggestParameter('args');
     assertSuggestParameter('b');
   }
 
   test_local_name() {
     addTestSource('class A {a() {var f; A ^}}');
     expect(computeFast(), isTrue);
     //TODO (danrubel) should not be suggested
     // but A ^ in this test
     // parses differently than var ^ in test below
     assertSuggestClass('A');
     assertSuggestMethodName('a');
-    assertSuggestVariable('f');
+    assertSuggestLocalVariable('f');
   }
 
   test_local_name2() {
     addTestSource('class A {a() {var f; var ^}}');
     expect(computeFast(), isTrue);
     assertNotSuggested('A');
     assertNotSuggested('a');
     assertNotSuggested('f');
   }
 
@@ skipping 32 matching lines @@
     expect(computeFast(), isTrue);
     // TODO (danrubel) should not be suggested
     // but var ^ in this test
     // parses differently than B ^ in test above
     assertSuggestClass('A');
   }
 
   test_variableDeclaration() {
     addTestSource('main() {int a = 1, b = 2 + ^;}');
     expect(computeFast(), isTrue);
-    assertSuggestVariable('a');
+    assertSuggestLocalVariable('a');
     assertNotSuggested('b');
   }
 }