Issue 21655. Don't import self when add type declaration.

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 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/local_memory_index.dart';
@@ skipping 344 matching lines @@
   var v = <String>[];
 }
 ''');
     assertHasAssistAt('v =', AssistKind.ADD_TYPE_ANNOTATION, '''
 main() {
   List<String> v = <String>[];
 }
 ''');
   }
 
+  void test_addTypeAnnotation_local_OK_localType() {
+    _indexTestUnit('''
+class C {}
+C f() => null;
+main() {
+  var x = f();
+}
+''');
+    assertHasAssistAt('x =', AssistKind.ADD_TYPE_ANNOTATION, '''
+class C {}
+C f() => null;
+main() {
+  C x = f();
+}
+''');
+  }
+
   void test_addTypeAnnotation_local_OK_onInitializer() {
     _indexTestUnit('''
 main() {
   var v = 123;
 }
 ''');
     assertHasAssistAt('23', AssistKind.ADD_TYPE_ANNOTATION, '''
 main() {
   int v = 123;
 }
@@ skipping 2191 matching lines @@
   void _indexTestUnit(String code) {
     resolveTestUnit(code);
     index.indexUnit(context, testUnit);
   }
 
   void _setStartEndSelection() {
     offset = findOffset('// start\n') + '// start\n'.length;
     length = findOffset('// end') - offset;
   }
 }