Improve used name relations and fields indexing.

pkg/analysis_server/test/services/search/search_engine2_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.src.search.search_engine2;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/services/index2/index2.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
@@ skipping 110 matching lines @@
 class A {
   var test; // A
   mainA() {
     test(); // a-inv-r-nq
     test = 1; // a-ref-r-nq
     test += 2; // a-ref-r-nq
     print(test); // a-ref-r-nq
   }
 }
 main(A a, p) {
-  a.test(); // a-inv-r-q
-  a.test = 1; // a-ref-r-q
-  a.test += 2; // a-ref-r-q
-  print(a.test); // a-ref-r-q
-  p.test(); // p-inv-ur-q
-  p.test = 1; // p-ref-ur-q
-  p.test += 2; // p-ref-ur-q
-  print(p.test); // p-ref-ur-q
+  print(a.test); // r
+  a.test = 1; // r
+  a.test += 2; // r
+  a.test(); // r
+  print(p.test); // ur
+  p.test = 1; // ur
+  p.test += 2; // ur
+  p.test(); // ur
 }
 ''');
     Element main = findElement('main');
     var expected = [
-      _expectIdQ(main, MatchKind.REFERENCE, 'test(); // p-inv-ur-q'),
-      _expectIdQ(main, MatchKind.REFERENCE, 'test = 1; // p-ref-ur-q'),
-      _expectIdQ(main, MatchKind.REFERENCE, 'test += 2; // p-ref-ur-q'),
-      _expectIdQ(main, MatchKind.REFERENCE, 'test); // p-ref-ur-q'),
+      _expectIdQU(main, MatchKind.READ, 'test); // ur'),
+      _expectIdQU(main, MatchKind.WRITE, 'test = 1; // ur'),
+      _expectIdQU(main, MatchKind.READ_WRITE, 'test += 2; // ur'),
+      _expectIdQU(main, MatchKind.INVOCATION, 'test(); // ur'),
     ];
     List<SearchMatch> matches =
         await searchEngine.searchMemberReferences('test');
     _assertMatches(matches, expected);
   }
 
   test_searchReferences_ClassElement() async {
     _indexTestUnit('''
 class A {}
 main(A p) {
@@ skipping 81 matching lines @@
     // setter
     field = 2; // ref-nq;
     this.field = 3; // ref-q;
   }
 }
 ''');
     FieldElement element = findElement('field');
     Element main = findElement('main');
     Element fieldParameter = findElement('field', ElementKind.PARAMETER);
     var expected = [
-      _expectIdQ(fieldParameter, MatchKind.REFERENCE, 'field}'),
+      _expectIdQ(fieldParameter, MatchKind.WRITE, 'field}'),
       _expectIdQ(main, MatchKind.REFERENCE, 'field: 1'),
       _expectId(main, MatchKind.READ, 'field); // ref-nq'),
       _expectIdQ(main, MatchKind.READ, 'field); // ref-q'),
       _expectId(main, MatchKind.INVOCATION, 'field(); // inv-nq'),
       _expectIdQ(main, MatchKind.INVOCATION, 'field(); // inv-q'),
       _expectId(main, MatchKind.WRITE, 'field = 2; // ref-nq'),
       _expectIdQ(main, MatchKind.WRITE, 'field = 3; // ref-q'),
     ];
     await _verifyReferences(element, expected);
   }
@@ skipping 473 matching lines @@
   ExpectedMatch _expectId(Element element, MatchKind kind, String search,
       {int length, bool isResolved: true, bool isQualified: false}) {
     int offset = findOffset(search);
     if (length == null) {
       length = getLeadingIdentifierLength(search);
     }
     return new ExpectedMatch(element, kind, offset, length,
         isResolved: isResolved, isQualified: isQualified);
   }
 
   ExpectedMatch _expectIdQ(Element element, MatchKind kind, String search,

[Brian Wilkerson, 2016/03/11 18:14:03]

nit: it might be good to document what 'Q' and 'QU' mean.

+      {int length, bool isResolved: true}) {
+    return _expectId(element, kind, search, isQualified: true, length: length);
+  }
+
+  ExpectedMatch _expectIdQU(Element element, MatchKind kind, String search,
       {int length}) {
-    return _expectId(element, kind, search, isQualified: true, length: length);
+    return _expectId(element, kind, search,
+        isQualified: true, isResolved: false, length: length);
   }
 
   void _indexTestUnit(String code) {
     resolveTestUnit(code);
     index.indexUnit(testUnit);
   }
 
   Future _verifyReferences(
       Element element, List<ExpectedMatch> expectedMatches) async {
     List<SearchMatch> matches = await searchEngine.searchReferences(element);
     _assertMatches(matches, expectedMatches);
     expect(matches, hasLength(expectedMatches.length));
   }
 
   static void _assertMatches(
       List<SearchMatch> matches, List<ExpectedMatch> expectedMatches) {
     expect(matches, unorderedEquals(expectedMatches));
   }
 }