Update Analysis Server highlight API and implementation.

pkg/analysis_server/test/analysis/notification_highlights_test.dart

Index: pkg/analysis_server/test/analysis/notification_highlights_test.dart
diff --git a/pkg/analysis_server/test/analysis/notification_highlights_test.dart b/pkg/analysis_server/test/analysis/notification_highlights_test.dart
index 5e08e7bcce9048ad7bc35aa13af77562d61112d2..4fab81b40293a05be3afd1c18471c2662a061aa6 100644
--- a/pkg/analysis_server/test/analysis/notification_highlights_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_highlights_test.dart
@@ -569,7 +569,22 @@ part of lib;
     });
   }
 
-  test_DYNAMIC_TYPE() {
+  test_DYNAMIC_VARIABLE_field() {
+    addTestFile('''
+class A {
+  var f;
+  m() {
+    f = 1;
+  }
+}
+''');
+    return prepareHighlights().then((_) {
+      assertHasRegion(HighlightRegionType.INSTANCE_FIELD_DECLARATION, 'f;');
+      assertHasRegion(HighlightRegionType.INSTANCE_FIELD_REFERENCE, 'f = 1');
+    });
+  }
+
+  test_DYNAMIC_VARIABLE_local() {
     addTestFile('''
 f() {}
 main(p) {
@@ -580,10 +595,10 @@ main(p) {
 }
 ''');
     return prepareHighlights().then((_) {
-      assertHasRegion(HighlightRegionType.DYNAMIC_TYPE, 'p)');
-      assertHasRegion(HighlightRegionType.DYNAMIC_TYPE, 'v1 =');
-      assertNoRegion(HighlightRegionType.DYNAMIC_TYPE, 'v2;');
-      assertNoRegion(HighlightRegionType.DYNAMIC_TYPE, 'v3 =');
+      assertHasRegion(HighlightRegionType.DYNAMIC_VARIABLE, 'p)');
+      assertHasRegion(HighlightRegionType.DYNAMIC_VARIABLE, 'v1 =');
+      assertNoRegion(HighlightRegionType.DYNAMIC_VARIABLE, 'v2;');
+      assertNoRegion(HighlightRegionType.DYNAMIC_VARIABLE, 'v3 =');
     });
   }
 
@@ -614,61 +629,6 @@ main() {
     });
   }
 
-  test_FIELD() {
-    addTestFile('''
-class A {
-  int aaa = 1;
-  int bbb = 2;
-  A([this.bbb = 3]);
-}
-main(A a) {
-  a.aaa = 4;
-  a.bbb = 5;
-}
-''');
-    return prepareHighlights().then((_) {
-      assertHasRegion(HighlightRegionType.FIELD, 'aaa = 1');
-      assertHasRegion(HighlightRegionType.FIELD, 'bbb = 2');
-      assertHasRegion(HighlightRegionType.FIELD, 'bbb = 3');
-      assertHasRegion(HighlightRegionType.FIELD, 'aaa = 4');
-      assertHasRegion(HighlightRegionType.FIELD, 'bbb = 5');
-    });
-  }
-
-  test_FIELD_STATIC() {
-    addTestFile('''
-class A {
-  static aaa = 1;
-  static get bbb => null;
-  static set ccc(x) {}
-}
-main() {
-  A.aaa = 2;
-  A.bbb;
-  A.ccc = 3;
-}
-''');
-    return prepareHighlights().then((_) {
-      assertHasRegion(HighlightRegionType.FIELD_STATIC, 'aaa = 1');
-      assertHasRegion(HighlightRegionType.FIELD_STATIC, 'aaa = 2');
-      assertHasRegion(HighlightRegionType.FIELD_STATIC, 'bbb;');
-      assertHasRegion(HighlightRegionType.FIELD_STATIC, 'ccc = 3');
-    });
-  }
-
-  test_FUNCTION() {
-    addTestFile('''
-fff(p) {}
-main() {
-  fff(42);
-}
-''');
-    return prepareHighlights().then((_) {
-      assertHasRegion(HighlightRegionType.FUNCTION_DECLARATION, 'fff(p) {}');
-      assertHasRegion(HighlightRegionType.FUNCTION, 'fff(42)');
-    });
-  }
-
   test_FUNCTION_TYPE_ALIAS() {
     addTestFile('''
 typedef FFF(p);
@@ -681,22 +641,29 @@ main(FFF fff) {
     });
   }
 
-  test_GETTER_DECLARATION() {
+  test_GETTER() {
     addTestFile('''
 get aaa => null;
 class A {
   get bbb => null;
+  static get ccc => null;
 }
 main(A a) {
   aaa;
   a.bbb;
+  A.ccc;
 }
 ''');
     return prepareHighlights().then((_) {
-      assertHasRegion(HighlightRegionType.GETTER_DECLARATION, 'aaa => null');
-      assertHasRegion(HighlightRegionType.GETTER_DECLARATION, 'bbb => null');
-      assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'aaa;');
-      assertHasRegion(HighlightRegionType.FIELD, 'bbb;');
+      assertHasRegion(
+          HighlightRegionType.TOP_LEVEL_GETTER_DECLARATION, 'aaa => null');
+      assertHasRegion(
+          HighlightRegionType.INSTANCE_GETTER_DECLARATION, 'bbb => null');
+      assertHasRegion(
+          HighlightRegionType.STATIC_GETTER_DECLARATION, 'ccc => null');
+      assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE_REFERENCE, 'aaa;');
+      assertHasRegion(HighlightRegionType.INSTANCE_FIELD_REFERENCE, 'bbb;');
+      assertHasRegion(HighlightRegionType.STATIC_FIELD_REFERENCE, 'ccc;');
     });
   }
 
@@ -728,6 +695,29 @@ main() {
     });
   }
 
+  test_INSTANCE_FIELD() {
+    addTestFile('''
+class A {
+  int aaa = 1;
+  int bbb = 2;
+  A([this.bbb = 3]);
+}
+main(A a) {
+  a.aaa = 4;
+  a.bbb = 5;
+}
+''');
+    return prepareHighlights().then((_) {
+      assertHasRegion(
+          HighlightRegionType.INSTANCE_FIELD_DECLARATION, 'aaa = 1');
+      assertHasRegion(
+          HighlightRegionType.INSTANCE_FIELD_DECLARATION, 'bbb = 2');
+      assertHasRegion(HighlightRegionType.INSTANCE_FIELD_REFERENCE, 'bbb = 3');
+      assertHasRegion(HighlightRegionType.INSTANCE_FIELD_REFERENCE, 'aaa = 4');
+      assertHasRegion(HighlightRegionType.INSTANCE_FIELD_REFERENCE, 'bbb = 5');
+    });
+  }
+
   test_KEYWORD() {
     addTestFile('''
 main() {
@@ -862,6 +852,22 @@ myLabel:
     });
   }
 
