languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-06 13:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix highlighting FunctionTypedFormalParameter name.

Browse source 
Change-Id: I476711afa5c44c0eb7cb177e85bd67e57b024421
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/272544
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2022-11-29 23:02:58 +00:00 committed by Commit Queue
parent c37fc761f5
commit 7e97d695f8
2 changed files with 153 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/analysis_server/lib/src/computer/computer_highlights.dart
View file

@ -905,6 +905,8 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
void visitFunctionTypedFormalParameter(FunctionTypedFormalParameter node) {
computer._addRegion_token(
node.requiredKeyword, HighlightRegionType.KEYWORD);
computer._addRegion_token(
node.name, HighlightRegionType.PARAMETER_DECLARATION);
super.visitFunctionTypedFormalParameter(node);
}

181
pkg/analysis_server/test/analysis/notification_highlights2_test.dart
View file

@ -485,6 +485,26 @@ class A {
''');
}
Future<void> test_class_method_functionTypedFormalParameter() async {
var testCode = TestCode.parse(r'''
class A {
void foo(int bar(String a)) {}
}
''');
addTestFile(testCode.code);
await prepareHighlights();
assertHighlightText(testCode, -1, r'''
0 + 5 |class| KEYWORD
6 + 1 |A| CLASS
12 + 4 |void| KEYWORD
17 + 3 |foo| INSTANCE_METHOD_DECLARATION
21 + 3 |int| CLASS
25 + 3 |bar| PARAMETER_DECLARATION
29 + 6 |String| CLASS
36 + 1 |a| PARAMETER_DECLARATION
''');
}
Future<void> test_CLASS_notDynamic() async {
addTestFile('''
dynamic f() {}
@ -1613,36 +1633,6 @@ void f() {
assertHasRegion(HighlightRegionType.TOP_LEVEL_SETTER_REFERENCE, 'V2 = 3');
}
Future<void> test_TYPE_ALIAS() async {
addTestFile('''
typedef A = double;
void f(A a) {}
''');
await prepareHighlights();
assertHasRegion(HighlightRegionType.TYPE_ALIAS, 'A');
assertHasRegion(HighlightRegionType.TYPE_ALIAS, 'A a');
}
Future<void> test_TYPE_ALIAS_dynamicType() async {
addTestFile('''
typedef A = dynamic;
void f(A a) {}
''');
await prepareHighlights();
assertHasRegion(HighlightRegionType.TYPE_ALIAS, 'A =');
assertHasRegion(HighlightRegionType.TYPE_ALIAS, 'A a');
}
Future<void> test_TYPE_ALIAS_interfaceType() async {
addTestFile('''
typedef A = List<int>;
void f(A a) {}
''');
await prepareHighlights();
assertHasRegion(HighlightRegionType.TYPE_ALIAS, 'A =');
assertHasRegion(HighlightRegionType.TYPE_ALIAS, 'A a');
}
Future<void> test_TYPE_NAME_DYNAMIC() async {
addTestFile('''
dynamic f() {
@ -1669,6 +1659,137 @@ class A<T> {
assertHasRegion(HighlightRegionType.TYPE_PARAMETER, 'T p)');
}
Future<void> test_typedef_classic() async {
var testCode = TestCode.parse(r'''
typedef int MyFunction<T extends num>(T a, String b);
''');
addTestFile(testCode.code);
await prepareHighlights();
assertHighlightText(testCode, -1, r'''
0 + 7 |typedef| BUILT_IN
8 + 3 |int| CLASS
12 + 10 |MyFunction| FUNCTION_TYPE_ALIAS
23 + 1 |T| TYPE_PARAMETER
33 + 3 |num| CLASS
38 + 1 |T| TYPE_PARAMETER
40 + 1 |a| PARAMETER_DECLARATION
43 + 6 |String| CLASS
50 + 1 |b| PARAMETER_DECLARATION
''');
}
Future<void> test_typedef_classic_functionTypedFormalParameter() async {
var testCode = TestCode.parse(r'''
typedef int MyFunction(bool foo());
''');
addTestFile(testCode.code);
await prepareHighlights();
assertHighlightText(testCode, -1, r'''
0 + 7 |typedef| BUILT_IN
8 + 3 |int| CLASS
12 + 10 |MyFunction| FUNCTION_TYPE_ALIAS
23 + 4 |bool| CLASS
28 + 3 |foo| PARAMETER_DECLARATION
''');
}
Future<void> test_typedef_classic_reference() async {
var testCode = TestCode.parse(r'''
typedef void MyFunction();
void f(MyFunction a) {}
''');
addTestFile(testCode.code);
await prepareHighlights();
assertHighlightText(testCode, -1, r'''
0 + 7 |typedef| BUILT_IN
8 + 4 |void| KEYWORD
13 + 10 |MyFunction| FUNCTION_TYPE_ALIAS
27 + 4 |void| KEYWORD
32 + 1 |f| TOP_LEVEL_FUNCTION_DECLARATION
34 + 10 |MyFunction| FUNCTION_TYPE_ALIAS
45 + 1 |a| PARAMETER_DECLARATION
''');
}
Future<void> test_typedef_modern_dynamicType() async {
var testCode = TestCode.parse(r'''
typedef A = dynamic;
''');
addTestFile(testCode.code);
await prepareHighlights();
assertHighlightText(testCode, -1, r'''
0 + 7 |typedef| BUILT_IN
8 + 1 |A| TYPE_ALIAS
12 + 7 |dynamic| TYPE_NAME_DYNAMIC
''');
}
Future<void> test_typedef_modern_functionType() async {
var testCode = TestCode.parse(r'''
typedef MyFunction = int Function(int a, {required String b});
''');
addTestFile(testCode.code);
await prepareHighlights();
assertHighlightText(testCode, -1, r'''
0 + 7 |typedef| BUILT_IN
8 + 10 |MyFunction| FUNCTION_TYPE_ALIAS
21 + 3 |int| CLASS
25 + 8 |Function| BUILT_IN
34 + 3 |int| CLASS
38 + 1 |a| PARAMETER_DECLARATION
42 + 8 |required| KEYWORD
51 + 6 |String| CLASS
58 + 1 |b| PARAMETER_DECLARATION
''');
}
Future<void> test_typedef_modern_interfaceType() async {
var testCode = TestCode.parse(r'''
typedef A = double;
''');
addTestFile(testCode.code);
await prepareHighlights();
assertHighlightText(testCode, -1, r'''
0 + 7 |typedef| BUILT_IN
8 + 1 |A| TYPE_ALIAS
12 + 6 |double| CLASS
''');
}
Future<void> test_typedef_modern_interfaceType_typeArguments() async {
var testCode = TestCode.parse(r'''
typedef A = Map<int, String>;
''');
addTestFile(testCode.code);
await prepareHighlights();
assertHighlightText(testCode, -1, r'''
0 + 7 |typedef| BUILT_IN
8 + 1 |A| TYPE_ALIAS
12 + 3 |Map| CLASS
16 + 3 |int| CLASS
21 + 6 |String| CLASS
''');
}
Future<void> test_typedef_modern_reference() async {
var testCode = TestCode.parse(r'''
typedef A = void Function();
void f(A a) {}
''');
addTestFile(testCode.code);
await prepareHighlights();
assertHighlightText(testCode, -1, r'''
0 + 7 |typedef| BUILT_IN
8 + 1 |A| FUNCTION_TYPE_ALIAS
12 + 4 |void| KEYWORD
17 + 8 |Function| BUILT_IN
29 + 4 |void| KEYWORD
34 + 1 |f| TOP_LEVEL_FUNCTION_DECLARATION
36 + 1 |A| FUNCTION_TYPE_ALIAS
38 + 1 |a| PARAMETER_DECLARATION
''');
}
Future<void>
test_UNRESOLVED_INSTANCE_MEMBER_REFERENCE_dynamicVarTarget() async {
addTestFile('''