Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: pkg/analysis_server/test/analysis/notification_highlights_test.dart

Issue 1236433003: Revert "Update Analysis Server highlight API and implementation." (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analysis_server/lib/src/generated_protocol.dart ('k') | pkg/analysis_server/test/integration/analysis/highlights_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 be2881de63b9e8c63d56b117a6fd4fa519e9cba4..5e08e7bcce9048ad7bc35aa13af77562d61112d2 100644
--- a/pkg/analysis_server/test/analysis/notification_highlights_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_highlights_test.dart
@@ -569,73 +569,103 @@ part of lib;
});
}
- test_DYNAMIC_LOCAL_VARIABLE() {
+ test_DYNAMIC_TYPE() {
addTestFile('''
f() {}
main(p) {
- var v = f();
- v;
+ print(p);
+ var v1 = f();
+ int v2;
+ var v3 = v2;
}
''');
return prepareHighlights().then((_) {
- assertHasRegion(
- HighlightRegionType.DYNAMIC_LOCAL_VARIABLE_DECLARATION, 'v = f()');
- assertHasRegion(
- HighlightRegionType.DYNAMIC_LOCAL_VARIABLE_REFERENCE, 'v;');
+ assertHasRegion(HighlightRegionType.DYNAMIC_TYPE, 'p)');
+ assertHasRegion(HighlightRegionType.DYNAMIC_TYPE, 'v1 =');
+ assertNoRegion(HighlightRegionType.DYNAMIC_TYPE, 'v2;');
+ assertNoRegion(HighlightRegionType.DYNAMIC_TYPE, 'v3 =');
});
}
- test_DYNAMIC_PARAMETER() {
+ test_ENUM() {
addTestFile('''
-main(p) {
- print(p);
+enum MyEnum {A, B, C}
+MyEnum value;
+''');
+ return prepareHighlights().then((_) {
+ assertHasRegion(HighlightRegionType.ENUM, 'MyEnum {');
+ assertHasRegion(HighlightRegionType.ENUM, 'MyEnum value;');
+ });
+ }
+
+ test_ENUM_CONSTANT() {
+ addTestFile('''
+enum MyEnum {AAA, BBB}
+main() {
+ print(MyEnum.AAA);
+ print(MyEnum.BBB);
}
''');
return prepareHighlights().then((_) {
- assertHasRegion(HighlightRegionType.DYNAMIC_PARAMETER_DECLARATION, 'p)');
- assertHasRegion(HighlightRegionType.DYNAMIC_PARAMETER_REFERENCE, 'p);');
+ assertHasRegion(HighlightRegionType.ENUM_CONSTANT, 'AAA, ');
+ assertHasRegion(HighlightRegionType.ENUM_CONSTANT, 'BBB}');
+ assertHasRegion(HighlightRegionType.ENUM_CONSTANT, 'AAA);');
+ assertHasRegion(HighlightRegionType.ENUM_CONSTANT, 'BBB);');
});
}
- test_DYNAMIC_VARIABLE_field() {
+ test_FIELD() {
addTestFile('''
class A {
- var f;
- m() {
- f = 1;
- }
+ 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, 'f;');
- assertHasRegion(HighlightRegionType.INSTANCE_SETTER_REFERENCE, 'f = 1');
+ 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_ENUM() {
+ test_FIELD_STATIC() {
addTestFile('''
-enum MyEnum {A, B, C}
-MyEnum value;
+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.ENUM, 'MyEnum {');
- assertHasRegion(HighlightRegionType.ENUM, 'MyEnum value;');
+ assertHasRegion(HighlightRegionType.FIELD_STATIC, 'aaa = 1');
+ assertHasRegion(HighlightRegionType.FIELD_STATIC, 'aaa = 2');
+ assertHasRegion(HighlightRegionType.FIELD_STATIC, 'bbb;');
+ assertHasRegion(HighlightRegionType.FIELD_STATIC, 'ccc = 3');
});
}
- test_ENUM_CONSTANT() {
+ test_FUNCTION() {
addTestFile('''
-enum MyEnum {AAA, BBB}
+fff(p) {}
main() {
- print(MyEnum.AAA);
- print(MyEnum.BBB);
+ fff(42);
}
''');
return prepareHighlights().then((_) {
- assertHasRegion(HighlightRegionType.ENUM_CONSTANT, 'AAA, ');
- assertHasRegion(HighlightRegionType.ENUM_CONSTANT, 'BBB}');
- assertHasRegion(HighlightRegionType.ENUM_CONSTANT, 'AAA);');
- assertHasRegion(HighlightRegionType.ENUM_CONSTANT, 'BBB);');
+ assertHasRegion(HighlightRegionType.FUNCTION_DECLARATION, 'fff(p) {}');
+ assertHasRegion(HighlightRegionType.FUNCTION, 'fff(42)');
});
}
@@ -651,29 +681,22 @@ main(FFF fff) {
});
}
- test_GETTER() {
+ test_GETTER_DECLARATION() {
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.TOP_LEVEL_GETTER_DECLARATION, 'aaa => null');
- assertHasRegion(
- HighlightRegionType.INSTANCE_GETTER_DECLARATION, 'bbb => null');
- assertHasRegion(
- HighlightRegionType.STATIC_GETTER_DECLARATION, 'ccc => null');
- assertHasRegion(HighlightRegionType.TOP_LEVEL_GETTER_REFERENCE, 'aaa;');
- assertHasRegion(HighlightRegionType.INSTANCE_GETTER_REFERENCE, 'bbb;');
- assertHasRegion(HighlightRegionType.STATIC_GETTER_REFERENCE, 'ccc;');
+ assertHasRegion(HighlightRegionType.GETTER_DECLARATION, 'aaa => null');
+ assertHasRegion(HighlightRegionType.GETTER_DECLARATION, 'bbb => null');
+ assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'aaa;');
+ assertHasRegion(HighlightRegionType.FIELD, 'bbb;');
});
}
@@ -705,29 +728,6 @@ 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_SETTER_REFERENCE, 'aaa = 4');
- assertHasRegion(HighlightRegionType.INSTANCE_SETTER_REFERENCE, 'bbb = 5');
- });
- }
-
test_KEYWORD() {
addTestFile('''
main() {
@@ -862,22 +862,6 @@ 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() {
@@ -889,8 +873,8 @@ main() {
return prepareHighlights().then((_) {
assertHasRegion(
HighlightRegionType.LOCAL_VARIABLE_DECLARATION, 'vvv = 0');
- assertHasRegion(HighlightRegionType.LOCAL_VARIABLE_REFERENCE, 'vvv;');
- assertHasRegion(HighlightRegionType.LOCAL_VARIABLE_REFERENCE, 'vvv = 1;');
+ assertHasRegion(HighlightRegionType.LOCAL_VARIABLE, 'vvv;');
+ assertHasRegion(HighlightRegionType.LOCAL_VARIABLE, 'vvv = 1;');
});
}
@@ -908,14 +892,13 @@ main(A a) {
}
''');
return prepareHighlights().then((_) {
+ assertHasRegion(HighlightRegionType.METHOD_DECLARATION, 'aaa() {}');
assertHasRegion(
- 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;');
+ HighlightRegionType.METHOD_DECLARATION_STATIC, 'bbb() {}');
+ assertHasRegion(HighlightRegionType.METHOD, 'aaa();');
+ assertHasRegion(HighlightRegionType.METHOD, 'aaa;');
+ assertHasRegion(HighlightRegionType.METHOD_STATIC, 'bbb();');
+ assertHasRegion(HighlightRegionType.METHOD_STATIC, 'bbb;');
});
}
@@ -928,8 +911,7 @@ main(p) {
}
''');
return prepareHighlights().then((_) {
- assertHasRegion(
- HighlightRegionType.INSTANCE_METHOD_REFERENCE, 'add(null)');
+ assertHasRegion(HighlightRegionType.METHOD, 'add(null)');
});
}
@@ -941,9 +923,9 @@ main(int p) {
}
''');
return prepareHighlights().then((_) {
- assertHasRegion(HighlightRegionType.PARAMETER_DECLARATION, 'p) {');
- assertHasRegion(HighlightRegionType.PARAMETER_REFERENCE, 'p;');
- assertHasRegion(HighlightRegionType.PARAMETER_REFERENCE, 'p = 42');
+ assertHasRegion(HighlightRegionType.PARAMETER, 'p) {');
+ assertHasRegion(HighlightRegionType.PARAMETER, 'p;');
+ assertHasRegion(HighlightRegionType.PARAMETER, 'p = 42');
});
}
@@ -952,82 +934,35 @@ 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_SETTER_REFERENCE, 'aaa = 1');
- assertHasRegion(HighlightRegionType.INSTANCE_SETTER_REFERENCE, 'bbb = 2');
- assertHasRegion(HighlightRegionType.STATIC_SETTER_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.STATIC_FIELD_DECLARATION, 'aaa = 1');
- assertHasRegion(HighlightRegionType.STATIC_SETTER_REFERENCE, 'aaa = 2');
- assertHasRegion(HighlightRegionType.STATIC_GETTER_REFERENCE, 'bbb;');
- assertHasRegion(HighlightRegionType.STATIC_SETTER_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)');
+ assertHasRegion(HighlightRegionType.SETTER_DECLARATION, 'aaa(x)');
+ assertHasRegion(HighlightRegionType.SETTER_DECLARATION, 'bbb(x)');
+ assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'aaa = 1');
+ assertHasRegion(HighlightRegionType.FIELD, 'bbb = 2');
});
}
test_TOP_LEVEL_VARIABLE() {
addTestFile('''
-const V1 = 1;
-var V2 = 2;
-@V1 // annotation
+const VVV = 0;
+@VVV // annotation
main() {
- print(V1);
- V2 = 3;
+ print(VVV);
+ VVV = 1;
}
''');
return prepareHighlights().then((_) {
+ assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'VVV = 0');
assertHasRegion(
- HighlightRegionType.TOP_LEVEL_VARIABLE_DECLARATION, 'V1 = 1');
- assertHasRegion(
- HighlightRegionType.TOP_LEVEL_VARIABLE_DECLARATION, 'V2 = 2');
- assertHasRegion(
- HighlightRegionType.TOP_LEVEL_GETTER_REFERENCE, 'V1 // annotation');
- assertHasRegion(HighlightRegionType.TOP_LEVEL_GETTER_REFERENCE, 'V1);');
- assertHasRegion(HighlightRegionType.TOP_LEVEL_SETTER_REFERENCE, 'V2 = 3');
+ HighlightRegionType.TOP_LEVEL_VARIABLE, 'VVV // annotation');
+ assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'VVV);');
+ assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'VVV = 1');
});
}
« no previous file with comments | « pkg/analysis_server/lib/src/generated_protocol.dart ('k') | pkg/analysis_server/test/integration/analysis/highlights_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698