Skip to content
This repository has been archived by the owner on Jul 30, 2020. It is now read-only.

Commit

Permalink
Move symbol related structs to symbol.h and add kind/role to textDocu…
Browse files Browse the repository at this point in the history 
…ment/documentHighlight
  • Loading branch information
@MaskRay
MaskRay committed Feb 13, 2018
1 parent 9157a6e commit ff4ff86
Show file tree
Hide file tree
Showing 36 changed files with 165 additions and 148 deletions.
4 changes: 2 additions & 2 deletions index_tests/constructors/constructor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void foo() {
"base": [],
"derived": [],
"locals": [],
"uses": ["7:7-7:8|1|3|72", "8:17-8:20|1|3|64"],
"uses": ["7:7-7:8|1|3|288", "8:17-8:20|1|3|32"],
"callees": []
}, {
"id": 1,
Expand All @@ -59,7 +59,7 @@ void foo() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["7:7-7:8|0|3|72", "7:7-7:8|0|3|72", "8:17-8:20|0|3|64", "8:17-8:20|0|3|64"]
"callees": ["7:7-7:8|0|3|288", "7:7-7:8|0|3|288", "8:17-8:20|0|3|32", "8:17-8:20|0|3|32"]
}],
"vars": [{
"id": 0,
Expand Down
4 changes: 2 additions & 2 deletions index_tests/constructors/destructor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void foo() {
"base": [],
"derived": [],
"locals": [],
"uses": ["8:7-8:8|2|3|72"],
"uses": ["8:7-8:8|2|3|288"],
"callees": []
}, {
"id": 1,
Expand Down Expand Up @@ -80,7 +80,7 @@ void foo() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["8:7-8:8|0|3|72", "8:7-8:8|0|3|72"]
"callees": ["8:7-8:8|0|3|288", "8:7-8:8|0|3|288"]
}],
"vars": [{
"id": 0,
Expand Down
4 changes: 2 additions & 2 deletions index_tests/constructors/implicit_constructor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void Make() {
"base": [],
"derived": [],
"locals": [],
"uses": ["6:8-6:12|1|3|72", "7:15-7:19|1|3|64"],
"uses": ["6:8-6:12|1|3|288", "7:15-7:19|1|3|32"],
"callees": []
}, {
"id": 1,
Expand All @@ -58,7 +58,7 @@ void Make() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["6:8-6:12|0|3|72", "6:8-6:12|0|3|72", "7:15-7:19|0|3|64", "7:15-7:19|0|3|64"]
"callees": ["6:8-6:12|0|3|288", "6:8-6:12|0|3|288", "7:15-7:19|0|3|32", "7:15-7:19|0|3|32"]
}],
"vars": [{
"id": 0,
Expand Down
14 changes: 7 additions & 7 deletions index_tests/constructors/make_functions.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ OUTPUT: make_functions.cc
"base": [],
"derived": [],
"locals": [],
"uses": ["14:3-14:13|2|3|64", "15:3-15:13|2|3|64", "16:3-16:13|2|3|64"],
"uses": ["14:3-14:13|2|3|32", "15:3-15:13|2|3|32", "16:3-16:13|2|3|32"],
"callees": []
}, {
"id": 1,
Expand All @@ -248,7 +248,7 @@ OUTPUT: make_functions.cc
"base": [],
"derived": [],
"locals": [],
"uses": ["17:3-17:14|2|3|64"],
"uses": ["17:3-17:14|2|3|32"],
"callees": []
}, {
"id": 2,
Expand All @@ -264,7 +264,7 @@ OUTPUT: make_functions.cc
"derived": [],
"locals": [],
"uses": [],
"callees": ["14:3-14:13|0|3|64", "15:3-15:13|0|3|64", "16:3-16:13|0|3|64", "17:3-17:14|1|3|64"]
"callees": ["14:3-14:13|0|3|32", "15:3-15:13|0|3|32", "16:3-16:13|0|3|32", "17:3-17:14|1|3|32"]
}, {
"id": 3,
"usr": 13131778807733950299,
Expand All @@ -276,7 +276,7 @@ OUTPUT: make_functions.cc
"base": [],
"derived": [],
"locals": [],
"uses": ["14:3-14:13|-1|1|72"],
"uses": ["14:3-14:13|-1|1|288"],
"callees": []
}, {
"id": 4,
Expand All @@ -289,7 +289,7 @@ OUTPUT: make_functions.cc
"base": [],
"derived": [],
"locals": [],
"uses": ["15:3-15:13|-1|1|72"],
"uses": ["15:3-15:13|-1|1|288"],
"callees": []
}, {
"id": 5,
Expand All @@ -302,7 +302,7 @@ OUTPUT: make_functions.cc
"base": [],
"derived": [],
"locals": [],
"uses": ["16:3-16:13|-1|1|72"],
"uses": ["16:3-16:13|-1|1|288"],
"callees": []
}, {
"id": 6,
Expand All @@ -315,7 +315,7 @@ OUTPUT: make_functions.cc
"base": [],
"derived": [],
"locals": [],
"uses": ["17:3-17:14|-1|1|72"],
"uses": ["17:3-17:14|-1|1|288"],
"callees": []
}],
"vars": [{
Expand Down
4 changes: 2 additions & 2 deletions index_tests/lambdas/lambda.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void foo() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["9:14-9:15|1|3|64", "10:14-10:15|1|3|64", "11:14-11:15|1|3|64"]
"callees": ["9:14-9:15|1|3|32", "10:14-10:15|1|3|32", "11:14-11:15|1|3|32"]
}, {
"id": 1,
"usr": 1328781044864682611,
Expand All @@ -69,7 +69,7 @@ void foo() {
"base": [],
"derived": [],
"locals": [],
"uses": ["9:14-9:15|0|3|64", "10:14-10:15|0|3|64", "11:14-11:15|0|3|64"],
"uses": ["9:14-9:15|0|3|32", "10:14-10:15|0|3|32", "11:14-11:15|0|3|32"],
"callees": []
}],
"vars": [{
Expand Down
4 changes: 2 additions & 2 deletions index_tests/macros/complex.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ FOO(make1(), make2);
"base": [],
"derived": [],
"locals": [],
"uses": ["12:5-12:10|1|3|64"],
"uses": ["12:5-12:10|1|3|32"],
"callees": []
}, {
"id": 1,
Expand All @@ -64,7 +64,7 @@ FOO(make1(), make2);
"derived": [],
"locals": [],
"uses": [],
"callees": ["12:5-12:10|0|3|64"]
"callees": ["12:5-12:10|0|3|32"]
}],
"vars": [{
"id": 0,
Expand Down
4 changes: 2 additions & 2 deletions index_tests/multi_file/impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ OUTPUT: impl.cc
"derived": [],
"locals": [],
"uses": [],
"callees": ["4:3-4:7|1|3|64"]
"callees": ["4:3-4:7|1|3|32"]
}, {
"id": 1,
"usr": 11650481237659640387,
Expand All @@ -215,7 +215,7 @@ OUTPUT: impl.cc
"base": [],
"derived": [],
"locals": [],
"uses": ["4:3-4:7|0|3|64"],
"uses": ["4:3-4:7|0|3|32"],
"callees": []
}],
"vars": []
Expand Down
4 changes: 2 additions & 2 deletions index_tests/multi_file/simple_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ OUTPUT: simple_impl.cc
"derived": [],
"locals": [],
"uses": [],
"callees": ["4:3-4:9|1|3|64"]
"callees": ["4:3-4:9|1|3|32"]
}, {
"id": 1,
"usr": 16236105532929924676,
Expand All @@ -65,7 +65,7 @@ OUTPUT: simple_impl.cc
"base": [],
"derived": [],
"locals": [],
"uses": ["4:3-4:9|0|3|64"],
"uses": ["4:3-4:9|0|3|32"],
"callees": []
}],
"vars": []
Expand Down
4 changes: 2 additions & 2 deletions index_tests/namespaces/namespace_reference.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void Runner() {
"base": [],
"derived": [],
"locals": [],
"uses": ["7:7-7:13|1|3|64", "9:3-9:9|1|3|64"],
"uses": ["7:7-7:13|1|3|32", "9:3-9:9|1|3|32"],
"callees": []
}, {
"id": 1,
Expand All @@ -86,7 +86,7 @@ void Runner() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["7:7-7:13|0|3|64", "9:3-9:9|0|3|64"]
"callees": ["7:7-7:13|0|3|32", "9:3-9:9|0|3|32"]
}],
"vars": [{
"id": 0,
Expand Down
2 changes: 1 addition & 1 deletion index_tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ namespace ns {
"base": [],
"derived": [],
"locals": [],
"uses": ["10:21-10:24|0|2|64", "11:22-11:25|0|2|64"],
"uses": ["10:21-10:24|0|2|32", "11:22-11:25|0|2|32"],
"callees": []
}],
"vars": [{
Expand Down
2 changes: 1 addition & 1 deletion index_tests/templates/template_class_func_usage_folded_into_one.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ int b = Foo<bool>::foo();
"base": [],
"derived": [],
"locals": [],
"uses": ["8:19-8:22|-1|1|64", "9:20-9:23|-1|1|64"],
"uses": ["8:19-8:22|-1|1|32", "9:20-9:23|-1|1|32"],
"callees": []
}],
"vars": [{
Expand Down
2 changes: 1 addition & 1 deletion index_tests/templates/template_class_template_func_usage_folded_into_one.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ int b = Foo<bool>::foo<double>();
"base": [],
"derived": [],
"locals": [],
"uses": ["9:19-9:22|-1|1|64", "10:20-10:23|-1|1|64"],
"uses": ["9:19-9:22|-1|1|32", "10:20-10:23|-1|1|32"],
"callees": []
}],
"vars": [{
Expand Down
2 changes: 1 addition & 1 deletion index_tests/templates/template_func_usage_folded_into_one.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ int b = foo<bool>();
"base": [],
"derived": [],
"locals": [],
"uses": ["6:9-6:12|-1|1|64", "7:9-7:12|-1|1|64"],
"uses": ["6:9-6:12|-1|1|32", "7:9-7:12|-1|1|32"],
"callees": []
}],
"vars": [{
Expand Down
4 changes: 2 additions & 2 deletions index_tests/usage/func_called_from_constructor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Foo::Foo() {
"base": [],
"derived": [],
"locals": [],
"uses": ["8:3-8:9|1|3|64"],
"uses": ["8:3-8:9|1|3|32"],
"callees": []
}, {
"id": 1,
Expand All @@ -64,7 +64,7 @@ Foo::Foo() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["8:3-8:9|0|3|64"]
"callees": ["8:3-8:9|0|3|32"]
}],
"vars": []
}
Expand Down
4 changes: 2 additions & 2 deletions index_tests/usage/func_called_from_macro_argument.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void caller() {
"base": [],
"derived": [],
"locals": [],
"uses": ["6:14-6:20|1|3|64"],
"uses": ["6:14-6:20|1|3|32"],
"callees": []
}, {
"id": 1,
Expand All @@ -44,7 +44,7 @@ void caller() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["6:14-6:20|0|3|64"]
"callees": ["6:14-6:20|0|3|32"]
}],
"vars": [{
"id": 0,
Expand Down
8 changes: 4 additions & 4 deletions index_tests/usage/func_called_from_template.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void foo() {
"base": [],
"derived": [],
"locals": [],
"uses": ["5:3-5:9|1|3|64"],
"uses": ["5:3-5:9|1|3|32"],
"callees": []
}, {
"id": 1,
Expand All @@ -48,8 +48,8 @@ void foo() {
"base": [],
"derived": [],
"locals": [],
"uses": ["9:3-9:9|2|3|64"],
"callees": ["5:3-5:9|0|3|64"]
"uses": ["9:3-9:9|2|3|32"],
"callees": ["5:3-5:9|0|3|32"]
}, {
"id": 2,
"usr": 4259594751088586730,
Expand All @@ -64,7 +64,7 @@ void foo() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["9:3-9:9|1|3|64"]
"callees": ["9:3-9:9|1|3|32"]
}],
"vars": []
}
Expand Down
6 changes: 3 additions & 3 deletions index_tests/usage/func_called_implicit_ctor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Wrapper caller() {
"base": [],
"derived": [],
"locals": [],
"uses": ["8:10-8:18|2|3|72"],
"uses": ["8:10-8:18|2|3|288"],
"callees": []
}, {
"id": 1,
Expand All @@ -61,7 +61,7 @@ Wrapper caller() {
"base": [],
"derived": [],
"locals": [],
"uses": ["8:10-8:16|2|3|64"],
"uses": ["8:10-8:16|2|3|32"],
"callees": []
}, {
"id": 2,
Expand All @@ -77,7 +77,7 @@ Wrapper caller() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["8:10-8:18|0|3|72", "8:10-8:16|1|3|64"]
"callees": ["8:10-8:18|0|3|288", "8:10-8:16|1|3|32"]
}],
"vars": []
}
Expand Down
6 changes: 3 additions & 3 deletions index_tests/usage/func_usage_addr_func.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void user() {
"base": [],
"derived": [],
"locals": [],
"uses": ["7:3-7:10|2|3|64"],
"uses": ["7:3-7:10|2|3|32"],
"callees": []
}, {
"id": 1,
Expand All @@ -41,7 +41,7 @@ void user() {
"base": [],
"derived": [],
"locals": [],
"uses": ["6:18-6:22|2|3|64", "7:12-7:16|2|3|64"],
"uses": ["6:18-6:22|2|3|32", "7:12-7:16|2|3|32"],
"callees": []
}, {
"id": 2,
Expand All @@ -57,7 +57,7 @@ void user() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["6:18-6:22|1|3|64", "6:18-6:22|1|3|64", "7:3-7:10|0|3|64", "7:12-7:16|1|3|64"]
"callees": ["6:18-6:22|1|3|32", "6:18-6:22|1|3|32", "7:3-7:10|0|3|32", "7:12-7:16|1|3|32"]
}],
"vars": [{
"id": 0,
Expand Down
4 changes: 2 additions & 2 deletions index_tests/usage/func_usage_addr_method.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void user() {
"base": [],
"derived": [],
"locals": [],
"uses": ["6:18-6:22|1|3|64"],
"uses": ["6:18-6:22|1|3|32"],
"callees": []
}, {
"id": 1,
Expand All @@ -61,7 +61,7 @@ void user() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["6:18-6:22|0|3|64", "6:18-6:22|0|3|64"]
"callees": ["6:18-6:22|0|3|32", "6:18-6:22|0|3|32"]
}],
"vars": [{
"id": 0,
Expand Down
4 changes: 2 additions & 2 deletions index_tests/usage/func_usage_call_func.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ void caller() {
"base": [],
"derived": [],
"locals": [],
"uses": ["3:3-3:9|1|3|64"],
"uses": ["3:3-3:9|1|3|32"],
"callees": []
}, {
"id": 1,
Expand All @@ -38,7 +38,7 @@ void caller() {
"derived": [],
"locals": [],
"uses": [],
"callees": ["3:3-3:9|0|3|64"]
"callees": ["3:3-3:9|0|3|32"]
}],
"vars": []
}
Expand Down
Loading

0 comments on commit ff4ff86

Please sign in to comment.