Stop returning declaration matches from search for references.

pkg/analysis_server/test/search/element_references_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.search.element_references;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/services/index/index.dart';
@@ skipping 135 matching lines @@
 }
 main(A a) {
   a.fff = 20;
   a.fff += 30;
   print(a.fff); // in main()
   a.fff(); // in main()
 }
 ''');
     await findElementReferences('fff; // declaration', false);
     expect(searchElement.kind, ElementKind.FIELD);
-    expect(results, hasLength(11));
-    assertHasResult(SearchResultKind.DECLARATION, 'fff; // declaration');
+    expect(results, hasLength(10));
     assertHasResult(SearchResultKind.WRITE, 'fff); // in constructor');
     assertHasResult(SearchResultKind.WRITE, 'fff = 1;');
     // m()
     assertHasResult(SearchResultKind.WRITE, 'fff = 2;');
     assertHasResult(SearchResultKind.WRITE, 'fff += 3;');
     assertHasResult(SearchResultKind.READ, 'fff); // in m()');
     assertHasResult(SearchResultKind.INVOCATION, 'fff(); // in m()');
     // main()
     assertHasResult(SearchResultKind.WRITE, 'fff = 20;');
     assertHasResult(SearchResultKind.WRITE, 'fff += 30;');
@@ skipping 41 matching lines @@
   var fff; // declaration
   A(this.fff); // in constructor
   m() {
     fff = 2;
     print(fff); // in m()
   }
 }
 ''');
     await findElementReferences('fff); // in constructor', false);
     expect(searchElement.kind, ElementKind.FIELD);
-    expect(results, hasLength(4));
-    assertHasResult(SearchResultKind.DECLARATION, 'fff; // declaration');
+    expect(results, hasLength(3));
     assertHasResult(SearchResultKind.WRITE, 'fff); // in constructor');
     assertHasResult(SearchResultKind.WRITE, 'fff = 2;');
     assertHasResult(SearchResultKind.READ, 'fff); // in m()');
   }
 
   test_function() async {
     addTestFile('''
 fff(p) {}
 main() {
   fff(1);
@@ skipping 19 matching lines @@
     int fff; // in C
   }
   main(A a, B b, C c) {
     a.fff = 10;
     b.fff = 20;
     c.fff = 30;
   }
   ''');
     await findElementReferences('fff; // in B', false);
     expect(searchElement.kind, ElementKind.FIELD);
-    assertHasResult(SearchResultKind.DECLARATION, 'fff; // in A');
-    assertHasResult(SearchResultKind.DECLARATION, 'fff; // in B');
-    assertHasResult(SearchResultKind.DECLARATION, 'fff; // in C');
     assertHasResult(SearchResultKind.WRITE, 'fff = 10;');
     assertHasResult(SearchResultKind.WRITE, 'fff = 20;');
     assertHasResult(SearchResultKind.WRITE, 'fff = 30;');
   }
 
   test_hierarchy_method() async {
     addTestFile('''
 class A {
   mmm(_) {} // in A
 }
@@ skipping 46 matching lines @@
   for (int i = 0; i < 10; i++) {
     if (i == 2) {
       continue myLabel; // continue
     }
     break myLabel; // break
   }
 }
 ''');
     await findElementReferences('myLabel; // break', false);
     expect(searchElement.kind, ElementKind.LABEL);
-    expect(results, hasLength(3));
-    assertHasResult(SearchResultKind.DECLARATION, 'myLabel:');
+    expect(results, hasLength(2));
     assertHasResult(SearchResultKind.REFERENCE, 'myLabel; // continue');
     assertHasResult(SearchResultKind.REFERENCE, 'myLabel; // break');
   }
 
   test_localVariable() async {
     addTestFile('''
 main() {
   var vvv = 1;
   print(vvv);
   vvv += 3;
   vvv = 2;
   vvv();
 }
 ''');
     await findElementReferences('vvv = 1', false);
     expect(searchElement.kind, ElementKind.LOCAL_VARIABLE);
-    expect(results, hasLength(5));
-    assertHasResult(SearchResultKind.DECLARATION, 'vvv = 1');
+    expect(results, hasLength(4));
     assertHasResult(SearchResultKind.READ, 'vvv);');
     assertHasResult(SearchResultKind.READ_WRITE, 'vvv += 3');
     assertHasResult(SearchResultKind.WRITE, 'vvv = 2');
     assertHasResult(SearchResultKind.INVOCATION, 'vvv();');
   }
 
   test_method() async {
     addTestFile('''
 class A {
   mmm(p) {}
@@ skipping 60 matching lines @@
     addTestFile('''
 main(ppp) {
   print(ppp);
   ppp += 3;
   ppp = 2;
   ppp();
 }
 ''');
     await findElementReferences('ppp) {', false);
     expect(searchElement.kind, ElementKind.PARAMETER);
-    expect(results, hasLength(5));
-    assertHasResult(SearchResultKind.DECLARATION, 'ppp) {');
+    expect(results, hasLength(4));
     assertHasResult(SearchResultKind.READ, 'ppp);');
     assertHasResult(SearchResultKind.READ_WRITE, 'ppp += 3');
     assertHasResult(SearchResultKind.WRITE, 'ppp = 2');
     assertHasResult(SearchResultKind.INVOCATION, 'ppp();');
   }
 
   test_path_inConstructor_named() async {
     addTestFile('''
 library my_lib;
 class A {}
@@ skipping 146 matching lines @@
 import 'dart:async' as ppp;
 main() {
   ppp.Future a;
   ppp.Stream b;
 }
 ''');
     await findElementReferences("ppp;", false);
     expect(searchElement.kind, ElementKind.PREFIX);
     expect(searchElement.name, 'ppp');
     expect(searchElement.location.startLine, 1);
-    expect(results, hasLength(3));
-    assertHasResult(SearchResultKind.DECLARATION, 'ppp;');
+    expect(results, hasLength(2));
     assertHasResult(SearchResultKind.REFERENCE, 'ppp.Future');
     assertHasResult(SearchResultKind.REFERENCE, 'ppp.Stream');
   }
 
   test_topLevelVariable_explicit() async {
     addTestFile('''
 var vvv = 1;
 main() {
   print(vvv);
   vvv += 3;
   vvv = 2;
   vvv();
 }
 ''');
     await findElementReferences('vvv = 1', false);
     expect(searchElement.kind, ElementKind.TOP_LEVEL_VARIABLE);
-    expect(results, hasLength(5));
-    assertHasResult(SearchResultKind.DECLARATION, 'vvv = 1;');
+    expect(results, hasLength(4));
     assertHasResult(SearchResultKind.READ, 'vvv);');
     assertHasResult(SearchResultKind.WRITE, 'vvv += 3');
     assertHasResult(SearchResultKind.WRITE, 'vvv = 2');
     assertHasResult(SearchResultKind.INVOCATION, 'vvv();');
   }
 
   test_topLevelVariable_implicit() async {
     addTestFile('''
 get vvv => null;
 set vvv(x) {}
@@ skipping 71 matching lines @@
   print(vvv);
 }
 ''');
     Request request = new SearchFindElementReferencesParams(testFile, 0, false)
         .toRequest('0');
     Response response = await waitResponse(request);
     expect(response.error, isNotNull);
     expect(response.error.code, RequestErrorCode.NO_INDEX_GENERATED);
   }
 }