Fix removing type annotations for const/final variables.

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:analyzer/src/generated/source.dart';
 import 'package:unittest/unittest.dart';
@@ skipping 2306 matching lines @@
   int v = 1;
 }
 ''');
     assertHasAssistAt('v = ', AssistKind.REMOVE_TYPE_ANNOTATION, '''
 class A {
   var v = 1;
 }
 ''');
   }
 
+  void test_removeTypeAnnotation_classField_OK_final() {
+    resolveTestUnit('''
+class A {
+  final int v = 1;
+}
+''');
+    assertHasAssistAt('v = ', AssistKind.REMOVE_TYPE_ANNOTATION, '''
+class A {
+  final v = 1;
+}
+''');
+  }
+
   void test_removeTypeAnnotation_localVariable_OK() {
     resolveTestUnit('''
 main() {
   int a = 1, b = 2;
 }
 ''');
     assertHasAssistAt('int ', AssistKind.REMOVE_TYPE_ANNOTATION, '''
 main() {
   var a = 1, b = 2;
 }
 ''');
   }
 
+  void test_removeTypeAnnotation_localVariable_OK_const() {
+    resolveTestUnit('''
+main() {
+  const int v = 1;
+}
+''');
+    assertHasAssistAt('int ', AssistKind.REMOVE_TYPE_ANNOTATION, '''
+main() {
+  const v = 1;
+}
+''');
+  }
+
+  void test_removeTypeAnnotation_localVariable_OK_final() {
+    resolveTestUnit('''
+main() {
+  final int v = 1;
+}
+''');
+    assertHasAssistAt('int ', AssistKind.REMOVE_TYPE_ANNOTATION, '''
+main() {
+  final v = 1;
+}
+''');
+  }
+
   void test_removeTypeAnnotation_topLevelVariable_OK() {
     resolveTestUnit('''
 int V = 1;
 ''');
     assertHasAssistAt('int ', AssistKind.REMOVE_TYPE_ANNOTATION, '''
 var V = 1;
 ''');
   }
 
+  void test_removeTypeAnnotation_topLevelVariable_OK_final() {
+    resolveTestUnit('''
+final int V = 1;
+''');
+    assertHasAssistAt('int ', AssistKind.REMOVE_TYPE_ANNOTATION, '''
+final V = 1;
+''');
+  }
+
   void test_replaceConditionalWithIfElse_OK_assignment() {
     resolveTestUnit('''
 main() {
   var v;
   v = true ? 111 : 222;
 }
 ''');
     // on conditional
     assertHasAssistAt('11 :', AssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE, '''
 main() {
@@ skipping 532 matching lines @@
       positions.add(new Position(testFile, offset));
     }
     return positions;
   }
 
   void _setStartEndSelection() {
     offset = findOffset('// start\n') + '// start\n'.length;
     length = findOffset('// end') - offset;
   }
 }