refactor and cleanup code completion

pkg/analysis_services/test/completion/local_computer_test.dart

Index: pkg/analysis_services/test/completion/local_computer_test.dart
diff --git a/pkg/analysis_services/test/completion/local_computer_test.dart b/pkg/analysis_services/test/completion/local_computer_test.dart
index eb0a7f97126f1a960d7f0f75b8b81d249f0598fd..88df3ce543471c54122f4bbf07a4c074a2437a11 100644
--- a/pkg/analysis_services/test/completion/local_computer_test.dart
+++ b/pkg/analysis_services/test/completion/local_computer_test.dart
@@ -27,7 +27,7 @@ class LocalComputerTest extends AbstractCompletionTest {
   test_block() {
     addTestSource('class A {a() {var f; {var x;} ^ var g;}}');
     expect(computeFast(), isTrue);
-    assertSuggestVariable('f');
+    assertSuggestLocalVariable('f');
     assertNotSuggested('g');
     assertNotSuggested('x');
   }
@@ -77,13 +77,13 @@ class LocalComputerTest extends AbstractCompletionTest {
   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() {
@@ -102,7 +102,7 @@ class LocalComputerTest extends AbstractCompletionTest {
     // parses differently than var ^ in test below
     assertSuggestClass('A');
     assertSuggestMethodName('a');
-    assertSuggestVariable('f');
+    assertSuggestLocalVariable('f');
   }
 
   test_local_name2() {
@@ -155,7 +155,7 @@ class LocalComputerTest extends AbstractCompletionTest {
   test_variableDeclaration() {
     addTestSource('main() {int a = 1, b = 2 + ^;}');
     expect(computeFast(), isTrue);
-    assertSuggestVariable('a');
+    assertSuggestLocalVariable('a');
     assertNotSuggested('b');
   }
 }