Make add/remove type Quick Assists less obtrusive.

pkg/analysis_server/test/services/correction/assist_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.correction.assist;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
 import 'package:analysis_server/plugin/protocol/protocol.dart';
@@ skipping 372 matching lines @@
 
   test_addTypeAnnotation_local_BAD_null() async {
     resolveTestUnit('''
 main() {
   var v = null;
 }
 ''');
     await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
   }
 
+  test_addTypeAnnotation_local_BAD_onInitializer() async {
+    resolveTestUnit('''
+main() {
+  var abc = 0;
+}
+''');
+    await assertNoAssistAt('0;', DartAssistKind.ADD_TYPE_ANNOTATION);
+  }
+
   test_addTypeAnnotation_local_BAD_unknown() async {
     verifyNoTestUnitErrors = false;
     resolveTestUnit('''
 main() {
   var v = unknownVar;
 }
 ''');
     await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
   }
 
@@ skipping 213 matching lines @@
         DartAssistKind.ADD_TYPE_ANNOTATION,
         '''
 class C {}
 C f() => null;
 main() {
   C x = f();
 }
 ''');
   }
 
-  test_addTypeAnnotation_local_OK_onInitializer() async {
-    resolveTestUnit('''
-main() {
-  var v = 123;
-}
-''');
-    await assertHasAssistAt(
-        '23',
-        DartAssistKind.ADD_TYPE_ANNOTATION,
-        '''
-main() {
-  int v = 123;
-}
-''');
-  }
-
   test_addTypeAnnotation_local_OK_onName() async {
     resolveTestUnit('''
 main() {
   var abc = 0;
 }
 ''');
     await assertHasAssistAt(
         'bc',
         DartAssistKind.ADD_TYPE_ANNOTATION,
         '''
@@ skipping 12 matching lines @@
     await assertHasAssistAt(
         'var ',
         DartAssistKind.ADD_TYPE_ANNOTATION,
         '''
 main() {
   int v = 0;
 }
 ''');
   }
 
-  test_addTypeAnnotation_local_OK_onVariableDeclarationStatement() async {
-    resolveTestUnit('''
-main() {
-  var v = 123; // marker
-}
-''');
-    await assertHasAssistAt(
-        ' // marker',
-        DartAssistKind.ADD_TYPE_ANNOTATION,
-        '''
-main() {
-  int v = 123; // marker
-}
-''');
-  }
-
   test_addTypeAnnotation_OK_privateType_sameLibrary() async {
     resolveTestUnit('''
 class _A {}
 _A getValue() => new _A();
 main() {
   var v = getValue();
 }
 ''');
     await assertHasAssistAt(
         'var ',
@@ skipping 2576 matching lines @@
     await assertHasAssistAt(
         'v = ',
         DartAssistKind.REMOVE_TYPE_ANNOTATION,
         '''
 class A {
   final v = 1;
 }
 ''');
   }
 
+  test_removeTypeAnnotation_localVariable_BAD_onInitializer() async {
+    resolveTestUnit('''
+main() {
+  final int v = 1;
+}
+''');
+    await assertNoAssistAt('1;', DartAssistKind.REMOVE_TYPE_ANNOTATION);
+  }
+
   test_removeTypeAnnotation_localVariable_OK() async {
     resolveTestUnit('''
 main() {
   int a = 1, b = 2;
 }
 ''');
     await assertHasAssistAt(
         'int ',
         DartAssistKind.REMOVE_TYPE_ANNOTATION,
         '''
@@ skipping 659 matching lines @@
       positions.add(new Position(testFile, offset));
     }
     return positions;
   }
 
   void _setStartEndSelection() {
     offset = findOffset('// start\n') + '// start\n'.length;
     length = findOffset('// end') - offset;
   }
 }