+  test_LOCAL_FUNCTION() {
+    addTestFile('''
+main() {
+  fff() {}
+  fff();
+  fff;
+}
+''');
+    return prepareHighlights().then((_) {
+      assertHasRegion(
+          HighlightRegionType.LOCAL_FUNCTION_DECLARATION, 'fff() {}');
+      assertHasRegion(HighlightRegionType.LOCAL_FUNCTION_REFERENCE, 'fff();');
+      assertHasRegion(HighlightRegionType.LOCAL_FUNCTION_REFERENCE, 'fff;');
+    });
+  }
+
   test_LOCAL_VARIABLE() {
     addTestFile('''
 main() {
@@ -873,8 +879,8 @@ main() {
     return prepareHighlights().then((_) {
       assertHasRegion(
           HighlightRegionType.LOCAL_VARIABLE_DECLARATION, 'vvv = 0');
-      assertHasRegion(HighlightRegionType.LOCAL_VARIABLE, 'vvv;');
-      assertHasRegion(HighlightRegionType.LOCAL_VARIABLE, 'vvv = 1;');
+      assertHasRegion(HighlightRegionType.LOCAL_VARIABLE_REFERENCE, 'vvv;');
+      assertHasRegion(HighlightRegionType.LOCAL_VARIABLE_REFERENCE, 'vvv = 1;');
     });
   }
 
@@ -892,13 +898,14 @@ main(A a) {
 }
 ''');
     return prepareHighlights().then((_) {
-      assertHasRegion(HighlightRegionType.METHOD_DECLARATION, 'aaa() {}');
       assertHasRegion(
-          HighlightRegionType.METHOD_DECLARATION_STATIC, 'bbb() {}');
-      assertHasRegion(HighlightRegionType.METHOD, 'aaa();');
-      assertHasRegion(HighlightRegionType.METHOD, 'aaa;');
-      assertHasRegion(HighlightRegionType.METHOD_STATIC, 'bbb();');
-      assertHasRegion(HighlightRegionType.METHOD_STATIC, 'bbb;');
+          HighlightRegionType.INSTANCE_METHOD_DECLARATION, 'aaa() {}');
+      assertHasRegion(
+          HighlightRegionType.STATIC_METHOD_DECLARATION, 'bbb() {}');
+      assertHasRegion(HighlightRegionType.INSTANCE_METHOD_REFERENCE, 'aaa();');
+      assertHasRegion(HighlightRegionType.INSTANCE_METHOD_REFERENCE, 'aaa;');
+      assertHasRegion(HighlightRegionType.STATIC_METHOD_REFERENCE, 'bbb();');
+      assertHasRegion(HighlightRegionType.STATIC_METHOD_REFERENCE, 'bbb;');
     });
   }
 
