From 3b997b12adc43988780a1bd4e6aaffb385827bef Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Fri, 20 Jul 2018 23:27:47 -0700 Subject: [PATCH] Use ContainerDC for extent, index callees, set StaticMethod --- index_tests/constructors/constructor.cc | 6 +++--- index_tests/constructors/destructor.cc | 6 +++--- .../constructors/implicit_constructor.cc | 6 +++--- index_tests/constructors/invalid_reference.cc | 4 ++-- index_tests/constructors/make_functions.cc | 14 ++++++------- .../class_member_static.cc | 2 +- .../declaration_vs_definition/method.cc | 2 +- index_tests/enums/enum_usage.cc | 2 +- index_tests/foobar.cc | 2 +- index_tests/inheritance/class_inherit.cc | 2 +- .../class_inherit_templated_parent.cc | 10 ++++----- .../inheritance/class_multiple_inherit.cc | 6 +++--- index_tests/inheritance/function_override.cc | 2 +- .../inheritance/multiple_base_functions.cc | 6 +++--- index_tests/lambdas/lambda.cc | 8 +++---- index_tests/macros/complex.cc | 6 +++--- index_tests/macros/foo.cc | 2 +- index_tests/method_definition.cc | 2 +- index_tests/multi_file/impl.cc | 10 ++++----- index_tests/multi_file/simple_impl.cc | 4 ++-- index_tests/multi_file/static.cc | 6 +++--- index_tests/namespaces/method_definition.cc | 2 +- index_tests/namespaces/namespace_alias.cc | 10 ++++----- index_tests/namespaces/namespace_reference.cc | 8 +++---- .../outline/static_function_in_type.cc | 8 +++---- .../func_specialized_template_param.cc | 4 ++-- .../implicit_variable_instantiation.cc | 4 ++-- ...ass_template_func_usage_folded_into_one.cc | 4 ++-- index_tests/templates/specialization.cc | 2 +- .../templates/specialized_func_definition.cc | 4 ++-- ...mplate_class_func_usage_folded_into_one.cc | 4 ++-- ...ass_template_func_usage_folded_into_one.cc | 4 ++-- ...mplate_class_type_usage_folded_into_one.cc | 2 +- ...emplate_class_var_usage_folded_into_one.cc | 2 +- index_tests/unions/union_usage.cc | 4 ++-- .../usage/func_called_from_constructor.cc | 8 +++---- .../usage/func_called_from_macro_argument.cc | 4 ++-- .../usage/func_called_from_template.cc | 21 +++++++++++++++---- .../usage/func_called_implicit_ctor.cc | 8 +++---- index_tests/usage/func_usage_addr_func.cc | 6 +++--- index_tests/usage/func_usage_addr_method.cc | 6 +++--- index_tests/usage/func_usage_call_func.cc | 4 ++-- index_tests/usage/func_usage_call_method.cc | 6 +++--- .../usage/func_usage_class_inline_var_def.cc | 2 +- .../usage/func_usage_forward_decl_func.cc | 4 ++-- .../usage/func_usage_forward_decl_method.cc | 6 +++--- index_tests/usage/func_usage_template_func.cc | 4 ++-- .../usage/type_usage_as_template_parameter.cc | 4 ++-- ...ype_usage_as_template_parameter_complex.cc | 10 ++++----- index_tests/usage/type_usage_declare_field.cc | 4 ++-- index_tests/usage/type_usage_declare_local.cc | 4 ++-- .../usage/type_usage_declare_qualifiers.cc | 2 +- .../usage/type_usage_on_return_type.cc | 6 +++--- index_tests/usage/type_usage_various.cc | 4 ++-- index_tests/usage/usage_inside_of_call.cc | 14 ++++++------- .../usage/usage_inside_of_call_simple.cc | 6 +++--- index_tests/usage/var_usage_call_function.cc | 4 ++-- index_tests/usage/var_usage_class_member.cc | 12 +++++------ .../usage/var_usage_class_member_static.cc | 8 +++---- index_tests/usage/var_usage_cstyle_cast.cc | 4 ++-- index_tests/usage/var_usage_extern.cc | 2 +- index_tests/usage/var_usage_static.cc | 2 +- index_tests/vars/class_member.cc | 2 +- index_tests/vars/class_static_member.cc | 4 ++-- index_tests/vars/deduce_auto_type.cc | 2 +- index_tests/vars/function_local.cc | 2 +- .../vars/type_instance_on_using_type.cc | 2 +- src/indexer.cc | 21 +++++++++++++------ src/messages/ccls_memberHierarchy.cc | 2 +- 69 files changed, 196 insertions(+), 174 deletions(-) diff --git a/index_tests/constructors/constructor.cc b/index_tests/constructors/constructor.cc index c3689b87..cf764596 100644 --- a/index_tests/constructors/constructor.cc +++ b/index_tests/constructors/constructor.cc @@ -26,7 +26,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["7:7-7:8|15041163540773201510|2|16676", "8:17-8:20|15041163540773201510|2|16676"], + "uses": ["7:7-7:8|4259594751088586730|3|16676", "8:17-8:20|4259594751088586730|3|16676"], "callees": [] }, { "usr": 4259594751088586730, @@ -42,7 +42,7 @@ OUTPUT: "derived": [], "vars": [10983126130596230582, 17165811951126099095], "uses": [], - "callees": [] + "callees": ["7:7-7:8|3385168158331140247|3|16676", "7:7-7:8|3385168158331140247|3|16676", "8:17-8:20|3385168158331140247|3|16676", "8:17-8:20|3385168158331140247|3|16676"] }], "usr2type": [{ "usr": 15041163540773201510, @@ -60,7 +60,7 @@ OUTPUT: "funcs": [3385168158331140247], "vars": [], "instances": [10983126130596230582, 17165811951126099095], - "uses": ["3:3-3:6|0|1|4", "7:3-7:6|0|1|4", "8:3-8:6|0|1|4", "8:17-8:20|0|1|4"] + "uses": ["3:3-3:6|15041163540773201510|2|4", "7:3-7:6|4259594751088586730|3|4", "8:3-8:6|4259594751088586730|3|4", "8:17-8:20|4259594751088586730|3|4"] }], "usr2var": [{ "usr": 10983126130596230582, diff --git a/index_tests/constructors/destructor.cc b/index_tests/constructors/destructor.cc index 0c4a0c92..f7724c3b 100644 --- a/index_tests/constructors/destructor.cc +++ b/index_tests/constructors/destructor.cc @@ -31,7 +31,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["8:7-8:8|15041163540773201510|2|16676"], + "uses": ["8:7-8:8|4259594751088586730|3|16676"], "callees": [] }, { "usr": 4259594751088586730, @@ -47,7 +47,7 @@ OUTPUT: "derived": [], "vars": [1893354193220338759], "uses": [], - "callees": [] + "callees": ["8:7-8:8|3385168158331140247|3|16676", "8:7-8:8|3385168158331140247|3|16676"] }, { "usr": 7440261702884428359, "detailed_name": "Foo::~Foo() noexcept", @@ -80,7 +80,7 @@ OUTPUT: "funcs": [3385168158331140247, 7440261702884428359], "vars": [], "instances": [1893354193220338759], - "uses": ["3:3-3:6|0|1|4", "4:4-4:7|0|1|4", "8:3-8:6|0|1|4"] + "uses": ["3:3-3:6|15041163540773201510|2|4", "4:4-4:7|15041163540773201510|2|4", "8:3-8:6|4259594751088586730|3|4"] }], "usr2var": [{ "usr": 1893354193220338759, diff --git a/index_tests/constructors/implicit_constructor.cc b/index_tests/constructors/implicit_constructor.cc index 9d934c97..be98be7f 100644 --- a/index_tests/constructors/implicit_constructor.cc +++ b/index_tests/constructors/implicit_constructor.cc @@ -26,7 +26,7 @@ OUTPUT: "derived": [], "vars": [449111627548814328, 17097499197730163115], "uses": [], - "callees": [] + "callees": ["6:8-6:12|10530961286677896857|3|16676", "6:8-6:12|10530961286677896857|3|16676", "7:15-7:19|10530961286677896857|3|16676", "7:15-7:19|10530961286677896857|3|16676"] }, { "usr": 10530961286677896857, "detailed_name": "Type::Type()", @@ -40,7 +40,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["6:8-6:12|13487927231218873822|2|16676", "7:15-7:19|13487927231218873822|2|16676"], + "uses": ["6:8-6:12|3957104924306079513|3|16676", "7:15-7:19|3957104924306079513|3|16676"], "callees": [] }], "usr2type": [{ @@ -59,7 +59,7 @@ OUTPUT: "funcs": [10530961286677896857], "vars": [], "instances": [449111627548814328, 17097499197730163115], - "uses": ["2:3-2:7|0|1|4", "6:3-6:7|0|1|4", "7:15-7:19|0|1|4"] + "uses": ["2:3-2:7|13487927231218873822|2|4", "6:3-6:7|3957104924306079513|3|4", "7:15-7:19|3957104924306079513|3|4"] }], "usr2var": [{ "usr": 449111627548814328, diff --git a/index_tests/constructors/invalid_reference.cc b/index_tests/constructors/invalid_reference.cc index b1ea4465..c6c933e1 100644 --- a/index_tests/constructors/invalid_reference.cc +++ b/index_tests/constructors/invalid_reference.cc @@ -21,7 +21,7 @@ OUTPUT: "storage": 0, "declarations": [], "spell": "4:6-4:9|15041163540773201510|2|1026", - "extent": "4:1-4:11|0|1|0", + "extent": "4:1-4:11|15041163540773201510|2|0", "bases": [], "derived": [], "vars": [], @@ -44,7 +44,7 @@ OUTPUT: "funcs": [17319723337446061757], "vars": [], "instances": [], - "uses": ["4:1-4:4|0|1|4", "4:6-4:9|0|1|4"] + "uses": ["4:1-4:4|0|1|4", "4:6-4:9|15041163540773201510|2|4"] }], "usr2var": [] } diff --git a/index_tests/constructors/make_functions.cc b/index_tests/constructors/make_functions.cc index 04699b41..e2e3be4c 100644 --- a/index_tests/constructors/make_functions.cc +++ b/index_tests/constructors/make_functions.cc @@ -105,7 +105,7 @@ OUTPUT: make_functions.h "funcs": [], "vars": [], "instances": [], - "uses": ["7:17-7:20|0|1|4", "8:15-8:18|0|1|4"] + "uses": ["7:17-7:20|14935975554338052500|2|4", "8:15-8:18|14935975554338052500|2|4"] }, { "usr": 14935975554338052500, "detailed_name": "class Foobar {}", @@ -122,7 +122,7 @@ OUTPUT: make_functions.h "funcs": [13131778807733950299, 13028995015627606181, 3765833212244435302, 17321436359755983845], "vars": [], "instances": [], - "uses": ["5:3-5:9|0|1|4", "6:3-6:9|0|1|4", "7:3-7:9|0|1|4", "8:3-8:9|0|1|4"] + "uses": ["5:3-5:9|14935975554338052500|2|4", "6:3-6:9|14935975554338052500|2|4", "7:3-7:9|14935975554338052500|2|4", "8:3-8:9|14935975554338052500|2|4"] }], "usr2var": [] } @@ -159,7 +159,7 @@ OUTPUT: make_functions.cc "bases": [], "derived": [], "vars": [3908732770590594660], - "uses": ["17:3-17:14|0|1|16420"], + "uses": ["17:3-17:14|2816883305867289955|3|16420"], "callees": [] }, { "usr": 2816883305867289955, @@ -175,7 +175,7 @@ OUTPUT: make_functions.cc "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["14:3-14:13|15793662558620604611|3|16420", "15:3-15:13|15793662558620604611|3|16420", "16:3-16:13|15793662558620604611|3|16420", "17:3-17:14|2532818908869373467|3|16420"] }, { "usr": 11138976705878544996, "detailed_name": "", @@ -215,7 +215,7 @@ OUTPUT: make_functions.cc "bases": [], "derived": [], "vars": [8463700030555379526], - "uses": ["14:3-14:13|0|1|16420", "15:3-15:13|0|1|16420", "16:3-16:13|0|1|16420"], + "uses": ["14:3-14:13|2816883305867289955|3|16420", "15:3-15:13|2816883305867289955|3|16420", "16:3-16:13|2816883305867289955|3|16420"], "callees": [] }], "usr2type": [{ @@ -262,7 +262,7 @@ OUTPUT: make_functions.cc "funcs": [], "vars": [], "instances": [], - "uses": ["16:29-16:32|0|1|4", "17:30-17:33|0|1|4"] + "uses": ["16:29-16:32|2816883305867289955|3|4", "17:30-17:33|2816883305867289955|3|4"] }, { "usr": 14935975554338052500, "detailed_name": "class Foobar {}", @@ -277,7 +277,7 @@ OUTPUT: make_functions.cc "funcs": [], "vars": [], "instances": [], - "uses": ["14:14-14:20|0|1|4", "15:14-15:20|0|1|4", "16:14-16:20|0|1|4", "17:15-17:21|0|1|4"] + "uses": ["14:14-14:20|2816883305867289955|3|4", "15:14-15:20|2816883305867289955|3|4", "16:14-16:20|2816883305867289955|3|4", "17:15-17:21|2816883305867289955|3|4"] }], "usr2var": [{ "usr": 180270746871803062, diff --git a/index_tests/declaration_vs_definition/class_member_static.cc b/index_tests/declaration_vs_definition/class_member_static.cc index 0e5b3222..c0ae1aa7 100644 --- a/index_tests/declaration_vs_definition/class_member_static.cc +++ b/index_tests/declaration_vs_definition/class_member_static.cc @@ -50,7 +50,7 @@ OUTPUT: "short_name": "foo", "declarations": ["2:14-2:17|15041163540773201510|2|1025"], "spell": "5:10-5:13|15041163540773201510|2|1026", - "extent": "5:1-5:13|0|1|0", + "extent": "5:1-5:13|15041163540773201510|2|0", "type": 53, "uses": [], "kind": 13, diff --git a/index_tests/declaration_vs_definition/method.cc b/index_tests/declaration_vs_definition/method.cc index c51fd99e..18aed73a 100644 --- a/index_tests/declaration_vs_definition/method.cc +++ b/index_tests/declaration_vs_definition/method.cc @@ -46,7 +46,7 @@ OUTPUT: "storage": 0, "declarations": ["4:8-4:11|15041163540773201510|2|1025"], "spell": "7:11-7:14|15041163540773201510|2|1026", - "extent": "7:1-7:19|0|1|0", + "extent": "7:1-7:19|15041163540773201510|2|0", "bases": [], "derived": [], "vars": [], diff --git a/index_tests/enums/enum_usage.cc b/index_tests/enums/enum_usage.cc index d7c94e44..2d602b45 100644 --- a/index_tests/enums/enum_usage.cc +++ b/index_tests/enums/enum_usage.cc @@ -39,7 +39,7 @@ OUTPUT: "spell": "2:3-2:4|16985894625255407295|2|1026", "extent": "2:3-2:4|16985894625255407295|2|0", "type": 0, - "uses": ["6:14-6:15|16985894625255407295|2|4"], + "uses": ["6:14-6:15|0|1|4"], "kind": 22, "storage": 0 }, { diff --git a/index_tests/foobar.cc b/index_tests/foobar.cc index cdbe2762..b1e571d1 100644 --- a/index_tests/foobar.cc +++ b/index_tests/foobar.cc @@ -115,7 +115,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["9:9-9:14|10528472276654770367|2|4"] + "uses": ["9:9-9:14|0|1|4"] }], "usr2var": [{ "usr": 12028309045033782423, diff --git a/index_tests/inheritance/class_inherit.cc b/index_tests/inheritance/class_inherit.cc index 3f797bc1..e38b20bd 100644 --- a/index_tests/inheritance/class_inherit.cc +++ b/index_tests/inheritance/class_inherit.cc @@ -23,7 +23,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["2:24-2:30|0|1|2052"] + "uses": ["2:24-2:30|10963370434658308541|2|2052"] }, { "usr": 10963370434658308541, "detailed_name": "class Derived : public Parent {}", diff --git a/index_tests/inheritance/class_inherit_templated_parent.cc b/index_tests/inheritance/class_inherit_templated_parent.cc index 14bedb59..33b80bbb 100644 --- a/index_tests/inheritance/class_inherit_templated_parent.cc +++ b/index_tests/inheritance/class_inherit_templated_parent.cc @@ -34,7 +34,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["13:43-13:51|0|1|2052"] + "uses": ["13:43-13:51|10963370434658308541|2|2052"] }, { "usr": 10651399730831737929, "detailed_name": "class Derived2 : Base2 {}", @@ -51,7 +51,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["13:56-13:64|0|1|2052"] + "uses": ["13:56-13:64|10963370434658308541|2|2052"] }, { "usr": 10963370434658308541, "detailed_name": "class Derived : Base1<3>, Base2, Derived1<4>, Derived2 {}", @@ -68,7 +68,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["13:33-13:40|0|1|2052", "13:65-13:72|0|1|2052"] + "uses": ["13:33-13:40|10963370434658308541|2|2052", "13:65-13:72|10963370434658308541|2|2052"] }, { "usr": 11118288764693061434, "detailed_name": "class Base2 {}", @@ -85,7 +85,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["13:27-13:32|0|1|2052"] + "uses": ["13:27-13:32|10963370434658308541|2|2052"] }, { "usr": 11930058224338108382, "detailed_name": "class Base1 {}", @@ -102,7 +102,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["13:17-13:22|0|1|2052"] + "uses": ["13:17-13:22|10963370434658308541|2|2052"] }], "usr2var": [] } diff --git a/index_tests/inheritance/class_multiple_inherit.cc b/index_tests/inheritance/class_multiple_inherit.cc index 18164c61..ee1603b3 100644 --- a/index_tests/inheritance/class_multiple_inherit.cc +++ b/index_tests/inheritance/class_multiple_inherit.cc @@ -25,7 +25,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["2:24-2:28|0|1|2052", "3:24-3:28|0|1|2052"] + "uses": ["2:24-2:28|11863524815063131483|2|2052", "3:24-3:28|14022569716337624303|2|2052"] }, { "usr": 10963370434658308541, "detailed_name": "class Derived : public MiddleA, public MiddleB {}", @@ -59,7 +59,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["4:24-4:31|0|1|2052"] + "uses": ["4:24-4:31|10963370434658308541|2|2052"] }, { "usr": 14022569716337624303, "detailed_name": "class MiddleB : public Root {}", @@ -76,7 +76,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["4:40-4:47|0|1|2052"] + "uses": ["4:40-4:47|10963370434658308541|2|2052"] }], "usr2var": [] } diff --git a/index_tests/inheritance/function_override.cc b/index_tests/inheritance/function_override.cc index 518fb3ba..982a2cf1 100644 --- a/index_tests/inheritance/function_override.cc +++ b/index_tests/inheritance/function_override.cc @@ -55,7 +55,7 @@ OUTPUT: "funcs": [9948027785633571339], "vars": [], "instances": [], - "uses": ["4:24-4:28|0|1|2052"] + "uses": ["4:24-4:28|10963370434658308541|2|2052"] }, { "usr": 10963370434658308541, "detailed_name": "class Derived : public Root {}", diff --git a/index_tests/inheritance/multiple_base_functions.cc b/index_tests/inheritance/multiple_base_functions.cc index 3ae72322..dcc0e781 100644 --- a/index_tests/inheritance/multiple_base_functions.cc +++ b/index_tests/inheritance/multiple_base_functions.cc @@ -75,7 +75,7 @@ OUTPUT: "funcs": [13164726294460837993], "vars": [], "instances": [], - "uses": ["8:4-8:11|0|1|4"] + "uses": ["8:4-8:11|10963370434658308541|2|4"] }, { "usr": 11628904180681204356, "detailed_name": "struct Base0 {}", @@ -92,7 +92,7 @@ OUTPUT: "funcs": [16347272523198263017], "vars": [], "instances": [], - "uses": ["2:12-2:17|0|1|4", "7:18-7:23|0|1|2052"] + "uses": ["2:12-2:17|11628904180681204356|2|4", "7:18-7:23|10963370434658308541|2|2052"] }, { "usr": 15826803741381445676, "detailed_name": "struct Base1 {}", @@ -109,7 +109,7 @@ OUTPUT: "funcs": [8401779086123965305], "vars": [], "instances": [], - "uses": ["5:12-5:17|0|1|4", "7:25-7:30|0|1|2052"] + "uses": ["5:12-5:17|15826803741381445676|2|4", "7:25-7:30|10963370434658308541|2|2052"] }], "usr2var": [] } diff --git a/index_tests/lambdas/lambda.cc b/index_tests/lambdas/lambda.cc index f9579276..357d6e32 100644 --- a/index_tests/lambdas/lambda.cc +++ b/index_tests/lambdas/lambda.cc @@ -30,7 +30,7 @@ OUTPUT: "derived": [], "vars": [12666114896600231317, 2981279427664991319], "uses": [], - "callees": [] + "callees": ["9:14-9:15|17926497908620168464|3|16420", "10:14-10:15|17926497908620168464|3|16420", "11:14-11:15|17926497908620168464|3|16420"] }, { "usr": 17926497908620168464, "detailed_name": "inline void foo()::(anon class)::operator()(int y) const", @@ -42,7 +42,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["9:14-9:15|14635009347499519042|2|16420", "10:14-10:15|14635009347499519042|2|16420", "11:14-11:15|14635009347499519042|2|16420"], + "uses": ["9:14-9:15|4259594751088586730|3|16420", "10:14-10:15|4259594751088586730|3|16420", "11:14-11:15|4259594751088586730|3|16420"], "callees": [] }], "usr2type": [{ @@ -110,9 +110,9 @@ OUTPUT: "short_name": "y", "declarations": [], "spell": "4:31-4:32|17926497908620168464|3|2", - "extent": "4:27-4:32|17926497908620168464|3|0", + "extent": "4:27-4:32|4259594751088586730|3|0", "type": 0, - "uses": ["6:7-6:8|17926497908620168464|3|28"], + "uses": ["6:7-6:8|4259594751088586730|3|28"], "kind": 253, "storage": 0 }] diff --git a/index_tests/macros/complex.cc b/index_tests/macros/complex.cc index c943f2c6..1b17ea8e 100644 --- a/index_tests/macros/complex.cc +++ b/index_tests/macros/complex.cc @@ -30,7 +30,7 @@ OUTPUT: "derived": [], "vars": [], "uses": ["2:7-2:8|0|1|64|0", "3:7-3:8|0|1|64|0"], - "callees": [] + "callees": ["12:5-12:10|14400399977994209582|3|16420"] }, { "usr": 14400399977994209582, "detailed_name": "int make1()", @@ -44,7 +44,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["12:5-12:10|0|1|16420", "12:5-12:10|0|1|64|0"], + "uses": ["12:5-12:10|9720930732776154610|3|16420", "12:5-12:10|0|1|64|0"], "callees": [] }], "usr2type": [{ @@ -73,7 +73,7 @@ OUTPUT: "spell": "9:11-9:16|0|1|2", "extent": "9:1-9:20|0|1|0", "type": 53, - "uses": ["12:14-12:19|0|1|12", "12:14-12:19|0|1|64|0"], + "uses": ["12:14-12:19|9720930732776154610|3|12", "12:14-12:19|0|1|64|0"], "kind": 13, "storage": 0 }, { diff --git a/index_tests/macros/foo.cc b/index_tests/macros/foo.cc index 7a832595..c2086d47 100644 --- a/index_tests/macros/foo.cc +++ b/index_tests/macros/foo.cc @@ -59,7 +59,7 @@ OUTPUT: "funcs": [13788753348312146871], "vars": [], "instances": [], - "uses": ["5:12-5:15|0|1|4", "5:12-5:15|0|1|64|0"] + "uses": ["5:12-5:15|15041163540773201510|2|4", "5:12-5:15|0|1|64|0"] }], "usr2var": [{ "usr": 1569772797058982873, diff --git a/index_tests/method_definition.cc b/index_tests/method_definition.cc index 083dbcb3..b79e9ba3 100644 --- a/index_tests/method_definition.cc +++ b/index_tests/method_definition.cc @@ -18,7 +18,7 @@ OUTPUT: "storage": 0, "declarations": ["2:8-2:11|15041163540773201510|2|1025"], "spell": "5:11-5:14|15041163540773201510|2|1026", - "extent": "5:1-5:25|0|1|0", + "extent": "5:1-5:25|15041163540773201510|2|0", "bases": [], "derived": [], "vars": [], diff --git a/index_tests/multi_file/impl.cc b/index_tests/multi_file/impl.cc index db74ff21..cc53dabf 100644 --- a/index_tests/multi_file/impl.cc +++ b/index_tests/multi_file/impl.cc @@ -107,7 +107,7 @@ OUTPUT: header.h "funcs": [], "vars": [], "instances": [], - "uses": ["5:26-5:30|0|1|2052"] + "uses": ["5:26-5:30|16750616846959666305|2|2052"] }, { "usr": 16750616846959666305, "detailed_name": "struct SameFileDerived : Base {}", @@ -212,11 +212,11 @@ OUTPUT: impl.cc "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["4:3-4:7|11650481237659640387|3|16420"] }, { "usr": 11650481237659640387, - "detailed_name": "void Foo1()", - "qual_name_offset": 5, + "detailed_name": "template<> void Foo1()", + "qual_name_offset": 16, "short_name": "Foo1", "kind": 12, "storage": 0, @@ -224,7 +224,7 @@ OUTPUT: impl.cc "bases": [], "derived": [], "vars": [], - "uses": ["4:3-4:7|0|1|16420"], + "uses": ["4:3-4:7|5817708529036841195|3|16420"], "callees": [] }], "usr2type": [], diff --git a/index_tests/multi_file/simple_impl.cc b/index_tests/multi_file/simple_impl.cc index 5109c2a2..df6d723e 100644 --- a/index_tests/multi_file/simple_impl.cc +++ b/index_tests/multi_file/simple_impl.cc @@ -47,7 +47,7 @@ OUTPUT: simple_impl.cc "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["4:3-4:9|16236105532929924676|3|16420"] }, { "usr": 16236105532929924676, "detailed_name": "void header()", @@ -59,7 +59,7 @@ OUTPUT: simple_impl.cc "bases": [], "derived": [], "vars": [], - "uses": ["4:3-4:9|0|1|16420"], + "uses": ["4:3-4:9|3373269392705484958|3|16420"], "callees": [] }], "usr2type": [], diff --git a/index_tests/multi_file/static.cc b/index_tests/multi_file/static.cc index c0a7267a..7b255c5d 100644 --- a/index_tests/multi_file/static.cc +++ b/index_tests/multi_file/static.cc @@ -12,7 +12,7 @@ OUTPUT: static.h "detailed_name": "static void Buffer::CreateSharedBuffer()", "qual_name_offset": 12, "short_name": "CreateSharedBuffer", - "kind": 6, + "kind": 254, "storage": 0, "declarations": ["4:15-4:33|9411323049603567600|2|1025"], "bases": [], @@ -53,11 +53,11 @@ OUTPUT: static.cc "detailed_name": "void Buffer::CreateSharedBuffer()", "qual_name_offset": 5, "short_name": "CreateSharedBuffer", - "kind": 6, + "kind": 254, "storage": 0, "declarations": [], "spell": "3:14-3:32|9411323049603567600|2|1026", - "extent": "3:1-3:37|0|1|0", + "extent": "3:1-3:37|9411323049603567600|2|0", "bases": [], "derived": [], "vars": [], diff --git a/index_tests/namespaces/method_definition.cc b/index_tests/namespaces/method_definition.cc index 3774972c..2506e411 100644 --- a/index_tests/namespaces/method_definition.cc +++ b/index_tests/namespaces/method_definition.cc @@ -20,7 +20,7 @@ OUTPUT: "storage": 0, "declarations": ["3:8-3:11|4508214972876735896|2|1025"], "spell": "6:11-6:14|4508214972876735896|2|1026", - "extent": "6:1-6:19|2029211996748007610|2|0", + "extent": "6:1-6:19|4508214972876735896|2|0", "bases": [], "derived": [], "vars": [], diff --git a/index_tests/namespaces/namespace_alias.cc b/index_tests/namespaces/namespace_alias.cc index 01e27631..118e20c7 100644 --- a/index_tests/namespaces/namespace_alias.cc +++ b/index_tests/namespaces/namespace_alias.cc @@ -63,7 +63,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["9:17-9:20|0|1|4", "12:11-12:14|0|1|4"] + "uses": ["9:17-9:20|0|1|4", "12:11-12:14|10818727483146447186|3|4"] }, { "usr": 11879713791858506216, "detailed_name": "namespace fbz = foo::bar::baz", @@ -78,7 +78,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["13:11-13:14|0|1|4"] + "uses": ["13:11-13:14|10818727483146447186|3|4"] }, { "usr": 14450849931009540802, "detailed_name": "namespace foo::bar::baz {\n}", @@ -96,7 +96,7 @@ OUTPUT: "R": -1 }], "instances": [], - "uses": ["9:27-9:30|17805385787823406700|2|4", "12:21-12:24|17805385787823406700|2|4"] + "uses": ["9:27-9:30|0|1|4", "12:21-12:24|10818727483146447186|3|4"] }, { "usr": 17805385787823406700, "detailed_name": "namespace foo::bar {\n}", @@ -111,7 +111,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["9:22-9:25|926793467007732869|2|4", "12:16-12:19|926793467007732869|2|4"] + "uses": ["9:22-9:25|0|1|4", "12:16-12:19|10818727483146447186|3|4"] }], "usr2var": [{ "usr": 6030927277961448585, @@ -149,7 +149,7 @@ OUTPUT: "spell": "4:18-4:21|14450849931009540802|2|1026", "extent": "4:14-4:26|14450849931009540802|2|0", "type": 53, - "uses": ["12:26-12:29|14450849931009540802|2|12", "13:16-13:19|14450849931009540802|2|12"], + "uses": ["12:26-12:29|10818727483146447186|3|12", "13:16-13:19|10818727483146447186|3|12"], "kind": 13, "storage": 0 }] diff --git a/index_tests/namespaces/namespace_reference.cc b/index_tests/namespaces/namespace_reference.cc index 758c39e7..16949403 100644 --- a/index_tests/namespaces/namespace_reference.cc +++ b/index_tests/namespaces/namespace_reference.cc @@ -28,7 +28,7 @@ OUTPUT: "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["7:7-7:13|17328473273923617489|3|16420", "9:3-9:9|17328473273923617489|3|16420"] }, { "usr": 17328473273923617489, "detailed_name": "void ns::Accept(int a)", @@ -42,7 +42,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [3649375698083002347], - "uses": ["7:7-7:13|11072669167287398027|2|16420", "9:3-9:9|11072669167287398027|2|16420"], + "uses": ["7:7-7:13|631910859630953711|3|16420", "9:3-9:9|631910859630953711|3|16420"], "callees": [] }], "usr2type": [{ @@ -77,7 +77,7 @@ OUTPUT: "R": -1 }], "instances": [], - "uses": ["7:3-7:5|0|1|4", "7:14-7:16|0|1|4", "8:19-8:21|0|1|4"] + "uses": ["7:3-7:5|631910859630953711|3|4", "7:14-7:16|631910859630953711|3|4", "8:19-8:21|631910859630953711|3|4"] }], "usr2var": [{ "usr": 3649375698083002347, @@ -100,7 +100,7 @@ OUTPUT: "spell": "2:7-2:10|11072669167287398027|2|1026", "extent": "2:3-2:10|11072669167287398027|2|0", "type": 53, - "uses": ["7:18-7:21|11072669167287398027|2|12", "9:10-9:13|11072669167287398027|2|12"], + "uses": ["7:18-7:21|631910859630953711|3|12", "9:10-9:13|631910859630953711|3|12"], "kind": 13, "storage": 0 }] diff --git a/index_tests/outline/static_function_in_type.cc b/index_tests/outline/static_function_in_type.cc index c9caa3bb..89842296 100644 --- a/index_tests/outline/static_function_in_type.cc +++ b/index_tests/outline/static_function_in_type.cc @@ -16,7 +16,7 @@ OUTPUT: static_function_in_type.h "detailed_name": "static void ns::Foo::Register(ns::Manager *)", "qual_name_offset": 12, "short_name": "Register", - "kind": 6, + "kind": 254, "storage": 0, "declarations": ["6:15-6:23|17262466801709381811|2|1025"], "bases": [], @@ -39,7 +39,7 @@ OUTPUT: static_function_in_type.h "funcs": [], "vars": [], "instances": [], - "uses": ["6:24-6:31|11072669167287398027|2|4"] + "uses": ["6:24-6:31|17262466801709381811|2|4"] }, { "usr": 11072669167287398027, "detailed_name": "namespace ns {\n}", @@ -87,12 +87,12 @@ OUTPUT: static_function_in_type.cc "detailed_name": "void Foo::Register(ns::Manager *m)", "qual_name_offset": 5, "short_name": "Register", - "kind": 6, + "kind": 254, "storage": 0, "comments": "static", "declarations": [], "spell": "5:11-5:19|17262466801709381811|2|1026", - "extent": "5:1-6:2|11072669167287398027|2|0", + "extent": "5:1-6:2|17262466801709381811|2|0", "bases": [], "derived": [], "vars": [13569879755236306838], diff --git a/index_tests/templates/func_specialized_template_param.cc b/index_tests/templates/func_specialized_template_param.cc index 6a3dc631..7d5f44be 100644 --- a/index_tests/templates/func_specialized_template_param.cc +++ b/index_tests/templates/func_specialized_template_param.cc @@ -21,7 +21,7 @@ OUTPUT: "storage": 0, "declarations": ["5:8-5:11|15041163540773201510|2|1025"], "spell": "8:11-8:14|15041163540773201510|2|1026", - "extent": "8:1-8:36|0|1|0", + "extent": "8:1-8:36|15041163540773201510|2|0", "bases": [], "derived": [], "vars": [], @@ -42,7 +42,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["5:12-5:20|0|1|4", "8:15-8:23|0|1|4"] + "uses": ["5:12-5:20|15041163540773201510|2|4", "8:15-8:23|0|1|4"] }, { "usr": 15041163540773201510, "detailed_name": "struct Foo {}", diff --git a/index_tests/templates/implicit_variable_instantiation.cc b/index_tests/templates/implicit_variable_instantiation.cc index 934522e8..db370e9f 100644 --- a/index_tests/templates/implicit_variable_instantiation.cc +++ b/index_tests/templates/implicit_variable_instantiation.cc @@ -51,7 +51,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [4731849186641714451, 4731849186641714451], - "uses": ["6:22-6:29|11072669167287398027|2|4", "6:44-6:51|11072669167287398027|2|4", "10:18-10:25|11072669167287398027|2|4"] + "uses": ["6:22-6:29|12688716854043726585|2|4", "6:44-6:51|12688716854043726585|2|4", "10:18-10:25|11072669167287398027|2|4"] }, { "usr": 11072669167287398027, "detailed_name": "namespace ns {\n}", @@ -99,7 +99,7 @@ OUTPUT: "hover": "static constexpr ns::VarType ns::Holder::static_var = (VarType)0x0", "declarations": ["6:30-6:40|12688716854043726585|2|1025"], "spell": "10:37-10:47|12688716854043726585|2|1026", - "extent": "9:3-10:47|11072669167287398027|2|0", + "extent": "9:3-10:47|12688716854043726585|2|0", "type": 1532099849728741556, "uses": ["13:26-13:36|11072669167287398027|2|12", "14:27-14:37|11072669167287398027|2|12"], "kind": 13, diff --git a/index_tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc b/index_tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc index ba245e89..073ba344 100644 --- a/index_tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc +++ b/index_tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc @@ -21,7 +21,7 @@ OUTPUT: "detailed_name": "static int ns::Foo::foo()", "qual_name_offset": 11, "short_name": "foo", - "kind": 6, + "kind": 254, "storage": 0, "declarations": [], "spell": "5:16-5:19|14042997404480181958|2|1026", @@ -29,7 +29,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["10:21-10:24|14042997404480181958|2|36", "11:22-11:25|14042997404480181958|2|36"], + "uses": ["10:21-10:24|11072669167287398027|2|36", "11:22-11:25|11072669167287398027|2|36"], "callees": [] }], "usr2type": [{ diff --git a/index_tests/templates/specialization.cc b/index_tests/templates/specialization.cc index aba5f2c9..c6345002 100644 --- a/index_tests/templates/specialization.cc +++ b/index_tests/templates/specialization.cc @@ -436,7 +436,7 @@ OUTPUT: "spell": "36:3-36:8|9201299975592934124|2|1026", "extent": "36:3-36:8|9201299975592934124|2|0", "type": 0, - "uses": ["43:20-43:25|9201299975592934124|2|4"], + "uses": ["43:20-43:25|0|1|4"], "kind": 22, "storage": 0 }, { diff --git a/index_tests/templates/specialized_func_definition.cc b/index_tests/templates/specialized_func_definition.cc index 68ce9f8b..07c0d475 100644 --- a/index_tests/templates/specialized_func_definition.cc +++ b/index_tests/templates/specialized_func_definition.cc @@ -31,7 +31,7 @@ OUTPUT: "storage": 0, "declarations": [], "spell": "10:22-10:25|17649312483543982122|2|1026", - "extent": "9:1-10:30|0|1|0", + "extent": "9:1-10:30|17649312483543982122|2|0", "bases": [], "derived": [], "vars": [], @@ -46,7 +46,7 @@ OUTPUT: "storage": 0, "declarations": ["3:8-3:11|17107291254533526269|2|1025"], "spell": "7:19-7:22|17107291254533526269|2|1026", - "extent": "6:1-7:24|0|1|0", + "extent": "6:1-7:24|17107291254533526269|2|0", "bases": [], "derived": [], "vars": [], diff --git a/index_tests/templates/template_class_func_usage_folded_into_one.cc b/index_tests/templates/template_class_func_usage_folded_into_one.cc index 0f59f673..93d12998 100644 --- a/index_tests/templates/template_class_func_usage_folded_into_one.cc +++ b/index_tests/templates/template_class_func_usage_folded_into_one.cc @@ -18,7 +18,7 @@ OUTPUT: "detailed_name": "static int Foo::foo()", "qual_name_offset": 11, "short_name": "foo", - "kind": 6, + "kind": 254, "storage": 0, "declarations": [], "spell": "3:14-3:17|10528472276654770367|2|1026", @@ -26,7 +26,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["8:19-8:22|10528472276654770367|2|36", "9:20-9:23|10528472276654770367|2|36"], + "uses": ["8:19-8:22|0|1|36", "9:20-9:23|0|1|36"], "callees": [] }], "usr2type": [{ diff --git a/index_tests/templates/template_class_template_func_usage_folded_into_one.cc b/index_tests/templates/template_class_template_func_usage_folded_into_one.cc index 034b6ef3..a38322c3 100644 --- a/index_tests/templates/template_class_template_func_usage_folded_into_one.cc +++ b/index_tests/templates/template_class_template_func_usage_folded_into_one.cc @@ -19,7 +19,7 @@ OUTPUT: "detailed_name": "static int Foo::foo()", "qual_name_offset": 11, "short_name": "foo", - "kind": 6, + "kind": 254, "storage": 0, "declarations": [], "spell": "4:14-4:17|10528472276654770367|2|1026", @@ -27,7 +27,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["9:19-9:22|10528472276654770367|2|36", "10:20-10:23|10528472276654770367|2|36"], + "uses": ["9:19-9:22|0|1|36", "10:20-10:23|0|1|36"], "callees": [] }], "usr2type": [{ diff --git a/index_tests/templates/template_class_type_usage_folded_into_one.cc b/index_tests/templates/template_class_type_usage_folded_into_one.cc index f80e5f0e..0dbec81c 100644 --- a/index_tests/templates/template_class_type_usage_folded_into_one.cc +++ b/index_tests/templates/template_class_type_usage_folded_into_one.cc @@ -117,7 +117,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["9:9-9:14|10528472276654770367|2|4", "10:9-10:14|10528472276654770367|2|4"] + "uses": ["9:9-9:14|0|1|4", "10:9-10:14|0|1|4"] }, { "usr": 15961308565836244174, "detailed_name": "Inner", diff --git a/index_tests/templates/template_class_var_usage_folded_into_one.cc b/index_tests/templates/template_class_var_usage_folded_into_one.cc index 8ab2b8dc..fd172671 100644 --- a/index_tests/templates/template_class_var_usage_folded_into_one.cc +++ b/index_tests/templates/template_class_var_usage_folded_into_one.cc @@ -66,7 +66,7 @@ OUTPUT: "hover": "static constexpr int Foo::var = 3", "declarations": ["3:24-3:27|10528472276654770367|2|1025"], "type": 53, - "uses": ["6:19-6:22|10528472276654770367|2|12", "7:20-7:23|10528472276654770367|2|12"], + "uses": ["6:19-6:22|0|1|12", "7:20-7:23|0|1|12"], "kind": 13, "storage": 2 }, { diff --git a/index_tests/unions/union_usage.cc b/index_tests/unions/union_usage.cc index eadb06c7..8682aae2 100644 --- a/index_tests/unions/union_usage.cc +++ b/index_tests/unions/union_usage.cc @@ -95,7 +95,7 @@ OUTPUT: "spell": "6:5-6:6|0|1|2", "extent": "6:1-6:6|0|1|0", "type": 8501689086387244262, - "uses": ["9:3-9:4|0|1|4"], + "uses": ["9:3-9:4|13982179977217945200|3|4"], "kind": 13, "storage": 0 }, { @@ -119,7 +119,7 @@ OUTPUT: "spell": "2:7-2:8|8501689086387244262|2|1026", "extent": "2:3-2:12|8501689086387244262|2|0", "type": 53, - "uses": ["9:5-9:6|8501689086387244262|2|20"], + "uses": ["9:5-9:6|13982179977217945200|3|20"], "kind": 8, "storage": 0 }] diff --git a/index_tests/usage/func_called_from_constructor.cc b/index_tests/usage/func_called_from_constructor.cc index 9f43fd00..69269d9e 100644 --- a/index_tests/usage/func_called_from_constructor.cc +++ b/index_tests/usage/func_called_from_constructor.cc @@ -26,7 +26,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["8:3-8:9|0|1|16420"], + "uses": ["8:3-8:9|3385168158331140247|3|16420"], "callees": [] }, { "usr": 3385168158331140247, @@ -37,12 +37,12 @@ OUTPUT: "storage": 0, "declarations": ["4:3-4:6|15041163540773201510|2|1025"], "spell": "7:6-7:9|15041163540773201510|2|1026", - "extent": "7:1-9:2|0|1|0", + "extent": "7:1-9:2|15041163540773201510|2|0", "bases": [], "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["8:3-8:9|468307235068920063|3|16420"] }], "usr2type": [{ "usr": 15041163540773201510, @@ -60,7 +60,7 @@ OUTPUT: "funcs": [3385168158331140247], "vars": [], "instances": [], - "uses": ["4:3-4:6|0|1|4", "7:1-7:4|0|1|4", "7:6-7:9|0|1|4"] + "uses": ["4:3-4:6|15041163540773201510|2|4", "7:1-7:4|0|1|4", "7:6-7:9|15041163540773201510|2|4"] }], "usr2var": [] } diff --git a/index_tests/usage/func_called_from_macro_argument.cc b/index_tests/usage/func_called_from_macro_argument.cc index c3bb78d8..1312ef95 100644 --- a/index_tests/usage/func_called_from_macro_argument.cc +++ b/index_tests/usage/func_called_from_macro_argument.cc @@ -22,7 +22,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["6:14-6:20|0|1|16420", "6:14-6:20|0|1|64|0"], + "uses": ["6:14-6:20|11404881820527069090|3|16420", "6:14-6:20|0|1|64|0"], "callees": [] }, { "usr": 11404881820527069090, @@ -38,7 +38,7 @@ OUTPUT: "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["6:14-6:20|3787803219955606747|3|16420"] }], "usr2type": [], "usr2var": [{ diff --git a/index_tests/usage/func_called_from_template.cc b/index_tests/usage/func_called_from_template.cc index 34338f34..868cc1b0 100644 --- a/index_tests/usage/func_called_from_template.cc +++ b/index_tests/usage/func_called_from_template.cc @@ -27,8 +27,21 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["5:3-5:9|0|1|16420"], + "uses": ["5:3-5:9|10177235824697315808|3|16420", "5:3-5:9|2459767597003442547|3|16420"], "callees": [] + }, { + "usr": 2459767597003442547, + "detailed_name": "", + "qual_name_offset": 0, + "short_name": "", + "kind": 0, + "storage": 0, + "declarations": [], + "bases": [], + "derived": [], + "vars": [], + "uses": [], + "callees": ["5:3-5:9|468307235068920063|3|16420"] }, { "usr": 4259594751088586730, "detailed_name": "void foo()", @@ -43,7 +56,7 @@ OUTPUT: "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["9:3-9:9|10177235824697315808|3|16420"] }, { "usr": 10177235824697315808, "detailed_name": "void caller()", @@ -57,8 +70,8 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["9:3-9:9|0|1|16420"], - "callees": [] + "uses": ["9:3-9:9|4259594751088586730|3|16420"], + "callees": ["5:3-5:9|468307235068920063|3|16420"] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/usage/func_called_implicit_ctor.cc b/index_tests/usage/func_called_implicit_ctor.cc index 372c2f12..522158bd 100644 --- a/index_tests/usage/func_called_implicit_ctor.cc +++ b/index_tests/usage/func_called_implicit_ctor.cc @@ -26,7 +26,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["8:10-8:16|0|1|16420"], + "uses": ["8:10-8:16|11404881820527069090|3|16420"], "callees": [] }, { "usr": 10544127002917214589, @@ -39,7 +39,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["8:10-8:16|13611487872560323389|2|16676"], + "uses": ["8:10-8:16|11404881820527069090|3|16676"], "callees": [] }, { "usr": 11404881820527069090, @@ -55,7 +55,7 @@ OUTPUT: "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["8:10-8:16|10544127002917214589|3|16676", "8:10-8:16|468307235068920063|3|16420"] }], "usr2type": [{ "usr": 13611487872560323389, @@ -73,7 +73,7 @@ OUTPUT: "funcs": [10544127002917214589], "vars": [], "instances": [], - "uses": ["2:3-2:10|0|1|4", "7:1-7:8|0|1|4"] + "uses": ["2:3-2:10|13611487872560323389|2|4", "7:1-7:8|0|1|4"] }], "usr2var": [] } diff --git a/index_tests/usage/func_usage_addr_func.cc b/index_tests/usage/func_usage_addr_func.cc index 3d163e13..294b6f5e 100644 --- a/index_tests/usage/func_usage_addr_func.cc +++ b/index_tests/usage/func_usage_addr_func.cc @@ -25,7 +25,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["6:18-6:22|0|1|132", "7:12-7:16|0|1|132"], + "uses": ["6:18-6:22|9376923949268137283|3|132", "7:12-7:16|9376923949268137283|3|132"], "callees": [] }, { "usr": 9376923949268137283, @@ -41,7 +41,7 @@ OUTPUT: "derived": [], "vars": [16088407831770615719], "uses": [], - "callees": [] + "callees": ["6:18-6:22|5264867802674151787|3|132", "6:18-6:22|5264867802674151787|3|132", "7:3-7:10|12924914488846929470|3|16420", "7:12-7:16|5264867802674151787|3|132"] }, { "usr": 12924914488846929470, "detailed_name": "void consume(void (*)())", @@ -55,7 +55,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["7:3-7:10|0|1|16420"], + "uses": ["7:3-7:10|9376923949268137283|3|16420"], "callees": [] }], "usr2type": [], diff --git a/index_tests/usage/func_usage_addr_method.cc b/index_tests/usage/func_usage_addr_method.cc index 1953c9cc..3dfdda35 100644 --- a/index_tests/usage/func_usage_addr_method.cc +++ b/index_tests/usage/func_usage_addr_method.cc @@ -26,7 +26,7 @@ OUTPUT: "derived": [], "vars": [4636142131003982569], "uses": [], - "callees": [] + "callees": ["6:18-6:22|18417145003926999463|3|132", "6:18-6:22|18417145003926999463|3|132"] }, { "usr": 18417145003926999463, "detailed_name": "void Foo::Used()", @@ -38,7 +38,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["6:18-6:22|15041163540773201510|2|132"], + "uses": ["6:18-6:22|9376923949268137283|3|132"], "callees": [] }], "usr2type": [{ @@ -57,7 +57,7 @@ OUTPUT: "funcs": [18417145003926999463], "vars": [], "instances": [], - "uses": ["6:13-6:16|0|1|4"] + "uses": ["6:13-6:16|9376923949268137283|3|4"] }], "usr2var": [{ "usr": 4636142131003982569, diff --git a/index_tests/usage/func_usage_call_func.cc b/index_tests/usage/func_usage_call_func.cc index 7552f625..b6d82740 100644 --- a/index_tests/usage/func_usage_call_func.cc +++ b/index_tests/usage/func_usage_call_func.cc @@ -21,7 +21,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["3:3-3:9|0|1|16420"], + "uses": ["3:3-3:9|11404881820527069090|3|16420"], "callees": [] }, { "usr": 11404881820527069090, @@ -37,7 +37,7 @@ OUTPUT: "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["3:3-3:9|468307235068920063|3|16420"] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/usage/func_usage_call_method.cc b/index_tests/usage/func_usage_call_method.cc index a727815e..e16be451 100644 --- a/index_tests/usage/func_usage_call_method.cc +++ b/index_tests/usage/func_usage_call_method.cc @@ -26,7 +26,7 @@ OUTPUT: "derived": [], "vars": [14045150712868309451], "uses": [], - "callees": [] + "callees": ["7:6-7:10|18417145003926999463|3|16420"] }, { "usr": 18417145003926999463, "detailed_name": "void Foo::Used()", @@ -38,7 +38,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["7:6-7:10|15041163540773201510|2|16420"], + "uses": ["7:6-7:10|9376923949268137283|3|16420"], "callees": [] }], "usr2type": [{ @@ -57,7 +57,7 @@ OUTPUT: "funcs": [18417145003926999463], "vars": [], "instances": [14045150712868309451], - "uses": ["6:3-6:6|0|1|4"] + "uses": ["6:3-6:6|9376923949268137283|3|4"] }], "usr2var": [{ "usr": 14045150712868309451, diff --git a/index_tests/usage/func_usage_class_inline_var_def.cc b/index_tests/usage/func_usage_class_inline_var_def.cc index fb529c48..41392385 100644 --- a/index_tests/usage/func_usage_class_inline_var_def.cc +++ b/index_tests/usage/func_usage_class_inline_var_def.cc @@ -24,7 +24,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["6:11-6:17|0|1|36"], + "uses": ["6:11-6:17|15041163540773201510|2|36"], "callees": [] }], "usr2type": [{ diff --git a/index_tests/usage/func_usage_forward_decl_func.cc b/index_tests/usage/func_usage_forward_decl_func.cc index 503465bc..775595fd 100644 --- a/index_tests/usage/func_usage_forward_decl_func.cc +++ b/index_tests/usage/func_usage_forward_decl_func.cc @@ -19,7 +19,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["4:3-4:6|0|1|16420"], + "uses": ["4:3-4:6|6767773193109753523|3|16420"], "callees": [] }, { "usr": 6767773193109753523, @@ -35,7 +35,7 @@ OUTPUT: "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["4:3-4:6|4259594751088586730|3|16420"] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/usage/func_usage_forward_decl_method.cc b/index_tests/usage/func_usage_forward_decl_method.cc index 2fbc2f9c..d27dadec 100644 --- a/index_tests/usage/func_usage_forward_decl_method.cc +++ b/index_tests/usage/func_usage_forward_decl_method.cc @@ -25,7 +25,7 @@ OUTPUT: "derived": [], "vars": [16229832321010999607], "uses": [], - "callees": [] + "callees": ["7:6-7:9|17922201480358737771|3|16420"] }, { "usr": 17922201480358737771, "detailed_name": "void Foo::foo()", @@ -37,7 +37,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["7:6-7:9|15041163540773201510|2|16420"], + "uses": ["7:6-7:9|6767773193109753523|3|16420"], "callees": [] }], "usr2type": [{ @@ -56,7 +56,7 @@ OUTPUT: "funcs": [17922201480358737771], "vars": [], "instances": [16229832321010999607], - "uses": ["6:3-6:6|0|1|4"] + "uses": ["6:3-6:6|6767773193109753523|3|4"] }], "usr2var": [{ "usr": 16229832321010999607, diff --git a/index_tests/usage/func_usage_template_func.cc b/index_tests/usage/func_usage_template_func.cc index a70dcf5f..422d5952 100644 --- a/index_tests/usage/func_usage_template_func.cc +++ b/index_tests/usage/func_usage_template_func.cc @@ -25,7 +25,7 @@ OUTPUT: "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["5:3-5:9|10585861037135727329|3|16420", "6:3-6:9|10585861037135727329|3|16420"] }, { "usr": 10585861037135727329, "detailed_name": "void accept(T)", @@ -37,7 +37,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["5:3-5:9|0|1|16420", "6:3-6:9|0|1|16420"], + "uses": ["5:3-5:9|4259594751088586730|3|16420", "6:3-6:9|4259594751088586730|3|16420"], "callees": [] }], "usr2type": [], diff --git a/index_tests/usage/type_usage_as_template_parameter.cc b/index_tests/usage/type_usage_as_template_parameter.cc index da797cfa..74d2c025 100644 --- a/index_tests/usage/type_usage_as_template_parameter.cc +++ b/index_tests/usage/type_usage_as_template_parameter.cc @@ -47,7 +47,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["6:8-6:18|0|1|4", "7:8-7:18|0|1|4", "9:1-9:11|0|1|4", "10:3-10:13|0|1|4"] + "uses": ["6:8-6:18|0|1|4", "7:8-7:18|0|1|4", "9:1-9:11|0|1|4", "10:3-10:13|16359708726068806331|3|4"] }, { "usr": 4186953406371619898, "detailed_name": "unique_ptr", @@ -81,7 +81,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["7:19-7:20|0|1|4", "9:12-9:13|0|1|4", "10:14-10:15|0|1|4"] + "uses": ["7:19-7:20|0|1|4", "9:12-9:13|0|1|4", "10:14-10:15|16359708726068806331|3|4"] }, { "usr": 16848604152578034754, "detailed_name": "unique_ptr", diff --git a/index_tests/usage/type_usage_as_template_parameter_complex.cc b/index_tests/usage/type_usage_as_template_parameter_complex.cc index 97c57d7c..7b5ebc54 100644 --- a/index_tests/usage/type_usage_as_template_parameter_complex.cc +++ b/index_tests/usage/type_usage_as_template_parameter_complex.cc @@ -122,7 +122,7 @@ OUTPUT: "storage": 0, "declarations": ["65:23-65:26|15041163540773201510|2|1025"], "spell": "79:26-79:29|15041163540773201510|2|1026", - "extent": "79:1-79:51|0|1|0", + "extent": "79:1-79:51|15041163540773201510|2|0", "bases": [], "derived": [], "vars": [], @@ -158,7 +158,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["15:30-15:32|0|1|4", "33:23-33:25|0|1|4", "33:63-33:65|0|1|4", "54:25-54:27|0|1|4", "65:14-65:16|0|1|4", "79:12-79:14|0|1|4"] + "uses": ["15:30-15:32|0|1|4", "33:23-33:25|0|1|4", "33:63-33:65|0|1|4", "54:25-54:27|18320186404467436976|3|4", "65:14-65:16|15041163540773201510|2|4", "79:12-79:14|0|1|4"] }, { "usr": 7147635971744144194, "detailed_name": "template<> class unique_ptr", @@ -173,7 +173,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["15:19-15:29|0|1|4", "33:12-33:22|0|1|4", "33:52-33:62|0|1|4", "54:14-54:24|0|1|4", "65:3-65:13|0|1|4", "79:1-79:11|0|1|4"] + "uses": ["15:19-15:29|0|1|4", "33:12-33:22|0|1|4", "33:52-33:62|0|1|4", "54:14-54:24|18320186404467436976|3|4", "65:3-65:13|15041163540773201510|2|4", "79:1-79:11|0|1|4"] }, { "usr": 12728490517004312484, "detailed_name": "struct S2", @@ -188,7 +188,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["15:34-15:36|0|1|4", "15:39-15:41|0|1|4", "33:27-33:29|0|1|4", "33:32-33:34|0|1|4", "33:67-33:69|0|1|4", "54:29-54:31|0|1|4", "54:34-54:36|0|1|4", "65:18-65:20|0|1|4", "79:16-79:18|0|1|4"] + "uses": ["15:34-15:36|0|1|4", "15:39-15:41|0|1|4", "33:27-33:29|0|1|4", "33:32-33:34|0|1|4", "33:67-33:69|0|1|4", "54:29-54:31|18320186404467436976|3|4", "54:34-54:36|18320186404467436976|3|4", "65:18-65:20|15041163540773201510|2|4", "79:16-79:18|0|1|4"] }, { "usr": 14209198335088845323, "detailed_name": "class unique_ptr", @@ -237,7 +237,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [2933643612409209903, 500112618220246], - "uses": ["15:8-15:18|0|1|4", "33:1-33:11|0|1|4", "54:3-54:13|0|1|4"] + "uses": ["15:8-15:18|0|1|4", "33:1-33:11|0|1|4", "54:3-54:13|18320186404467436976|3|4"] }], "usr2var": [{ "usr": 500112618220246, diff --git a/index_tests/usage/type_usage_declare_field.cc b/index_tests/usage/type_usage_declare_field.cc index bd1323e9..60b3c7b7 100644 --- a/index_tests/usage/type_usage_declare_field.cc +++ b/index_tests/usage/type_usage_declare_field.cc @@ -28,7 +28,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [14727441168849658842], - "uses": ["6:3-6:18|0|1|4"] + "uses": ["6:3-6:18|15041163540773201510|2|4"] }, { "usr": 13749354388332789217, "detailed_name": "struct ForwardType", @@ -43,7 +43,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [14314859014962085433], - "uses": ["5:3-5:14|0|1|4"] + "uses": ["5:3-5:14|15041163540773201510|2|4"] }, { "usr": 15041163540773201510, "detailed_name": "struct Foo {}", diff --git a/index_tests/usage/type_usage_declare_local.cc b/index_tests/usage/type_usage_declare_local.cc index 848ab490..726dc8a2 100644 --- a/index_tests/usage/type_usage_declare_local.cc +++ b/index_tests/usage/type_usage_declare_local.cc @@ -43,7 +43,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [2580122838476012357], - "uses": ["6:3-6:18|0|1|4"] + "uses": ["6:3-6:18|4654328188330986029|3|4"] }, { "usr": 13749354388332789217, "detailed_name": "struct ForwardType", @@ -58,7 +58,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [16374832544037266261], - "uses": ["5:3-5:14|0|1|4"] + "uses": ["5:3-5:14|4654328188330986029|3|4"] }], "usr2var": [{ "usr": 2580122838476012357, diff --git a/index_tests/usage/type_usage_declare_qualifiers.cc b/index_tests/usage/type_usage_declare_qualifiers.cc index e5c12bf9..41dfc325 100644 --- a/index_tests/usage/type_usage_declare_qualifiers.cc +++ b/index_tests/usage/type_usage_declare_qualifiers.cc @@ -43,7 +43,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [7997456978847868736, 17228576662112939520, 15429032129697337561, 6081981442495435784, 5004072032239834773, 14939253431683105646], - "uses": ["3:10-3:14|0|1|4", "3:26-3:30|0|1|4", "4:3-4:7|0|1|4", "5:3-5:7|0|1|4", "6:9-6:13|0|1|4", "7:9-7:13|0|1|4"] + "uses": ["3:10-3:14|0|1|4", "3:26-3:30|0|1|4", "4:3-4:7|16858540520096802573|3|4", "5:3-5:7|16858540520096802573|3|4", "6:9-6:13|16858540520096802573|3|4", "7:9-7:13|16858540520096802573|3|4"] }], "usr2var": [{ "usr": 5004072032239834773, diff --git a/index_tests/usage/type_usage_on_return_type.cc b/index_tests/usage/type_usage_on_return_type.cc index bf825b69..04e84860 100644 --- a/index_tests/usage/type_usage_on_return_type.cc +++ b/index_tests/usage/type_usage_on_return_type.cc @@ -31,7 +31,7 @@ OUTPUT: "storage": 0, "declarations": ["9:8-9:13|15041163540773201510|2|1025"], "spell": "13:11-13:16|15041163540773201510|2|1026", - "extent": "13:1-13:21|0|1|0", + "extent": "13:1-13:21|15041163540773201510|2|0", "bases": [], "derived": [], "vars": [], @@ -74,7 +74,7 @@ OUTPUT: "storage": 0, "declarations": ["8:9-8:12|15041163540773201510|2|1025"], "spell": "12:12-12:15|15041163540773201510|2|1026", - "extent": "12:1-12:40|0|1|0", + "extent": "12:1-12:40|15041163540773201510|2|0", "bases": [], "derived": [], "vars": [], @@ -110,7 +110,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["3:1-3:5|0|1|4", "4:1-4:5|0|1|4", "5:1-5:5|0|1|4", "8:3-8:7|0|1|4", "12:1-12:5|0|1|4", "15:14-15:18|0|1|4", "17:8-17:12|0|1|4", "18:8-18:12|0|1|4"] + "uses": ["3:1-3:5|0|1|4", "4:1-4:5|0|1|4", "5:1-5:5|0|1|4", "8:3-8:7|15041163540773201510|2|4", "12:1-12:5|0|1|4", "15:14-15:18|0|1|4", "17:8-17:12|0|1|4", "18:8-18:12|0|1|4"] }, { "usr": 15041163540773201510, "detailed_name": "class Foo {}", diff --git a/index_tests/usage/type_usage_various.cc b/index_tests/usage/type_usage_various.cc index c313d436..fead6f19 100644 --- a/index_tests/usage/type_usage_various.cc +++ b/index_tests/usage/type_usage_various.cc @@ -23,7 +23,7 @@ OUTPUT: "storage": 0, "declarations": ["2:8-2:12|15041163540773201510|2|1025"], "spell": "5:11-5:15|15041163540773201510|2|1026", - "extent": "5:1-8:2|0|1|0", + "extent": "5:1-8:2|15041163540773201510|2|0", "bases": [], "derived": [], "vars": [16380484338511689669], @@ -46,7 +46,7 @@ OUTPUT: "funcs": [9488177941273031343], "vars": [], "instances": [16380484338511689669, 14455976355866885943], - "uses": ["2:3-2:6|0|1|4", "5:1-5:4|0|1|4", "5:6-5:9|0|1|4", "6:3-6:6|0|1|4", "10:8-10:11|0|1|4"] + "uses": ["2:3-2:6|15041163540773201510|2|4", "5:1-5:4|0|1|4", "5:6-5:9|0|1|4", "6:3-6:6|9488177941273031343|3|4", "10:8-10:11|0|1|4"] }], "usr2var": [{ "usr": 14455976355866885943, diff --git a/index_tests/usage/usage_inside_of_call.cc b/index_tests/usage/usage_inside_of_call.cc index 78c2c340..036671a4 100644 --- a/index_tests/usage/usage_inside_of_call.cc +++ b/index_tests/usage/usage_inside_of_call.cc @@ -33,7 +33,7 @@ OUTPUT: "derived": [], "vars": [8039186520399841081], "uses": [], - "callees": [] + "callees": ["14:3-14:9|18319417758892371313|3|16420", "14:14-14:17|11404602816585117695|3|16420"] }, { "usr": 11404602816585117695, "detailed_name": "int gen()", @@ -45,7 +45,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["14:14-14:17|0|1|16420"], + "uses": ["14:14-14:17|4259594751088586730|3|16420"], "callees": [] }, { "usr": 18319417758892371313, @@ -58,7 +58,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["14:3-14:9|0|1|16420"], + "uses": ["14:3-14:9|4259594751088586730|3|16420"], "callees": [] }], "usr2type": [{ @@ -95,7 +95,7 @@ OUTPUT: "R": 0 }], "instances": [], - "uses": ["10:5-10:8|0|1|4", "14:22-14:25|0|1|4", "14:40-14:43|0|1|4"] + "uses": ["10:5-10:8|0|1|4", "14:22-14:25|4259594751088586730|3|4", "14:40-14:43|4259594751088586730|3|4"] }], "usr2var": [{ "usr": 8039186520399841081, @@ -119,7 +119,7 @@ OUTPUT: "spell": "7:7-7:16|15041163540773201510|2|1026", "extent": "7:3-7:16|15041163540773201510|2|0", "type": 53, - "uses": ["14:28-14:37|15041163540773201510|2|12"], + "uses": ["14:28-14:37|4259594751088586730|3|12"], "kind": 8, "storage": 0 }, { @@ -129,9 +129,9 @@ OUTPUT: "short_name": "static_var", "declarations": ["6:14-6:24|15041163540773201510|2|1025"], "spell": "10:10-10:20|15041163540773201510|2|1026", - "extent": "10:1-10:24|0|1|0", + "extent": "10:1-10:24|15041163540773201510|2|0", "type": 53, - "uses": ["14:45-14:55|0|1|12"], + "uses": ["14:45-14:55|4259594751088586730|3|12"], "kind": 13, "storage": 2 }] diff --git a/index_tests/usage/usage_inside_of_call_simple.cc b/index_tests/usage/usage_inside_of_call_simple.cc index 0dc7dcd8..9bb67ba9 100644 --- a/index_tests/usage/usage_inside_of_call_simple.cc +++ b/index_tests/usage/usage_inside_of_call_simple.cc @@ -25,7 +25,7 @@ OUTPUT: "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["6:3-6:9|18319417758892371313|3|16420", "6:10-6:13|11404602816585117695|3|16420", "6:18-6:21|11404602816585117695|3|16420"] }, { "usr": 11404602816585117695, "detailed_name": "int gen()", @@ -39,7 +39,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["6:10-6:13|0|1|16420", "6:18-6:21|0|1|16420"], + "uses": ["6:10-6:13|4259594751088586730|3|16420", "6:18-6:21|4259594751088586730|3|16420"], "callees": [] }, { "usr": 18319417758892371313, @@ -52,7 +52,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["6:3-6:9|0|1|16420"], + "uses": ["6:3-6:9|4259594751088586730|3|16420"], "callees": [] }], "usr2type": [], diff --git a/index_tests/usage/var_usage_call_function.cc b/index_tests/usage/var_usage_call_function.cc index ee39a73c..5ac9d0fa 100644 --- a/index_tests/usage/var_usage_call_function.cc +++ b/index_tests/usage/var_usage_call_function.cc @@ -25,7 +25,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["4:13-4:19|0|1|132", "7:3-7:9|0|1|16420"], + "uses": ["4:13-4:19|11404881820527069090|3|132", "7:3-7:9|11404881820527069090|3|16420"], "callees": [] }, { "usr": 11404881820527069090, @@ -41,7 +41,7 @@ OUTPUT: "derived": [], "vars": [9121974011454213596], "uses": [], - "callees": [] + "callees": ["4:13-4:19|468307235068920063|3|132", "4:13-4:19|468307235068920063|3|132", "7:3-7:9|468307235068920063|3|16420"] }], "usr2type": [], "usr2var": [{ diff --git a/index_tests/usage/var_usage_class_member.cc b/index_tests/usage/var_usage_class_member.cc index 0433edb3..93667b6d 100644 --- a/index_tests/usage/var_usage_class_member.cc +++ b/index_tests/usage/var_usage_class_member.cc @@ -36,7 +36,7 @@ OUTPUT: "derived": [], "vars": [14669930844300034456], "uses": [], - "callees": [] + "callees": ["14:3-14:9|17175780305784503374|3|16420", "15:3-15:9|17175780305784503374|3|16420", "16:3-16:9|12086644540399881766|3|16420", "17:3-17:9|17175780305784503374|3|16420"] }, { "usr": 12086644540399881766, "detailed_name": "void accept(int *)", @@ -48,7 +48,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["16:3-16:9|0|1|16420"], + "uses": ["16:3-16:9|4259594751088586730|3|16420"], "callees": [] }, { "usr": 17175780305784503374, @@ -61,7 +61,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["14:3-14:9|0|1|16420", "15:3-15:9|0|1|16420", "17:3-17:9|0|1|16420"], + "uses": ["14:3-14:9|4259594751088586730|3|16420", "15:3-15:9|4259594751088586730|3|16420", "17:3-17:9|4259594751088586730|3|16420"], "callees": [] }], "usr2type": [{ @@ -101,7 +101,7 @@ OUTPUT: "R": 32 }], "instances": [14669930844300034456], - "uses": ["11:3-11:6|0|1|4"] + "uses": ["11:3-11:6|4259594751088586730|3|4"] }], "usr2var": [{ "usr": 3873837747174060388, @@ -112,7 +112,7 @@ OUTPUT: "spell": "4:7-4:8|15041163540773201510|2|1026", "extent": "4:3-4:8|15041163540773201510|2|0", "type": 53, - "uses": ["17:12-17:13|15041163540773201510|2|12"], + "uses": ["17:12-17:13|4259594751088586730|3|12"], "kind": 8, "storage": 0 }, { @@ -124,7 +124,7 @@ OUTPUT: "spell": "3:7-3:8|15041163540773201510|2|1026", "extent": "3:3-3:8|15041163540773201510|2|0", "type": 53, - "uses": ["12:5-12:6|15041163540773201510|2|20", "13:5-13:6|15041163540773201510|2|4", "14:12-14:13|15041163540773201510|2|12", "15:12-15:13|15041163540773201510|2|12", "16:13-16:14|15041163540773201510|2|132"], + "uses": ["12:5-12:6|4259594751088586730|3|20", "13:5-13:6|4259594751088586730|3|4", "14:12-14:13|4259594751088586730|3|12", "15:12-15:13|4259594751088586730|3|12", "16:13-16:14|4259594751088586730|3|132"], "kind": 8, "storage": 0 }, { diff --git a/index_tests/usage/var_usage_class_member_static.cc b/index_tests/usage/var_usage_class_member_static.cc index 28e6da57..6f2eee7d 100644 --- a/index_tests/usage/var_usage_class_member_static.cc +++ b/index_tests/usage/var_usage_class_member_static.cc @@ -27,7 +27,7 @@ OUTPUT: "derived": [], "vars": [], "uses": [], - "callees": [] + "callees": ["8:3-8:9|17175780305784503374|3|16420"] }, { "usr": 17175780305784503374, "detailed_name": "void accept(int)", @@ -39,7 +39,7 @@ OUTPUT: "bases": [], "derived": [], "vars": [], - "uses": ["8:3-8:9|0|1|16420"], + "uses": ["8:3-8:9|4259594751088586730|3|16420"], "callees": [] }], "usr2type": [{ @@ -73,7 +73,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [], - "uses": ["8:10-8:13|0|1|4"] + "uses": ["8:10-8:13|4259594751088586730|3|4"] }], "usr2var": [{ "usr": 8599782646965457351, @@ -82,7 +82,7 @@ OUTPUT: "short_name": "x", "declarations": ["2:14-2:15|15041163540773201510|2|1025"], "type": 53, - "uses": ["8:15-8:16|15041163540773201510|2|12"], + "uses": ["8:15-8:16|4259594751088586730|3|12"], "kind": 13, "storage": 2 }] diff --git a/index_tests/usage/var_usage_cstyle_cast.cc b/index_tests/usage/var_usage_cstyle_cast.cc index 1f2bcb06..1233becc 100644 --- a/index_tests/usage/var_usage_cstyle_cast.cc +++ b/index_tests/usage/var_usage_cstyle_cast.cc @@ -29,7 +29,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [7057400933868440116, 7057400933868440116], - "uses": ["4:20-4:27|0|1|4", "4:42-4:49|0|1|4", "7:7-7:14|0|1|4"] + "uses": ["4:20-4:27|10028537921178202800|2|4", "4:42-4:49|10028537921178202800|2|4", "7:7-7:14|0|1|4"] }, { "usr": 10028537921178202800, "detailed_name": "struct Holder {}", @@ -56,7 +56,7 @@ OUTPUT: "hover": "static constexpr VarType Holder::static_var = (VarType)0x0", "declarations": ["4:28-4:38|10028537921178202800|2|1025"], "spell": "7:23-7:33|10028537921178202800|2|1026", - "extent": "7:1-7:33|0|1|0", + "extent": "7:1-7:33|10028537921178202800|2|0", "type": 5792006888140599735, "uses": [], "kind": 13, diff --git a/index_tests/usage/var_usage_extern.cc b/index_tests/usage/var_usage_extern.cc index fe5c928f..09442598 100644 --- a/index_tests/usage/var_usage_extern.cc +++ b/index_tests/usage/var_usage_extern.cc @@ -47,7 +47,7 @@ OUTPUT: "short_name": "a", "declarations": ["1:12-1:13|0|1|1"], "type": 53, - "uses": ["4:3-4:4|0|1|20"], + "uses": ["4:3-4:4|4259594751088586730|3|20"], "kind": 13, "storage": 1 }] diff --git a/index_tests/usage/var_usage_static.cc b/index_tests/usage/var_usage_static.cc index 873fc5db..5000ec77 100644 --- a/index_tests/usage/var_usage_static.cc +++ b/index_tests/usage/var_usage_static.cc @@ -50,7 +50,7 @@ OUTPUT: "spell": "1:12-1:13|0|1|2", "extent": "1:1-1:13|0|1|0", "type": 53, - "uses": ["4:3-4:4|0|1|20"], + "uses": ["4:3-4:4|4259594751088586730|3|20"], "kind": 13, "storage": 2 }] diff --git a/index_tests/vars/class_member.cc b/index_tests/vars/class_member.cc index 7eb364a5..4b3925a7 100644 --- a/index_tests/vars/class_member.cc +++ b/index_tests/vars/class_member.cc @@ -26,7 +26,7 @@ OUTPUT: "R": 0 }], "instances": [13799811842374292251], - "uses": ["2:3-2:6|0|1|4"] + "uses": ["2:3-2:6|15041163540773201510|2|4"] }], "usr2var": [{ "usr": 13799811842374292251, diff --git a/index_tests/vars/class_static_member.cc b/index_tests/vars/class_static_member.cc index b4c4784d..1dcb0699 100644 --- a/index_tests/vars/class_static_member.cc +++ b/index_tests/vars/class_static_member.cc @@ -25,7 +25,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [5844987037615239736, 5844987037615239736], - "uses": ["2:10-2:13|0|1|4", "4:1-4:4|0|1|4", "4:6-4:9|0|1|4"] + "uses": ["2:10-2:13|15041163540773201510|2|4", "4:1-4:4|0|1|4", "4:6-4:9|0|1|4"] }], "usr2var": [{ "usr": 5844987037615239736, @@ -34,7 +34,7 @@ OUTPUT: "short_name": "member", "declarations": ["2:15-2:21|15041163540773201510|2|1025"], "spell": "4:11-4:17|15041163540773201510|2|1026", - "extent": "4:1-4:27|0|1|0", + "extent": "4:1-4:27|15041163540773201510|2|0", "type": 15041163540773201510, "uses": [], "kind": 13, diff --git a/index_tests/vars/deduce_auto_type.cc b/index_tests/vars/deduce_auto_type.cc index 2212b9af..3823df90 100644 --- a/index_tests/vars/deduce_auto_type.cc +++ b/index_tests/vars/deduce_auto_type.cc @@ -41,7 +41,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [10601729374837386290, 18422884837902130475], - "uses": ["3:16-3:19|0|1|4", "4:17-4:20|0|1|4"] + "uses": ["3:16-3:19|880549676430489861|3|4", "4:17-4:20|880549676430489861|3|4"] }], "usr2var": [{ "usr": 10601729374837386290, diff --git a/index_tests/vars/function_local.cc b/index_tests/vars/function_local.cc index 8090f1cd..b6197c40 100644 --- a/index_tests/vars/function_local.cc +++ b/index_tests/vars/function_local.cc @@ -39,7 +39,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [13198746475679542317], - "uses": ["4:3-4:6|0|1|4"] + "uses": ["4:3-4:6|4259594751088586730|3|4"] }], "usr2var": [{ "usr": 13198746475679542317, diff --git a/index_tests/vars/type_instance_on_using_type.cc b/index_tests/vars/type_instance_on_using_type.cc index 229959d5..7a6ebcf6 100644 --- a/index_tests/vars/type_instance_on_using_type.cc +++ b/index_tests/vars/type_instance_on_using_type.cc @@ -60,7 +60,7 @@ OUTPUT: "funcs": [], "vars": [], "instances": [6975456769752895964], - "uses": ["4:3-4:4|0|1|4"] + "uses": ["4:3-4:4|4654328188330986029|3|4"] }], "usr2var": [{ "usr": 6975456769752895964, diff --git a/src/indexer.cc b/src/indexer.cc index 8afb6eb7..a8fbd32c 100644 --- a/src/indexer.cc +++ b/src/indexer.cc @@ -492,6 +492,7 @@ public: if (L.isMacroID() || !SM.isBeforeInTranslationUnit(L, R.getBegin())) return; StringRef Buf = GetSourceInRange(SM, Lang, R); + Twine Static("static "); Twine T = Buf.count('\n') <= kInitializerMaxLines - 1 ? def.detailed_name + (Buf.size() && Buf[0] == ':' ? Twine(" ", Buf) @@ -499,7 +500,7 @@ public: : def.detailed_name; def.hover = def.storage == SC_Static && strncmp(def.detailed_name, "static ", 7) - ? Intern(("static " + T).str()) + ? Intern((Static + T).str()) : Intern(T.str()); } } @@ -591,7 +592,7 @@ public: const Decl* OrigD = ASTNode.OrigD; const DeclContext *SemDC = OrigD->getDeclContext(); - const DeclContext *LexDC = OrigD->getLexicalDeclContext(); + const DeclContext *LexDC = ASTNode.ContainerDC; Role role = static_cast(Roles); db->language = std::max(db->language, GetDeclLanguage(OrigD)); @@ -639,9 +640,14 @@ public: if (func->def.detailed_name[0] == '\0') SetName(OrigD, info->short_name, info->qualified, func->def); if (is_def || is_decl) { - const Decl* DC = cast(SemDC); + const Decl *DC = cast(SemDC); if (GetSymbolKind(DC) == SymbolKind::Type) db->ToType(GetUsr(DC)).def.funcs.push_back(usr); + } else { + const Decl *DC = cast(LexDC); + if (GetSymbolKind(DC) == SymbolKind::Func) + db->ToFunc(GetUsr(DC)) + .def.callees.push_back({{loc, usr, SymbolKind::Func, role}}); } break; case SymbolKind::Type: @@ -670,7 +676,7 @@ public: else if (auto *FD = dyn_cast(D)) T = FD->getType(); if (is_def || is_decl) { - const Decl* DC = cast(SemDC); + const Decl *DC = cast(SemDC); if (GetSymbolKind(DC) == SymbolKind::Func) db->ToFunc(GetUsr(DC)).def.vars.push_back(usr); else if (auto *ND = dyn_cast(SemDC)) @@ -863,8 +869,10 @@ public: case Decl::Function: func->def.kind = lsSymbolKind::Function; break; - case Decl::CXXMethod: - func->def.kind = lsSymbolKind::Method; + case Decl::CXXMethod: { + const auto *MD = cast(D); + func->def.kind = + MD->isStatic() ? lsSymbolKind::StaticMethod : lsSymbolKind::Method; if (is_def || is_decl) { if (auto *ND = dyn_cast(D)) { SmallVector OverDecls; @@ -877,6 +885,7 @@ public: } } break; + } case Decl::CXXConstructor: case Decl::CXXConversion: func->def.kind = lsSymbolKind::Constructor; diff --git a/src/messages/ccls_memberHierarchy.cc b/src/messages/ccls_memberHierarchy.cc index e40244c4..03cfcca3 100644 --- a/src/messages/ccls_memberHierarchy.cc +++ b/src/messages/ccls_memberHierarchy.cc @@ -207,7 +207,7 @@ struct Handler_CclsMemberHierarchy Out_CclsMemberHierarchy::Entry entry; // Not type, |id| is invalid. - entry.name = std::string(def->Name(qualified)); + entry.name = def->Name(qualified); if (def->spell) { if (std::optional loc = GetLsLocation(db, working_files, *def->spell))