@@ -911,7 +918,8 @@ main(p) {
 }
 ''');
     return prepareHighlights().then((_) {
-      assertHasRegion(HighlightRegionType.METHOD, 'add(null)');
+      assertHasRegion(
+          HighlightRegionType.INSTANCE_METHOD_REFERENCE, 'add(null)');
     });
   }
 
@@ -923,9 +931,9 @@ main(int p) {
 }
 ''');
     return prepareHighlights().then((_) {
-      assertHasRegion(HighlightRegionType.PARAMETER, 'p) {');
-      assertHasRegion(HighlightRegionType.PARAMETER, 'p;');
-      assertHasRegion(HighlightRegionType.PARAMETER, 'p = 42');
+      assertHasRegion(HighlightRegionType.PARAMETER_DECLARATION, 'p) {');
+      assertHasRegion(HighlightRegionType.PARAMETER_REFERENCE, 'p;');
+      assertHasRegion(HighlightRegionType.PARAMETER_REFERENCE, 'p = 42');
     });
   }
 
@@ -934,17 +942,60 @@ main(int p) {
 set aaa(x) {}
 class A {
   set bbb(x) {}
+  static set ccc(x) {}
 }
 main(A a) {
   aaa = 1;
   a.bbb = 2;
+  A.ccc = 3;
+}
+''');
+    return prepareHighlights().then((_) {
+      assertHasRegion(
+          HighlightRegionType.TOP_LEVEL_SETTER_DECLARATION, 'aaa(x)');
+      assertHasRegion(
+          HighlightRegionType.INSTANCE_SETTER_DECLARATION, 'bbb(x)');
+      assertHasRegion(HighlightRegionType.STATIC_SETTER_DECLARATION, 'ccc(x)');
+      assertHasRegion(
+          HighlightRegionType.TOP_LEVEL_VARIABLE_REFERENCE, 'aaa = 1');
+      assertHasRegion(HighlightRegionType.INSTANCE_FIELD_REFERENCE, 'bbb = 2');
+      assertHasRegion(HighlightRegionType.STATIC_FIELD_REFERENCE, 'ccc = 3');
+    });
+  }
+
+  test_STATIC_FIELD() {
+    addTestFile('''
+class A {
+  static aaa = 1;
+  static get bbb => null;
+  static set ccc(x) {}
+}
+main() {
+  A.aaa = 2;
+  A.bbb;
+  A.ccc = 3;
 }
 ''');
     return prepareHighlights().then((_) {
-      assertHasRegion(HighlightRegionType.SETTER_DECLARATION, 'aaa(x)');
-      assertHasRegion(HighlightRegionType.SETTER_DECLARATION, 'bbb(x)');
-      assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'aaa = 1');
-      assertHasRegion(HighlightRegionType.FIELD, 'bbb = 2');
+      assertHasRegion(HighlightRegionType.STATIC_FIELD_DECLARATION, 'aaa = 1');
+      assertHasRegion(HighlightRegionType.STATIC_FIELD_REFERENCE, 'aaa = 2');
+      assertHasRegion(HighlightRegionType.STATIC_FIELD_REFERENCE, 'bbb;');
+      assertHasRegion(HighlightRegionType.STATIC_FIELD_REFERENCE, 'ccc = 3');
+    });
+  }
+
+  test_TOP_LEVEL_FUNCTION() {
+    addTestFile('''
+fff(p) {}
+main() {
+  fff(42);
+}
+''');
+    return prepareHighlights().then((_) {
+      assertHasRegion(
+          HighlightRegionType.TOP_LEVEL_FUNCTION_DECLARATION, 'fff(p) {}');
+      assertHasRegion(
+          HighlightRegionType.TOP_LEVEL_FUNCTION_REFERENCE, 'fff(42)');
     });
   }
 
@@ -958,11 +1009,14 @@ main() {
 }
 ''');
     return prepareHighlights().then((_) {
-      assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'VVV = 0');
       assertHasRegion(
-          HighlightRegionType.TOP_LEVEL_VARIABLE, 'VVV // annotation');
-      assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'VVV);');
-      assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'VVV = 1');
+          HighlightRegionType.TOP_LEVEL_VARIABLE_DECLARATION, 'VVV = 0');
+      assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE_REFERENCE,
+          'VVV // annotation');
+      assertHasRegion(
+          HighlightRegionType.TOP_LEVEL_VARIABLE_REFERENCE, 'VVV);');
+      assertHasRegion(
+          HighlightRegionType.TOP_LEVEL_VARIABLE_REFERENCE, 'VVV = 1');
     });
   }